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

webrtc/voice_engine/output_mixer.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_OUTPUT_MIXER_H_
 #define WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_
 
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h"
 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h"
 #include "webrtc/modules/utility/include/file_recorder.h"
 #include "webrtc/voice_engine/dtmf_inband.h"
 #include "webrtc/voice_engine/level_indicator.h"
 #include "webrtc/voice_engine/voice_engine_defines.h"
 
 namespace webrtc {
 
 class AudioProcessing;
-class CriticalSectionWrapper;
 class FileWrapper;
 class VoEMediaProcess;
 
 namespace voe {
 
 class Statistics;
 
 class OutputMixer : public AudioMixerOutputReceiver,
                     public FileCallback
 {
@@ skipping 64 matching lines @@
     void RecordFileEnded(int32_t id);
 
 private:
     OutputMixer(uint32_t instanceId);
     int InsertInbandDtmfTone();
 
     // uses
     Statistics* _engineStatisticsPtr;
     AudioProcessing* _audioProcessingModulePtr;
 
-    // owns
-    CriticalSectionWrapper& _callbackCritSect;
+    rtc::CriticalSection _callbackCritSect;
     // protect the _outputFileRecorderPtr and _outputFileRecording
-    CriticalSectionWrapper& _fileCritSect;
+    rtc::CriticalSection _fileCritSect;
     AudioConferenceMixer& _mixerModule;
     AudioFrame _audioFrame;
     // Converts mixed audio to the audio device output rate.
     PushResampler<int16_t> resampler_;
     // Converts mixed audio to the audio processing rate.
     PushResampler<int16_t> audioproc_resampler_;
     AudioLevel _audioLevel;    // measures audio level for the combined signal
     DtmfInband _dtmfGenerator;
     int _instanceId;
     VoEMediaProcess* _externalMediaCallbackPtr;
     bool _externalMedia;
     float _panLeft;
     float _panRight;
     int _mixingFrequencyHz;
     FileRecorder* _outputFileRecorderPtr;
     bool _outputFileRecording;
 };
 
 }  // namespace voe
 
 }  // namespace werbtc
 
 #endif  // VOICE_ENGINE_OUTPUT_MIXER_H_