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

Source/modules/serviceworkers/FetchRequestData.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 "FetchRequestData.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/ResourceLoaderOptions.h"
@@ skipping 22 matching lines @@
 
 FetchRequestData* FetchRequestData::create(const WebServiceWorkerRequest& webRequest)
 {
     FetchRequestData* request = FetchRequestData::create();
     request->m_url = webRequest.url();
     request->m_method = webRequest.method();
     for (HTTPHeaderMap::const_iterator it = webRequest.headers().begin(); it != webRequest.headers().end(); ++it)
         request->m_headerList->append(it->key, it->value);
     request->m_blobDataHandle = webRequest.blobDataHandle();
     request->m_referrer.setURL(webRequest.referrer());
-    switch (webRequest.mode()) {
-    case WebURLRequest::FetchRequestModeSameOrigin:
-        request->setMode(FetchRequestData::SameOriginMode);
-        break;
-    case WebURLRequest::FetchRequestModeNoCORS:
-        request->setMode(FetchRequestData::NoCORSMode);
-        break;
-    case WebURLRequest::FetchRequestModeCORS:
-        request->setMode(FetchRequestData::CORSMode);
-        break;
-    case WebURLRequest::FetchRequestModeCORSWithForcedPreflight:
-        request->setMode(FetchRequestData::CORSWithForcedPreflight);
-    }
-    switch (webRequest.credentialsMode()) {
-    case WebURLRequest::FetchCredentialsModeOmit:
-        request->setCredentials(FetchRequestData::OmitCredentials);
-        break;
-    case WebURLRequest::FetchCredentialsModeSameOrigin:
-        request->setCredentials(FetchRequestData::SameOriginCredentials);
-        break;
-    case WebURLRequest::FetchCredentialsModeInclude:
-        request->setCredentials(FetchRequestData::IncludeCredentials);
-        break;
-    }
+    request->setMode(webRequest.mode());
+    request->setCredentials(webRequest.credentialsMode());
     return request;
 }
 
 FetchRequestData* FetchRequestData::createRestrictedCopy(ExecutionContext* context, PassRefPtr<SecurityOrigin> origin) const
 {
     // "To make a restricted copy of a request |request|, run these steps:
     // 1. Let |r| be a new request whose url is |request|'s url, method is
     // |request|'s method, header list is a copy of |request|'s header list,
     // body is a tee of |request|'s body, client is entry settings object's
     // global object, origin is entry settings object's origin, referrer is
@@ skipping 37 matching lines @@
 FetchRequestData::~FetchRequestData()
 {
 }
 
 FetchRequestData::FetchRequestData()
     : m_method("GET")
     , m_headerList(FetchHeaderList::create())
     , m_unsafeRequestFlag(false)
     , m_context(NullContext)
     , m_sameOriginDataURLFlag(false)
-    , m_mode(NoCORSMode)
-    , m_credentials(OmitCredentials)
+    , m_mode(WebURLRequest::FetchRequestModeNoCORS)
+    , m_credentials(WebURLRequest::FetchCredentialsModeOmit)
     , m_responseTainting(BasicTainting)
 {
 }
 
 void FetchRequestData::trace(Visitor* visitor)
 {
     visitor->trace(m_headerList);
 }
 
 } // namespace blink