From c317ce5456218533fa69a3c9ddddb59eda04036d Mon Sep 17 00:00:00 2001 From: Jelena Marusic Date: Wed, 15 Apr 2015 12:45:14 +0200 Subject: [PATCH] VoE: move mock directory 1 level up Changes: 1. Moved directory voice_engine/include/mock to voice_engine/mock (current recommendation). 2. Updated includes where necessary. Caution: We need confirmation that these mocks are indeed used only locally. R=kwiberg@webrtc.org Review URL: https://webrtc-codereview.appspot.com/48089004 Cr-Commit-Position: refs/heads/master@{#9005} --- webrtc/tools/agc/agc_manager_unittest.cc | 4 ++-- webrtc/tools/agc/agc_test.cc | 4 ++-- .../voice_engine/{include => }/mock/fake_voe_external_media.h | 0 webrtc/voice_engine/{include => }/mock/mock_voe_observer.h | 0 .../voice_engine/{include => }/mock/mock_voe_volume_control.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename webrtc/voice_engine/{include => }/mock/fake_voe_external_media.h (100%) rename webrtc/voice_engine/{include => }/mock/mock_voe_observer.h (100%) rename webrtc/voice_engine/{include => }/mock/mock_voe_volume_control.h (100%) diff --git a/webrtc/tools/agc/agc_manager_unittest.cc b/webrtc/tools/agc/agc_manager_unittest.cc index fca8decc85..e126c017f2 100644 --- a/webrtc/tools/agc/agc_manager_unittest.cc +++ b/webrtc/tools/agc/agc_manager_unittest.cc @@ -16,8 +16,8 @@ #include "webrtc/modules/audio_processing/agc/mock_agc.h" #include "webrtc/modules/audio_processing/include/mock_audio_processing.h" #include "webrtc/system_wrappers/interface/trace.h" -#include "webrtc/voice_engine/include/mock/fake_voe_external_media.h" -#include "webrtc/voice_engine/include/mock/mock_voe_volume_control.h" +#include "webrtc/voice_engine/mock/fake_voe_external_media.h" +#include "webrtc/voice_engine/mock/mock_voe_volume_control.h" #include "webrtc/test/testsupport/trace_to_stderr.h" using ::testing::_; diff --git a/webrtc/tools/agc/agc_test.cc b/webrtc/tools/agc/agc_test.cc index 29769488c1..a651cb168e 100644 --- a/webrtc/tools/agc/agc_test.cc +++ b/webrtc/tools/agc/agc_test.cc @@ -23,8 +23,8 @@ #include "webrtc/test/testsupport/trace_to_stderr.h" #include "webrtc/tools/agc/agc_manager.h" #include "webrtc/tools/agc/test_utils.h" -#include "webrtc/voice_engine/include/mock/fake_voe_external_media.h" -#include "webrtc/voice_engine/include/mock/mock_voe_volume_control.h" +#include "webrtc/voice_engine/mock/fake_voe_external_media.h" +#include "webrtc/voice_engine/mock/mock_voe_volume_control.h" DEFINE_string(in, "in.pcm", "input filename"); DEFINE_string(out, "out.pcm", "output filename"); diff --git a/webrtc/voice_engine/include/mock/fake_voe_external_media.h b/webrtc/voice_engine/mock/fake_voe_external_media.h similarity index 100% rename from webrtc/voice_engine/include/mock/fake_voe_external_media.h rename to webrtc/voice_engine/mock/fake_voe_external_media.h diff --git a/webrtc/voice_engine/include/mock/mock_voe_observer.h b/webrtc/voice_engine/mock/mock_voe_observer.h similarity index 100% rename from webrtc/voice_engine/include/mock/mock_voe_observer.h rename to webrtc/voice_engine/mock/mock_voe_observer.h diff --git a/webrtc/voice_engine/include/mock/mock_voe_volume_control.h b/webrtc/voice_engine/mock/mock_voe_volume_control.h similarity index 100% rename from webrtc/voice_engine/include/mock/mock_voe_volume_control.h rename to webrtc/voice_engine/mock/mock_voe_volume_control.h