summaryrefslogtreecommitdiffstats
path: root/sync/test
diff options
context:
space:
mode:
authorpavely@chromium.org <pavely@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-17 17:44:47 +0000
committerpavely@chromium.org <pavely@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-17 17:44:47 +0000
commit331604491f2c1f7106551162209dfff2f1628c84 (patch)
tree8891be64027809bb25b77fe256c4688838d03fe8 /sync/test
parent29e13ba3426f3f938dd0de1c473dd381c0ac224c (diff)
downloadchromium_src-331604491f2c1f7106551162209dfff2f1628c84.zip
chromium_src-331604491f2c1f7106551162209dfff2f1628c84.tar.gz
chromium_src-331604491f2c1f7106551162209dfff2f1628c84.tar.bz2
Pass retry_task to SyncScheduler::ScheduleConfiguration
Pass retry_task through ConfigurationParams to SyncScheduler::ScheduleConfiguration. We might in the future do configuration asynchronously and passing retry_task through asynchronous calls will be handy. SyncManagerTestWithMockScheduler.ConfigurationRetry is no longer needed, SyncSchedulerTest.ConfigWithBackingOff tests this functionality. BUG=259913 Review URL: https://codereview.chromium.org/62283011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235541 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/test')
-rw-r--r--sync/test/engine/fake_sync_scheduler.cc3
-rw-r--r--sync/test/engine/fake_sync_scheduler.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/sync/test/engine/fake_sync_scheduler.cc b/sync/test/engine/fake_sync_scheduler.cc
index 5d45494..f6144aa 100644
--- a/sync/test/engine/fake_sync_scheduler.cc
+++ b/sync/test/engine/fake_sync_scheduler.cc
@@ -34,10 +34,9 @@ void FakeSyncScheduler::ScheduleInvalidationNudge(
const tracked_objects::Location& nudge_location) {
}
-bool FakeSyncScheduler::ScheduleConfiguration(
+void FakeSyncScheduler::ScheduleConfiguration(
const ConfigurationParams& params) {
params.ready_task.Run();
- return true;
}
void FakeSyncScheduler::SetNotificationsEnabled(bool notifications_enabled) {
diff --git a/sync/test/engine/fake_sync_scheduler.h b/sync/test/engine/fake_sync_scheduler.h
index 95bdfa9..31ab110 100644
--- a/sync/test/engine/fake_sync_scheduler.h
+++ b/sync/test/engine/fake_sync_scheduler.h
@@ -33,7 +33,7 @@ class FakeSyncScheduler : public SyncScheduler {
const base::TimeDelta& desired_delay,
const ObjectIdInvalidationMap& invalidation_map,
const tracked_objects::Location& nudge_location) OVERRIDE;
- virtual bool ScheduleConfiguration(
+ virtual void ScheduleConfiguration(
const ConfigurationParams& params) OVERRIDE;
virtual void SetNotificationsEnabled(bool notifications_enabled) OVERRIDE;