Teach EmbeddedWorkerInstance to create a process when it needs one.

content/browser/service_worker/embedded_worker_test_helper.cc

 // Copyright 2014 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_test_helper.h"
 
 #include "base/bind.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
+#include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
 #include "content/common/service_worker/service_worker_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
-EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper(
-    ServiceWorkerContextCore* context,
-    int mock_render_process_id)
-    : context_(context->AsWeakPtr()),
+static bool AlwaysTrue(int process_id) {
+  return true;
+}
+
+EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper(int mock_render_process_id)
+    : wrapper_(new ServiceWorkerContextWrapper()),
       next_thread_id_(0),
       weak_factory_(this) {
+  wrapper_->Init(base::FilePath(), NULL);
   registry()->AddChildProcessSender(mock_render_process_id, this);
+  ServiceWorkerContextWrapper::ResetWorkerRefCountOperationsForTest(
+      base::Bind(AlwaysTrue), base::Bind(AlwaysTrue));
 }
 
 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() {
+  ServiceWorkerContextWrapper::ResetWorkerRefCountOperationsForTest();
+  if (wrapper_)
+    wrapper_->Shutdown();
 }
 
 void EmbeddedWorkerTestHelper::SimulateAddProcessToWorker(
     int embedded_worker_id,
     int process_id) {
   EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
   ASSERT_TRUE(worker);
   registry()->AddChildProcessSender(process_id, this);
   worker->AddProcessReference(process_id);
 }
@@ skipping 14 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   // IPC::TestSink only records messages that are not handled by filters,
   // so we just forward all messages to the separate sink.
   sink_.OnMessageReceived(message);
 
   return handled;
 }
 
+ServiceWorkerContextCore* EmbeddedWorkerTestHelper::context() {
+  return wrapper_->context();
+}
+
+void EmbeddedWorkerTestHelper::ShutdownContext() {
+  wrapper_->Shutdown();
+  wrapper_ = NULL;
+}
+
 void EmbeddedWorkerTestHelper::OnStartWorker(
     int embedded_worker_id,
     int64 service_worker_version_id,
     const GURL& scope,
     const GURL& script_url) {
   // By default just notify the sender that the worker is started.
   SimulateWorkerStarted(next_thread_id_++, embedded_worker_id);
 }
 
 void EmbeddedWorkerTestHelper::OnStopWorker(int embedded_worker_id) {
@@ skipping 141 matching lines @@
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(&EmbeddedWorkerTestHelper::OnFetchEvent,
                  weak_factory_.GetWeakPtr(),
                  current_embedded_worker_id_,
                  request_id,
                  request));
 }
 
 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() {
-  DCHECK(context_);
-  return context_->embedded_worker_registry();
+  DCHECK(context());
+  return context()->embedded_worker_registry();
 }
 
 }  // namespace content