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

webrtc/video/payload_router.h

Index: webrtc/video/payload_router.h
diff --git a/webrtc/video/payload_router.h b/webrtc/video/payload_router.h
index 881145976d13bd28639f1474c0e56613899bdb5c..7a95b1eca180feef0a69867f0b25521e700b2556 100644
--- a/webrtc/video/payload_router.h
+++ b/webrtc/video/payload_router.h
@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
@@ -22,7 +23,6 @@
 
 namespace webrtc {
 
-class CriticalSectionWrapper;
 class RTPFragmentationHeader;
 class RtpRtcp;
 struct RTPVideoHeader;
@@ -69,11 +69,11 @@ class PayloadRouter {
  private:
   // TODO(mflodman): When the new video API has launched, remove crit_ and

[tommi, 2016/01/21 11:46:20]

maybe we can do this now? (not this cl of course, but now that the video API has
launched?)

[mflodman, 2016/01/21 13:25:23]

We're working on moving around stuff, so it's in the pipe of things to do.

[tommi, 2016/01/21 16:00:50]

Acknowledged.

   // assume rtp_modules_ will never change during a call.
-  rtc::scoped_ptr<CriticalSectionWrapper> crit_;
+  mutable rtc::CriticalSection crit_;
 
   // Active sending RTP modules, in layer order.
-  std::vector<RtpRtcp*> rtp_modules_ GUARDED_BY(crit_.get());
-  bool active_ GUARDED_BY(crit_.get());
+  std::vector<RtpRtcp*> rtp_modules_ GUARDED_BY(crit_);
+  bool active_ GUARDED_BY(crit_);
 
   Atomic32 ref_count_;