Populate versions on individual nodes in sync model and native bookmark model.

sync/syncable/write_transaction.h

Index: sync/syncable/write_transaction.h
diff --git a/sync/syncable/write_transaction.h b/sync/syncable/write_transaction.h
index 17264c4c65e3c883439ca84f202c7d1e5b0af24a..aa90377cfe75aa20705efc4e985c95ce00580a18 100644
--- a/sync/syncable/write_transaction.h
+++ b/sync/syncable/write_transaction.h
@@ -17,6 +17,13 @@ class WriteTransaction : public BaseTransaction {
   WriteTransaction(const tracked_objects::Location& from_here,
                    WriterTag writer, Directory* directory);
 
+  // Constructor used for getting back model version after making sync
+  // API changes to one model. After the transaction is destroyed,

[Nicolas Zea, 2012/11/02 21:02:25]

nit: "After the transaction is destroyed" -> "During destruction, "

[haitaol1, 2012/11/02 22:58:18]

Done.

+  // |new_model_version| stores the new model version if model is changed,
+  // or -1 if model is not changed.
+  WriteTransaction(const tracked_objects::Location& from_here,
+                   Directory* directory, int64* new_model_version);
+
   virtual ~WriteTransaction();
 
   void SaveOriginal(const EntryKernel* entry);
@@ -36,10 +43,16 @@ class WriteTransaction : public BaseTransaction {
   ModelTypeSet NotifyTransactionChangingAndEnding(
       const ImmutableEntryKernelMutationMap& mutations);
 
+  // Increment versions of the models whose entries are modified and set the
+  // version on the changed entries.
+  void UpdateTransactionVersion(const std::vector<int64>& entry_changed);
+
   // Only the original fields are filled in until |RecordMutations()|.
   // We use a mutation map instead of a kernel set to avoid copying.
   EntryKernelMutationMap mutations_;
 
+  int64* new_model_version_;

[Nicolas Zea, 2012/11/02 21:02:25]

Comment that you don't have ownership of this.

[haitaol1, 2012/11/02 22:58:18]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(WriteTransaction);
 };