summaryrefslogtreecommitdiff
path: root/chromium/sync/engine/commit.cc
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-11 21:33:03 +0100
committerAndras Becsi <andras.becsi@digia.com>2013-12-13 12:34:07 +0100
commitf2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch)
tree0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/sync/engine/commit.cc
parent5362912cdb5eea702b68ebe23702468d17c3017a (diff)
downloadqtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/sync/engine/commit.cc')
-rw-r--r--chromium/sync/engine/commit.cc19
1 files changed, 8 insertions, 11 deletions
diff --git a/chromium/sync/engine/commit.cc b/chromium/sync/engine/commit.cc
index ee69812c3f9..415c608def6 100644
--- a/chromium/sync/engine/commit.cc
+++ b/chromium/sync/engine/commit.cc
@@ -6,8 +6,9 @@
#include "base/debug/trace_event.h"
#include "sync/engine/build_commit_command.h"
-#include "sync/engine/get_commit_ids_command.h"
+#include "sync/engine/get_commit_ids.h"
#include "sync/engine/process_commit_response_command.h"
+#include "sync/engine/syncer.h"
#include "sync/engine/syncer_proto_util.h"
#include "sync/sessions/sync_session.h"
#include "sync/syncable/mutable_entry.h"
@@ -26,12 +27,12 @@ namespace {
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);
+ entry.PutSyncing(value_to_set);
}
}
}
@@ -76,11 +77,7 @@ bool PrepareCommitMessage(
// Fetch the items to commit.
const size_t batch_size = session->context()->max_commit_batch_size();
- GetCommitIdsCommand get_commit_ids_command(&trans,
- requested_types,
- batch_size,
- commit_set);
- get_commit_ids_command.Execute(session);
+ GetCommitIds(&trans, requested_types, batch_size, commit_set);
DVLOG(1) << "Commit message will contain " << commit_set->Size() << " items.";
if (commit_set->Empty()) {