Add an action for server to send down rollback command.

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

 // Copyright (c) 2012 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/test/integration/sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 897 matching lines @@
     case syncer::THROTTLED:
       return sync_pb::SyncEnums::THROTTLED;
     case syncer::CLEAR_PENDING:
       return sync_pb::SyncEnums::CLEAR_PENDING;
     case syncer::TRANSIENT_ERROR:
       return sync_pb::SyncEnums::TRANSIENT_ERROR;
     case syncer::MIGRATION_DONE:
       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;
   }
 }
 
 sync_pb::SyncEnums::Action GetClientToServerResponseAction(
     const syncer::ClientAction& action) {
   switch (action) {
     case syncer::UPGRADE_CLIENT:
       return sync_pb::SyncEnums::UPGRADE_CLIENT;
     case syncer::CLEAR_USER_DATA_AND_RESYNC:
       return sync_pb::SyncEnums::CLEAR_USER_DATA_AND_RESYNC;
     case syncer::ENABLE_SYNC_ON_ACCOUNT:
       return sync_pb::SyncEnums::ENABLE_SYNC_ON_ACCOUNT;
     case syncer::STOP_AND_RESTART_SYNC:
       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;
   }
 }
 
 }  // namespace
 
 void SyncTest::TriggerSyncError(const syncer::SyncProtocolError& error,
                                 SyncErrorFrequency frequency) {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   std::string path = "chromiumsync/error";
   int error_type =
@@ skipping 28 matching lines @@
 
 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                               const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SetProxyConfigCallback, &done,
                  make_scoped_refptr(context_getter), proxy_config));
   done.Wait();
 }