summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-09-24 00:53:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-24 07:53:38 +0000
commit8c3eb804c56b7173f00e58e040f47fe867dabda7 (patch)
tree3dee4211092c1942e4eaf24684f3255cfddd9e34 /sync
parentf7033f79311149ae641bcaa3986c753f60f1db7e (diff)
downloadchromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.zip
chromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.tar.gz
chromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.tar.bz2
base: Template methods on Timer classes instead of the classes themselves.
The base class for OneShotTimer and DelayedTimer is templated but only the Start method needs to be (which has a TODO to make it go away entirely too). The DelayedTimer class is also templated but only its constructor needs to be, and the type can be inferred at the callsite, so less typing all around. R=thakis@chromium.org TBR=sky,brettw BUG=148832 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1355063004 Cr-Commit-Position: refs/heads/master@{#350496}
Diffstat (limited to 'sync')
-rw-r--r--sync/engine/sync_scheduler_impl.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sync/engine/sync_scheduler_impl.h b/sync/engine/sync_scheduler_impl.h
index 0304da9..4e5fb17 100644
--- a/sync/engine/sync_scheduler_impl.h
+++ b/sync/engine/sync_scheduler_impl.h
@@ -255,7 +255,7 @@ class SYNC_EXPORT_PRIVATE SyncSchedulerImpl
// Timer for polling. Restarted on each successful poll, and when entering
// normal sync mode or exiting an error state. Not active in configuration
// mode.
- base::OneShotTimer<SyncSchedulerImpl> poll_timer_;
+ base::OneShotTimer poll_timer_;
// The mode of operation.
Mode mode_;
@@ -266,10 +266,10 @@ class SYNC_EXPORT_PRIVATE SyncSchedulerImpl
scoped_ptr<BackoffDelayProvider> delay_provider_;
// The event that will wake us up.
- base::OneShotTimer<SyncSchedulerImpl> pending_wakeup_timer_;
+ base::OneShotTimer pending_wakeup_timer_;
// An event that fires when data type throttling expires.
- base::OneShotTimer<SyncSchedulerImpl> type_unthrottle_timer_;
+ base::OneShotTimer type_unthrottle_timer_;
// Storage for variables related to an in-progress configure request. Note
// that (mode_ != CONFIGURATION_MODE) \implies !pending_configure_params_.
@@ -315,7 +315,7 @@ class SYNC_EXPORT_PRIVATE SyncSchedulerImpl
JobPriority next_sync_session_job_priority_;
// One-shot timer for scheduling GU retry according to delay set by server.
- base::OneShotTimer<SyncSchedulerImpl> retry_timer_;
+ base::OneShotTimer retry_timer_;
base::WeakPtrFactory<SyncSchedulerImpl> weak_ptr_factory_;