Index: chrome/browser/sync/engine/download_updates_command.cc |
diff --git a/chrome/browser/sync/engine/download_updates_command.cc b/chrome/browser/sync/engine/download_updates_command.cc |
index 8cee1b55dbfa4c21ceffc2b3f947b49036743fda..ee90cbe04f96ebe4b50e43f0322606990592d9f6 100644 |
--- a/chrome/browser/sync/engine/download_updates_command.cc |
+++ b/chrome/browser/sync/engine/download_updates_command.cc |
@@ -91,7 +91,7 @@ SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) { |
AppendClientDebugInfoIfNeeded(session, debug_info); |
- bool ok = SyncerProtoUtil::PostClientToServerMessage( |
+ SyncerError result = SyncerProtoUtil::PostClientToServerMessage( |
client_to_server_message, |
&update_response, |
session); |
@@ -101,11 +101,11 @@ SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) { |
StatusController* status = session->mutable_status_controller(); |
status->set_updates_request_types(enabled_types); |
- if (!ok) { |
+ if (result != SYNCER_OK) { |
status->increment_num_consecutive_errors(); |
status->mutable_updates_response()->Clear(); |
LOG(ERROR) << "PostClientToServerMessage() failed during GetUpdates"; |
- return SYNCER_OK; // TODO(rlarocque): Return an error here. |
+ return result; |
} |
status->mutable_updates_response()->CopyFrom(update_response); |
@@ -115,7 +115,7 @@ SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) { |
<< " updates and indicated " |
<< update_response.get_updates().changes_remaining() |
<< " updates left on server."; |
- return SYNCER_OK; |
+ return result; |
} |
void DownloadUpdatesCommand::AppendClientDebugInfoIfNeeded( |