diff options
author | haitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 09:57:04 +0000 |
---|---|---|
committer | haitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 09:57:04 +0000 |
commit | b56a9e0d1f1cfe00928b846831e3827554470dba (patch) | |
tree | 6155a4b94122627fbc8a2d6a3e79f893e1e4244b /chrome | |
parent | 6376f2f7eedd33afd7bb22eb05dfc890bd3b36b9 (diff) | |
download | chromium_src-b56a9e0d1f1cfe00928b846831e3827554470dba.zip chromium_src-b56a9e0d1f1cfe00928b846831e3827554470dba.tar.gz chromium_src-b56a9e0d1f1cfe00928b846831e3827554470dba.tar.bz2 |
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
Diffstat (limited to 'chrome')
5 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/sync/backup_rollback_controller.cc b/chrome/browser/sync/backup_rollback_controller.cc index 1f0de17..c7018e3 100644 --- a/chrome/browser/sync/backup_rollback_controller.cc +++ b/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 } diff --git a/chrome/browser/sync/backup_rollback_controller_unittest.cc b/chrome/browser/sync/backup_rollback_controller_unittest.cc index 7e12c40..0176cbb 100644 --- a/chrome/browser/sync/backup_rollback_controller_unittest.cc +++ b/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: diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index fa456d7..e0c7108 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/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( diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index bd6150a..8b5fa2a 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/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(); } 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 3d60367..5dec3a1 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 @@ -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 |