Move fetch-related predicates to core/fetch.

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"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/ExceptionCode.h"
+#include "core/fetch/FetchUtils.h"
 #include "core/fileapi/Blob.h"
 #include "core/loader/ThreadableLoader.h"
 #include "core/loader/ThreadableLoaderClient.h"
-#include "core/xml/XMLHttpRequest.h"
 #include "modules/serviceworkers/FetchRequestData.h"
 #include "modules/serviceworkers/Response.h"
 #include "modules/serviceworkers/ResponseInit.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/WebURLRequest.h"
 #include "wtf/HashSet.h"
 
 namespace blink {
 
@@ skipping 166 matching lines @@
         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
         || (m_request->unsafeRequestFlag()
-            && (!isSimpleMethod(m_request->method())
+            && (!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();
         return;
     }
@@ skipping 131 matching lines @@
     Loader* loader = m_loaders.add(ownLoader.release()).storedValue->get();
     loader->start();
     return promise;
 }
 
 void FetchManager::onLoaderFinished(Loader* loader)
 {
     m_loaders.remove(loader);
 }
 
-bool FetchManager::isSimpleMethod(const String& method)
-{
-    // "A simple method is a method that is `GET`, `HEAD`, or `POST`."
-    return isOnAccessControlSimpleRequestMethodWhitelist(method);
-}
-
-bool FetchManager::isForbiddenMethod(const String& method)
-{
-    // "A forbidden method is a method that is a byte case-insensitive match for
-    // one of `CONNECT`, `TRACE`, and `TRACK`."
-    return !XMLHttpRequest::isAllowedHTTPMethod(method);
-}
-
-bool FetchManager::isUsefulMethod(const String& method)
-{
-    // "A useful method is a method that is not a forbidden method."
-    // "A forbidden method is a method that is a byte case-insensitive match for
-    // one of `CONNECT`, `TRACE`, and `TRACK`."
-    return XMLHttpRequest::isAllowedHTTPMethod(method);
-}
-
 } // namespace blink