Replace DeprecatedEqualIgnoringCase with EqualIgnoringASCIICase in FetchUtils.h

third_party/WebKit/Source/platform/loader/fetch/FetchUtils.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 "platform/loader/fetch/FetchUtils.h"
 
 #include "platform/HTTPNames.h"
 #include "platform/network/HTTPHeaderMap.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/wtf/HashSet.h"
@@ skipping 77 matching lines @@
   // "A simple header is a header whose name is either one of `Accept`,
   // `Accept-Language`, and `Content-Language`, or whose name is
   // `Content-Type` and value, once parsed, is one of
   // `application/x-www-form-urlencoded`, `multipart/form-data`, and
   // `text/plain`."
   // Treat 'Save-Data' as a simple header, since it is added by Chrome when
   // Data Saver feature is enabled.
   // Treat inspector headers as a simple headers, since they are added by blink
   // when the inspector is open.
 
-  if (DeprecatedEqualIgnoringCase(name, "accept") ||
-      DeprecatedEqualIgnoringCase(name, "accept-language") ||
-      DeprecatedEqualIgnoringCase(name, "content-language") ||
-      DeprecatedEqualIgnoringCase(
+  if (EqualIgnoringASCIICase(name, "accept") ||
+      EqualIgnoringASCIICase(name, "accept-language") ||
+      EqualIgnoringASCIICase(name, "content-language") ||
+      EqualIgnoringASCIICase(
           name, HTTPNames::X_DevTools_Emulate_Network_Conditions_Client_Id) ||
-      DeprecatedEqualIgnoringCase(name, HTTPNames::X_DevTools_Request_Id) ||
-      DeprecatedEqualIgnoringCase(name, "save-data"))
+      EqualIgnoringASCIICase(name, HTTPNames::X_DevTools_Request_Id) ||
+      EqualIgnoringASCIICase(name, "save-data"))
     return true;
 
-  if (DeprecatedEqualIgnoringCase(name, "content-type"))
+  if (EqualIgnoringASCIICase(name, "content-type"))
     return IsSimpleContentType(value);
 
   return false;
 }
 
 bool FetchUtils::IsSimpleContentType(const AtomicString& media_type) {
   AtomicString mime_type = ExtractMIMETypeFromMediaType(media_type);
-  return DeprecatedEqualIgnoringCase(mime_type,
-                                     "application/x-www-form-urlencoded") ||
-         DeprecatedEqualIgnoringCase(mime_type, "multipart/form-data") ||
-         DeprecatedEqualIgnoringCase(mime_type, "text/plain");
+  return EqualIgnoringASCIICase(mime_type,
+                                "application/x-www-form-urlencoded") ||
+         EqualIgnoringASCIICase(mime_type, "multipart/form-data") ||
+         EqualIgnoringASCIICase(mime_type, "text/plain");
 }
 
 bool FetchUtils::IsSimpleRequest(const String& method,
                                  const HTTPHeaderMap& header_map) {
   if (!IsSimpleMethod(method))
     return false;
 
   for (const auto& header : header_map) {
     // Preflight is required for MIME types that can not be sent via form
     // submission.
     if (!IsSimpleHeader(header.key, header.value))
       return false;
   }
 
   return true;
 }
 
 bool FetchUtils::IsForbiddenMethod(const String& method) {
   // http://fetch.spec.whatwg.org/#forbidden-method
   // "A forbidden method is a method that is a byte case-insensitive match"
   //  for one of `CONNECT`, `TRACE`, and `TRACK`."
-  return DeprecatedEqualIgnoringCase(method, "TRACE") ||
-         DeprecatedEqualIgnoringCase(method, "TRACK") ||
-         DeprecatedEqualIgnoringCase(method, "CONNECT");
+  return EqualIgnoringASCIICase(method, "TRACE") ||
+         EqualIgnoringASCIICase(method, "TRACK") ||
+         EqualIgnoringASCIICase(method, "CONNECT");
 }
 
 bool FetchUtils::IsForbiddenHeaderName(const String& name) {
   // http://fetch.spec.whatwg.org/#forbidden-header-name
   // "A forbidden header name is a header names that is one of:
   //   `Accept-Charset`, `Accept-Encoding`, `Access-Control-Request-Headers`,
   //   `Access-Control-Request-Method`, `Connection`,
   //   `Content-Length, Cookie`, `Cookie2`, `Date`, `DNT`, `Expect`, `Host`,
   //   `Keep-Alive`, `Origin`, `Referer`, `TE`, `Trailer`,
   //   `Transfer-Encoding`, `Upgrade`, `User-Agent`, `Via`
   // or starts with `Proxy-` or `Sec-` (including when it is just `Proxy-` or
   // `Sec-`)."
 
   return ForbiddenHeaderNames::Get().Has(name);
 }
 
 bool FetchUtils::IsForbiddenResponseHeaderName(const String& name) {
   // http://fetch.spec.whatwg.org/#forbidden-response-header-name
   // "A forbidden response header name is a header name that is one of:
   // `Set-Cookie`, `Set-Cookie2`"
 
-  return DeprecatedEqualIgnoringCase(name, "set-cookie") ||
-         DeprecatedEqualIgnoringCase(name, "set-cookie2");
+  return EqualIgnoringASCIICase(name, "set-cookie") ||
+         EqualIgnoringASCIICase(name, "set-cookie2");
 }
 
 bool FetchUtils::IsSimpleOrForbiddenRequest(const String& method,
                                             const HTTPHeaderMap& header_map) {
   if (!IsSimpleMethod(method))
     return false;
 
   for (const auto& header : header_map) {
     if (!IsSimpleHeader(header.key, header.value) &&
         !IsForbiddenHeaderName(header.key))
       return false;
   }
 
   return true;
 }
 
 AtomicString FetchUtils::NormalizeMethod(const AtomicString& method) {
   // https://fetch.spec.whatwg.org/#concept-method-normalize
 
   // We place GET and POST first because they are more commonly used than
   // others.
   const char* const kMethods[] = {
       "GET", "POST", "DELETE", "HEAD", "OPTIONS", "PUT",
   };
 
   for (const auto& known : kMethods) {
-    if (DeprecatedEqualIgnoringCase(method, known)) {
+    if (EqualIgnoringASCIICase(method, known)) {
       // Don't bother allocating a new string if it's already all
       // uppercase.
       return method == known ? method : known;
     }
   }
   return method;
 }
 
 String FetchUtils::NormalizeHeaderValue(const String& value) {
   // https://fetch.spec.whatwg.org/#concept-header-value-normalize
   // Strip leading and trailing whitespace from header value.
   // HTTP whitespace bytes are 0x09, 0x0A, 0x0D, and 0x20.
 
   return value.StripWhiteSpace(IsHTTPWhitespace);
 }
 
 }  // namespace blink