Fix MessageReader to pass errors to the channel

remoting/protocol/message_reader_unittest.cc

 // 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.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 58 matching lines @@
  protected:
   void SetUp() override {
     reader_.reset(new MessageReader());
   }
 
   void TearDown() override { STLDeleteElements(&messages_); }
 
   void InitReader() {
     reader_->SetMessageReceivedCallback(
         base::Bind(&MessageReaderTest::OnMessage, base::Unretained(this)));
-    reader_->StartReading(&socket_);
+    reader_->StartReading(&socket_, base::Bind(&MessageReaderTest::OnReadError,
+                                               base::Unretained(this)));
   }
 
   void AddMessage(const std::string& message) {
     std::string data = std::string(4, ' ') + message;
     rtc::SetBE32(const_cast<char*>(data.data()), message.size());
 
     socket_.AppendInputData(data);
   }
 
   bool CompareResult(CompoundBuffer* buffer, const std::string& expected) {
     std::string result(buffer->total_bytes(), ' ');
     buffer->CopyTo(const_cast<char*>(result.data()), result.size());
     return result == expected;
   }
 
+  void OnReadError(int error) {
+    read_error_ = error;
+    reader_.reset();
+  }
+
   void OnMessage(scoped_ptr<CompoundBuffer> buffer,
                  const base::Closure& done_callback) {
     messages_.push_back(buffer.release());
     callback_.OnMessage(done_callback);
   }
 
   base::MessageLoop message_loop_;
   scoped_ptr<MessageReader> reader_;
   FakeStreamSocket socket_;
   MockMessageReceivedCallback callback_;
+  int read_error_ = 0;
   std::vector<CompoundBuffer*> messages_;
   bool in_callback_;
 };
 
 // Receive one message and process it with delay
 TEST_F(MessageReaderTest, OneMessage_Delay) {
   base::Closure done_task;
 
   AddMessage(kTestMessage1);
 
@@ skipping 159 matching lines @@
 
   done_task.Run();
 
   EXPECT_TRUE(socket_.read_pending());
 }
 
 // Read() returns error.
 TEST_F(MessageReaderTest, ReadError) {
   socket_.AppendReadError(net::ERR_FAILED);
 
-  // Add a message. It should never be read after the error above.
-  AddMessage(kTestMessage1);
-
-  EXPECT_CALL(callback_, OnMessage(_))
-      .Times(0);
+  EXPECT_CALL(callback_, OnMessage(_)).Times(0);
 
   InitReader();
+
+  EXPECT_EQ(net::ERR_FAILED, read_error_);
+  EXPECT_FALSE(reader_);
 }
 
 // Verify that we the OnMessage callback is not reentered.
 TEST_F(MessageReaderTest, ReadFromCallback) {
   AddMessage(kTestMessage1);
 
   EXPECT_CALL(callback_, OnMessage(_))
       .Times(2)
       .WillOnce(Invoke(this, &MessageReaderTest::AddSecondMessage))
       .WillOnce(Invoke(this, &MessageReaderTest::OnSecondMessage));
@@ skipping 16 matching lines @@
   EXPECT_CALL(callback_, OnMessage(_))
       .Times(1)
       .WillOnce(Invoke(this, &MessageReaderTest::DeleteReader));
 
   InitReader();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace protocol
 }  // namespace remoting