Add model version to association stats and client debug info.

BUG=249978

Review URL: https://chromiumcodereview.appspot.com/16854019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206774 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 1 deletions

diff --git a/sync/api/sync_merge_result.cc b/sync/api/sync_merge_result.cc
index 0caf57b..0c2fb83 100644
--- a/sync/api/sync_merge_result.cc
+++ b/sync/api/sync_merge_result.cc
@@ -12,7 +12,8 @@ SyncMergeResult::SyncMergeResult(ModelType type)
     num_items_after_association_(0),
     num_items_added_(0),
     num_items_deleted_(0),
-    num_items_modified_(0) {
+    num_items_modified_(0),
+    pre_association_version_(0) {
 }
 
 SyncMergeResult::~SyncMergeResult() {
@@ -46,6 +47,10 @@ void SyncMergeResult::set_num_items_modified(int num_items_modified) {
   num_items_modified_ = num_items_modified;
 }
 
+void SyncMergeResult::set_pre_association_version(int64 version) {
+  pre_association_version_ = version;
+}
+
 ModelType SyncMergeResult::model_type() const {
   return model_type_;
 }
@@ -74,4 +79,8 @@ int SyncMergeResult::num_items_modified() const {
   return num_items_modified_;
 }
 
+int64 SyncMergeResult::pre_association_version() const {
+  return pre_association_version_;
+}
+
 }  // namespace syncer
diff --git a/sync/api/sync_merge_result.h b/sync/api/sync_merge_result.h
index 4ffd474..712f4bd 100644
--- a/sync/api/sync_merge_result.h
+++ b/sync/api/sync_merge_result.h
@@ -34,6 +34,7 @@ class SYNC_EXPORT SyncMergeResult {
   void set_num_items_added(int num_items_added);
   void set_num_items_deleted(int num_items_deleted);
   void set_num_items_modified(int num_items_modified);
+  void set_pre_association_version(int64 version);
 
   // Getters.
   ModelType model_type() const;
@@ -43,6 +44,7 @@ class SYNC_EXPORT SyncMergeResult {
   int num_items_added() const;
   int num_items_deleted() const;
   int num_items_modified() const;
+  int64 pre_association_version() const;
 
  private:
   // Make |this| into a copy of |other|.
@@ -66,6 +68,9 @@ class SYNC_EXPORT SyncMergeResult {
   int num_items_added_;
   int num_items_deleted_;
   int num_items_modified_;
+
+  // Version of model before association.
+  int64 pre_association_version_;
 };
 
 }  // namespace syncer