| Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
|
| diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
|
| index 39d3e032a7d5ee31b3fcd4181c52833f05eb8060..1f47dc3b244fe16debdc0f96ef3ffaada3a31ff5 100644
|
| --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
|
| +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
|
| @@ -13,12 +13,12 @@
|
|
|
| #include <list>
|
| #include <map>
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "webrtc/base/checks.h"
|
| #include "webrtc/base/criticalsection.h"
|
| #include "webrtc/base/rate_statistics.h"
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/base/thread_checker.h"
|
| #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
|
| #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
|
| @@ -120,7 +120,7 @@ class RemoteBitrateEstimatorAbsSendTime : public RemoteBitrateEstimator {
|
|
|
| rtc::ThreadChecker network_thread_;
|
| RemoteBitrateObserver* const observer_;
|
| - rtc::scoped_ptr<InterArrival> inter_arrival_;
|
| + std::unique_ptr<InterArrival> inter_arrival_;
|
| OveruseEstimator estimator_;
|
| OveruseDetector detector_;
|
| RateStatistics incoming_bitrate_;
|
|
|