Revert 244074 "Eliminate video capture thread in renderer"

trunk/src/content/renderer/pepper/pepper_platform_video_capture.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 "content/renderer/pepper/pepper_platform_video_capture.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
@@ skipping 10 matching lines @@
     const base::WeakPtr<RenderViewImpl>& render_view,
     const std::string& device_id,
     const GURL& document_url,
     PepperVideoCaptureHost* handler)
     : render_view_(render_view),
       device_id_(device_id),
       session_id_(0),
       handler_proxy_(new media::VideoCaptureHandlerProxy(
           this, base::MessageLoopProxy::current())),
       handler_(handler),
+      video_capture_(NULL),
       unbalanced_start_(false),
       pending_open_device_(false),
       pending_open_device_id_(-1) {
   // We need to open the device and obtain the label and session ID before
   // initializing.
   if (render_view_.get()) {
     pending_open_device_id_ = GetMediaDeviceManager()->OpenDevice(
         PP_DEVICETYPE_DEV_VIDEOCAPTURE,
         device_id,
         document_url,
@@ skipping 34 matching lines @@
 }
 
 int PepperPlatformVideoCapture::CaptureFrameRate() {
   return handler_proxy_->state().frame_rate;
 }
 
 void PepperPlatformVideoCapture::DetachEventHandler() {
   handler_ = NULL;
   StopCapture(NULL);
 
-  video_capture_.reset();
+  if (video_capture_) {
+    VideoCaptureImplManager* manager =
+        RenderThreadImpl::current()->video_capture_impl_manager();
+    manager->RemoveDevice(session_id_, handler_proxy_.get());
+    video_capture_ = NULL;
+  }
 
   if (render_view_.get()) {
     if (!label_.empty()) {
       GetMediaDeviceManager()->CloseDevice(label_);
       label_.clear();
     }
     if (pending_open_device_) {
       GetMediaDeviceManager()->CancelOpenDevice(pending_open_device_id_);
       pending_open_device_ = false;
       pending_open_device_id_ = -1;
@@ skipping 38 matching lines @@
 
 PepperPlatformVideoCapture::~PepperPlatformVideoCapture() {
   DCHECK(!video_capture_);
   DCHECK(label_.empty());
   DCHECK(!pending_open_device_);
 }
 
 void PepperPlatformVideoCapture::Initialize() {
   VideoCaptureImplManager* manager =
       RenderThreadImpl::current()->video_capture_impl_manager();
-  video_capture_ = manager->UseDevice(session_id_);
+  video_capture_ = manager->AddDevice(session_id_, handler_proxy_.get());
 }
 
 void PepperPlatformVideoCapture::OnDeviceOpened(int request_id,
                                                 bool succeeded,
                                                 const std::string& label) {
   pending_open_device_ = false;
   pending_open_device_id_ = -1;
 
   succeeded = succeeded && render_view_.get();
   if (succeeded) {
     label_ = label;
     session_id_ = GetMediaDeviceManager()->GetSessionID(
         PP_DEVICETYPE_DEV_VIDEOCAPTURE, label);
     Initialize();
   }
 
   if (handler_)
     handler_->OnInitialized(this, succeeded);
 }
 
 PepperMediaDeviceManager*
     PepperPlatformVideoCapture::GetMediaDeviceManager() {
   return PepperMediaDeviceManager::GetForRenderView(render_view_.get());
 }
 
 }  // namespace content