From 9b351151f99b2f6bb16c5fd0263d7619d61ae3fc Mon Sep 17 00:00:00 2001 From: Alejandro Luebs Date: Tue, 25 Aug 2015 10:24:41 -0700 Subject: [PATCH] Move mock_nonlinear_beamformer to only be a header R=andrew@webrtc.org Review URL: https://codereview.webrtc.org/1305303003 . Cr-Commit-Position: refs/heads/master@{#9781} --- .../beamformer/mock_nonlinear_beamformer.cc | 22 ------------------- .../beamformer/mock_nonlinear_beamformer.h | 3 ++- webrtc/modules/modules.gyp | 1 - 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.cc diff --git a/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.cc b/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.cc deleted file mode 100644 index aecb0ec0ce..0000000000 --- a/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.cc +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#include "webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h" - -#include - -namespace webrtc { - -MockNonlinearBeamformer::MockNonlinearBeamformer( - const std::vector& array_geometry) - : NonlinearBeamformer(array_geometry) { -} - -} // namespace webrtc diff --git a/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h b/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h index 79e335b624..e2b4417c13 100644 --- a/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h +++ b/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h @@ -20,7 +20,8 @@ namespace webrtc { class MockNonlinearBeamformer : public NonlinearBeamformer { public: - explicit MockNonlinearBeamformer(const std::vector& array_geometry); + explicit MockNonlinearBeamformer(const std::vector& array_geometry) + : NonlinearBeamformer(array_geometry) {} MOCK_METHOD2(Initialize, void(int chunk_size_ms, int sample_rate_hz)); MOCK_METHOD2(ProcessChunk, void(const ChannelBuffer& input, diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index f114fea93e..65921a5f4e 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -167,7 +167,6 @@ 'audio_processing/beamformer/complex_matrix_unittest.cc', 'audio_processing/beamformer/covariance_matrix_generator_unittest.cc', 'audio_processing/beamformer/matrix_unittest.cc', - 'audio_processing/beamformer/mock_nonlinear_beamformer.cc', 'audio_processing/beamformer/mock_nonlinear_beamformer.h', 'audio_processing/echo_cancellation_impl_unittest.cc', 'audio_processing/intelligibility/intelligibility_enhancer_unittest.cc',