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

Unified Diff: content/browser/service_worker/service_worker_url_request_job_unittest.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: Handle 2 places where context_ could be NULL. 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/service_worker_url_request_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
index 63e57d6d81d6dc3cf5fa9e16296217301efb2a12..931cace061a643f5876c6dadd256a801702b9f2a 100644
--- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -89,34 +89,32 @@ class ServiceWorkerURLRequestJobTest : public testing::Test {
virtual ~ServiceWorkerURLRequestJobTest() {}
virtual void SetUp() OVERRIDE {
- context_.reset(new ServiceWorkerContextCore(base::FilePath(), NULL, NULL));
- helper_.reset(new EmbeddedWorkerTestHelper(context_.get(), kProcessID));
+ helper_.reset(new EmbeddedWorkerTestHelper(kProcessID));
registration_ = new ServiceWorkerRegistration(
GURL("http://example.com/*"),
GURL("http://example.com/service_worker.js"),
- 1L, context_->AsWeakPtr());
+ 1L,
+ helper_->context()->AsWeakPtr());
version_ = new ServiceWorkerVersion(
- registration_,
- 1L, context_->AsWeakPtr());
+ registration_, 1L, helper_->context()->AsWeakPtr());
scoped_ptr<ServiceWorkerProviderHost> provider_host(
- new ServiceWorkerProviderHost(kProcessID, kProviderID,
- context_->AsWeakPtr(), NULL));
+ new ServiceWorkerProviderHost(
+ kProcessID, kProviderID, helper_->context()->AsWeakPtr(), NULL));
provider_host->SetActiveVersion(version_.get());
url_request_job_factory_.SetProtocolHandler(
"http", new MockProtocolHandler(provider_host->AsWeakPtr()));
url_request_context_.set_job_factory(&url_request_job_factory_);
- context_->AddProviderHost(provider_host.Pass());
+ helper_->context()->AddProviderHost(provider_host.Pass());
}
virtual void TearDown() OVERRIDE {
version_ = NULL;
registration_ = NULL;
helper_.reset();
- context_.reset();
}
void TestRequest() {
@@ -137,7 +135,6 @@ class ServiceWorkerURLRequestJobTest : public testing::Test {
TestBrowserThreadBundle thread_bundle_;
- scoped_ptr<ServiceWorkerContextCore> context_;
scoped_ptr<EmbeddedWorkerTestHelper> helper_;
scoped_refptr<ServiceWorkerRegistration> registration_;
scoped_refptr<ServiceWorkerVersion> version_;

Powered by Google App Engine
This is Rietveld 408576698