Template methods on Timer classes instead of the classes themselves.

ash/system/chromeos/network/tray_network_state_observer.h

Index: ash/system/chromeos/network/tray_network_state_observer.h
diff --git a/ash/system/chromeos/network/tray_network_state_observer.h b/ash/system/chromeos/network/tray_network_state_observer.h
index af9bed6172aa686827ea5032fddaab368c1f0c41..d5f572b8b6bd7b1d2193f0b89a2a2b3502e88749 100644
--- a/ash/system/chromeos/network/tray_network_state_observer.h
+++ b/ash/system/chromeos/network/tray_network_state_observer.h
@@ -53,7 +53,7 @@ class TrayNetworkStateObserver : public chromeos::NetworkStateHandlerObserver {
   int update_frequency_;
 
   // Timer used to limit the frequency of NetworkStateChanged updates.
-  base::OneShotTimer<TrayNetworkStateObserver> timer_;
+  base::OneShotTimer timer_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayNetworkStateObserver);
 };