Fix MessageReader not to invoke message callback from done callback.

remoting/protocol/message_reader.cc

 // 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.
 
 #include "remoting/protocol/message_reader.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/thread_task_runner_handle.h"
+#include "base/single_thread_task_runner.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/socket/socket.h"
 #include "remoting/base/compound_buffer.h"
 #include "remoting/proto/internal.pb.h"
 
 namespace remoting {
 namespace protocol {
 
 static const int kReadBufferSize = 4096;
@@ skipping 59 matching lines @@
     closed_ = true;
   }
 }
 
 void MessageReader::OnDataReceived(net::IOBuffer* data, int data_size) {
   DCHECK(CalledOnValidThread());
   message_decoder_.AddData(data, data_size);
 
   // Get list of all new messages first, and then call the callback
   // for all of them.
-  std::vector<CompoundBuffer*> new_messages;
   while (true) {
     CompoundBuffer* buffer = message_decoder_.GetNextMessage();
     if (!buffer)
       break;
-    new_messages.push_back(buffer);
-  }
-
-  pending_messages_ += new_messages.size();
-
-  for (std::vector<CompoundBuffer*>::iterator it = new_messages.begin();
-       it != new_messages.end(); ++it) {
-    message_received_callback_.Run(
-        scoped_ptr<CompoundBuffer>(*it),
-        base::Bind(&MessageReader::OnMessageDone,
-                   weak_factory_.GetWeakPtr()));
+    pending_messages_++;
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE,
+        base::Bind(&MessageReader::RunCallback,
+                   weak_factory_.GetWeakPtr(),
+                   base::Passed(scoped_ptr<CompoundBuffer>(buffer))));
   }
 }
 
+void MessageReader::RunCallback(scoped_ptr<CompoundBuffer> message) {
+  message_received_callback_.Run(
+      message.Pass(), base::Bind(&MessageReader::OnMessageDone,
+                                 weak_factory_.GetWeakPtr()));
+}
+
 void MessageReader::OnMessageDone() {
   DCHECK(CalledOnValidThread());
   pending_messages_--;
   DCHECK_GE(pending_messages_, 0);
 
-  if (!read_pending_)
-    DoRead();  // Start next read if necessary.
+  // Start next read if necessary.
+  DoRead();
 }
 
 }  // namespace protocol
 }  // namespace remoting