ServiceWorker: Exchange InterfaceProviders when starting worker thread

content/renderer/service_worker/service_worker_context_client.cc

Index: content/renderer/service_worker/service_worker_context_client.cc
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
index f3907bd0e6ac1ab69c652ea6875c5bb6c83db55f..69e63eedfd44b52017d1b2d3bd990b65b0e64426 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -209,13 +209,15 @@ struct ServiceWorkerContextClient::WorkerContextData {
   // Pending callbacks for ClaimClients().
   ClaimClientsCallbacksMap claim_clients_callbacks;
 
-  // Pending callbacks for Background Sync Events
+  // Pending callbacks for Background Sync Events.
   SyncEventCallbacksMap sync_event_callbacks;
 
-  // Pending callbacks for Fetch Events
+  // Pending callbacks for Fetch Events.
   FetchEventCallbacksMap fetch_event_callbacks;
 
   service_manager::InterfaceRegistry interface_registry;
+  // This is not used when mojo for the service workers is enabled. At that
+  // time, remote interfaces are stored in EmbeddedWorkerInstanceClientImpl.
   service_manager::InterfaceProvider remote_interfaces;
 
   base::ThreadChecker thread_checker;
@@ -429,6 +431,12 @@ void ServiceWorkerContextClient::workerContextStarted(
   context_->interface_registry.AddInterface(
       base::Bind(&FetchEventDispatcherImpl::Create));
 
+  if (ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) {
+    DCHECK(embedded_worker_client_);
+    embedded_worker_client_->ExposeInterfacesToBrowser(
+        &context_->interface_registry);
+  }
+
   SetRegistrationInServiceWorkerGlobalScope(registration_info, version_attrs);
 
   Send(new EmbeddedWorkerHostMsg_WorkerThreadStarted(