Enable rollback by default on trunk (m38).

chrome/browser/sync/backup_rollback_controller_unittest.cc

Index: chrome/browser/sync/backup_rollback_controller_unittest.cc
diff --git a/chrome/browser/sync/backup_rollback_controller_unittest.cc b/chrome/browser/sync/backup_rollback_controller_unittest.cc
index e69be7fda6896ac49607ee5532a769c11222870b..a10809df08a658942d5f354761860ef818948bdd 100644
--- a/chrome/browser/sync/backup_rollback_controller_unittest.cc
+++ b/chrome/browser/sync/backup_rollback_controller_unittest.cc
@@ -117,9 +117,6 @@ TEST_F(BackupRollbackControllerTest, StartOnUserSignedOut) {
 }
 
 TEST_F(BackupRollbackControllerTest, StartRollback) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kSyncEnableRollback);
-
   EXPECT_CALL(signin_wrapper_, GetEffectiveUsername())
       .Times(2)
       .WillOnce(Return("test"))
@@ -134,18 +131,12 @@ TEST_F(BackupRollbackControllerTest, StartRollback) {
 }
 
 TEST_F(BackupRollbackControllerTest, RollbackOnBrowserStart) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kSyncEnableRollback);
-
   fake_prefs_.SetRemainingRollbackTries(1);
   controller_->Start(base::TimeDelta());
   EXPECT_TRUE(rollback_started_);
 }
 
 TEST_F(BackupRollbackControllerTest, BackupAfterRollbackDone) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kSyncEnableRollback);
-
   fake_prefs_.SetRemainingRollbackTries(3);
   controller_->Start(base::TimeDelta());
   EXPECT_TRUE(rollback_started_);
@@ -157,9 +148,6 @@ TEST_F(BackupRollbackControllerTest, BackupAfterRollbackDone) {
 }
 
 TEST_F(BackupRollbackControllerTest, GiveUpRollback) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kSyncEnableRollback);
-
   fake_prefs_.SetRemainingRollbackTries(3);
   for (int i = 0; i < 3; ++i) {
     controller_->Start(base::TimeDelta());
@@ -174,6 +162,9 @@ TEST_F(BackupRollbackControllerTest, GiveUpRollback) {
 }
 
 TEST_F(BackupRollbackControllerTest, SkipRollbackIfNotEnabled) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kSyncDisableRollback);
+
   EXPECT_CALL(signin_wrapper_, GetEffectiveUsername())
       .Times(2)
       .WillOnce(Return("test"))