[ServiceWorker] Associate interfaces.

content/browser/service_worker/embedded_worker_test_helper.h

Index: content/browser/service_worker/embedded_worker_test_helper.h
diff --git a/content/browser/service_worker/embedded_worker_test_helper.h b/content/browser/service_worker/embedded_worker_test_helper.h
index c52c6925f015e2b49cb6f438d1412c0ed0eb09ea..b81eaad7c0f8039f149537a46b90d1634ae75f68 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.h
+++ b/content/browser/service_worker/embedded_worker_test_helper.h
@@ -22,7 +22,7 @@
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_test_sink.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/associated_binding.h"
 #include "net/http/http_response_info.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
@@ -80,7 +80,7 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
     ~MockEmbeddedWorkerInstanceClient() override;
 
     static void Bind(const base::WeakPtr<EmbeddedWorkerTestHelper>& helper,
-                     mojom::EmbeddedWorkerInstanceClientRequest request);
+                     mojo::ScopedInterfaceEndpointHandle handle);
 
    protected:
     // Implementation of mojo interfaces.
@@ -90,7 +90,7 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
     void StopWorker(const StopWorkerCallback& callback) override;
 
     base::WeakPtr<EmbeddedWorkerTestHelper> helper_;
-    mojo::Binding<mojom::EmbeddedWorkerInstanceClient> binding_;
+    mojo::AssociatedBinding<mojom::EmbeddedWorkerInstanceClient> binding_;
 
     base::Optional<int> embedded_worker_id_;
 
@@ -246,8 +246,7 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
 
   MessagePortMessageFilter* NewMessagePortMessageFilter();
 
-  std::unique_ptr<service_manager::InterfaceRegistry> CreateInterfaceRegistry(
-      MockRenderProcessHost* rph);
+  void OverrideRemoteAssociatedInterfaces(MockRenderProcessHost* rph);
 
   std::unique_ptr<TestBrowserContext> browser_context_;
   std::unique_ptr<MockRenderProcessHost> render_process_host_;
@@ -266,11 +265,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   int mock_render_process_id_;
   int new_mock_render_process_id_;
 
-  std::unique_ptr<service_manager::InterfaceRegistry>
-      render_process_interface_registry_;
-  std::unique_ptr<service_manager::InterfaceRegistry>
-      new_render_process_interface_registry_;
-
   std::map<int, int64_t> embedded_worker_id_service_worker_version_id_map_;
   std::map<int /* thread_id */, int /* embedded_worker_id */>
       thread_id_embedded_worker_id_map_;