Skip foreign fetch when the skipServiceWorker flag is set on a request.

content/browser/loader/resource_dispatcher_host_impl.cc

Index: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index b7cda32ff0fa0f79358ab4516c8704a95bb55280..02951daf8cbff84bff11759579c76e189b4cc1b5 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1535,12 +1535,12 @@ void ResourceDispatcherHostImpl::BeginRequest(
 
   // Initialize the service worker handler for the request. We don't use
   // ServiceWorker for synchronous loads to avoid renderer deadlocks.
-  const bool should_skip_service_worker =
-      request_data.skip_service_worker || is_sync_load;
+  const SkipServiceWorker should_skip_service_worker =
+      is_sync_load ? SkipServiceWorker::ALL : request_data.skip_service_worker;
   ServiceWorkerRequestHandler::InitializeHandler(
       new_request.get(), filter_->service_worker_context(), blob_context,
       child_id, request_data.service_worker_provider_id,
-      should_skip_service_worker,
+      should_skip_service_worker != SkipServiceWorker::NONE,
       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,
@@ -1551,11 +1551,11 @@ void ResourceDispatcherHostImpl::BeginRequest(
     ForeignFetchRequestHandler::InitializeHandler(
         new_request.get(), filter_->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);
+        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);
   }
 
   // Have the appcache associate its extra info with the request.