| Index: webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
|
| diff --git a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
|
| index 11fd64f84e77dcbedbb56ab879432fe1e1e29fca..4967913558cff09e40fb5daad693204e537d7de6 100644
|
| --- a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
|
| +++ b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
|
| @@ -8,8 +8,9 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| +#include <memory>
|
| +
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
|
| #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h"
|
| #include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h"
|
| @@ -244,8 +245,8 @@ TEST_P(BweSimulation, SelfFairnessTest) {
|
| Random prng(Clock::GetRealTimeClock()->TimeInMicroseconds());
|
| const int kAllFlowIds[] = {0, 1, 2, 3};
|
| const size_t kNumFlows = sizeof(kAllFlowIds) / sizeof(kAllFlowIds[0]);
|
| - rtc::scoped_ptr<VideoSource> sources[kNumFlows];
|
| - rtc::scoped_ptr<VideoSender> senders[kNumFlows];
|
| + std::unique_ptr<VideoSource> sources[kNumFlows];
|
| + std::unique_ptr<VideoSender> senders[kNumFlows];
|
| for (size_t i = 0; i < kNumFlows; ++i) {
|
| // Streams started 20 seconds apart to give them different advantage when
|
| // competing for the bandwidth.
|
| @@ -257,7 +258,7 @@ TEST_P(BweSimulation, SelfFairnessTest) {
|
| ChokeFilter choke(&uplink_, CreateFlowIds(kAllFlowIds, kNumFlows));
|
| choke.set_capacity_kbps(1000);
|
|
|
| - rtc::scoped_ptr<RateCounterFilter> rate_counters[kNumFlows];
|
| + std::unique_ptr<RateCounterFilter> rate_counters[kNumFlows];
|
| for (size_t i = 0; i < kNumFlows; ++i) {
|
| rate_counters[i].reset(
|
| new RateCounterFilter(&uplink_, CreateFlowIds(&kAllFlowIds[i], 1),
|
| @@ -268,7 +269,7 @@ TEST_P(BweSimulation, SelfFairnessTest) {
|
| &uplink_, CreateFlowIds(kAllFlowIds, kNumFlows), "total_utilization",
|
| "Total_link_utilization");
|
|
|
| - rtc::scoped_ptr<PacketReceiver> receivers[kNumFlows];
|
| + std::unique_ptr<PacketReceiver> receivers[kNumFlows];
|
| for (size_t i = 0; i < kNumFlows; ++i) {
|
| receivers[i].reset(new PacketReceiver(&uplink_, kAllFlowIds[i], GetParam(),
|
| i == 0, false));
|
|
|