| Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
|
| diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
|
| index 69f17639521d6822b8e952dbe38fa4bb3eeee147..12ac9e8502dec02225d75b2b5f81339da2368412 100644
|
| --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
|
| +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
|
| @@ -13,12 +13,12 @@
|
|
|
| #include <list>
|
| #include <map>
|
| +#include <memory>
|
| #include <utility>
|
| #include <vector>
|
|
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "webrtc/base/constructormagic.h"
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
|
| #include "webrtc/system_wrappers/include/clock.h"
|
|
|
| @@ -210,9 +210,9 @@ class RemoteBitrateEstimatorTest : public ::testing::Test {
|
| static const int kArrivalTimeClockOffsetMs = 60000;
|
|
|
| SimulatedClock clock_; // Time at the receiver.
|
| - rtc::scoped_ptr<testing::TestBitrateObserver> bitrate_observer_;
|
| - rtc::scoped_ptr<RemoteBitrateEstimator> bitrate_estimator_;
|
| - rtc::scoped_ptr<testing::StreamGenerator> stream_generator_;
|
| + std::unique_ptr<testing::TestBitrateObserver> bitrate_observer_;
|
| + std::unique_ptr<RemoteBitrateEstimator> bitrate_estimator_;
|
| + std::unique_ptr<testing::StreamGenerator> stream_generator_;
|
|
|
| RTC_DISALLOW_COPY_AND_ASSIGN(RemoteBitrateEstimatorTest);
|
| };
|
|
|