commit f2f828374c3ee1e1834c72bb27eaae88ef67bb40
author Peter Boström <pbos@webrtc.org> Fri May 01 11:00:41 2015
committer Peter Boström <pbos@webrtc.org> Fri May 01 14:25:53 2015
tree f15a6a63f82c6577e3910fea18668292d75be847
parent cac1b381359652fe623a1bdd320f0877b7b7a300

Use rtc::CriticalSection in webrtc/video/.

Removes heap allocation from CriticalSection creation.

BUG=
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/50839004

Cr-Commit-Position: refs/heads/master@{#9126}

webrtc/test/frame_generator_capturer.h

diff --git a/webrtc/test/frame_generator_capturer.h b/webrtc/test/frame_generator_capturer.h
index 7f79c9f..a1ca336 100644
--- a/webrtc/test/frame_generator_capturer.h
+++ b/webrtc/test/frame_generator_capturer.h
@@ -12,6 +12,7 @@
 
 #include <string>
 
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/test/video_capturer.h"
 #include "webrtc/typedefs.h"
@@ -61,7 +62,7 @@
   bool sending_;
 
   rtc::scoped_ptr<EventTimerWrapper> tick_;
-  rtc::scoped_ptr<CriticalSectionWrapper> lock_;
+  rtc::CriticalSection lock_;
   rtc::scoped_ptr<ThreadWrapper> thread_;
   rtc::scoped_ptr<FrameGenerator> frame_generator_;