9 files changed, 41 insertions, 39 deletions
diff --git a/chromium/chrome/VERSION b/chromium/chrome/VERSION
index 152e81f0aaf..64c1fb9445c 100644
--- a/chromium/chrome/VERSION
+++ b/chromium/chrome/VERSION
@@ -1,4 +1,4 @@
 MAJOR=45
 MINOR=0
 BUILD=2454
-PATCH=79
+PATCH=101
diff --git a/chromium/chrome/app/theme/default_100_percent/cros/logo_google_color_90.png b/chromium/chrome/app/theme/default_100_percent/cros/logo_google_color_90.png
index 9ac7df1da31..e836fc30994 100644
--- a/chromium/chrome/app/theme/default_100_percent/cros/logo_google_color_90.png
+++ b/chromium/chrome/app/theme/default_100_percent/cros/logo_google_color_90.png
diff --git a/chromium/chrome/app/theme/default_200_percent/cros/logo_google_color_90.png b/chromium/chrome/app/theme/default_200_percent/cros/logo_google_color_90.png
index ccd9a53c4e9..ea1ee1ad7c1 100644
--- a/chromium/chrome/app/theme/default_200_percent/cros/logo_google_color_90.png
+++ b/chromium/chrome/app/theme/default_200_percent/cros/logo_google_color_90.png
diff --git a/chromium/chrome/browser/resources/pdf/pdf.js b/chromium/chrome/browser/resources/pdf/pdf.js
index 43e085e434b..c4975746d57 100644
--- a/chromium/chrome/browser/resources/pdf/pdf.js
+++ b/chromium/chrome/browser/resources/pdf/pdf.js
@@ -84,6 +84,7 @@ function PDFViewer(browserApi) {
   this.browserApi_ = browserApi;
   this.loadState_ = LoadState.LOADING;
   this.parentWindow_ = null;
+  this.parentOrigin_ = null;
 
   this.delayedScriptingMessages_ = [];
 
@@ -674,6 +675,7 @@ PDFViewer.prototype = {
   handleScriptingMessage: function(message) {
     if (this.parentWindow_ != message.source) {
       this.parentWindow_ = message.source;
+      this.parentOrigin_ = message.origin;
       // Ensure that we notify the embedder if the document is loaded.
       if (this.loadState_ != LoadState.LOADING)
         this.sendDocumentLoadedMessage_();
@@ -760,11 +762,22 @@ PDFViewer.prototype = {
    * @param {Object} message the message to send.
    */
   sendScriptingMessage_: function(message) {
-    if (this.parentWindow_)
-      this.parentWindow_.postMessage(message, '*');
+    if (this.parentWindow_ && this.parentOrigin_) {
+      var targetOrigin;
+      // Only send data back to the embedder if it is from the same origin,
+      // unless we're sending it to ourselves (which could happen in the case
+      // of tests). We also allow documentLoaded messages through as this won't
+      // leak important information.
+      if (this.parentOrigin_ == window.location.origin)
+        targetOrigin = this.parentOrigin_;
+      else if (message.type == 'documentLoaded')
+        targetOrigin = '*';
+      else
+        targetOrigin = this.browserApi_.getStreamInfo().originalUrl;
+      this.parentWindow_.postMessage(message, targetOrigin);
+    }
   },
 
-
   /**
    * @type {Viewport} the viewport of the PDF viewer.
    */
diff --git a/chromium/chrome/chrome_browser.gypi b/chromium/chrome/chrome_browser.gypi
index 6300411b413..58639ea625f 100644
--- a/chromium/chrome/chrome_browser.gypi
+++ b/chromium/chrome/chrome_browser.gypi
@@ -72,8 +72,6 @@
       'browser/android/compositor/layer/tab_handle_layer.h',
       'browser/android/compositor/layer/tab_layer.cc',
       'browser/android/compositor/layer/tab_layer.h',
-      'browser/android/compositor/layer/throbber_layer.cc',
-      'browser/android/compositor/layer/throbber_layer.h',
       'browser/android/compositor/layer/thumbnail_layer.cc',
       'browser/android/compositor/layer/thumbnail_layer.h',
       'browser/android/compositor/layer/toolbar_layer.cc',
diff --git a/chromium/chrome/chrome_installer.gypi b/chromium/chrome/chrome_installer.gypi
index efc5f889fd2..eeb633514bc 100644
--- a/chromium/chrome/chrome_installer.gypi
+++ b/chromium/chrome/chrome_installer.gypi
@@ -211,6 +211,7 @@
           'target_name': 'setup',
           'type': 'executable',
           'dependencies': [
+            'chrome_version_header',
             'installer_util',
             'installer_util_strings',
             '../base/base.gyp:base',
diff --git a/chromium/chrome/common/localized_error.cc b/chromium/chrome/common/localized_error.cc
index 3089c7c829e..7033f6499fe 100644
--- a/chromium/chrome/common/localized_error.cc
+++ b/chromium/chrome/common/localized_error.cc
@@ -44,8 +44,7 @@ namespace {
 static const char kRedirectLoopLearnMoreUrl[] =
     "https://support.google.com/chrome/answer/95626";
 static const char kWeakDHKeyLearnMoreUrl[] =
-    "https://www.chromium.org/administrators/"
-    "err_ssl_weak_server_ephemeral_dh_key";
+    "https://support.google.com/chrome?p=dh_error";
 static const char kCachedCopyButtonFieldTrial[] =
     "EnableGoogleCachedCopyTextExperiment";
 static const char kCachedCopyButtonExpTypeControl[] = "control";
diff --git a/chromium/chrome/renderer/resources/plugins/plugin_placeholders.css b/chromium/chrome/renderer/resources/plugins/plugin_placeholders.css
index 119119f6803..345ef673f95 100644
--- a/chromium/chrome/renderer/resources/plugins/plugin_placeholders.css
+++ b/chromium/chrome/renderer/resources/plugins/plugin_placeholders.css
@@ -31,26 +31,16 @@ p {
 }
 
 #outer {
+  align-items: center;
   border: 1px black solid;
   box-sizing: border-box;
+  display: flex;
   height: 100%;
+  justify-content: center;
   position: absolute;
   width: 100%;
 }
 
-#inner {
-  height: 100%;
-<if expr="not is_android">
-  margin-top: -70px;
-</if>
-<if expr="is_android">
-  margin-top: -14px;
-</if>
-  position: relative;
-  top: 50%;
-  width: 100%;
-}
-
 #close {
   background-image: -webkit-image-set(
       url(../../../../ui/resources/default_100_percent/close_2.png) 1x,
diff --git a/chromium/chrome/renderer/resources/plugins/plugin_poster.html b/chromium/chrome/renderer/resources/plugins/plugin_poster.html
index d5945d1314a..4a4b90c8bd3 100644
--- a/chromium/chrome/renderer/resources/plugins/plugin_poster.html
+++ b/chromium/chrome/renderer/resources/plugins/plugin_poster.html
@@ -21,7 +21,6 @@
 #outer {
   border: none;
   cursor: pointer;
-  position: relative;
 }
 
 #shielding {
@@ -34,11 +33,12 @@
   z-index: 2;
 }
 
-#plugin_icon {
+#plugin-icon {
+  display: block;
   opacity: 0.8;
 }
 
-#plugin_icon:hover {
+#plugin-icon:hover {
   opacity: 0.95;
 }
 
@@ -49,14 +49,14 @@
   z-index: 1;
 }
 
-#inner_container {
-  height: 100%;
-  position: relative;
-  width: 100%;
-}
-
-#inner {
-  margin-top: -25px;
+#inner-container {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  left: 0px;
+  position: absolute;
+  top: 0px;
+  z-index: 2;
 }
 </style>
 <base i18n-values="href:baseurl">
@@ -65,12 +65,13 @@
 <body>
   <div i18n-values="title:name" id="outer">
     <img id="poster" i18n-values="srcset:poster">
-    <div id="shielding">
-      <div id="inner_container"
-           i18n-values=".style.width:visibleWidth;.style.height:visibleHeight">
-        <div id="inner">
-          <img id="plugin_icon" src="plugin_power_saver_play.png" />
-        </div>
+    <div id="shielding"></div>
+    <div id="inner-container"
+         i18n-values=".style.width:visibleWidth;.style.height:visibleHeight">
+      <div id="inner">
+        <img id="plugin-icon" src="plugin_power_saver_play.png"
+             i18n-values=".style.maxWidth:visibleWidth;
+                          .style.maxHeight:visibleHeight" />
       </div>
     </div>
   </div>
@@ -84,7 +85,7 @@
     };
 
     window.setPosterMargin = function(marginLeft, marginTop) {
-      var container = document.getElementById('inner_container');
+      var container = document.getElementById('inner-container');
       container.style.marginLeft = marginLeft;
       container.style.marginTop = marginTop;
     };