Lock scheme #8: Introduced the new locking scheme

webrtc/modules/audio_processing/echo_control_mobile_impl.h

Index: webrtc/modules/audio_processing/echo_control_mobile_impl.h
diff --git a/webrtc/modules/audio_processing/echo_control_mobile_impl.h b/webrtc/modules/audio_processing/echo_control_mobile_impl.h
index fe8415ecc0a2cb59bb784c898d90d3f2bd3004ea..c53b6fd49625925314bc49cef6e19a0a792a8623 100644
--- a/webrtc/modules/audio_processing/echo_control_mobile_impl.h
+++ b/webrtc/modules/audio_processing/echo_control_mobile_impl.h
@@ -12,6 +12,7 @@
 #define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_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"
@@ -47,7 +48,8 @@ class EchoControlMobileImpl : public EchoControlMobile,
                               public ProcessingComponent {
  public:
   EchoControlMobileImpl(const AudioProcessing* apm,
-                        CriticalSectionWrapper* crit,
+                        rtc::CriticalSection* crit_render,
+                        rtc::CriticalSection* crit_capture,
                         rtc::ThreadChecker* render_thread,
                         rtc::ThreadChecker* capture_thread);
   virtual ~EchoControlMobileImpl();
@@ -91,7 +93,8 @@ class EchoControlMobileImpl : public EchoControlMobile,
   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_;
   RoutingMode routing_mode_;