Changed thread_checker on VideoCaptureImpl and VideoCaptureImplManager.

content/renderer/media/video_capture_impl_manager.cc

Index: content/renderer/media/video_capture_impl_manager.cc
diff --git a/content/renderer/media/video_capture_impl_manager.cc b/content/renderer/media/video_capture_impl_manager.cc
index 686e6ad74c1a0746d5aed659680b0a3ac1de4c46..2b3de27c57f6adb31be2742a40a30e88dc109ab5 100644
--- a/content/renderer/media/video_capture_impl_manager.cc
+++ b/content/renderer/media/video_capture_impl_manager.cc
@@ -36,11 +36,12 @@ namespace content {
 VideoCaptureImplManager::VideoCaptureImplManager()
     : next_client_id_(0),
       filter_(new VideoCaptureMessageFilter()),
+      io_message_loop_(base::MessageLoopProxy::current()),
       weak_factory_(this) {
 }
 
 VideoCaptureImplManager::~VideoCaptureImplManager() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(io_message_loop_->BelongsToCurrentThread());
   if (devices_.empty())
     return;
   // Forcibly release all video capture resources.
@@ -61,7 +62,7 @@ VideoCaptureImplManager::~VideoCaptureImplManager() {
 
 base::Closure VideoCaptureImplManager::UseDevice(
     media::VideoCaptureSessionId id) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(io_message_loop_->BelongsToCurrentThread());
 
   VideoCaptureImpl* impl = NULL;
   VideoCaptureDeviceMap::iterator it = devices_.find(id);
@@ -86,7 +87,7 @@ base::Closure VideoCaptureImplManager::StartCapture(
     const media::VideoCaptureParams& params,
     const VideoCaptureStateUpdateCB& state_update_cb,
     const VideoCaptureDeliverFrameCB& deliver_frame_cb) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(io_message_loop_->BelongsToCurrentThread());
   VideoCaptureDeviceMap::iterator it = devices_.find(id);
   DCHECK(it != devices_.end());
   VideoCaptureImpl* impl = it->second.second;
@@ -110,7 +111,7 @@ base::Closure VideoCaptureImplManager::StartCapture(
 void VideoCaptureImplManager::GetDeviceSupportedFormats(
     media::VideoCaptureSessionId id,
     const VideoCaptureDeviceFormatsCB& callback) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(io_message_loop_->BelongsToCurrentThread());
   VideoCaptureDeviceMap::iterator it = devices_.find(id);
   DCHECK(it != devices_.end());
   VideoCaptureImpl* impl = it->second.second;
@@ -123,7 +124,7 @@ void VideoCaptureImplManager::GetDeviceSupportedFormats(
 void VideoCaptureImplManager::GetDeviceFormatsInUse(
     media::VideoCaptureSessionId id,
     const VideoCaptureDeviceFormatsCB& callback) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(io_message_loop_->BelongsToCurrentThread());
   VideoCaptureDeviceMap::iterator it = devices_.find(id);
   DCHECK(it != devices_.end());
   VideoCaptureImpl* impl = it->second.second;
@@ -142,7 +143,7 @@ VideoCaptureImplManager::CreateVideoCaptureImplForTesting(
 
 void VideoCaptureImplManager::StopCapture(
     int client_id, media::VideoCaptureSessionId id) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(io_message_loop_->BelongsToCurrentThread());
   VideoCaptureDeviceMap::iterator it = devices_.find(id);
   DCHECK(it != devices_.end());
   VideoCaptureImpl* impl = it->second.second;
@@ -154,7 +155,7 @@ void VideoCaptureImplManager::StopCapture(
 
 void VideoCaptureImplManager::UnrefDevice(
     media::VideoCaptureSessionId id) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(io_message_loop_->BelongsToCurrentThread());
   VideoCaptureDeviceMap::iterator it = devices_.find(id);
   DCHECK(it != devices_.end());
   VideoCaptureImpl* impl = it->second.second;
@@ -176,7 +177,7 @@ void VideoCaptureImplManager::UnrefDevice(
 }
 
 void VideoCaptureImplManager::SuspendDevices(bool suspend) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(io_message_loop_->BelongsToCurrentThread());
   for (VideoCaptureDeviceMap::iterator it = devices_.begin();
        it != devices_.end(); ++it) {
     VideoCaptureImpl* impl = it->second.second;