Revert 244074 "Eliminate video capture thread in renderer"

trunk/src/content/renderer/pepper/pepper_platform_video_capture.h

 // 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.
 
 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_VIDEO_CAPTURE_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_VIDEO_CAPTURE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "media/video/capture/video_capture.h"
 #include "media/video/capture/video_capture_types.h"
 
 class GURL;
 
 namespace media {
 class VideoCaptureHandlerProxy;
 }
 
 namespace content {
 class PepperMediaDeviceManager;
 class PepperVideoCaptureHost;
 class RenderViewImpl;
-class VideoCaptureHandle;
 
 class PepperPlatformVideoCapture
     : public media::VideoCapture,
       public base::RefCounted<PepperPlatformVideoCapture>,
       public media::VideoCapture::EventHandler {
  public:
   PepperPlatformVideoCapture(
       const base::WeakPtr<RenderViewImpl>& render_view,
       const std::string& device_id,
       const GURL& document_url,
@@ skipping 36 matching lines @@
   base::WeakPtr<RenderViewImpl> render_view_;
 
   std::string device_id_;
   std::string label_;
   int session_id_;
 
   scoped_ptr<media::VideoCaptureHandlerProxy> handler_proxy_;
 
   PepperVideoCaptureHost* handler_;
 
-  scoped_ptr<VideoCaptureHandle> video_capture_;
+  media::VideoCapture* video_capture_;
 
   // StartCapture() must be balanced by StopCapture(), otherwise this object
   // will leak.
   bool unbalanced_start_;
 
   // Whether we have a pending request to open a device. We have to make sure
   // there isn't any pending request before this object goes away.
   bool pending_open_device_;
   int pending_open_device_id_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperPlatformVideoCapture);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_VIDEO_CAPTURE_H_