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

content/browser/webui/web_ui_mojo_browsertest.cc

 // Copyright 2014 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 <limits>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 41 matching lines @@
                                &contents,
                                std::string::npos)) << id;
   base::RefCountedString* ref_contents = new base::RefCountedString;
   ref_contents->data() = contents;
   callback.Run(ref_contents);
   return true;
 }
 
 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);
   }
 
   virtual ~BrowserTargetImpl() {}
 
   // BrowserTarget overrides:
   virtual void PingResponse() OVERRIDE {
     NOTREACHED();
   }
 
  protected:
   RendererTargetPtr renderer_;
   base::RunLoop* run_loop_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserTargetImpl);
 };
 
 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();
   }
 
   virtual ~PingBrowserTargetImpl() {}
 
   // BrowserTarget overrides:
   // Quit the RunLoop when called.
   virtual void PingResponse() OVERRIDE {
     got_message = true;
     run_loop_->Quit();
@@ skipping 27 matching lines @@
 // implementation at the right time.
 class PingTestWebUIController : public TestWebUIController {
  public:
    PingTestWebUIController(WebUI* web_ui, base::RunLoop* run_loop)
        : TestWebUIController(web_ui, run_loop) {
    }
    virtual ~PingTestWebUIController() {}
 
   // 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:
   DISALLOW_COPY_AND_ASSIGN(PingTestWebUIController);
 };
 
 // WebUIControllerFactory that creates TestWebUIController.
 class TestWebUIControllerFactory : public WebUIControllerFactory {
  public:
   TestWebUIControllerFactory() : run_loop_(NULL) {}
@@ skipping 77 matching lines @@
   NavigateToURL(other_shell, test_url);
   // RunLoop is quit when message received from page.
   other_run_loop.Run();
   EXPECT_TRUE(got_message);
   EXPECT_EQ(shell()->web_contents()->GetRenderProcessHost(),
             other_shell->web_contents()->GetRenderProcessHost());
 }
 
 }  // namespace
 }  // namespace content