Rename SkipServiceWorker to ServiceWorkerMode

content/browser/loader/resource_dispatcher_host_impl.cc

 // Copyright (c) 2012 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 
 #include <stddef.h>
 
@@ skipping 1521 matching lines @@
     // Hang on to a reference to ensure the blob is not released prior
     // to the job being started.
     storage::BlobProtocolHandler::SetRequestedBlobDataHandle(
         new_request.get(), requester_info->blob_storage_context()
                                ->context()
                                ->GetBlobDataFromPublicURL(new_request->url()));
   }
 
   // Initialize the service worker handler for the request. We don't use
   // ServiceWorker for synchronous loads to avoid renderer deadlocks.
-  const SkipServiceWorker should_skip_service_worker =
-      is_sync_load ? SkipServiceWorker::ALL : request_data.skip_service_worker;
+  const ServiceWorkerMode service_worker_mode =
+      is_sync_load ? ServiceWorkerMode::NONE : request_data.service_worker_mode;
   ServiceWorkerRequestHandler::InitializeHandler(
       new_request.get(), requester_info->service_worker_context(), blob_context,
       child_id, request_data.service_worker_provider_id,
-      should_skip_service_worker != SkipServiceWorker::NONE,
+      service_worker_mode != ServiceWorkerMode::ALL,
       request_data.fetch_request_mode, request_data.fetch_credentials_mode,
       request_data.fetch_redirect_mode, request_data.resource_type,
       request_data.fetch_request_context_type, request_data.fetch_frame_type,
       request_data.request_body);
 
   ForeignFetchRequestHandler::InitializeHandler(
       new_request.get(), requester_info->service_worker_context(), blob_context,
-      child_id, request_data.service_worker_provider_id,
-      should_skip_service_worker, request_data.fetch_request_mode,
-      request_data.fetch_credentials_mode, request_data.fetch_redirect_mode,
-      request_data.resource_type, request_data.fetch_request_context_type,
-      request_data.fetch_frame_type, request_data.request_body,
-      request_data.initiated_in_secure_context);
+      child_id, request_data.service_worker_provider_id, service_worker_mode,
+      request_data.fetch_request_mode, request_data.fetch_credentials_mode,
+      request_data.fetch_redirect_mode, request_data.resource_type,
+      request_data.fetch_request_context_type, request_data.fetch_frame_type,
+      request_data.request_body, request_data.initiated_in_secure_context);
 
   // Have the appcache associate its extra info with the request.
   AppCacheInterceptor::SetExtraRequestInfo(
       new_request.get(), requester_info->appcache_service(), child_id,
       request_data.appcache_host_id, request_data.resource_type,
       request_data.should_reset_appcache);
 
   std::unique_ptr<ResourceHandler> handler(CreateResourceHandler(
       requester_info.get(), new_request.get(), request_data,
       sync_result_handler, route_id, child_id, resource_context,
@@ skipping 1225 matching lines @@
                                  &throttles);
     if (!throttles.empty()) {
       handler.reset(new ThrottlingResourceHandler(std::move(handler), request,
                                                   std::move(throttles)));
     }
   }
   return handler;
 }
 
 }  // namespace content