Make media::VideoCaptureImpl::ClientBuffer RefCountedThreadSafe

BUG=298981 TEST=None TBR=glider Review URL: https://codereview.chromium.org/25130002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225893 0039d316-1c4b-4281-b951-d872f2087c98
hylschwy · Sep 29, 2013 · 159f1cf · 159f1cf
1 parent 5efd640
commit 159f1cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
@@ -13,7 +13,8 @@
 
 namespace content {
 
-class VideoCaptureImpl::ClientBuffer : public base::RefCounted<ClientBuffer> {
+class VideoCaptureImpl::ClientBuffer
+    : public base::RefCountedThreadSafe<ClientBuffer> {
  public:
   ClientBuffer(scoped_ptr<base::SharedMemory> buffer,
                size_t buffer_size,
@@ -32,7 +33,7 @@ class VideoCaptureImpl::ClientBuffer : public base::RefCounted<ClientBuffer> {
   const int frame_stride;  // In pixels.
 
  private:
-  friend class base::RefCounted<ClientBuffer>;
+  friend class base::RefCountedThreadSafe<ClientBuffer>;
 
   virtual ~ClientBuffer() {}
 

diff --git a/tools/valgrind/tsan_v2/suppressions.txt b/tools/valgrind/tsan_v2/suppressions.txt
@@ -137,6 +137,3 @@ race:PostponeInterruptsScope
 
 # http://crbug.com/296883
 race:net::URLFetcherCore::Stop
-
-# http://crbug.com/298981
-race:content::VideoCaptureImpl::DoBufferReceivedOnCaptureThread