Swap use of CriticalSectionWrapper for rtc::CriticalSection in webrtc/video.

webrtc/video/vie_channel.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_VIDEO_VIE_CHANNEL_H_
 #define WEBRTC_VIDEO_VIE_CHANNEL_H_
 
 #include <list>
 #include <map>
 #include <vector>
 
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/platform_thread.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video/vie_receiver.h"
 #include "webrtc/video/vie_sync_module.h"
 
 namespace webrtc {
 
 class CallStatsObserver;
 class ChannelStatsObserver;
 class Config;
-class CriticalSectionWrapper;
 class EncodedImageCallback;
 class I420FrameCallback;
 class IncomingVideoStream;
 class PacedSender;
 class PacketRouter;
 class PayloadRouter;
 class ProcessThread;
 class ReceiveStatisticsProxy;
 class ReportBlockStats;
 class RtcpRttStats;
@@ skipping 268 matching lines @@
   void UpdateHistograms();
 
   // ViEChannel exposes methods that allow to modify observers and callbacks
   // to be modified. Such an API-style is cumbersome to implement and maintain
   // at all the levels when comparing to only setting them at construction. As
   // so this class instantiates its children with a wrapper that can be modified
   // at a later time.
   template <class T>
   class RegisterableCallback : public T {
    public:
-    RegisterableCallback()
-        : critsect_(CriticalSectionWrapper::CreateCriticalSection()),
-          callback_(NULL) {}
+    RegisterableCallback() : callback_(NULL) {}
 
     void Set(T* callback) {
-      CriticalSectionScoped cs(critsect_.get());
+      rtc::CritScope lock(&critsect_);
       callback_ = callback;
     }
 
    protected:
     // Note: this should be implemented with a RW-lock to allow simultaneous
     // calls into the callback. However that doesn't seem to be needed for the
     // current type of callbacks covered by this class.
-    rtc::scoped_ptr<CriticalSectionWrapper> critsect_;
+    mutable rtc::CriticalSection critsect_;
     T* callback_ GUARDED_BY(critsect_);
 
    private:
     RTC_DISALLOW_COPY_AND_ASSIGN(RegisterableCallback);
   };
 
   class RegisterableBitrateStatisticsObserver:
     public RegisterableCallback<BitrateStatisticsObserver> {
     virtual void Notify(const BitrateStatistics& total_stats,
                         const BitrateStatistics& retransmit_stats,
                         uint32_t ssrc) {
-      CriticalSectionScoped cs(critsect_.get());
+      rtc::CritScope lock(&critsect_);
       if (callback_)
         callback_->Notify(total_stats, retransmit_stats, ssrc);
     }
   } send_bitrate_observer_;
 
   class RegisterableFrameCountObserver
       : public RegisterableCallback<FrameCountObserver> {
    public:
     virtual void FrameCountUpdated(const FrameCounts& frame_counts,
                                    uint32_t ssrc) {
-      CriticalSectionScoped cs(critsect_.get());
+      rtc::CritScope lock(&critsect_);
       if (callback_)
         callback_->FrameCountUpdated(frame_counts, ssrc);
     }
 
    private:
   } send_frame_count_observer_;
 
   class RegisterableSendSideDelayObserver :
       public RegisterableCallback<SendSideDelayObserver> {
     void SendSideDelayUpdated(int avg_delay_ms,
                               int max_delay_ms,
                               uint32_t ssrc) override {
-      CriticalSectionScoped cs(critsect_.get());
+      rtc::CritScope lock(&critsect_);
       if (callback_)
         callback_->SendSideDelayUpdated(avg_delay_ms, max_delay_ms, ssrc);
     }
   } send_side_delay_observer_;
 
   class RegisterableRtcpPacketTypeCounterObserver
       : public RegisterableCallback<RtcpPacketTypeCounterObserver> {
    public:
     void RtcpPacketTypesCounterUpdated(
         uint32_t ssrc,
         const RtcpPacketTypeCounter& packet_counter) override {
-      CriticalSectionScoped cs(critsect_.get());
+      rtc::CritScope lock(&critsect_);
       if (callback_)
         callback_->RtcpPacketTypesCounterUpdated(ssrc, packet_counter);
       counter_map_[ssrc] = packet_counter;
     }
 
     virtual std::map<uint32_t, RtcpPacketTypeCounter> GetPacketTypeCounterMap()
         const {
-      CriticalSectionScoped cs(critsect_.get());
+      rtc::CritScope lock(&critsect_);
       return counter_map_;
     }
 
    private:
     std::map<uint32_t, RtcpPacketTypeCounter> counter_map_
         GUARDED_BY(critsect_);
   } rtcp_packet_type_counter_observer_;
 
   const uint32_t number_of_cores_;
   const bool sender_;
 
   ProcessThread* const module_process_thread_;
 
   // Used for all registered callbacks except rendering.
-  rtc::scoped_ptr<CriticalSectionWrapper> crit_;
+  mutable rtc::CriticalSection crit_;
 
   // Owned modules/classes.
   rtc::scoped_refptr<PayloadRouter> send_payload_router_;
   rtc::scoped_ptr<ViEChannelProtectionCallback> vcm_protection_callback_;
 
   VideoCodingModule* const vcm_;
   ViEReceiver vie_receiver_;
   ViESyncModule vie_sync_;
 
   // Helper to report call statistics.
@@ skipping 25 matching lines @@
   size_t num_rtts_ GUARDED_BY(crit_);
 
   // RtpRtcp modules, declared last as they use other members on construction.
   const std::vector<RtpRtcp*> rtp_rtcp_modules_;
   size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIE_CHANNEL_H_