BASELINE: Update Chromium to 53.0.2785.41

Also adds a few extra files for extensions.

Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

4 files changed, 23 insertions, 23 deletions

diff --git a/chromium/components/guest_view/browser/BUILD.gn b/chromium/components/guest_view/browser/BUILD.gn
index b7103350b8b..e6d27b7b762 100644
--- a/chromium/components/guest_view/browser/BUILD.gn
+++ b/chromium/components/guest_view/browser/BUILD.gn
@@ -22,7 +22,7 @@ source_set("browser") {
   deps = [
     "//base",
     "//components/guest_view/common",
-    "//components/ui/zoom",
+    "//components/zoom",
     "//content/public/browser",
     "//content/public/common",
     "//ipc",
diff --git a/chromium/components/guest_view/browser/DEPS b/chromium/components/guest_view/browser/DEPS
index f0c51e42b11..cbd25b55f6f 100644
--- a/chromium/components/guest_view/browser/DEPS
+++ b/chromium/components/guest_view/browser/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+components/ui/zoom",
+  "+components/zoom",
   "+content/public/browser",
   "+content/public/common",
   "+content/public/test",
diff --git a/chromium/components/guest_view/browser/guest_view_base.cc b/chromium/components/guest_view/browser/guest_view_base.cc
index 3334745172f..45ce1855c5c 100644
--- a/chromium/components/guest_view/browser/guest_view_base.cc
+++ b/chromium/components/guest_view/browser/guest_view_base.cc
@@ -14,8 +14,8 @@
 #include "components/guest_view/browser/guest_view_manager.h"
 #include "components/guest_view/common/guest_view_constants.h"
 #include "components/guest_view/common/guest_view_messages.h"
-#include "components/ui/zoom/page_zoom.h"
-#include "components/ui/zoom/zoom_controller.h"
+#include "components/zoom/page_zoom.h"
+#include "components/zoom/zoom_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ -218,7 +218,7 @@ void GuestViewBase::InitWithWebContents(
   // in DidNavigateMainFrame, but since ZoomController always resets to default
   // zoom mode on this event, GuestViewBase would need to do so after
   // ZoomController::DidNavigateMainFrame has completed.
-  ui_zoom::ZoomController::CreateForWebContents(guest_web_contents);
+  zoom::ZoomController::CreateForWebContents(guest_web_contents);
 
   // At this point, we have just created the guest WebContents, we need to add
   // an observer to the owner WebContents. This observer will be responsible
@@ -240,8 +240,7 @@ void GuestViewBase::InitWithWebContents(
     SetUpSizing(create_params);
 
   // Observe guest zoom changes.
-  auto zoom_controller =
-      ui_zoom::ZoomController::FromWebContents(web_contents());
+  auto zoom_controller = zoom::ZoomController::FromWebContents(web_contents());
   zoom_controller->AddObserver(this);
 
   // Give the derived class an opportunity to perform additional initialization.
@@ -624,9 +623,9 @@ void GuestViewBase::ContentsMouseEvent(WebContents* source,
 }
 
 void GuestViewBase::ContentsZoomChange(bool zoom_in) {
-  ui_zoom::PageZoom::Zoom(
-      embedder_web_contents(),
-      zoom_in ? content::PAGE_ZOOM_IN : content::PAGE_ZOOM_OUT);
+  zoom::PageZoom::Zoom(embedder_web_contents(), zoom_in
+                                                    ? content::PAGE_ZOOM_IN
+                                                    : content::PAGE_ZOOM_OUT);
 }
 
 void GuestViewBase::HandleKeyboardEvent(
@@ -665,12 +664,13 @@ void GuestViewBase::ResizeDueToAutoResize(WebContents* web_contents,
   guest_host_->GuestResizeDueToAutoResize(new_size);
 }
 
-void GuestViewBase::RunFileChooser(WebContents* web_contents,
+void GuestViewBase::RunFileChooser(content::RenderFrameHost* render_frame_host,
                                    const content::FileChooserParams& params) {
   if (!attached() || !embedder_web_contents()->GetDelegate())
     return;
 
-  embedder_web_contents()->GetDelegate()->RunFileChooser(web_contents, params);
+  embedder_web_contents()->GetDelegate()->RunFileChooser(render_frame_host,
+                                                         params);
 }
 
 bool GuestViewBase::ShouldFocusPageAfterCrash() {
@@ -726,11 +726,11 @@ void GuestViewBase::FindReply(WebContents* source,
 }
 
 void GuestViewBase::OnZoomChanged(
-    const ui_zoom::ZoomController::ZoomChangedEventData& data) {
+    const zoom::ZoomController::ZoomChangedEventData& data) {
   if (data.web_contents == embedder_web_contents()) {
     // The embedder's zoom level has changed.
     auto guest_zoom_controller =
-        ui_zoom::ZoomController::FromWebContents(web_contents());
+        zoom::ZoomController::FromWebContents(web_contents());
     if (content::ZoomValuesEqual(data.new_zoom_level,
                                  guest_zoom_controller->GetZoomLevel())) {
       return;
@@ -793,7 +793,7 @@ double GuestViewBase::GetEmbedderZoomFactor() const {
     return 1.0;
 
   return content::ZoomLevelToZoomFactor(
-      ui_zoom::ZoomController::GetZoomLevelForWebContents(
+      zoom::ZoomController::GetZoomLevelForWebContents(
           embedder_web_contents()));
 }
 
@@ -847,11 +847,11 @@ void GuestViewBase::SetUpSizing(const base::DictionaryValue& params) {
 
 void GuestViewBase::SetGuestZoomLevelToMatchEmbedder() {
   auto embedder_zoom_controller =
-      ui_zoom::ZoomController::FromWebContents(owner_web_contents());
+      zoom::ZoomController::FromWebContents(owner_web_contents());
   if (!embedder_zoom_controller)
     return;
 
-  ui_zoom::ZoomController::FromWebContents(web_contents())
+  zoom::ZoomController::FromWebContents(web_contents())
       ->SetZoomLevel(embedder_zoom_controller->GetZoomLevel());
 }
 
@@ -860,7 +860,7 @@ void GuestViewBase::StartTrackingEmbedderZoomLevel() {
     return;
 
   auto embedder_zoom_controller =
-      ui_zoom::ZoomController::FromWebContents(owner_web_contents());
+      zoom::ZoomController::FromWebContents(owner_web_contents());
   // Chrome Apps do not have a ZoomController.
   if (!embedder_zoom_controller)
     return;
@@ -876,7 +876,7 @@ void GuestViewBase::StopTrackingEmbedderZoomLevel() {
     return;
 
   auto embedder_zoom_controller =
-      ui_zoom::ZoomController::FromWebContents(owner_web_contents());
+      zoom::ZoomController::FromWebContents(owner_web_contents());
   // Chrome Apps do not have a ZoomController.
   if (!embedder_zoom_controller)
     return;
diff --git a/chromium/components/guest_view/browser/guest_view_base.h b/chromium/components/guest_view/browser/guest_view_base.h
index 8f216853bb9..320a5e4d50b 100644
--- a/chromium/components/guest_view/browser/guest_view_base.h
+++ b/chromium/components/guest_view/browser/guest_view_base.h
@@ -12,7 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "components/guest_view/common/guest_view_constants.h"
-#include "components/ui/zoom/zoom_observer.h"
+#include "components/zoom/zoom_observer.h"
 #include "content/public/browser/browser_plugin_guest_delegate.h"
 #include "content/public/browser/guest_host.h"
 #include "content/public/browser/render_process_host_observer.h"
@@ -51,7 +51,7 @@ struct SetSizeParams {
 class GuestViewBase : public content::BrowserPluginGuestDelegate,
                       public content::WebContentsDelegate,
                       public content::WebContentsObserver,
-                      public ui_zoom::ZoomObserver {
+                      public zoom::ZoomObserver {
  public:
   // Returns a *ViewGuest if this GuestView is of the given view type.
   template <typename T>
@@ -364,7 +364,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
       const std::vector<content::ColorSuggestion>& suggestions) final;
   void ResizeDueToAutoResize(content::WebContents* web_contents,
                              const gfx::Size& new_size) final;
-  void RunFileChooser(content::WebContents* web_contents,
+  void RunFileChooser(content::RenderFrameHost* render_frame_host,
                       const content::FileChooserParams& params) final;
   bool ShouldFocusPageAfterCrash() final;
   void UpdatePreferredSize(content::WebContents* web_contents,
@@ -379,7 +379,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
 
   // ui_zoom::ZoomObserver implementation.
   void OnZoomChanged(
-      const ui_zoom::ZoomController::ZoomChangedEventData& data) final;
+      const zoom::ZoomController::ZoomChangedEventData& data) final;
 
   void SendQueuedEvents();