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

content/browser/frame_host/render_frame_host_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/render_frame_host_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 3913 matching lines @@
     return;
 
   SimulateBeforeUnloadAck();
 }
 
 #if defined(OS_ANDROID)
 
 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);
 };
 
 base::android::ScopedJavaLocalRef<jobject>
 RenderFrameHostImpl::GetJavaRenderFrameHost() {
   RenderFrameHostAndroid* render_frame_host_android =
       static_cast<RenderFrameHostAndroid*>(
           GetUserData(kRenderFrameHostAndroidKey));
@@ skipping 22 matching lines @@
 }
 
 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame(
     const std::string& interface_name,
     mojo::ScopedMessagePipeHandle pipe) {
   GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe));
 }
 #endif
 
 }  // namespace content