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/audio_buffer.h

diff --git a/webrtc/modules/audio_processing/audio_buffer.h b/webrtc/modules/audio_processing/audio_buffer.h
index a7f7e89..cdf0336 100644
--- a/webrtc/modules/audio_processing/audio_buffer.h
+++ b/webrtc/modules/audio_processing/audio_buffer.h
@@ -13,12 +13,12 @@
 
 #include <vector>
 
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/common_audio/include/audio_util.h"
 #include "webrtc/common_audio/channel_buffer.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/audio_processing/splitting_filter.h"
 #include "webrtc/modules/interface/module_common_types.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/scoped_vector.h"
 #include "webrtc/typedefs.h"
 
@@ -124,13 +124,13 @@
   AudioFrame::VADActivity activity_;
 
   const float* keyboard_data_;
-  scoped_ptr<IFChannelBuffer> data_;
-  scoped_ptr<IFChannelBuffer> split_data_;
-  scoped_ptr<SplittingFilter> splitting_filter_;
-  scoped_ptr<ChannelBuffer<int16_t> > mixed_low_pass_channels_;
-  scoped_ptr<ChannelBuffer<int16_t> > low_pass_reference_channels_;
-  scoped_ptr<ChannelBuffer<float> > input_buffer_;
-  scoped_ptr<ChannelBuffer<float> > process_buffer_;
+  rtc::scoped_ptr<IFChannelBuffer> data_;
+  rtc::scoped_ptr<IFChannelBuffer> split_data_;
+  rtc::scoped_ptr<SplittingFilter> splitting_filter_;
+  rtc::scoped_ptr<ChannelBuffer<int16_t> > mixed_low_pass_channels_;
+  rtc::scoped_ptr<ChannelBuffer<int16_t> > low_pass_reference_channels_;
+  rtc::scoped_ptr<ChannelBuffer<float> > input_buffer_;
+  rtc::scoped_ptr<ChannelBuffer<float> > process_buffer_;
   ScopedVector<PushSincResampler> input_resamplers_;
   ScopedVector<PushSincResampler> output_resamplers_;
 };