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

Unified Diff: webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc

Issue 1750533002: Replace scoped_ptr with unique_ptr in webrtc/modules/remote_bitrate_estimator/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
index 51afae1df46e1a40d3b58d26493bd10c7d5d3423..ec008ffb7ffdbc916691c98e03f1fac44701c844 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
@@ -11,11 +11,11 @@
#include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h"
#include <algorithm>
+#include <memory>
#include <numeric>
#include "webrtc/base/arraysize.h"
#include "webrtc/base/common.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
#include "webrtc/modules/remote_bitrate_estimator/test/packet.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -314,7 +314,7 @@ TEST_F(NadaSenderSideTest, VeryHighBandwith) {
}
TEST_F(NadaReceiverSideTest, FeedbackInitialCases) {
- rtc::scoped_ptr<NadaFeedback> nada_feedback(
+ std::unique_ptr<NadaFeedback> nada_feedback(
static_cast<NadaFeedback*>(nada_receiver_.GetFeedback(0)));
EXPECT_EQ(nada_feedback, nullptr);
@@ -342,7 +342,7 @@ TEST_F(NadaReceiverSideTest, FeedbackEmptyQueues) {
}
// Baseline delay will be equal kOneWayDelayMs.
- rtc::scoped_ptr<NadaFeedback> nada_feedback(
+ std::unique_ptr<NadaFeedback> nada_feedback(
static_cast<NadaFeedback*>(nada_receiver_.GetFeedback(500)));
EXPECT_EQ(nada_feedback->exp_smoothed_delay_ms(), 0L);
EXPECT_EQ(nada_feedback->est_queuing_delay_signal_ms(), 0L);
@@ -378,7 +378,7 @@ TEST_F(NadaReceiverSideTest, FeedbackIncreasingDelay) {
const MediaPacket media_packet(kFlowId, send_time_us, 0, sequence_number);
nada_receiver_.ReceivePacket(arrival_time_ms, media_packet);
- rtc::scoped_ptr<NadaFeedback> nada_feedback(static_cast<NadaFeedback*>(
+ std::unique_ptr<NadaFeedback> nada_feedback(static_cast<NadaFeedback*>(
nada_receiver_.GetFeedback(arrival_time_ms)));
EXPECT_EQ(nada_feedback->exp_smoothed_delay_ms(),
exp_smoothed_delays_ms[i]);
@@ -447,7 +447,7 @@ TEST_F(NadaReceiverSideTest, FeedbackWarpedDelay) {
const MediaPacket media_packet(kFlowId, send_time_us, 0, sequence_number);
nada_receiver_.ReceivePacket(arrival_time_ms, media_packet);
- rtc::scoped_ptr<NadaFeedback> nada_feedback(static_cast<NadaFeedback*>(
+ std::unique_ptr<NadaFeedback> nada_feedback(static_cast<NadaFeedback*>(
nada_receiver_.GetFeedback(arrival_time_ms)));
EXPECT_EQ(nada_feedback->exp_smoothed_delay_ms(),
exp_smoothed_delays_ms[i]);

Powered by Google App Engine
This is Rietveld 408576698