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

webrtc/voice_engine/monitor_module.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #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"
 
 class MonitorObserver
 {
 public:
     virtual void OnPeriodicProcess() = 0;
 protected:
     virtual ~MonitorObserver() {}
 };
 
 
 namespace webrtc {
-class CriticalSectionWrapper;
-
 namespace voe {
 
 class MonitorModule : public Module
 {
 public:
     int32_t RegisterObserver(MonitorObserver& observer);
 
     int32_t DeRegisterObserver();
 
     MonitorModule();
 
     virtual ~MonitorModule();
 public: // module
  int64_t TimeUntilNextProcess() override;
 
  int32_t Process() override;
 
 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;
 };
 
 }  // namespace voe
 
 }  // namespace webrtc
 
 #endif // VOICE_ENGINE_MONITOR_MODULE