Reland 1: 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 00a063090fe276e6c6e5553ac90f11404485e585..0cce9d98224058476fc0d4c495e92e55f1f0ebc0 100644
--- a/services/service_manager/public/cpp/binder_registry.h
+++ b/services/service_manager/public/cpp/binder_registry.h
@@ -18,13 +18,13 @@
 
 namespace service_manager {
 
-class InterfaceBinder;
 struct BindSourceInfo;
 
 class SERVICE_MANAGER_PUBLIC_CPP_EXPORT BinderRegistry {
  public:
-  using Binder = base::Callback<void(const std::string&,
-                                mojo::ScopedMessagePipeHandle)>;
+  using Binder = base::Callback<void(const BindSourceInfo&,
+                                     const std::string&,
+                                     mojo::ScopedMessagePipeHandle)>;
 
   BinderRegistry();
   ~BinderRegistry();
@@ -44,6 +44,11 @@ class SERVICE_MANAGER_PUBLIC_CPP_EXPORT BinderRegistry {
       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
   // bindings already completed.
   template <typename Interface>