content/browser/service_worker/service_worker_provider_host_unittest.cc - Issue 501453002: Decouple script_url from ServiceWorkerRegistration

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 501453002: Decouple script_url from ServiceWorkerRegistration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync after major collision Created 6 years, 4 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

« no previous file with comments | « content/browser/service_worker/service_worker_job_unittest.cc ('k') | content/browser/service_worker/service_worker_register_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_provider_host_unittest.cc

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

index a24e15de9139698e99a3c51d7abf4fcd74ce47a5..c4b2cd8e681e8b198ef0a7cde5bf3a81dcd38d99 100644

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

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

@@ -36,9 +36,9 @@ class ServiceWorkerProviderHostTest : public testing::Test {

scope_ = GURL("http://www.example.com/");

script_url_ = GURL("http://www.example.com/service_worker.js");

registration_ = new ServiceWorkerRegistration(

- scope_, script_url_, 1L, context_->AsWeakPtr());

+ scope_, 1L, context_->AsWeakPtr());

version_ = new ServiceWorkerVersion(

- registration_.get(), 1L, context_->AsWeakPtr());

+ registration_.get(), script_url_, 1L, context_->AsWeakPtr());

// Prepare provider hosts (for the same process).

scoped_ptr<ServiceWorkerProviderHost> host1(new ServiceWorkerProviderHost(

@@ -194,10 +194,10 @@ TEST_F(ServiceWorkerProviderHostTest,

VerifyVersionAttributes(provider_host1_, NULL, NULL, NULL);

VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);

- scoped_refptr<ServiceWorkerVersion> version1 =

- new ServiceWorkerVersion(registration_.get(), 10L, context_->AsWeakPtr());

- scoped_refptr<ServiceWorkerVersion> version2 =

- new ServiceWorkerVersion(registration_.get(), 20L, context_->AsWeakPtr());

+ scoped_refptr<ServiceWorkerVersion> version1 = new ServiceWorkerVersion(

+ registration_.get(), script_url_, 10L, context_->AsWeakPtr());

+ scoped_refptr<ServiceWorkerVersion> version2 = new ServiceWorkerVersion(

+ registration_.get(), script_url_, 20L, context_->AsWeakPtr());

registration_->SetInstallingVersion(version1.get());

VerifyVersionAttributes(provider_host1_, version1.get(), NULL, NULL);