content/browser/service_worker/service_worker_job_unittest.cc - Issue 2142523004: M52: Merge "Reland: service worker: Don't control a subframe of an insecure context"

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_job_unittest.cc

Issue 2142523004: M52: Merge "Reland: service worker: Don't control a subframe of an insecure context" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743

Patch Set: fix compile errors Created 4 years, 5 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_handle_unittest.cc ('k') | content/browser/service_worker/service_worker_provider_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 9974961edfbec797af9060aae0dce8ccfb369413..2d71520b7f93fbf203f5ac464b5c11e8182b0061 100644

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

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

@@ -181,11 +181,12 @@ ServiceWorkerJobTest::FindRegistrationForPattern(

std::unique_ptr<ServiceWorkerProviderHost>

ServiceWorkerJobTest::CreateControllee() {

return std::unique_ptr<ServiceWorkerProviderHost>(

- new ServiceWorkerProviderHost(33 /* dummy render_process id */,

- MSG_ROUTING_NONE /* render_frame_id */,

- 1 /* dummy provider_id */,

- SERVICE_WORKER_PROVIDER_FOR_WINDOW,

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

+ new ServiceWorkerProviderHost(

+ 33 /* dummy render_process id */,

+ MSG_ROUTING_NONE /* render_frame_id */, 1 /* dummy provider_id */,

+ SERVICE_WORKER_PROVIDER_FOR_WINDOW,

+ ServiceWorkerProviderHost::FrameSecurityLevel::SECURE,

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

}

TEST_F(ServiceWorkerJobTest, SameDocumentSameRegistration) {