Add an action for server to send down rollback command.

chrome/browser/sync/test/integration/sync_test.cc

Index: chrome/browser/sync/test/integration/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 68bdae55b16cbf004b7d135c272082c6ee2c1c96..da83b0d51db730278b0004fff278974967dd4aec 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -915,8 +915,13 @@ sync_pb::SyncEnums::ErrorType
       return sync_pb::SyncEnums::MIGRATION_DONE;
     case syncer::UNKNOWN_ERROR:
       return sync_pb::SyncEnums::UNKNOWN;
-    default:
-      NOTREACHED();
+    case syncer::INVALID_CREDENTIAL:
+      return sync_pb::SyncEnums::USER_NOT_ACTIVATED;

[Nicolas Zea, 2014/04/18 18:06:50]

shouldn't this be auth_expired?

[haitaol1, 2014/04/18 20:01:31]

This should be the reverse mapping of
ConvertSyncProtocolErrorTypePBToLocalType(), which maps USER_NOT_ACTIVATED,
AUTH_INVALID, ACCESS_DENIED to INVALID_CREDENTIAL. But I dont' see any of those
being set in server code. Looks like auth error is actually detected through
http response code. So set NOTREACHED() to prevent testing on false assumption.

+    case syncer::DISABLED_BY_ADMIN:
+      return sync_pb::SyncEnums::DISABLED_BY_ADMIN;
+    case syncer::USER_ROLLBACK:
+      return sync_pb::SyncEnums::USER_ROLLBACK;
+    case syncer::NON_RETRIABLE_ERROR:
       return sync_pb::SyncEnums::UNKNOWN;
   }
 }
@@ -934,11 +939,11 @@ sync_pb::SyncEnums::Action GetClientToServerResponseAction(
       return sync_pb::SyncEnums::STOP_AND_RESTART_SYNC;
     case syncer::DISABLE_SYNC_ON_CLIENT:
       return sync_pb::SyncEnums::DISABLE_SYNC_ON_CLIENT;
+    case syncer::STOP_SYNC_FOR_DISABLED_ACCOUNT:
+      return sync_pb::SyncEnums::DISABLED_BY_ADMIN;
+    case syncer::USER_ROLLBACK:

[Nicolas Zea, 2014/04/18 18:06:50]

Shouldn't this case lead to DISABLE_SYNC_AND_ROLLBACK?

[haitaol1, 2014/04/18 20:01:31]

I didn't add corresponding action in sync proto because that's not how server
works today. Set NOTREACHED() to prevent testing.

On 2014/04/18 18:06:50, Nicolas Zea wrote:

     case syncer::UNKNOWN_ACTION:
       return sync_pb::SyncEnums::UNKNOWN_ACTION;
-    default:
-      NOTREACHED();
-      return sync_pb::SyncEnums::UNKNOWN_ACTION;
   }
 }