Rename SkipServiceWorker to ServiceWorkerMode

content/child/web_url_request_util.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_request_util.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 467 matching lines @@
   if (request.getExtraData()) {
     RequestExtraData* extra_data =
         static_cast<RequestExtraData*>(request.getExtraData());
     block_mixed_plugin_content = extra_data->block_mixed_plugin_content();
   }
 
   return blink::WebMixedContent::contextTypeFromRequestContext(
       request.getRequestContext(), block_mixed_plugin_content);
 }
 
-STATIC_ASSERT_ENUM(SkipServiceWorker::NONE,
-                   WebURLRequest::SkipServiceWorker::None);
-STATIC_ASSERT_ENUM(SkipServiceWorker::CONTROLLING,
-                   WebURLRequest::SkipServiceWorker::Controlling);
-STATIC_ASSERT_ENUM(SkipServiceWorker::ALL,
-                   WebURLRequest::SkipServiceWorker::All);
+STATIC_ASSERT_ENUM(ServiceWorkerMode::NONE,
+                   WebURLRequest::ServiceWorkerMode::None);
+STATIC_ASSERT_ENUM(ServiceWorkerMode::FOREIGN,
+                   WebURLRequest::ServiceWorkerMode::Foreign);
+STATIC_ASSERT_ENUM(ServiceWorkerMode::ALL,
+                   WebURLRequest::ServiceWorkerMode::All);
 
-SkipServiceWorker GetSkipServiceWorkerForWebURLRequest(
+ServiceWorkerMode GetServiceWorkerModeForWebURLRequest(
     const blink::WebURLRequest& request) {
-  return static_cast<SkipServiceWorker>(request.skipServiceWorker());
+  return static_cast<ServiceWorkerMode>(request.getServiceWorkerMode());
 }
 
 blink::WebURLError CreateWebURLError(const blink::WebURL& unreachable_url,
                                      bool stale_copy_in_cache,
                                      int reason) {
   blink::WebURLError error;
   error.domain = WebString::fromASCII(net::kErrorDomain);
   error.reason = reason;
   error.unreachableURL = unreachable_url;
   error.staleCopyInCache = stale_copy_in_cache;
@@ skipping 15 matching lines @@
                                      bool stale_copy_in_cache,
                                      int reason,
                                      bool was_ignored_by_handler) {
   blink::WebURLError error =
       CreateWebURLError(unreachable_url, stale_copy_in_cache, reason);
   error.wasIgnoredByHandler = was_ignored_by_handler;
   return error;
 }
 
 }  // namespace content