| Index: webrtc/modules/audio_coding/test/TwoWayCommunication.h
|
| diff --git a/webrtc/modules/audio_coding/test/TwoWayCommunication.h b/webrtc/modules/audio_coding/test/TwoWayCommunication.h
|
| index 77639935da903169e61234d0d734b15e5ebc0366..f9d37f7f77f6d37a0fd5d94661edc68b598dedf8 100644
|
| --- a/webrtc/modules/audio_coding/test/TwoWayCommunication.h
|
| +++ b/webrtc/modules/audio_coding/test/TwoWayCommunication.h
|
| @@ -11,7 +11,8 @@
|
| #ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_
|
| #define WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_
|
|
|
| -#include "webrtc/base/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
|
| #include "webrtc/modules/audio_coding/test/ACMTest.h"
|
| #include "webrtc/modules/audio_coding/test/Channel.h"
|
| @@ -31,11 +32,11 @@ class TwoWayCommunication : public ACMTest {
|
| void SetUp();
|
| void SetUpAutotest();
|
|
|
| - rtc::scoped_ptr<AudioCodingModule> _acmA;
|
| - rtc::scoped_ptr<AudioCodingModule> _acmB;
|
| + std::unique_ptr<AudioCodingModule> _acmA;
|
| + std::unique_ptr<AudioCodingModule> _acmB;
|
|
|
| - rtc::scoped_ptr<AudioCodingModule> _acmRefA;
|
| - rtc::scoped_ptr<AudioCodingModule> _acmRefB;
|
| + std::unique_ptr<AudioCodingModule> _acmRefA;
|
| + std::unique_ptr<AudioCodingModule> _acmRefB;
|
|
|
| Channel* _channel_A2B;
|
| Channel* _channel_B2A;
|
|
|