Fix ChannelMultiplexer to properly handle base channel creation failure.

remoting/protocol/channel_multiplexer.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_CHANNEL_MULTIPLEXER_H_
 #define REMOTING_PROTOCOL_CHANNEL_MULTIPLEXER_H_
 
+#include "base/memory/weak_ptr.h"
 #include "remoting/proto/mux.pb.h"
 #include "remoting/protocol/buffered_socket_writer.h"
 #include "remoting/protocol/channel_factory.h"
 #include "remoting/protocol/message_reader.h"
 
 namespace remoting {
 namespace protocol {
 
 class ChannelMultiplexer : public ChannelFactory {
  public:
@@ skipping 15 matching lines @@
 
  private:
   struct PendingChannel;
   class MuxChannel;
   class MuxSocket;
   friend class MuxChannel;
 
   // Callback for |base_channel_| creation.
   void OnBaseChannelReady(scoped_ptr<net::StreamSocket> socket);
 
+  // Helper to create channels asynchronously.
+  void DoCreatePendingChannels();
+
   // Helper method used to create channels.
   MuxChannel* GetOrCreateChannel(const std::string& name);
 
-  // Callbacks for |writer_| and |reader_|.
+  // Error handling callback for |writer_|.
   void OnWriteFailed(int error);
+
+  // Failed write notifier, queued asynchronously by OnWriteFailed().
+  void NotifyWriteFailed(const std::string& name);
+
+  // Callback for |reader_;
   void OnIncomingPacket(scoped_ptr<MultiplexPacket> packet,
                         const base::Closure& done_task);
 
   // Called by MuxChannel.
   bool DoWrite(scoped_ptr<MultiplexPacket> packet,
                const base::Closure& done_task);
 
   // Factory used to create |base_channel_|. Set to NULL once creation is
   // finished or failed.
   ChannelFactory* base_channel_factory_;
@@ skipping 10 matching lines @@
   int next_channel_id_;
   std::map<std::string, MuxChannel*> channels_;
 
   // Channels are added to |channels_by_receive_id_| only after we receive
   // receive_id from the remote peer.
   std::map<int, MuxChannel*> channels_by_receive_id_;
 
   BufferedSocketWriter writer_;
   ProtobufMessageReader<MultiplexPacket> reader_;
 
-  // Flag used by OnWriteFailed() to detect when the multiplexer is destroyed.
-  bool* destroyed_flag_;
+  base::WeakPtrFactory<ChannelMultiplexer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelMultiplexer);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 
 #endif  // REMOTING_PROTOCOL_CHANNEL_MULTIPLEXER_H_