Rename SkipServiceWorker to ServiceWorkerMode

This was changed in the following PR to the Fetch standard:
  whatwg/fetch#435

BUG=592188

Review-Url: https://codereview.chromium.org/2714423002
Cr-Commit-Position: refs/heads/master@{#453432}

Author: beverloo

content/browser/loader/resource_dispatcher_host_impl.cc

@@ -1539,25 +1539,24 @@ void ResourceDispatcherHostImpl::ContinuePendingBeginRequest(
 
   // 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(

content/browser/service_worker/foreign_fetch_request_handler.cc

@@ -70,7 +70,7 @@ void ForeignFetchRequestHandler::InitializeHandler(
     storage::BlobStorageContext* blob_storage_context,
     int process_id,
     int provider_id,
-    SkipServiceWorker skip_service_worker,
+    ServiceWorkerMode service_worker_mode,
     FetchRequestMode request_mode,
     FetchCredentialsMode credentials_mode,
     FetchRedirectMode redirect_mode,
@@ -87,7 +87,7 @@ void ForeignFetchRequestHandler::InitializeHandler(
     return;
   }
 
-  if (skip_service_worker == SkipServiceWorker::ALL)
+  if (service_worker_mode == ServiceWorkerMode::NONE)
     return;
 
   if (!initiated_in_secure_context)

content/browser/service_worker/foreign_fetch_request_handler.h

@@ -58,7 +58,7 @@ class CONTENT_EXPORT ForeignFetchRequestHandler
       storage::BlobStorageContext* blob_storage_context,
       int process_id,
       int provider_id,
-      SkipServiceWorker skip_service_worker,
+      ServiceWorkerMode service_worker_mode,
       FetchRequestMode request_mode,
       FetchCredentialsMode credentials_mode,
       FetchRedirectMode redirect_mode,

content/browser/service_worker/foreign_fetch_request_handler_unittest.cc

@@ -145,7 +145,7 @@ class ForeignFetchRequestHandlerTest : public testing::Test {
     ForeignFetchRequestHandler::InitializeHandler(
         request_.get(), context_wrapper(), &blob_storage_context_,
         helper_->mock_render_process_id(), kMockProviderId,
-        SkipServiceWorker::NONE, FETCH_REQUEST_MODE_CORS,
+        ServiceWorkerMode::ALL, FETCH_REQUEST_MODE_CORS,
         FETCH_CREDENTIALS_MODE_OMIT, FetchRedirectMode::FOLLOW_MODE,
         resource_type, REQUEST_CONTEXT_TYPE_FETCH,
         REQUEST_CONTEXT_FRAME_TYPE_NONE, nullptr,

content/browser/service_worker/service_worker_fetch_dispatcher.cc

@@ -557,7 +557,7 @@ bool ServiceWorkerFetchDispatcher::MaybeStartNavigationPreload(
   // for the service worker navigation preload request.
   request.resource_type = RESOURCE_TYPE_SUB_RESOURCE;
   request.priority = original_request->priority();
-  request.skip_service_worker = SkipServiceWorker::ALL;
+  request.service_worker_mode = ServiceWorkerMode::NONE;
   request.do_not_prompt_for_login = true;
   request.render_frame_id = original_info->GetRenderFrameID();
   request.is_main_frame = original_info->IsMainFrame();

content/child/web_url_loader_impl.cc

@@ -571,8 +571,8 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
       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 =
@@ -667,8 +667,8 @@ bool WebURLLoaderImpl::Context::OnReceivedRedirect(
   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) {
@@ -1162,7 +1162,7 @@ void WebURLLoaderImpl::PopulateURLResponse(const GURL& url,
 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);
@@ -1172,7 +1172,7 @@ WebURLRequest WebURLLoaderImpl::PopulateURLRequestForRedirect(
   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());

content/child/web_url_loader_impl.h

@@ -53,7 +53,7 @@ class CONTENT_EXPORT WebURLLoaderImpl
   static blink::WebURLRequest PopulateURLRequestForRedirect(
       const blink::WebURLRequest& request,
       const net::RedirectInfo& redirect_info,
-      blink::WebURLRequest::SkipServiceWorker skip_service_worker);
+      blink::WebURLRequest::ServiceWorkerMode service_worker_mode);
 
   // WebURLLoader methods:
   void loadSynchronously(const blink::WebURLRequest& request,

content/child/web_url_request_util.cc

@@ -485,16 +485,16 @@ blink::WebMixedContentContextType GetMixedContentContextTypeForWebURLRequest(
       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);
-
-SkipServiceWorker GetSkipServiceWorkerForWebURLRequest(
+STATIC_ASSERT_ENUM(ServiceWorkerMode::NONE,
+                   WebURLRequest::ServiceWorkerMode::None);
+STATIC_ASSERT_ENUM(ServiceWorkerMode::FOREIGN,
+                   WebURLRequest::ServiceWorkerMode::Foreign);
+STATIC_ASSERT_ENUM(ServiceWorkerMode::ALL,
+                   WebURLRequest::ServiceWorkerMode::All);
+
+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,

content/child/web_url_request_util.h

@@ -59,7 +59,7 @@ RequestContextType GetRequestContextTypeForWebURLRequest(
     const blink::WebURLRequest& request);
 blink::WebMixedContentContextType GetMixedContentContextTypeForWebURLRequest(
     const blink::WebURLRequest& request);
-SkipServiceWorker GetSkipServiceWorkerForWebURLRequest(
+ServiceWorkerMode GetServiceWorkerModeForWebURLRequest(
     const blink::WebURLRequest& request);
 
 // Generates a WebURLError based on |reason|.

content/common/resource_messages.h

@@ -130,8 +130,8 @@ IPC_ENUM_TRAITS_MAX_VALUE(content::FetchCredentialsMode,
 IPC_ENUM_TRAITS_MAX_VALUE(content::FetchRedirectMode,
                           content::FetchRedirectMode::LAST)
 
-IPC_ENUM_TRAITS_MAX_VALUE(content::SkipServiceWorker,
-                          content::SkipServiceWorker::LAST)
+IPC_ENUM_TRAITS_MAX_VALUE(content::ServiceWorkerMode,
+                          content::ServiceWorkerMode::LAST)
 
 IPC_ENUM_TRAITS_MAX_VALUE(net::EffectiveConnectionType,
                           net::EFFECTIVE_CONNECTION_TYPE_LAST - 1)
@@ -230,7 +230,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::ResourceRequest)
   IPC_STRUCT_TRAITS_MEMBER(should_reset_appcache)
   IPC_STRUCT_TRAITS_MEMBER(service_worker_provider_id)
   IPC_STRUCT_TRAITS_MEMBER(originated_from_service_worker)
-  IPC_STRUCT_TRAITS_MEMBER(skip_service_worker)
+  IPC_STRUCT_TRAITS_MEMBER(service_worker_mode)
   IPC_STRUCT_TRAITS_MEMBER(fetch_request_mode)
   IPC_STRUCT_TRAITS_MEMBER(fetch_credentials_mode)
   IPC_STRUCT_TRAITS_MEMBER(fetch_redirect_mode)

content/common/resource_request.h

@@ -102,8 +102,9 @@ struct CONTENT_EXPORT ResourceRequest {
   // fetch() in the Service Worker script.
   bool originated_from_service_worker = false;
 
-  // Indicates which types of ServiceWorkers should skip handling this request.
-  SkipServiceWorker skip_service_worker = SkipServiceWorker::NONE;
+  // The service worker mode that indicates which service workers should get
+  // events for this request.
+  ServiceWorkerMode service_worker_mode = ServiceWorkerMode::ALL;
 
   // The request mode passed to the ServiceWorker.
   FetchRequestMode fetch_request_mode = FETCH_REQUEST_MODE_SAME_ORIGIN;

content/common/service_worker/service_worker_types.h

@@ -98,17 +98,18 @@ enum class FetchRedirectMode {
   LAST = MANUAL_MODE
 };
 
-// Indicates which types of ServiceWorkers should skip handling a request.
-enum class SkipServiceWorker {
-  // Request can be handled both by a controlling same-origin worker and
-  // a cross-origin foreign fetch service worker.
-  NONE,
-  // Request should not be handled by a same-origin controlling worker,
-  // but can be intercepted by a foreign fetch service worker.
-  CONTROLLING,
-  // Request should skip all possible service workers.
+// Indicates which service workers will receive fetch events for this request.
+enum class ServiceWorkerMode {
+  // Relevant local and foreign service workers will get a fetch or
+  // foreignfetch event for this request.
   ALL,
-  LAST = ALL
+  // Only relevant foreign service workers will get a foreignfetch event for
+  // this request.
+  FOREIGN,
+  // Neither local nor foreign service workers will get events for this
+  // request.
+  NONE,
+  LAST = NONE
 };
 
 // Indicates how the service worker handled a fetch event.

content/public/renderer/associated_resource_fetcher.h

@@ -42,8 +42,8 @@ class CONTENT_EXPORT AssociatedResourceFetcher {
   // the request, and the callback will never be run.
   static AssociatedResourceFetcher* Create(const GURL& url);
 
-  virtual void SetSkipServiceWorker(
-      blink::WebURLRequest::SkipServiceWorker skip_service_worker) = 0;
+  virtual void SetServiceWorkerMode(
+      blink::WebURLRequest::ServiceWorkerMode service_worker_mode) = 0;
   virtual void SetCachePolicy(blink::WebCachePolicy policy) = 0;
 
   // Associate the corresponding WebURLLoaderOptions to the loader. Must be

content/renderer/fetchers/associated_resource_fetcher_impl.cc

@@ -127,12 +127,12 @@ AssociatedResourceFetcherImpl::~AssociatedResourceFetcherImpl() {
     loader_->cancel();
 }
 
-void AssociatedResourceFetcherImpl::SetSkipServiceWorker(
-    blink::WebURLRequest::SkipServiceWorker skip_service_worker) {
+void AssociatedResourceFetcherImpl::SetServiceWorkerMode(
+    blink::WebURLRequest::ServiceWorkerMode service_worker_mode) {
   DCHECK(!request_.isNull());
   DCHECK(!loader_);
 
-  request_.setSkipServiceWorker(skip_service_worker);
+  request_.setServiceWorkerMode(service_worker_mode);
 }
 
 void AssociatedResourceFetcherImpl::SetCachePolicy(

content/renderer/fetchers/associated_resource_fetcher_impl.h

@@ -29,8 +29,8 @@ namespace content {
 class AssociatedResourceFetcherImpl : public AssociatedResourceFetcher {
  public:
   // AssociatedResourceFetcher implementation:
-  void SetSkipServiceWorker(
-      blink::WebURLRequest::SkipServiceWorker skip_service_worker) override;
+  void SetServiceWorkerMode(
+      blink::WebURLRequest::ServiceWorkerMode service_worker_mode) override;
   void SetCachePolicy(blink::WebCachePolicy policy) override;
   void SetLoaderOptions(
       const blink::WebAssociatedURLLoaderOptions& options) override;

content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc

@@ -44,7 +44,7 @@ MultiResolutionImageResourceFetcher::MultiResolutionImageResourceFetcher(
   // workers. This should ideally not happen or at least not all the time.
   // See https://crbug.com/448427
   if (request_context == WebURLRequest::RequestContextFavicon)
-    fetcher_->SetSkipServiceWorker(WebURLRequest::SkipServiceWorker::All);
+    fetcher_->SetServiceWorkerMode(WebURLRequest::ServiceWorkerMode::None);
 
   fetcher_->SetCachePolicy(cache_policy);
 

content/renderer/pepper/pepper_url_loader_host.cc

@@ -260,10 +260,10 @@ int32_t PepperURLLoaderHost::InternalOnHostMsgOpen(
   web_request.setRequestorProcessID(renderer_ppapi_host_->GetPluginPID());
   // The requests from the plugins with private permission which can bypass same
   // origin must skip the ServiceWorker.
-  web_request.setSkipServiceWorker(
+  web_request.setServiceWorkerMode(
       host()->permissions().HasPermission(ppapi::PERMISSION_PRIVATE)
-          ? WebURLRequest::SkipServiceWorker::All
-          : WebURLRequest::SkipServiceWorker::None);
+          ? WebURLRequest::ServiceWorkerMode::None
+          : WebURLRequest::ServiceWorkerMode::All);
 
   WebAssociatedURLLoaderOptions options;
   if (has_universal_access_) {

content/renderer/render_frame_impl.cc

@@ -4280,15 +4280,15 @@ void RenderFrameImpl::willSendRequest(blink::WebLocalFrame* frame,
     provider_id = provider->provider_id();
     // If the provider does not have a controller at this point, the renderer
     // expects the request to never be handled by a controlling service worker,
-    // so set the SkipServiceWorker flag here. Otherwise, a service worker that
-    // is in the process of becoming the controller (i.e., via claim()) on the
-    // browser-side could handle the request and break the assumptions of the
-    // renderer.
+    // so set the ServiceWorkerMode to skip local workers here. Otherwise, a
+    // service worker that is in the process of becoming the controller (i.e.,
+    // via claim()) on the browser-side could handle the request and break
+    // the assumptions of the renderer.
     if (!provider->IsControlledByServiceWorker() &&
-        request.skipServiceWorker() !=
-            blink::WebURLRequest::SkipServiceWorker::All) {
-      request.setSkipServiceWorker(
-          blink::WebURLRequest::SkipServiceWorker::Controlling);
+        request.getServiceWorkerMode() !=
+            blink::WebURLRequest::ServiceWorkerMode::None) {
+      request.setServiceWorkerMode(
+          blink::WebURLRequest::ServiceWorkerMode::Foreign);
     }
   }
 
@@ -6278,8 +6278,8 @@ void RenderFrameImpl::BeginNavigation(const NavigationPolicyInfo& info) {
   BeginNavigationParams begin_navigation_params(
       GetWebURLRequestHeaders(info.urlRequest), load_flags,
       info.urlRequest.hasUserGesture(),
-      info.urlRequest.skipServiceWorker() !=
-          blink::WebURLRequest::SkipServiceWorker::None,
+      info.urlRequest.getServiceWorkerMode() !=
+          blink::WebURLRequest::ServiceWorkerMode::All,
       GetRequestContextTypeForWebURLRequest(info.urlRequest),
       GetMixedContentContextTypeForWebURLRequest(info.urlRequest),
       initiator_origin);

content/renderer/shared_worker/embedded_shared_worker_stub.cc

@@ -96,17 +96,17 @@ class WebServiceWorkerNetworkProviderImpl
     request.setExtraData(extra_data.release());
     // If the provider does not have a controller at this point, the renderer
     // expects subresource requests to never be handled by a controlling service
-    // worker, so set the SkipServiceWorker flag here. Otherwise, a service
-    // worker that is in the process of becoming the controller (i.e., via
-    // claim()) on the browser-side could handle the request and break the
-    // assumptions of the renderer.
+    // worker, so set the ServiceWorkerMode to skip local workers here.
+    // Otherwise, a service worker that is in the process of becoming the
+    // controller (i.e., via claim()) on the browser-side could handle the
+    // request and break the assumptions of the renderer.
     if (request.getRequestContext() !=
             blink::WebURLRequest::RequestContextSharedWorker &&
         !provider->IsControlledByServiceWorker() &&
-        request.skipServiceWorker() !=
-            blink::WebURLRequest::SkipServiceWorker::All) {
-      request.setSkipServiceWorker(
-          blink::WebURLRequest::SkipServiceWorker::Controlling);
+        request.getServiceWorkerMode() !=
+            blink::WebURLRequest::ServiceWorkerMode::None) {
+      request.setServiceWorkerMode(
+          blink::WebURLRequest::ServiceWorkerMode::Foreign);
     }
   }
 

third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp

@@ -686,7 +686,7 @@ void InspectorNetworkAgent::willSendRequest(
     request.setShouldResetAppCache(true);
   }
   if (m_state->booleanProperty(NetworkAgentState::bypassServiceWorker, false))
-    request.setSkipServiceWorker(WebURLRequest::SkipServiceWorker::All);
+    request.setServiceWorkerMode(WebURLRequest::ServiceWorkerMode::None);
 
   willSendRequestInternal(frame, identifier, loader, request, redirectResponse,
                           initiatorInfo);