commit 31fc21f4545fe7ccb32eb83e5de51a07988a408e
author tommi <tommi@webrtc.org> Thu Jan 21 10:37:37 2016 -0800
committer Commit bot <commit-bot@chromium.org> Thu Jan 21 18:37:44 2016 +0000
tree 6456e36696f7077df00abf181e00502013148211
parent 8947a01e050dbca308c266bafc361bd96ea9dc32

Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/
Also remove mischievous tab character!
This is a part of getting rid of CriticalSectionWrapper and makes the code slightly simpler.

BUG=

Review URL: https://codereview.webrtc.org/1607353002

Cr-Commit-Position: refs/heads/master@{#11346}

webrtc/voice_engine/channel_manager.h

diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h
index 4c0cede..a46d71d 100644
--- a/webrtc/voice_engine/channel_manager.h
+++ b/webrtc/voice_engine/channel_manager.h
@@ -14,10 +14,10 @@
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/call/rtc_event_log.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -123,7 +123,7 @@
 
   Atomic32 last_channel_id_;
 
-  rtc::scoped_ptr<CriticalSectionWrapper> lock_;
+  mutable rtc::CriticalSection lock_;
   std::vector<ChannelOwner> channels_;
 
   const Config& config_;