Chromium Code Reviews| 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 887a95f050642e4ae16c7abda71ed423d325ad38..5fd643ec4ba842207a071196e7a51948f41cdf9b 100644 |
| --- a/content/browser/service_worker/embedded_worker_test_helper.cc |
| +++ b/content/browser/service_worker/embedded_worker_test_helper.cc |
| @@ -18,10 +18,14 @@ |
| #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 "content/public/test/mock_render_process_host.h" |
| +#include "content/public/test/test_browser_context.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| namespace content { |
| +namespace { |
| + |
| class MockMessagePortMessageFilter : public MessagePortMessageFilter { |
| public: |
| MockMessagePortMessageFilter() |
| @@ -40,6 +44,8 @@ class MockMessagePortMessageFilter : public MessagePortMessageFilter { |
| ScopedVector<IPC::Message> message_queue_; |
| }; |
| +} // namespace |
| + |
| EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper( |
| const base::FilePath& user_data_directory, |
| int mock_render_process_id) |
| @@ -60,6 +66,24 @@ EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper( |
| NewMessagePortMessageFilter()); |
| } |
| +EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper( |
| + const base::FilePath& user_data_directory) |
| + : browser_context_(new TestBrowserContext), |
| + render_process_host_(new MockRenderProcessHost(browser_context_.get())), |
| + wrapper_(new ServiceWorkerContextWrapper(NULL)), |
|
falken
2015/10/16 11:58:43
nit: nullptr for new code (and below)
Marijn Kruisselbrink
2015/10/16 17:23:24
Done
|
| + next_thread_id_(0), |
| + mock_render_process_id_(render_process_host_->GetID()), |
| + weak_factory_(this) { |
| + scoped_ptr<MockServiceWorkerDatabaseTaskManager> database_task_manager( |
| + new MockServiceWorkerDatabaseTaskManager( |
| + base::ThreadTaskRunnerHandle::Get())); |
| + wrapper_->InitInternal(user_data_directory, database_task_manager.Pass(), |
| + base::ThreadTaskRunnerHandle::Get(), NULL, NULL); |
| + wrapper_->process_manager()->SetProcessIdForTest(mock_render_process_id_); |
| + registry()->AddChildProcessSender(mock_render_process_id_, this, |
| + NewMessagePortMessageFilter()); |
| +} |
| + |
| EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() { |
| if (wrapper_.get()) |
| wrapper_->Shutdown(); |