Template methods on Timer classes instead of the classes themselves.

google_apis/gcm/engine/connection_handler_impl.h

Index: google_apis/gcm/engine/connection_handler_impl.h
diff --git a/google_apis/gcm/engine/connection_handler_impl.h b/google_apis/gcm/engine/connection_handler_impl.h
index 399b39723d08683c22b714d2b0673af8b154b2fc..e2702c0acb158079fc4b6a8400639a76282c3e0a 100644
--- a/google_apis/gcm/engine/connection_handler_impl.h
+++ b/google_apis/gcm/engine/connection_handler_impl.h
@@ -93,7 +93,7 @@ class GCM_EXPORT ConnectionHandlerImpl : public ConnectionHandler {
   // TODO(zea): consider enforcing a separate timeout when waiting for
   // a message to send.
   const base::TimeDelta read_timeout_;
-  base::OneShotTimer<ConnectionHandlerImpl> read_timeout_timer_;
+  base::OneShotTimer read_timeout_timer_;
 
   // This connection's socket and the input/output streams attached to it.
   net::StreamSocket* socket_;