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

Source/modules/serviceworkers/Request.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 "Request.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/FetchUtils.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/loader/ThreadableLoader.h"
 #include "modules/serviceworkers/FetchManager.h"
 #include "modules/serviceworkers/RequestInit.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/Referrer.h"
 #include "public/platform/WebServiceWorkerRequest.h"
+#include "public/platform/WebURLRequest.h"
 
 namespace blink {
 
-Request* Request::createRequestWithRequestData(ExecutionContext* context, FetchRequestData* request, const RequestInit& init, FetchRequestData::Mode mode, FetchRequestData::Credentials credentials, ExceptionState& exceptionState)
+Request* Request::createRequestWithRequestData(ExecutionContext* context, FetchRequestData* request, const RequestInit& init, WebURLRequest::FetchRequestMode mode, WebURLRequest::FetchCredentialsMode credentials, ExceptionState& exceptionState)
 {
     // "7. Let |mode| be |init|'s mode member if it is present, and
     // |fallbackMode| otherwise."
     // "8. If |mode| is non-null, set |request|'s mode to |mode|."
     if (init.mode == "same-origin") {
-        request->setMode(FetchRequestData::SameOriginMode);
+        request->setMode(WebURLRequest::FetchRequestModeSameOrigin);
     } else if (init.mode == "no-cors") {
-        request->setMode(mode = FetchRequestData::NoCORSMode);
+        request->setMode(mode = WebURLRequest::FetchRequestModeNoCORS);
     } else if (init.mode == "cors") {
-        request->setMode(FetchRequestData::CORSMode);
+        request->setMode(WebURLRequest::FetchRequestModeCORS);
     } else {
         // Instead of using null as a special fallback value, we pass the
         // current mode in Request::create(). So we just set here.
         request->setMode(mode);
     }
 
     // "9. Let |credentials| be |init|'s credentials member if it is present,
     // and |fallbackCredentials| otherwise."
     // "10. If |credentials| is non-null, set |request|'s credentials mode to
     // |credentials|.
     if (init.credentials == "omit") {
-        request->setCredentials(FetchRequestData::OmitCredentials);
+        request->setCredentials(WebURLRequest::FetchCredentialsModeOmit);
     } else if (init.credentials == "same-origin") {
-        request->setCredentials(FetchRequestData::SameOriginCredentials);
+        request->setCredentials(WebURLRequest::FetchCredentialsModeSameOrigin);
     } else if (init.credentials == "include") {
-        request->setCredentials(FetchRequestData::IncludeCredentials);
+        request->setCredentials(WebURLRequest::FetchCredentialsModeInclude);
     } else {
         // Instead of using null as a special fallback value, we pass the
         // current credentials in Request::create(). So we just set here.
         request->setCredentials(credentials);
     }
 
     // "11. If |init|'s method member is present, let |method| be it and run
     // these substeps:"
     if (!init.method.isEmpty()) {
         // "1. If |method| is not a useful method, throw a TypeError."
@@ skipping 19 matching lines @@
     // We don't create a copy of r's Headers object when init's headers member
     // is present.
     Headers* headers = 0;
     if (!init.headers && init.headersDictionary.isUndefinedOrNull()) {
         headers = r->headers()->createCopy();
     }
     // "15. Empty |r|'s request's header list."
     r->clearHeaderList();
 
     // "16. If |r|'s request's mode is no CORS, run these substeps:
-    if (r->request()->mode() == FetchRequestData::NoCORSMode) {
+    if (r->request()->mode() == WebURLRequest::FetchRequestModeNoCORS) {
         // "1. If |r|'s request's method is not a simple method, throw a
         // TypeError."
         if (!FetchUtils::isSimpleMethod(r->request()->method())) {
             exceptionState.throwTypeError("'" + r->request()->method() + "' is unsupported in no-cors mode.");
             return 0;
         }
         // "Set |r|'s Headers object's guard to |request-no-CORS|.
         r->headers()->setGuard(Headers::RequestNoCORSGuard);
     }
 
@@ skipping 51 matching lines @@
     KURL parsedURL = context->completeURL(input);
     // "2. If |parsedURL| is failure, throw a TypeError."
     if (!parsedURL.isValid()) {
         exceptionState.throwTypeError("Invalid URL");
         return 0;
     }
     // "3. Set |request|'s url to |parsedURL|."
     request->setURL(parsedURL);
     // "4. Set |fallbackMode| to CORS."
     // "5. Set |fallbackCredentials| to omit."
-    return createRequestWithRequestData(context, request, RequestInit(context, init, exceptionState), FetchRequestData::CORSMode, FetchRequestData::OmitCredentials, exceptionState);
+    return createRequestWithRequestData(context, request, RequestInit(context, init, exceptionState), WebURLRequest::FetchRequestModeCORS, WebURLRequest::FetchCredentialsModeOmit, exceptionState);
 }
 
 Request* Request::create(ExecutionContext* context, Request* input, ExceptionState& exceptionState)
 {
     return create(context, input, Dictionary(), exceptionState);
 }
 
 Request* Request::create(ExecutionContext* context, Request* input, const Dictionary& init, ExceptionState& exceptionState)
 {
     // "1. If input is a Request object, run these substeps:"
     // "  1. If input's used flag is set, throw a TypeError."
     // "  2. Set input's used flag."
     if (input->bodyUsed()) {
         exceptionState.throwTypeError(
             "Cannot construct a Request with a Request object that has already been used.");
         return 0;
     }
     input->setBodyUsed();
     // "2. Let |request| be |input|'s associated request, if |input| is a
     // Request object, and a new request otherwise."
     // "3. Set |request| to a restricted copy of itself."
     FetchRequestData* request(input->request()->createRestrictedCopy(context, SecurityOrigin::create(context->url())));
     // "4. Let |fallbackMode| be null."
     // "5. Let |fallbackCredentials| be null."
     // Instead of using null as a special fallback value, just pass the current
     // mode and credentials; it has the same effect.
-    const FetchRequestData::Mode currentMode = request->mode();
-    const FetchRequestData::Credentials currentCredentials = request->credentials();
+    const WebURLRequest::FetchRequestMode currentMode = request->mode();
+    const WebURLRequest::FetchCredentialsMode currentCredentials = request->credentials();
     return createRequestWithRequestData(context, request, RequestInit(context, init, exceptionState), currentMode, currentCredentials, exceptionState);
 }
 
 Request* Request::create(ExecutionContext* context, FetchRequestData* request)
 {
     Request* r = new Request(context, request);
     r->suspendIfNeeded();
     return r;
 }
 
@@ skipping 57 matching lines @@
     // request's referrer is none, and request's referrer, serialized,
     // otherwise."
     return m_request->referrer().referrer().referrer;
 }
 
 String Request::mode() const
 {
     // "The mode attribute's getter must return the value corresponding to the
     // first matching statement, switching on request's mode:"
     switch (m_request->mode()) {
-    case FetchRequestData::SameOriginMode:
+    case WebURLRequest::FetchRequestModeSameOrigin:
         return "same-origin";
-    case FetchRequestData::NoCORSMode:
+    case WebURLRequest::FetchRequestModeNoCORS:
         return "no-cors";
-    case FetchRequestData::CORSMode:
-    case FetchRequestData::CORSWithForcedPreflight:
+    case WebURLRequest::FetchRequestModeCORS:
+    case WebURLRequest::FetchRequestModeCORSWithForcedPreflight:
         return "cors";
     }
     ASSERT_NOT_REACHED();
     return "";
 }
 
 String Request::credentials() const
 {
     // "The credentials attribute's getter must return the value corresponding
     // to the first matching statement, switching on request's credentials
     // mode:"
     switch (m_request->credentials()) {
-    case FetchRequestData::OmitCredentials:
+    case WebURLRequest::FetchCredentialsModeOmit:
         return "omit";
-    case FetchRequestData::SameOriginCredentials:
+    case WebURLRequest::FetchCredentialsModeSameOrigin:
         return "same-origin";
-    case FetchRequestData::IncludeCredentials:
+    case WebURLRequest::FetchCredentialsModeInclude:
         return "include";
     }
     ASSERT_NOT_REACHED();
     return "";
 }
 
 Request* Request::clone() const
 {
     return Request::create(*this);
 }
@@ skipping 30 matching lines @@
 }
 
 void Request::trace(Visitor* visitor)
 {
     Body::trace(visitor);
     visitor->trace(m_request);
     visitor->trace(m_headers);
 }
 
 } // namespace blink