commit 3747838afb857104fc371c36bdfa34f62ec7bed6
author kwiberg <kwiberg@webrtc.org> Sun Feb 14 20:40:57 2016 -0800
committer Commit bot <commit-bot@chromium.org> Mon Feb 15 04:41:04 2016 +0000
tree 705218327abbe01defc81d023aa00cf1e219bd8d
parent 1d9ada795c1d659518fef4e71bf2f8b8d74126fe

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}

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