PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 05e6ad6f8c49c076f229b9ebe655ec73dbc4ad97..b5f7d47c3cbee5ad87ea382d8d3eb02eb1951ed1 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -447,6 +447,8 @@ WebURLRequest CreateURLRequestForNavigation(
 
   RequestExtraData* extra_data = new RequestExtraData();
   extra_data->set_stream_override(stream_override.Pass());
+  extra_data->set_service_worker_provider_id(
+      common_params.service_worker_provider_id);
   request.setExtraData(extra_data);
 
   // Set the ui timestamp for this navigation. Currently the timestamp here is
@@ -513,7 +515,8 @@ CommonNavigationParams MakeCommonNavigationParams(
   return CommonNavigationParams(
       request->url(), referrer, extra_data->transition_type(),
       FrameMsg_Navigate_Type::NORMAL, true, should_replace_current_entry,
-      ui_timestamp, report_type, GURL(), GURL());
+      ui_timestamp, report_type, GURL(), GURL(),
+      extra_data->service_worker_provider_id());
 }
 
 #if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
@@ -2524,8 +2527,19 @@ void RenderFrameImpl::didCreateDataSource(blink::WebLocalFrame* frame,
         blink::WebSandboxFlags::Origin) {
       provider_type = SERVICE_WORKER_PROVIDER_FOR_SANDBOXED_FRAME;

[nasko, 2015/08/20 16:49:50]

Can we DCHECK here that this is not the top-level RenderFrame?

[Fabrice (no longer in Chrome), 2015/08/26 13:23:25]

Done.

[Fabrice (no longer in Chrome), 2015/08/27 11:18:15]

I added a DCHECK on is_subframe_, but some tests did not like it:
SitePerProcessBrowserTest.DynamicSandboxFlagsRemoteToLocal
SitePerProcessBrowserTest.DynamicSandboxFlags
SitePerProcessBrowserTest.SandboxFlagsReplication

Is it the right check to do here?

     }
+    const WebURLRequest& original_request = datasource->originalRequest();
+
+    int service_worker_provider_id = kInvalidServiceWorkerProviderId;
+    if (original_request.extraData()) {
+      RequestExtraData* extra_data =
+          static_cast<RequestExtraData*>(original_request.extraData());
+      service_worker_provider_id = extra_data->service_worker_provider_id();
+    }
+
     scoped_ptr<ServiceWorkerNetworkProvider> network_provider(
-        new ServiceWorkerNetworkProvider(routing_id_, provider_type));
+        new ServiceWorkerNetworkProvider(routing_id_, provider_type,
+                                         service_worker_provider_id));
+
     ServiceWorkerNetworkProvider::AttachToDocumentState(
         DocumentState::FromDataSource(datasource),
         network_provider.Pass());
@@ -4812,8 +4826,16 @@ void RenderFrameImpl::BeginNavigation(blink::WebURLRequest* request) {
       routing_id_,
       MakeCommonNavigationParams(request, should_replace_current_entry),
       BeginNavigationParams(

[clamy, 2015/08/24 12:27:35]

If we remove parameters such as FetchCredentialsMode etc... from
BeginNavigationParams as nasko suggested, can we DCHECK here that we are getting
the values we expect?

[Fabrice (no longer in Chrome), 2015/08/26 13:23:25]

Done.

-          request->httpMethod().latin1(), GetWebURLRequestHeaders(*request),
-          GetLoadFlagsForWebURLRequest(*request), request->hasUserGesture()),
+          request->httpMethod().latin1(),
+          GetWebURLRequestHeaders(*request),
+          GetLoadFlagsForWebURLRequest(*request),
+          request->hasUserGesture(),
+          request->skipServiceWorker(),
+          GetFetchRequestModeForWebURLRequest(*request),
+          GetFetchCredentialsModeForWebURLRequest(*request),
+          GetFetchRedirectModeForWebURLRequest(*request),
+          GetRequestContextTypeForWebURLRequest(*request),
+          GetRequestContextFrameTypeForWebURLRequest(*request)),
       GetRequestBodyForWebURLRequest(*request)));
 }