Autofill phone number enhancements and integration of Phone Number Util Library: part 3
BUG=71443
TEST=unit-tested
Review URL: http://codereview.chromium.org/6877130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86305 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc
index 2ddb0c7..5d1b57f 100644
--- a/chrome/browser/autofill/personal_data_manager_unittest.cc
+++ b/chrome/browser/autofill/personal_data_manager_unittest.cc
@@ -889,7 +889,7 @@
form1.fields.push_back(field);
// Phone gets updated.
autofill_test::CreateTestFormField(
- "Phone:", "phone", "4445556666", "text", &field);
+ "Phone:", "phone", "6505556666", "text", &field);
form1.fields.push_back(field);
FormStructure form_structure1(form1);
@@ -907,7 +907,7 @@
AutofillProfile expected;
autofill_test::SetProfileInfo(&expected, "George", NULL,
"Washington", "[email protected]", NULL, "1600 Pennsylvania Avenue",
- "Suite A", "San Francisco", "California", "94102", NULL, "4445556666",
+ "Suite A", "San Francisco", "California", "94102", NULL, "4085556666",
NULL);
const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
ASSERT_EQ(1U, results1.size());
@@ -945,7 +945,7 @@
form2.fields.push_back(field);
// Phone gets updated.
autofill_test::CreateTestFormField(
- "Phone:", "phone", "1231231234", "text", &field);
+ "Phone:", "phone", "6502231234", "text", &field);
form2.fields.push_back(field);
FormStructure form_structure2(form2);
@@ -964,7 +964,7 @@
// Add multi-valued phone number to expectation. Also, country gets added.
std::vector<string16> values;
expected.GetMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
- values.push_back(ASCIIToUTF16("1231231234"));
+ values.push_back(ASCIIToUTF16("6502231234"));
expected.SetMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);
expected.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States"));
ASSERT_EQ(1U, results2.size());
@@ -1632,7 +1632,7 @@
autofill_test::SetProfileInfo(&profile0,
"Marion", NULL, "Morrison",
"[email protected]", NULL, "123 Zoo St.", NULL, "Hollywood", "CA",
- "91601", "US", "2345678910", NULL);
+ "91601", "US", "14155678910", NULL);
personal_data_->AddProfile(profile0);
@@ -1642,7 +1642,7 @@
MessageLoop::current()->Run();
personal_data_->GetNonEmptyTypes(&non_empty_types);
- EXPECT_EQ(13U, non_empty_types.size());
+ EXPECT_EQ(14U, non_empty_types.size());
EXPECT_TRUE(non_empty_types.count(NAME_FIRST));
EXPECT_TRUE(non_empty_types.count(NAME_LAST));
EXPECT_TRUE(non_empty_types.count(NAME_FULL));
@@ -1653,6 +1653,7 @@
EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_ZIP));
EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_COUNTRY));
EXPECT_TRUE(non_empty_types.count(PHONE_HOME_NUMBER));
+ EXPECT_TRUE(non_empty_types.count(PHONE_HOME_COUNTRY_CODE));
EXPECT_TRUE(non_empty_types.count(PHONE_HOME_CITY_CODE));
EXPECT_TRUE(non_empty_types.count(PHONE_HOME_CITY_AND_NUMBER));
EXPECT_TRUE(non_empty_types.count(PHONE_HOME_WHOLE_NUMBER));
@@ -1662,13 +1663,13 @@
autofill_test::SetProfileInfo(&profile1,
"Josephine", "Alicia", "Saenz",
"[email protected]", "Fox", "903 Apple Ct.", NULL, "Orlando", "FL", "32801",
- "US", "19482937549", "13502849239");
+ "US", "16502937549", "14082849239");
AutofillProfile profile2;
autofill_test::SetProfileInfo(&profile2,
"Josephine", "Alicia", "Saenz",
"[email protected]", "Fox", "1212 Center.", "Bld. 5", "Orlando", "FL",
- "32801", "US", "19482937549", "13502849239");
+ "32801", "US", "16502937549", "14152849239");
personal_data_->AddProfile(profile1);
personal_data_->AddProfile(profile2);
