Remove ALL usage of CriticalSectionWrapper.

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h

Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
index 610d961e95e4e01fe438bb858ead0f51049e9693..0b78bfc33243bb542d30e6c1725fc759d6066a93 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
@@ -16,10 +16,10 @@
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/rate_statistics.h"
 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 
 namespace webrtc {
 
@@ -47,24 +47,24 @@ class RemoteBitrateEstimatorSingleStream : public RemoteBitrateEstimator {
 
   // Triggers a new estimate calculation.
   void UpdateEstimate(int64_t time_now)
-      EXCLUSIVE_LOCKS_REQUIRED(crit_sect_.get());
+      EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
 
   void GetSsrcs(std::vector<uint32_t>* ssrcs) const
-      SHARED_LOCKS_REQUIRED(crit_sect_.get());
+      SHARED_LOCKS_REQUIRED(crit_sect_);
 
   // Returns |remote_rate_| if the pointed to object exists,
   // otherwise creates it.
-  AimdRateControl* GetRemoteRate() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_.get());
+  AimdRateControl* GetRemoteRate() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
 
   const Clock* const clock_;
-  SsrcOveruseEstimatorMap overuse_detectors_ GUARDED_BY(crit_sect_.get());
-  RateStatistics incoming_bitrate_ GUARDED_BY(crit_sect_.get());
-  uint32_t last_valid_incoming_bitrate_ GUARDED_BY(crit_sect_.get());
-  std::unique_ptr<AimdRateControl> remote_rate_ GUARDED_BY(crit_sect_.get());
-  RemoteBitrateObserver* const observer_ GUARDED_BY(crit_sect_.get());
-  std::unique_ptr<CriticalSectionWrapper> crit_sect_;
+  SsrcOveruseEstimatorMap overuse_detectors_ GUARDED_BY(crit_sect_);
+  RateStatistics incoming_bitrate_ GUARDED_BY(crit_sect_);
+  uint32_t last_valid_incoming_bitrate_ GUARDED_BY(crit_sect_);
+  std::unique_ptr<AimdRateControl> remote_rate_ GUARDED_BY(crit_sect_);
+  RemoteBitrateObserver* const observer_ GUARDED_BY(crit_sect_);
+  rtc::CriticalSection crit_sect_;
   int64_t last_process_time_;
-  int64_t process_interval_ms_ GUARDED_BY(crit_sect_.get());
+  int64_t process_interval_ms_ GUARDED_BY(crit_sect_);
   bool uma_recorded_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RemoteBitrateEstimatorSingleStream);