| Index: chrome/browser/sync/engine/sync_scheduler_unittest.cc
|
| diff --git a/chrome/browser/sync/engine/sync_scheduler_unittest.cc b/chrome/browser/sync/engine/sync_scheduler_unittest.cc
|
| index 4f1058d78498938535b0fd62a2846e6520035ee7..d3450dbb26113fb94702c2646114c359d3cb22c1 100644
|
| --- a/chrome/browser/sync/engine/sync_scheduler_unittest.cc
|
| +++ b/chrome/browser/sync/engine/sync_scheduler_unittest.cc
|
| @@ -10,7 +10,6 @@
|
| #include "base/task.h"
|
| #include "base/test/test_timeouts.h"
|
| #include "chrome/browser/sync/engine/mock_model_safe_workers.h"
|
| -#include "chrome/browser/sync/engine/configure_reason.h"
|
| #include "chrome/browser/sync/engine/sync_scheduler.h"
|
| #include "chrome/browser/sync/engine/syncer.h"
|
| #include "chrome/browser/sync/sessions/test_util.h"
|
| @@ -289,7 +288,7 @@ TEST_F(SyncSchedulerTest, Config) {
|
| RunLoop();
|
|
|
| scheduler()->ScheduleConfig(
|
| - model_types, sync_api::CONFIGURE_REASON_RECONFIGURATION);
|
| + model_types, GetUpdatesCallerInfo::RECONFIGURATION);
|
| RunLoop();
|
|
|
| ASSERT_EQ(1U, records.snapshots.size());
|
| @@ -319,7 +318,7 @@ TEST_F(SyncSchedulerTest, ConfigWithBackingOff) {
|
|
|
| ASSERT_EQ(0U, records.snapshots.size());
|
| scheduler()->ScheduleConfig(
|
| - model_types, sync_api::CONFIGURE_REASON_RECONFIGURATION);
|
| + model_types, GetUpdatesCallerInfo::RECONFIGURATION);
|
| RunLoop();
|
|
|
| ASSERT_EQ(1U, records.snapshots.size());
|
| @@ -356,12 +355,12 @@ TEST_F(SyncSchedulerTest, MultipleConfigWithBackingOff) {
|
|
|
| ASSERT_EQ(0U, records.snapshots.size());
|
| scheduler()->ScheduleConfig(
|
| - model_types1, sync_api::CONFIGURE_REASON_RECONFIGURATION);
|
| + model_types1, GetUpdatesCallerInfo::RECONFIGURATION);
|
| RunLoop();
|
|
|
| ASSERT_EQ(1U, records.snapshots.size());
|
| scheduler()->ScheduleConfig(
|
| - model_types2, sync_api::CONFIGURE_REASON_RECONFIGURATION);
|
| + model_types2, GetUpdatesCallerInfo::RECONFIGURATION);
|
| RunLoop();
|
|
|
| ASSERT_EQ(2U, records.snapshots.size());
|
| @@ -399,7 +398,7 @@ TEST_F(SyncSchedulerTest, NudgeWithConfigWithBackingOff) {
|
|
|
| ASSERT_EQ(0U, records.snapshots.size());
|
| scheduler()->ScheduleConfig(
|
| - model_types, sync_api::CONFIGURE_REASON_RECONFIGURATION);
|
| + model_types, GetUpdatesCallerInfo::RECONFIGURATION);
|
| RunLoop();
|
|
|
| ASSERT_EQ(1U, records.snapshots.size());
|
| @@ -698,7 +697,7 @@ TEST_F(SyncSchedulerTest, ThrottlingDoesThrottle) {
|
| RunLoop();
|
|
|
| scheduler()->ScheduleConfig(
|
| - types, sync_api::CONFIGURE_REASON_RECONFIGURATION);
|
| + types, GetUpdatesCallerInfo::RECONFIGURATION);
|
| PumpLoop();
|
| }
|
|
|
| @@ -751,7 +750,7 @@ TEST_F(SyncSchedulerTest, ConfigurationMode) {
|
| config_types[syncable::BOOKMARKS] = true;
|
|
|
| scheduler()->ScheduleConfig(
|
| - config_types, sync_api::CONFIGURE_REASON_RECONFIGURATION);
|
| + config_types, GetUpdatesCallerInfo::RECONFIGURATION);
|
| RunLoop();
|
|
|
| ASSERT_EQ(1U, records.snapshots.size());
|
| @@ -853,7 +852,7 @@ TEST_F(SyncSchedulerTest, BackoffDropsJobs) {
|
| RunLoop();
|
|
|
| scheduler()->ScheduleConfig(
|
| - types, sync_api::CONFIGURE_REASON_RECONFIGURATION);
|
| + types, GetUpdatesCallerInfo::RECONFIGURATION);
|
| PumpLoop();
|
|
|
| StartSyncScheduler(SyncScheduler::NORMAL_MODE);
|
| @@ -995,7 +994,7 @@ TEST_F(SyncSchedulerTest, SyncerSteps) {
|
| RunLoop();
|
|
|
| scheduler()->ScheduleConfig(
|
| - ModelTypeBitSet(), sync_api::CONFIGURE_REASON_RECONFIGURATION);
|
| + ModelTypeBitSet(), GetUpdatesCallerInfo::RECONFIGURATION);
|
| PumpLoop();
|
| PumpLoop();
|
|
|
|
|