Index: components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc |
diff --git a/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc b/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc |
index ddf6982c1c3cf6a8e8971511907957ea01852dcb..1a696ccbbdbe6fa985877de5f20609eab7ac2951 100644 |
--- a/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc |
+++ b/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc |
@@ -134,8 +134,8 @@ scoped_ptr<AutofillProfile> ConstructCompleteProfile() { |
new AutofillProfile(kGuid1, kHttpsOrigin)); |
std::vector<base::string16> names; |
- names.push_back(ASCIIToUTF16("John K. Doe")); |
- names.push_back(ASCIIToUTF16("Jane Luise Smith")); |
+ names.push_back(ASCIIToUTF16("John K. Doe, Jr.")); |
+ names.push_back(ASCIIToUTF16("Jane Luise Smith MD")); |
profile->SetRawMultiInfo(NAME_FULL, names); |
std::vector<base::string16> emails; |
@@ -180,10 +180,12 @@ syncer::SyncData ConstructCompleteSyncData() { |
specifics->add_name_first("John"); |
specifics->add_name_middle("K."); |
specifics->add_name_last("Doe"); |
+ specifics->add_name_full("John K. Doe, Jr."); |
specifics->add_name_first("Jane"); |
specifics->add_name_middle("Luise"); |
specifics->add_name_last("Smith"); |
+ specifics->add_name_full("Jane Luise Smith MD"); |
specifics->add_email_address("user@example.com"); |
specifics->add_email_address("superuser@example.org"); |
@@ -446,6 +448,7 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeDataEmptyOrigins) { |
autofill_specifics->add_name_first("John"); |
autofill_specifics->add_name_middle(std::string()); |
autofill_specifics->add_name_last(std::string()); |
+ autofill_specifics->add_name_full("John"); |
autofill_specifics->add_email_address(std::string()); |
autofill_specifics->add_phone_home_whole_number(std::string()); |
autofill_specifics->set_address_home_line1("1 1st st"); |
@@ -854,6 +857,7 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeDataEmptyStreetAddress) { |
autofill_specifics->add_name_first(std::string()); |
autofill_specifics->add_name_middle(std::string()); |
autofill_specifics->add_name_last(std::string()); |
+ autofill_specifics->add_name_full(std::string()); |
autofill_specifics->add_email_address(std::string()); |
autofill_specifics->add_phone_home_whole_number(std::string()); |
autofill_specifics->set_address_home_line1("123 Example St."); |
@@ -889,6 +893,7 @@ TEST_F(AutofillProfileSyncableServiceTest, EmptySyncPreservesOrigin) { |
autofill_specifics->add_name_first("John"); |
autofill_specifics->add_name_middle(std::string()); |
autofill_specifics->add_name_last(std::string()); |
+ autofill_specifics->add_name_full("John"); |
autofill_specifics->add_email_address(std::string()); |
autofill_specifics->add_phone_home_whole_number(std::string()); |
EXPECT_FALSE(autofill_specifics->has_origin()); |
@@ -930,6 +935,7 @@ TEST_F(AutofillProfileSyncableServiceTest, NoLanguageCodeNoSync) { |
autofill_specifics->add_name_first(std::string()); |
autofill_specifics->add_name_middle(std::string()); |
autofill_specifics->add_name_last(std::string()); |
+ autofill_specifics->add_name_full(std::string()); |
autofill_specifics->add_email_address(std::string()); |
autofill_specifics->add_phone_home_whole_number(std::string()); |
EXPECT_FALSE(autofill_specifics->has_address_home_language_code()); |
@@ -966,6 +972,7 @@ TEST_F(AutofillProfileSyncableServiceTest, SyncUpdatesEmptyLanguageCode) { |
autofill_specifics->add_name_first(std::string()); |
autofill_specifics->add_name_middle(std::string()); |
autofill_specifics->add_name_last(std::string()); |
+ autofill_specifics->add_name_full(std::string()); |
autofill_specifics->add_email_address(std::string()); |
autofill_specifics->add_phone_home_whole_number(std::string()); |
autofill_specifics->set_address_home_language_code("en"); |
@@ -1008,6 +1015,7 @@ TEST_F(AutofillProfileSyncableServiceTest, SyncUpdatesIncorrectLanguageCode) { |
autofill_specifics->add_name_first(std::string()); |
autofill_specifics->add_name_middle(std::string()); |
autofill_specifics->add_name_last(std::string()); |
+ autofill_specifics->add_name_full(std::string()); |
autofill_specifics->add_email_address(std::string()); |
autofill_specifics->add_phone_home_whole_number(std::string()); |
autofill_specifics->set_address_home_language_code("en"); |
@@ -1051,6 +1059,7 @@ TEST_F(AutofillProfileSyncableServiceTest, EmptySyncPreservesLanguageCode) { |
autofill_specifics->add_name_first("John"); |
autofill_specifics->add_name_middle(std::string()); |
autofill_specifics->add_name_last(std::string()); |
+ autofill_specifics->add_name_full("John"); |
autofill_specifics->add_email_address(std::string()); |
autofill_specifics->add_phone_home_whole_number(std::string()); |
EXPECT_FALSE(autofill_specifics->has_address_home_language_code()); |