Remove mojo::InterfaceImpl from render_thread_impl and web_ui_mojo_browsertest.

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/files/file_path.h"
 #include "base/files/file_util.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_frame_host.h"
 #include "content/public/browser/render_process_host.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/service_registry.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/shell/browser/shell.h"
 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h"
 #include "third_party/mojo/src/mojo/edk/test/test_utils.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 #include "third_party/mojo/src/mojo/public/js/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.
@@ skipping 13 matching lines @@
   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::InterfaceImpl<BrowserTarget> {
+class BrowserTargetImpl : public BrowserTarget {
  public:
-  explicit BrowserTargetImpl(base::RunLoop* run_loop) : run_loop_(run_loop) {}
+  BrowserTargetImpl(base::RunLoop* run_loop,
+                    mojo::InterfaceRequest<BrowserTarget> request)
+      : run_loop_(run_loop), binding_(this, request.Pass()) {}
 
   ~BrowserTargetImpl() override {}
 
-  // mojo::InterfaceImpl<BrowserTarget> overrides:
+  // BrowserTarget overrides:
   void Start(const mojo::Closure& closure) override {
     closure.Run();
   }
   void Stop() override {
     got_message = true;
     run_loop_->Quit();
   }
 
  protected:
   base::RunLoop* run_loop_;
 
  private:
+  mojo::Binding<BrowserTarget> binding_;
   DISALLOW_COPY_AND_ASSIGN(BrowserTargetImpl);
 };
 
 // WebUIController that sets up mojo bindings.
 class TestWebUIController : public WebUIController {
  public:
    TestWebUIController(WebUI* web_ui, base::RunLoop* run_loop)
       : WebUIController(web_ui),
         run_loop_(run_loop) {
     content::WebUIDataSource* data_source =
@@ skipping 20 matching lines @@
    ~PingTestWebUIController() override {}
 
   // WebUIController overrides:
   void RenderViewCreated(RenderViewHost* render_view_host) override {
     render_view_host->GetMainFrame()->GetServiceRegistry()->
         AddService<BrowserTarget>(base::Bind(
             &PingTestWebUIController::CreateHandler, base::Unretained(this)));
   }
 
   void CreateHandler(mojo::InterfaceRequest<BrowserTarget> request) {
-    browser_target_.reset(mojo::WeakBindToRequest(
-        new BrowserTargetImpl(run_loop_), &request));
+    browser_target_.reset(new BrowserTargetImpl(run_loop_, request.Pass()));
   }
 
  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