Lock scheme #8: Introduced the new locking scheme

webrtc/modules/audio_processing/noise_suppression_impl.h

Index: webrtc/modules/audio_processing/noise_suppression_impl.h
diff --git a/webrtc/modules/audio_processing/noise_suppression_impl.h b/webrtc/modules/audio_processing/noise_suppression_impl.h
index 9da7c4200f9b6a5f95aad3b9d20ec5f93e8683f9..efae1b8b4efc14294d9a452ace1e5651dd08e946 100644
--- a/webrtc/modules/audio_processing/noise_suppression_impl.h
+++ b/webrtc/modules/audio_processing/noise_suppression_impl.h
@@ -11,6 +11,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_
 #define WEBRTC_MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_
 
+#include "webrtc/base/criticalsection.h"

[hlundin-webrtc, 2015/11/05 16:11:23]

You include this here, but not in all other submodules' .h files. In other
cases, you include it in the .cc file instead.

[peah-webrtc, 2015/11/06 09:54:33]

Good find! A thing that further messed things up is that thread_checker.h
includes criticalsection.h which makes my includes quite inconsistent.

Will fix.

Done.

 #include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/audio_processing/processing_component.h"
@@ -23,8 +24,7 @@ class CriticalSectionWrapper;
 class NoiseSuppressionImpl : public NoiseSuppression,
                              public ProcessingComponent {
  public:
-  NoiseSuppressionImpl(const AudioProcessing* apm,
-                       CriticalSectionWrapper* crit);
+  NoiseSuppressionImpl(const AudioProcessing* apm, rtc::CriticalSection* crit);
   virtual ~NoiseSuppressionImpl();
 
   int AnalyzeCaptureAudio(AudioBuffer* audio);
@@ -49,7 +49,7 @@ class NoiseSuppressionImpl : public NoiseSuppression,
   int GetHandleError(void* handle) const override;
 
   const AudioProcessing* apm_;
-  CriticalSectionWrapper* crit_;
+  rtc::CriticalSection* const crit_;
   Level level_;
 };