Add support for multiplexed channels in remoting::protocol::Session interface.

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 <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/channel_factory.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 {
 namespace protocol {
 
+class ChannelMultiplexer;
 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 ChannelFactory,
                       public Transport::EventHandler {
  public:
   virtual ~JingleSession();
 
   // Session interface.
   virtual void SetEventHandler(Session::EventHandler* event_handler) OVERRIDE;
   virtual ErrorCode error() OVERRIDE;
+  virtual const std::string& jid() OVERRIDE;
+  virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
+  virtual const SessionConfig& config() OVERRIDE;
+  virtual void set_config(const SessionConfig& config) OVERRIDE;
+  virtual ChannelFactory* GetTransportChannelFactory() OVERRIDE;
+  virtual ChannelFactory* GetMultiplexedChannelFactory() OVERRIDE;
+  virtual void Close() OVERRIDE;
+
+  // ChannelFactory interface.
   virtual void CreateStreamChannel(
       const std::string& name,
       const StreamChannelCallback& callback) OVERRIDE;
   virtual void CreateDatagramChannel(
       const std::string& name,
       const DatagramChannelCallback& callback) OVERRIDE;
   virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
-  virtual const std::string& jid() OVERRIDE;
-  virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
-  virtual const SessionConfig& config() OVERRIDE;
-  virtual void set_config(const SessionConfig& config) OVERRIDE;
-  virtual void Close() OVERRIDE;
 
   // Transport::EventHandler interface.
   virtual void OnTransportCandidate(
       Transport* transport,
       const cricket::Candidate& candidate) OVERRIDE;
   virtual void OnTransportRouteChange(Transport* transport,
                                       const TransportRoute& route) OVERRIDE;
   virtual void OnTransportReady(Transport* transport,
                                 bool ready) OVERRIDE;
   virtual void OnTransportDeleted(Transport* transport) OVERRIDE;
@@ skipping 69 matching lines @@
   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_;
 
   ChannelsMap channels_;
+  scoped_ptr<ChannelMultiplexer> channel_multiplexer_;
 
   base::OneShotTimer<JingleSession> transport_infos_timer_;
   std::list<JingleMessage::NamedCandidate> pending_candidates_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_H_