| 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 d5645559cc3f6cd51d6e9dc338042914599e35ba..5aa966e539546b528c81f62f78222180f8177219 100644
|
| --- a/components/autofill/core/browser/personal_data_manager.cc
|
| +++ b/components/autofill/core/browser/personal_data_manager.cc
|
| @@ -602,9 +602,9 @@ void PersonalDataManager::GetProfileSuggestions(
|
| continue;
|
|
|
| base::string16 profile_value_lower_case(
|
| - StringToLowerASCII(multi_values[i]));
|
| + base::StringToLowerASCII(multi_values[i]));
|
| base::string16 field_value_lower_case(
|
| - StringToLowerASCII(field_contents));
|
| + base::StringToLowerASCII(field_contents));
|
| // Phone numbers could be split in US forms, so field value could be
|
| // either prefix or suffix of the phone.
|
| bool matched_phones = false;
|
| @@ -751,8 +751,8 @@ std::string PersonalDataManager::MergeProfile(
|
| AutofillProfile* existing_profile = *iter;
|
| if (!matching_profile_found &&
|
| !new_profile.PrimaryValue().empty() &&
|
| - StringToLowerASCII(existing_profile->PrimaryValue()) ==
|
| - StringToLowerASCII(new_profile.PrimaryValue())) {
|
| + base::StringToLowerASCII(existing_profile->PrimaryValue()) ==
|
| + base::StringToLowerASCII(new_profile.PrimaryValue())) {
|
| // Unverified profiles should always be updated with the newer data,
|
| // whereas verified profiles should only ever be overwritten by verified
|
| // data. If an automatically aggregated profile would overwrite a
|
| @@ -779,22 +779,23 @@ 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(base::UTF16ToASCII(
|
| + country_codes.push_back(base::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));
|
| + country_codes.push_back(base::StringToLowerASCII(timezone_country));
|
|
|
| // Only take the locale into consideration if all else fails.
|
| if (country_codes.empty()) {
|
| - country_codes.push_back(StringToLowerASCII(
|
| + country_codes.push_back(base::StringToLowerASCII(
|
| AutofillCountry::CountryCodeForLocale(app_locale())));
|
| }
|
|
|
| return std::find(country_codes.begin(), country_codes.end(),
|
| - StringToLowerASCII(country_code)) != country_codes.end();
|
| + base::StringToLowerASCII(country_code)) !=
|
| + country_codes.end();
|
| }
|
|
|
| const std::string& PersonalDataManager::GetDefaultCountryCodeForNewAddress()
|
|
|