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

remoting/protocol/channel_dispatcher_base.cc

 // 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.
 
 #include "remoting/protocol/channel_dispatcher_base.h"
 
 #include "base/bind.h"
 #include "remoting/protocol/p2p_stream_socket.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/stream_channel_factory.h"
-#include "remoting/protocol/transport.h"
 
 namespace remoting {
 namespace protocol {
 
 ChannelDispatcherBase::ChannelDispatcherBase(const char* channel_name)
     : channel_name_(channel_name),
       channel_factory_(nullptr),
       event_handler_(nullptr) {
 }
 
 ChannelDispatcherBase::~ChannelDispatcherBase() {
   if (channel_factory_)
     channel_factory_->CancelChannelCreation(channel_name_);
 }
 
 void ChannelDispatcherBase::Init(Session* session,
                                  const ChannelConfig& config,
                                  EventHandler* event_handler) {
   DCHECK(session);
   switch (config.transport) {
     case ChannelConfig::TRANSPORT_MUX_STREAM:
-      channel_factory_ =
-          session->GetTransportSession()->GetMultiplexedChannelFactory();
+      channel_factory_ = session->GetMultiplexedChannelFactory();
       break;
 
     case ChannelConfig::TRANSPORT_QUIC_STREAM:
       channel_factory_ = session->GetQuicChannelFactory();
       break;
 
     case ChannelConfig::TRANSPORT_STREAM:
-      channel_factory_ =
-          session->GetTransportSession()->GetStreamChannelFactory();
+      channel_factory_ = session->GetTransportChannelFactory();
       break;
 
     default:
       LOG(FATAL) << "Unknown transport type: " << config.transport;
   }
 
   event_handler_ = event_handler;
 
   channel_factory_->CreateChannel(channel_name_, base::Bind(
       &ChannelDispatcherBase::OnChannelReady, base::Unretained(this)));
@@ skipping 18 matching lines @@
 
   event_handler_->OnChannelInitialized(this);
 }
 
 void ChannelDispatcherBase::OnReadWriteFailed(int error) {
   event_handler_->OnChannelError(this, CHANNEL_CONNECTION_ERROR);
 }
 
 }  // namespace protocol
 }  // namespace remoting