commit 00b8f6b3643332cce1ee711715f7fbb824d793ca
author kwiberg@webrtc.org <kwiberg@webrtc.org> Thu Feb 26 14:34:55 2015 +0000
committer kwiberg@webrtc.org <kwiberg@webrtc.org> Thu Feb 26 14:43:50 2015 +0000
tree c9b615128a443fe938a38e09023ec700d8adf62b
parent ac2d27d9ae74eb8d28ec0d5f12f70fa64461ab90

Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away

BUG=
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/36229004

Cr-Commit-Position: refs/heads/master@{#8517}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8517 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/audio_processing/test/test_utils.h

diff --git a/webrtc/modules/audio_processing/test/test_utils.h b/webrtc/modules/audio_processing/test/test_utils.h
index 0bf6f27..52274d7 100644
--- a/webrtc/modules/audio_processing/test/test_utils.h
+++ b/webrtc/modules/audio_processing/test/test_utils.h
@@ -12,12 +12,12 @@
 #include <limits>
 
 #include "webrtc/audio_processing/debug.pb.h"
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/common_audio/channel_buffer.h"
 #include "webrtc/common_audio/include/audio_util.h"
 #include "webrtc/common_audio/wav_file.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/interface/module_common_types.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 namespace webrtc {
 
@@ -66,7 +66,7 @@
                                   WavWriter* wav_file,
                                   RawFile* raw_file) {
   size_t length = num_channels * samples_per_channel;
-  scoped_ptr<float[]> buffer(new float[length]);
+  rtc::scoped_ptr<float[]> buffer(new float[length]);
   Interleave(data, samples_per_channel, num_channels, buffer.get());
   if (raw_file) {
     raw_file->WriteSamples(buffer.get(), length);
@@ -107,7 +107,7 @@
 void SetContainerFormat(int sample_rate_hz,
                         int num_channels,
                         AudioFrame* frame,
-                        scoped_ptr<ChannelBuffer<T> >* cb) {
+                        rtc::scoped_ptr<ChannelBuffer<T> >* cb) {
   SetFrameSampleRate(frame, sample_rate_hz);
   frame->num_channels_ = num_channels;
   cb->reset(new ChannelBuffer<T>(frame->samples_per_channel_, num_channels));
@@ -128,8 +128,9 @@
 
 // Allocates new memory in the scoped_ptr to fit the raw message and returns the
 // number of bytes read.
-static inline size_t ReadMessageBytesFromFile(FILE* file,
-                                              scoped_ptr<uint8_t[]>* bytes) {
+static inline size_t ReadMessageBytesFromFile(
+    FILE* file,
+    rtc::scoped_ptr<uint8_t[]>* bytes) {
   // The "wire format" for the size is little-endian. Assume we're running on
   // a little-endian machine.
   int32_t size = 0;
@@ -145,7 +146,7 @@
 // Returns true on success, false on error or end-of-file.
 static inline bool ReadMessageFromFile(FILE* file,
                                        ::google::protobuf::MessageLite* msg) {
-  scoped_ptr<uint8_t[]> bytes;
+  rtc::scoped_ptr<uint8_t[]> bytes;
   size_t size = ReadMessageBytesFromFile(file, &bytes);
   if (!size)
     return false;