Index: webrtc/tools/agc/activity_metric.cc |
diff --git a/webrtc/tools/agc/activity_metric.cc b/webrtc/tools/agc/activity_metric.cc |
index 258d02377ee80b6512c5c5de228a5bf10fe23426..6c1f756ec58bf30ecc7d0bc564f6e3fc73868695 100644 |
--- a/webrtc/tools/agc/activity_metric.cc |
+++ b/webrtc/tools/agc/activity_metric.cc |
@@ -14,10 +14,10 @@ |
#include <stdlib.h> |
#include <algorithm> |
+#include <memory> |
#include "gflags/gflags.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/modules/audio_processing/agc/agc.h" |
#include "webrtc/modules/audio_processing/agc/histogram.h" |
#include "webrtc/modules/audio_processing/agc/utility.h" |
@@ -155,10 +155,10 @@ class AgcStat { |
int video_index_; |
double activity_threshold_; |
double video_vad_[kMaxNumFrames]; |
- rtc::scoped_ptr<Histogram> audio_content_; |
- rtc::scoped_ptr<VadAudioProc> audio_processing_; |
- rtc::scoped_ptr<PitchBasedVad> vad_; |
- rtc::scoped_ptr<StandaloneVad> standalone_vad_; |
+ std::unique_ptr<Histogram> audio_content_; |
+ std::unique_ptr<VadAudioProc> audio_processing_; |
+ std::unique_ptr<PitchBasedVad> vad_; |
+ std::unique_ptr<StandaloneVad> standalone_vad_; |
FILE* audio_content_fid_; |
}; |