Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1100)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2940563002: Fix SW tests with servicification (Closed)
Patch Set: . Created 3 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/child/service_worker/service_worker_network_provider.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 765239650ec7829b73a25051773fabe2f514b3f2..260af849b793804e195687fea6404ab269fa88ed 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2920,8 +2920,6 @@ RenderFrameImpl::CreateWorkerFetchContext() {
ServiceWorkerNetworkProvider* provider =
ServiceWorkerNetworkProvider::FromWebServiceWorkerNetworkProvider(
web_provider);
- if (!provider)
- return nullptr;
worker_fetch_context->set_service_worker_provider_id(
provider->provider_id());
worker_fetch_context->set_is_controlled_by_service_worker(
@@ -2973,10 +2971,6 @@ RenderFrameImpl::CreateServiceWorkerProvider() {
ServiceWorkerNetworkProvider* provider =
ServiceWorkerNetworkProvider::FromWebServiceWorkerNetworkProvider(
frame_->DataSource()->GetServiceWorkerNetworkProvider());
- if (!provider) {
- DCHECK(ServiceWorkerUtils::IsServicificationEnabled());
- return nullptr;
- }
if (!provider->context()) {
// The context can be null when the frame is sandboxed.
return nullptr;
@@ -3434,12 +3428,6 @@ void RenderFrameImpl::DidCreateDataSource(blink::WebLocalFrame* frame,
if (datasource->GetServiceWorkerNetworkProvider())
return;
- if (ServiceWorkerUtils::IsServicificationEnabled()) {
- // Disable interception via ServiceWorkerNetworkProvider if
- // servicification is enabled.
- return;
- }
-
datasource->SetServiceWorkerNetworkProvider(
ServiceWorkerNetworkProvider::CreateForNavigation(
routing_id_, navigation_state->request_params(), frame,
« no previous file with comments | « content/child/service_worker/service_worker_network_provider.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698