Mojo: Remove InterfaceProvider.

Review URL: https://codereview.chromium.org/358743002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280569 0039d316-1c4b-4281-b951-d872f2087c98

content/app/BUILD.gn

@@ -54,7 +54,7 @@ source_set("app") {
   } else {
     deps += [
       "//mojo/environment:chromium",
-      "//mojo/public/interfaces/interface_provider",
+      "//mojo/public/interfaces/service_provider",
       "//mojo/service_manager",
       "//mojo/system",
     ]

content/browser/BUILD.gn

@@ -92,7 +92,7 @@ source_set("browser") {
       "//cc",
       "//cc:cc_surfaces",
       "//mojo/public/cpp/bindings",
-      "//mojo/public/interfaces/interface_provider",
+      "//mojo/public/interfaces/service_provider",
       "//mojo/public/js/bindings",
       "//net:http_server",
       "//third_party/icu",

content/browser/frame_host/render_frame_host_impl.cc

@@ -167,8 +167,8 @@ RenderFrameHostImpl::RenderFrameHostImpl(
 
   if (GetProcess()->GetServiceRegistry()) {
     RenderFrameSetupPtr setup;
-    GetProcess()->GetServiceRegistry()->GetRemoteInterface(&setup);
-    mojo::IInterfaceProviderPtr service_provider;
+    GetProcess()->GetServiceRegistry()->ConnectToRemoteService(&setup);
+    mojo::ServiceProviderPtr service_provider;
     setup->GetServiceProviderForFrame(routing_id_,
                                       mojo::Get(&service_provider));
     service_registry_.BindRemoteServiceProvider(

content/child/BUILD.gn

@@ -18,7 +18,7 @@ source_set("child") {
     "//base",
     "//components/tracing",
     "//mojo/environment:chromium",
-    "//mojo/public/interfaces/interface_provider",
+    "//mojo/public/interfaces/service_provider",
     "//skia",
     "//third_party/icu",
     "//ui/base",

content/common/BUILD.gn

@@ -56,7 +56,7 @@ source_set("common") {
       "//gpu/command_buffer/client:gles2_implementation",
       "//gpu/command_buffer/service",
       "//gpu/ipc",
-      "//mojo/public/interfaces/interface_provider",
+      "//mojo/public/interfaces/service_provider",
       "//ui/gl",
       "//webkit/browser:storage",
       "//webkit/common",

content/common/mojo/service_registry_impl.cc

@@ -29,7 +29,7 @@ void ServiceRegistryImpl::BindRemoteServiceProvider(
   bound_ = true;
   mojo::BindToPipe(this, handle.Pass());
   while (!pending_connects_.empty()) {
-    client()->GetInterface(
+    client()->ConnectToService(
         mojo::String::From(pending_connects_.front().first),
         mojo::ScopedMessagePipeHandle(pending_connects_.front().second));
     pending_connects_.pop();
@@ -52,18 +52,18 @@ void ServiceRegistryImpl::RemoveService(const std::string& service_name) {
   service_factories_.erase(service_name);
 }
 
-void ServiceRegistryImpl::GetRemoteInterface(
+void ServiceRegistryImpl::ConnectToRemoteService(
     const base::StringPiece& service_name,
     mojo::ScopedMessagePipeHandle handle) {
   if (!bound_) {
     pending_connects_.push(
         std::make_pair(service_name.as_string(), handle.release()));
     return;
   }
-  client()->GetInterface(mojo::String::From(service_name), handle.Pass());
+  client()->ConnectToService(mojo::String::From(service_name), handle.Pass());
 }
 
-void ServiceRegistryImpl::GetInterface(
+void ServiceRegistryImpl::ConnectToService(
     const mojo::String& name,
     mojo::ScopedMessagePipeHandle client_handle) {
   std::map<std::string,

content/common/mojo/service_registry_impl.h

@@ -14,21 +14,20 @@
 #include "content/public/common/service_registry.h"
 #include "mojo/public/cpp/bindings/interface_impl.h"
 #include "mojo/public/cpp/system/core.h"
-#include "mojo/public/interfaces/interface_provider/interface_provider.mojom.h"
+#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 
 namespace content {
 
-class ServiceRegistryImpl
-    : public ServiceRegistry,
-      public mojo::InterfaceImpl<mojo::IInterfaceProvider> {
+class ServiceRegistryImpl : public ServiceRegistry,
+                            public mojo::InterfaceImpl<mojo::ServiceProvider> {
  public:
   ServiceRegistryImpl();
   explicit ServiceRegistryImpl(mojo::ScopedMessagePipeHandle handle);
   virtual ~ServiceRegistryImpl();
 
   // Binds to a remote ServiceProvider. This will expose added services to the
   // remote ServiceProvider with the corresponding handle and enable
-  // GetInterface to provide access to services exposed by the remote
+  // ConnectToRemoteService to provide access to services exposed by the remote
   // ServiceProvider.
   void BindRemoteServiceProvider(mojo::ScopedMessagePipeHandle handle);
 
@@ -38,13 +37,13 @@ class ServiceRegistryImpl
       const base::Callback<void(mojo::ScopedMessagePipeHandle)> service_factory)
       OVERRIDE;
   virtual void RemoveService(const std::string& service_name) OVERRIDE;
-  virtual void GetRemoteInterface(
+  virtual void ConnectToRemoteService(
       const base::StringPiece& service_name,
       mojo::ScopedMessagePipeHandle handle) OVERRIDE;
 
  private:
-  // mojo::InterfaceImpl<mojo::IInterfaceProvider> overrides.
-  virtual void GetInterface(
+  // mojo::InterfaceImpl<mojo::ServiceProvider> overrides.
+  virtual void ConnectToService(
       const mojo::String& name,
       mojo::ScopedMessagePipeHandle client_handle) OVERRIDE;
   virtual void OnConnectionError() OVERRIDE;

content/common/render_frame_setup.mojom

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import "../../mojo/public/interfaces/interface_provider/interface_provider.mojom"
+import "../../mojo/public/interfaces/service_provider/service_provider.mojom"
 
 module content {
 
 interface RenderFrameSetup {
   GetServiceProviderForFrame(int32 frame_routing_id,
-                             mojo.IInterfaceProvider& service_provider);
+                             mojo.ServiceProvider& service_provider);
 };
 
 }

content/content_app.gypi

@@ -67,8 +67,8 @@
     }, {  # OS!="ios"
       'dependencies': [
         '../mojo/mojo.gyp:mojo_environment_chromium',
-        '../mojo/mojo.gyp:mojo_interface_provider_bindings',
         '../mojo/mojo.gyp:mojo_service_manager',
+        '../mojo/mojo.gyp:mojo_service_provider_bindings',
         '../mojo/mojo.gyp:mojo_system_impl',
      ],
     }],

content/content_browser.gypi

@@ -1568,8 +1568,8 @@
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
         '../mojo/mojo.gyp:mojo_cpp_bindings',
-        '../mojo/mojo.gyp:mojo_interface_provider_bindings',
         '../mojo/mojo.gyp:mojo_js_bindings',
+        '../mojo/mojo.gyp:mojo_service_provider_bindings',
         '../net/net.gyp:http_server',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../ui/surface/surface.gyp:surface',

content/content_child.gypi

@@ -7,7 +7,7 @@
     '../base/base.gyp:base',
     '../components/tracing.gyp:tracing',
     '../mojo/mojo.gyp:mojo_environment_chromium',
-    '../mojo/mojo.gyp:mojo_interface_provider_bindings',
+    '../mojo/mojo.gyp:mojo_service_provider_bindings',
     '../skia/skia.gyp:skia',
     '../ui/base/ui_base.gyp:ui_base',
     '../ui/gfx/gfx.gyp:gfx',

content/content_common.gypi

@@ -546,8 +546,8 @@
         '../media/media.gyp:shared_memory_support',
         '../mojo/mojo.gyp:mojo_cpp_bindings',
         '../mojo/mojo.gyp:mojo_environment_chromium',
+        '../mojo/mojo.gyp:mojo_service_provider_bindings',
         '../mojo/mojo.gyp:mojo_system_impl',
-        '../mojo/mojo.gyp:mojo_interface_provider_bindings',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/gl/gl.gyp:gl',
         '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',

content/content_common_mojo_bindings.gypi

@@ -10,7 +10,7 @@
       'dependencies': [
         '../mojo/mojo.gyp:mojo_cpp_bindings',
         '../mojo/mojo.gyp:mojo_environment_chromium',
-        '../mojo/mojo.gyp:mojo_interface_provider_bindings'
+        '../mojo/mojo.gyp:mojo_service_provider_bindings'
       ],
       'sources': [
         'common/render_frame_setup.mojom',
@@ -19,7 +19,7 @@
       'export_dependent_settings': [
         '../mojo/mojo.gyp:mojo_cpp_bindings',
         '../mojo/mojo.gyp:mojo_environment_chromium',
-        '../mojo/mojo.gyp:mojo_interface_provider_bindings'
+        '../mojo/mojo.gyp:mojo_service_provider_bindings'
       ],
     },
   ],

content/content_gpu.gypi

@@ -5,7 +5,7 @@
 {
   'dependencies': [
     '../base/base.gyp:base',
-    '../mojo/mojo.gyp:mojo_interface_provider_bindings',
+    '../mojo/mojo.gyp:mojo_service_provider_bindings',
     '../skia/skia.gyp:skia',
     '../ui/gl/gl.gyp:gl',
   ],

content/content_plugin.gypi

@@ -6,7 +6,7 @@
   'conditions': [
     ['enable_plugins==1 and OS!="linux"', {
       'dependencies': [
-        '../mojo/mojo.gyp:mojo_interface_provider_bindings',
+        '../mojo/mojo.gyp:mojo_service_provider_bindings',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../third_party/npapi/npapi.gyp:npapi',

content/content_ppapi_plugin.gypi

@@ -7,7 +7,7 @@
     ['enable_plugins==1', {
       'dependencies': [
         '../base/base.gyp:base',
-        '../mojo/mojo.gyp:mojo_interface_provider_bindings',
+        '../mojo/mojo.gyp:mojo_service_provider_bindings',
         '../ppapi/ppapi_internal.gyp:ppapi_ipc',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/gfx/gfx.gyp:gfx',

content/content_renderer.gypi

@@ -13,8 +13,8 @@
     '../jingle/jingle.gyp:jingle_glue',
     '../media/media.gyp:media',
     '../mojo/mojo.gyp:mojo_environment_chromium',
-    '../mojo/mojo.gyp:mojo_interface_provider_bindings',
     '../mojo/mojo.gyp:mojo_js_bindings_lib',
+    '../mojo/mojo.gyp:mojo_service_provider_bindings',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
     '../third_party/WebKit/public/blink.gyp:blink',

content/content_utility.gypi

@@ -6,7 +6,7 @@
   'dependencies': [
     '../base/base.gyp:base',
     '../courgette/courgette.gyp:courgette_lib',
-    '../mojo/mojo.gyp:mojo_interface_provider_bindings',
+    '../mojo/mojo.gyp:mojo_service_provider_bindings',
   ],
   'sources': [
     'public/utility/content_utility_client.cc',

content/content_worker.gypi

@@ -5,7 +5,7 @@
 {
   'dependencies': [
     '../base/base.gyp:base',
-    '../mojo/mojo.gyp:mojo_interface_provider_bindings',
+    '../mojo/mojo.gyp:mojo_service_provider_bindings',
     '../skia/skia.gyp:skia',
     '../third_party/WebKit/public/blink.gyp:blink',
   ],

content/gpu/BUILD.gn

@@ -27,7 +27,7 @@ source_set("gpu") {
   deps = [
     "//base",
     "//content:export",
-    "//mojo/public/interfaces/interface_provider",
+    "//mojo/public/interfaces/service_provider",
     "//skia",
     "//ui/gl",
   ]

content/plugin/BUILD.gn

@@ -29,7 +29,7 @@ if (enable_plugins && !is_linux) {
 
     deps = [
       "//content:export",
-      "//mojo/public/interfaces/interface_provider",
+      "//mojo/public/interfaces/service_provider",
       "//skia",
       "//third_party/npapi",
       "//third_party/WebKit/public:blink",

content/ppapi_plugin/BUILD.gn

@@ -21,7 +21,7 @@ source_set("ppapi_plugin") {
   deps = [
     "//base",
     "//content:export",
-    "//mojo/public/interfaces/interface_provider",
+    "//mojo/public/interfaces/service_provider",
     "//ppapi:ppapi_ipc",
     "//skia",
     "//third_party/icu",

content/public/common/service_registry.h

@@ -19,13 +19,14 @@ namespace content {
 
 // A ServiceRegistry exposes local services that have been added using
 // AddService to a paired remote ServiceRegistry and provides local access to
-// services exposed by the remote ServiceRegistry through GetInterface.
+// services exposed by the remote ServiceRegistry through
+// ConnectToRemoteService.
 class CONTENT_EXPORT ServiceRegistry {
  public:
   virtual ~ServiceRegistry() {}
 
   // Make the service created by |service_factory| available to the remote
-  // InterfaceProvider. In response to each request for a service,
+  // ServiceProvider. In response to each request for a service,
   // |service_factory| will be run with an InterfaceRequest<Interface>
   // representing that request.
   template <typename Interface>
@@ -48,15 +49,15 @@ class CONTENT_EXPORT ServiceRegistry {
   }
   virtual void RemoveService(const std::string& service_name) = 0;
 
-  // Connect to an interface provided by the remote interface provider.
+  // Connect to an interface provided by the remote service provider.
   template <typename Interface>
-  void GetRemoteInterface(mojo::InterfacePtr<Interface>* ptr) {
+  void ConnectToRemoteService(mojo::InterfacePtr<Interface>* ptr) {
     mojo::MessagePipe pipe;
     ptr->Bind(pipe.handle0.Pass());
-    GetRemoteInterface(Interface::Name_, pipe.handle1.Pass());
+    ConnectToRemoteService(Interface::Name_, pipe.handle1.Pass());
   }
-  virtual void GetRemoteInterface(const base::StringPiece& name,
-                                  mojo::ScopedMessagePipeHandle handle) = 0;
+  virtual void ConnectToRemoteService(const base::StringPiece& name,
+                                      mojo::ScopedMessagePipeHandle handle) = 0;
 
  private:
   template <typename Interface>

content/renderer/BUILD.gn

@@ -29,7 +29,7 @@ source_set("renderer") {
     "//gin",
     "//mojo/environment:chromium",
     "//mojo/public/js/bindings",
-    "//mojo/public/interfaces/interface_provider",
+    "//mojo/public/interfaces/service_provider",
     "//net",
     "//skia",
     "//third_party/icu",

content/renderer/render_thread_impl.cc

@@ -269,7 +269,7 @@ class RenderFrameSetupImpl : public mojo::InterfaceImpl<RenderFrameSetup> {
  public:
   virtual void GetServiceProviderForFrame(
       int32_t frame_routing_id,
-      mojo::InterfaceRequest<mojo::IInterfaceProvider> request) OVERRIDE {
+      mojo::InterfaceRequest<mojo::ServiceProvider> request) OVERRIDE {
     RenderFrameImpl* frame = RenderFrameImpl::FromRoutingID(frame_routing_id);
     // We can receive a GetServiceProviderForFrame message for a frame not yet
     // created due to a race between the message and a ViewMsg_New IPC that

content/renderer/web_ui_mojo.cc

@@ -89,7 +89,7 @@ void WebUIMojo::OnDidFinishDocumentLoad() {
   SetHandleOnContextState(pipe.handle0.Pass());
   RenderFrame::FromWebFrame(render_view()->GetWebView()->mainFrame())->
       GetServiceRegistry()->
-          GetRemoteInterface("webui_controller", pipe.handle1.Pass());
+          ConnectToRemoteService("webui_controller", pipe.handle1.Pass());
 }
 
 void WebUIMojo::SetHandleOnContextState(mojo::ScopedMessagePipeHandle handle) {

content/utility/BUILD.gn

@@ -17,7 +17,7 @@ source_set("utility") {
     "//base",
     "//content:export",
     "//courgette:courgette_lib",
-    "//mojo/public/interfaces/interface_provider",
+    "//mojo/public/interfaces/service_provider",
     "//third_party/WebKit/public:blink_headers",
   ]
 }

content/worker/BUILD.gn

@@ -24,7 +24,7 @@ source_set("worker") {
 
   deps = [
     "//base",
-    "//mojo/public/interfaces/interface_provider",
+    "//mojo/public/interfaces/service_provider",
     "//skia",
     "//third_party/WebKit/public:blink",
   ]

mojo/mojo_public.gypi

@@ -379,21 +379,6 @@
         '..',
       ],
     },
-    {
-      # GN version: //mojo/public/interfaces/interface_provider:interface_provider
-      'target_name': 'mojo_interface_provider_bindings',
-      'type': 'static_library',
-      'sources': [
-        'public/interfaces/interface_provider/interface_provider.mojom',
-      ],
-      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
-      'dependencies': [
-        'mojo_cpp_bindings',
-      ],
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-    },
     {
       # GN version: //mojo/public/interfaces/service_provider:service_provider
       'target_name': 'mojo_service_provider_bindings',