[autofill] Sync server card and address metadata.

components/autofill/core/browser/autofill_profile.cc

 // Copyright 2013 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/autofill_profile.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <ostream>
@@ skipping 236 matching lines @@
       name_(1),
       email_(1),
       phone_number_(1, PhoneNumber(this)) {
 }
 
 AutofillProfile::AutofillProfile(RecordType type, const std::string& server_id)
     : AutofillDataModel(base::GenerateGUID(), std::string()),
       record_type_(type),
       name_(1),
       email_(1),
-      phone_number_(1, PhoneNumber(this)),
-      server_id_(server_id) {
+      phone_number_(1, PhoneNumber(this)) {
   DCHECK(type == SERVER_PROFILE);
+  set_server_id(server_id);
 }
 
 AutofillProfile::AutofillProfile()
     : AutofillDataModel(base::GenerateGUID(), std::string()),
       record_type_(LOCAL_PROFILE),
       name_(1),
       email_(1),
       phone_number_(1, PhoneNumber(this)) {
 }
 
 AutofillProfile::AutofillProfile(const AutofillProfile& profile)
     : AutofillDataModel(std::string(), std::string()) {
   operator=(profile);
 }
 
 AutofillProfile::~AutofillProfile() {
 }
 
 AutofillProfile& AutofillProfile::operator=(const AutofillProfile& profile) {
+  set_server_id(profile.server_id());
   set_use_count(profile.use_count());
   set_use_date(profile.use_date());
   set_modification_date(profile.modification_date());
 
   if (this == &profile)
     return *this;
 
   set_guid(profile.guid());
   set_origin(profile.origin());
 
   record_type_ = profile.record_type_;
 
   name_ = profile.name_;
   email_ = profile.email_;
   company_ = profile.company_;
   phone_number_ = profile.phone_number_;
 
   for (size_t i = 0; i < phone_number_.size(); ++i)
     phone_number_[i].set_profile(this);
 
   address_ = profile.address_;
   set_language_code(profile.language_code());
 
-  server_id_ = profile.server_id();
-
   return *this;
 }
 
 void AutofillProfile::GetMatchingTypes(
     const base::string16& text,
     const std::string& app_locale,
     ServerFieldTypeSet* matching_types) const {
   FormGroupList info = FormGroups();
   for (FormGroupList::const_iterator it = info.begin(); it != info.end(); ++it)
     (*it)->GetMatchingTypes(text, app_locale, matching_types);
@@ skipping 517 matching lines @@
   contents.append(GetRawInfo(ADDRESS_HOME_STREET_ADDRESS));
   contents.append(GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY));
   contents.append(GetRawInfo(ADDRESS_HOME_CITY));
   contents.append(GetRawInfo(ADDRESS_HOME_STATE));
   contents.append(GetRawInfo(ADDRESS_HOME_ZIP));
   contents.append(GetRawInfo(ADDRESS_HOME_SORTING_CODE));
   contents.append(GetRawInfo(ADDRESS_HOME_COUNTRY));
   contents.append(MultiString(*this, PHONE_HOME_WHOLE_NUMBER));
   std::string contents_utf8 = UTF16ToUTF8(contents);
   contents_utf8.append(language_code());
-  server_id_ = base::SHA1HashString(contents_utf8);
+  set_server_id(base::SHA1HashString(contents_utf8));
 }
 
 // static
 base::string16 AutofillProfile::CanonicalizeProfileString(
     const base::string16& str) {
   base::string16 ret;
   ret.reserve(str.size());
 
   bool previous_was_whitespace = false;
 
@@ skipping 320 matching lines @@
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))
       << " "
       << profile.language_code()
       << " "
       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill