From 63cb434691922ce44b988ad9f1d73bfecf31656e Mon Sep 17 00:00:00 2001
From: tommi <tommi@webrtc.org>
Date: Wed, 20 Jan 2016 02:32:54 -0800
Subject: [PATCH] Switch use of CriticalSectionWrapper -> rtc::CriticalSection
 in call/ This is a first cl of removing use of CriticalSectionWrapper after a
 series of cleanup CLs that have been landing recently (and still are
 landing).

BUG=

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

Cr-Commit-Position: refs/heads/master@{#11316}
---
 webrtc/call/bitrate_allocator.cc | 13 ++++++-------
 webrtc/call/bitrate_allocator.h  |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/webrtc/call/bitrate_allocator.cc b/webrtc/call/bitrate_allocator.cc
index b3789d3bb6..07f830610c 100644
--- a/webrtc/call/bitrate_allocator.cc
+++ b/webrtc/call/bitrate_allocator.cc
@@ -24,8 +24,7 @@ const int kTransmissionMaxBitrateMultiplier = 2;
 const int kDefaultBitrateBps = 300000;
 
 BitrateAllocator::BitrateAllocator()
-    : crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
-      bitrate_observers_(),
+    : bitrate_observers_(),
       bitrate_observers_modified_(false),
       enforce_min_bitrate_(true),
       last_bitrate_bps_(kDefaultBitrateBps),
@@ -35,7 +34,7 @@ BitrateAllocator::BitrateAllocator()
 uint32_t BitrateAllocator::OnNetworkChanged(uint32_t bitrate,
                                             uint8_t fraction_loss,
                                             int64_t rtt) {
-  CriticalSectionScoped lock(crit_sect_.get());
+  rtc::CritScope lock(&crit_sect_);
   last_bitrate_bps_ = bitrate;
   last_fraction_loss_ = fraction_loss;
   last_rtt_ = rtt;
@@ -64,7 +63,7 @@ BitrateAllocator::ObserverBitrateMap BitrateAllocator::AllocateBitrates() {
 int BitrateAllocator::AddBitrateObserver(BitrateObserver* observer,
                                          uint32_t min_bitrate_bps,
                                          uint32_t max_bitrate_bps) {
-  CriticalSectionScoped lock(crit_sect_.get());
+  rtc::CritScope lock(&crit_sect_);
 
   BitrateObserverConfList::iterator it =
       FindObserverConfigurationPair(observer);
@@ -96,7 +95,7 @@ int BitrateAllocator::AddBitrateObserver(BitrateObserver* observer,
 }
 
 void BitrateAllocator::RemoveBitrateObserver(BitrateObserver* observer) {
-  CriticalSectionScoped lock(crit_sect_.get());
+  rtc::CritScope lock(&crit_sect_);
   BitrateObserverConfList::iterator it =
       FindObserverConfigurationPair(observer);
   if (it != bitrate_observers_.end()) {
@@ -110,7 +109,7 @@ void BitrateAllocator::GetMinMaxBitrateSumBps(int* min_bitrate_sum_bps,
   *min_bitrate_sum_bps = 0;
   *max_bitrate_sum_bps = 0;
 
-  CriticalSectionScoped lock(crit_sect_.get());
+  rtc::CritScope lock(&crit_sect_);
   for (const auto& observer : bitrate_observers_) {
     *min_bitrate_sum_bps += observer.second.min_bitrate;
     *max_bitrate_sum_bps += observer.second.max_bitrate;
@@ -129,7 +128,7 @@ BitrateAllocator::FindObserverConfigurationPair(
 }
 
 void BitrateAllocator::EnforceMinBitrate(bool enforce_min_bitrate) {
-  CriticalSectionScoped lock(crit_sect_.get());
+  rtc::CritScope lock(&crit_sect_);
   enforce_min_bitrate_ = enforce_min_bitrate;
 }
 
diff --git a/webrtc/call/bitrate_allocator.h b/webrtc/call/bitrate_allocator.h
index 4a3fd59d49..88a9960f1f 100644
--- a/webrtc/call/bitrate_allocator.h
+++ b/webrtc/call/bitrate_allocator.h
@@ -19,9 +19,9 @@
 #include <map>
 #include <utility>
 
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_annotations.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 
 namespace webrtc {
 
@@ -89,7 +89,7 @@ class BitrateAllocator {
   ObserverBitrateMap LowRateAllocation(uint32_t bitrate)
       EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
 
-  rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
+  mutable rtc::CriticalSection crit_sect_;
   // Stored in a list to keep track of the insertion order.
   BitrateObserverConfList bitrate_observers_ GUARDED_BY(crit_sect_);
   bool bitrate_observers_modified_ GUARDED_BY(crit_sect_);