Revert "Revert of ServiceWorker: Implement StartWorker by using mojo (patchset #1 id:1 of https://c…

content/browser/service_worker/embedded_worker_registry.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_registry.h"
 
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/render_widget_helper.h"
@@ skipping 231 matching lines @@
     : context_(context),
       next_embedded_worker_id_(initial_embedded_worker_id),
       initial_embedded_worker_id_(initial_embedded_worker_id) {
 }
 
 EmbeddedWorkerRegistry::~EmbeddedWorkerRegistry() {
   Shutdown();
 }
 
 ServiceWorkerStatusCode EmbeddedWorkerRegistry::SendStartWorker(
-    std::unique_ptr<EmbeddedWorkerMsg_StartWorker_Params> params,
+    std::unique_ptr<EmbeddedWorkerStartParams> params,
     int process_id) {
   if (!context_)
     return SERVICE_WORKER_ERROR_ABORT;
 
   // The ServiceWorkerDispatcherHost is supposed to be created when the process
   // is created, and keep an entry in process_sender_map_ for its whole
   // lifetime.
   DCHECK(base::ContainsKey(process_sender_map_, process_id));
 
   int embedded_worker_id = params->embedded_worker_id;
   DCHECK(GetWorker(embedded_worker_id));
   DCHECK_EQ(GetWorker(embedded_worker_id)->process_id(), process_id);
   DCHECK(
       !base::ContainsKey(worker_process_map_, process_id) ||
       !base::ContainsKey(worker_process_map_[process_id], embedded_worker_id));
 
   ServiceWorkerStatusCode status =
       Send(process_id, new EmbeddedWorkerMsg_StartWorker(*params));
   if (status == SERVICE_WORKER_OK)
-    worker_process_map_[process_id].insert(embedded_worker_id);
+    BindWorkerToProcess(process_id, embedded_worker_id);
   return status;
 }
 
+void EmbeddedWorkerRegistry::BindWorkerToProcess(int process_id,
+                                                 int embedded_worker_id) {
+  // The ServiceWorkerDispatcherHost is supposed to be created when the process
+  // is created, and keep an entry in process_sender_map_ for its whole
+  // lifetime.
+  DCHECK(base::ContainsKey(process_sender_map_, process_id));
+  DCHECK(GetWorker(embedded_worker_id));
+  DCHECK_EQ(GetWorker(embedded_worker_id)->process_id(), process_id);
+  DCHECK(
+      !base::ContainsKey(worker_process_map_, process_id) ||
+      !base::ContainsKey(worker_process_map_[process_id], embedded_worker_id));
+
+  worker_process_map_[process_id].insert(embedded_worker_id);
+}
+
 ServiceWorkerStatusCode EmbeddedWorkerRegistry::Send(
     int process_id, IPC::Message* message_ptr) {
   std::unique_ptr<IPC::Message> message(message_ptr);
   if (!context_)
     return SERVICE_WORKER_ERROR_ABORT;
   ProcessToSenderMap::iterator found = process_sender_map_.find(process_id);
   if (found == process_sender_map_.end())
     return SERVICE_WORKER_ERROR_PROCESS_NOT_FOUND;
   if (!found->second->Send(message.release()))
     return SERVICE_WORKER_ERROR_IPC_FAILED;
@@ skipping 17 matching lines @@
   EmbeddedWorkerInstance* worker = GetWorker(embedded_worker_id);
   if (!worker || worker->process_id() != process_id) {
     UMA_HISTOGRAM_BOOLEAN("ServiceWorker.WorkerForMessageFound", false);
     return nullptr;
   }
   UMA_HISTOGRAM_BOOLEAN("ServiceWorker.WorkerForMessageFound", true);
   return worker;
 }
 
 }  // namespace content