Template methods on Timer classes instead of the classes themselves.

google_apis/gcm/engine/connection_handler_impl.h

 // Copyright 2013 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 GOOGLE_APIS_GCM_ENGINE_CONNECTION_HANDLER_IMPL_H_
 #define GOOGLE_APIS_GCM_ENGINE_CONNECTION_HANDLER_IMPL_H_
 
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 75 matching lines @@
   // Closes the current connection.
   void CloseConnection();
 
   // Timeout policy: the timeout is only enforced while waiting on the
   // handshake (version and/or LoginResponse) or once at least a tag packet has
   // been received. It is reset every time new data is received, and is
   // only stopped when a full message is processed.
   // 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_;
   scoped_ptr<SocketInputStream> input_stream_;
   scoped_ptr<SocketOutputStream> output_stream_;
 
   // Whether the MCS login handshake has successfully completed. See Init(..)
   // description for more info on what the handshake involves.
   bool handshake_complete_;
 
@@ skipping 15 matching lines @@
   std::vector<uint8> payload_input_buffer_;
 
   base::WeakPtrFactory<ConnectionHandlerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionHandlerImpl);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_CONNECTION_HANDLER_IMPL_H_