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 8abb3b8d0c32fa12228ca205366e8ddd6e9b682e..86d80f681b0eee1216f72957a1a55d51ff9945f8 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -58,10 +58,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());
     renderer_.set_client(this);
   }
 
@@ -82,9 +82,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,14 @@ class PingTestWebUIController : public TestWebUIController {
   // WebUIController overrides:
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE {
     render_view_host->GetProcess()->ActivateMojo();
-    render_view_host->GetMainFrame()->GetServiceRegistry()->AddService(
-        "webui_controller",
-        base::Bind(&PingTestWebUIController::CreateHandler,
-                   base::Unretained(this)));
+    render_view_host->GetMainFrame()
+        ->GetServiceRegistry()

[darin (slow to review), 2014/06/21 04:44:15]

ditto

[Sam McNally, 2014/06/24 08:45:01]

Done.

+        ->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: