| Index: webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
|
| diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
|
| index ac54bee64936c1439b2d234a9f9882025aadec3c..b736aac420d5add4f3931d76a77537eb78cc3ba9 100644
|
| --- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
|
| +++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
|
| @@ -19,7 +19,7 @@
|
|
|
| class TestRtpObserver : public webrtc::VoERTPObserver {
|
| public:
|
| - TestRtpObserver() : changed_ssrc_event_(voetest::EventWrapper::Create()) {}
|
| + TestRtpObserver() : changed_ssrc_event_(webrtc::EventWrapper::Create()) {}
|
| virtual ~TestRtpObserver() {}
|
| virtual void OnIncomingCSRCChanged(int channel,
|
| unsigned int CSRC,
|
| @@ -28,7 +28,7 @@ class TestRtpObserver : public webrtc::VoERTPObserver {
|
| unsigned int SSRC);
|
| void WaitForChangedSsrc() {
|
| // 10 seconds should be enough.
|
| - EXPECT_EQ(voetest::kEventSignaled, changed_ssrc_event_->Wait(10*1000));
|
| + EXPECT_EQ(webrtc::kEventSignaled, changed_ssrc_event_->Wait(10*1000));
|
| }
|
| void SetIncomingSsrc(unsigned int ssrc) {
|
| rtc::CritScope lock(&crit_);
|
| @@ -37,7 +37,7 @@ class TestRtpObserver : public webrtc::VoERTPObserver {
|
| public:
|
| rtc::CriticalSection crit_;
|
| unsigned int incoming_ssrc_;
|
| - std::unique_ptr<voetest::EventWrapper> changed_ssrc_event_;
|
| + std::unique_ptr<webrtc::EventWrapper> changed_ssrc_event_;
|
| };
|
|
|
| void TestRtpObserver::OnIncomingSSRCChanged(int channel,
|
|
|