| Index: webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
|
| diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
|
| index cc7807ba8aaac36f9149426e7dda023185fadf5b..53550fb854c50e49c935cff05fafc55a47dfc7d3 100644
|
| --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
|
| +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
|
| @@ -120,11 +120,11 @@
|
| #else // BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <stack>
|
| #include <string>
|
|
|
| #include "webrtc/base/constructormagic.h"
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/common_types.h"
|
|
|
| #define BWE_TEST_LOGGING_GLOBAL_CONTEXT(name) \
|
| @@ -310,7 +310,7 @@ class Logging {
|
| void PopState();
|
|
|
| static Logging g_Logging;
|
| - rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
|
| + std::unique_ptr<CriticalSectionWrapper> crit_sect_;
|
| ThreadMap thread_map_;
|
|
|
| RTC_DISALLOW_COPY_AND_ASSIGN(Logging);
|
|
|