ServiceWorker: Exchange InterfaceProviders when starting worker thread

content/renderer/service_worker/embedded_worker_instance_client_impl.cc

 // Copyright (c) 2016 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/renderer/service_worker/embedded_worker_instance_client_impl.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/scoped_child_process_reference.h"
@@ skipping 17 matching lines @@
   DCHECK(embedded_worker_id_);
   dispatcher_->UnregisterWorker(embedded_worker_id_.value());
   embedded_worker_id_.reset();
   stop_callback_.Run();
   TRACE_EVENT0("ServiceWorker",
                "EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted");
   stop_callback_.Reset();
 }
 
 void EmbeddedWorkerInstanceClientImpl::StartWorker(
-    mojom::EmbeddedWorkerStartWorkerParamsPtr params) {
+    mojom::EmbeddedWorkerStartWorkerParamsPtr params,
+    shell::mojom::InterfaceProviderPtr remote_interfaces) {
   TRACE_EVENT0("ServiceWorker",
                "EmbeddedWorkerInstanceClientImpl::StartWorker");
 
   embedded_worker_id_ = params->embedded_worker_id;
+  remote_interfaces_.Bind(std::move(remote_interfaces));
 
   std::unique_ptr<EmbeddedWorkerDispatcher::WorkerWrapper> wrapper(
       new EmbeddedWorkerDispatcher::WorkerWrapper(
           blink::WebEmbeddedWorker::create(
               new ServiceWorkerContextClient(
                   params->embedded_worker_id, params->service_worker_version_id,
                   params->scope, params->script_url,
                   params->worker_devtools_agent_route_id,
                   std::move(temporal_self_)),
               NULL),
@@ skipping 28 matching lines @@
   stop_callback_ = std::move(callback);
   dispatcher_->SetStopWorkerTimer(embedded_worker_id_.value());
   wrapper_->worker()->terminateWorkerContext();
 }
 
 EmbeddedWorkerInstanceClientImpl::EmbeddedWorkerInstanceClientImpl(
     EmbeddedWorkerDispatcher* dispatcher,
     mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request)
     : dispatcher_(dispatcher),
       binding_(this, std::move(request)),
-      temporal_self_(std::unique_ptr<EmbeddedWorkerInstanceClientImpl>(this)) {
-  binding_.set_connection_error_handler(base::Bind(
-      &EmbeddedWorkerInstanceClientImpl::OnError, base::Unretained(this)));
+      temporal_self_(std::unique_ptr<EmbeddedWorkerInstanceClientImpl>(this)),
+      main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
+      weak_factory(this) {
+  binding_.set_connection_error_handler(
+      base::Bind(&EmbeddedWorkerInstanceClientImpl::OnError, AsWeakPtr()));
 }
 
 EmbeddedWorkerInstanceClientImpl::~EmbeddedWorkerInstanceClientImpl() {}
 
 void EmbeddedWorkerInstanceClientImpl::OnError() {
   // Removes myself if it's owned by myself
   temporal_self_.reset();
 }
 
+base::WeakPtr<EmbeddedWorkerInstanceClientImpl>
+EmbeddedWorkerInstanceClientImpl::AsWeakPtr() {
+  return weak_factory.GetWeakPtr();
+}
+
 }  // namespace content