content/browser/service_worker/service_worker_storage_unittest.cc - Issue 1042933002: ServiceWorker: Support non-window clients in Clients.matchAll (1/2 chromium)

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

Issue 1042933002: ServiceWorker: Support non-window clients in Clients.matchAll (1/2 chromium) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 9 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

« content/browser/service_worker/service_worker_context_core.cc ('K') | « content/browser/service_worker/service_worker_request_handler_unittest.cc ('k') | content/browser/service_worker/service_worker_url_request_job_unittest.cc » ('j') | content/browser/service_worker/service_worker_version.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 7c2e46f9e7a9098c1a662489d244f3821bad2ef2..7d53c2dd14eee71c1c2023f5481cdcea7d10f416 100644

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

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

@@ -1096,13 +1096,10 @@ TEST_F(ServiceWorkerResourceStorageTest, DeleteRegistration_ActiveVersion) {

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

storage()->UpdateToActiveState(

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

- scoped_ptr<ServiceWorkerProviderHost> host(

- new ServiceWorkerProviderHost(33 /* dummy render process id */,

- MSG_ROUTING_NONE,

- 1 /* dummy provider_id */,

- SERVICE_WORKER_PROVIDER_FOR_CONTROLLEE,

- context_->AsWeakPtr(),

- NULL));

+ scoped_ptr<ServiceWorkerProviderHost> host(new ServiceWorkerProviderHost(

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

+ 1 /* dummy provider_id */, SERVICE_WORKER_PROVIDER_FOR_WINDOW,

+ context_->AsWeakPtr(), NULL));

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

bool was_called = false;

@@ -1150,13 +1147,10 @@ TEST_F(ServiceWorkerResourceStorageDiskTest, CleanupOnRestart) {

registration_->SetWaitingVersion(NULL);

storage()->UpdateToActiveState(

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

- scoped_ptr<ServiceWorkerProviderHost> host(

- new ServiceWorkerProviderHost(33 /* dummy render process id */,

- MSG_ROUTING_NONE,

- 1 /* dummy provider_id */,

- SERVICE_WORKER_PROVIDER_FOR_CONTROLLEE,

- context_->AsWeakPtr(),

- NULL));

+ scoped_ptr<ServiceWorkerProviderHost> host(new ServiceWorkerProviderHost(

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

+ 1 /* dummy provider_id */, SERVICE_WORKER_PROVIDER_FOR_WINDOW,

+ context_->AsWeakPtr(), NULL));

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

bool was_called = false;

@@ -1248,13 +1242,10 @@ TEST_F(ServiceWorkerResourceStorageTest, UpdateRegistration) {

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

storage()->UpdateToActiveState(

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

- scoped_ptr<ServiceWorkerProviderHost> host(

- new ServiceWorkerProviderHost(33 /* dummy render process id */,

- MSG_ROUTING_NONE,

- 1 /* dummy provider_id */,

- SERVICE_WORKER_PROVIDER_FOR_CONTROLLEE,

- context_->AsWeakPtr(),

- NULL));

+ scoped_ptr<ServiceWorkerProviderHost> host(new ServiceWorkerProviderHost(

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

+ 1 /* dummy provider_id */, SERVICE_WORKER_PROVIDER_FOR_WINDOW,

+ context_->AsWeakPtr(), NULL));

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

bool was_called = false;