Move fetch-related predicates to core/fetch.

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/CrossOriginAccessControl.h"
+#include "core/fetch/FetchUtils.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/loader/ThreadableLoader.h"
 #include "core/xml/XMLHttpRequest.h"
 #include "modules/serviceworkers/FetchManager.h"
 #include "modules/serviceworkers/RequestInit.h"
 #include "platform/NotImplemented.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/Referrer.h"
 #include "public/platform/WebServiceWorkerRequest.h"
@@ skipping 32 matching lines @@
     } 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);
     }
 
     // "10. 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."
-        if (!FetchManager::isUsefulMethod(init.method)) {
+        if (!FetchUtils::isUsefulMethod(init.method)) {
             exceptionState.throwTypeError("'" + init.method + "' HTTP method is unsupported.");
             return nullptr;
         }
         if (!isValidHTTPToken(init.method)) {
             exceptionState.throwTypeError("'" + init.method + "' is not a valid HTTP method.");
             return nullptr;
         }
         // FIXME: "2. Add case correction as in XMLHttpRequest?"
         // "3. Set |request|'s method to |method|."
         request->setMethod(XMLHttpRequest::uppercaseKnownHTTPMethod(AtomicString(init.method)));
@@ skipping 11 matching lines @@
     if (!init.headers && init.headersDictionary.isUndefinedOrNull()) {
         headers = r->headers()->createCopy();
     }
     // "14. Empty |r|'s request's header list."
     r->request()->headerList()->clearList();
 
     // "15. If |r|'s request's mode is no CORS, run these substeps:
     if (r->request()->mode() == FetchRequestData::NoCORSMode) {
         // "1. If |r|'s request's method is not a simple method, throw a
         // TypeError."
-        if (!FetchManager::isSimpleMethod(r->request()->method())) {
+        if (!FetchUtils::isSimpleMethod(r->request()->method())) {
             exceptionState.throwTypeError("'" + r->request()->method() + "' is unsupported in no-cors mode.");
             return nullptr;
         }
         // "Set |r|'s Headers object's guard to |request-no-CORS|.
         r->headers()->setGuard(Headers::RequestNoCORSGuard);
     }
 
     // "16. Fill |r|'s Headers object with |headers|. Rethrow any exceptions."
     if (init.headers) {
         ASSERT(init.headersDictionary.isUndefinedOrNull());
@@ skipping 149 matching lines @@
     return "";
 }
 
 void Request::trace(Visitor* visitor)
 {
     visitor->trace(m_request);
     visitor->trace(m_headers);
 }
 
 } // namespace blink