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..4379a80d77aa2e966ea69096630862a56363f979 100644 |
--- a/chrome/browser/sync/engine/post_commit_message_command.cc |
+++ b/chrome/browser/sync/engine/post_commit_message_command.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -19,14 +19,15 @@ 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 SYNCER_OK; // 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)) { |
@@ -41,11 +42,13 @@ void PostCommitMessageCommand::ExecuteImpl(sessions::SyncSession* session) { |
syncable::MutableEntry entry(&trans, syncable::GET_BY_ID, commit_ids[i]); |
entry.Put(syncable::SYNCING, false); |
} |
- return; |
+ return SYNCER_OK; // TODO(rlarocque): Return an error here. |
} else { |
status->set_items_committed(); |
} |
+ |
status->mutable_commit_response()->CopyFrom(response); |
+ return SYNCER_OK; |
} |
} // namespace browser_sync |