Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/net/websockets/websocket_handshake_handler.cc

Index: trunk/src/net/websockets/websocket_handshake_handler.cc
===================================================================
--- trunk/src/net/websockets/websocket_handshake_handler.cc	(revision 289319)
+++ trunk/src/net/websockets/websocket_handshake_handler.cc	(working copy)
@@ -57,8 +57,8 @@
   net::HttpUtil::HeadersIterator iter(headers.begin(), headers.end(), "\r\n");
   while (iter.GetNext()) {
     for (size_t i = 0; i < headers_to_get_len; i++) {
-      if (base::LowerCaseEqualsASCII(iter.name_begin(), iter.name_end(),
-                                     headers_to_get[i])) {
+      if (LowerCaseEqualsASCII(iter.name_begin(), iter.name_end(),
+                               headers_to_get[i])) {
         values->push_back(iter.values());
       }
     }
@@ -98,8 +98,7 @@
     bool should_remove = false;
     if (GetHeaderName(line_begin, line_end, &name_begin, &name_end)) {
       for (size_t i = 0; i < headers_to_remove_len; ++i) {
-        if (base::LowerCaseEqualsASCII(name_begin, name_end,
-                                       headers_to_remove[i])) {
+        if (LowerCaseEqualsASCII(name_begin, name_end, headers_to_remove[i])) {
           should_remove = true;
           break;
         }
@@ -239,31 +238,31 @@
 
   HttpUtil::HeadersIterator iter(headers_.begin(), headers_.end(), "\r\n");
   while (iter.GetNext()) {
-    if (base::LowerCaseEqualsASCII(iter.name_begin(),
-                                   iter.name_end(),
-                                   websockets::kUpgradeLowercase) ||
-        base::LowerCaseEqualsASCII(
+    if (LowerCaseEqualsASCII(iter.name_begin(),
+                             iter.name_end(),
+                             websockets::kUpgradeLowercase) ||
+        LowerCaseEqualsASCII(
             iter.name_begin(), iter.name_end(), "connection") ||
-        base::LowerCaseEqualsASCII(iter.name_begin(),
-                                   iter.name_end(),
-                                   websockets::kSecWebSocketVersionLowercase)) {
+        LowerCaseEqualsASCII(iter.name_begin(),
+                             iter.name_end(),
+                             websockets::kSecWebSocketVersionLowercase)) {
       // These headers must be ignored.
       continue;
-    } else if (base::LowerCaseEqualsASCII(
-                   iter.name_begin(), iter.name_end(),
-                   websockets::kSecWebSocketKeyLowercase)) {
+    } else if (LowerCaseEqualsASCII(iter.name_begin(),
+                                    iter.name_end(),
+                                    websockets::kSecWebSocketKeyLowercase)) {
       *challenge = iter.values();
       // Sec-WebSocket-Key is not sent to the server.
       continue;
-    } else if (base::LowerCaseEqualsASCII(
+    } else if (LowerCaseEqualsASCII(
                    iter.name_begin(), iter.name_end(), "host") ||
-               base::LowerCaseEqualsASCII(
+               LowerCaseEqualsASCII(
                    iter.name_begin(), iter.name_end(), "origin") ||
-               base::LowerCaseEqualsASCII(
+               LowerCaseEqualsASCII(
                    iter.name_begin(),
                    iter.name_end(),
                    websockets::kSecWebSocketProtocolLowercase) ||
-               base::LowerCaseEqualsASCII(
+               LowerCaseEqualsASCII(
                    iter.name_begin(),
                    iter.name_end(),
                    websockets::kSecWebSocketExtensionsLowercase)) {
@@ -424,9 +423,9 @@
     // we separate that back out into individual headers for each value
     // in the list.
     if ((spdy_protocol_version <= 2 &&
-         base::LowerCaseEqualsASCII(iter->first, "status")) ||
+         LowerCaseEqualsASCII(iter->first, "status")) ||
         (spdy_protocol_version >= 3 &&
-         base::LowerCaseEqualsASCII(iter->first, ":status"))) {
+         LowerCaseEqualsASCII(iter->first, ":status"))) {
       // The status value is already handled as the first line of
       // |response_message|. Just skip here.
       continue;
@@ -442,10 +441,10 @@
       else
         tval = value.substr(start);
       if (spdy_protocol_version >= 3 &&
-          (base::LowerCaseEqualsASCII(iter->first,
-               websockets::kSecWebSocketProtocolSpdy3) ||
-           base::LowerCaseEqualsASCII(iter->first,
-               websockets::kSecWebSocketExtensionsSpdy3)))
+          (LowerCaseEqualsASCII(iter->first,
+                                websockets::kSecWebSocketProtocolSpdy3) ||
+           LowerCaseEqualsASCII(iter->first,
+                                websockets::kSecWebSocketExtensionsSpdy3)))
         AppendHeader(iter->first.substr(1), tval, &response_message);
       else
         AppendHeader(iter->first, tval, &response_message);