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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_service.h"
 
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 306 matching lines @@
   bool diff = false;
   if (specifics.has_origin() && profile->origin() != specifics.origin()) {
     bool was_verified = profile->IsVerified();
     profile->set_origin(specifics.origin());
     diff = true;
 
     // Verified profiles should never be overwritten by unverified ones.
     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;
   diff = UpdateField(ADDRESS_HOME_CITY,
                      specifics.address_home_city(), profile) || diff;
   diff = UpdateField(ADDRESS_HOME_STATE,
                      specifics.address_home_state(), profile) || diff;
   diff = UpdateField(ADDRESS_HOME_ZIP,
                      specifics.address_home_zip(), profile) || diff;
   diff = UpdateField(ADDRESS_HOME_SORTING_CODE,
@@ skipping 94 matching lines @@
   specifics->set_address_home_sorting_code(
       LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE))));
   specifics->set_address_home_dependent_locality(
       LimitData(
           UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY))));
   specifics->set_address_home_language_code(LimitData(profile.language_code()));
 
   // 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))));
 
   // TODO(estade): this should be set_phone_home_whole_number.
   specifics->add_phone_home_whole_number(
       LimitData(UTF16ToUTF8(profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER))));
 }
 
 void AutofillProfileSyncableService::CreateGUIDToProfileMap(
@@ skipping 147 matching lines @@
 bool AutofillProfileSyncableService::UpdateField(
     ServerFieldType field_type,
     const std::string& new_value,
     AutofillProfile* autofill_profile) {
   if (UTF16ToUTF8(autofill_profile->GetRawInfo(field_type)) == new_value)
     return false;
   autofill_profile->SetRawInfo(field_type, UTF8ToUTF16(new_value));
   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,
     const std::string& app_locale) {
   // Overwrites all values. Does not overwrite GUID.
   merge_into->OverwriteWith(merge_from, app_locale);
   return !merge_into->EqualsForSyncPurposes(merge_from);
 }
 
 AutofillTable* AutofillProfileSyncableService::GetAutofillTable() const {
   return AutofillTable::FromWebDatabase(webdata_backend_->GetDatabase());
 }
 
 void AutofillProfileSyncableService::InjectStartSyncFlare(
     const syncer::SyncableService::StartSyncFlare& flare) {
   flare_ = flare;
 }
 
 AutofillProfileSyncableService::DataBundle::DataBundle() {}
 
 AutofillProfileSyncableService::DataBundle::~DataBundle() {}
 
 }  // namespace autofill