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

remoting/protocol/fake_session.h

Index: remoting/protocol/fake_session.h
diff --git a/remoting/protocol/fake_session.h b/remoting/protocol/fake_session.h
index 848a2bf5e3c122c63ed43374c56e9e631869cc3f..2c4c7845c33cc26a52baad2d0a98b9bfa42b9d60 100644
--- a/remoting/protocol/fake_session.h
+++ b/remoting/protocol/fake_session.h
@@ -14,6 +14,7 @@
 #include "net/base/completion_callback.h"
 #include "net/socket/socket.h"
 #include "net/socket/stream_socket.h"
+#include "remoting/protocol/channel_factory.h"
 #include "remoting/protocol/session.h"
 
 class MessageLoop;
@@ -146,7 +147,8 @@ class FakeUdpSocket : public net::Socket {
 
 // FakeSession is a dummy protocol::Session that uses FakeSocket for all
 // channels.
-class FakeSession : public Session {
+class FakeSession : public Session,
+                    public ChannelFactory {
  public:
   FakeSession();
   virtual ~FakeSession();
@@ -164,11 +166,18 @@ class FakeSession : public Session {
   FakeSocket* GetStreamChannel(const std::string& name);
   FakeUdpSocket* GetDatagramChannel(const std::string& name);
 
-  // Session implementation.
+  // Session interface.
   virtual void SetEventHandler(EventHandler* event_handler) OVERRIDE;
-
   virtual ErrorCode error() OVERRIDE;
+  virtual const std::string& jid() OVERRIDE;
+  virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
+  virtual const SessionConfig& config() OVERRIDE;
+  virtual void set_config(const SessionConfig& config) OVERRIDE;
+  virtual ChannelFactory* GetMainChannelFactory() OVERRIDE;
+  virtual ChannelFactory* GetMultiplexedChannelFactory() OVERRIDE;
+  virtual void Close() OVERRIDE;
 
+  // ChannelFactory interface.
   virtual void CreateStreamChannel(
       const std::string& name, const StreamChannelCallback& callback) OVERRIDE;
   virtual void CreateDatagramChannel(
@@ -176,14 +185,6 @@ class FakeSession : public Session {
       const DatagramChannelCallback& callback) OVERRIDE;
   virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
 
-  virtual const std::string& jid() OVERRIDE;
-
-  virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
-  virtual const SessionConfig& config() OVERRIDE;
-  virtual void set_config(const SessionConfig& config) OVERRIDE;
-
-  virtual void Close() OVERRIDE;
-
  public:
   EventHandler* event_handler_;
   scoped_ptr<const CandidateSessionConfig> candidate_config_;