| 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 9262164b2ee23864754009b12d1e306c8b0aa4c4..be9ecdba52032b84d49aa340791fd24c162fc8d0 100644
|
| --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
|
| +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
|
| @@ -129,6 +129,7 @@
|
| #include <string>
|
|
|
| #include "webrtc/base/constructormagic.h"
|
| +#include "webrtc/base/criticalsection.h"
|
| #include "webrtc/common_types.h"
|
|
|
| #define BWE_TEST_LOGGING_GLOBAL_CONTEXT(name) \
|
| @@ -254,9 +255,6 @@
|
| } while (0)
|
|
|
| namespace webrtc {
|
| -
|
| -class CriticalSectionWrapper;
|
| -
|
| namespace testing {
|
| namespace bwe {
|
|
|
| @@ -340,7 +338,7 @@ class Logging {
|
| void PopState();
|
|
|
| static Logging g_Logging;
|
| - std::unique_ptr<CriticalSectionWrapper> crit_sect_;
|
| + rtc::CriticalSection crit_sect_;
|
| ThreadMap thread_map_;
|
|
|
| RTC_DISALLOW_COPY_AND_ASSIGN(Logging);
|
|
|