Move fetch-related predicates to core/fetch.

Source/modules/serviceworkers/Headers.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 "modules/serviceworkers/Headers.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
-#include "core/fetch/CrossOriginAccessControl.h"
+#include "core/fetch/FetchUtils.h"
 #include "core/xml/XMLHttpRequest.h"
 #include "modules/serviceworkers/HeadersForEachCallback.h"
 #include "wtf/NotFound.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 PassRefPtrWillBeRawPtr<Headers> Headers::create()
@@ skipping 62 matching lines @@
         exceptionState.throwTypeError("Invalid value");
         return;
     }
     // "2. If guard is |request|, throw a TypeError."
     if (m_guard == ImmutableGuard) {
         exceptionState.throwTypeError("Headers are immutable");
         return;
     }
     // "3. Otherwise, if guard is |request| and |name| is a forbidden header
     //     name, return."
-    if (m_guard == RequestGuard && FetchHeaderList::isForbiddenHeaderName(name))
+    if (m_guard == RequestGuard && FetchUtils::isForbiddenHeaderName(name))
         return;
     // "4. Otherwise, if guard is |request-no-CORS| and |name|/|value| is not a
     //     simple header, return."
-    if (m_guard == RequestNoCORSGuard && !FetchHeaderList::isSimpleHeader(name, value))
+    if (m_guard == RequestNoCORSGuard && !FetchUtils::isSimpleHeader(AtomicString(name), AtomicString(value)))
         return;
     // "5. Otherwise, if guard is |response| and |name| is a forbidden response
     //     header name, return."
-    if (m_guard == ResponseGuard && FetchHeaderList::isForbiddenResponseHeaderName(name))
+    if (m_guard == ResponseGuard && FetchUtils::isForbiddenResponseHeaderName(name))
         return;
     // "6. Append |name|/|value| to header list."
     m_headerList->append(name, value);
 }
 
 void Headers::remove(const String& name, ExceptionState& exceptionState)
 {
     // "The delete(|name|) method, when invoked, must run these steps:"
     // "1. If name is not a name, throw a TypeError."
     if (!FetchHeaderList::isValidHeaderName(name)) {
         exceptionState.throwTypeError("Invalid name");
         return;
     }
     // "2. If guard is |immutable|, throw a TypeError."
     if (m_guard == ImmutableGuard) {
         exceptionState.throwTypeError("Headers are immutable");
         return;
     }
     // "3. Otherwise, if guard is |request| and |name| is a forbidden header
     //     name, return."
-    if (m_guard == RequestGuard && FetchHeaderList::isForbiddenHeaderName(name))
+    if (m_guard == RequestGuard && FetchUtils::isForbiddenHeaderName(name))
         return;
     // "4. Otherwise, if guard is |request-no-CORS| and |name|/`invalid` is not
     //     a simple header, return."
-    if (m_guard == RequestNoCORSGuard && !FetchHeaderList::isSimpleHeader(name, "invalid"))
+    if (m_guard == RequestNoCORSGuard && !FetchUtils::isSimpleHeader(AtomicString(name), "invalid"))
         return;
     // "5. Otherwise, if guard is |response| and |name| is a forbidden response
     //     header name, return."
-    if (m_guard == ResponseGuard && FetchHeaderList::isForbiddenResponseHeaderName(name))
+    if (m_guard == ResponseGuard && FetchUtils::isForbiddenResponseHeaderName(name))
         return;
     // "6. Delete |name| from header list."
     m_headerList->remove(name);
 }
 
 String Headers::get(const String& name, ExceptionState& exceptionState)
 {
     // "The get(|name|) method, when invoked, must run these steps:"
     // "1. If |name| is not a name, throw a TypeError."
     if (!FetchHeaderList::isValidHeaderName(name)) {
@@ skipping 48 matching lines @@
         exceptionState.throwTypeError("Invalid value");
         return;
     }
     // "2. If guard is |immutable|, throw a TypeError."
     if (m_guard == ImmutableGuard) {
         exceptionState.throwTypeError("Headers are immutable");
         return;
     }
     // "3. Otherwise, if guard is |request| and |name| is a forbidden header
     //     name, return."
-    if (m_guard == RequestGuard && FetchHeaderList::isForbiddenHeaderName(name))
+    if (m_guard == RequestGuard && FetchUtils::isForbiddenHeaderName(name))
         return;
     // "4. Otherwise, if guard is |request-no-CORS| and |name|/|value| is not a
     //     simple header, return."
-    if (m_guard == RequestNoCORSGuard && !FetchHeaderList::isSimpleHeader(name, value))
+    if (m_guard == RequestNoCORSGuard && !FetchUtils::isSimpleHeader(AtomicString(name), AtomicString(value)))
         return;
     // "5. Otherwise, if guard is |response| and |name| is a forbidden response
     //     header name, return."
-    if (m_guard == ResponseGuard && FetchHeaderList::isForbiddenResponseHeaderName(name))
+    if (m_guard == ResponseGuard && FetchUtils::isForbiddenResponseHeaderName(name))
         return;
     // "6. Set |name|/|value| in header list."
     m_headerList->set(name, value);
 }
 
 void Headers::forEach(PassOwnPtr<HeadersForEachCallback> callback, ScriptValue& thisArg)
 {
     forEachInternal(callback, &thisArg);
 }
 
@@ skipping 103 matching lines @@
             break;
     }
 }
 
 void Headers::trace(Visitor* visitor)
 {
     visitor->trace(m_headerList);
 }
 
 } // namespace blink