| Index: sync/engine/get_commit_ids_command.h
|
| diff --git a/sync/engine/get_commit_ids_command.h b/sync/engine/get_commit_ids_command.h
|
| index 334fb6b9d406fd8f8d87c62c41e3c8299ec65e48..118e57c20e62ccdf9802a1ef6d883b24d760ca65 100644
|
| --- a/sync/engine/get_commit_ids_command.h
|
| +++ b/sync/engine/get_commit_ids_command.h
|
| @@ -24,7 +24,8 @@ class GetCommitIdsCommand : public SyncerCommand {
|
| friend class SyncerTest;
|
|
|
| public:
|
| - explicit GetCommitIdsCommand(int commit_batch_size);
|
| + GetCommitIdsCommand(size_t commit_batch_size,
|
| + sessions::OrderedCommitSet* ordered_commit_set);
|
| virtual ~GetCommitIdsCommand();
|
|
|
| // SyncerCommand implementation.
|
| @@ -93,8 +94,7 @@ class GetCommitIdsCommand : public SyncerCommand {
|
| sessions::OrderedCommitSet* result) const;
|
|
|
| // Appends all commit ready predecessors of |item|, followed by |item| itself,
|
| - // to |ordered_commit_set_|, iff item and all its predecessors not in
|
| - // conflict.
|
| + // to |commit_set|, iff item and all its predecessors not in conflict.
|
| // Return values:
|
| // False: if there was an entry in conflict.
|
| // True: if all entries were checked for commit readiness and added to
|
| @@ -103,7 +103,7 @@ class GetCommitIdsCommand : public SyncerCommand {
|
| const ModelSafeRoutingInfo& routes,
|
| const std::set<int64>& ready_unsynced_set,
|
| const syncable::Entry& item,
|
| - sessions::OrderedCommitSet* result) const;
|
| + sessions::OrderedCommitSet* commit_set) const;
|
|
|
| bool IsCommitBatchFull() const;
|
|
|
| @@ -114,9 +114,8 @@ class GetCommitIdsCommand : public SyncerCommand {
|
| void AddDeletes(syncable::WriteTransaction* write_transaction,
|
| const std::set<int64>& ready_unsynced_set);
|
|
|
| - scoped_ptr<sessions::OrderedCommitSet> ordered_commit_set_;
|
| -
|
| - int requested_commit_batch_size_;
|
| + size_t requested_commit_batch_size_;
|
| + sessions::OrderedCommitSet *commit_set_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GetCommitIdsCommand);
|
| };
|
|
|