Fix a couple of data races found by TSAN Race Verifier in VideoCaptureController.

content/browser/renderer_host/media/video_capture_controller.cc

 // 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.
 
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 
 #include "base/stl_util.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
@@ skipping 41 matching lines @@
                                   stopped_task));
 }
 
 void VideoCaptureController::ReturnBuffer(int buffer_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   bool ready_to_delete;
   {
     base::AutoLock lock(lock_);
     free_dibs_.push_back(buffer_id);
-    ready_to_delete = (free_dibs_.size() == owned_dibs_.size());
+    ready_to_delete = (free_dibs_.size() == owned_dibs_.size()) &&
+        report_ready_to_delete_;
   }
-  if (report_ready_to_delete_ && ready_to_delete) {
+  if (ready_to_delete) {
     event_handler_->OnReadyToDelete(id_);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Implements VideoCaptureDevice::EventHandler.
 // OnIncomingCapturedFrame is called the thread running the capture device.
 // I.e.- DirectShow thread on windows and v4l2_thread on Linux.
 void VideoCaptureController::OnIncomingCapturedFrame(const uint8* data,
                                                      int length,
@@ skipping 116 matching lines @@
   event_handler_->OnFrameInfo(id_, info.width, info.height, info.frame_rate);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Called by VideoCaptureManager when a device have been stopped.
 // This will report to the event handler that this object is ready to be deleted
 // if all DIBS have been returned.
 void VideoCaptureController::OnDeviceStopped(Task* stopped_task) {
   bool ready_to_delete_now;
 
-  // Set flag to indicate we need to report when all DIBs have been returned.
-  report_ready_to_delete_ = true;
   {
     base::AutoLock lock(lock_);
+    // Set flag to indicate we need to report when all DIBs have been returned.
+    report_ready_to_delete_ = true;
     ready_to_delete_now = (free_dibs_.size() == owned_dibs_.size());
   }
 
   if (ready_to_delete_now) {
     event_handler_->OnReadyToDelete(id_);
   }
   if (stopped_task) {
     stopped_task->Run();
     delete stopped_task;
   }
 }