| Index: sync/engine/build_commit_command.h
|
| diff --git a/sync/engine/build_commit_command.h b/sync/engine/build_commit_command.h
|
| index 0adab28f54bab13054b26b74524bee56835bbc15..c1712a615c558b8ed5c083fee93fce2ad1ea851d 100644
|
| --- a/sync/engine/build_commit_command.h
|
| +++ b/sync/engine/build_commit_command.h
|
| @@ -9,7 +9,6 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "sync/engine/syncer_command.h"
|
| -#include "sync/engine/syncproto.h"
|
| #include "sync/syncable/entry_kernel.h"
|
|
|
| namespace syncer {
|
| @@ -37,7 +36,7 @@ class BuildCommitCommand : public SyncerCommand {
|
| // The commit_message parameter is an output parameter which will contain the
|
| // fully initialized commit message once ExecuteImpl() has been called.
|
| BuildCommitCommand(const sessions::OrderedCommitSet& batch_commit_set,
|
| - ClientToServerMessage* commit_message);
|
| + sync_pb::ClientToServerMessage* commit_message);
|
| virtual ~BuildCommitCommand();
|
|
|
| // SyncerCommand implementation.
|
| @@ -52,7 +51,7 @@ class BuildCommitCommand : public SyncerCommand {
|
| static int64 GetGap();
|
|
|
| void AddExtensionsActivityToMessage(sessions::SyncSession* session,
|
| - CommitMessage* message);
|
| + sync_pb::CommitMessage* message);
|
| // Helper for computing position. Find the numeric position value
|
| // of the closest already-synced entry. |direction| must be one of
|
| // NEXT_ID or PREV_ID; this parameter controls the search direction.
|
| @@ -70,7 +69,7 @@ class BuildCommitCommand : public SyncerCommand {
|
| const sessions::OrderedCommitSet& batch_commit_set_;
|
|
|
| // Output parameter; see constructor comment.
|
| - ClientToServerMessage* commit_message_;
|
| + sync_pb::ClientToServerMessage* commit_message_;
|
| };
|
|
|
| } // namespace syncer
|
|
|