Add MessageChanneFactory interface and use it in ChannelDispatcherBase.

remoting/protocol/stream_message_pipe_adapter.cc

 // Copyright 2016 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/stream_message_pipe_adapter.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
+#include "net/base/net_errors.h"
 #include "remoting/base/buffered_socket_writer.h"
 #include "remoting/base/compound_buffer.h"
 #include "remoting/protocol/message_serialization.h"
 #include "remoting/protocol/p2p_stream_socket.h"
+#include "remoting/protocol/stream_channel_factory.h"
 
 namespace remoting {
 namespace protocol {
 
 StreamMessagePipeAdapter::StreamMessagePipeAdapter(
     scoped_ptr<P2PStreamSocket> socket,
     const ErrorCallback& error_callback)
     : socket_(std::move(socket)),
       error_callback_(error_callback),
       writer_(new BufferedSocketWriter()) {
@@ skipping 22 matching lines @@
 }
 
 void StreamMessagePipeAdapter::CloseOnError(int error) {
   // Stop writing on error.
   writer_.reset();
 
   if (!error_callback_.is_null())
     base::ResetAndReturn(&error_callback_).Run(error);
 }
 
+StreamMessageChannelFactoryAdapter::StreamMessageChannelFactoryAdapter(
+    StreamChannelFactory* stream_channel_factory,
+    const ErrorCallback& error_callback)
+    : stream_channel_factory_(stream_channel_factory),
+      error_callback_(error_callback) {}
+StreamMessageChannelFactoryAdapter::~StreamMessageChannelFactoryAdapter() {}

[Jamie, 2016/02/03 02:01:02]

Blank line after non-trivial ctor?

[Sergey Ulanov, 2016/02/03 20:09:18]

Done.

+
+void StreamMessageChannelFactoryAdapter::CreateChannel(
+    const std::string& name,
+    const ChannelCreatedCallback& callback) {
+  stream_channel_factory_->CreateChannel(
+      name, base::Bind(&StreamMessageChannelFactoryAdapter::OnChannelCreated,
+                       base::Unretained(this), callback));
+}
+
+void StreamMessageChannelFactoryAdapter::CancelChannelCreation(
+    const std::string& name) {
+  stream_channel_factory_->CancelChannelCreation(name);
+}
+
+void StreamMessageChannelFactoryAdapter::OnChannelCreated(
+    const ChannelCreatedCallback& callback,
+    scoped_ptr<P2PStreamSocket> socket) {
+  if (!socket) {
+    error_callback_.Run(net::ERR_FAILED);
+    return;
+  }
+  callback.Run(make_scoped_ptr(
+      new StreamMessagePipeAdapter(std::move(socket), error_callback_)));
+}
+
 }  // namespace protocol
 }  // namespace remoting