| Index: chrome/browser/sync/engine/post_commit_message_command.cc
|
| diff --git a/chrome/browser/sync/engine/post_commit_message_command.cc b/chrome/browser/sync/engine/post_commit_message_command.cc
|
| index c70a1936d96d4b69165effccf1faf9e8bd105b76..5b75f761fe734f47e9b93037888a043718ec088c 100644
|
| --- a/chrome/browser/sync/engine/post_commit_message_command.cc
|
| +++ b/chrome/browser/sync/engine/post_commit_message_command.cc
|
| @@ -19,17 +19,19 @@ namespace browser_sync {
|
| PostCommitMessageCommand::PostCommitMessageCommand() {}
|
| PostCommitMessageCommand::~PostCommitMessageCommand() {}
|
|
|
| -void PostCommitMessageCommand::ExecuteImpl(sessions::SyncSession* session) {
|
| +SyncerError PostCommitMessageCommand::ExecuteImpl(
|
| + sessions::SyncSession* session) {
|
| if (session->status_controller().commit_ids().empty())
|
| - return; // Nothing to commit.
|
| + return NO_ERROR; // Nothing to commit.
|
| ClientToServerResponse response;
|
| syncable::ScopedDirLookup dir(session->context()->directory_manager(),
|
| session->context()->account_name());
|
| if (!dir.good())
|
| - return;
|
| + return DIRECTORY_LOOKUP_FAILED;
|
| sessions::StatusController* status = session->mutable_status_controller();
|
| - if (!SyncerProtoUtil::PostClientToServerMessage(status->commit_message(),
|
| - &response, session)) {
|
| + SyncerError result = SyncerProtoUtil::PostClientToServerMessage(
|
| + status->commit_message(), &response, session);
|
| + if (result != NO_ERROR) {
|
| // None of our changes got through. Clear the SYNCING bit which was
|
| // set to true during BuildCommitCommand, and which may still be true.
|
| // Not to be confused with IS_UNSYNCED, this bit is used to detect local
|
| @@ -41,11 +43,12 @@ void PostCommitMessageCommand::ExecuteImpl(sessions::SyncSession* session) {
|
| syncable::MutableEntry entry(&trans, syncable::GET_BY_ID, commit_ids[i]);
|
| entry.Put(syncable::SYNCING, false);
|
| }
|
| - return;
|
| - } else {
|
| - status->set_items_committed();
|
| + return result;
|
| }
|
| +
|
| + status->set_items_committed();
|
| status->mutable_commit_response()->CopyFrom(response);
|
| + return NO_ERROR;
|
| }
|
|
|
| } // namespace browser_sync
|
|
|