Remove more CriticalSectionWrappers.

webrtc/modules/audio_device/audio_device_impl.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_IMPL_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H
 
 #if defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE)
 
 #include <memory>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/audio_device/audio_device_buffer.h"
 #include "webrtc/modules/audio_device/include/audio_device.h"
 
 namespace webrtc {
 
 class AudioDeviceGeneric;
 class AudioManager;
-class CriticalSectionWrapper;
 
 class AudioDeviceModuleImpl : public AudioDeviceModule {
  public:
   enum PlatformType {
     kPlatformNotSupported = 0,
     kPlatformWin32 = 1,
     kPlatformWinCe = 2,
     kPlatformLinux = 3,
     kPlatformMac = 4,
     kPlatformAndroid = 5,
@@ skipping 159 matching lines @@
   AudioManager* GetAndroidAudioManagerForTest() {
     return _audioManagerAndroid.get();
   }
 #endif
   AudioDeviceBuffer* GetAudioDeviceBuffer() { return &_audioDeviceBuffer; }
 
  private:
   PlatformType Platform() const;
   AudioLayer PlatformAudioLayer() const;
 
-  CriticalSectionWrapper& _critSect;
-  CriticalSectionWrapper& _critSectEventCb;
-  CriticalSectionWrapper& _critSectAudioCb;
+  rtc::CriticalSection _critSect;
+  rtc::CriticalSection _critSectEventCb;
+  rtc::CriticalSection _critSectAudioCb;
 
   AudioDeviceObserver* _ptrCbAudioDeviceObserver;
 
   AudioDeviceGeneric* _ptrAudioDevice;
 
   AudioDeviceBuffer _audioDeviceBuffer;
 #if defined(WEBRTC_ANDROID)
   std::unique_ptr<AudioManager> _audioManagerAndroid;
 #endif
   int32_t _id;
   AudioLayer _platformAudioLayer;
   int64_t _lastProcessTime;
   PlatformType _platformType;
   bool _initialized;
   mutable ErrorCode _lastError;
 };
 
 }  // namespace webrtc
 
 #endif  // defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE)
 
 #endif  // WEBRTC_MODULES_INTERFACE_AUDIO_DEVICE_IMPL_H_