Revert 123635 - Implement timeouts for IQ requests.

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_PEPPER_SESSION_H_
 #define REMOTING_PROTOCOL_PEPPER_SESSION_H_
 
 #include <list>
 #include <map>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/timer.h"
 #include "crypto/rsa_private_key.h"
 #include "net/base/completion_callback.h"
-#include "remoting/jingle_glue/iq_sender.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/jingle_messages.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/transport.h"
 
 namespace net {
 class Socket;
 class StreamSocket;
 }  // namespace net
 
 namespace remoting {
+
+class IqRequest;
+
 namespace protocol {
 
 class JingleSessionManager;
 
 // JingleSessionManager and JingleSession implement the subset of the
 // Jingle protocol used in Chromoting. Instances of this class are
 // created by the JingleSessionManager.
 class JingleSession : public Session,
                       public Transport::EventHandler {
  public:
@@ skipping 38 matching lines @@
   void StartConnection(const std::string& peer_jid,
                        scoped_ptr<Authenticator> authenticator,
                        scoped_ptr<CandidateSessionConfig> config,
                        const StateChangeCallback& state_change_callback);
 
   // Called by JingleSessionManager for incoming connections.
   void InitializeIncomingConnection(const JingleMessage& initiate_message,
                                     scoped_ptr<Authenticator> authenticator);
   void AcceptIncomingConnection(const JingleMessage& initiate_message);
 
-  // Helper to send IqRequests to the peer. It sets up the response
-  // callback to OnMessageResponse() which simply terminates the
-  // session whenever a request fails or times out. This method should
-  // not be used for messages that need to be handled differently.
-  void SendMessage(const JingleMessage& message);
-  void OnMessageResponse(JingleMessage::ActionType request_type,
-                         IqRequest* request,
-                         const buzz::XmlElement* response);
-  void CleanupPendingRequests(IqRequest* request);
+  // Handler for session-initiate response.
+  void OnSessionInitiateResponse(const buzz::XmlElement* response);
 
   // Called by JingleSessionManager on incoming |message|. Must call
   // |reply_callback| to send reply message before sending any other
   // messages.
   void OnIncomingMessage(const JingleMessage& message,
                          const ReplyCallback& reply_callback);
 
   // Message handlers for incoming messages.
   void OnAccept(const JingleMessage& message,
                 const ReplyCallback& reply_callback);
   void OnSessionInfo(const JingleMessage& message,
                      const ReplyCallback& reply_callback);
   void OnTerminate(const JingleMessage& message,
                    const ReplyCallback& reply_callback);
   void ProcessTransportInfo(const JingleMessage& message);
 
   // Called from OnAccept() to initialize session config.
   bool InitializeConfigFromDescription(const ContentDescription* description);
 
   void ProcessAuthenticationStep();
+  void OnSessionInfoResponse(const buzz::XmlElement* response);
 
   void SendTransportInfo();
+  void OnTransportInfoResponse(const buzz::XmlElement* response);
 
   // Terminates the session and sends session-terminate if it is
   // necessary. |error| specifies the error code in case when the
   // session is being closed due to an error.
   void CloseInternal(Error error);
 
   // Sets |state_| to |new_state| and calls state change callback.
   void SetState(State new_state);
 
   JingleSessionManager* session_manager_;
   std::string peer_jid_;
   scoped_ptr<CandidateSessionConfig> candidate_config_;
   StateChangeCallback state_change_callback_;
   RouteChangeCallback route_change_callback_;
 
   std::string session_id_;
   State state_;
   Error error_;
 
   SessionConfig config_;
   bool config_is_set_;
 
   scoped_ptr<Authenticator> authenticator_;
 
-  // Container for pending Iq requests. Requests are removed in
-  // CleanupPendingRequests() which is called when a response is
-  // received or one of the requests times out.
-  std::list<IqRequest*> pending_requests_;
+  scoped_ptr<IqRequest> initiate_request_;
+  scoped_ptr<IqRequest> session_info_request_;
+  scoped_ptr<IqRequest> transport_info_request_;
 
   ChannelsMap channels_;
 
   base::OneShotTimer<JingleSession> transport_infos_timer_;
   std::list<cricket::Candidate> pending_candidates_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PEPPER_SESSION_H_