[autofill] Sync server card and address metadata.

components/autofill/core/browser/autofill_profile.h

Index: components/autofill/core/browser/autofill_profile.h
diff --git a/components/autofill/core/browser/autofill_profile.h b/components/autofill/core/browser/autofill_profile.h
index 5da60d50d952d25a8bc81e784f4bf357d78410be..dc01ed51ee6a1110f69e51a4604e1ab41658c124 100644
--- a/components/autofill/core/browser/autofill_profile.h
+++ b/components/autofill/core/browser/autofill_profile.h
@@ -179,12 +179,9 @@ class AutofillProfile : public AutofillDataModel {
     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
@@ -262,10 +259,6 @@ class AutofillProfile : public AutofillDataModel {
 
   // 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().