Remove ALL usage of CriticalSectionWrapper.

webrtc/modules/video_capture/test/video_capture_unittest.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 <stdio.h>
 
 #include <map>
 #include <memory>
 #include <sstream>
 
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/api/video/video_frame.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/modules/video_capture/video_capture.h"
 #include "webrtc/modules/video_capture/video_capture_factory.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/test/frame_utils.h"
 #include "webrtc/test/gtest.h"
 
-using webrtc::CriticalSectionWrapper;
-using webrtc::CriticalSectionScoped;
 using webrtc::SleepMs;
 using webrtc::VideoCaptureCapability;
 using webrtc::VideoCaptureFactory;
 using webrtc::VideoCaptureModule;
 
 
 #define WAIT_(ex, timeout, res) \
   do { \
     res = (ex); \
     int64_t start = rtc::TimeMillis(); \
@@ skipping 12 matching lines @@
 
 
 static const int kTimeOut = 5000;
 static const int kTestHeight = 288;
 static const int kTestWidth = 352;
 static const int kTestFramerate = 30;
 
 class TestVideoCaptureCallback
     : public rtc::VideoSinkInterface<webrtc::VideoFrame> {
  public:
-  TestVideoCaptureCallback()
-      : capture_cs_(CriticalSectionWrapper::CreateCriticalSection()),
+  TestVideoCaptureCallback() :
         last_render_time_ms_(0),
         incoming_frames_(0),
         timing_warnings_(0),
         rotate_frame_(webrtc::kVideoRotation_0) {}
 
   ~TestVideoCaptureCallback() {
     if (timing_warnings_ > 0)
       printf("No of timing warnings %d\n", timing_warnings_);
   }
 
   void OnFrame(const webrtc::VideoFrame& videoFrame) override {
-    CriticalSectionScoped cs(capture_cs_.get());
+    rtc::CritScope cs(&capture_cs_);
     int height = videoFrame.height();
     int width = videoFrame.width();
 #if defined(ANDROID) && ANDROID
     // Android camera frames may be rotated depending on test device
     // orientation.
     EXPECT_TRUE(height == capability_.height || height == capability_.width);
     EXPECT_TRUE(width == capability_.width || width == capability_.height);
 #else
     EXPECT_EQ(height, capability_.height);
     EXPECT_EQ(width, capability_.width);
@@ skipping 12 matching lines @@
             last_render_time_ms_ > 0)) {
       timing_warnings_++;
     }
 
     incoming_frames_++;
     last_render_time_ms_ = videoFrame.render_time_ms();
     last_frame_ = videoFrame.video_frame_buffer();
   }
 
   void SetExpectedCapability(VideoCaptureCapability capability) {
-    CriticalSectionScoped cs(capture_cs_.get());
+    rtc::CritScope cs(&capture_cs_);
     capability_= capability;
     incoming_frames_ = 0;
     last_render_time_ms_ = 0;
   }
   int incoming_frames() {
-    CriticalSectionScoped cs(capture_cs_.get());
+    rtc::CritScope cs(&capture_cs_);
     return incoming_frames_;
   }
 
   int timing_warnings() {
-    CriticalSectionScoped cs(capture_cs_.get());
+    rtc::CritScope cs(&capture_cs_);
     return timing_warnings_;
   }
   VideoCaptureCapability capability() {
-    CriticalSectionScoped cs(capture_cs_.get());
+    rtc::CritScope cs(&capture_cs_);
     return capability_;
   }
 
   bool CompareLastFrame(const webrtc::VideoFrame& frame) {
-    CriticalSectionScoped cs(capture_cs_.get());
+    rtc::CritScope cs(&capture_cs_);
     return webrtc::test::FrameBufsEqual(last_frame_,
                                         frame.video_frame_buffer());
   }
 
   void SetExpectedCaptureRotation(webrtc::VideoRotation rotation) {
-    CriticalSectionScoped cs(capture_cs_.get());
+    rtc::CritScope cs(&capture_cs_);
     rotate_frame_ = rotation;
   }
 
  private:
-  std::unique_ptr<CriticalSectionWrapper> capture_cs_;
+  rtc::CriticalSection capture_cs_;
   VideoCaptureCapability capability_;
   int64_t last_render_time_ms_;
   int incoming_frames_;
   int timing_warnings_;
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> last_frame_;
   webrtc::VideoRotation rotate_frame_;
 };
 
 class VideoCaptureTest : public testing::Test {
  public:
@@ skipping 266 matching lines @@
     length, capture_callback_.capability(), 0));
   EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_180));
   capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_180);
   EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
     length, capture_callback_.capability(), 0));
   EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_270));
   capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_270);
   EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
     length, capture_callback_.capability(), 0));
 }