content/browser/service_worker/service_worker_controllee_request_handler.cc - Issue 2055433002: Revert of 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_controllee_request_handler.cc

Issue 2055433002: Revert of service worker: Don't control a subframe of an insecure context (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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_context_unittest.cc ('k') | content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_controllee_request_handler.cc

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

index c6652dc92b1d01688564cd432b1ed9287b137c1d..74b8e80d8a86d5f4cf1aef2c98310a4d5af25cba 100644

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

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

@@ -5,7 +5,6 @@

#include "content/browser/service_worker/service_worker_controllee_request_handler.h"

#include <memory>

-#include <set>

#include <string>

#include "base/trace_event/trace_event.h"

@@ -214,17 +213,6 @@

return;

}

- if (!provider_host_->IsContextSecureForServiceWorker()) {

- // TODO(falken): Figure out a way to surface in the page's DevTools

- // console that the service worker was blocked for security.

- job_->FallbackToNetwork();

- TRACE_EVENT_ASYNC_END1(

- "ServiceWorker",

- "ServiceWorkerControlleeRequestHandler::PrepareForMainResource",

- job_.get(), "Info", "Insecure context");

- return;

- }

if (need_to_update) {

force_update_started_ = true;

context_->UpdateServiceWorker(