| Index: sync/internal_api/sync_manager_impl.cc
|
| diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
|
| index 8d96efa689ddf8a9a8a1f3828d91367cac01ae53..45e57f8122150f49c6a8758b89e600c791f755b2 100644
|
| --- a/sync/internal_api/sync_manager_impl.cc
|
| +++ b/sync/internal_api/sync_manager_impl.cc
|
| @@ -218,7 +218,7 @@ void SyncManagerImpl::ConfigureSyncer(
|
| ready_task,
|
| retry_task);
|
|
|
| - scheduler_->Start(SyncScheduler::CONFIGURATION_MODE);
|
| + scheduler_->Start(SyncScheduler::CONFIGURATION_MODE, base::Time());
|
| scheduler_->ScheduleConfiguration(params);
|
| }
|
|
|
| @@ -335,7 +335,7 @@ void SyncManagerImpl::Init(InitArgs* args) {
|
| scheduler_ = args->internal_components_factory->BuildScheduler(
|
| name_, session_context_.get(), args->cancelation_signal).Pass();
|
|
|
| - scheduler_->Start(SyncScheduler::CONFIGURATION_MODE);
|
| + scheduler_->Start(SyncScheduler::CONFIGURATION_MODE, base::Time());
|
|
|
| initialized_ = true;
|
|
|
| @@ -407,7 +407,8 @@ void SyncManagerImpl::OnPassphraseTypeChanged(
|
| }
|
|
|
| void SyncManagerImpl::StartSyncingNormally(
|
| - const ModelSafeRoutingInfo& routing_info) {
|
| + const ModelSafeRoutingInfo& routing_info,
|
| + base::Time last_poll_time) {
|
| // Start the sync scheduler.
|
| // TODO(sync): We always want the newest set of routes when we switch back
|
| // to normal mode. Figure out how to enforce set_routing_info is always
|
| @@ -415,7 +416,8 @@ void SyncManagerImpl::StartSyncingNormally(
|
| // mode.
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| session_context_->SetRoutingInfo(routing_info);
|
| - scheduler_->Start(SyncScheduler::NORMAL_MODE);
|
| + scheduler_->Start(SyncScheduler::NORMAL_MODE,
|
| + last_poll_time);
|
| }
|
|
|
| syncable::Directory* SyncManagerImpl::directory() {
|
|
|