Simplify message parsing.

remoting/protocol/message_reader.h

 // Copyright (c) 2012 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.
 
 #ifndef REMOTING_PROTOCOL_MESSAGE_READER_H_
 #define REMOTING_PROTOCOL_MESSAGE_READER_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 24 matching lines @@
 // e.g. when we the sender sends multiple messages in one TCP packet.
 class MessageReader : public base::NonThreadSafe {
  public:
   typedef base::Callback<void(scoped_ptr<CompoundBuffer> message)>
       MessageReceivedCallback;
   typedef base::Callback<void(int)> ReadFailedCallback;
 
   MessageReader();
   virtual ~MessageReader();
 
-  // Sets the callback to be called for each incoming message.
-  void SetMessageReceivedCallback(const MessageReceivedCallback& callback);
-
   // Starts reading from |socket|.
   void StartReading(P2PStreamSocket* socket,
+                    const MessageReceivedCallback& message_received_callback,
                     const ReadFailedCallback& read_failed_callback);
 
  private:
   void DoRead();
   void OnRead(int result);
   void HandleReadResult(int result, bool* read_succeeded);
   void OnDataReceived(net::IOBuffer* data, int data_size);
   void RunCallback(scoped_ptr<CompoundBuffer> message);
 
   ReadFailedCallback read_failed_callback_;
@@ skipping 14 matching lines @@
 
   base::WeakPtrFactory<MessageReader> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageReader);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_MESSAGE_READER_H_