Eliminate MojoApplicationHost

content/shell/browser/layout_test/layout_test_content_browser_client.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 "content/shell/browser/layout_test/layout_test_content_browser_client.h"
 
 #include "base/memory/ptr_util.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/service_registry.h"
 #include "content/shell/browser/layout_test/blink_test_controller.h"
 #include "content/shell/browser/layout_test/layout_test_bluetooth_fake_adapter_setter_impl.h"
 #include "content/shell/browser/layout_test/layout_test_browser_context.h"
 #include "content/shell/browser/layout_test/layout_test_browser_main_parts.h"
 #include "content/shell/browser/layout_test/layout_test_message_filter.h"
 #include "content/shell/browser/layout_test/layout_test_notification_manager.h"
 #include "content/shell/browser/layout_test/layout_test_resource_dispatcher_host_delegate.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/shell/common/layout_test/layout_test_switches.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
+#include "services/shell/public/cpp/interface_registry.h"
 
 namespace content {
 namespace {
 
 LayoutTestContentBrowserClient* g_layout_test_browser_client;
 
 }  // namespace
 
 LayoutTestContentBrowserClient::LayoutTestContentBrowserClient() {
   DCHECK(!g_layout_test_browser_client);
@@ skipping 26 matching lines @@
   ShellContentBrowserClient::RenderProcessWillLaunch(host);
 
   StoragePartition* partition =
       BrowserContext::GetDefaultStoragePartition(browser_context());
   host->AddFilter(new LayoutTestMessageFilter(
       host->GetID(),
       partition->GetDatabaseTracker(),
       partition->GetQuotaManager(),
       partition->GetURLRequestContext()));
 
-  host->GetServiceRegistry()->AddService(base::Bind(
+  host->GetInterfaceRegistry()->AddInterface(base::Bind(
       &LayoutTestBluetoothFakeAdapterSetterImpl::Create, host->GetID()));
 
   host->Send(new ShellViewMsg_SetWebKitSourceDir(GetWebKitRootDirFilePath()));
 }
 
 void LayoutTestContentBrowserClient::OverrideWebkitPrefs(
     RenderViewHost* render_view_host,
     WebPreferences* prefs) {
   BlinkTestController::Get()->OverrideWebkitPrefs(prefs);
 }
@@ skipping 37 matching lines @@
   set_browser_main_parts(new LayoutTestBrowserMainParts(parameters));
   return shell_browser_main_parts();
 }
 
 PlatformNotificationService*
 LayoutTestContentBrowserClient::GetPlatformNotificationService() {
   return layout_test_notification_manager_.get();
 }
 
 }  // namespace content