Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/

webrtc/voice_engine/monitor_module.h

Index: webrtc/voice_engine/monitor_module.h
diff --git a/webrtc/voice_engine/monitor_module.h b/webrtc/voice_engine/monitor_module.h
index fe915b320b3df972a461918a25fdf7937371a70f..9c413105d8baf9df5b1807806212b2d4b24279ed 100644
--- a/webrtc/voice_engine/monitor_module.h
+++ b/webrtc/voice_engine/monitor_module.h
@@ -11,6 +11,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_MONITOR_MODULE_H
 #define WEBRTC_VOICE_ENGINE_MONITOR_MODULE_H
 
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/include/module.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/voice_engine/voice_engine_defines.h"
@@ -25,8 +26,6 @@ protected:
 
 
 namespace webrtc {
-class CriticalSectionWrapper;
-
 namespace voe {
 
 class MonitorModule : public Module
@@ -46,7 +45,7 @@ public:	// module
 
 private:
     MonitorObserver* _observerPtr;
-    CriticalSectionWrapper&	_callbackCritSect;
+    mutable rtc::CriticalSection _callbackCritSect;

[the sun, 2016/01/21 13:07:28]

nits: remove mutable, add GUARDED_BY to _observerPtr, and put lock first.

[tommi, 2016/01/21 15:29:23]

Done.

[tommi, 2016/01/21 15:37:15]

Oh and that nit uncovered a bug in the code! Nice.

[the sun, 2016/01/21 19:28:45]

How about that! :)

     int64_t _lastProcessTime;
 };