commit 00b8f6b3643332cce1ee711715f7fbb824d793ca
author kwiberg@webrtc.org <kwiberg@webrtc.org> Thu Feb 26 14:34:55 2015
committer kwiberg@webrtc.org <kwiberg@webrtc.org> Thu Feb 26 14:43:50 2015
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/common_audio/real_fourier.h

diff --git a/webrtc/common_audio/real_fourier.h b/webrtc/common_audio/real_fourier.h
index 0ca962c..eda3ba3 100644
--- a/webrtc/common_audio/real_fourier.h
+++ b/webrtc/common_audio/real_fourier.h
@@ -13,8 +13,8 @@
 
 #include <complex>
 
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/aligned_malloc.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 // Uniform interface class for the real DFT and its inverse, for power-of-2
 // input lengths. Also contains helper functions for buffer allocation, taking
@@ -25,8 +25,9 @@
 class RealFourier {
  public:
   // Shorthand typenames for the scopers used by the buffer allocation helpers.
-  typedef scoped_ptr<float[], AlignedFreeDeleter> fft_real_scoper;
-  typedef scoped_ptr<std::complex<float>[], AlignedFreeDeleter> fft_cplx_scoper;
+  typedef rtc::scoped_ptr<float[], AlignedFreeDeleter> fft_real_scoper;
+  typedef rtc::scoped_ptr<std::complex<float>[], AlignedFreeDeleter>
+      fft_cplx_scoper;
 
   // The maximum input order supported by this implementation.
   static const int kMaxFftOrder;