Revert of [mojo] Enable ServiceRegistryImpl to override remote services

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..5e4fd73fd917b8c4874f5965df9ca52bb5f1e4a4 100644
--- a/content/common/mojo/service_registry_impl.h
+++ b/content/common/mojo/service_registry_impl.h
@@ -24,8 +24,6 @@
     : public ServiceRegistry,
       public NON_EXPORTED_BASE(mojo::ServiceProvider) {
  public:
-  using ServiceFactory = base::Callback<void(mojo::ScopedMessagePipeHandle)>;
-
   ServiceRegistryImpl();
   ~ServiceRegistryImpl() override;
 
@@ -38,15 +36,10 @@
   // ServiceProvider.
   void BindRemoteServiceProvider(mojo::ServiceProviderPtr service_provider);
 
-  // Registers a local service factory to intercept ConnectToRemoteService
-  // requests instead of actually connecting to the remote registry. Used only
-  // for testing.
-  void AddServiceOverrideForTesting(const std::string& service_name,
-                                    const ServiceFactory& service_factory);
-
   // ServiceRegistry overrides.
   void AddService(const std::string& service_name,
-                  const ServiceFactory service_factory) override;
+                  const base::Callback<void(mojo::ScopedMessagePipeHandle)>
+                      service_factory) override;
   void RemoveService(const std::string& service_name) override;
   void ConnectToRemoteService(const base::StringPiece& service_name,
                               mojo::ScopedMessagePipeHandle handle) override;
@@ -65,11 +58,10 @@
   mojo::Binding<mojo::ServiceProvider> binding_;
   mojo::ServiceProviderPtr remote_provider_;
 
-  std::map<std::string, ServiceFactory> service_factories_;
+  std::map<std::string, base::Callback<void(mojo::ScopedMessagePipeHandle)> >
+      service_factories_;
   std::queue<std::pair<std::string, mojo::MessagePipeHandle> >
       pending_connects_;
-
-  std::map<std::string, ServiceFactory> service_overrides_;
 
   base::WeakPtrFactory<ServiceRegistry> weak_factory_;
 };