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

webrtc/voice_engine/voe_dtmf_impl.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/voice_engine/voe_dtmf_impl.h"
 
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/voice_engine/channel.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
 #include "webrtc/voice_engine/output_mixer.h"
 #include "webrtc/voice_engine/transmit_mixer.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc {
 
 VoEDtmf* VoEDtmf::GetInterface(VoiceEngine* voiceEngine) {
@@ skipping 166 matching lines @@
   }
   return _shared->output_mixer()->PlayDtmfTone(eventCode, lengthMs,
                                                attenuationDb);
 }
 
 int VoEDtmfImpl::SetDtmfFeedbackStatus(bool enable, bool directFeedback) {
   WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "SetDtmfFeedbackStatus(enable=%d, directFeeback=%d)",
                (int)enable, (int)directFeedback);
 
-  CriticalSectionScoped sc(_shared->crit_sec());
+  rtc::CritScope cs(_shared->crit_sec());

[the sun, 2016/01/21 13:07:28]

nit: transitive dependency? Include-what-you-use? A few more similar in the
other VoE interfaces.

[tommi, 2016/01/21 15:29:23]

Done.

 
   _dtmfFeedback = enable;
   _dtmfDirectFeedback = directFeedback;
 
   return 0;
 }
 
 int VoEDtmfImpl::GetDtmfFeedbackStatus(bool& enabled, bool& directFeedback) {
-  CriticalSectionScoped sc(_shared->crit_sec());
+  rtc::CritScope cs(_shared->crit_sec());
 
   enabled = _dtmfFeedback;
   directFeedback = _dtmfDirectFeedback;
   return 0;
 }
 #endif  // #ifdef WEBRTC_VOICE_ENGINE_DTMF_API
 
 }  // namespace webrtc