Remove more CriticalSectionWrappers.

webrtc/modules/audio_device/win/audio_device_core_win.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_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_
 
 #if (_MSC_VER >= 1400)  // only include for VS 2005 and higher
 
 #include "webrtc/modules/audio_device/audio_device_generic.h"
 
 #include <wmcodecdsp.h>      // CLSID_CWMAudioAEC
                              // (must be before audioclient.h)
 #include <Audioclient.h>     // WASAPI
 #include <Audiopolicy.h>
 #include <Mmdeviceapi.h>     // MMDevice
 #include <avrt.h>            // Avrt
 #include <endpointvolume.h>
 #include <mediaobj.h>        // IMediaObject
 
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 
 // Use Multimedia Class Scheduler Service (MMCSS) to boost the thread priority
 #pragma comment( lib, "avrt.lib" )
 // AVRT function pointers
 typedef BOOL (WINAPI *PAvRevertMmThreadCharacteristics)(HANDLE);
 typedef HANDLE (WINAPI *PAvSetMmThreadCharacteristicsA)(LPCSTR, LPDWORD);
 typedef BOOL (WINAPI *PAvSetMmThreadPriority)(HANDLE, AVRT_PRIORITY);
 
 namespace webrtc {
 
@@ skipping 191 matching lines @@
 
     static DWORD WINAPI GetCaptureVolumeThread(LPVOID context);
     DWORD DoGetCaptureVolumeThread();
 
     static DWORD WINAPI SetCaptureVolumeThread(LPVOID context);
     DWORD DoSetCaptureVolumeThread();
 
     void _Lock() { _critSect.Enter(); };
     void _UnLock() { _critSect.Leave(); };
 
-private:
     int32_t Id() {return _id;}
 
-private:
     int SetDMOProperties();
 
     int SetBoolProperty(IPropertyStore* ptrPS,
                         REFPROPERTYKEY key,
                         VARIANT_BOOL value);
 
     int SetVtI4Property(IPropertyStore* ptrPS,
                         REFPROPERTYKEY key,
                         LONG value);
 
@@ skipping 11 matching lines @@
     int32_t _GetDeviceID(IMMDevice* pDevice, LPWSTR pszBuffer, int bufferLen);
     int32_t _GetDefaultDevice(EDataFlow dir, ERole role, IMMDevice** ppDevice);
     int32_t _GetListDevice(EDataFlow dir, int index, IMMDevice** ppDevice);
 
     // Converts from wide-char to UTF-8 if UNICODE is defined.
     // Does nothing if UNICODE is undefined.
     char* WideToUTF8(const TCHAR* src) const;
 
     int32_t InitRecordingDMO();
 
-private:
     ScopedCOMInitializer                    _comInit;
     AudioDeviceBuffer*                      _ptrAudioBuffer;
-    CriticalSectionWrapper&                 _critSect;
-    CriticalSectionWrapper&                 _volumeMutex;
-    int32_t                           _id;
+    rtc::CriticalSection                    _critSect;
+    rtc::CriticalSection                    _volumeMutex;
+    int32_t                                 _id;
 
-private:  // MMDevice
     IMMDeviceEnumerator*                    _ptrEnumerator;
     IMMDeviceCollection*                    _ptrRenderCollection;
     IMMDeviceCollection*                    _ptrCaptureCollection;
     IMMDevice*                              _ptrDeviceOut;
     IMMDevice*                              _ptrDeviceIn;
 
-private:  // WASAPI
     IAudioClient*                           _ptrClientOut;
     IAudioClient*                           _ptrClientIn;
     IAudioRenderClient*                     _ptrRenderClient;
     IAudioCaptureClient*                    _ptrCaptureClient;
     IAudioEndpointVolume*                   _ptrCaptureVolume;
     ISimpleAudioVolume*                     _ptrRenderSimpleVolume;
 
     // DirectX Media Object (DMO) for the built-in AEC.
     rtc::scoped_refptr<IMediaObject> _dmo;
     rtc::scoped_refptr<IMediaBuffer> _mediaBuffer;
@@ skipping 69 matching lines @@
     uint16_t                          _newMicLevel;
 
     mutable char                            _str[512];
 };
 
 #endif    // #if (_MSC_VER >= 1400)
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_