Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/net/websockets/websocket_handshake_handler.cc

 // Copyright (c) 2012 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 "net/websockets/websocket_handshake_handler.h"
 
 #include <limits>
 
 #include "base/base64.h"
 #include "base/sha1.h"
@@ skipping 39 matching lines @@
   }
 }
 
 void FetchHeaders(const std::string& headers,
                   const char* const headers_to_get[],
                   size_t headers_to_get_len,
                   std::vector<std::string>* values) {
   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());
       }
     }
   }
 }
 
 bool GetHeaderName(std::string::const_iterator line_begin,
                    std::string::const_iterator line_end,
                    std::string::const_iterator* name_begin,
                    std::string::const_iterator* name_end) {
@@ skipping 19 matching lines @@
 
   base::StringTokenizer lines(headers.begin(), headers.end(), "\r\n");
   while (lines.GetNext()) {
     std::string::const_iterator line_begin = lines.token_begin();
     std::string::const_iterator line_end = lines.token_end();
     std::string::const_iterator name_begin;
     std::string::const_iterator name_end;
     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;
         }
       }
     }
     if (!should_remove) {
       filtered_headers.append(line_begin, line_end);
       filtered_headers.append("\r\n");
     }
   }
@@ skipping 119 matching lines @@
     (*headers)["version"] = "WebSocket/13";
     (*headers)["scheme"] = url.scheme();
   } else {
     (*headers)[":path"] = url.path();
     (*headers)[":version"] = "WebSocket/13";
     (*headers)[":scheme"] = url.scheme();
   }
 
   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)) {
       // TODO(toyoshim): Some WebSocket extensions may not be compatible with
       // SPDY. We should omit them from a Sec-WebSocket-Extension header.
       std::string name;
       if (spdy_protocol_version <= 2)
         name = base::StringToLowerASCII(iter.name());
       else
         name = ":" + base::StringToLowerASCII(iter.name());
@@ skipping 140 matching lines @@
   AppendHeader(
       websockets::kSecWebSocketAccept, websocket_accept, &response_message);
 
   for (SpdyHeaderBlock::const_iterator iter = headers.begin();
        iter != headers.end();
        ++iter) {
     // For each value, if the server sends a NUL-separated list of values,
     // 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;
     }
     const std::string& value = iter->second;
     size_t start = 0;
     size_t end = 0;
     do {
       end = value.find('\0', start);
       std::string tval;
       if (end != std::string::npos)
         tval = value.substr(start, (end - start));
       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);
       start = end + 1;
     } while (end != std::string::npos);
   }
   response_message += "\r\n";
 
   return ParseRawResponse(response_message.data(),
                           response_message.size()) == response_message.size();
@@ skipping 31 matching lines @@
 
 std::string WebSocketHandshakeResponseHandler::GetResponse() {
   DCHECK(HasResponse());
   DCHECK(!status_line_.empty());
   // headers_ might be empty for wrong response from server.
 
   return status_line_ + headers_ + header_separator_;
 }
 
 }  // namespace net