[ServiceWorker] Add EmbeddedWorkerInstanceHost Interface.

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/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 10 matching lines @@
 // static
 void EmbeddedWorkerInstanceClientImpl::Create(
     EmbeddedWorkerDispatcher* dispatcher,
     mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request) {
   // This won't be leaked because the lifetime will be managed internally.
   new EmbeddedWorkerInstanceClientImpl(dispatcher, std::move(request));
 }
 
 void EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted() {
   DCHECK(embedded_worker_id_);
-  DCHECK(stop_callback_);
   TRACE_EVENT0("ServiceWorker",
                "EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted");
-  // TODO(falken): The signals to the browser should be in the order:
-  // (1) WorkerStopped (via stop_callback_)
-  // (2) ProviderDestroyed (via UnregisterWorker destroying
-  //     WebEmbeddedWorkerImpl)
-  // But this ordering is currently not guaranteed since the Mojo pipes are
-  // different. https://crbug.com/676526
-  stop_callback_.Run();
-  stop_callback_.Reset();
   dispatcher_->UnregisterWorker(embedded_worker_id_.value());
   embedded_worker_id_.reset();
   wrapper_ = nullptr;
 }
 
 void EmbeddedWorkerInstanceClientImpl::StartWorker(
     const EmbeddedWorkerStartParams& params,
-    mojom::ServiceWorkerEventDispatcherRequest dispatcher_request) {
+    mojom::ServiceWorkerEventDispatcherRequest dispatcher_request,
+    mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host) {
   DCHECK(ChildThreadImpl::current());
   DCHECK(!wrapper_);
   DCHECK(!embedded_worker_id_);
   TRACE_EVENT0("ServiceWorker",
                "EmbeddedWorkerInstanceClientImpl::StartWorker");
   embedded_worker_id_ = params.embedded_worker_id;
 
   std::unique_ptr<EmbeddedWorkerDispatcher::WorkerWrapper> wrapper =
       dispatcher_->StartWorkerContext(
           params,
           base::MakeUnique<ServiceWorkerContextClient>(
               params.embedded_worker_id, params.service_worker_version_id,
-              params.scope, params.script_url,
-              std::move(dispatcher_request), std::move(temporal_self_)));
+              params.scope, params.script_url, std::move(dispatcher_request),
+              std::move(instance_host), std::move(temporal_self_)));
   wrapper_ = wrapper.get();
   dispatcher_->RegisterWorker(params.embedded_worker_id, std::move(wrapper));
 }
 
-void EmbeddedWorkerInstanceClientImpl::StopWorker(
-    const StopWorkerCallback& callback) {
+void EmbeddedWorkerInstanceClientImpl::StopWorker() {
   // StopWorker must be called after StartWorker is called.
   DCHECK(ChildThreadImpl::current());
   DCHECK(wrapper_);
   DCHECK(embedded_worker_id_);
-  DCHECK(!stop_callback_);
 
   TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerInstanceClientImpl::StopWorker");
-  stop_callback_ = callback;
   dispatcher_->RecordStopWorkerTimer(embedded_worker_id_.value());
   wrapper_->worker()->terminateWorkerContext();
 }
 
 void EmbeddedWorkerInstanceClientImpl::ResumeAfterDownload() {
   DCHECK(wrapper_);
   DCHECK(wrapper_->worker());
   wrapper_->worker()->resumeAfterDownload();
 }
 
@@ skipping 18 matching lines @@
 }
 
 EmbeddedWorkerInstanceClientImpl::~EmbeddedWorkerInstanceClientImpl() {}
 
 void EmbeddedWorkerInstanceClientImpl::OnError() {
   // Removes myself if it's owned by myself.
   temporal_self_.reset();
 }
 
 }  // namespace content