Enable rollback by default on trunk (m38).

chrome/browser/sync/backup_rollback_controller_unittest.cc

 // Copyright 2014 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/backup_rollback_controller.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
@@ skipping 99 matching lines @@
   controller_->Start(base::TimeDelta());
   EXPECT_FALSE(backup_started_);
   EXPECT_FALSE(rollback_started_);
 
   // 2nd time no signed-in user. Starts backup.
   controller_->Start(base::TimeDelta());
   EXPECT_TRUE(backup_started_);
 }
 
 TEST_F(BackupRollbackControllerTest, StartRollback) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kSyncEnableRollback);
-
   EXPECT_CALL(signin_wrapper_, GetEffectiveUsername())
       .Times(2)
       .WillOnce(Return("test"))
       .WillOnce(Return(""));
   controller_->Start(base::TimeDelta());
   EXPECT_FALSE(backup_started_);
   EXPECT_FALSE(rollback_started_);
 
   controller_->OnRollbackReceived();
   controller_->Start(base::TimeDelta());
   EXPECT_TRUE(rollback_started_);
 }
 
 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_);
   EXPECT_FALSE(backup_started_);
 
   controller_->OnRollbackDone();
   controller_->Start(base::TimeDelta());
   EXPECT_TRUE(backup_started_);
 }
 
 TEST_F(BackupRollbackControllerTest, GiveUpRollback) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kSyncEnableRollback);
-
   fake_prefs_.SetRemainingRollbackTries(3);
   for (int i = 0; i < 3; ++i) {
     controller_->Start(base::TimeDelta());
     EXPECT_TRUE(rollback_started_);
     EXPECT_FALSE(backup_started_);
     rollback_started_ = false;
   }
 
   controller_->Start(base::TimeDelta());
   EXPECT_FALSE(rollback_started_);
   EXPECT_TRUE(backup_started_);
 }
 
 TEST_F(BackupRollbackControllerTest, SkipRollbackIfNotEnabled) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kSyncDisableRollback);
+
   EXPECT_CALL(signin_wrapper_, GetEffectiveUsername())
       .Times(2)
       .WillOnce(Return("test"))
       .WillOnce(Return(""));
   controller_->Start(base::TimeDelta());
   EXPECT_FALSE(backup_started_);
   EXPECT_FALSE(rollback_started_);
 
   controller_->OnRollbackReceived();
   controller_->Start(base::TimeDelta());
   EXPECT_TRUE(backup_started_);
   EXPECT_FALSE(rollback_started_);
 }
 
 #endif
 
 }  // anonymous namespace