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

webrtc/voice_engine/monitor_module.cc

 /*
  *  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.
  */
 
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
 #include "webrtc/voice_engine/monitor_module.h"
 
 namespace webrtc  {
 
 namespace voe  {
 
 MonitorModule::MonitorModule() :
     _observerPtr(NULL),
-    _callbackCritSect(*CriticalSectionWrapper::CreateCriticalSection()),
     _lastProcessTime(TickTime::MillisecondTimestamp())
 {
 }
 
 MonitorModule::~MonitorModule()
 {
-    delete &_callbackCritSect;
 }
 
 int32_t
 MonitorModule::RegisterObserver(MonitorObserver& observer)
 {
-    CriticalSectionScoped lock(&_callbackCritSect);
+    rtc::CritScope lock(&_callbackCritSect);
     if (_observerPtr)
     {
         return -1;
     }
     _observerPtr = &observer;
     return 0;
 }
 
 int32_t
 MonitorModule::DeRegisterObserver()
 {
-    CriticalSectionScoped lock(&_callbackCritSect);
+    rtc::CritScope lock(&_callbackCritSect);
     if (!_observerPtr)
     {
         return 0;
     }
     _observerPtr = NULL;
     return 0;
 }
 
 int64_t
 MonitorModule::TimeUntilNextProcess()
 {
     int64_t now = TickTime::MillisecondTimestamp();
     const int64_t kAverageProcessUpdateTimeMs = 1000;
     return kAverageProcessUpdateTimeMs - (now - _lastProcessTime);
 }
 
 int32_t
 MonitorModule::Process()
 {
     _lastProcessTime = TickTime::MillisecondTimestamp();
     if (_observerPtr)
     {
-        CriticalSectionScoped lock(&_callbackCritSect);
+        rtc::CritScope lock(&_callbackCritSect);
         _observerPtr->OnPeriodicProcess();
     }
     return 0;
 }
 
 }  // namespace voe
 
 }  // namespace webrtc