Add MessageChanneFactory interface and use it in ChannelDispatcherBase.

remoting/protocol/ice_connection_to_host.cc

 // Copyright 2015 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/ice_connection_to_host.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 102 matching lines @@
       // Configure video pipeline.
       video_renderer_->OnSessionConfig(session_->config());
       monitored_video_stub_.reset(new MonitoredVideoStub(
           video_renderer_->GetVideoStub(),
           base::TimeDelta::FromSeconds(
               MonitoredVideoStub::kConnectivityCheckDelaySeconds),
           base::Bind(&IceConnectionToHost::OnVideoChannelStatus,
                      base::Unretained(this))));
       video_dispatcher_.reset(
           new ClientVideoDispatcher(monitored_video_stub_.get()));
-      video_dispatcher_->Init(transport_->GetStreamChannelFactory(), this);
+      video_dispatcher_->Init(transport_->GetChannelFactory(), this);
 
       // Configure audio pipeline if necessary.
       if (session_->config().is_audio_enabled()) {
         audio_reader_.reset(new AudioReader(audio_stub_));
         audio_reader_->Init(transport_->GetMultiplexedChannelFactory(), this);
       }
       break;
 
     case Session::CLOSED:
       CloseChannels();
       SetState(CLOSED, OK);
       break;
 
     case Session::FAILED:
       // If we were connected then treat signaling timeout error as if
       // the connection was closed by the peer.
       //
       // TODO(sergeyu): This logic belongs to the webapp, but we
       // currently don't expose this error code to the webapp, and it
       // would be hard to add it because client plugin and webapp
       // versions may not be in sync. It should be easy to do after we
       // are finished moving the client plugin to NaCl.
+      CloseChannels();
       if (state_ == CONNECTED && session_->error() == SIGNALING_TIMEOUT) {
-        CloseChannels();
         SetState(CLOSED, OK);
       } else {
-        CloseOnError(session_->error());
+        SetState(FAILED, session_->error());
       }
       break;
   }
 }
 
 void IceConnectionToHost::OnIceTransportRouteChange(
     const std::string& channel_name,
     const TransportRoute& route) {
   event_callback_->OnRouteChanged(channel_name, route);
 }
 
 void IceConnectionToHost::OnIceTransportError(ErrorCode error) {
   session_->Close(error);
 }
 
 void IceConnectionToHost::OnChannelInitialized(
     ChannelDispatcherBase* channel_dispatcher) {
   NotifyIfChannelsReady();
 }
 
-void IceConnectionToHost::OnChannelError(
-    ChannelDispatcherBase* channel_dispatcher,
-    ErrorCode error) {
-  LOG(ERROR) << "Failed to connect channel "
-             << channel_dispatcher->channel_name();
-  CloseOnError(CHANNEL_CONNECTION_ERROR);
-}
-
 void IceConnectionToHost::OnVideoChannelStatus(bool active) {
   event_callback_->OnConnectionReady(active);
 }
 
 ConnectionToHost::State IceConnectionToHost::state() const {
   return state_;
 }
 
 void IceConnectionToHost::NotifyIfChannelsReady() {
   if (!control_dispatcher_.get() || !control_dispatcher_->is_connected())
     return;
   if (!event_dispatcher_.get() || !event_dispatcher_->is_connected())
     return;
   if (!video_dispatcher_.get() || !video_dispatcher_->is_connected())
     return;
   if ((!audio_reader_.get() || !audio_reader_->is_connected()) &&
       session_->config().is_audio_enabled()) {
     return;
   }
   if (state_ != AUTHENTICATED)
     return;
 
   // Start forwarding clipboard and input events.
   clipboard_forwarder_.set_clipboard_stub(control_dispatcher_.get());
   event_forwarder_.set_input_stub(event_dispatcher_.get());
   SetState(CONNECTED, OK);
 }
 
-void IceConnectionToHost::CloseOnError(ErrorCode error) {
-  CloseChannels();
-  SetState(FAILED, error);
-}
-
 void IceConnectionToHost::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
   clipboard_forwarder_.set_clipboard_stub(nullptr);
   event_forwarder_.set_input_stub(nullptr);
   video_dispatcher_.reset();
   audio_reader_.reset();
 }
 
 void IceConnectionToHost::SetState(State state, ErrorCode error) {
   DCHECK(CalledOnValidThread());
   // |error| should be specified only when |state| is set to FAILED.
   DCHECK(state == FAILED || error == OK);
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting