Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index b42860a347326f73bf1a8c8600251accf5273585..d637a6a317e40629cae4afab9f599324cf40afb0 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -515,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) |
@@ -4849,12 +4850,30 @@ void RenderFrameImpl::BeginNavigation(blink::WebURLRequest* request) { |
if (data_source && render_view_->history_list_length_ > 0) { |
should_replace_current_entry = data_source->replacesCurrentHistoryItem(); |
} |
+ |
+ DCHECK_EQ(FETCH_REQUEST_MODE_SAME_ORIGIN, |
+ GetFetchRequestModeForWebURLRequest(*request)); |
+ DCHECK_EQ(FETCH_CREDENTIALS_MODE_INCLUDE, |
+ GetFetchCredentialsModeForWebURLRequest(*request)); |
+ DCHECK(GetFetchRedirectModeForWebURLRequest(*request) == |
+ FetchRedirectMode::MANUAL_MODE); |
+ DCHECK_IMPLIES(!frame_->parent(), |
+ GetRequestContextFrameTypeForWebURLRequest(*request) == |
+ REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL); |
+ DCHECK_IMPLIES(frame_->parent(), |
+ GetRequestContextFrameTypeForWebURLRequest(*request) == |
+ REQUEST_CONTEXT_FRAME_TYPE_NESTED); |
+ |
Send(new FrameHostMsg_BeginNavigation( |
routing_id_, |
MakeCommonNavigationParams(request, should_replace_current_entry), |
BeginNavigationParams( |
- request->httpMethod().latin1(), GetWebURLRequestHeaders(*request), |
- GetLoadFlagsForWebURLRequest(*request), request->hasUserGesture()), |
+ request->httpMethod().latin1(), |
+ GetWebURLRequestHeaders(*request), |
+ GetLoadFlagsForWebURLRequest(*request), |
+ request->hasUserGesture(), |
+ request->skipServiceWorker(), |
+ GetRequestContextTypeForWebURLRequest(*request)), |
GetRequestBodyForWebURLRequest(*request))); |
} |