diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 05:34:48 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 05:34:48 +0000 |
| commit | 4d11fcde4d6bb6d2a98fedff9e3a4812b0c24e89 (patch) | |
| tree | b44a155924fac62ab8872adc1a22169f598ec3e4 /chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc | |
| parent | 0e7f2b7f4023f10cc1d4d4a9eabca701faedec01 (diff) | |
| download | chromium_src-4d11fcde4d6bb6d2a98fedff9e3a4812b0c24e89.zip chromium_src-4d11fcde4d6bb6d2a98fedff9e3a4812b0c24e89.tar.gz chromium_src-4d11fcde4d6bb6d2a98fedff9e3a4812b0c24e89.tar.bz2 | |
[Autofill] Rename {Get,Set}CanonicalizedInfo() to {Get,Set}Info(), and pass in the app locale.
Also:
* Pass the app locale to FormGroup::GetMatchingTypes(), FormGroup::GetNonEmptyTypes(), and CreditCard::UpdateFromImportedCard().
* Update PhoneNumber::GetRawInfo() to not rely on knowing the locale, and move all the code that depended on knowing the locale into PhoneNumber::GetInfo().
* Within the AutofillManager code, read the app locale on the UI thread, and pass it as a parameter to the worker thread.
BUG=100845
TEST=none (this is a refactoring change)
Review URL: https://chromiumcodereview.appspot.com/11417131
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc')
| -rw-r--r-- | chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc index e5c5b98..ace0867 100644 --- a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc +++ b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc @@ -165,9 +165,10 @@ TEST_F(AutofillIeToolbarImportTest, TestAutofillImport) { EXPECT_EQ(profile1[2].value, profiles[1].GetRawInfo(NAME_LAST)); EXPECT_EQ(profile1[3].value, profiles[1].GetRawInfo(EMAIL_ADDRESS)); EXPECT_EQ(profile1[4].value, profiles[1].GetRawInfo(COMPANY_NAME)); - EXPECT_EQ(profile1[7].value, profiles[1].GetRawInfo(PHONE_HOME_COUNTRY_CODE)); - EXPECT_EQ(profile1[6].value, profiles[1].GetRawInfo(PHONE_HOME_CITY_CODE)); - EXPECT_EQ(L"5555555", profiles[1].GetRawInfo(PHONE_HOME_NUMBER)); + EXPECT_EQ(profile1[7].value, + profiles[1].GetInfo(PHONE_HOME_COUNTRY_CODE, "US")); + EXPECT_EQ(profile1[6].value, profiles[1].GetInfo(PHONE_HOME_CITY_CODE, "US")); + EXPECT_EQ(L"5555555", profiles[1].GetInfo(PHONE_HOME_NUMBER, "US")); EXPECT_EQ(L"+1 650-555-5555", profiles[1].GetRawInfo(PHONE_HOME_WHOLE_NUMBER)); |