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>

7 files changed, 12 insertions, 18 deletions

diff --git a/chromium/components/web_cache/browser/BUILD.gn b/chromium/components/web_cache/browser/BUILD.gn
index e304cdb1c2c..9b566c5fa97 100644
--- a/chromium/components/web_cache/browser/BUILD.gn
+++ b/chromium/components/web_cache/browser/BUILD.gn
@@ -16,6 +16,7 @@ source_set("browser") {
     "//components/web_cache/public/interfaces",
     "//content/public/browser",
     "//content/public/common",
+    "//services/shell/public/cpp",
     "//third_party/WebKit/public:blink_headers",
   ]
 }
diff --git a/chromium/components/web_cache/browser/DEPS b/chromium/components/web_cache/browser/DEPS
index f6417ed8f4e..b90a1edea8c 100644
--- a/chromium/components/web_cache/browser/DEPS
+++ b/chromium/components/web_cache/browser/DEPS
@@ -1,5 +1,6 @@
 include_rules = [
   "+content/public/browser",
   "+content/public",
-  '+third_party/WebKit/public/web',
+  "+services/shell/public/cpp",
+  "+third_party/WebKit/public/web",
 ]
diff --git a/chromium/components/web_cache/browser/web_cache_manager.cc b/chromium/components/web_cache/browser/web_cache_manager.cc
index 488fe5861c4..f82b216a586 100644
--- a/chromium/components/web_cache/browser/web_cache_manager.cc
+++ b/chromium/components/web_cache/browser/web_cache_manager.cc
@@ -22,7 +22,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
-#include "content/public/common/service_registry.h"
+#include "services/shell/public/cpp/interface_provider.h"
 
 using base::Time;
 using base::TimeDelta;
@@ -94,8 +94,7 @@ void WebCacheManager::Add(int renderer_id) {
       content::RenderProcessHost::FromID(renderer_id);
   if (host) {
     mojom::WebCachePtr service;
-    host->GetServiceRegistry()->ConnectToRemoteService(
-        mojo::GetProxy(&service));
+    host->GetRemoteInterfaces()->GetInterface(&service);
     web_cache_services_[renderer_id] = std::move(service);
   }
 
diff --git a/chromium/components/web_cache/public/interfaces/OWNERS b/chromium/components/web_cache/public/interfaces/OWNERS
index e5c69a97669..08850f42120 100644
--- a/chromium/components/web_cache/public/interfaces/OWNERS
+++ b/chromium/components/web_cache/public/interfaces/OWNERS
@@ -1,11 +1,2 @@
-# Changes to mojom files require a security review to avoid introducing
-# new sandbox escapes.
 per-file *.mojom=set noparent
-per-file *.mojom=dcheng@chromium.org
-per-file *.mojom=inferno@chromium.org
-per-file *.mojom=jln@chromium.org
-per-file *.mojom=jschuh@chromium.org
-per-file *.mojom=kenrb@chromium.org
-per-file *.mojom=nasko@chromium.org
-per-file *.mojom=tsepez@chromium.org
-per-file *.mojom=wfh@chromium.org
+per-file *.mojom=file://ipc/SECURITY_OWNERS
diff --git a/chromium/components/web_cache/renderer/BUILD.gn b/chromium/components/web_cache/renderer/BUILD.gn
index 624d2b9cbf1..4f3df24f15d 100644
--- a/chromium/components/web_cache/renderer/BUILD.gn
+++ b/chromium/components/web_cache/renderer/BUILD.gn
@@ -13,6 +13,7 @@ source_set("renderer") {
     "//components/web_cache/public/interfaces",
     "//content/public/common",
     "//content/public/renderer",
+    "//services/shell/public/cpp",
     "//third_party/WebKit/public:blink",
   ]
 }
diff --git a/chromium/components/web_cache/renderer/DEPS b/chromium/components/web_cache/renderer/DEPS
index 6df06f73d16..4c81f94c10e 100644
--- a/chromium/components/web_cache/renderer/DEPS
+++ b/chromium/components/web_cache/renderer/DEPS
@@ -2,5 +2,6 @@ include_rules = [
   "+content/public/common",
   "+content/public/renderer",
   "+mojo/public",
+  "+services/shell/public/cpp",
   "+third_party/WebKit/public/web",
 ]
diff --git a/chromium/components/web_cache/renderer/web_cache_impl.cc b/chromium/components/web_cache/renderer/web_cache_impl.cc
index 8743b9d24b2..dfe8e7e0bf5 100644
--- a/chromium/components/web_cache/renderer/web_cache_impl.cc
+++ b/chromium/components/web_cache/renderer/web_cache_impl.cc
@@ -8,16 +8,16 @@
 
 #include "base/bind.h"
 #include "base/numerics/safe_conversions.h"
-#include "content/public/common/service_registry.h"
 #include "content/public/renderer/render_thread.h"
+#include "services/shell/public/cpp/interface_registry.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 
 namespace web_cache {
 
 WebCacheImpl::WebCacheImpl() : clear_cache_state_(kInit) {
-  content::ServiceRegistry* service_registry =
-      content::RenderThread::Get()->GetServiceRegistry();
-  service_registry->AddService(
+  shell::InterfaceRegistry* registry =
+      content::RenderThread::Get()->GetInterfaceRegistry();
+  registry->AddInterface(
       base::Bind(&WebCacheImpl::BindRequest, base::Unretained(this)));
 }