sync: Remove IDs from OrderedCommitSet

sync/engine/commit.cc

 // Copyright 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/commit.h"
 
 #include "base/debug/trace_event.h"
 #include "sync/engine/build_commit_command.h"
 #include "sync/engine/get_commit_ids_command.h"
 #include "sync/engine/process_commit_response_command.h"
 #include "sync/engine/syncer_proto_util.h"
 #include "sync/sessions/sync_session.h"
 #include "sync/syncable/mutable_entry.h"
 #include "sync/syncable/syncable_write_transaction.h"
 
 namespace syncer {
 
 using sessions::SyncSession;
 using sessions::StatusController;
 using syncable::SYNCER;
 using syncable::WriteTransaction;
 
 namespace {
 
 // Sets the SYNCING bits of all items in the commit set to value_to_set.
 void SetAllSyncingBitsToValue(WriteTransaction* trans,
                               const sessions::OrderedCommitSet& commit_set,
                               bool value_to_set) {
-  const std::vector<syncable::Id>& commit_ids = commit_set.GetAllCommitIds();
-  for (std::vector<syncable::Id>::const_iterator it = commit_ids.begin();
-       it != commit_ids.end(); ++it) {
-    syncable::MutableEntry entry(trans, syncable::GET_BY_ID, *it);
+  const std::vector<int64>& commit_handles = commit_set.GetAllCommitHandles();
+  for (std::vector<int64>::const_iterator it = commit_handles.begin();
+       it != commit_handles.end(); ++it) {
+    syncable::MutableEntry entry(trans, syncable::GET_BY_HANDLE, *it);
     if (entry.good()) {
       entry.Put(syncable::SYNCING, value_to_set);
     }
   }
 }
 
 // Sets the SYNCING bits for all items in the OrderedCommitSet.
 void SetSyncingBits(WriteTransaction* trans,
                     const sessions::OrderedCommitSet& commit_set) {
   SetAllSyncingBitsToValue(trans, commit_set, true);
@@ skipping 139 matching lines @@
   sessions::OrderedCommitSet commit_set(session->context()->routing_info());
   SyncerError result =
       BuildAndPostCommitsImpl(requested_types, syncer, session, &commit_set);
   if (result != SYNCER_OK) {
     ClearSyncingBits(session->context()->directory(), commit_set);
   }
   return result;
 }
 
 }  // namespace syncer