Switch remoting/protocol to new callbacks

remoting/client/chromoting_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/client/chromoting_client.h"
 
 #include "base/bind.h"
 #include "remoting/client/chromoting_view.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/input_handler.h"
 #include "remoting/client/rectangle_update_decoder.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/session_config.h"
 
 namespace remoting {
 
+ChromotingClient::QueuedVideoPacket::QueuedVideoPacket(
+    const VideoPacket* packet, const base::Closure& done)
+    : packet(packet), done(done) {
+}
+
+ChromotingClient::QueuedVideoPacket::~QueuedVideoPacket() {
+}
+
 ChromotingClient::ChromotingClient(const ClientConfig& config,
                                    ClientContext* context,
                                    protocol::ConnectionToHost* connection,
                                    ChromotingView* view,
                                    RectangleUpdateDecoder* rectangle_decoder,
                                    InputHandler* input_handler,
                                    Task* client_done)
     : config_(config),
       context_(context),
       connection_(connection),
@@ skipping 48 matching lines @@
 ChromotingStats* ChromotingClient::GetStats() {
   return &stats_;
 }
 
 void ChromotingClient::Repaint() {
   DCHECK(message_loop()->BelongsToCurrentThread());
   view_->Paint();
 }
 
 void ChromotingClient::ProcessVideoPacket(const VideoPacket* packet,
-                                          Task* done) {
+                                          const base::Closure& done) {
   DCHECK(message_loop()->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();
-    delete done;
+    done.Run();
     return;
   }
 
   // Record size of the packet for statistics.
   stats_.video_bandwidth()->Record(packet->data().size());
 
   // Record statistics received from host.
   if (packet->has_capture_time_ms())
     stats_.video_capture_ms()->Record(packet->capture_time_ms());
   if (packet->has_encode_time_ms())
@@ skipping 62 matching lines @@
     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();
-  delete received_packets_.front().done;
+  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;
   }
 
   // Initialize the decoder.
   rectangle_decoder_->Initialize(connection_->config());
 
   // Schedule the input handler to process the event queue.
   input_handler_->Initialize();
 }
 
 ////////////////////////////////////////////////////////////////////////////
 // ClientStub control channel interface.
 void ChromotingClient::BeginSessionResponse(
-    const protocol::LocalLoginStatus* msg, Task* done) {
+    const protocol::LocalLoginStatus* msg, const base::Closure& done) {
   if (!message_loop()->BelongsToCurrentThread()) {
     thread_proxy_.PostTask(FROM_HERE, base::Bind(
         &ChromotingClient::BeginSessionResponse, base::Unretained(this),
         msg, done));
     return;
   }
 
   VLOG(1) << "BeginSessionResponse received";
 
   // Inform the connection that the client has been authenticated. This will
   // enable the communication channels.
   if (msg->success()) {
     connection_->OnClientAuthenticated();
   }
 
   view_->UpdateLoginStatus(msg->success(), msg->error_info());
-  done->Run();
-  delete done;
+  done.Run();
 }
 
 }  // namespace remoting