Fix the false-positive detection of commit errors

chrome/browser/sync/engine/clear_data_command.cc

 // Copyright (c) 2010 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/clear_data_command.h"
 
 #include <string>
 
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/sessions/sync_session.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 
 using syncable::ScopedDirLookup;
 
 namespace browser_sync {
 
 using sessions::StatusController;
 using sessions::SyncSession;
 using std::string;
 using syncable::FIRST_REAL_MODEL_TYPE;
 using syncable::MODEL_TYPE_COUNT;
 
 
 ClearDataCommand::ClearDataCommand() {}
 ClearDataCommand::~ClearDataCommand() {}
 
 void ClearDataCommand::ExecuteImpl(SyncSession* session) {
+  StatusController* status = session->status_controller();
   ClientToServerMessage client_to_server_message;
   ClientToServerResponse client_to_server_response;
+  SyncOperationResult result;
 
   client_to_server_message.set_share(session->context()->account_name());
   client_to_server_message.set_message_contents(
       ClientToServerMessage::CLEAR_DATA);
 
   client_to_server_message.mutable_clear_user_data();
 
   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;
+    status->set_last_clear_data_result(result);
     return;
   }
 
   SyncerProtoUtil::AddRequestBirthday(dir, &client_to_server_message);
 
   VLOG(1) << "Clearing server data";
 
-  bool ok = SyncerProtoUtil::PostClientToServerMessage(
-      client_to_server_message,
-      &client_to_server_response,
-      session);
+  result = SyncerProtoUtil::PostClientToServerMessage(
+               client_to_server_message,
+               &client_to_server_response,
+               session);
+  status->set_last_clear_data_result(result);
 
   DVLOG(1) << SyncerProtoUtil::ClientToServerResponseDebugString(
       client_to_server_response);
 
-  // Clear pending indicates that the server has received our clear message
-  if (!ok || !client_to_server_response.has_error_code() ||
+  // NOTE: This code is broken.  error_code() is deprecated.  Fixing this
+  // is a separate issue that I don't want to get into.
+
+  // Clear pending indicates that the server has received our clear message.
+  if (result.error_type != OPERATION_SUCCESS ||
+      // TODO(rlarocque): This code depends on deprecated error variables.
+      !client_to_server_response.has_error_code() ||
       client_to_server_response.error_code() !=
       sync_pb::ClientToServerResponse::SUCCESS) {
     // On failure, subsequent requests to the server will cause it to attempt
     // to resume the clear.  The client will handle disabling of sync in
     // response to a store birthday error from the server.
     SyncEngineEvent event(SyncEngineEvent::CLEAR_SERVER_DATA_FAILED);
     session->context()->NotifyListeners(event);
 
     LOG(ERROR) << "Error posting ClearData.";
 
     return;
   }
 
   SyncEngineEvent event(SyncEngineEvent::CLEAR_SERVER_DATA_SUCCEEDED);
   session->context()->NotifyListeners(event);
 
   session->delegate()->OnShouldStopSyncingPermanently();
 
   VLOG(1) << "ClearData succeeded.";
 }
 
 }  // namespace browser_sync