Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/test/

BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1695763004

Cr-Commit-Position: refs/heads/master@{#11618}
This commit is contained in:
kwiberg
2016-02-14 20:40:57 -08:00
committed by Commit bot
parent 1d9ada795c
commit 3747838afb
16 changed files with 63 additions and 49 deletions

View File

@ -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");