ServiceWorker: Mojofication of EWInstance::StopWorker

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 287 matching lines @@
   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;
   return SERVICE_WORKER_OK;
 }
 
 void EmbeddedWorkerRegistry::RemoveWorker(int process_id,
                                           int embedded_worker_id) {
   DCHECK(base::ContainsKey(worker_map_, embedded_worker_id));
+  DetachWorker(process_id, embedded_worker_id);
   worker_map_.erase(embedded_worker_id);
+}
+
+void EmbeddedWorkerRegistry::DetachWorker(int process_id,
+                                          int embedded_worker_id) {
+  DCHECK(base::ContainsKey(worker_map_, embedded_worker_id));
   if (!base::ContainsKey(worker_process_map_, process_id))
     return;
   worker_process_map_[process_id].erase(embedded_worker_id);
   if (worker_process_map_[process_id].empty())
     worker_process_map_.erase(process_id);
 }
 
 EmbeddedWorkerInstance* EmbeddedWorkerRegistry::GetWorkerForMessage(
     int process_id,
     int embedded_worker_id) {
   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