Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: webrtc/modules/audio_processing/include/mock_audio_processing.h

Issue 1710483002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_processing/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_processing/include/mock_audio_processing.h
diff --git a/webrtc/modules/audio_processing/include/mock_audio_processing.h b/webrtc/modules/audio_processing/include/mock_audio_processing.h
index 363e99a003aad55ba78d04ac2d66ef60f2f7fa25..b5ea5875a797f96e72ae61388426ea09a86adfb5 100644
--- a/webrtc/modules/audio_processing/include/mock_audio_processing.h
+++ b/webrtc/modules/audio_processing/include/mock_audio_processing.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_
#define WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_
-#include "webrtc/base/scoped_ptr.h"
+#include <memory>
+
#include "webrtc/modules/audio_processing/include/audio_processing.h"
namespace webrtc {
@@ -282,13 +283,13 @@ class MockAudioProcessing : public AudioProcessing {
}
private:
- rtc::scoped_ptr<MockEchoCancellation> echo_cancellation_;
- rtc::scoped_ptr<MockEchoControlMobile> echo_control_mobile_;
- rtc::scoped_ptr<MockGainControl> gain_control_;
- rtc::scoped_ptr<MockHighPassFilter> high_pass_filter_;
- rtc::scoped_ptr<MockLevelEstimator> level_estimator_;
- rtc::scoped_ptr<MockNoiseSuppression> noise_suppression_;
- rtc::scoped_ptr<MockVoiceDetection> voice_detection_;
+ std::unique_ptr<MockEchoCancellation> echo_cancellation_;
+ std::unique_ptr<MockEchoControlMobile> echo_control_mobile_;
+ std::unique_ptr<MockGainControl> gain_control_;
+ std::unique_ptr<MockHighPassFilter> high_pass_filter_;
+ std::unique_ptr<MockLevelEstimator> level_estimator_;
+ std::unique_ptr<MockNoiseSuppression> noise_suppression_;
+ std::unique_ptr<MockVoiceDetection> voice_detection_;
};
} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698