Simplified MessageReader and MessageDecoder classes.

remoting/protocol/message_decoder_unittest.cc

 // Copyright (c) 2010 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/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/message_decoder.h"
@@ skipping 51 matching lines @@
   // Then feed the protocol decoder using the above generated data and the
   // read pattern.
   std::list<EventMessage*> message_list;
   for (int i = 0; i < size;) {
     // First generate the amount to feed the decoder.
     int read = std::min(size - i, read_sequence[i % sequence_size]);
 
     // And then prepare an IOBuffer for feeding it.
     scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(read));
     memcpy(buffer->data(), test_data + i, read);
-    decoder.ParseMessages(buffer, read, &message_list);
+    decoder.AddData(buffer, read);
+    while (true) {
+      CompoundBuffer message;
+      if (!decoder.GetNextMessage(&message))
+        break;
+
+      EventMessage* event = new EventMessage();
+      CompoundBufferInputStream stream(&message);
+      ASSERT_TRUE(event->ParseFromZeroCopyStream(&stream));
+      message_list.push_back(event);
+    }
     i += read;
   }
 
   // Then verify the decoded messages.
   EXPECT_EQ(10u, message_list.size());
 
   int index = 0;
   for (std::list<EventMessage*>::iterator it =
            message_list.begin();
        it != message_list.end(); ++it) {
@@ skipping 21 matching lines @@
   SimulateReadSequence(kReads, arraysize(kReads));
 }
 
 TEST(MessageDecoderTest, EmptyReads) {
   const int kReads[] = {4, 0, 50, 0};
   SimulateReadSequence(kReads, arraysize(kReads));
 }
 
 }  // namespace protocol
 }  // namespace remoting