Add frame-specific InterfaceProviderSpec.

content/browser/service_worker/embedded_worker_instance.cc

 // Copyright 2013 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_instance.h"
 
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/macros.h"
@@ skipping 444 matching lines @@
     return;
   }
   DCHECK(status_ == EmbeddedWorkerStatus::STOPPED);
 
   DCHECK(!params->pause_after_download || !params->is_installed);
   DCHECK_NE(kInvalidServiceWorkerVersionId, params->service_worker_version_id);
   step_time_ = base::TimeTicks::Now();
   status_ = EmbeddedWorkerStatus::STARTING;
   starting_phase_ = ALLOCATING_PROCESS;
   network_accessed_for_script_ = false;
-  interface_registry_ = base::MakeUnique<service_manager::InterfaceRegistry>(
-      service_manager::Identity(), service_manager::InterfaceProviderSpec());
+  interface_registry_ = base::MakeUnique<service_manager::InterfaceRegistry>();
   remote_interfaces_.reset(new service_manager::InterfaceProvider);
   for (auto& observer : listener_list_)
     observer.OnStarting();
 
   params->embedded_worker_id = embedded_worker_id_;
   params->worker_devtools_agent_route_id = MSG_ROUTING_NONE;
   params->wait_for_debugger = false;
   params->settings.v8_cache_options = GetV8CacheOptions();
 
   mojom::EmbeddedWorkerInstanceClientRequest request;
@@ skipping 139 matching lines @@
 
 ServiceWorkerStatusCode EmbeddedWorkerInstance::SendMojoStartWorker(
     std::unique_ptr<EmbeddedWorkerStartParams> params) {
   if (!context_)
     return SERVICE_WORKER_ERROR_ABORT;
   service_manager::mojom::InterfaceProviderPtr remote_interfaces;
   service_manager::mojom::InterfaceProviderRequest request =
       mojo::GetProxy(&remote_interfaces);
   remote_interfaces_->Bind(std::move(remote_interfaces));
   service_manager::mojom::InterfaceProviderPtr exposed_interfaces;
-  interface_registry_->Bind(mojo::GetProxy(&exposed_interfaces),
-                            service_manager::Identity(),
-                            service_manager::InterfaceProviderSpec());
+  interface_registry_->Bind(
+      mojo::GetProxy(&exposed_interfaces), service_manager::Identity(),
+      service_manager::InterfaceProviderSpec(), service_manager::Identity(),
+      service_manager::InterfaceProviderSpec());
   client_->StartWorker(*params, std::move(exposed_interfaces),
                        std::move(request));
   registry_->BindWorkerToProcess(process_id(), embedded_worker_id());
   TRACE_EVENT_ASYNC_STEP_PAST1("ServiceWorker", "EmbeddedWorkerInstance::Start",
                                this, "SendStartWorker", "Status", "mojo");
   OnStartWorkerMessageSent();
   return SERVICE_WORKER_OK;
 }
 
 void EmbeddedWorkerInstance::OnStartWorkerMessageSent() {
@@ skipping 90 matching lines @@
 
   thread_id_ = thread_id;
   for (auto& observer : listener_list_)
     observer.OnThreadStarted();
 
   // This code is for BackgroundSync and FetchEvent, which have been already
   // mojofied. Interfaces are exchanged at StartWorker when mojo for the service
   // worker is enabled, so this code isn't necessary when the flag is enabled.
   if (!ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) {
     service_manager::mojom::InterfaceProviderPtr exposed_interfaces;
-    interface_registry_->Bind(mojo::GetProxy(&exposed_interfaces),
-                              service_manager::Identity(),
-                              service_manager::InterfaceProviderSpec());
+    interface_registry_->Bind(
+        mojo::GetProxy(&exposed_interfaces), service_manager::Identity(),
+        service_manager::InterfaceProviderSpec(), service_manager::Identity(),
+        service_manager::InterfaceProviderSpec());
     service_manager::mojom::InterfaceProviderPtr remote_interfaces;
     service_manager::mojom::InterfaceProviderRequest request =
         mojo::GetProxy(&remote_interfaces);
     remote_interfaces_->Bind(std::move(remote_interfaces));
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(SetupMojoOnUIThread, process_id(), thread_id_,
                    base::Passed(&request),
                    base::Passed(exposed_interfaces.PassInterface())));
   }
@@ skipping 218 matching lines @@
     case SCRIPT_READ_FINISHED:
       return "Script read finished";
     case STARTING_PHASE_MAX_VALUE:
       NOTREACHED();
   }
   NOTREACHED() << phase;
   return std::string();
 }
 
 }  // namespace content