PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/child/web_url_loader_impl.cc

Index: content/child/web_url_loader_impl.cc
diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
index d2353b957ac696d5a2d19c1d3cdc296d9d7e99f7..2ace47a299b42e15d0f81aff681f44e02fba8690 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -180,10 +180,6 @@ STATIC_ASSERT_MATCHING_ENUMS(
     FETCH_REQUEST_MODE_CORS_WITH_FORCED_PREFLIGHT,
     WebURLRequest::FetchRequestModeCORSWithForcedPreflight);
 
-FetchRequestMode GetFetchRequestMode(const WebURLRequest& request) {

[clamy, 2015/08/31 12:09:27]

Since we are moving the conversion out of this file, should we also move the
asserts so that they remain together?

[Fabrice (no longer in Chrome), 2015/08/31 14:00:35]

That sounds reasonable to me and I think they belong in WebUrlRequestUtil better
anyway.
I moved them, nasko@, WDYT?

-  return static_cast<FetchRequestMode>(request.fetchRequestMode());
-}
-
 STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_OMIT,
                              WebURLRequest::FetchCredentialsModeOmit);
 STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_SAME_ORIGIN,
@@ -191,10 +187,6 @@ STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_SAME_ORIGIN,
 STATIC_ASSERT_MATCHING_ENUMS(FETCH_CREDENTIALS_MODE_INCLUDE,
                              WebURLRequest::FetchCredentialsModeInclude);
 
-FetchCredentialsMode GetFetchCredentialsMode(const WebURLRequest& request) {
-  return static_cast<FetchCredentialsMode>(request.fetchCredentialsMode());
-}
-
 STATIC_ASSERT_MATCHING_ENUMS(FetchRedirectMode::FOLLOW_MODE,
                              WebURLRequest::FetchRedirectModeFollow);
 STATIC_ASSERT_MATCHING_ENUMS(FetchRedirectMode::ERROR_MODE,
@@ -202,10 +194,6 @@ STATIC_ASSERT_MATCHING_ENUMS(FetchRedirectMode::ERROR_MODE,
 STATIC_ASSERT_MATCHING_ENUMS(FetchRedirectMode::MANUAL_MODE,
                              WebURLRequest::FetchRedirectModeManual);
 
-FetchRedirectMode GetFetchRedirectMode(const WebURLRequest& request) {
-  return static_cast<FetchRedirectMode>(request.fetchRedirectMode());
-}
-
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_AUXILIARY,
                              WebURLRequest::FrameTypeAuxiliary);
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_NESTED,
@@ -215,11 +203,6 @@ STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_NONE,
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL,
                              WebURLRequest::FrameTypeTopLevel);
 
-RequestContextFrameType GetRequestContextFrameType(
-    const WebURLRequest& request) {
-  return static_cast<RequestContextFrameType>(request.frameType());
-}
-
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_TYPE_UNSPECIFIED,
                              WebURLRequest::RequestContextUnspecified);
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_TYPE_AUDIO,
@@ -289,10 +272,6 @@ STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_TYPE_XML_HTTP_REQUEST,
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_TYPE_XSLT,
                              WebURLRequest::RequestContextXSLT);
 
-RequestContextType GetRequestContextType(const WebURLRequest& request) {
-  return static_cast<RequestContextType>(request.requestContext());
-}
-
 void SetSecurityStyleAndDetails(const GURL& url,
                                 const std::string& security_info,
                                 WebURLResponse* response,
@@ -599,11 +578,16 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
   request_info.has_user_gesture = request.hasUserGesture();
   request_info.skip_service_worker = request.skipServiceWorker();
   request_info.should_reset_appcache = request.shouldResetAppCache();
-  request_info.fetch_request_mode = GetFetchRequestMode(request);
-  request_info.fetch_credentials_mode = GetFetchCredentialsMode(request);
-  request_info.fetch_redirect_mode = GetFetchRedirectMode(request);
-  request_info.fetch_request_context_type = GetRequestContextType(request);
-  request_info.fetch_frame_type = GetRequestContextFrameType(request);
+  request_info.fetch_request_mode =
+      GetFetchRequestModeForWebURLRequest(request);
+  request_info.fetch_credentials_mode =
+      GetFetchCredentialsModeForWebURLRequest(request);
+  request_info.fetch_redirect_mode =
+      GetFetchRedirectModeForWebURLRequest(request);
+  request_info.fetch_request_context_type =
+      GetRequestContextTypeForWebURLRequest(request);
+  request_info.fetch_frame_type =
+      GetRequestContextFrameTypeForWebURLRequest(request);
   request_info.extra_data = request.extraData();
   request_info.report_raw_headers = request.reportRawHeaders();