Define a single macro for enabling backup function on desktop: win, mac (exclude ios),

linux (exclude cros).

BUG=362679

Review URL: https://codereview.chromium.org/347653006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278659 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -418,6 +418,9 @@
       # Whether one-click signin is enabled or not.
       'enable_one_click_signin%': 0,
 
+      # Whether to back up data before sync.
+      'enable_pre_sync_backup%': 0,
+
       # Enable Chrome browser extensions
       'enable_extensions%': 1,
 
@@ -679,6 +682,7 @@
 
         ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', {
           'enable_one_click_signin%': 1,
+          'enable_pre_sync_backup%': 1,
         }],
 
         ['OS=="android"', {
@@ -1045,6 +1049,7 @@
     'use_third_party_translations%': '<(use_third_party_translations)',
     'remoting%': '<(remoting)',
     'enable_one_click_signin%': '<(enable_one_click_signin)',
+    'enable_pre_sync_backup%': '<(enable_pre_sync_backup)',
     'enable_webrtc%': '<(enable_webrtc)',
     'chromium_win_pch%': '<(chromium_win_pch)',
     'configuration_policy%': '<(configuration_policy)',
@@ -2463,6 +2468,9 @@
       ['enable_one_click_signin==1', {
         'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
       }],
+      ['enable_pre_sync_backup==1', {
+        'defines': ['ENABLE_PRE_SYNC_BACKUP'],
+      }],
       ['use_xi2_mt!=0 and use_x11==1', {
         'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
       }],

chrome/browser/sync/backup_rollback_controller.cc

@@ -12,7 +12,7 @@
 
 namespace browser_sync {
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(ENABLE_PRE_SYNC_BACKUP)
 // Number of rollback attempts to try before giving up.
 static const int kRollbackLimits = 3;
 #endif
@@ -33,7 +33,7 @@ BackupRollbackController::~BackupRollbackController() {
 }
 
 void BackupRollbackController::Start(base::TimeDelta delay) {
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(ENABLE_PRE_SYNC_BACKUP)
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSyncDisableBackup)) {
     return;
@@ -57,13 +57,13 @@ void BackupRollbackController::Start(base::TimeDelta delay) {
 }
 
 void BackupRollbackController::OnRollbackReceived() {
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(ENABLE_PRE_SYNC_BACKUP)
   sync_prefs_->SetRemainingRollbackTries(kRollbackLimits);
 #endif
 }
 
 void BackupRollbackController::OnRollbackDone() {
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(ENABLE_PRE_SYNC_BACKUP)
   sync_prefs_->SetRemainingRollbackTries(0);
 #endif
 }

chrome/browser/sync/backup_rollback_controller_unittest.cc

@@ -17,7 +17,7 @@ using ::testing::Return;
 
 namespace {
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(ENABLE_PRE_SYNC_BACKUP)
 
 class MockSigninManagerWrapper : public ManagedUserSigninManagerWrapper {
  public:

chrome/browser/sync/profile_sync_service.cc

@@ -311,7 +311,7 @@ void ProfileSyncService::Initialize() {
 
   backup_rollback_controller_.Start(backup_start_delay_);
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(ENABLE_PRE_SYNC_BACKUP)
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSyncDisableBackup)) {
     profile_->GetIOTaskRunner()->PostDelayedTask(

chrome/browser/sync/profile_sync_service_unittest.cc

@@ -487,7 +487,7 @@ TEST_F(ProfileSyncServiceTest, GetSyncTokenStatus) {
   EXPECT_EQ(syncer::CONNECTION_OK, token_status.connection_status);
 }
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(ENABLE_PRE_SYNC_BACKUP)
 void QuitLoop() {
   base::MessageLoop::current()->Quit();
 }

chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc

@@ -73,7 +73,7 @@ class BackupModeChecker {
   base::TimeTicks expiration_;
 };
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(ENABLE_PRE_SYNC_BACKUP)
 #define MAYBE_TestBackupRollback TestBackupRollback
 #else
 #define MAYBE_TestBackupRollback DISABLED_TestBackupRollback