Revert of Convert enable_pre_sync_backup flag to new flags system.

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/files/file_util.h"
 #include "base/location.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/test_timeouts.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/preferences_helper.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
-#include "components/sync_driver/sync_driver_features.h"
 #include "components/sync_driver/sync_driver_switches.h"
 #include "sync/internal_api/public/util/sync_db_util.h"
 #include "sync/test/fake_server/fake_server_verifier.h"
 #include "sync/util/time.h"
 
 using bookmarks::BookmarkNode;
 using bookmarks_helper::AddFolder;
 using bookmarks_helper::AddURL;
 using bookmarks_helper::GetOtherNode;
 using bookmarks_helper::ModelMatchesVerifier;
@@ skipping 119 matching lines @@
     return rollback_started_ && clear_done_;
   }
 
   ProfileSyncService* const pss_;
   const base::TimeDelta timeout_;
   base::RunLoop run_loop_;
   bool rollback_started_;
   bool clear_done_;
 };
 
-#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
+#if defined(ENABLE_PRE_SYNC_BACKUP)
 #define MAYBE_TestBackup TestBackup
 #else
 #define MAYBE_TestBackup DISABLED_TestBackup
 #endif
 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
                        MAYBE_TestBackup) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   // Setup sync, wait for its completion, and make sure changes were synced.
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   // Verify backup DB is created and backup time is set on device info.
   base::Time backup_time = GetBackupDbLastModified();
   ASSERT_FALSE(backup_time.is_null());
   ASSERT_EQ(backup_time, GetSyncService(0)->GetDeviceBackupTimeForTesting());
 }
 
-#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
+#if defined(ENABLE_PRE_SYNC_BACKUP)
 #define MAYBE_TestBackupDisabled TestBackupDisabled
 #else
 #define MAYBE_TestBackupDisabled DISABLED_TestBackupDisabled
 #endif
 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
                        MAYBE_TestBackupDisabled) {
   DisableBackup();
 
   // Setup sync, wait for its completion, and make sure changes were synced.
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   // Verify backup DB is not created and backup time is not set on device info.
   ASSERT_FALSE(base::PathExists(
       GetProfile(0)->GetPath().Append(FILE_PATH_LITERAL("Sync Data Backup"))));
   ASSERT_TRUE(GetSyncService(0)->GetDeviceBackupTimeForTesting().is_null());
 }
 
-#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
+#if defined(ENABLE_PRE_SYNC_BACKUP)
 #define MAYBE_TestRollback TestRollback
 #else
 #define MAYBE_TestRollback DISABLED_TestRollback
 #endif
 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
                        MAYBE_TestRollback) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   // Starting state:
   // other_node
@@ skipping 37 matching lines @@
   // Verify bookmarks are restored.
   ASSERT_EQ(1, tier1_a->child_count());
   const BookmarkNode* url1 = tier1_a->GetChild(0);
   ASSERT_EQ(GURL("http://mail.google.com"), url1->url());
 
   ASSERT_EQ(1, tier1_b->child_count());
   const BookmarkNode* url2 = tier1_b->GetChild(0);
   ASSERT_EQ(GURL("http://www.nhl.com"), url2->url());
 }
 
-#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
+#if defined(ENABLE_PRE_SYNC_BACKUP)
 #define MAYBE_TestRollbackDisabled TestRollbackDisabled
 #else
 #define MAYBE_TestRollbackDisabled DISABLED_TestRollbackDisabled
 #endif
 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
                        MAYBE_TestRollbackDisabled) {
   DisableRollback();
 
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
@@ skipping 28 matching lines @@
   SyncBackendStoppedChecker shutdown_checker(GetSyncService(0));
   ASSERT_TRUE(shutdown_checker.Wait());
 
   // With rollback disabled, bookmarks in backup DB should not be restored.
   // Only bookmark added during sync is present.
   ASSERT_EQ(1, GetOtherNode(0)->child_count());
   ASSERT_EQ(GURL("http://www.yahoo.com"),
             GetOtherNode(0)->GetChild(0)->url());
 }
 
-#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
+#if defined(ENABLE_PRE_SYNC_BACKUP)
 #define MAYBE_TestSyncDisabled TestSyncDisabled
 #else
 #define MAYBE_TestSyncDisabled DISABLED_TestSyncDisabled
 #endif
 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
                        MAYBE_TestSyncDisabled) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   // Starting state:
   // other_node
@@ skipping 26 matching lines @@
   // Wait sync backend is completely shut down.
   SyncBackendStoppedChecker shutdown_checker(GetSyncService(0));
   ASSERT_TRUE(shutdown_checker.Wait());
 
   // Shouldn't restore bookmarks with sign-out only.
   ASSERT_EQ(1, GetOtherNode(0)->child_count());
   ASSERT_EQ(GURL("http://www.yahoo.com"),
             GetOtherNode(0)->GetChild(0)->url());
 }
 
-#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
+#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) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   // Starting state:
   // other_node
@@ skipping 26 matching lines @@
   ASSERT_TRUE(rollback_checker.Wait());
   SyncBackendStoppedChecker checker(GetSyncService(0));
   ASSERT_TRUE(checker.Wait());
 
   // Without backup DB, bookmarks remain at the state when sync stops.
   ASSERT_EQ(1, GetOtherNode(0)->child_count());
   ASSERT_EQ(GURL("http://www.nhl.com"),
             GetOtherNode(0)->GetChild(0)->url());
 }
 
-#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
+#if defined(ENABLE_PRE_SYNC_BACKUP)
 #define MAYBE_DontChangeBookmarkOrdering DontChangeBookmarkOrdering
 #else
 #define MAYBE_DontChangeBookmarkOrdering DISABLED_DontChangeBookmarkOrdering
 #endif
 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
                        MAYBE_DontChangeBookmarkOrdering) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   const BookmarkNode* sub_folder = AddFolder(0, GetOtherNode(0), 0, "test");
   ASSERT_TRUE(AddURL(0, sub_folder, 0, "", GURL(kUrl1)));
@@ skipping 22 matching lines @@
   ASSERT_TRUE(rollback_checker.Wait());
   SyncBackendStoppedChecker shutdown_checker(GetSyncService(0));
   ASSERT_TRUE(shutdown_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());
 }