Add support for multiplexed channels in remoting::protocol::Session interface.

remoting/protocol/fake_session.cc

Index: remoting/protocol/fake_session.cc
diff --git a/remoting/protocol/fake_session.cc b/remoting/protocol/fake_session.cc
index dc64a1d52cfafcc2233cafdc300a2155ab6fda6b..956b502a5d80326559932c072e59aa27644c5b0e 100644
--- a/remoting/protocol/fake_session.cc
+++ b/remoting/protocol/fake_session.cc
@@ -308,23 +308,6 @@ ErrorCode FakeSession::error() {
   return error_;
 }
 
-void FakeSession::CreateStreamChannel(
-    const std::string& name, const StreamChannelCallback& callback) {
-  scoped_ptr<FakeSocket> channel(new FakeSocket());
-  stream_channels_[name] = channel.get();
-  callback.Run(channel.PassAs<net::StreamSocket>());
-}
-
-void FakeSession::CreateDatagramChannel(
-    const std::string& name, const DatagramChannelCallback& callback) {
-  scoped_ptr<FakeUdpSocket> channel(new FakeUdpSocket());
-  datagram_channels_[name] = channel.get();
-  callback.Run(channel.PassAs<net::Socket>());
-}
-
-void FakeSession::CancelChannelCreation(const std::string& name) {
-}
-
 const std::string& FakeSession::jid() {
   return jid_;
 }
@@ -341,9 +324,35 @@ void FakeSession::set_config(const SessionConfig& config) {
   config_ = config;
 }
 
+ChannelFactory* FakeSession::GetTransportChannelFactory() {
+  return this;
+}
+
+ChannelFactory* FakeSession::GetMultiplexedChannelFactory() {
+  NOTIMPLEMENTED();
+  return NULL;

[Wez, 2012/08/18 00:30:36]

nit: Return this here, so that tests can test code that tries to create
multiplexed channels?

[Sergey Ulanov, 2012/08/18 01:53:56]

Done. 

+}
+
 void FakeSession::Close() {
   closed_ = true;
 }
 
+void FakeSession::CreateStreamChannel(
+    const std::string& name, const StreamChannelCallback& callback) {
+  scoped_ptr<FakeSocket> channel(new FakeSocket());
+  stream_channels_[name] = channel.get();
+  callback.Run(channel.PassAs<net::StreamSocket>());
+}
+
+void FakeSession::CreateDatagramChannel(
+    const std::string& name, const DatagramChannelCallback& callback) {
+  scoped_ptr<FakeUdpSocket> channel(new FakeUdpSocket());
+  datagram_channels_[name] = channel.get();
+  callback.Run(channel.PassAs<net::Socket>());
+}
+
+void FakeSession::CancelChannelCreation(const std::string& name) {
+}
+
 }  // namespace protocol
 }  // namespace remoting