PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/child/web_url_loader_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/web_url_loader_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 162 matching lines @@
 STATIC_ASSERT_MATCHING_ENUMS(FETCH_REQUEST_MODE_SAME_ORIGIN,
                              WebURLRequest::FetchRequestModeSameOrigin);
 STATIC_ASSERT_MATCHING_ENUMS(FETCH_REQUEST_MODE_NO_CORS,
                              WebURLRequest::FetchRequestModeNoCORS);
 STATIC_ASSERT_MATCHING_ENUMS(FETCH_REQUEST_MODE_CORS,
                              WebURLRequest::FetchRequestModeCORS);
 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,
                              WebURLRequest::FetchCredentialsModeSameOrigin);
 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,
                              WebURLRequest::FetchRedirectModeError);
 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,
                              WebURLRequest::FrameTypeNested);
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_FRAME_TYPE_NONE,
                              WebURLRequest::FrameTypeNone);
 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,
                              WebURLRequest::RequestContextAudio);
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_TYPE_BEACON,
                              WebURLRequest::RequestContextBeacon);
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_TYPE_CSP_REPORT,
                              WebURLRequest::RequestContextCSPReport);
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_TYPE_DOWNLOAD,
                              WebURLRequest::RequestContextDownload);
@@ skipping 49 matching lines @@
                              WebURLRequest::RequestContextTrack);
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_TYPE_VIDEO,
                              WebURLRequest::RequestContextVideo);
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_TYPE_WORKER,
                              WebURLRequest::RequestContextWorker);
 STATIC_ASSERT_MATCHING_ENUMS(REQUEST_CONTEXT_TYPE_XML_HTTP_REQUEST,
                              WebURLRequest::RequestContextXMLHttpRequest);
 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,
                                 bool report_security_info) {
   if (!report_security_info) {
     response->setSecurityStyle(WebURLResponse::SecurityStyleUnknown);
     return;
   }
   if (!url.SchemeIsCryptographic()) {
     response->setSecurityStyle(WebURLResponse::SecurityStyleUnauthenticated);
@@ skipping 286 matching lines @@
   request_info.requestor_pid = request.requestorProcessID();
   request_info.request_type = WebURLRequestToResourceType(request);
   request_info.priority =
       ConvertWebKitPriorityToNetPriority(request.priority());
   request_info.appcache_host_id = request.appCacheHostID();
   request_info.routing_id = request.requestorID();
   request_info.download_to_file = request.downloadToFile();
   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();
 
   scoped_refptr<ResourceRequestBody> request_body =
       GetRequestBodyForWebURLRequest(request).get();
 
   if (sync_load_response) {
     resource_dispatcher_->StartSync(
         request_info, request_body.get(), sync_load_response);
     return;
@@ skipping 547 matching lines @@
                                          int intra_priority_value) {
   context_->DidChangePriority(new_priority, intra_priority_value);
 }
 
 bool WebURLLoaderImpl::attachThreadedDataReceiver(
     blink::WebThreadedDataReceiver* threaded_data_receiver) {
   return context_->AttachThreadedDataReceiver(threaded_data_receiver);
 }
 
 }  // namespace content