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

remoting/protocol/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_SESSION_H_
 #define REMOTING_PROTOCOL_SESSION_H_
 
 #include <string>
 
-#include "remoting/protocol/channel_factory.h"
 #include "remoting/protocol/errors.h"
 #include "remoting/protocol/session_config.h"
 
 namespace net {
 class IPEndPoint;
 }  // namespace net
 
 namespace remoting {
 namespace protocol {
 
+class ChannelFactory;
 struct TransportRoute;
 
 // Generic interface for Chromotocol connection used by both client and host.
 // Provides access to the connection channels, but doesn't depend on the
 // protocol used for each channel.
-class Session : public ChannelFactory {
+class Session {
  public:
   enum State {
     // Created, but not connecting yet.
     INITIALIZING,
 
     // Sent or received session-initiate, but haven't sent or received
     // session-accept.
     // TODO(sergeyu): Do we really need this state?
     CONNECTING,
 
@@ skipping 54 matching lines @@
 
   // Protocol configuration. Can be called only after session has been accepted.
   // Returned pointer is valid until connection is closed.
   virtual const SessionConfig& config() = 0;
 
   // Set protocol configuration for an incoming session. Must be
   // called on the host before the connection is accepted, from
   // ChromotocolServer::IncomingConnectionCallback.
   virtual void set_config(const SessionConfig& config) = 0;
 
+  // Return channel factories for the session. First one creates regular
+  // channels, while the second one creates multiplexed channels. All
+  // multiplexed channels work over a single regular channel.

[Wez, 2012/08/18 00:30:36]

Suggest reword:
"GetTransportChannelFactory returns a factory that creates a new transport
channel for each logical channel. GetMultiplexedChannelFactory channels share a
single underlying transport channel."

[Sergey Ulanov, 2012/08/18 01:53:56]

Done.

+  virtual ChannelFactory* GetTransportChannelFactory() = 0;
+  virtual ChannelFactory* GetMultiplexedChannelFactory() = 0;
+
   // Closes connection. Callbacks are guaranteed not to be called
   // after this method returns. Must be called before the object is
   // destroyed, unless the state is set to FAILED or CLOSED.
   virtual void Close() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Session);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_SESSION_H_