Fix MessageReader to pass errors to the channel

remoting/protocol/message_reader.h

Index: remoting/protocol/message_reader.h
diff --git a/remoting/protocol/message_reader.h b/remoting/protocol/message_reader.h
index 65d52d0a8bbe5cfb34965be2ef64eb982e8220e9..fd1ad96c3972d537d997cf3a72d3beabf344283f 100644
--- a/remoting/protocol/message_reader.h
+++ b/remoting/protocol/message_reader.h
@@ -35,6 +35,7 @@ class MessageReader : public base::NonThreadSafe {
  public:
   typedef base::Callback<void(scoped_ptr<CompoundBuffer>, const base::Closure&)>
       MessageReceivedCallback;
+  typedef base::Callback<void(int)> ReadFailedCallback;
 
   MessageReader();
   virtual ~MessageReader();
@@ -43,16 +44,19 @@ class MessageReader : public base::NonThreadSafe {
   void SetMessageReceivedCallback(const MessageReceivedCallback& callback);
 
   // Starts reading from |socket|.
-  void StartReading(net::Socket* socket);
+  void StartReading(net::Socket* socket,
+                    const ReadFailedCallback& read_failed_callback);
 
  private:
   void DoRead();
   void OnRead(int result);
-  void HandleReadResult(int result);
+  void HandleReadResult(int result, bool* read_again);

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

I think |read_again| is a misleading name for this. It could be interpreted
(correctly, I think) that the read succeeded and it's safe to read something
else, or it could be interpreted that the read failed and should be retried. I
suggest |read_succeeded| might be a better name.

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

Done. Note that I also changed the meaning of this parameter - it's set to true
now when result == net::ERR_IO_PENDING, i.e. ERR_IO_PENDING is not a failure. It
doesn't matter because DoRead() checks for read_pending_ anyway.

   void OnDataReceived(net::IOBuffer* data, int data_size);
   void RunCallback(scoped_ptr<CompoundBuffer> message);
   void OnMessageDone();
 
+  ReadFailedCallback read_failed_callback_;
+
   net::Socket* socket_;
 
   // Set to true, when we have a socket read pending, and expecting