| Index: content/browser/service_worker/service_worker_job_unittest.cc
|
| diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc
|
| index de5e61283ab82c506a3d6f4816dfcdd3a2748f53..35c368e845484b8322301e1d1472dedfc81bcfbc 100644
|
| --- a/content/browser/service_worker/service_worker_job_unittest.cc
|
| +++ b/content/browser/service_worker/service_worker_job_unittest.cc
|
| @@ -94,24 +94,22 @@ class ServiceWorkerJobTest : public testing::Test {
|
| render_process_id_(88) {}
|
|
|
| virtual void SetUp() OVERRIDE {
|
| - context_.reset(new ServiceWorkerContextCore(base::FilePath(), NULL, NULL));
|
| - helper_.reset(new EmbeddedWorkerTestHelper(context_.get(),
|
| - render_process_id_));
|
| + helper_.reset(new EmbeddedWorkerTestHelper(render_process_id_));
|
| }
|
|
|
| virtual void TearDown() OVERRIDE {
|
| helper_.reset();
|
| - context_.reset();
|
| }
|
|
|
| + ServiceWorkerContextCore* context() const { return helper_->context(); }
|
| +
|
| ServiceWorkerJobCoordinator* job_coordinator() const {
|
| - return context_->job_coordinator();
|
| + return context()->job_coordinator();
|
| }
|
| - ServiceWorkerStorage* storage() const { return context_->storage(); }
|
| + ServiceWorkerStorage* storage() const { return context()->storage(); }
|
|
|
| protected:
|
| TestBrowserThreadBundle browser_thread_bundle_;
|
| - scoped_ptr<ServiceWorkerContextCore> context_;
|
| scoped_ptr<EmbeddedWorkerTestHelper> helper_;
|
|
|
| int render_process_id_;
|
| @@ -398,9 +396,8 @@ TEST_F(ServiceWorkerJobTest, RegisterDuplicateScript) {
|
|
|
| class FailToStartWorkerTestHelper : public EmbeddedWorkerTestHelper {
|
| public:
|
| - FailToStartWorkerTestHelper(ServiceWorkerContextCore* context,
|
| - int mock_render_process_id)
|
| - : EmbeddedWorkerTestHelper(context, mock_render_process_id) {}
|
| + FailToStartWorkerTestHelper(int mock_render_process_id)
|
| + : EmbeddedWorkerTestHelper(mock_render_process_id) {}
|
|
|
| virtual void OnStartWorker(int embedded_worker_id,
|
| int64 service_worker_version_id,
|
| @@ -413,8 +410,7 @@ class FailToStartWorkerTestHelper : public EmbeddedWorkerTestHelper {
|
| };
|
|
|
| TEST_F(ServiceWorkerJobTest, Register_FailToStartWorker) {
|
| - helper_.reset(
|
| - new FailToStartWorkerTestHelper(context_.get(), render_process_id_));
|
| + helper_.reset(new FailToStartWorkerTestHelper(render_process_id_));
|
|
|
| bool called = false;
|
| scoped_refptr<ServiceWorkerRegistration> registration;
|
|
|