Lock scheme #8: Introduced the new locking scheme

webrtc/modules/audio_processing/echo_cancellation_impl.h

Index: webrtc/modules/audio_processing/echo_cancellation_impl.h
diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.h b/webrtc/modules/audio_processing/echo_cancellation_impl.h
index 12fbd4b3b2f78a3c0b71ac47374bea99b5578144..735cd66193e7c975c0426a37ad813ed42e0fe667 100644
--- a/webrtc/modules/audio_processing/echo_cancellation_impl.h
+++ b/webrtc/modules/audio_processing/echo_cancellation_impl.h
@@ -12,6 +12,7 @@
 #define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_
 
 #include "webrtc/base/scoped_ptr.h"
+#include "webrtc/base/thread_annotations.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/common_audio/swap_queue.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
@@ -41,13 +42,13 @@ class AecRenderQueueItemVerifier {
 }  // namespace anonymous
 
 class AudioBuffer;
-class CriticalSectionWrapper;
 
 class EchoCancellationImpl : public EchoCancellation,
                              public ProcessingComponent {
  public:
   EchoCancellationImpl(const AudioProcessing* apm,
-                       CriticalSectionWrapper* crit,
+                       rtc::CriticalSection* crit_render,
+                       rtc::CriticalSection* crit_capture,
                        rtc::ThreadChecker* render_thread,
                        rtc::ThreadChecker* capture_thread);
   virtual ~EchoCancellationImpl();
@@ -106,7 +107,8 @@ class EchoCancellationImpl : public EchoCancellation,
   void AllocateRenderQueue();
 
   const AudioProcessing* apm_;
-  CriticalSectionWrapper* crit_;
+  rtc::CriticalSection* const crit_render_;
+  rtc::CriticalSection* const crit_capture_;
   const rtc::ThreadChecker* const render_thread_;
   const rtc::ThreadChecker* const capture_thread_;