Fix ChannelMultiplexer to properly handle base channel creation failure.

remoting/protocol/fake_session.h

 // 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_FAKE_SESSION_H_
 #define REMOTING_PROTOCOL_FAKE_SESSION_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 137 matching lines @@
 // FakeSession is a dummy protocol::Session that uses FakeSocket for all
 // channels.
 class FakeSession : public Session,
                     public ChannelFactory {
  public:
   FakeSession();
   virtual ~FakeSession();
 
   EventHandler* event_handler() { return event_handler_; }
 
-  void set_message_loop(MessageLoop* message_loop) {
-    message_loop_ = message_loop;
+  void set_async_creation(bool async_creation) {
+    async_creation_ = async_creation;
   }
 
   void set_error(ErrorCode error) { error_ = error; }
 
   bool is_closed() const { return closed_; }
 
   FakeSocket* GetStreamChannel(const std::string& name);
   FakeUdpSocket* GetDatagramChannel(const std::string& name);
 
   // 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* GetTransportChannelFactory() OVERRIDE;
   virtual ChannelFactory* GetMultiplexedChannelFactory() OVERRIDE;
   virtual void Close() OVERRIDE;
 
   // ChannelFactory interface.
   virtual void CreateStreamChannel(
-      const std::string& name, const StreamChannelCallback& callback) OVERRIDE;
+      const std::string& name,
+      const StreamChannelCallback& callback) OVERRIDE;
   virtual void CreateDatagramChannel(
       const std::string& name,
       const DatagramChannelCallback& callback) OVERRIDE;
   virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
 
  public:
+  void CallStreamChannelCallback(

[Wez, 2012/09/25 17:43:58]

nit: NotifyStreamChannelConnected/NotifyStreamChannelCallback?

[Sergey Ulanov, 2012/09/25 18:59:08]

Done.

+      const std::string& name,
+      const StreamChannelCallback& callback);
+  void CallDatagramChannelCallback(
+      const std::string& name,
+      const DatagramChannelCallback& callback);
+
   EventHandler* event_handler_;
   scoped_ptr<const CandidateSessionConfig> candidate_config_;
   SessionConfig config_;
   MessageLoop* message_loop_;
 
+  bool async_creation_;
+
   std::map<std::string, FakeSocket*> stream_channels_;
   std::map<std::string, FakeUdpSocket*> datagram_channels_;
 
   std::string jid_;
 
   ErrorCode error_;
   bool closed_;
 
+  base::WeakPtrFactory<FakeSession> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(FakeSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_FAKE_SESSION_H_