Revert "Fix crashes in ChromotingHost"

remoting/host/screen_recorder.h

 // Copyright (c) 2010 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"
@@ skipping 52 matching lines @@
 //
 // This class has the following state variables:
 // |is_recording_| - If this is set to false there should be no activity on
 //                      the capture thread by this object.
 // |network_stopped_| - This state is to prevent activity on the network thread
 //                      if set to false.
 class ScreenRecorder : public base::RefCountedThreadSafe<ScreenRecorder> {
  public:
 
   // Construct a ScreenRecorder. Message loops and threads are provided.
-  // This object does not own capturer but owns encoder.
+  // This object does not own capturer and encoder.
   ScreenRecorder(MessageLoop* capture_loop,
                  MessageLoop* encode_loop,
                  MessageLoop* network_loop,
                  Capturer* capturer,
                  Encoder* encoder);
 
   virtual ~ScreenRecorder();
 
   // Start recording.
   void Start();
@@ skipping 69 matching lines @@
   void EncodedDataAvailableCallback(VideoPacket* packet);
   void SendVideoPacket(VideoPacket* packet);
 
   // Message loops used by this class.
   MessageLoop* capture_loop_;
   MessageLoop* encode_loop_;
   MessageLoop* network_loop_;
 
   // Reference to the capturer. This member is always accessed on the capture
   // thread.
-  Capturer* capturer_;
+  scoped_ptr<Capturer> capturer_;
 
   // Reference to the encoder. This member is always accessed on the encode
   // thread.
   scoped_ptr<Encoder> encoder_;
 
   // A list of clients connected to this hosts.
   // This member is always accessed on the network thread.
   typedef std::vector<scoped_refptr<protocol::ConnectionToClient> >
       ConnectionToClientList;
   ConnectionToClientList connections_;
@@ skipping 18 matching lines @@
 
   // Number of captures to perform every second. Written on the capture thread.
   double max_rate_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenRecorder);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_SCREEN_RECORDER_H_