Merge service_manager::BinderMapWithContext into mojo::BinderMap

Tbr: oksamyt@chromium.org
Bug: 1046578
Change-Id: Ic2c01ee09c4b6a9fb2a936acf28fc0f00dc053f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2174654
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#765090}

chrome/browser/chrome_browser_interface_binders.cc

@@ -356,7 +356,7 @@ void BindCaptionContextHandler(
 #endif
 
 void PopulateChromeFrameBinders(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>* map) {
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* map) {
   map->Add<image_annotation::mojom::Annotator>(
       base::BindRepeating(&BindImageAnnotator));
 
@@ -448,7 +448,7 @@ void PopulateChromeFrameBinders(
 }
 
 void PopulateChromeWebUIFrameBinders(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>* map) {
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* map) {
   RegisterWebUIControllerInterfaceBinder<::mojom::BluetoothInternalsHandler,
                                          BluetoothInternalsUI>(map);
 

chrome/browser/chrome_browser_interface_binders.h

@@ -10,7 +10,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_controller.h"
-#include "services/service_manager/public/cpp/binder_map.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 
 namespace content {
 
@@ -28,13 +28,13 @@ namespace internal {
 // GetInterface() handler callbacks for chrome-specific document-scoped
 // interfaces.
 void PopulateChromeFrameBinders(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>* map);
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* map);
 
 // PopulateChromeWebUIFrameBinders() registers BrowserInterfaceBroker's
 // GetInterface() handler callbacks for chrome-specific document-scoped
 // interfaces used from WebUI pages (e.g. chrome://bluetooth-internals).
 void PopulateChromeWebUIFrameBinders(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>* map);
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* map);
 
 template <typename Interface, int N, typename... Subclasses>
 struct BinderHelper;
@@ -83,7 +83,7 @@ struct BinderHelper<Interface, 0, std::tuple<Subclass, Subclasses...>> {
 // has a WebUIController among type |WebUIControllerSubclasses|.
 template <typename Interface, typename... WebUIControllerSubclasses>
 void RegisterWebUIControllerInterfaceBinder(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>* map) {
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* map) {
   map->Add<Interface>(
       base::BindRepeating([](content::RenderFrameHost* host,
                              mojo::PendingReceiver<Interface> receiver) {

chrome/browser/chrome_content_browser_client.h

@@ -387,8 +387,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
                                 mojo::GenericPendingReceiver receiver) override;
   void RegisterBrowserInterfaceBindersForFrame(
       content::RenderFrameHost* render_frame_host,
-      service_manager::BinderMapWithContext<content::RenderFrameHost*>* map)
-      override;
+      mojo::BinderMapWithContext<content::RenderFrameHost*>* map) override;
   bool BindAssociatedReceiverFromFrame(
       content::RenderFrameHost* render_frame_host,
       const std::string& interface_name,

chrome/browser/chrome_content_browser_client_receiver_bindings.cc

@@ -206,7 +206,7 @@ void ChromeContentBrowserClient::BindMediaServiceReceiver(
 
 void ChromeContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
     content::RenderFrameHost* render_frame_host,
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>* map) {
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* map) {
   chrome::internal::PopulateChromeFrameBinders(map);
   chrome::internal::PopulateChromeWebUIFrameBinders(map);
 

chrome/browser/extensions/chrome_extensions_browser_client.cc

@@ -323,8 +323,7 @@ ChromeExtensionsBrowserClient::GetExtensionSystemFactory() {
 }
 
 void ChromeExtensionsBrowserClient::RegisterBrowserInterfaceBindersForFrame(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>*
-        binder_map,
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* binder_map,
     content::RenderFrameHost* render_frame_host,
     const Extension* extension) const {
   PopulateExtensionFrameBinders(binder_map, render_frame_host, extension);

chrome/browser/extensions/chrome_extensions_browser_client.h

@@ -104,8 +104,7 @@ class ChromeExtensionsBrowserClient : public ExtensionsBrowserClient {
   bool IsLoggedInAsPublicAccount() override;
   ExtensionSystemProvider* GetExtensionSystemFactory() override;
   void RegisterBrowserInterfaceBindersForFrame(
-      service_manager::BinderMapWithContext<content::RenderFrameHost*>*
-          binder_map,
+      mojo::BinderMapWithContext<content::RenderFrameHost*>* binder_map,
       content::RenderFrameHost* render_frame_host,
       const Extension* extension) const override;
   std::unique_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate(

chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc

@@ -131,8 +131,7 @@ void ConnectToCameraAppHelper(
 }  // namespace
 
 void PopulateChromeFrameBindersForExtension(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>*
-        binder_map,
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* binder_map,
     content::RenderFrameHost* render_frame_host,
     const Extension* extension) {
   DCHECK(extension);

chrome/browser/extensions/chrome_extensions_browser_interface_binders.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSIONS_BROWSER_INTERFACE_BINDERS_H_
 #define CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSIONS_BROWSER_INTERFACE_BINDERS_H_
 
-#include "services/service_manager/public/cpp/binder_map.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 
 namespace content {
 class RenderFrameHost;
@@ -16,8 +16,7 @@ namespace extensions {
 class Extension;
 
 void PopulateChromeFrameBindersForExtension(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>*
-        binder_map,
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* binder_map,
     content::RenderFrameHost* render_frame_host,
     const Extension* extension);
 

chrome/test/base/mojo_web_ui_browser_test.cc

@@ -20,9 +20,9 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
-#include "services/service_manager/public/cpp/binder_map.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
@@ -68,8 +68,7 @@ class MojoWebUIBrowserTest::WebUITestContentBrowserClient
 
   void RegisterBrowserInterfaceBindersForFrame(
       content::RenderFrameHost* render_frame_host,
-      service_manager::BinderMapWithContext<content::RenderFrameHost*>* map)
-      override {
+      mojo::BinderMapWithContext<content::RenderFrameHost*>* map) override {
     ChromeContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
         render_frame_host, map);
     map->Add<web_ui_test::mojom::TestRunner>(

chrome/test/data/webui/mojo/mojo_web_ui_controller_browsertest.cc

@@ -26,7 +26,7 @@
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/no_renderer_crashes_assertion.h"
 #include "content/public/test/test_utils.h"
-#include "services/service_manager/public/cpp/binder_map.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"
@@ -182,8 +182,7 @@ class MojoWebUIControllerBrowserTest : public InProcessBrowserTest {
 
     void RegisterBrowserInterfaceBindersForFrame(
         content::RenderFrameHost* render_frame_host,
-        service_manager::BinderMapWithContext<content::RenderFrameHost*>* map)
-        override {
+        mojo::BinderMapWithContext<content::RenderFrameHost*>* map) override {
       ChromeContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
           render_frame_host, map);
       chrome::internal::RegisterWebUIControllerInterfaceBinder<

chromecast/browser/cast_browser_interface_binders.cc

@@ -43,8 +43,7 @@ void BindApplicationMediaCapabilities(
 
 void PopulateCastFrameBinders(
     content::RenderFrameHost* render_frame_host,
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>*
-        binder_map) {
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* binder_map) {
   binder_map->Add<network_hints::mojom::NetworkHintsHandler>(
       base::BindRepeating(&BindNetworkHintsHandler));
   binder_map->Add<mojom::ApplicationMediaCapabilities>(

chromecast/browser/cast_browser_interface_binders.h

@@ -5,7 +5,7 @@
 #ifndef CHROMECAST_BROWSER_CAST_BROWSER_INTERFACE_BINDERS_H_
 #define CHROMECAST_BROWSER_CAST_BROWSER_INTERFACE_BINDERS_H_
 
-#include "services/service_manager/public/cpp/binder_map.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 
 namespace content {
 class RenderFrameHost;
@@ -16,8 +16,7 @@ namespace shell {
 
 void PopulateCastFrameBinders(
     content::RenderFrameHost* render_frame_host,
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>*
-        binder_map);
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* binder_map);
 
 }  // namespace shell
 }  // namespace chromecast

chromecast/browser/cast_content_browser_client.h

@@ -204,8 +204,7 @@ class CastContentBrowserClient
                                 mojo::GenericPendingReceiver receiver) override;
   void RegisterBrowserInterfaceBindersForFrame(
       content::RenderFrameHost* render_frame_host,
-      service_manager::BinderMapWithContext<content::RenderFrameHost*>* map)
-      override;
+      mojo::BinderMapWithContext<content::RenderFrameHost*>* map) override;
   mojo::Remote<::media::mojom::MediaService> RunSecondaryMediaService()
       override;
   void RunServiceInstance(

chromecast/browser/cast_content_browser_client_receiver_bindings.cc

@@ -25,8 +25,8 @@
 #include "components/cdm/browser/media_drm_storage_impl.h"
 #include "content/public/browser/render_process_host.h"
 #include "media/mojo/buildflags.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
-#include "services/service_manager/public/cpp/binder_map.h"
 #include "url/origin.h"
 
 #if BUILDFLAG(ENABLE_CAST_RENDERER)
@@ -139,7 +139,7 @@ void CastContentBrowserClient::BindMediaServiceReceiver(
 
 void CastContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
     content::RenderFrameHost* render_frame_host,
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>* map) {
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* map) {
   PopulateCastFrameBinders(render_frame_host, map);
 }
 

chromecast/browser/extensions/cast_extensions_browser_client.cc

@@ -205,8 +205,7 @@ CastExtensionsBrowserClient::GetExtensionSystemFactory() {
 }
 
 void CastExtensionsBrowserClient::RegisterBrowserInterfaceBindersForFrame(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>*
-        binder_map,
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* binder_map,
     content::RenderFrameHost* render_frame_host,
     const Extension* extension) const {
   PopulateExtensionFrameBinders(binder_map, render_frame_host, extension);

chromecast/browser/extensions/cast_extensions_browser_client.h

@@ -95,8 +95,7 @@ class CastExtensionsBrowserClient : public ExtensionsBrowserClient {
   bool IsLoggedInAsPublicAccount() override;
   ExtensionSystemProvider* GetExtensionSystemFactory() override;
   void RegisterBrowserInterfaceBindersForFrame(
-      service_manager::BinderMapWithContext<content::RenderFrameHost*>*
-          binder_map,
+      mojo::BinderMapWithContext<content::RenderFrameHost*>* binder_map,
       content::RenderFrameHost* render_frame_host,
       const Extension* extension) const override;
   std::unique_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate(

components/performance_manager/embedder/performance_manager_registry.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "services/service_manager/public/cpp/binder_map.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 
 namespace content {
@@ -82,8 +82,7 @@ class PerformanceManagerRegistry {
   // FrameNode in the graph. Typically wired up via
   // ContentBrowserClient::RegisterBrowserInterfaceBindersForFrame.
   virtual void ExposeInterfacesToRenderFrame(
-      service_manager::BinderMapWithContext<content::RenderFrameHost*>*
-          map) = 0;
+      mojo::BinderMapWithContext<content::RenderFrameHost*>* map) = 0;
 
   // Must be invoked prior to destroying the object. Schedules deletion of
   // PageNodes and ProcessNodes retained by this registry, even if the

components/performance_manager/performance_manager_registry_impl.cc

@@ -121,7 +121,7 @@ void PerformanceManagerRegistryImpl::
 }
 
 void PerformanceManagerRegistryImpl::ExposeInterfacesToRenderFrame(
-    service_manager::BinderMapWithContext<content::RenderFrameHost*>* map) {
+    mojo::BinderMapWithContext<content::RenderFrameHost*>* map) {
   map->Add<performance_manager::mojom::DocumentCoordinationUnit>(
       base::BindRepeating(&BindDocumentCoordinationUnit));
 }

components/performance_manager/performance_manager_registry_impl.h

@@ -61,8 +61,7 @@ class PerformanceManagerRegistryImpl
       service_manager::BinderRegistry* registry,
       content::RenderProcessHost* render_process_host) override;
   void ExposeInterfacesToRenderFrame(
-      service_manager::BinderMapWithContext<content::RenderFrameHost*>* map)
-      override;
+      mojo::BinderMapWithContext<content::RenderFrameHost*>* map) override;
   void TearDown() override;
 
   // PerformanceManagerTabHelper::DestructionObserver:

components/performance_manager/test_support/performance_manager_browsertest_harness.cc

@@ -9,7 +9,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_content_browser_client.h"
-#include "services/service_manager/public/cpp/binder_map.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 
 namespace performance_manager {
@@ -59,12 +59,12 @@ void PerformanceManagerBrowserTestHarness::CreatedBrowserMainParts(
   // Expose interfaces to RenderFrame.
   content::ShellContentBrowserClient::Get()
       ->set_register_browser_interface_binders_for_frame_callback(
-          base::BindRepeating([](content::RenderFrameHost* render_frame_host,
-                                 service_manager::BinderMapWithContext<
-                                     content::RenderFrameHost*>* map) {
-            PerformanceManagerRegistry::GetInstance()
-                ->ExposeInterfacesToRenderFrame(map);
-          }));
+          base::BindRepeating(
+              [](content::RenderFrameHost* render_frame_host,
+                 mojo::BinderMapWithContext<content::RenderFrameHost*>* map) {
+                PerformanceManagerRegistry::GetInstance()
+                    ->ExposeInterfacesToRenderFrame(map);
+              }));
 }
 
 content::Shell* PerformanceManagerBrowserTestHarness::CreateShell() {