Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

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"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "content/browser/webui/web_ui_controller_factory_registry.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h"
 #include "grit/content_resources.h"
 #include "mojo/common/test/test_utils.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
-#include "mojo/public/cpp/bindings/remote_ptr.h"
 #include "mojo/public/js/bindings/constants.h"
 
 namespace content {
 namespace {
 
 bool got_message = false;
 
 // The bindings for the page are generated from a .mojom file. This code looks
 // up the generated file from disk and returns it.
 bool GetResource(const std::string& id,
                  const WebUIDataSource::GotDataCallback& callback) {
   // These are handled by the WebUIDataSource that AddMojoDataSource() creates.
   if (id == mojo::kCodecModuleName ||
       id == mojo::kConnectionModuleName ||
       id == mojo::kConnectorModuleName ||
       id == mojo::kRouterModuleName)
     return false;
 
   std::string contents;
   CHECK(base::ReadFileToString(mojo::test::GetFilePathForJSResource(id),
                                &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 mojo::BrowserTarget {
+class BrowserTargetImpl : public BrowserTarget {
  public:
-  BrowserTargetImpl(mojo::ScopedRendererTargetHandle& handle,
+  BrowserTargetImpl(mojo::ScopedMessagePipeHandle handle,
                     base::RunLoop* run_loop)
-      : client_(handle.Pass(), this),
+      : renderer_(mojo::MakeProxy<RendererTarget>(handle.Pass())),
         run_loop_(run_loop) {
+    renderer_->SetClient(this);
   }
 
   virtual ~BrowserTargetImpl() {}
 
-  // mojo::BrowserTarget overrides:
+  // BrowserTarget overrides:
   virtual void PingResponse() OVERRIDE {
     NOTREACHED();
   }
 
  protected:
-  mojo::RemotePtr<mojo::RendererTarget> client_;
+  RendererTargetPtr renderer_;
   base::RunLoop* run_loop_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserTargetImpl);
 };
 
 class PingBrowserTargetImpl : public BrowserTargetImpl {
  public:
-  PingBrowserTargetImpl(mojo::ScopedRendererTargetHandle handle,
+  PingBrowserTargetImpl(mojo::ScopedMessagePipeHandle handle,
                         base::RunLoop* run_loop)
-      : BrowserTargetImpl(handle, run_loop) {
-    client_->Ping();
+      : BrowserTargetImpl(handle.Pass(), run_loop) {
+    renderer_->Ping();
   }
 
   virtual ~PingBrowserTargetImpl() {}
 
-  // mojo::BrowserTarget overrides:
+  // BrowserTarget overrides:
   // Quit the RunLoop when called.
   virtual void PingResponse() OVERRIDE {
     got_message = true;
     run_loop_->Quit();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PingBrowserTargetImpl);
 };
 
@@ skipping 20 matching lines @@
 // TestWebUIController that additionally creates the ping test BrowserTarget
 // implementation at the right time.
 class PingTestWebUIController : public TestWebUIController {
  public:
    PingTestWebUIController(WebUI* web_ui, base::RunLoop* run_loop)
        : TestWebUIController(web_ui, run_loop) {
    }
 
   // WebUIController overrides:
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE {
-    mojo::InterfacePipe<mojo::BrowserTarget, mojo::RendererTarget> pipe;
-    browser_target_.reset(new PingBrowserTargetImpl(
-        pipe.handle_to_peer.Pass(), run_loop_));
-    render_view_host->SetWebUIHandle(
-        mojo::ScopedMessagePipeHandle(pipe.handle_to_self.release()));
+    mojo::MessagePipe pipe;
+    browser_target_.reset(
+        new PingBrowserTargetImpl(pipe.handle0.Pass(), run_loop_));
+    render_view_host->SetWebUIHandle(pipe.handle1.Pass());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PingTestWebUIController);
 };
 
 // WebUIControllerFactory that creates TestWebUIController.
 class TestWebUIControllerFactory : public WebUIControllerFactory {
  public:
   TestWebUIControllerFactory() : run_loop_(NULL) {}
@@ skipping 64 matching lines @@
   factory()->set_run_loop(&run_loop);
   GURL test_url(test_server()->GetURL("files/web_ui_mojo.html?ping"));
   NavigateToURL(shell(), test_url);
   // RunLoop is quit when message received from page.
   run_loop.Run();
   EXPECT_TRUE(got_message);
 }
 
 }  // namespace
 }  // namespace content