Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(874)

Unified Diff: content/browser/service_worker/embedded_worker_test_helper.cc

Issue 238043002: Teach EmbeddedWorkerInstance to create a process when it needs one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Null out browser_context_ in Shutdown Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/embedded_worker_test_helper.cc
diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc
index 67ca05af7263a6eb494457df9c369c179e4eb098..a170c359f648b5939e98fd4610f71e3a8848ba76 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.cc
+++ b/content/browser/service_worker/embedded_worker_test_helper.cc
@@ -8,22 +8,31 @@
#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(
@@ -58,6 +67,15 @@ bool EmbeddedWorkerTestHelper::OnMessageReceived(const IPC::Message& 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,
@@ -219,8 +237,8 @@ void EmbeddedWorkerTestHelper::OnFetchEventStub(
}
EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() {
- DCHECK(context_);
- return context_->embedded_worker_registry();
+ DCHECK(context());
+ return context()->embedded_worker_registry();
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698