Move UTF16ToASCII, remove WideToASCII.

chrome/browser/extensions/api/proxy/proxy_api_helpers.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.
 
 // Implementation of helper functions for the Chrome Extensions Proxy Settings
 // API.
 //
 // Throughout this code, we report errors to the user by setting an |error|
 // parameter, if and only if these errors can be cause by invalid input
 // from the extension and we cannot expect that the extensions API has
@@ skipping 99 matching lines @@
       !pac_dict->GetString(keys::kProxyConfigPacScriptUrl, &pac_url16)) {
     LOG(ERROR) << "'pacScript.url' could not be parsed.";
     *bad_message = true;
     return false;
   }
   if (!IsStringASCII(pac_url16)) {
     *error = "'pacScript.url' supports only ASCII URLs "
              "(encode URLs in Punycode format).";
     return false;
   }
-  *out = UTF16ToASCII(pac_url16);
+  *out = base::UTF16ToASCII(pac_url16);
   return true;
 }
 
 bool GetPacDataFromExtensionPref(const base::DictionaryValue* proxy_config,
                                  std::string* out,
                                  std::string* error,
                                  bool* bad_message) {
   const base::DictionaryValue* pac_dict = NULL;
   proxy_config->GetDictionary(keys::kProxyConfigPacScript, &pac_dict);
   if (!pac_dict)
     return true;
 
   base::string16 pac_data16;
   if (pac_dict->HasKey(keys::kProxyConfigPacScriptData) &&
       !pac_dict->GetString(keys::kProxyConfigPacScriptData, &pac_data16)) {
     LOG(ERROR) << "'pacScript.data' could not be parsed.";
     *bad_message = true;
     return false;
   }
   if (!IsStringASCII(pac_data16)) {
     *error = "'pacScript.data' supports only ASCII code"
              "(encode URLs in Punycode format).";
     return false;
   }
-  *out = UTF16ToASCII(pac_data16);
+  *out = base::UTF16ToASCII(pac_data16);
   return true;
 }
 
 bool GetProxyServer(const base::DictionaryValue* proxy_server,
                     net::ProxyServer::Scheme default_scheme,
                     net::ProxyServer* out,
                     std::string* error,
                     bool* bad_message) {
   std::string scheme_string;  // optional.
 
@@ skipping 13 matching lines @@
     *bad_message = true;
     return false;
   }
   if (!IsStringASCII(host16)) {
     *error = ErrorUtils::FormatErrorMessage(
         "Invalid 'rules.???.host' entry '*'. 'host' field supports only ASCII "
         "URLs (encode URLs in Punycode format).",
         base::UTF16ToUTF8(host16));
     return false;
   }
-  std::string host = UTF16ToASCII(host16);
+  std::string host = base::UTF16ToASCII(host16);
 
   int port;  // optional.
   if (!proxy_server->GetInteger(keys::kProxyConfigRulePort, &port))
     port = net::ProxyServer::GetDefaultPortForScheme(scheme);
 
   *out = net::ProxyServer(scheme, net::HostPortPair(host, port));
 
   return true;
 }
 
@@ skipping 80 matching lines @@
     if (!list->GetString(i, &entry)) {
       LOG(ERROR) << "'rules.bypassList' could not be parsed.";
       *bad_message = true;
       return false;
     }
     if (!IsStringASCII(entry)) {
       *error = "'rules.bypassList' supports only ASCII URLs "
                "(encode URLs in Punycode format).";
       return false;
     }
-    result.append(UTF16ToASCII(entry));
+    result.append(base::UTF16ToASCII(entry));
   }
   *out = result;
   return true;
 }
 
 bool GetBypassListFromExtensionPref(const base::DictionaryValue* proxy_config,
                                     std::string* out,
                                     std::string* error,
                                     bool* bad_message) {
   const base::DictionaryValue* proxy_rules = NULL;
@@ skipping 200 matching lines @@
                                 const std::string& delims) {
   base::ListValue* out = new base::ListValue;
   base::StringTokenizer entries(in, delims);
   while (entries.GetNext())
     out->Append(new base::StringValue(entries.token()));
   return out;
 }
 
 }  // namespace proxy_api_helpers
 }  // namespace extensions