Template methods on Timer classes instead of the classes themselves.

remoting/protocol/jingle_session.h

 // Copyright (c) 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 REMOTING_PROTOCOL_JINGLE_SESSION_H_
 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 158 matching lines @@
   // Pending transport-info requests.
   std::list<IqRequest*> transport_info_requests_;
 
   ChannelsMap channels_;
   scoped_ptr<PseudoTcpChannelFactory> pseudotcp_channel_factory_;
   scoped_ptr<SecureChannelFactory> secure_channel_factory_;
   scoped_ptr<ChannelMultiplexer> channel_multiplexer_;
   scoped_ptr<QuicChannelFactory> quic_channel_factory_;
 
   scoped_ptr<JingleMessage> pending_transport_info_message_;
-  base::OneShotTimer<JingleSession> transport_info_timer_;
+  base::OneShotTimer transport_info_timer_;
 
   // Pending remote transport info received before the local channels were
   // created.
   std::list<JingleMessage::IceCredentials> pending_remote_ice_credentials_;
   std::list<JingleMessage::NamedCandidate> pending_remote_candidates_;
 
   base::WeakPtrFactory<JingleSession> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_H_