Convert EmbeddedWorker to InterfaceRegistry/Provider.

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 <string>
 #include <utility>
 
@@ skipping 47 matching lines @@
     : public mojom::EmbeddedWorkerSetup {
  public:
   static void Create(
       const base::WeakPtr<EmbeddedWorkerTestHelper>& helper,
       mojo::InterfaceRequest<mojom::EmbeddedWorkerSetup> request) {
     new MockEmbeddedWorkerSetup(helper, std::move(request));
   }
 
   void ExchangeInterfaceProviders(
       int32_t thread_id,
-      shell::mojom::InterfaceProviderRequest services,
-      shell::mojom::InterfaceProviderPtr exposed_services) override {
+      shell::mojom::InterfaceProviderRequest request,
+      shell::mojom::InterfaceProviderPtr remote_interfaces) override {
     if (!helper_)
       return;
-    helper_->OnSetupMojoStub(thread_id, std::move(services),
-                             std::move(exposed_services));
+    helper_->OnSetupMojoStub(thread_id, std::move(request),
+                             std::move(remote_interfaces));
   }
 
  private:
   MockEmbeddedWorkerSetup(
       const base::WeakPtr<EmbeddedWorkerTestHelper>& helper,
       mojo::InterfaceRequest<mojom::EmbeddedWorkerSetup> request)
       : helper_(helper), binding_(this, std::move(request)) {}
 
   base::WeakPtr<EmbeddedWorkerTestHelper> helper_;
   mojo::StrongBinding<mojom::EmbeddedWorkerSetup> binding_;
@@ skipping 118 matching lines @@
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_InstallEvent, OnInstallEventStub)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_FetchEvent, OnFetchEventStub)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_PushEvent, OnPushEventStub)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   // Record all messages directed to inner script context.
   inner_sink_.OnMessageReceived(message);
   return handled;
 }
 
-void EmbeddedWorkerTestHelper::OnSetupMojo(ServiceRegistry* service_registry) {}
+void EmbeddedWorkerTestHelper::OnSetupMojo(
+    shell::InterfaceRegistry* interface_registry) {}
 
 void EmbeddedWorkerTestHelper::OnActivateEvent(int embedded_worker_id,
                                                int request_id) {
   SimulateSend(new ServiceWorkerHostMsg_ActivateEventFinished(
       embedded_worker_id, request_id,
       blink::WebServiceWorkerEventResultCompleted));
 }
 
 void EmbeddedWorkerTestHelper::OnExtendableMessageEvent(int embedded_worker_id,
                                                         int request_id) {
@@ skipping 183 matching lines @@
     int request_id,
     const PushEventPayload& payload) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&EmbeddedWorkerTestHelper::OnPushEvent,
                             weak_factory_.GetWeakPtr(),
                             current_embedded_worker_id_, request_id, payload));
 }
 
 void EmbeddedWorkerTestHelper::OnSetupMojoStub(
     int thread_id,
-    shell::mojom::InterfaceProviderRequest services,
-    shell::mojom::InterfaceProviderPtr exposed_services) {
-  std::unique_ptr<ServiceRegistryImpl> new_registry(new ServiceRegistryImpl);
-  new_registry->Bind(std::move(services));
-  // TODO(beng): this shouldn't be necessary once we adjust this API to look
-  //             more like the one we've created for Frame.
-  //             http://crbug.com/621187
-  mojo::FuseInterface(new_registry->TakeRemoteRequest(),
-                      exposed_services.PassInterface());
-  OnSetupMojo(new_registry.get());
-  thread_id_service_registry_map_.add(thread_id, std::move(new_registry));
+    shell::mojom::InterfaceProviderRequest request,
+    shell::mojom::InterfaceProviderPtr remote_interfaces) {
+  std::unique_ptr<shell::InterfaceRegistry> local(
+      new shell::InterfaceRegistry(nullptr));
+  local->Bind(std::move(request));
+
+  std::unique_ptr<shell::InterfaceProvider> remote(
+      new shell::InterfaceProvider);
+  remote->Bind(std::move(remote_interfaces));
+
+  OnSetupMojo(local.get());
+  InterfaceRegistryAndProvider pair(std::move(local), std::move(remote));
+  thread_id_service_registry_map_[thread_id] = std::move(pair);
 }
 
 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() {
   DCHECK(context());
   return context()->embedded_worker_registry();
 }
 
 MessagePortMessageFilter*
 EmbeddedWorkerTestHelper::NewMessagePortMessageFilter() {
   scoped_refptr<MessagePortMessageFilter> filter(
       new MockMessagePortMessageFilter);
   message_port_message_filters_.push_back(filter);
   return filter.get();
 }
 
 }  // namespace content