Removal of UpdateMultivaluedField() as we now don't have multiple values for name,email and phone n…

components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc

Index: components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc
diff --git a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc
index 00499142a01b4789ee15ba6353ef6375a26362c5..287988d87f5b7a88e76b2cc88d942f5724c80b38 100644
--- a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc
+++ b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc
@@ -324,24 +324,36 @@ bool AutofillProfileSyncableService::OverwriteProfileWithServerData(
     DCHECK(!was_verified || profile->IsVerified());
   }
 
-  // Update all multivalued fields: names, emails, and phones.
-  diff = UpdateMultivaluedField(NAME_FIRST,
-                                specifics.name_first(), profile) || diff;
-  diff = UpdateMultivaluedField(NAME_MIDDLE,
-                                specifics.name_middle(), profile) || diff;
-  diff = UpdateMultivaluedField(NAME_LAST,
-                                specifics.name_last(), profile) || diff;
+  // Update name, email, and phone fields.
+  diff = UpdateField(NAME_FIRST,
+                     specifics.name_first().size() ? specifics.name_first(0)
+                                                   : std::string(), profile) ||

[Evan Stade, 2015/07/09 19:06:55]

regardless of whether this is git cl formatted, this line wrapping is suspect
and should be fixed (align profile with the other arguments to UpdateField)

[Deepak, 2015/07/10 06:09:54]

Done.

+         diff;
+  diff = UpdateField(NAME_MIDDLE,
+                     specifics.name_middle().size() ? specifics.name_middle(0)
+                                                    : std::string(), profile) ||
+         diff;
+  diff = UpdateField(NAME_LAST,
+                     specifics.name_last().size() ? specifics.name_last(0)
+                                                  : std::string(), profile) ||
+         diff;
   // Older versions don't have a separate full name; don't overwrite full name
   // in this case.
   if (specifics.name_full().size() > 0) {
-    diff = UpdateMultivaluedField(NAME_FULL,
-                                  specifics.name_full(), profile) || diff;
+    diff = UpdateField(NAME_FULL,
+                       specifics.name_full().size() ? specifics.name_full(0)
+                                                    : std::string(), profile) ||
+           diff;
   }
-  diff = UpdateMultivaluedField(EMAIL_ADDRESS,
-                                specifics.email_address(), profile) || diff;
-  diff = UpdateMultivaluedField(PHONE_HOME_WHOLE_NUMBER,
-                                specifics.phone_home_whole_number(),
-                                profile) || diff;
+  diff = UpdateField(EMAIL_ADDRESS, specifics.email_address().size()
+                                        ? specifics.email_address(0)
+                                        : std::string(), profile) ||
+         diff;
+  diff = UpdateField(PHONE_HOME_WHOLE_NUMBER,
+                     specifics.phone_home_whole_number().size()
+                         ? specifics.phone_home_whole_number(0)
+                         : std::string(), profile) ||
+         diff;
 
   // Update all simple single-valued address fields.
   diff = UpdateField(COMPANY_NAME, specifics.company_name(), profile) || diff;
@@ -456,7 +468,6 @@ void AutofillProfileSyncableService::WriteAutofillProfile(
   // TODO(estade): this should be set_email_address.
   specifics->add_email_address(
       LimitData(UTF16ToUTF8(profile.GetRawInfo(EMAIL_ADDRESS))));
-  std::vector<base::string16> values;
 
   specifics->set_company_name(
       LimitData(UTF16ToUTF8(profile.GetRawInfo(COMPANY_NAME))));
@@ -624,16 +635,6 @@ bool AutofillProfileSyncableService::UpdateField(
   return true;
 }
 
-// TODO(estade): remove this function.
-bool AutofillProfileSyncableService::UpdateMultivaluedField(
-    ServerFieldType field_type,
-    const ::google::protobuf::RepeatedPtrField<std::string>& new_values,
-    AutofillProfile* autofill_profile) {
-  return UpdateField(field_type,
-                     new_values.size() < 1 ? std::string() : new_values.Get(0),
-                     autofill_profile);
-}
-
 bool AutofillProfileSyncableService::MergeProfile(
     const AutofillProfile& merge_from,
     AutofillProfile* merge_into,