| Index: remoting/protocol/message_decoder.h
 | 
| diff --git a/remoting/protocol/message_decoder.h b/remoting/protocol/message_decoder.h
 | 
| index 207dee5b37820d754c4a8979f7f07218f125f494..6f4713f665126a0c192ffb2dabe4a71392e0f6a7 100644
 | 
| --- a/remoting/protocol/message_decoder.h
 | 
| +++ b/remoting/protocol/message_decoder.h
 | 
| @@ -11,7 +11,7 @@
 | 
|  #include "base/ref_counted.h"
 | 
|  #include "base/scoped_ptr.h"
 | 
|  #include "google/protobuf/message_lite.h"
 | 
| -#include "remoting/base/multiple_array_input_stream.h"
 | 
| +#include "remoting/base/compound_buffer.h"
 | 
|  
 | 
|  namespace net {
 | 
|  class DrainableIOBuffer;
 | 
| @@ -27,9 +27,9 @@ class ClientEventMessage;
 | 
|  class HostControlMessage;
 | 
|  class HostEventMessage;
 | 
|  
 | 
| -// MessageDecoder uses MultipleArrayInputStream to decode bytes into
 | 
| -// protocol buffer messages. This can be used to decode bytes received from
 | 
| -// the network.
 | 
| +// MessageDecoder uses CompoundBuffer to decode bytes into protocol
 | 
| +// buffer messages. This can be used to decode bytes received from the
 | 
| +// network.
 | 
|  //
 | 
|  // It provides ParseMessages() which accepts an IOBuffer. If enough bytes
 | 
|  // are collected to produce protocol buffer messages then the bytes will be
 | 
| @@ -72,7 +72,7 @@ class MessageDecoder {
 | 
|    // Parse one message from |buffer_list_|. Return true if sucessful.
 | 
|    template <class MessageType>
 | 
|    bool ParseOneMessage(MessageType** message) {
 | 
| -    scoped_ptr<MultipleArrayInputStream> stream(CreateInputStreamFromData());
 | 
| +    scoped_ptr<CompoundBuffer> stream(CreateInputStreamFromData());
 | 
|      if (!stream.get())
 | 
|        return false;
 | 
|  
 | 
| @@ -86,7 +86,7 @@ class MessageDecoder {
 | 
|  
 | 
|    void AddBuffer(scoped_refptr<net::IOBuffer> data, int data_size);
 | 
|  
 | 
| -  MultipleArrayInputStream* CreateInputStreamFromData();
 | 
| +  CompoundBuffer* CreateInputStreamFromData();
 | 
|  
 | 
|    // Retrieves the read payload size of the current protocol buffer via |size|.
 | 
|    // Returns false and leaves |size| unmodified, if we do not have enough data
 | 
| 
 |