Index: webrtc/call/bitrate_estimator_tests.cc |
diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc |
index f3bef73b6eb34f5138f045c123141cdb030beb01..c63d45dc6e695c26c801b206399c95584f95ed2a 100644 |
--- a/webrtc/call/bitrate_estimator_tests.cc |
+++ b/webrtc/call/bitrate_estimator_tests.cc |
@@ -9,6 +9,7 @@ |
*/ |
#include <functional> |
#include <list> |
+#include <memory> |
#include <string> |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -17,7 +18,6 @@ |
#include "webrtc/base/checks.h" |
#include "webrtc/base/event.h" |
#include "webrtc/base/logging.h" |
-#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/base/thread_annotations.h" |
#include "webrtc/call.h" |
#include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
@@ -243,17 +243,17 @@ class BitrateEstimatorTest : public test::CallTest { |
VideoSendStream* send_stream_; |
AudioReceiveStream* audio_receive_stream_; |
VideoReceiveStream* video_receive_stream_; |
- rtc::scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer_; |
+ std::unique_ptr<test::FrameGeneratorCapturer> frame_generator_capturer_; |
test::FakeEncoder fake_encoder_; |
test::FakeDecoder fake_decoder_; |
}; |
testing::NiceMock<test::MockVoiceEngine> mock_voice_engine_; |
LogObserver receiver_log_; |
- rtc::scoped_ptr<test::DirectTransport> send_transport_; |
- rtc::scoped_ptr<test::DirectTransport> receive_transport_; |
- rtc::scoped_ptr<Call> sender_call_; |
- rtc::scoped_ptr<Call> receiver_call_; |
+ std::unique_ptr<test::DirectTransport> send_transport_; |
+ std::unique_ptr<test::DirectTransport> receive_transport_; |
+ std::unique_ptr<Call> sender_call_; |
+ std::unique_ptr<Call> receiver_call_; |
VideoReceiveStream::Config receive_config_; |
std::vector<Stream*> streams_; |
}; |