MessageLoopProxy cleanups in remoting client.

remoting/client/chromoting_client.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/client/chromoting_client.h"
 
 #include "base/bind.h"
 #include "remoting/client/chromoting_view.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/rectangle_update_decoder.h"
@@ skipping 13 matching lines @@
     : packet(packet.release()), done(done) {
 }
 
 ChromotingClient::QueuedVideoPacket::~QueuedVideoPacket() {
 }
 
 ChromotingClient::ChromotingClient(const ClientConfig& config,
                                    ClientContext* context,
                                    protocol::ConnectionToHost* connection,
                                    ChromotingView* view,
-                                   RectangleUpdateDecoder* rectangle_decoder,
-                                   const base::Closure& client_done)
+                                   RectangleUpdateDecoder* rectangle_decoder)
     : config_(config),
       context_(context),
       connection_(connection),
       view_(view),
       rectangle_decoder_(rectangle_decoder),
-      client_done_(client_done),
       packet_being_processed_(false),
       last_sequence_number_(0),
-      thread_proxy_(context_->network_message_loop()) {
+      thread_proxy_(context_->main_task_runner()) {
 }
 
 ChromotingClient::~ChromotingClient() {
 }
 
 void ChromotingClient::Start(
     scoped_refptr<XmppProxy> xmpp_proxy,
     scoped_ptr<protocol::TransportFactory> transport_factory) {
-  DCHECK(message_loop()->BelongsToCurrentThread());
+  DCHECK(task_runner()->BelongsToCurrentThread());
 
   scoped_ptr<protocol::Authenticator> authenticator;
   if (config_.use_v1_authenticator) {
     authenticator.reset(new protocol::V1ClientAuthenticator(
         config_.local_jid, config_.shared_secret));
   } else {
     authenticator = protocol::NegotiatingAuthenticator::CreateForClient(
         config_.authentication_tag,
         config_.shared_secret, config_.authentication_methods);
   }
 
   connection_->Connect(xmpp_proxy, config_.local_jid, config_.host_jid,
                        config_.host_public_key, transport_factory.Pass(),
                        authenticator.Pass(), this, this, this, this);
 
-  if (!view_->Initialize()) {
-    ClientDone();
-  }
+  view_->Initialize();
 }
 
 void ChromotingClient::Stop(const base::Closure& shutdown_task) {
-  if (!message_loop()->BelongsToCurrentThread()) {
-    message_loop()->PostTask(
+  if (!task_runner()->BelongsToCurrentThread()) {

[Wez, 2012/05/26 00:18:40]

Which other threads does the client get Stop()ped from?

[Sergey Ulanov, 2012/05/30 01:07:07]

This is no longer necessary. Replaced with a DCHECK.

+    task_runner()->PostTask(
         FROM_HERE, base::Bind(&ChromotingClient::Stop,
                               base::Unretained(this), shutdown_task));
     return;
   }
 
   // Drop all pending packets.
   while(!received_packets_.empty()) {
     delete received_packets_.front().packet;
     received_packets_.front().done.Run();
     received_packets_.pop_front();
   }
 
   connection_->Disconnect(base::Bind(&ChromotingClient::OnDisconnected,
                                      base::Unretained(this), shutdown_task));
 }
 
 void ChromotingClient::OnDisconnected(const base::Closure& shutdown_task) {
   view_->TearDown();
 
   shutdown_task.Run();
 }
 
-void ChromotingClient::ClientDone() {
-  if (!client_done_.is_null()) {
-    message_loop()->PostTask(FROM_HERE, client_done_);
-    client_done_.Reset();
-  }
-}
-
 ChromotingStats* ChromotingClient::GetStats() {
+  DCHECK(task_runner()->BelongsToCurrentThread());
   return &stats_;
 }
 
 void ChromotingClient::InjectClipboardEvent(
     const protocol::ClipboardEvent& event) {
+  DCHECK(task_runner()->BelongsToCurrentThread());
   view_->GetClipboardStub()->InjectClipboardEvent(event);
 }
 
 void ChromotingClient::ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
                                           const base::Closure& done) {
-  DCHECK(message_loop()->BelongsToCurrentThread());
+  DCHECK(task_runner()->BelongsToCurrentThread());
 
   // If the video packet is empty then drop it. Empty packets are used to
   // maintain activity on the network.
   if (!packet->has_data() || packet->data().size() == 0) {
     done.Run();
     return;
   }
 
   // Add one frame to the counter.
   stats_.video_frame_rate()->Record(1);
@@ skipping 12 matching lines @@
         base::Time::FromInternalValue(packet->client_sequence_number());
     stats_.round_trip_ms()->Record(round_trip_latency.InMilliseconds());
   }
 
   received_packets_.push_back(QueuedVideoPacket(packet.Pass(), done));
   if (!packet_being_processed_)
     DispatchPacket();
 }
 
 int ChromotingClient::GetPendingPackets() {
+  DCHECK(task_runner()->BelongsToCurrentThread());
   return received_packets_.size();
 }
 
 void ChromotingClient::DispatchPacket() {
-  DCHECK(message_loop()->BelongsToCurrentThread());
+  DCHECK(task_runner()->BelongsToCurrentThread());
   CHECK(!packet_being_processed_);
 
   if (received_packets_.empty()) {
     // Nothing to do!
     return;
   }
 
   scoped_ptr<VideoPacket> packet(received_packets_.front().packet);
   received_packets_.front().packet = NULL;
   packet_being_processed_ = true;
 
   // Measure the latency between the last packet being received and presented.
   bool last_packet = (packet->flags() & VideoPacket::LAST_PACKET) != 0;
   base::Time decode_start;
   if (last_packet)
     decode_start = base::Time::Now();
 
   rectangle_decoder_->DecodePacket(
       packet.Pass(),
       base::Bind(&ChromotingClient::OnPacketDone, base::Unretained(this),
                  last_packet, decode_start));
 }
 
 void ChromotingClient::OnConnectionState(
     protocol::ConnectionToHost::State state,
     protocol::ErrorCode error) {
-  DCHECK(message_loop()->BelongsToCurrentThread());
+  DCHECK(task_runner()->BelongsToCurrentThread());
   VLOG(1) << "ChromotingClient::OnConnectionState(" << state << ")";
   if (state == protocol::ConnectionToHost::CONNECTED)
     Initialize();
   view_->SetConnectionState(state, error);
 }
 
-base::MessageLoopProxy* ChromotingClient::message_loop() {
-  return context_->network_message_loop();
+base::SingleThreadTaskRunner* ChromotingClient::task_runner() {
+  return context_->main_task_runner();
 }
 
 void ChromotingClient::OnPacketDone(bool last_packet,
                                     base::Time decode_start) {
-  if (!message_loop()->BelongsToCurrentThread()) {
+  if (!task_runner()->BelongsToCurrentThread()) {
     thread_proxy_.PostTask(FROM_HERE, base::Bind(
         &ChromotingClient::OnPacketDone, base::Unretained(this),
         last_packet, decode_start));
     return;
   }
 
   // Record the latency between the final packet being received and
   // presented.
   if (last_packet) {
     stats_.video_decode_ms()->Record(
         (base::Time::Now() - decode_start).InMilliseconds());
   }
 
   received_packets_.front().done.Run();
   received_packets_.pop_front();
 
   packet_being_processed_ = false;
 
   // Process the next video packet.
   DispatchPacket();
 }
 
 void ChromotingClient::Initialize() {
-  if (!message_loop()->BelongsToCurrentThread()) {
-    thread_proxy_.PostTask(FROM_HERE, base::Bind(
-        &ChromotingClient::Initialize, base::Unretained(this)));
-    return;
-  }
+  DCHECK(task_runner()->BelongsToCurrentThread());
 
   // Initialize the decoder.
   rectangle_decoder_->Initialize(connection_->config());
 }
 
 }  // namespace remoting