Implement ChannelMultiplexer.

remoting/protocol/channel_factory.h

Index: remoting/protocol/channel_factory.h
diff --git a/remoting/protocol/channel_factory.h b/remoting/protocol/channel_factory.h
new file mode 100644
index 0000000000000000000000000000000000000000..13e928e8415f0d57659538566bd01ac6ae75d586
--- /dev/null
+++ b/remoting/protocol/channel_factory.h
@@ -0,0 +1,50 @@
+// 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.
+
+#ifndef REMOTING_PROTOCOL_CHANNEL_FACTORY_H_
+#define REMOTING_PROTOCOL_CHANNEL_FACTORY_H_
+
+#include "base/callback.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/threading/non_thread_safe.h"
+
+namespace net {
+class Socket;
+class StreamSocket;
+}  // namespace net
+
+namespace remoting {
+namespace protocol {
+
+class ChannelFactory : public base::NonThreadSafe {

[Wez, 2012/08/06 23:14:07]

nit: Why is NonThreadSafe part of this interface?

[Sergey Ulanov, 2012/08/07 20:12:22]

To make it clear that this interface is not thread-safe - all methods should
always be called on a specific thread.

+ public:
+  // TODO(sergeyu): Specify connection error code when channel
+  // connection fails.
+  typedef base::Callback<void(scoped_ptr<net::StreamSocket>)>
+      StreamChannelCallback;
+  typedef base::Callback<void(scoped_ptr<net::Socket>)>
+      DatagramChannelCallback;
+
+  ChannelFactory() {}
+  virtual ~ChannelFactory() {}

[Wez, 2012/08/06 23:14:07]

Is the caller really responsible for the lifetime of ChannelFactory, or should
the dtor be private?

[Sergey Ulanov, 2012/08/07 20:12:22]

Done.

+
+  // Creates new channels for this connection. The specified callback
+  // is called when then new channel is created and connected. The
+  // callback is called with NULL if connection failed for any reason.
+  // All channels must be destroyed before the session is
+  // destroyed. Can be called only when in CONNECTING, CONNECTED or
+  // AUTHENTICATED states.

[Wez, 2012/08/06 23:14:07]

nit: This comment refers to sessions and session states, which this interface
has no dependence on; presumably the rule is simply that the channels must be
destroyed before the factory, and they implicitly can't be created before it
exists?

[Wez, 2012/08/06 23:14:07]

nit: Clarify that it's acceptable for implementations to succeed or fail
synchronously, invoking the callback before the call returns.

[Sergey Ulanov, 2012/08/07 20:12:22]

Cleaned up that comment.

[Sergey Ulanov, 2012/08/07 20:12:22]

Done.

+  virtual void CreateStreamChannel(
+      const std::string& name, const StreamChannelCallback& callback) = 0;
+  virtual void CreateDatagramChannel(
+      const std::string& name, const DatagramChannelCallback& callback) = 0;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ChannelFactory);
+};
+
+}  // namespace protocol
+}  // namespace remoting
+
+#endif  // REMOTING_PROTOCOL_CHANNEL_FACTORY_H_