| Index: sync/engine/process_commit_response_command.cc
|
| diff --git a/sync/engine/process_commit_response_command.cc b/sync/engine/process_commit_response_command.cc
|
| index 766a6b337e1f1646bf529b446c276401716b0938..26be7766d8e8c05d321c9033426a6c7774b260fb 100644
|
| --- a/sync/engine/process_commit_response_command.cc
|
| +++ b/sync/engine/process_commit_response_command.cc
|
| @@ -22,14 +22,19 @@
|
| #include "sync/syncable/write_transaction.h"
|
| #include "sync/util/time.h"
|
|
|
| -using syncable::WriteTransaction;
|
| -using syncable::MutableEntry;
|
| -using syncable::Entry;
|
| -
|
| using std::set;
|
| using std::string;
|
| using std::vector;
|
|
|
| +namespace syncer {
|
| +
|
| +using sessions::OrderedCommitSet;
|
| +using sessions::StatusController;
|
| +using sessions::SyncSession;
|
| +using sessions::ConflictProgress;
|
| +using syncable::WriteTransaction;
|
| +using syncable::MutableEntry;
|
| +using syncable::Entry;
|
| using syncable::BASE_VERSION;
|
| using syncable::GET_BY_ID;
|
| using syncable::ID;
|
| @@ -45,13 +50,6 @@ using syncable::SERVER_VERSION;
|
| using syncable::SYNCER;
|
| using syncable::SYNCING;
|
|
|
| -namespace syncer {
|
| -
|
| -using sessions::OrderedCommitSet;
|
| -using sessions::StatusController;
|
| -using sessions::SyncSession;
|
| -using sessions::ConflictProgress;
|
| -
|
| ProcessCommitResponseCommand::ProcessCommitResponseCommand(
|
| const sessions::OrderedCommitSet& commit_set,
|
| const ClientToServerMessage& commit_message,
|
|
|