WIP: The Bookmark Position Megapatch

sync/internal_api/change_reorder_buffer.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/internal_api/change_reorder_buffer.h"
 
 #include <limits>
 #include <queue>
 #include <set>
 #include <utility>  // for pair<>
@@ skipping 182 matching lines @@
         Traversal::LinkSet::const_iterator j = traversal.begin_children(next);
         Traversal::LinkSet::const_iterator end = traversal.end_children(next);
         for (; j != end; ++j) {
           CHECK(j->first == next);
           to_visit.push(j->second);
         }
     } else {
       // There were ordering changes on the children of this parent, so
       // enumerate all the children in the sibling order.
       syncable::Entry parent(trans, syncable::GET_BY_HANDLE, next);
-      syncable::Id id;
-      if (!trans->directory()->GetFirstChildId(
-              trans, parent.Get(syncable::ID), &id)) {
-        *changes = ImmutableChangeRecordList();
-        return false;
-      }
+      syncable::Id id = parent.GetFirstChildId();
       while (!id.IsRoot()) {
         syncable::Entry child(trans, syncable::GET_BY_ID, id);
         CHECK(child.good());
         int64 handle = child.Get(syncable::META_HANDLE);
         to_visit.push(handle);
         // If there is no operation on this child node, record it as as an
         // update, so that the listener gets notified of all nodes in the new
         // ordering.
         if (operations_.find(handle) == operations_.end())
           operations_[handle] = OP_UPDATE_POSITION_AND_PROPERTIES;
-        id = child.Get(syncable::NEXT_ID);
+        id = child.GetSuccessorId();
       }
     }
   }
 
   *changes = ImmutableChangeRecordList(&changelist);
   return true;
 }
 
 }  // namespace syncer