Template methods on Timer classes instead of the classes themselves.

sync/engine/sync_scheduler_impl.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SYNC_ENGINE_SYNC_SCHEDULER_IMPL_H_
 #define SYNC_ENGINE_SYNC_SCHEDULER_IMPL_H_
 
 #include <map>
 #include <string>
 
@@ skipping 237 matching lines @@
   bool started_;
 
   // Modifiable versions of kDefaultLongPollIntervalSeconds which can be
   // updated by the server.
   base::TimeDelta syncer_short_poll_interval_seconds_;
   base::TimeDelta syncer_long_poll_interval_seconds_;
 
   // 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_;
 
   // Current wait state.  Null if we're not in backoff and not throttled.
   scoped_ptr<WaitInterval> wait_interval_;
 
   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_.
   scoped_ptr<ConfigurationParams> pending_configure_params_;
 
   scoped_ptr<ClearParams> pending_clear_params_;
 
   // If we have a nudge pending to run soon, it will be listed here.
   base::TimeTicks scheduled_nudge_time_;
 
@@ skipping 25 matching lines @@
 
   // next_sync_session_job_priority_ defines which priority will be used next
   // time TrySyncSessionJobImpl is called. CANARY_PRIORITY allows syncer to run
   // even if scheduler is in exponential backoff. This is needed for events that
   // have chance of resolving previous error (e.g. network connection change
   // after NETWORK_UNAVAILABLE error).
   // It is reset back to NORMAL_PRIORITY on every call to TrySyncSessionJobImpl.
   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_;
 
   // A second factory specially for weak_handle_this_, to allow the handle
   // to be const and alleviate threading concerns.
   base::WeakPtrFactory<SyncSchedulerImpl> weak_ptr_factory_for_weak_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSchedulerImpl);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_SYNC_SCHEDULER_IMPL_H_