Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: sync/internal_api/sync_manager_impl.cc

Issue 1144443004: Revert of [Sync] Refactoring polling to be reliable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/sync_manager_impl.h ('k') | sync/internal_api/sync_manager_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 45e57f8122150f49c6a8758b89e600c791f755b2..8d96efa689ddf8a9a8a1f3828d91367cac01ae53 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -218,7 +218,7 @@
ready_task,
retry_task);
- scheduler_->Start(SyncScheduler::CONFIGURATION_MODE, base::Time());
+ scheduler_->Start(SyncScheduler::CONFIGURATION_MODE);
scheduler_->ScheduleConfiguration(params);
}
@@ -335,7 +335,7 @@
scheduler_ = args->internal_components_factory->BuildScheduler(
name_, session_context_.get(), args->cancelation_signal).Pass();
- scheduler_->Start(SyncScheduler::CONFIGURATION_MODE, base::Time());
+ scheduler_->Start(SyncScheduler::CONFIGURATION_MODE);
initialized_ = true;
@@ -407,8 +407,7 @@
}
void SyncManagerImpl::StartSyncingNormally(
- const ModelSafeRoutingInfo& routing_info,
- base::Time last_poll_time) {
+ const ModelSafeRoutingInfo& routing_info) {
// 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
@@ -416,8 +415,7 @@
// mode.
DCHECK(thread_checker_.CalledOnValidThread());
session_context_->SetRoutingInfo(routing_info);
- scheduler_->Start(SyncScheduler::NORMAL_MODE,
- last_poll_time);
+ scheduler_->Start(SyncScheduler::NORMAL_MODE);
}
syncable::Directory* SyncManagerImpl::directory() {
« no previous file with comments | « sync/internal_api/sync_manager_impl.h ('k') | sync/internal_api/sync_manager_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698