[autofill] Sync server card and address metadata.

components/autofill/core/browser/autofill_data_model.h

Index: components/autofill/core/browser/autofill_data_model.h
diff --git a/components/autofill/core/browser/autofill_data_model.h b/components/autofill/core/browser/autofill_data_model.h
index e04889f95762024d6c6f568e568baa03f0741429..2a68578b714ade3e411bc99a87c790175ced2f0b 100644
--- a/components/autofill/core/browser/autofill_data_model.h
+++ b/components/autofill/core/browser/autofill_data_model.h
@@ -45,6 +45,9 @@ class AutofillDataModel : public FormGroup {
   std::string origin() const { return origin_; }
   void set_origin(const std::string& origin) { origin_ = origin; }
 
+  const std::string& server_id() const { return server_id_; }
+  void set_server_id(const std::string& server_id) { server_id_ = server_id; }

[Evan Stade, 2015/05/18 22:02:59]

can you make this protected

[please use gerrit instead, 2015/05/20 20:04:55]

No longer applicable as we decided to go without this change.

+
   size_t use_count() const { return use_count_; }
   void set_use_count(size_t count) { use_count_ = count; }
 
@@ -69,6 +72,11 @@ class AutofillDataModel : public FormGroup {
   //   (c) an empty string, indicating that the origin for this data is unknown.
   std::string origin_;
 
+  // An identifeir used for identifying server data. Only set for
+  // SERVER_PROFILEs, MASKED_SERVER_CARDs, and FULL_SERVER_CARDs. If the server
+  // does not provide this data, then this is a hash of contents.
+  std::string server_id_;
+
   // The number of times this model has been used.
   size_t use_count_;