Rename ServiceProvider to InterfaceProvider.

content/common/mojo/service_registry_impl.h

Index: content/common/mojo/service_registry_impl.h
diff --git a/content/common/mojo/service_registry_impl.h b/content/common/mojo/service_registry_impl.h
index a51c67cfeed072ded9f685a3a1cca461666ecd67..ca8043aba7d21d9695b60461dea94a66c28d7080 100644
--- a/content/common/mojo/service_registry_impl.h
+++ b/content/common/mojo/service_registry_impl.h
@@ -16,13 +16,13 @@
 #include "content/public/common/service_registry.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/system/core.h"
-#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/interface_provider.mojom.h"
 
 namespace content {
 
 class CONTENT_EXPORT ServiceRegistryImpl
     : public ServiceRegistry,
-      public NON_EXPORTED_BASE(mojo::ServiceProvider) {
+      public NON_EXPORTED_BASE(mojo::InterfaceProvider) {
  public:
   using ServiceFactory = base::Callback<void(mojo::ScopedMessagePipeHandle)>;
 
@@ -30,13 +30,13 @@ class CONTENT_EXPORT ServiceRegistryImpl
   ~ServiceRegistryImpl() override;
 
   // Binds this ServiceProvider implementation to a message pipe endpoint.
-  void Bind(mojo::InterfaceRequest<mojo::ServiceProvider> request);
+  void Bind(mojo::InterfaceRequest<mojo::InterfaceProvider> request);
 
   // Binds to a remote ServiceProvider. This will expose added services to the
   // remote ServiceProvider with the corresponding handle and enable
   // ConnectToRemoteService to provide access to services exposed by the remote
   // ServiceProvider.
-  void BindRemoteServiceProvider(mojo::ServiceProviderPtr service_provider);
+  void BindRemoteServiceProvider(mojo::InterfaceProviderPtr service_provider);
 
   // Registers a local service factory to intercept ConnectToRemoteService
   // requests instead of actually connecting to the remote registry. Used only
@@ -56,14 +56,14 @@ class CONTENT_EXPORT ServiceRegistryImpl
   base::WeakPtr<ServiceRegistry> GetWeakPtr();
 
  private:
-  // mojo::ServiceProvider overrides.
-  void ConnectToService(const mojo::String& name,
-                        mojo::ScopedMessagePipeHandle client_handle) override;
+  // mojo::InterfaceProvider overrides.
+  void GetInterface(const mojo::String& name,
+                    mojo::ScopedMessagePipeHandle client_handle) override;
 
   void OnConnectionError();
 
-  mojo::Binding<mojo::ServiceProvider> binding_;
-  mojo::ServiceProviderPtr remote_provider_;
+  mojo::Binding<mojo::InterfaceProvider> binding_;
+  mojo::InterfaceProviderPtr remote_provider_;
 
   std::map<std::string, ServiceFactory> service_factories_;
   std::queue<std::pair<std::string, mojo::MessagePipeHandle> >