Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(627)

Unified Diff: webrtc/call/bitrate_estimator_tests.cc

Issue 1789903003: Replace scoped_ptr with unique_ptr in webrtc/call/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;
};

Powered by Google App Engine
This is Rietveld 408576698