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

webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.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 "webrtc/base/criticalsection.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 #include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
 
 class TestRtpObserver : public webrtc::VoERTPObserver {
  public:
-  TestRtpObserver()
-      : crit_(voetest::CriticalSectionWrapper::CreateCriticalSection()),
-        changed_ssrc_event_(voetest::EventWrapper::Create()) {}
+  TestRtpObserver() : changed_ssrc_event_(voetest::EventWrapper::Create()) {}
   virtual ~TestRtpObserver() {}
   virtual void OnIncomingCSRCChanged(int channel,
                                      unsigned int CSRC,
                                      bool added) {}
   virtual void OnIncomingSSRCChanged(int channel,
                                      unsigned int SSRC);
   void WaitForChangedSsrc() {
     // 10 seconds should be enough.
     EXPECT_EQ(voetest::kEventSignaled, changed_ssrc_event_->Wait(10*1000));
   }
   void SetIncomingSsrc(unsigned int ssrc) {
-    voetest::CriticalSectionScoped lock(crit_.get());
+    rtc::CritScope lock(&crit_);
     incoming_ssrc_ = ssrc;
   }
  public:
-  rtc::scoped_ptr<voetest::CriticalSectionWrapper> crit_;
+  rtc::CriticalSection crit_;
   unsigned int incoming_ssrc_;
   rtc::scoped_ptr<voetest::EventWrapper> changed_ssrc_event_;
 };
 
 void TestRtpObserver::OnIncomingSSRCChanged(int channel,
                                             unsigned int SSRC) {
   char msg[128];
   sprintf(msg, "\n=> OnIncomingSSRCChanged(channel=%d, SSRC=%u)\n", channel,
           SSRC);
   TEST_LOG("%s", msg);
 
   {
-    voetest::CriticalSectionScoped lock(crit_.get());
+    rtc::CritScope lock(&crit_);
     if (incoming_ssrc_ == SSRC)
       changed_ssrc_event_->Set();
   }
 }
 
 static const char* const RTCP_CNAME = "Whatever";
 
 class RtpRtcpTest : public AfterStreamingFixture {
  protected:
   void SetUp() {
@@ skipping 47 matching lines @@
 
   Sleep(1000);
 
   unsigned int ssrc;
   EXPECT_EQ(0, voe_rtp_rtcp_->GetLocalSSRC(channel_, ssrc));
   EXPECT_EQ(local_ssrc, ssrc);
 
   EXPECT_EQ(0, voe_rtp_rtcp_->GetRemoteSSRC(channel_, ssrc));
   EXPECT_EQ(local_ssrc, ssrc);
 }