Fix the false-positive detection of commit errors

chrome/browser/sync/engine/download_updates_command.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/sync/engine/download_updates_command.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "chrome/browser/sync/engine/syncer.h"
@@ skipping 11 matching lines @@
 using std::string;
 using syncable::FIRST_REAL_MODEL_TYPE;
 using syncable::MODEL_TYPE_COUNT;
 
 DownloadUpdatesCommand::DownloadUpdatesCommand() {}
 DownloadUpdatesCommand::~DownloadUpdatesCommand() {}
 
 void DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
   ClientToServerMessage client_to_server_message;
   ClientToServerResponse update_response;
+  SyncOperationResult result;
 
   client_to_server_message.set_share(session->context()->account_name());
   client_to_server_message.set_message_contents(
       ClientToServerMessage::GET_UPDATES);
   GetUpdatesMessage* get_updates =
       client_to_server_message.mutable_get_updates();
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableSyncedBookmarksFolder)) {
     get_updates->set_include_syncable_bookmarks(true);
   }
 
   ScopedDirLookup dir(session->context()->directory_manager(),
                       session->context()->account_name());
   if (!dir.good()) {
     LOG(ERROR) << "Scoped dir lookup failed!";
+    result.error_type = DIRECTORY_LOOKUP_FAILED;
+    session->status_controller()->set_last_download_updates_result(
+        result);
     return;
   }
 
   // Request updates for all enabled types.
   syncable::ModelTypeBitSet enabled_types;
   const syncable::ModelTypePayloadMap& type_payload_map =
       session->source().types;
   for (ModelSafeRoutingInfo::const_iterator i = session->routing_info().begin();
        i != session->routing_info().end(); ++i) {
     syncable::ModelType model_type = syncable::ModelTypeFromInt(i->first);
@@ skipping 19 matching lines @@
   get_updates->set_fetch_folders(true);
 
   // Set GetUpdatesMessage.GetUpdatesCallerInfo information.
   get_updates->mutable_caller_info()->set_source(
       session->TestAndSetSource().updates_source);
   get_updates->mutable_caller_info()->set_notifications_enabled(
       session->context()->notifications_enabled());
 
   SyncerProtoUtil::AddRequestBirthday(dir, &client_to_server_message);
 
-  bool ok = SyncerProtoUtil::PostClientToServerMessage(
+  result = SyncerProtoUtil::PostClientToServerMessage(
       client_to_server_message,
       &update_response,
       session);
 
   VLOG(2) << SyncerProtoUtil::ClientToServerResponseDebugString(
       update_response);
 
   StatusController* status = session->status_controller();
   status->set_updates_request_types(enabled_types);
-  if (!ok) {
+  status->set_last_download_updates_result(result);
+  if (result.error_type != OPERATION_SUCCESS) {
     status->increment_num_consecutive_errors();
     status->mutable_updates_response()->Clear();
-    LOG(ERROR) << "PostClientToServerMessage() failed during GetUpdates";
+    LOG(ERROR) << "Get updates failed with return code: "
+        << browser_sync::GetSyncErrorTypeString(result.error_type);
     return;
   }
 
   status->mutable_updates_response()->CopyFrom(update_response);
 
   VLOG(1) << "GetUpdates "
           << " returned " << update_response.get_updates().entries_size()
           << " updates and indicated "
           << update_response.get_updates().changes_remaining()
           << " updates left on server.";
@@ skipping 10 matching lines @@
     if (target_datatypes[i]) {
       requested_type_count++;
       syncable::AddDefaultExtensionValue(syncable::ModelTypeFromInt(i),
                                          filter_protobuf);
     }
   }
   DCHECK_LT(0, requested_type_count) << "Doing GetUpdates with empty filter.";
 }
 
 }  // namespace browser_sync