Simplify message parsing.

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 17 matching lines @@
   // VideoStub interface.
   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);
+  void OnMessageReceived(scoped_ptr<CompoundBuffer> buffer);
   void OnReadError(int error);
 
   base::MessageLoop message_loop_;
 
   // Set to true in OnChannelInitialized().
   bool initialized_;
 
   // Client side.
   FakeStreamChannelFactory client_channel_factory_;
   ClientVideoDispatcher dispatcher_;
 
   // Host side.
   FakeStreamSocket host_socket_;
   MessageReader reader_;
-  ProtobufMessageParser<VideoAck> parser_;
   BufferedSocketWriter writer_;
 
   ScopedVector<VideoPacket> video_packets_;
   std::vector<base::Closure> packet_done_callbacks_;
 
   ScopedVector<VideoAck> ack_messages_;
 };
 
 ClientVideoDispatcherTest::ClientVideoDispatcherTest()
     : initialized_(false),
-      dispatcher_(this),
-      parser_(base::Bind(&ClientVideoDispatcherTest::OnVideoAck,
-                         base::Unretained(this)),
-              &reader_) {
+      dispatcher_(this) {
   dispatcher_.Init(&client_channel_factory_, this);
   base::RunLoop().RunUntilIdle();
   DCHECK(initialized_);
   host_socket_.PairWith(
       client_channel_factory_.GetFakeChannel(kVideoChannelName));
   reader_.StartReading(&host_socket_,
+                       base::Bind(&ClientVideoDispatcherTest::OnMessageReceived,
+                                  base::Unretained(this)),
                        base::Bind(&ClientVideoDispatcherTest::OnReadError,
                                   base::Unretained(this)));
   writer_.Start(
       base::Bind(&P2PStreamSocket::Write, base::Unretained(&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) {
+void ClientVideoDispatcherTest::OnMessageReceived(
+    scoped_ptr<CompoundBuffer> buffer) {
+  scoped_ptr<VideoAck> ack = ParseMessage<VideoAck>(buffer.get());
+  EXPECT_TRUE(ack);
   ack_messages_.push_back(ack.release());
 }
 
 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) {
@@ skipping 64 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