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

webrtc/voice_engine/channel_manager.cc

 /*
  *  Copyright (c) 2011 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.
  */
 
@@ skipping 30 matching lines @@
 
   return *this;
 }
 
 ChannelOwner::ChannelRef::ChannelRef(class Channel* channel)
     : channel(channel), ref_count(1) {}
 
 ChannelManager::ChannelManager(uint32_t instance_id, const Config& config)
     : instance_id_(instance_id),
       last_channel_id_(-1),
-      lock_(CriticalSectionWrapper::CreateCriticalSection()),
       config_(config),
       event_log_(RtcEventLog::Create()) {}
 
 ChannelOwner ChannelManager::CreateChannel() {
   return CreateChannelInternal(config_);
 }
 
 ChannelOwner ChannelManager::CreateChannel(const Config& external_config) {
   return CreateChannelInternal(external_config);
 }
 
 ChannelOwner ChannelManager::CreateChannelInternal(const Config& config) {
   Channel* channel;
   Channel::CreateChannel(channel, ++last_channel_id_, instance_id_,
                          event_log_.get(), config);
   ChannelOwner channel_owner(channel);
 
-  CriticalSectionScoped crit(lock_.get());
+  rtc::CritScope crit(&lock_);
 
   channels_.push_back(channel_owner);
 
   return channel_owner;
 }
 
 ChannelOwner ChannelManager::GetChannel(int32_t channel_id) {
-  CriticalSectionScoped crit(lock_.get());
+  rtc::CritScope crit(&lock_);
 
   for (size_t i = 0; i < channels_.size(); ++i) {
     if (channels_[i].channel()->ChannelId() == channel_id)
       return channels_[i];
   }
   return ChannelOwner(NULL);
 }
 
 void ChannelManager::GetAllChannels(std::vector<ChannelOwner>* channels) {
-  CriticalSectionScoped crit(lock_.get());
+  rtc::CritScope crit(&lock_);
 
   *channels = channels_;
 }
 
 void ChannelManager::DestroyChannel(int32_t channel_id) {
   assert(channel_id >= 0);
   // Holds a reference to a channel, this is used so that we never delete
   // Channels while holding a lock, but rather when the method returns.
   ChannelOwner reference(NULL);
   {
-    CriticalSectionScoped crit(lock_.get());
+    rtc::CritScope crit(&lock_);
     std::vector<ChannelOwner>::iterator to_delete = channels_.end();
     for (auto it = channels_.begin(); it != channels_.end(); ++it) {
       Channel* channel = it->channel();
       // For channels associated with the channel to be deleted, disassociate
       // with that channel.
       channel->DisassociateSendChannel(channel_id);
 
       if (channel->ChannelId() == channel_id) {
         to_delete = it;
       }
     }
     if (to_delete != channels_.end()) {
       reference = *to_delete;
       channels_.erase(to_delete);
     }
   }
 }
 
 void ChannelManager::DestroyAllChannels() {
   // Holds references so that Channels are not destroyed while holding this
   // lock, but rather when the method returns.
   std::vector<ChannelOwner> references;
   {
-    CriticalSectionScoped crit(lock_.get());
+    rtc::CritScope crit(&lock_);
     references = channels_;
     channels_.clear();
   }
 }
 
 size_t ChannelManager::NumOfChannels() const {
-  CriticalSectionScoped crit(lock_.get());
+  rtc::CritScope crit(&lock_);
   return channels_.size();
 }
 
 RtcEventLog* ChannelManager::GetEventLog() const {
   return event_log_.get();
 }
 
 ChannelManager::Iterator::Iterator(ChannelManager* channel_manager)
     : iterator_pos_(0) {
   channel_manager->GetAllChannels(&channels_);
 }
 
 Channel* ChannelManager::Iterator::GetChannel() {
   if (iterator_pos_ < channels_.size())
     return channels_[iterator_pos_].channel();
   return NULL;
 }
 
 bool ChannelManager::Iterator::IsValid() {
   return iterator_pos_ < channels_.size();
 }
 
 void ChannelManager::Iterator::Increment() {
   ++iterator_pos_;
 }
 
 }  // namespace voe
 }  // namespace webrtc