Revert of Use standard ICE in Chromoting.

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 33 matching lines @@
                       public Transport::EventHandler {
  public:
   ~JingleSession() override;
 
   // Session interface.
   void SetEventHandler(Session::EventHandler* event_handler) override;
   ErrorCode error() override;
   const std::string& jid() override;
   const CandidateSessionConfig* candidate_config() override;
   const SessionConfig& config() override;
-  void set_config(scoped_ptr<SessionConfig> config) override;
+  void set_config(const SessionConfig& config) override;
   StreamChannelFactory* GetTransportChannelFactory() override;
   StreamChannelFactory* GetMultiplexedChannelFactory() override;
   void Close() override;
 
   // DatagramChannelFactory interface.
   void CreateChannel(const std::string& name,
                      const ChannelCreatedCallback& callback) override;
   void CancelChannelCreation(const std::string& name) override;
 
   // Transport::EventHandler interface.
-  void OnTransportIceCredentials(Transport* transport,
-                                 const std::string& ufrag,
-                                 const std::string& password) override;
   void OnTransportCandidate(Transport* transport,
                             const cricket::Candidate& candidate) override;
   void OnTransportRouteChange(Transport* transport,
                               const TransportRoute& route) override;
   void OnTransportFailed(Transport* transport) override;
   void OnTransportDeleted(Transport* transport) override;
 
  private:
   friend class JingleSessionManager;
 
   typedef std::map<std::string, Transport*> ChannelsMap;
   typedef base::Callback<void(JingleMessageReply::ErrorType)> ReplyCallback;
 
   explicit JingleSession(JingleSessionManager* session_manager);
 
   // Start connection by sending session-initiate message.
   void StartConnection(const std::string& peer_jid,
                        scoped_ptr<Authenticator> authenticator,
                        scoped_ptr<CandidateSessionConfig> config);
 
-  // Passes transport info to a new |channel| in case it was received before the
-  // channel was created.
-  void AddPendingRemoteTransportInfo(Transport* channel);
+  // Adds to a new channel the remote candidates received before it was created.
+  void AddPendingRemoteCandidates(Transport* channel, const std::string& name);
 
   // Called by JingleSessionManager for incoming connections.
   void InitializeIncomingConnection(const JingleMessage& initiate_message,
                                     scoped_ptr<Authenticator> authenticator);
   void AcceptIncomingConnection(const JingleMessage& initiate_message);
 
   // Sends |message| to the peer. The session is closed if the send fails or no
   // response is received within a reasonable time. All other responses are
   // ignored.
   void SendMessage(const JingleMessage& message);
 
   // Iq response handler.
   void OnMessageResponse(JingleMessage::ActionType request_type,
                          IqRequest* request,
                          const buzz::XmlElement* response);
 
-  // Creates empty |pending_transport_info_message_| and schedules timer for
-  // SentTransportInfo() to sent the message later.
-  void EnsurePendingTransportInfoMessage();
-
   // Sends transport-info message with candidates from |pending_candidates_|.
   void SendTransportInfo();
 
   // Response handler for transport-info responses. Transport-info timeouts are
   // ignored and don't terminate connection.
   void OnTransportInfoResponse(IqRequest* request,
                                const buzz::XmlElement* response);
 
   // Called by JingleSessionManager on incoming |message|. Must call
   // |reply_callback| to send reply message before sending any other
@@ skipping 38 matching lines @@
 
   JingleSessionManager* session_manager_;
   std::string peer_jid_;
   scoped_ptr<CandidateSessionConfig> candidate_config_;
   Session::EventHandler* event_handler_;
 
   std::string session_id_;
   State state_;
   ErrorCode error_;
 
-  scoped_ptr<SessionConfig> config_;
+  SessionConfig config_;
+  bool config_is_set_;
 
   scoped_ptr<Authenticator> authenticator_;
 
   // Pending Iq requests. Used for all messages except transport-info.
   std::set<IqRequest*> pending_requests_;
 
   // 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<JingleMessage> pending_transport_info_message_;
-  base::OneShotTimer<JingleSession> transport_info_timer_;
+  base::OneShotTimer<JingleSession> transport_infos_timer_;
+  std::list<JingleMessage::NamedCandidate> pending_candidates_;
 
-  // Pending remote transport info received before the local channels were
-  // created.
-  std::list<JingleMessage::IceCredentials> pending_remote_ice_credentials_;
+  // Pending remote candidates, received before the local channels were created.
   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_