Switch CriticalSectionWrapper->rtc::CriticalSection in modules/audio_coding.

webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h

Index: webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h
diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h b/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h
index 926671f199a9e5d35e8c5986c22ebaae98a0332e..19776d1013f641ea05013d0d26cc2ddf3e810519 100644
--- a/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h
+++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h
@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "webrtc/base/buffer.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
@@ -25,7 +26,6 @@
 
 namespace webrtc {
 
-class CriticalSectionWrapper;
 class AudioCodingImpl;
 
 namespace acm2 {
@@ -240,7 +240,7 @@ class AudioCodingModuleImpl final : public AudioCodingModule {
   // to |index|.
   int UpdateUponReceivingCodec(int index);
 
-  const rtc::scoped_ptr<CriticalSectionWrapper> acm_crit_sect_;
+  mutable rtc::CriticalSection acm_crit_sect_;
   rtc::Buffer encode_buffer_ GUARDED_BY(acm_crit_sect_);
   int id_;  // TODO(henrik.lundin) Make const.
   uint32_t expected_codec_ts_ GUARDED_BY(acm_crit_sect_);
@@ -271,7 +271,7 @@ class AudioCodingModuleImpl final : public AudioCodingModule {
   uint32_t last_timestamp_ GUARDED_BY(acm_crit_sect_);
   uint32_t last_rtp_timestamp_ GUARDED_BY(acm_crit_sect_);
 
-  const rtc::scoped_ptr<CriticalSectionWrapper> callback_crit_sect_;
+  mutable rtc::CriticalSection callback_crit_sect_;
   AudioPacketizationCallback* packetization_callback_
       GUARDED_BY(callback_crit_sect_);
   ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_);