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/transient/file_utils.cc

diff --git a/webrtc/modules/audio_processing/transient/file_utils.cc b/webrtc/modules/audio_processing/transient/file_utils.cc
index c7415bd..2325bd6 100644
--- a/webrtc/modules/audio_processing/transient/file_utils.cc
+++ b/webrtc/modules/audio_processing/transient/file_utils.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/modules/audio_processing/transient/file_utils.h"
 
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/file_wrapper.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -83,7 +83,7 @@
     return 0;
   }
 
-  scoped_ptr<uint8_t[]> byte_array(new uint8_t[2]);
+  rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[2]);
 
   size_t int16s_read = 0;
 
@@ -109,7 +109,7 @@
     return 0;
   }
 
-  scoped_ptr<int16_t[]> buffer16(new int16_t[length]);
+  rtc::scoped_ptr<int16_t[]> buffer16(new int16_t[length]);
 
   size_t int16s_read = ReadInt16BufferFromFile(file, length, buffer16.get());
 
@@ -127,7 +127,7 @@
     return 0;
   }
 
-  scoped_ptr<int16_t[]> buffer16(new int16_t[length]);
+  rtc::scoped_ptr<int16_t[]> buffer16(new int16_t[length]);
 
   size_t int16s_read = ReadInt16BufferFromFile(file, length, buffer16.get());
 
@@ -145,7 +145,7 @@
     return 0;
   }
 
-  scoped_ptr<uint8_t[]> byte_array(new uint8_t[4]);
+  rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[4]);
 
   size_t floats_read = 0;
 
@@ -168,7 +168,7 @@
     return 0;
   }
 
-  scoped_ptr<uint8_t[]> byte_array(new uint8_t[8]);
+  rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[8]);
 
   size_t doubles_read = 0;
 
@@ -191,7 +191,7 @@
     return 0;
   }
 
-  scoped_ptr<uint8_t[]> byte_array(new uint8_t[2]);
+  rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[2]);
 
   size_t int16s_written = 0;
 
@@ -215,7 +215,7 @@
     return 0;
   }
 
-  scoped_ptr<uint8_t[]> byte_array(new uint8_t[4]);
+  rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[4]);
 
   size_t floats_written = 0;
 
@@ -238,7 +238,7 @@
     return 0;
   }
 
-  scoped_ptr<uint8_t[]> byte_array(new uint8_t[8]);
+  rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[8]);
 
   size_t doubles_written = 0;