Move UTF16ToASCII, remove WideToASCII.

components/autofill/core/browser/personal_data_manager.cc

 // Copyright 2013 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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 71 matching lines @@
 // required as determined by its country code.
 // No verification of validity of the contents is preformed. This is an
 // existence check only.
 bool IsMinimumAddress(const AutofillProfile& profile,
                       const std::string& app_locale) {
   // All countries require at least one address line.
   if (profile.GetRawInfo(ADDRESS_HOME_LINE1).empty())
     return false;
 
   std::string country_code =
-      UTF16ToASCII(profile.GetRawInfo(ADDRESS_HOME_COUNTRY));
+      base::UTF16ToASCII(profile.GetRawInfo(ADDRESS_HOME_COUNTRY));
   if (country_code.empty())
     country_code = AutofillCountry::CountryCodeForLocale(app_locale);
 
   AutofillCountry country(country_code, app_locale);
 
   if (country.requires_city() && profile.GetRawInfo(ADDRESS_HOME_CITY).empty())
     return false;
 
   if (country.requires_state() &&
       profile.GetRawInfo(ADDRESS_HOME_STATE).empty())
@@ skipping 660 matching lines @@
   return guid;
 }
 
 bool PersonalDataManager::IsCountryOfInterest(const std::string& country_code)
     const {
   DCHECK_EQ(2U, country_code.size());
 
   const std::vector<AutofillProfile*>& profiles = web_profiles();
   std::list<std::string> country_codes;
   for (size_t i = 0; i < profiles.size(); ++i) {
-    country_codes.push_back(StringToLowerASCII(UTF16ToASCII(
+    country_codes.push_back(StringToLowerASCII(base::UTF16ToASCII(
         profiles[i]->GetRawInfo(ADDRESS_HOME_COUNTRY))));
   }
 
   std::string timezone_country = CountryCodeForCurrentTimezone();
   if (!timezone_country.empty())
     country_codes.push_back(StringToLowerASCII(timezone_country));
 
   // Only take the locale into consideration if all else fails.
   if (country_codes.empty()) {
     country_codes.push_back(StringToLowerASCII(
@@ skipping 262 matching lines @@
     return std::string();
 
   // Count up country codes from existing profiles.
   std::map<std::string, int> votes;
   // TODO(estade): can we make this GetProfiles() instead? It seems to cause
   // errors in tests on mac trybots. See http://crbug.com/57221
   const std::vector<AutofillProfile*>& profiles = web_profiles();
   std::vector<std::string> country_codes;
   AutofillCountry::GetAvailableCountries(&country_codes);
   for (size_t i = 0; i < profiles.size(); ++i) {
-    std::string country_code = StringToUpperASCII(UTF16ToASCII(
+    std::string country_code = StringToUpperASCII(base::UTF16ToASCII(
         profiles[i]->GetRawInfo(ADDRESS_HOME_COUNTRY)));
 
     if (std::find(country_codes.begin(), country_codes.end(), country_code) !=
             country_codes.end()) {
       // Verified profiles count 100x more than unverified ones.
       votes[country_code] += profiles[i]->IsVerified() ? 100 : 1;
     }
   }
 
   // Take the most common country code.
   if (!votes.empty()) {
     std::map<std::string, int>::iterator iter =
         std::max_element(votes.begin(), votes.end(), CompareVotes);
     return iter->first;
   }
 
   return std::string();
 }
 
 void PersonalDataManager::EnabledPrefChanged() {
   default_country_code_.clear();
   NotifyPersonalDataChanged();
 }
 
 }  // namespace autofill