Add a Javascript wrapper around ServiceRegistry and expose it to WebUI.

content/browser/webui/web_ui_mojo_browsertest.cc

Index: content/browser/webui/web_ui_mojo_browsertest.cc
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index 6261316ab115d4cd2d9da02de1f60c54341da51a..ad93ed182583a846c81b66a5168559e5684e6282 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -59,10 +59,10 @@ bool GetResource(const std::string& id,
 
 class BrowserTargetImpl : public BrowserTarget {
  public:
-  BrowserTargetImpl(mojo::ScopedMessagePipeHandle handle,
+  BrowserTargetImpl(mojo::InterfaceRequest<BrowserTarget> request,
                     base::RunLoop* run_loop)
       : run_loop_(run_loop) {
-    renderer_.Bind(handle.Pass());
+    renderer_.Bind(request.PassMessagePipe());

[darin (slow to review), 2014/06/28 21:10:38]

It is kind of awkward to be connecting an InterfaceRequest<BrowserTarget> to a
InterfacePtr<RendererTarget>. This use of PassMessagePipe() loses type
information, which makes this code potentially a bit fragile. I wonder if there
is a way to change BrowserTargetImpl to instead receive a RendererTargetPtr or
if BrowserTargetImpl should instead be an InterfaceImpl<BrowserTarget>? The
latter seems right given how ServiceRegistry works.

[Sam McNally, 2014/06/30 01:26:14]

Done.

     renderer_.set_client(this);
   }
 
@@ -83,9 +83,9 @@ class BrowserTargetImpl : public BrowserTarget {
 
 class PingBrowserTargetImpl : public BrowserTargetImpl {
  public:
-  PingBrowserTargetImpl(mojo::ScopedMessagePipeHandle handle,
+  PingBrowserTargetImpl(mojo::InterfaceRequest<BrowserTarget> request,
                         base::RunLoop* run_loop)
-      : BrowserTargetImpl(handle.Pass(), run_loop) {
+      : BrowserTargetImpl(request.Pass(), run_loop) {
     renderer_->Ping();
   }
 
@@ -133,14 +133,13 @@ class PingTestWebUIController : public TestWebUIController {
 
   // WebUIController overrides:
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE {
-    render_view_host->GetMainFrame()->GetServiceRegistry()->AddService(
-        "webui_controller",
-        base::Bind(&PingTestWebUIController::CreateHandler,
-                   base::Unretained(this)));
+    render_view_host->GetMainFrame()->GetServiceRegistry()->
+        AddService<BrowserTarget>(base::Bind(
+            &PingTestWebUIController::CreateHandler, base::Unretained(this)));
   }
 
-  void CreateHandler(mojo::ScopedMessagePipeHandle handle) {
-    browser_target_.reset(new PingBrowserTargetImpl(handle.Pass(), run_loop_));
+  void CreateHandler(mojo::InterfaceRequest<BrowserTarget> request) {
+    browser_target_.reset(new PingBrowserTargetImpl(request.Pass(), run_loop_));
   }
 
  private: