Swap use of CriticalSectionWrapper for rtc::CriticalSection in webrtc/video.

webrtc/video/encoder_state_feedback.h

Index: webrtc/video/encoder_state_feedback.h
diff --git a/webrtc/video/encoder_state_feedback.h b/webrtc/video/encoder_state_feedback.h
index 620e382d89060769c277075cc2b9665121074b6c..0e2f95b0b423425c11de132ebc4b8d47154f51f9 100644
--- a/webrtc/video/encoder_state_feedback.h
+++ b/webrtc/video/encoder_state_feedback.h
@@ -18,12 +18,12 @@
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
-class CriticalSectionWrapper;
 class EncoderStateFeedbackObserver;
 class RtcpIntraFrameObserver;
 class ViEEncoder;
@@ -55,7 +55,7 @@ class EncoderStateFeedback {
  private:
   typedef std::map<uint32_t,  ViEEncoder*> SsrcEncoderMap;
 
-  rtc::scoped_ptr<CriticalSectionWrapper> crit_;
+  mutable rtc::CriticalSection crit_;
 
   // Instance registered at the class requesting new key frames.
   rtc::scoped_ptr<EncoderStateFeedbackObserver> observer_;