Eliminate MojoApplicationHost

content/browser/battery_status/battery_monitor_integration_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 <utility>
 
 #include "base/callback_list.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
-#include "content/public/common/service_registry.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "device/battery/battery_monitor.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "services/shell/public/cpp/interface_registry.h"
 
 // These tests run against a dummy implementation of the BatteryMonitor service.
 // That is, they verify that the service implementation is correctly exposed to
 // the renderer, whatever the implementation is.
 
 namespace content {
 
 namespace {
 
 typedef base::CallbackList<void(const device::BatteryStatus&)>
@@ skipping 48 matching lines @@
 
   std::unique_ptr<BatteryUpdateSubscription> subscription_;
   mojo::StrongBinding<BatteryMonitor> binding_;
   QueryNextStatusCallback callback_;
 };
 
 // Overrides the default service implementation with the test implementation
 // declared above.
 class TestContentBrowserClient : public ContentBrowserClient {
  public:
-  void RegisterRenderProcessMojoServices(
-      ServiceRegistry* registry,
+  void ExposeInterfacesToRenderer(
+      shell::InterfaceRegistry* registry,
       RenderProcessHost* render_process_host) override {
-    registry->AddService(base::Bind(&FakeBatteryMonitor::Create));
+    registry->AddInterface(base::Bind(&FakeBatteryMonitor::Create));
   }
 
   void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                       int child_process_id) override {
     // Necessary for passing kIsolateSitesForTesting flag to the renderer.
     ShellContentBrowserClient::Get()->AppendExtraCommandLineSwitches(
         command_line, child_process_id);
   }
 
 #if defined(OS_ANDROID)
@@ skipping 73 matching lines @@
   TestNavigationObserver same_tab_observer2(shell()->web_contents(), 1);
   status.level = 0.6;
   UpdateBattery(status);
   same_tab_observer2.Wait();
   EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
 }
 
 }  //  namespace
 
 }  //  namespace content