Change RenderFrame to use InterfaceRegistry et al.

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 <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.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_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/browser_test_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 "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "services/shell/public/cpp/interface_registry.h"
 
 namespace content {
 namespace {
 
 base::FilePath GetFilePathForJSResource(const std::string& path) {
   std::string binding_path = "gen/" + path + ".js";
 #if defined(OS_WIN)
   base::ReplaceChars(binding_path, "//", "\\", &binding_path);
 #endif
   base::FilePath exe_dir;
@@ skipping 77 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) {
    }
    ~PingTestWebUIController() override {}
 
   // WebUIController overrides:
   void RenderViewCreated(RenderViewHost* render_view_host) override {
-    render_view_host->GetMainFrame()->GetServiceRegistry()->AddService(
+    render_view_host->GetMainFrame()->GetInterfaceRegistry()->AddInterface(
         base::Bind(&PingTestWebUIController::CreateHandler,
                    base::Unretained(this)));
   }
 
   void CreateHandler(mojo::InterfaceRequest<mojom::BrowserTarget> request) {
     browser_target_.reset(new BrowserTargetImpl(run_loop_, std::move(request)));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PingTestWebUIController);
@@ skipping 87 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