Simplify data channel creation logic in WebRTC-based protocol

remoting/protocol/webrtc_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/webrtc_connection_to_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 137 matching lines @@
       control_dispatcher_.reset();
       event_dispatcher_.reset();
       transport_->Close(state == Session::CLOSED ? OK : session_->error());
       event_handler_->OnConnectionClosed(
           this, state == Session::CLOSED ? OK : session_->error());
       break;
   }
 }
 
 void WebrtcConnectionToClient::OnWebrtcTransportConnecting() {
-  // Create outgoing control channel by initializing |control_dispatcher_|.
-  // |event_dispatcher_| is initialized later because event channel is expected
-  // to be created by the client.
-  control_dispatcher_->Init(transport_->outgoing_channel_factory(), this);
+  // Create outgoing control channel. |event_dispatcher_| is initialized later
+  // because event channel is expected to be created by the client.
+  control_dispatcher_->Init(
+      transport_->CreateOutgoingChannel(control_dispatcher_->channel_name()),
+      this);
 }
 
 void WebrtcConnectionToClient::OnWebrtcTransportConnected() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void WebrtcConnectionToClient::OnWebrtcTransportError(ErrorCode error) {
   DCHECK(thread_checker_.CalledOnValidThread());
   Disconnect(error);
 }
@@ skipping 31 matching lines @@
     ChannelDispatcherBase* channel_dispatcher) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   LOG(ERROR) << "Channel " << channel_dispatcher->channel_name()
              << " was closed unexpectedly.";
   Disconnect(INCOMPATIBLE_PROTOCOL);
 }
 
 }  // namespace protocol
 }  // namespace remoting