Properly handle screen recorder shutdown in ChromotingHost.

remoting/host/screen_recorder.h

 // 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.
 
 #ifndef REMOTING_HOST_SCREEN_RECORDER_H_
 #define REMOTING_HOST_SCREEN_RECORDER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "remoting/base/encoder.h"
 #include "remoting/host/capturer.h"
 #include "remoting/proto/video.pb.h"
 
 namespace remoting {
@@ skipping 57 matching lines @@
                  Capturer* capturer,
                  Encoder* encoder);
 
   virtual ~ScreenRecorder();
 
   // Start recording.
   void Start();
 
   // Stop the recording session. |done_task| is executed when recording is fully
   // stopped. This object cannot be used again after |task| is executed.
-  void Stop(Task* done_task);
+  void Stop(const base::Closure& done_task);
 
   // Set the maximum capture rate. This is denoted by number of updates
   // in one second. The actual system may run in a slower rate than the maximum
   // rate due to various factors, e.g. capture speed, encode speed and network
   // conditions.
   // This method should be called before Start() is called.
   void SetMaxRate(double rate);
 
   // Add a connection to this recording session.
   void AddConnection(scoped_refptr<protocol::ConnectionToClient> connection);
 
   // Remove a connection from receiving screen updates.
   void RemoveConnection(scoped_refptr<protocol::ConnectionToClient> connection);
 
   // Remove all connections.
   void RemoveAllConnections();
 
   // Update the sequence number for tracing performance.
   void UpdateSequenceNumber(int64 sequence_number);
 
  private:
   // Getters for capturer and encoder.
   Capturer* capturer();
   Encoder* encoder();
 
   // Capturer thread ----------------------------------------------------------
 
   void DoStart();
-  void DoStop(Task* done_task);
-
   void DoSetMaxRate(double max_rate);
 
   // Hepler method to schedule next capture using the current rate.
   void StartCaptureTimer();
 
   void DoCapture();
   void CaptureDoneCallback(scoped_refptr<CaptureData> capture_data);
   void DoFinishOneRecording();
   void DoInvalidateFullScreen();
 
   // Network thread -----------------------------------------------------------
 
   // DoSendVideoPacket takes ownership of the |packet| and is responsible
   // for deleting it.
   void DoSendVideoPacket(VideoPacket* packet);
 
   void DoSendInit(scoped_refptr<protocol::ConnectionToClient> connection,
                   int width, int height);
 
   void DoAddConnection(scoped_refptr<protocol::ConnectionToClient> connection);
   void DoRemoveClient(scoped_refptr<protocol::ConnectionToClient> connection);
   void DoRemoveAllClients();
 
   // Signal network thread to cease activities.
-  void DoStopOnNetworkThread(Task* done_task);
+  void DoStopOnNetworkThread(const base::Closure& done_task);
 
   // Callback for the last packet in one update. Deletes |packet| and
   // schedules next screen capture.
   void FrameSentCallback(VideoPacket* packet);
 
   // Encoder thread -----------------------------------------------------------
 
   void DoEncode(scoped_refptr<CaptureData> capture_data);
 
   // Perform stop operations on encode thread.
-  void DoStopOnEncodeThread(Task* done_task);
+  void DoStopOnEncodeThread(const base::Closure& done_task);
 
   // EncodedDataAvailableCallback takes ownership of |packet|.
   void EncodedDataAvailableCallback(VideoPacket* packet);
   void SendVideoPacket(VideoPacket* packet);
 
   // Message loops used by this class.
   MessageLoop* capture_loop_;
   MessageLoop* encode_loop_;
   MessageLoop* network_loop_;
 
@@ skipping 41 matching lines @@
 
   // This is a number updated by client to trace performance.
   int64 sequence_number_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenRecorder);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_SCREEN_RECORDER_H_