Reland of Convert enable_pre_sync_backup flag to new flags system.

chrome/browser/sync/profile_sync_service_unittest.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 "base/basictypes.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 25 matching lines @@
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/sync_driver/data_type_manager.h"
 #include "components/sync_driver/data_type_manager_observer.h"
 #include "components/sync_driver/fake_data_type_controller.h"
 #include "components/sync_driver/glue/sync_backend_host_mock.h"
 #include "components/sync_driver/pref_names.h"
 #include "components/sync_driver/signin_manager_wrapper.h"
 #include "components/sync_driver/sync_api_component_factory_mock.h"
+#include "components/sync_driver/sync_driver_features.h"
 #include "components/sync_driver/sync_driver_switches.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "components/sync_driver/sync_service_observer.h"
 #include "components/sync_driver/sync_util.h"
 #include "components/syncable_prefs/testing_pref_service_syncable.h"
 #include "components/version_info/version_info_values.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 621 matching lines @@
       ->UpdateCredentials(secondary_account_id, "second_account_refresh_token");
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile())
       ->RevokeCredentials(secondary_account_id);
   EXPECT_FALSE(service()->GetAccessTokenForTest().empty());
 
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile())
       ->RevokeCredentials(primary_account_id);
   EXPECT_TRUE(service()->GetAccessTokenForTest().empty());
 }
 
-#if defined(ENABLE_PRE_SYNC_BACKUP)
+#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
 TEST_F(ProfileSyncServiceTest, DontStartBackupOnBrowserStart) {
   CreateServiceWithoutSignIn();
   InitializeForFirstSync();
   PumpLoop();
   EXPECT_EQ(ProfileSyncService::IDLE, service()->backend_mode());
 }
 
 TEST_F(ProfileSyncServiceTest, BackupBeforeFirstSync) {
   CreateServiceWithoutSignIn();
   ExpectDataTypeManagerCreation(2, GetDefaultConfigureCalledCallback());
@@ skipping 78 matching lines @@
   EXPECT_EQ(ProfileSyncService::IDLE, service()->backend_mode());
 
   // First sync time is erased after rollback is done.
   EXPECT_TRUE(sync_prefs.GetFirstSyncTime().is_null());
 
   EXPECT_EQ(2u, delete_dir_param.size());
   EXPECT_FALSE(delete_dir_param[0]);
   EXPECT_FALSE(delete_dir_param[1]);
 }
 
-#endif
+#endif  // ENABLE_PRE_SYNC_BACKUP
 
 // Verify that LastSyncedTime is cleared when the user signs out.
 TEST_F(ProfileSyncServiceTest, ClearLastSyncedTimeOnSignOut) {
   IssueTestTokens();
   CreateService(AUTO_START);
   ExpectDataTypeManagerCreation(1, GetDefaultConfigureCalledCallback());
   ExpectSyncBackendHostCreation(1);
   InitializeForNthSync();
   EXPECT_TRUE(service()->IsSyncActive());
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_SYNC_TIME_JUST_NOW),
@@ skipping 273 matching lines @@
 // dereferenced in OnSyncCycleCompleted. The fix is to use find() to check if
 // entry for sessions exists in map.
 TEST_F(ProfileSyncServiceTest, ValidPointersInDTCMap) {
   CreateService(browser_sync::AUTO_START);
   service()->OnSessionRestoreComplete();
   service()->OnSyncCycleCompleted();
 }
 
 }  // namespace
 }  // namespace browser_sync