Revert of Enable overriding interface binders for any services running in current process.

services/service_manager/public/cpp/binder_registry.h

Index: services/service_manager/public/cpp/binder_registry.h
diff --git a/services/service_manager/public/cpp/binder_registry.h b/services/service_manager/public/cpp/binder_registry.h
index b4d18911aaac9191b09786ae5bce97e8b367d9e2..9e16687920f8eb437962bef7c796c131f81ce52b 100644
--- a/services/service_manager/public/cpp/binder_registry.h
+++ b/services/service_manager/public/cpp/binder_registry.h
@@ -17,13 +17,13 @@
 
 namespace service_manager {
 
+class InterfaceBinder;
 struct BindSourceInfo;
 
 class BinderRegistry {
  public:
-  using Binder = base::Callback<void(const BindSourceInfo&,
-                                     const std::string&,
-                                     mojo::ScopedMessagePipeHandle)>;
+  using Binder = base::Callback<void(const std::string&,
+                                mojo::ScopedMessagePipeHandle)>;
 
   BinderRegistry();
   ~BinderRegistry();
@@ -41,11 +41,6 @@
   void AddInterface(
       const std::string& interface_name,
       const base::Callback<void(mojo::ScopedMessagePipeHandle)>& callback,
-      const scoped_refptr<base::SingleThreadTaskRunner>& task_runner = nullptr);
-
-  void AddInterface(
-      const std::string& interface_name,
-      const Binder& binder_callback,
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner = nullptr);
 
   // Removes the specified interface from the registry. This has no effect on