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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_
13 13
14 #include "webrtc/base/scoped_ptr.h" 14 #include <memory>
15
15 #include "webrtc/modules/audio_processing/include/audio_processing.h" 16 #include "webrtc/modules/audio_processing/include/audio_processing.h"
16 17
17 namespace webrtc { 18 namespace webrtc {
18 19
19 class MockEchoCancellation : public EchoCancellation { 20 class MockEchoCancellation : public EchoCancellation {
20 public: 21 public:
21 MOCK_METHOD1(Enable, 22 MOCK_METHOD1(Enable,
22 int(bool enable)); 23 int(bool enable));
23 MOCK_CONST_METHOD0(is_enabled, 24 MOCK_CONST_METHOD0(is_enabled,
24 bool()); 25 bool());
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 return level_estimator_.get(); 276 return level_estimator_.get();
276 } 277 }
277 virtual MockNoiseSuppression* noise_suppression() const { 278 virtual MockNoiseSuppression* noise_suppression() const {
278 return noise_suppression_.get(); 279 return noise_suppression_.get();
279 } 280 }
280 virtual MockVoiceDetection* voice_detection() const { 281 virtual MockVoiceDetection* voice_detection() const {
281 return voice_detection_.get(); 282 return voice_detection_.get();
282 } 283 }
283 284
284 private: 285 private:
285 rtc::scoped_ptr<MockEchoCancellation> echo_cancellation_; 286 std::unique_ptr<MockEchoCancellation> echo_cancellation_;
286 rtc::scoped_ptr<MockEchoControlMobile> echo_control_mobile_; 287 std::unique_ptr<MockEchoControlMobile> echo_control_mobile_;
287 rtc::scoped_ptr<MockGainControl> gain_control_; 288 std::unique_ptr<MockGainControl> gain_control_;
288 rtc::scoped_ptr<MockHighPassFilter> high_pass_filter_; 289 std::unique_ptr<MockHighPassFilter> high_pass_filter_;
289 rtc::scoped_ptr<MockLevelEstimator> level_estimator_; 290 std::unique_ptr<MockLevelEstimator> level_estimator_;
290 rtc::scoped_ptr<MockNoiseSuppression> noise_suppression_; 291 std::unique_ptr<MockNoiseSuppression> noise_suppression_;
291 rtc::scoped_ptr<MockVoiceDetection> voice_detection_; 292 std::unique_ptr<MockVoiceDetection> voice_detection_;
292 }; 293 };
293 294
294 } // namespace webrtc 295 } // namespace webrtc
295 296
296 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_ 297 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698