Eliminate MojoApplicationHost

content/browser/service_worker/embedded_worker_test_helper.cc

Index: content/browser/service_worker/embedded_worker_test_helper.cc
diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc
index 6e22d4c4eca93228cd85e9686107d6cf24707e93..5696c6712b60f3866bec4421fc71b17515d082c4 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.cc
+++ b/content/browser/service_worker/embedded_worker_test_helper.cc
@@ -100,14 +100,20 @@ EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper(
                                     NewMessagePortMessageFilter());
 
   // Setup process level mojo service registry pair.
-  std::unique_ptr<ServiceRegistryImpl> host_service_registry(
-      new ServiceRegistryImpl);
-  render_process_service_registry_.ServiceRegistry::AddService(
+  render_process_interface_registry_.reset(
+      new shell::InterfaceRegistry(nullptr));
+  render_process_interface_registry_->AddInterface(
       base::Bind(&MockEmbeddedWorkerSetup::Create, weak_factory_.GetWeakPtr()));
-  shell::mojom::InterfaceProviderPtr services;
-  render_process_service_registry_.Bind(
-      host_service_registry->TakeRemoteRequest());
-  render_process_host_->SetServiceRegistry(std::move(host_service_registry));
+  shell::mojom::InterfaceProviderPtr interfaces;
+  render_process_interface_registry_->Bind(mojo::GetProxy(&interfaces));
+
+  std::unique_ptr<shell::InterfaceProvider> host_remote_interfaces(
+      new shell::InterfaceProvider);
+  host_remote_interfaces->Bind(std::move(interfaces));
+  std::unique_ptr<shell::InterfaceRegistry> host_registry(
+      new shell::InterfaceRegistry(nullptr));
+  render_process_host_->SetInterfaceRegistry(std::move(host_registry));
+  render_process_host_->SetRemoteInterfaces(std::move(host_remote_interfaces));
 }
 
 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() {