| Index: components/sync_driver/backup_rollback_controller.cc
|
| diff --git a/components/sync_driver/backup_rollback_controller.cc b/components/sync_driver/backup_rollback_controller.cc
|
| index b33bd6065e1b95a7edbed2c09b71a8c398b16ce8..362997314d0d13c7f83263523e5882c4ddb8468b 100644
|
| --- a/components/sync_driver/backup_rollback_controller.cc
|
| +++ b/components/sync_driver/backup_rollback_controller.cc
|
| @@ -12,12 +12,13 @@
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "components/sync_driver/signin_manager_wrapper.h"
|
| +#include "components/sync_driver/sync_driver_features.h"
|
| #include "components/sync_driver/sync_driver_switches.h"
|
| #include "components/sync_driver/sync_prefs.h"
|
|
|
| namespace sync_driver {
|
|
|
| -#if defined(ENABLE_PRE_SYNC_BACKUP)
|
| +#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
|
| // Number of rollback attempts to try before giving up.
|
| static const int kRollbackLimits = 3;
|
|
|
| @@ -71,20 +72,20 @@
|
| }
|
|
|
| void BackupRollbackController::OnRollbackReceived() {
|
| -#if defined(ENABLE_PRE_SYNC_BACKUP)
|
| +#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
|
| sync_prefs_->SetRemainingRollbackTries(kRollbackLimits);
|
| #endif
|
| }
|
|
|
| void BackupRollbackController::OnRollbackDone() {
|
| -#if defined(ENABLE_PRE_SYNC_BACKUP)
|
| +#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
|
| sync_prefs_->SetRemainingRollbackTries(0);
|
| #endif
|
| }
|
|
|
| // static
|
| bool BackupRollbackController::IsBackupEnabled() {
|
| -#if defined(ENABLE_PRE_SYNC_BACKUP)
|
| +#if BUILDFLAG(ENABLE_PRE_SYNC_BACKUP)
|
| const std::string group_name =
|
| base::FieldTrialList::FindFullName(kSyncBackupFinchName);
|
|
|
|
|