Simplified MessageReader and MessageDecoder classes.

remoting/protocol/message_decoder.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 "remoting/protocol/message_decoder.h"
 
 #include "base/logging.h"
 #include "net/base/io_buffer.h"
 #include "remoting/base/compound_buffer.h"
 #include "remoting/proto/internal.pb.h"
 #include "third_party/libjingle/source/talk/base/byteorder.h"
 
 namespace remoting {
 namespace protocol {
 
 MessageDecoder::MessageDecoder()
     : next_payload_(0),
       next_payload_known_(false) {
 }
 
 MessageDecoder::~MessageDecoder() {}
 
-void MessageDecoder::AddBuffer(scoped_refptr<net::IOBuffer> data,
-                               int data_size) {
+void MessageDecoder::AddData(scoped_refptr<net::IOBuffer> data,
+                             int data_size) {
   buffer_.Append(data, data_size);
 }
 
-bool MessageDecoder::GetNextMessageData(CompoundBuffer* message_buffer) {
+bool MessageDecoder::GetNextMessage(CompoundBuffer* message_buffer) {
   // Determine the payload size. If we already know it then skip this part.
   // We may not have enough data to determine the payload size so use a
   // utility function to find out.
   int next_payload = -1;
   if (!next_payload_known_ && GetPayloadSize(&next_payload)) {
     DCHECK_NE(-1, next_payload);
     next_payload_ = next_payload;
     next_payload_known_ = true;
   }
 
@@ skipping 21 matching lines @@
   char header[kHeaderSize];
   header_buffer.CopyFrom(buffer_, 0, kHeaderSize);
   header_buffer.CopyTo(header, kHeaderSize);
   *size = talk_base::GetBE32(header);
   buffer_.CropFront(kHeaderSize);
   return true;
 }
 
 }  // namespace protocol
 }  // namespace remoting