Convert content ConnectionFilter to OnBindInterface

content/browser/service_worker/embedded_worker_test_helper.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/browser/service_worker/embedded_worker_test_helper.h"
 
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 97 matching lines @@
 void EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient::
     AddMessageToConsole(blink::WebConsoleMessage::Level level,
                         const std::string& message) {
   // TODO(shimazu): Pass these arguments to the test helper when a test is
   // necessary to check them individually.
 }
 
 // static
 void EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient::Bind(
     const base::WeakPtr<EmbeddedWorkerTestHelper>& helper,
-    mojom::EmbeddedWorkerInstanceClientRequest request) {
+    mojo::ScopedMessagePipeHandle request_handle) {
+  mojom::EmbeddedWorkerInstanceClientRequest request =
+      mojo::MakeRequest<mojom::EmbeddedWorkerInstanceClient>(
+          std::move(request_handle));
   std::vector<std::unique_ptr<MockEmbeddedWorkerInstanceClient>>* clients =
       helper->mock_instance_clients();
   size_t next_client_index = helper->mock_instance_clients_next_index_;
 
   ASSERT_GE(clients->size(), next_client_index);
   if (clients->size() == next_client_index) {
     clients->push_back(
         base::MakeUnique<MockEmbeddedWorkerInstanceClient>(helper));
   }
 
@@ skipping 154 matching lines @@
   wrapper_->process_manager()->SetNewProcessIdForTest(new_render_process_id());
 
   scoped_refptr<ServiceWorkerDispatcherHost> dispatcher_host(
       new MockServiceWorkerDispatcherHost(
           mock_render_process_id_, browser_context_->GetResourceContext(),
           this));
   wrapper_->context()->AddDispatcherHost(mock_render_process_id_,
                                          dispatcher_host.get());
   dispatcher_hosts_[mock_render_process_id_] = std::move(dispatcher_host);
 
-  // Setup process level interface registry.
-  render_process_interface_registry_ =
-      CreateInterfaceRegistry(render_process_host_.get());
-  new_render_process_interface_registry_ =
-      CreateInterfaceRegistry(new_render_process_host_.get());
+  render_process_host_->OverrideBinderForTesting(
+      mojom::EmbeddedWorkerInstanceClient::Name_,
+      base::Bind(&MockEmbeddedWorkerInstanceClient::Bind, AsWeakPtr()));
+  new_render_process_host_->OverrideBinderForTesting(
+      mojom::EmbeddedWorkerInstanceClient::Name_,
+      base::Bind(&MockEmbeddedWorkerInstanceClient::Bind, AsWeakPtr()));
 }
 
 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() {
   if (wrapper_.get())
     wrapper_->Shutdown();
 }
 
 void EmbeddedWorkerTestHelper::SimulateAddProcessToPattern(const GURL& pattern,
                                                            int process_id) {
   if (!context()->GetDispatcherHost(process_id)) {
@@ skipping 446 matching lines @@
       FROM_HERE,
       base::Bind(&EmbeddedWorkerTestHelper::OnPaymentRequestEvent, AsWeakPtr(),
                  base::Passed(std::move(app_request)), callback));
 }
 
 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() {
   DCHECK(context());
   return context()->embedded_worker_registry();
 }
 
-std::unique_ptr<service_manager::InterfaceRegistry>
-EmbeddedWorkerTestHelper::CreateInterfaceRegistry(MockRenderProcessHost* rph) {
-  auto registry =
-      base::MakeUnique<service_manager::InterfaceRegistry>(std::string());
-  registry->AddInterface(
-      base::Bind(&MockEmbeddedWorkerInstanceClient::Bind, AsWeakPtr()));
-
-  service_manager::mojom::InterfaceProviderPtr interfaces;
-  registry->Bind(mojo::MakeRequest(&interfaces), service_manager::Identity(),
-                 service_manager::InterfaceProviderSpec(),
-                 service_manager::Identity(),
-                 service_manager::InterfaceProviderSpec());
-
-  std::unique_ptr<service_manager::InterfaceProvider> remote_interfaces(
-      new service_manager::InterfaceProvider);
-  remote_interfaces->Bind(std::move(interfaces));
-  rph->SetRemoteInterfaces(std::move(remote_interfaces));
-  return registry;
-}
-
 }  // namespace content