[autofill] Sync server card and address metadata.

components/autofill/core/browser/autofill_profile.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_
 
 #include <stddef.h>
 
 #include <iosfwd>
@@ skipping 161 matching lines @@
       ServerFieldType excluded_field,
       size_t minimal_fields_shown,
       const std::string& app_locale,
       std::vector<base::string16>* labels);
 
   const std::string& language_code() const { return language_code_; }
   void set_language_code(const std::string& language_code) {
     language_code_ = language_code;
   }
 
-  // Nonempty only when type() == SERVER_PROFILE.
-  const std::string& server_id() const { return server_id_; }
-
-  // Creates an identifier and saves it as |server_id_|. Only used for
-  // server credit cards. The server doesn't attach an identifier so Chrome
-  // creates its own. The ID is a hash of the data contained in the profile.
+  // Creates an identifier and saves it as a server ID. The server doesn't
+  // attach an identifier so Chrome creates its own. The ID is a hash of the
+  // data contained in the profile.
   void GenerateServerProfileIdentifier();
 
   // Returns a standardized representation of the given string for comparison
   // purposes. The resulting string will be lower-cased with all punctuation
   // substituted by spaces. Whitespace will be converted to ASCII space, and
   // multiple whitespace characters will be collapsed.
   //
   // This string is designed for comparison purposes only and isn't suitable
   // for storing or displaying to the user.
   static base::string16 CanonicalizeProfileString(const base::string16& str);
@@ skipping 57 matching lines @@
 
   // Personal information for this profile.
   std::vector<NameInfo> name_;
   std::vector<EmailInfo> email_;
   CompanyInfo company_;
   std::vector<PhoneNumber> phone_number_;
   Address address_;
 
   // The BCP 47 language code that can be used to format |address_| for display.
   std::string language_code_;
-
-  // ID used for identifying this profile. Only set for SERVER_PROFILEs. This is
-  // a hash of the contents.
-  std::string server_id_;
 };
 
 // So we can compare AutofillProfiles with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile);
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_