Add return values to SyncerCommand

chrome/browser/sync/engine/clear_data_command.cc

Index: chrome/browser/sync/engine/clear_data_command.cc
diff --git a/chrome/browser/sync/engine/clear_data_command.cc b/chrome/browser/sync/engine/clear_data_command.cc
index 932c624d63ab8070cbb4f098ae7653e5ab5f5fba..d84335d9f008c0adbbc0bc9a98be448181d9db6e 100644
--- a/chrome/browser/sync/engine/clear_data_command.cc
+++ b/chrome/browser/sync/engine/clear_data_command.cc
@@ -26,7 +26,7 @@ using syncable::MODEL_TYPE_COUNT;
 ClearDataCommand::ClearDataCommand() {}
 ClearDataCommand::~ClearDataCommand() {}
 
-void ClearDataCommand::ExecuteImpl(SyncSession* session) {
+SyncerError ClearDataCommand::ExecuteImpl(SyncSession* session) {
   ClientToServerMessage client_to_server_message;
   ClientToServerResponse client_to_server_response;
 
@@ -40,7 +40,7 @@ void ClearDataCommand::ExecuteImpl(SyncSession* session) {
                       session->context()->account_name());
   if (!dir.good()) {
     LOG(ERROR) << "Scoped dir lookup failed!";
-    return;
+    return DIRECTORY_LOOKUP_FAILED;
   }
 
   SyncerProtoUtil::AddRequestBirthday(dir, &client_to_server_message);
@@ -55,6 +55,10 @@ void ClearDataCommand::ExecuteImpl(SyncSession* session) {
   DVLOG(1) << SyncerProtoUtil::ClientToServerResponseDebugString(
       client_to_server_response);
 
+  // FIXME(rlarocque): This code is wrong.  The response error codes it checks
+  // have been obsoleted.  The only reason it hasn't caused problems is that
+  // this code is unreachable.  We should do something to clean up this mess.
+  //

[lipalani1, 2012/01/05 22:59:41]

Change it to a TODO

[rlarocque, 2012/01/06 00:24:31]

Done.

   // Clear pending indicates that the server has received our clear message
   if (!ok || !client_to_server_response.has_error_code() ||
       client_to_server_response.error_code() != sync_pb::SyncEnums::SUCCESS) {
@@ -66,7 +70,7 @@ void ClearDataCommand::ExecuteImpl(SyncSession* session) {
 
     LOG(ERROR) << "Error posting ClearData.";
 
-    return;
+    return NO_ERROR;
   }
 
   SyncEngineEvent event(SyncEngineEvent::CLEAR_SERVER_DATA_SUCCEEDED);
@@ -75,6 +79,7 @@ void ClearDataCommand::ExecuteImpl(SyncSession* session) {
   session->delegate()->OnShouldStopSyncingPermanently();
 
   DVLOG(1) << "ClearData succeeded.";
+  return NO_ERROR;
 }
 
 }  // namespace browser_sync