Fix MessageReader to pass errors to the channel

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/base/buffered_socket_writer.h"
 #include "remoting/proto/mux.pb.h"
@@ skipping 26 matching lines @@
 
   // 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);
 
-  // Error handling callback for |writer_|.
-  void OnWriteFailed(int error);
+  // Error handling callback for |reader_| and |writer_|.
+  void OnBaseChannelError(int error);

[Jamie, 2015/05/13 18:25:17]

Why not OnReadWriteFailed for consistency with the other rename you've done?

[Sergey Ulanov, 2015/05/14 00:15:21]

In multiplexer OnReadWriteFailed() doesn't make it clear where the error has
occurred.

 
-  // Failed write notifier, queued asynchronously by OnWriteFailed().
-  void NotifyWriteFailed(const std::string& name);
+  // Propagates base channel error to channel |name|, queued asynchronously by
+  // OnBaseChannelError().
+  void NotifyBaseChannelError(const std::string& name, int error);
 
   // 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 nullptr once creation is
@@ skipping 23 matching lines @@
   base::WeakPtrFactory<ChannelMultiplexer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelMultiplexer);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 
 #endif  // REMOTING_PROTOCOL_CHANNEL_MULTIPLEXER_H_