Fix MessageReader to pass errors to the channel

remoting/protocol/client_video_dispatcher_unittest.cc

 // Copyright 2015 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 "remoting/protocol/client_video_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 18 matching lines @@
   void ProcessVideoPacket(scoped_ptr<VideoPacket> video_packet,
                           const base::Closure& done) override;
 
   // ChannelDispatcherBase::EventHandler interface.
   void OnChannelInitialized(ChannelDispatcherBase* channel_dispatcher) override;
   void OnChannelError(ChannelDispatcherBase* channel_dispatcher,
                       ErrorCode error) override;
 
  protected:
   void OnVideoAck(scoped_ptr<VideoAck> ack, const base::Closure& done);
+  void OnReadError(int error);
 
   base::MessageLoop message_loop_;
 
   // Set to true in OnChannelInitialized().
   bool initialized_;
 
   // Client side.
   ClientVideoDispatcher dispatcher_;
   FakeSession session_;
 
@@ skipping 16 matching lines @@
                          base::Unretained(this)),
               &reader_) {
   dispatcher_.Init(&session_, ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                                             kDefaultStreamVersion,
                                             ChannelConfig::CODEC_UNDEFINED),
                    this);
   base::RunLoop().RunUntilIdle();
   DCHECK(initialized_);
   host_socket_.PairWith(
       session_.fake_channel_factory().GetFakeChannel(kVideoChannelName));
-  reader_.StartReading(&host_socket_);
+  reader_.StartReading(&host_socket_,
+                       base::Bind(&ClientVideoDispatcherTest::OnReadError,
+                                  base::Unretained(this)));
   writer_.Init(&host_socket_, BufferedSocketWriter::WriteFailedCallback());
 }
 
 void ClientVideoDispatcherTest::ProcessVideoPacket(
     scoped_ptr<VideoPacket> video_packet,
     const base::Closure& done) {
   video_packets_.push_back(video_packet.release());
   packet_done_callbacks_.push_back(done);
 }
 
 void ClientVideoDispatcherTest::OnChannelInitialized(
     ChannelDispatcherBase* channel_dispatcher) {
   initialized_ = true;
 }
 
 void ClientVideoDispatcherTest::OnChannelError(
     ChannelDispatcherBase* channel_dispatcher,
     ErrorCode error) {
   // Don't expect channel creation to fail.
   FAIL();
 }
 
 void ClientVideoDispatcherTest::OnVideoAck(scoped_ptr<VideoAck> ack,
                                            const base::Closure& done) {
   ack_messages_.push_back(ack.release());
   done.Run();
 }
 
+void ClientVideoDispatcherTest::OnReadError(int error) {
+  LOG(FATAL) << "Unexpected read error: " << error;
+}
+
 // Verify that the client can receive video packets and acks are not sent for
 // VideoPackets that don't have frame_id field set.
 TEST_F(ClientVideoDispatcherTest, WithoutAcks) {
   VideoPacket packet;
   packet.set_data(std::string());
 
   // Send a VideoPacket and verify that the client receives it.
   writer_.Write(SerializeAndFrameMessage(packet), base::Closure());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1U, video_packets_.size());
@@ skipping 57 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   // Verify order of Ack messages.
   ASSERT_EQ(2U, ack_messages_.size());
   EXPECT_EQ(kTestFrameId, ack_messages_[0]->frame_id());
   EXPECT_EQ(kTestFrameId + 1, ack_messages_[1]->frame_id());
 }
 
 }  // namespace protocol
 }  // namespace remoting