[ServiceWorker] Stop using FetchRequestData::Mode and FetchRequestData::Credentials.

Source/modules/serviceworkers/FetchManager.cpp

 // 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 "config.h"
 #include "FetchManager.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 157 matching lines @@
     // "- |request|'s url's scheme is 'about'"
     if ((SecurityOrigin::create(m_request->url())->isSameSchemeHostPort(m_request->origin().get()) && !m_corsFlag)
         || (m_request->url().protocolIsData() && m_request->sameOriginDataURLFlag())
         || (m_request->url().protocolIsAbout())) {
         // "The result of performing a basic fetch using request."
         performBasicFetch();
         return;
     }
 
     // "- |request|'s mode is |same-origin|"
-    if (m_request->mode() == FetchRequestData::SameOriginMode) {
+    if (m_request->mode() == WebURLRequest::FetchRequestModeSameOrigin) {
         // "A network error."
         performNetworkError();
         return;
     }
 
     // "- |request|'s mode is |no CORS|"
-    if (m_request->mode() == FetchRequestData::NoCORSMode) {
+    if (m_request->mode() == WebURLRequest::FetchRequestModeNoCORS) {
         // "Set |request|'s response tainting to |opaque|."
         m_request->setResponseTainting(FetchRequestData::OpaqueTainting);
         // "The result of performing a basic fetch using |request|."
         performBasicFetch();
         return;
     }
 
     // "- |request|'s url's scheme is not one of 'http' and 'https'"
     if (!m_request->url().protocolIsInHTTPFamily()) {
         // "A network error."
         performNetworkError();
         return;
     }
 
     // "- |request|'s mode is |CORS-with-forced-preflight|.
     // "- |request|'s unsafe request flag is set and either |request|'s method
     // is not a simple method or a header in |request|'s header list is not a
     // simple header"
-    if (m_request->mode() == FetchRequestData::CORSWithForcedPreflight
+    if (m_request->mode() == WebURLRequest::FetchRequestModeCORSWithForcedPreflight
         || (m_request->unsafeRequestFlag()
             && (!FetchUtils::isSimpleMethod(m_request->method())
                 || m_request->headerList()->containsNonSimpleHeader()))) {
         // "Set |request|'s response tainting to |CORS|."
         m_request->setResponseTainting(FetchRequestData::CORSTainting);
         // "The result of performing an HTTP fetch using |request| with the
         // |CORS flag| and |CORS preflight flag| set."
         m_corsFlag = true;
         m_corsPreflightFlag = true;
         performHTTPFetch();
@@ skipping 81 matching lines @@
     // |HTTPRequest|'s origin, serialized and utf-8 encoded, to |HTTPRequest|'s
     // header list."
     // We set Origin header in updateRequestForAccessControl() called from
     // DocumentThreadableLoader::makeCrossOriginAccessRequest
 
     // "5. Let |credentials flag| be set if either |HTTPRequest|'s credentials
     // mode is |include|, or |HTTPRequest|'s credentials mode is |same-origin|
     // and the |CORS flag| is unset, and unset otherwise.
     ResourceLoaderOptions resourceLoaderOptions;
     resourceLoaderOptions.dataBufferingPolicy = DoNotBufferData;
-    if (m_request->credentials() == FetchRequestData::IncludeCredentials
-        || (m_request->credentials() == FetchRequestData::SameOriginCredentials && !m_corsFlag)) {
+    if (m_request->credentials() == WebURLRequest::FetchCredentialsModeInclude
+        || (m_request->credentials() == WebURLRequest::FetchCredentialsModeSameOrigin && !m_corsFlag)) {
         resourceLoaderOptions.allowCredentials = AllowStoredCredentials;
     }
 
     ThreadableLoaderOptions threadableLoaderOptions;
     if (m_corsPreflightFlag)
         threadableLoaderOptions.preflightPolicy = ForcePreflight;
     if (m_corsFlag)
         threadableLoaderOptions.crossOriginRequestPolicy = UseAccessControl;
     else
         threadableLoaderOptions.crossOriginRequestPolicy = AllowCrossOriginRequests;
@@ skipping 43 matching lines @@
     loader->start();
     return promise;
 }
 
 void FetchManager::onLoaderFinished(Loader* loader)
 {
     m_loaders.remove(loader);
 }
 
 } // namespace blink