Index: chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc |
diff --git a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc |
index 128fa9371ba63fd8382767c1bb5b797b450a47da..769326a89b3e9dd455412c97e5e7130b39782a2e 100644 |
--- a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc |
+++ b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc |
@@ -19,7 +19,6 @@ |
#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" |
@@ -159,7 +158,7 @@ |
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 |
@@ -179,7 +178,7 @@ |
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 |
@@ -199,7 +198,7 @@ |
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 |
@@ -257,7 +256,7 @@ |
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 |
@@ -306,7 +305,7 @@ |
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 |
@@ -353,7 +352,7 @@ |
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 |
@@ -400,7 +399,7 @@ |
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 |