content/browser/service_worker/service_worker_storage_unittest.cc - Issue 2638313002: Manage ServiceWorkerDispatcherHost in ServiceWorkerContextCore

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

Issue 2638313002: Manage ServiceWorkerDispatcherHost in ServiceWorkerContextCore (Closed)

Patch Set: Remove a break line Created 3 years, 10 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

« content/browser/service_worker/service_worker_provider_host_unittest.cc ('K') | « content/browser/service_worker/service_worker_request_handler_unittest.cc ('k') | content/browser/service_worker/service_worker_test_utils.h » ('j') | content/child/service_worker/service_worker_network_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_storage_unittest.cc

diff --git a/content/browser/service_worker/service_worker_storage_unittest.cc b/content/browser/service_worker/service_worker_storage_unittest.cc

index 9598586c9d45b0b5ca2f51dd3ee6956dfcba0b3a..9fdd2a4a56fb98df1d8a39eaf55669a79961c0c2 100644

--- a/content/browser/service_worker/service_worker_storage_unittest.cc

+++ b/content/browser/service_worker/service_worker_storage_unittest.cc

@@ -1342,11 +1342,9 @@ TEST_F(ServiceWorkerResourceStorageTest, DeleteRegistration_ActiveVersion) {

registration_->SetActiveVersion(registration_->waiting_version());

storage()->UpdateToActiveState(

registration_.get(), base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));

- std::unique_ptr<ServiceWorkerProviderHost> host(new ServiceWorkerProviderHost(

- 33 /* dummy render process id */, MSG_ROUTING_NONE,

- 1 /* dummy provider_id */, SERVICE_WORKER_PROVIDER_FOR_WINDOW,

- ServiceWorkerProviderHost::FrameSecurityLevel::SECURE,

- context()->AsWeakPtr(), NULL));

+ std::unique_ptr<ServiceWorkerProviderHost> host = CreateProviderHostForWindow(

+ 33 /* dummy render process id */, 1 /* dummy provider_id */,

+ true /* is_parent_frame_secure */, context()->AsWeakPtr());

registration_->active_version()->AddControllee(host.get());

bool was_called = false;

@@ -1394,11 +1392,9 @@ TEST_F(ServiceWorkerResourceStorageDiskTest, CleanupOnRestart) {

registration_->SetWaitingVersion(NULL);

storage()->UpdateToActiveState(

registration_.get(), base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));

- std::unique_ptr<ServiceWorkerProviderHost> host(new ServiceWorkerProviderHost(

- 33 /* dummy render process id */, MSG_ROUTING_NONE,

- 1 /* dummy provider_id */, SERVICE_WORKER_PROVIDER_FOR_WINDOW,

- ServiceWorkerProviderHost::FrameSecurityLevel::SECURE,

- context()->AsWeakPtr(), NULL));

+ std::unique_ptr<ServiceWorkerProviderHost> host = CreateProviderHostForWindow(

+ 33 /* dummy render process id */, 1 /* dummy provider_id */,

+ true /* is_parent_frame_secure */, context()->AsWeakPtr());

registration_->active_version()->AddControllee(host.get());

bool was_called = false;

@@ -1554,11 +1550,9 @@ TEST_F(ServiceWorkerResourceStorageTest, UpdateRegistration) {

registration_->SetActiveVersion(registration_->waiting_version());

storage()->UpdateToActiveState(

registration_.get(), base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));

- std::unique_ptr<ServiceWorkerProviderHost> host(new ServiceWorkerProviderHost(

- 33 /* dummy render process id */, MSG_ROUTING_NONE,

- 1 /* dummy provider_id */, SERVICE_WORKER_PROVIDER_FOR_WINDOW,

- ServiceWorkerProviderHost::FrameSecurityLevel::SECURE,

- context()->AsWeakPtr(), NULL));

+ std::unique_ptr<ServiceWorkerProviderHost> host = CreateProviderHostForWindow(

+ 33 /* dummy render process id */, 1 /* dummy provider_id */,

+ true /* is_parent_frame_secure */, helper_->context()->AsWeakPtr());

registration_->active_version()->AddControllee(host.get());

bool was_called = false;