Support exposing Mojo services between render frames, render threads, and their respective hosts.

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 f883a45098cb08d4634e0c40f904f8aa70943d1e..4403b8e31dd61638e4e377836b02bd15d2c7eef7 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -24,6 +24,7 @@
 #include "content/common/frame_messages.h"
 #include "content/common/input_messages.h"
 #include "content/common/inter_process_time_ticks_converter.h"
+#include "content/common/render_frame_setup.mojom.h"
 #include "content/common/swapped_out_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
@@ -123,6 +124,34 @@ base::i18n::TextDirection WebTextDirectionToChromeTextDirection(
   }
 }
 
+class RenderFrameSetupImpl : public mojo::InterfaceImpl<RenderFrameSetup> {
+ public:
+  explicit RenderFrameSetupImpl(int process_id) : process_id_(process_id) {}
+
+  virtual void ConnectToInterfaceProvider(
+      int32_t view_routing_id,
+      mojo::InterfaceRequest<mojo::IInterfaceProvider>
+          interface_provider_request) OVERRIDE {
+    RenderFrameHostImpl* frame_host = static_cast<RenderFrameHostImpl*>(
+        RenderFrameHost::FromID(process_id_, view_routing_id));
+    if (!frame_host)
+      return;
+
+    frame_host->BindServiceRegistry(
+        interface_provider_request.PassMessagePipe());
+  }
+
+  virtual void OnConnectionError() OVERRIDE { delete this; }
+
+ private:
+  const int process_id_;
+};
+
+void CreateRenderFrameHostSetup(int process_id,
+                                mojo::ScopedMessagePipeHandle handle) {
+  mojo::BindToPipe(new RenderFrameSetupImpl(process_id), handle.Pass());
+}
+
 }  // namespace
 
 RenderFrameHost* RenderFrameHost::FromID(int render_process_id,
@@ -161,6 +190,11 @@ RenderFrameHostImpl::RenderFrameHostImpl(
   g_routing_id_frame_map.Get().insert(std::make_pair(
       RenderFrameHostID(GetProcess()->GetID(), routing_id_),
       this));
+
+  if (GetProcess()->GetServiceRegistry()) {
+    GetProcess()->GetServiceRegistry()->AddService<RenderFrameSetup>(
+        base::Bind(CreateRenderFrameHostSetup, GetProcess()->GetID()));
+  }
 }
 
 RenderFrameHostImpl::~RenderFrameHostImpl() {
@@ -241,6 +275,10 @@ RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() {
   return render_view_host_;
 }
 
+ServiceRegistry* RenderFrameHostImpl::GetServiceRegistry() {
+  return &service_registry_;
+}
+
 bool RenderFrameHostImpl::Send(IPC::Message* message) {
   if (IPC_MESSAGE_ID_CLASS(message->type()) == InputMsgStart) {
     return render_view_host_->input_router()->SendInput(
@@ -896,4 +934,9 @@ void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone(
       routing_id_, callback_context));
 }
 
+void RenderFrameHostImpl::BindServiceRegistry(
+    mojo::ScopedMessagePipeHandle shell_handle) {
+  service_registry_.Bind(shell_handle.Pass());
+}
+
 }  // namespace content