Use MessageLoopProxy for network message loop.

remoting/protocol/connection_to_client.cc

 // Copyright (c) 2011 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/connection_to_client.h"
 
 #include "base/bind.h"
+#include "base/message_loop_proxy.h"
 #include "google/protobuf/message.h"
 #include "net/base/io_buffer.h"
 #include "remoting/protocol/client_control_sender.h"
 #include "remoting/protocol/host_message_dispatcher.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/input_stub.h"
 
 // TODO(hclam): Remove this header once MessageDispatcher is used.
 #include "remoting/base/compound_buffer.h"
 
 namespace remoting {
 namespace protocol {
 
 // Determine how many update streams we should count to find the size of
 // average update stream.
 static const size_t kAverageUpdateStream = 10;
 
-ConnectionToClient::ConnectionToClient(MessageLoop* message_loop,
+ConnectionToClient::ConnectionToClient(base::MessageLoopProxy* message_loop,
                                        EventHandler* handler)
-    : loop_(message_loop),
+    : message_loop_(message_loop),
       handler_(handler),
       host_stub_(NULL),
       input_stub_(NULL),
       control_connected_(false),
       input_connected_(false),
       video_connected_(false) {
-  DCHECK(loop_);
+  DCHECK(message_loop_);
   DCHECK(handler_);
 }
 
 ConnectionToClient::~ConnectionToClient() {
   // TODO(hclam): When we shut down the viewer we may have to close the
   // connection.
 }
 
 void ConnectionToClient::Init(protocol::Session* session) {
-  DCHECK_EQ(loop_, MessageLoop::current());
+  DCHECK(message_loop_->BelongsToCurrentThread());
   session_.reset(session);
   session_->SetStateChangeCallback(
       NewCallback(this, &ConnectionToClient::OnSessionStateChange));
 }
 
 protocol::Session* ConnectionToClient::session() {
   return session_.get();
 }
 
 void ConnectionToClient::Disconnect() {
   // This method can be called from main thread so perform threading switching.
-  if (MessageLoop::current() != loop_) {
-    loop_->PostTask(
+  if (!message_loop_->BelongsToCurrentThread()) {
+    message_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &ConnectionToClient::Disconnect));
     return;
   }
 
   CloseChannels();
 
   // If there is a session then release it, causing it to close.
   if (session_.get())
     session_.reset();
@@ skipping 14 matching lines @@
 
 void ConnectionToClient::set_host_stub(protocol::HostStub* host_stub) {
   host_stub_ = host_stub;
 }
 
 void ConnectionToClient::set_input_stub(protocol::InputStub* input_stub) {
   input_stub_ = input_stub;
 }
 
 void ConnectionToClient::OnSessionStateChange(protocol::Session::State state) {
-  DCHECK_EQ(loop_, MessageLoop::current());
+  DCHECK(message_loop_->BelongsToCurrentThread());
 
   DCHECK(handler_);
   switch(state) {
     case protocol::Session::CONNECTING:
       // Don't care about this message.
       break;
 
     case protocol::Session::CONNECTED:
-      video_writer_.reset(VideoWriter::Create(session_->config()));
+      video_writer_.reset(
+          VideoWriter::Create(message_loop_, session_->config()));
       video_writer_->Init(
           session_.get(), base::Bind(&ConnectionToClient::OnVideoInitialized,
                                      base::Unretained(this)));
       break;
 
     case protocol::Session::CONNECTED_CHANNELS:
       client_control_sender_.reset(
-          new ClientControlSender(session_->control_channel()));
+          new ClientControlSender(message_loop_, session_->control_channel()));
       dispatcher_.reset(new HostMessageDispatcher());
       dispatcher_->Initialize(this, host_stub_, input_stub_);
 
       control_connected_ = true;
       input_connected_ = true;
       NotifyIfChannelsReady();
       break;
 
     case protocol::Session::CLOSED:
       CloseChannels();
@@ skipping 33 matching lines @@
 
 void ConnectionToClient::CloseChannels() {
   if (video_writer_.get())
     video_writer_->Close();
   if (client_control_sender_.get())
     client_control_sender_->Close();
 }
 
 }  // namespace protocol
 }  // namespace remoting