ServiceWorker: Implement StartWorker by using mojo

content/renderer/service_worker/embedded_worker_dispatcher.cc

Index: content/renderer/service_worker/embedded_worker_dispatcher.cc
diff --git a/content/renderer/service_worker/embedded_worker_dispatcher.cc b/content/renderer/service_worker/embedded_worker_dispatcher.cc
index ec12c06d5aabc50fc1b1252f4a6cf83eb1d1caba..a05224b026d9b3e6132df761479199890d9b6255 100644
--- a/content/renderer/service_worker/embedded_worker_dispatcher.cc
+++ b/content/renderer/service_worker/embedded_worker_dispatcher.cc
@@ -10,7 +10,6 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_process.h"
-#include "content/child/scoped_child_process_reference.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/worker_thread_registry.h"
 #include "content/common/devtools_messages.h"
@@ -27,23 +26,14 @@
 
 namespace content {
 
-// A thin wrapper of WebEmbeddedWorker which also adds and releases process
-// references automatically.
-class EmbeddedWorkerDispatcher::WorkerWrapper {
- public:
-  WorkerWrapper(blink::WebEmbeddedWorker* worker, int devtools_agent_route_id)
-      : worker_(worker),
-        dev_tools_agent_(
-            new EmbeddedWorkerDevToolsAgent(worker, devtools_agent_route_id)) {}
-  ~WorkerWrapper() {}
+EmbeddedWorkerDispatcher::WorkerWrapper::WorkerWrapper(
+    blink::WebEmbeddedWorker* worker,
+    int devtools_agent_route_id)
+    : worker_(worker),
+      dev_tools_agent_(
+          new EmbeddedWorkerDevToolsAgent(worker, devtools_agent_route_id)) {}
 
-  blink::WebEmbeddedWorker* worker() { return worker_.get(); }
-
- private:
-  ScopedChildProcessReference process_ref_;
-  std::unique_ptr<blink::WebEmbeddedWorker> worker_;
-  std::unique_ptr<EmbeddedWorkerDevToolsAgent> dev_tools_agent_;
-};
+EmbeddedWorkerDispatcher::WorkerWrapper::~WorkerWrapper() {}
 
 EmbeddedWorkerDispatcher::EmbeddedWorkerDispatcher() : weak_factory_(this) {}
 
@@ -107,7 +97,7 @@ void EmbeddedWorkerDispatcher::OnStartWorker(
           : blink::WebEmbeddedWorkerStartData::DontPauseAfterDownload;
 
   wrapper->worker()->startWorkerContext(start_data);
-  workers_.AddWithID(wrapper.release(), params.embedded_worker_id);
+  RegisterWorker(params.embedded_worker_id, std::move(wrapper));
 }
 
 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) {
@@ -163,4 +153,10 @@ void EmbeddedWorkerDispatcher::OnAddMessageToConsole(
       target_level, blink::WebString::fromUTF8(message)));
 }
 
+void EmbeddedWorkerDispatcher::RegisterWorker(
+    int embedded_worker_id,
+    std::unique_ptr<WorkerWrapper> wrapper) {
+  workers_.AddWithID(wrapper.release(), embedded_worker_id);
+}
+
 }  // namespace content