Revert of Add TransportSession interface to prepare for WebRTC-based transport.

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/errors.h"
 #include "remoting/protocol/session_config.h"
 
+namespace net {
+class IPEndPoint;
+}  // namespace net
+
 namespace remoting {
 namespace protocol {
 
 class StreamChannelFactory;
-class TransportSession;
 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:
   enum State {
     // Created, but not connecting yet.
     INITIALIZING,
@@ skipping 47 matching lines @@
   // Returns error code for a failed session.
   virtual ErrorCode error() = 0;
 
   // JID of the other side.
   virtual const std::string& jid() = 0;
 
   // Protocol configuration. Can be called only after session has been accepted.
   // Returned pointer is valid until connection is closed.
   virtual const SessionConfig& config() = 0;
 
-  // Returns TransportSession that can be used to create transport channels.
-  virtual TransportSession* GetTransportSession() = 0;
-
-  // Channel factory for QUIC-based channels. Returns nullptr when QUIC is
-  // disabled for the session.
+  // GetTransportChannelFactory() returns a factory that creates a new transport
+  // channel for each logical channel. GetMultiplexedChannelFactory() channels
+  // share a single underlying transport channel
+  virtual StreamChannelFactory* GetTransportChannelFactory() = 0;
+  virtual StreamChannelFactory* GetMultiplexedChannelFactory() = 0;
   virtual StreamChannelFactory* GetQuicChannelFactory() = 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_