BASELINE: Update Chromium to 64.0.3282.139

Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

5 files changed, 12 insertions, 11 deletions

diff --git a/chromium/components/guest_view/browser/guest_view_base.cc b/chromium/components/guest_view/browser/guest_view_base.cc
index b88ed07db74..e4bf5148ebe 100644
--- a/chromium/components/guest_view/browser/guest_view_base.cc
+++ b/chromium/components/guest_view/browser/guest_view_base.cc
@@ -447,10 +447,6 @@ WebContents* GuestViewBase::GetOwnerWebContents() const {
   return owner_web_contents_;
 }
 
-void GuestViewBase::GuestSizeChanged(const gfx::Size& new_size) {
-  UpdateGuestSize(new_size, auto_size_enabled_);
-}
-
 const GURL& GuestViewBase::GetOwnerSiteURL() const {
   return owner_web_contents()->GetLastCommittedURL();
 }
@@ -656,7 +652,7 @@ content::ColorChooser* GuestViewBase::OpenColorChooser(
 
 void GuestViewBase::ResizeDueToAutoResize(WebContents* web_contents,
                                           const gfx::Size& new_size) {
-  guest_host_->GuestResizeDueToAutoResize(new_size);
+  UpdateGuestSize(new_size, auto_size_enabled_);
 }
 
 void GuestViewBase::RunFileChooser(content::RenderFrameHost* render_frame_host,
@@ -871,14 +867,16 @@ void GuestViewBase::StartTrackingEmbedderZoomLevel() {
 }
 
 void GuestViewBase::StopTrackingEmbedderZoomLevel() {
-  if (!attached() || !ZoomPropagatesFromEmbedderToGuest())
-    return;
+  // TODO(wjmaclean): Remove the observer any time the GuestWebView transitions
+  // from propagating to not-propagating the zoom from the embedder.
 
   auto* embedder_zoom_controller =
       zoom::ZoomController::FromWebContents(owner_web_contents());
   // Chrome Apps do not have a ZoomController.
   if (!embedder_zoom_controller)
     return;
+
+  // It is safe to remove an observer that was never registed.
   embedder_zoom_controller->RemoveObserver(this);
 }
 
diff --git a/chromium/components/guest_view/browser/guest_view_base.h b/chromium/components/guest_view/browser/guest_view_base.h
index ebdab1679e7..ae27d9f7908 100644
--- a/chromium/components/guest_view/browser/guest_view_base.h
+++ b/chromium/components/guest_view/browser/guest_view_base.h
@@ -340,7 +340,6 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
   void DidAttach(int guest_proxy_routing_id) final;
   void DidDetach() final;
   content::WebContents* GetOwnerWebContents() const final;
-  void GuestSizeChanged(const gfx::Size& new_size) final;
   void SetGuestHost(content::GuestHost* guest_host) final;
   void WillAttach(content::WebContents* embedder_web_contents,
                   int browser_plugin_instance_id,
diff --git a/chromium/components/guest_view/browser/test_guest_view_manager.cc b/chromium/components/guest_view/browser/test_guest_view_manager.cc
index 41dc908ab1d..84ca6d85f98 100644
--- a/chromium/components/guest_view/browser/test_guest_view_manager.cc
+++ b/chromium/components/guest_view/browser/test_guest_view_manager.cc
@@ -169,8 +169,7 @@ void TestGuestViewManager::ViewGarbageCollected(int embedder_process_id,
 
 // Test factory for creating test instances of GuestViewManager.
 TestGuestViewManagerFactory::TestGuestViewManagerFactory()
-    : test_guest_view_manager_(NULL) {
-}
+    : test_guest_view_manager_(nullptr) {}
 
 TestGuestViewManagerFactory::~TestGuestViewManagerFactory() {
 }
diff --git a/chromium/components/guest_view/common/guest_view_message_generator.h b/chromium/components/guest_view/common/guest_view_message_generator.h
index 0e569e226f1..9f1bb10b405 100644
--- a/chromium/components/guest_view/common/guest_view_message_generator.h
+++ b/chromium/components/guest_view/common/guest_view_message_generator.h
@@ -4,4 +4,5 @@
 
 // Multiply-included file, no traditional include guard.
 
+#undef COMPONENTS_GUEST_VIEW_COMMON_GUEST_VIEW_MESSAGES_H_
 #include "components/guest_view/common/guest_view_messages.h"
diff --git a/chromium/components/guest_view/common/guest_view_messages.h b/chromium/components/guest_view/common/guest_view_messages.h
index acec2c62037..43dcc4f8902 100644
--- a/chromium/components/guest_view/common/guest_view_messages.h
+++ b/chromium/components/guest_view/common/guest_view_messages.h
@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 // IPC messages for GuestViews.
-// Multiply-included message file, hence no include guard.
+
+#ifndef COMPONENTS_GUEST_VIEW_COMMON_GUEST_VIEW_MESSAGES_H_
+#define COMPONENTS_GUEST_VIEW_COMMON_GUEST_VIEW_MESSAGES_H_
 
 #include "base/values.h"
 #include "ipc/ipc_message_macros.h"
@@ -58,3 +60,5 @@ IPC_MESSAGE_CONTROL2(GuestViewHostMsg_ViewCreated,
 // been garbage collected in JavaScript.
 IPC_MESSAGE_CONTROL1(GuestViewHostMsg_ViewGarbageCollected,
                      int /* view_instance_id */)
+
+#endif  // COMPONENTS_GUEST_VIEW_COMMON_GUEST_VIEW_MESSAGES_H_