Reland 1: Enable overriding interface binders for any services running in current process.

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index f0d7fd004abf05ef2bfb2ffd7cdd11e8569e723d..cd3a864d50d0e1a705539d3bfec517dfd39ce22b 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -3931,20 +3931,23 @@ void RenderFrameHostImpl::BeforeUnloadTimeout() {
 class RenderFrameHostImpl::JavaInterfaceProvider
     : public service_manager::mojom::InterfaceProvider {
  public:
+  using BindCallback =
+      base::Callback<void(const std::string&, mojo::ScopedMessagePipeHandle)>;
+
   JavaInterfaceProvider(
-      const service_manager::BinderRegistry::Binder& bind_callback,
+      const BindCallback& bind_callback,
       service_manager::mojom::InterfaceProviderRequest request)
       : bind_callback_(bind_callback), binding_(this, std::move(request)) {}
   ~JavaInterfaceProvider() override = default;
 
  private:
-  // service_manager::mojom::INterfaceProvider:
+  // service_manager::mojom::InterfaceProvider:
   void GetInterface(const std::string& interface_name,
                     mojo::ScopedMessagePipeHandle handle) override {
     bind_callback_.Run(interface_name, std::move(handle));
   }
 
-  service_manager::BinderRegistry::Binder bind_callback_;
+  const BindCallback bind_callback_;
   mojo::Binding<service_manager::mojom::InterfaceProvider> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(JavaInterfaceProvider);