Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/net/http/http_content_disposition.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/http/http_content_disposition.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
@@ skipping 343 matching lines @@
   // If the disposition-type isn't a valid token the then the
   // Content-Disposition header is malformed, and we treat the first bytes as
   // a parameter rather than a disposition-type.
   if (!HttpUtil::IsToken(type_begin, type_end))
     return begin;
 
   parse_result_flags_ |= HAS_DISPOSITION_TYPE;
 
   DCHECK(std::find(type_begin, type_end, '=') == type_end);
 
-  if (base::LowerCaseEqualsASCII(type_begin, type_end, "inline")) {
+  if (LowerCaseEqualsASCII(type_begin, type_end, "inline")) {
     type_ = INLINE;
-  } else if (base::LowerCaseEqualsASCII(type_begin, type_end, "attachment")) {
+  } else if (LowerCaseEqualsASCII(type_begin, type_end, "attachment")) {
     type_ = ATTACHMENT;
   } else {
     parse_result_flags_ |= HAS_UNKNOWN_DISPOSITION_TYPE;
     type_ = ATTACHMENT;
   }
   return delimiter;
 }
 
 // http://tools.ietf.org/html/rfc6266
 //
@@ skipping 21 matching lines @@
   std::string::const_iterator pos = header.begin();
   std::string::const_iterator end = header.end();
   pos = ConsumeDispositionType(pos, end);
 
   std::string name;
   std::string filename;
   std::string ext_filename;
 
   HttpUtil::NameValuePairsIterator iter(pos, end, ';');
   while (iter.GetNext()) {
-    if (filename.empty() && base::LowerCaseEqualsASCII(iter.name_begin(),
-                                                       iter.name_end(),
-                                                       "filename")) {
+    if (filename.empty() && LowerCaseEqualsASCII(iter.name_begin(),
+                                                 iter.name_end(),
+                                                 "filename")) {
       DecodeFilenameValue(iter.value(), referrer_charset, &filename,
                           &parse_result_flags_);
       if (!filename.empty())
         parse_result_flags_ |= HAS_FILENAME;
-    } else if (name.empty() && base::LowerCaseEqualsASCII(iter.name_begin(),
-                                                          iter.name_end(),
-                                                          "name")) {
+    } else if (name.empty() && LowerCaseEqualsASCII(iter.name_begin(),
+                                                    iter.name_end(),
+                                                    "name")) {
       DecodeFilenameValue(iter.value(), referrer_charset, &name, NULL);
       if (!name.empty())
         parse_result_flags_ |= HAS_NAME;
-    } else if (ext_filename.empty() &&
-               base::LowerCaseEqualsASCII(iter.name_begin(), iter.name_end(),
-                                          "filename*")) {
+    } else if (ext_filename.empty() && LowerCaseEqualsASCII(iter.name_begin(),
+                                                            iter.name_end(),
+                                                            "filename*")) {
       DecodeExtValue(iter.raw_value(), &ext_filename);
       if (!ext_filename.empty())
         parse_result_flags_ |= HAS_EXT_FILENAME;
     }
   }
 
   if (!ext_filename.empty())
     filename_ = ext_filename;
   else if (!filename.empty())
     filename_ = filename;
   else
     filename_ = name;
 }
 
 }  // namespace net