| Index: components/autofill/core/browser/personal_data_manager.cc
|
| diff --git a/components/autofill/core/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc
|
| index 8544c6c27c3b1c8fa577cd594ef213509705af09..9ad41cab9b9535c4668ded28545233d652d98490 100644
|
| --- a/components/autofill/core/browser/personal_data_manager.cc
|
| +++ b/components/autofill/core/browser/personal_data_manager.cc
|
| @@ -89,7 +89,7 @@ bool IsMinimumAddress(const AutofillProfile& profile,
|
| 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);
|
|
|
| @@ -770,7 +770,7 @@ bool PersonalDataManager::IsCountryOfInterest(const std::string& country_code)
|
| 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))));
|
| }
|
|
|
| @@ -1053,7 +1053,7 @@ std::string PersonalDataManager::MostCommonCountryCodeFromProfiles() const {
|
| 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) !=
|
|
|