Rename SkipServiceWorker to ServiceWorkerMode

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 <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 553 matching lines @@
   resource_request->load_flags = GetLoadFlagsForWebURLRequest(request);
   // origin_pid only needs to be non-zero if the request originates outside
   // the render process, so we can use requestorProcessID even for requests
   // from in-process plugins.
   resource_request->origin_pid = request.requestorProcessID();
   resource_request->resource_type = WebURLRequestToResourceType(request);
   resource_request->priority =
       ConvertWebKitPriorityToNetPriority(request.getPriority());
   resource_request->appcache_host_id = request.appCacheHostID();
   resource_request->should_reset_appcache = request.shouldResetAppCache();
-  resource_request->skip_service_worker =
-      GetSkipServiceWorkerForWebURLRequest(request);
+  resource_request->service_worker_mode =
+      GetServiceWorkerModeForWebURLRequest(request);
   resource_request->fetch_request_mode =
       GetFetchRequestModeForWebURLRequest(request);
   resource_request->fetch_credentials_mode =
       GetFetchCredentialsModeForWebURLRequest(request);
   resource_request->fetch_redirect_mode =
       GetFetchRedirectModeForWebURLRequest(request);
   resource_request->fetch_request_context_type =
       GetRequestContextTypeForWebURLRequest(request);
   resource_request->fetch_mixed_content_context_type =
       GetMixedContentContextTypeForWebURLRequest(request);
@@ skipping 74 matching lines @@
       "loading", "WebURLLoaderImpl::Context::OnReceivedRedirect",
       this, TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
 
   WebURLResponse response;
   PopulateURLResponse(request_.url(), info, &response,
                       request_.reportRawHeaders());
 
   WebURLRequest new_request = PopulateURLRequestForRedirect(
       request_, redirect_info,
       info.was_fetched_via_service_worker
-          ? blink::WebURLRequest::SkipServiceWorker::None
-          : blink::WebURLRequest::SkipServiceWorker::All);
+          ? blink::WebURLRequest::ServiceWorkerMode::All
+          : blink::WebURLRequest::ServiceWorkerMode::None);
 
   bool follow = client_->willFollowRedirect(new_request, response);
   if (!follow) {
     request_ = WebURLRequest();
 
     return false;
   }
 
   DCHECK(WebURL(redirect_info.new_url) == new_request.url());
 
@@ skipping 473 matching lines @@
   std::string value;
   while (headers->EnumerateHeaderLines(&iter, &name, &value)) {
     response->addHTTPHeaderField(WebString::fromLatin1(name),
                                  WebString::fromLatin1(value));
   }
 }
 
 WebURLRequest WebURLLoaderImpl::PopulateURLRequestForRedirect(
     const blink::WebURLRequest& request,
     const net::RedirectInfo& redirect_info,
-    blink::WebURLRequest::SkipServiceWorker skip_service_worker) {
+    blink::WebURLRequest::ServiceWorkerMode service_worker_mode) {
   // TODO(darin): We lack sufficient information to construct the actual
   // request that resulted from the redirect.
   WebURLRequest new_request(redirect_info.new_url);
   new_request.setFirstPartyForCookies(
       redirect_info.new_first_party_for_cookies);
   new_request.setDownloadToFile(request.downloadToFile());
   new_request.setUseStreamOnResponse(request.useStreamOnResponse());
   new_request.setRequestContext(request.getRequestContext());
   new_request.setFrameType(request.getFrameType());
-  new_request.setSkipServiceWorker(skip_service_worker);
+  new_request.setServiceWorkerMode(service_worker_mode);
   new_request.setShouldResetAppCache(request.shouldResetAppCache());
   new_request.setFetchRequestMode(request.getFetchRequestMode());
   new_request.setFetchCredentialsMode(request.getFetchCredentialsMode());
 
   new_request.setHTTPReferrer(WebString::fromUTF8(redirect_info.new_referrer),
                                NetReferrerPolicyToBlinkReferrerPolicy(
                                    redirect_info.new_referrer_policy));
   new_request.setPriority(request.getPriority());
 
   std::string old_method = request.httpMethod().utf8();
@@ skipping 61 matching lines @@
                                          int intra_priority_value) {
   context_->DidChangePriority(new_priority, intra_priority_value);
 }
 
 void WebURLLoaderImpl::setLoadingTaskRunner(
     base::SingleThreadTaskRunner* loading_task_runner) {
   context_->SetTaskRunner(loading_task_runner);
 }
 
 }  // namespace content