WIP: The Bookmark Position Megapatch

sync/engine/get_commit_ids_command.cc

 // Copyright (c) 2012 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.
 
 #include "sync/engine/get_commit_ids_command.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 230 matching lines @@
   if (commit_set_->HaveCommitItem(item_handle)) {
     // We've already added this item to the commit set, and so must have
     // already added the predecessors as well.
     return true;
   }
   if (!AddItem(ready_unsynced_set, item, result))
     return false;  // Item is in conflict.
   if (item.Get(syncable::IS_DEL))
     return true;  // Deleted items have no predecessors.
 
-  syncable::Id prev_id = item.Get(syncable::PREV_ID);
+  syncable::Id prev_id = item.GetPredecessorId();
   while (!prev_id.IsRoot()) {
     syncable::Entry prev(trans, syncable::GET_BY_ID, prev_id);
     CHECK(prev.good()) << "Bad id when walking predecessors.";
     if (!prev.Get(syncable::IS_UNSYNCED))
       break;
     int64 handle = prev.Get(syncable::META_HANDLE);
     if (commit_set_->HaveCommitItem(handle)) {
       // We've already added this item to the commit set, and so must have
       // already added the predecessors as well.
       return true;
     }
     if (!AddItem(ready_unsynced_set, prev, result))
       return false;  // Item is in conflict.
-    prev_id = prev.Get(syncable::PREV_ID);
+    prev_id = prev.GetPredecessorId();
   }
   return true;
 }
 
 bool GetCommitIdsCommand::AddPredecessorsThenItem(
     syncable::BaseTransaction* trans,
     const ModelSafeRoutingInfo& routes,
     const std::set<int64>& ready_unsynced_set,
     const syncable::Entry& item,
     OrderedCommitSet* result) const {
@@ skipping 152 matching lines @@
   // delete trees.
 
   // Add moves and creates, and prepend their uncommitted parents.
   AddCreatesAndMoves(write_transaction, routes, ready_unsynced_set);
 
   // Add all deletes.
   AddDeletes(write_transaction, ready_unsynced_set);
 }
 
 }  // namespace syncer