Index: webrtc/modules/audio_coding/test/EncodeDecodeTest.cc |
diff --git a/webrtc/modules/audio_coding/test/EncodeDecodeTest.cc b/webrtc/modules/audio_coding/test/EncodeDecodeTest.cc |
index ba3c8d9ad2e053605b0cbfb88d9457fcd2595f33..e0632243bf4ffa7439fc352610d2674f4db67529 100644 |
--- a/webrtc/modules/audio_coding/test/EncodeDecodeTest.cc |
+++ b/webrtc/modules/audio_coding/test/EncodeDecodeTest.cc |
@@ -10,12 +10,12 @@ |
#include "webrtc/modules/audio_coding/test/EncodeDecodeTest.h" |
+#include <memory> |
#include <sstream> |
#include <stdio.h> |
#include <stdlib.h> |
#include "testing/gtest/include/gtest/gtest.h" |
-#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/common_types.h" |
#include "webrtc/modules/audio_coding/include/audio_coding_module.h" |
#include "webrtc/modules/audio_coding/acm2/acm_common_defs.h" |
@@ -275,7 +275,7 @@ void EncodeDecodeTest::Perform() { |
codePars[1] = 0; |
codePars[2] = 0; |
- rtc::scoped_ptr<AudioCodingModule> acm(AudioCodingModule::Create(0)); |
+ std::unique_ptr<AudioCodingModule> acm(AudioCodingModule::Create(0)); |
struct CodecInst sendCodecTmp; |
numCodecs = acm->NumberOfCodecs(); |
@@ -331,7 +331,7 @@ std::string EncodeDecodeTest::EncodeToFile(int fileType, |
int codeId, |
int* codePars, |
int testMode) { |
- rtc::scoped_ptr<AudioCodingModule> acm(AudioCodingModule::Create(1)); |
+ std::unique_ptr<AudioCodingModule> acm(AudioCodingModule::Create(1)); |
RTPFile rtpFile; |
std::string fileName = webrtc::test::TempFilename(webrtc::test::OutputPath(), |
"encode_decode_rtp"); |