Rename SkipServiceWorker to ServiceWorkerMode

third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2007 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 308 matching lines @@
     const WebURLResponse& webURLResponse,
     std::unique_ptr<WebDataConsumerHandle> handle) {
   DCHECK(!webURLResponse.isNull());
 
   const ResourceResponse& response = webURLResponse.toResourceResponse();
 
   if (response.wasFetchedViaServiceWorker()) {
     if (m_resource->options().corsEnabled == IsCORSEnabled &&
         response.wasFallbackRequiredByServiceWorker()) {
       ResourceRequest request = m_resource->lastResourceRequest();
-      DCHECK_EQ(request.skipServiceWorker(),
-                WebURLRequest::SkipServiceWorker::None);
+      DCHECK_EQ(request.getServiceWorkerMode(),
+                WebURLRequest::ServiceWorkerMode::All);
       // This code handles the case when a regular controlling service worker
       // doesn't handle a cross origin request. When this happens we still want
       // to give foreign fetch a chance to handle the request, so only skip the
       // controlling service worker for the fallback request. This is currently
       // safe because of http://crbug.com/604084 the
       // wasFallbackRequiredByServiceWorker flag is never set when foreign fetch
       // handled a request.
       if (!context().shouldLoadNewResource(m_resource->getType())) {
         // Cancel the request if we should not trigger a reload now.
         handleError(ResourceError::cancelledError(response.url()));
         return;
       }
-      request.setSkipServiceWorker(
-          WebURLRequest::SkipServiceWorker::Controlling);
+      request.setServiceWorkerMode(WebURLRequest::ServiceWorkerMode::Foreign);
       restart(request);
       return;
     }
 
     // If the response is fetched via ServiceWorker, the original URL of the
     // response could be different from the URL of the request. We check the URL
     // not to load the resources which are forbidden by the page CSP.
     // https://w3c.github.io/webappsec-csp/#should-block-response
     const KURL& originalURL = response.originalURLViaServiceWorker();
     if (!originalURL.isEmpty()) {
@@ skipping 166 matching lines @@
     return;
 
   // Don't activate if cache policy is explicitly set.
   if (request.getCachePolicy() != WebCachePolicy::UseProtocolCachePolicy)
     return;
 
   m_isCacheAwareLoadingActivated = true;
 }
 
 }  // namespace blink