components/autofill/core/browser/address.cc - Issue 1582353006: CountryNames: Separate data creation from usage

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/autofill/core/browser/address.cc

Issue 1582353006: CountryNames: Separate data creation from usage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@571610_exposeCountryNamesToTesting

Patch Set: Just rebased Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc ('k') | components/autofill/core/browser/address_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/autofill/core/browser/address.cc

diff --git a/components/autofill/core/browser/address.cc b/components/autofill/core/browser/address.cc

index 88d6dfdde0163ba4f0f5a03c1a05f303c9ac8f49..428d9f5283efe815adacbcd2901d5d59f181acf6 100644

--- a/components/autofill/core/browser/address.cc

+++ b/components/autofill/core/browser/address.cc

@@ -170,8 +170,7 @@ bool Address::SetInfo(const AutofillType& type,

ServerFieldType storable_type = type.GetStorableType();

if (storable_type == ADDRESS_HOME_COUNTRY && !value.empty()) {

- country_code_ =

- CountryNames::GetInstance()->GetCountryCode(value, app_locale);

+ country_code_ = CountryNames::GetInstance()->GetCountryCode(value);

return !country_code_.empty();

}

@@ -196,8 +195,7 @@ void Address::GetMatchingTypes(const base::string16& text,

FormGroup::GetMatchingTypes(text, app_locale, matching_types);

// Check to see if the |text| canonicalized as a country name is a match.

- std::string country_code =

- CountryNames::GetInstance()->GetCountryCode(text, app_locale);

+ std::string country_code = CountryNames::GetInstance()->GetCountryCode(text);

if (!country_code.empty() && country_code_ == country_code)

matching_types->insert(ADDRESS_HOME_COUNTRY);

}