Revert 257524 "Move IsStringASCII/UTF8 to base namespace."

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/i18n/icu_string_conversions.h"
 #include "base/logging.h"
 #include "base/strings/string_tokenizer.h"
@@ skipping 85 matching lines @@
 bool DecodeWord(const std::string& encoded_word,
                 const std::string& referrer_charset,
                 bool* is_rfc2047,
                 std::string* output,
                 int* parse_result_flags) {
   *is_rfc2047 = false;
   output->clear();
   if (encoded_word.empty())
     return true;
 
-  if (!base::IsStringASCII(encoded_word)) {
+  if (!IsStringASCII(encoded_word)) {
     // Try UTF-8, referrer_charset and the native OS default charset in turn.
-    if (base::IsStringUTF8(encoded_word)) {
+    if (IsStringUTF8(encoded_word)) {
       *output = encoded_word;
     } else {
       base::string16 utf16_output;
       if (!referrer_charset.empty() &&
           base::CodepageToUTF16(encoded_word, referrer_charset.c_str(),
                                 base::OnStringConversionError::FAIL,
                                 &utf16_output)) {
         *output = base::UTF16ToUTF8(utf16_output);
       } else {
         *output = base::WideToUTF8(base::SysNativeMBToWide(encoded_word));
@@ skipping 83 matching lines @@
   // We're not handling 'especial' characters quoted with '\', but
   // it should be Ok because we're not an email client but a
   // web browser.
 
   // What IE6/7 does: %-escaped UTF-8.
   decoded_word = net::UnescapeURLComponent(encoded_word,
                                            net::UnescapeRule::SPACES);
   if (decoded_word != encoded_word)
     *parse_result_flags |=
         net::HttpContentDisposition::HAS_PERCENT_ENCODED_STRINGS;
-  if (base::IsStringUTF8(decoded_word)) {
+  if (IsStringUTF8(decoded_word)) {
     output->swap(decoded_word);
     return true;
     // We can try either the OS default charset or 'origin charset' here,
     // As far as I can tell, IE does not support it. However, I've seen
     // web servers emit %-escaped string in a legacy encoding (usually
     // origin charset).
     // TODO(jungshik) : Test IE further and consider adding a fallback here.
   }
   return false;
 }
@@ skipping 105 matching lines @@
 bool DecodeExtValue(const std::string& param_value, std::string* decoded) {
   if (param_value.find('"') != std::string::npos)
     return false;
 
   std::string charset;
   std::string value;
   if (!ParseExtValueComponents(param_value, &charset, &value))
     return false;
 
   // RFC 5987 value should be ASCII-only.
-  if (!base::IsStringASCII(value)) {
+  if (!IsStringASCII(value)) {
     decoded->clear();
     return true;
   }
 
   std::string unescaped = net::UnescapeURLComponent(
       value, net::UnescapeRule::SPACES | net::UnescapeRule::URL_SPECIAL_CHARS);
 
   return base::ConvertToUtf8AndNormalize(unescaped, charset, decoded);
 }
 
@@ skipping 98 matching lines @@
 
   if (!ext_filename.empty())
     filename_ = ext_filename;
   else if (!filename.empty())
     filename_ = filename;
   else
     filename_ = name;
 }
 
 }  // namespace net