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

Source/modules/serviceworkers/Request.cpp

Index: Source/modules/serviceworkers/Request.cpp
diff --git a/Source/modules/serviceworkers/Request.cpp b/Source/modules/serviceworkers/Request.cpp
index 429da069f214b04739f6e478f0eec446f5b1e5c5..fd334f28b7d09a581ef80e95d3275c13f71354a2 100644
--- a/Source/modules/serviceworkers/Request.cpp
+++ b/Source/modules/serviceworkers/Request.cpp
@@ -16,20 +16,21 @@
 #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.
@@ -41,11 +42,11 @@ Request* Request::createRequestWithRequestData(ExecutionContext* context, FetchR
     // "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.
@@ -85,7 +86,7 @@ Request* Request::createRequestWithRequestData(ExecutionContext* context, FetchR
     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())) {
@@ -157,7 +158,7 @@ Request* Request::create(ExecutionContext* context, const String& input, const D
     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)
@@ -184,8 +185,8 @@ Request* Request::create(ExecutionContext* context, Request* input, const Dictio
     // "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);
 }
 
@@ -263,12 +264,12 @@ 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();
@@ -281,11 +282,11 @@ String Request::credentials() const
     // 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();