Enable rollback by default on trunk (m38).

chrome/browser/sync/test/integration/single_client_backup_rollback_test.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 "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 25 matching lines @@
 class SingleClientBackupRollbackTest : public SyncTest {
  public:
   SingleClientBackupRollbackTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SingleClientBackupRollbackTest() {}
 
   void DisableBackup() {
     CommandLine::ForCurrentProcess()->AppendSwitch(
           switches::kSyncDisableBackup);
   }
 
-  void EnableRollback() {
+  void DisableRollback() {
     CommandLine::ForCurrentProcess()->AppendSwitch(
-          switches::kSyncEnableRollback);
+          switches::kSyncDisableRollback);
   }
 
   base::Time GetBackupDbLastModified() {
     base::RunLoop run_loop;
 
     base::Time backup_time;
     syncer::CheckSyncDbLastModifiedTime(
         GetProfile(0)->GetPath().Append(FILE_PATH_LITERAL("Sync Data Backup")),
         base::MessageLoopProxy::current(),
         base::Bind(&SingleClientBackupRollbackTest::CheckDbCallback,
@@ skipping 69 matching lines @@
   ASSERT_EQ(ProfileSyncService::IDLE, GetSyncService(0)->backend_mode());
 }
 
 #if defined(ENABLE_PRE_SYNC_BACKUP)
 #define MAYBE_TestBackupOnly TestBackupOnly
 #else
 #define MAYBE_TestBackupOnly DISABLED_TestBackupOnly
 #endif
 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
                        MAYBE_TestBackupOnly) {
+  DisableRollback();
+
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   // Starting state:
   // other_node
   //    -> http://mail.google.com  "url0"
   //    -> http://www.nhl.com "url1"
   ASSERT_TRUE(AddURL(0, GetOtherNode(0), 0, "url0",
                      GURL("http://mail.google.com")));
   ASSERT_TRUE(AddURL(0, GetOtherNode(0), 1, "url1",
                      GURL("http://www.nhl.com")));
@@ skipping 30 matching lines @@
             GetOtherNode(0)->GetChild(0)->url());
 }
 
 #if defined(ENABLE_PRE_SYNC_BACKUP)
 #define MAYBE_TestBackupRollback TestBackupRollback
 #else
 #define MAYBE_TestBackupRollback DISABLED_TestBackupRollback
 #endif
 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
                        MAYBE_TestBackupRollback) {
-  EnableRollback();
-
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   // Starting state:
   // other_node
   //    -> top
   //      -> tier1_a
   //        -> http://mail.google.com  "tier1_a_url0"
   //      -> tier1_b
   //        -> http://www.nhl.com "tier1_b_url0"
   const BookmarkNode* top = AddFolder(0, GetOtherNode(0), 0, "top");
@@ skipping 46 matching lines @@
 
 #if defined(ENABLE_PRE_SYNC_BACKUP)
 #define MAYBE_TestPrefBackupRollback TestPrefBackupRollback
 #else
 #define MAYBE_TestPrefBackupRollback DISABLED_TestPrefBackupRollback
 #endif
 // Verify local preferences are not affected by preferences in backup DB under
 // backup mode.
 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
                        MAYBE_TestPrefBackupRollback) {
-  EnableRollback();
-
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   preferences_helper::ChangeStringPref(0, prefs::kHomePage, kUrl1);
 
   BackupModeChecker checker(GetSyncService(0),
                             base::TimeDelta::FromSeconds(15));
   ASSERT_TRUE(checker.Wait());
 
   // Shut down backup, then change preference.
   GetSyncService(0)->StartStopBackupForTesting();
@@ skipping 25 matching lines @@
             preferences_helper::GetPrefs(0)->GetString(prefs::kHomePage));
 }
 
 #if defined(ENABLE_PRE_SYNC_BACKUP)
 #define MAYBE_RollbackNoBackup RollbackNoBackup
 #else
 #define MAYBE_RollbackNoBackup DISABLED_RollbackNoBackup
 #endif
 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
                        MAYBE_RollbackNoBackup) {
-  EnableRollback();
-
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   // Setup sync, wait for its completion, and make sure changes were synced.
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Starting state:
   // other_node
   //    -> http://mail.google.com  "url0"
   //    -> http://www.nhl.com "url1"
   ASSERT_TRUE(AddURL(0, GetOtherNode(0), 0, "url0",
@@ skipping 43 matching lines @@
   GetSyncService(0)->StartStopBackupForTesting();
   GetSyncService(0)->StartStopBackupForTesting();
   ASSERT_TRUE(checker.Wait());
 
   // Verify bookmarks are unchanged.
   ASSERT_EQ(3, sub_folder->child_count());
   ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url());
   ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url());
   ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url());
 }