Add MessageChanneFactory interface and use it in ChannelDispatcherBase.

remoting/protocol/ice_connection_to_client.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_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 135 matching lines @@
     case Session::AUTHENTICATED:
       // Initialize channels.
       control_dispatcher_->Init(transport_.GetMultiplexedChannelFactory(),
                                 this);
 
       event_dispatcher_->Init(transport_.GetMultiplexedChannelFactory(), this);
       event_dispatcher_->set_on_input_event_callback(
           base::Bind(&IceConnectionToClient::OnInputEventReceived,
                      base::Unretained(this)));
 
-      video_dispatcher_->Init(transport_.GetStreamChannelFactory(), this);
+      video_dispatcher_->Init(transport_.GetChannelFactory(), this);
 
       audio_writer_ = AudioWriter::Create(session_->config());
       if (audio_writer_)
         audio_writer_->Init(transport_.GetMultiplexedChannelFactory(), this);
 
       // Notify the handler after initializing the channels, so that
       // ClientSession can get a client clipboard stub.
       event_handler_->OnConnectionAuthenticated(this);
       break;
 
@@ skipping 19 matching lines @@
   Disconnect(error);
 }
 
 void IceConnectionToClient::OnChannelInitialized(
     ChannelDispatcherBase* channel_dispatcher) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   NotifyIfChannelsReady();
 }
 
-void IceConnectionToClient::OnChannelError(
-    ChannelDispatcherBase* channel_dispatcher,
-    ErrorCode error) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  LOG(ERROR) << "Failed to connect channel "
-             << channel_dispatcher->channel_name();
-  Disconnect(error);
-}
-
 void IceConnectionToClient::NotifyIfChannelsReady() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!control_dispatcher_ || !control_dispatcher_->is_connected())
     return;
   if (!event_dispatcher_ || !event_dispatcher_->is_connected())
     return;
   if (!video_dispatcher_ || !video_dispatcher_->is_connected())
     return;
   if ((!audio_writer_ || !audio_writer_->is_connected()) &&
       session_->config().is_audio_enabled()) {
     return;
   }
   event_handler_->OnConnectionChannelsConnected(this);
 }
 
 void IceConnectionToClient::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
   video_dispatcher_.reset();
   audio_writer_.reset();
 }
 
 }  // namespace protocol
 }  // namespace remoting