| Index: webrtc/media/engine/webrtcvoiceengine_unittest.cc
|
| diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
|
| index e4e4cf1b128febc9fb9f2aaea351e7f17bc59af3..ea67bc292f5157255514f219b7111093b4e1f077 100644
|
| --- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc
|
| +++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
|
| @@ -571,6 +571,10 @@ class WebRtcVoiceEngineTestFake : public testing::Test {
|
| }
|
| }
|
|
|
| + bool IsHighPassFilterEnabled() {
|
| + return engine_->GetApmConfig().high_pass_filter.enabled;
|
| + }
|
| +
|
| protected:
|
| StrictMock<webrtc::test::MockAudioDeviceModule> adm_;
|
| StrictMock<webrtc::test::MockAudioProcessing> apm_;
|
| @@ -2801,7 +2805,7 @@ TEST_F(WebRtcVoiceEngineTestFake, SetAudioOptions) {
|
| voe_.GetAgcStatus(agc_enabled, agc_mode);
|
| voe_.GetAgcConfig(agc_config);
|
| voe_.GetNsStatus(ns_enabled, ns_mode);
|
| - highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
|
| + highpass_filter_enabled = IsHighPassFilterEnabled();
|
| stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
|
| voe_.GetTypingDetectionStatus(typing_detection_enabled);
|
| EXPECT_TRUE(ec_enabled);
|
| @@ -2826,7 +2830,7 @@ TEST_F(WebRtcVoiceEngineTestFake, SetAudioOptions) {
|
| voe_.GetAgcStatus(agc_enabled, agc_mode);
|
| voe_.GetAgcConfig(agc_config);
|
| voe_.GetNsStatus(ns_enabled, ns_mode);
|
| - highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
|
| + highpass_filter_enabled = IsHighPassFilterEnabled();
|
| stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
|
| voe_.GetTypingDetectionStatus(typing_detection_enabled);
|
| EXPECT_TRUE(ec_enabled);
|
| @@ -2858,7 +2862,7 @@ TEST_F(WebRtcVoiceEngineTestFake, SetAudioOptions) {
|
| voe_.GetAgcStatus(agc_enabled, agc_mode);
|
| voe_.GetAgcConfig(agc_config);
|
| voe_.GetNsStatus(ns_enabled, ns_mode);
|
| - highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
|
| + highpass_filter_enabled = IsHighPassFilterEnabled();
|
| stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
|
| voe_.GetTypingDetectionStatus(typing_detection_enabled);
|
| EXPECT_TRUE(ec_enabled);
|
| @@ -2919,7 +2923,7 @@ TEST_F(WebRtcVoiceEngineTestFake, SetAudioOptions) {
|
| send_parameters_.options.stereo_swapping = rtc::Optional<bool>(true);
|
| SetSendParameters(send_parameters_);
|
| voe_.GetNsStatus(ns_enabled, ns_mode);
|
| - highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
|
| + highpass_filter_enabled = IsHighPassFilterEnabled();
|
| stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
|
| voe_.GetTypingDetectionStatus(typing_detection_enabled);
|
| EXPECT_FALSE(ns_enabled);
|
| @@ -2953,7 +2957,7 @@ TEST_F(WebRtcVoiceEngineTestFake, DefaultOptions) {
|
| voe_.GetEcStatus(ec_enabled, ec_mode);
|
| voe_.GetAgcStatus(agc_enabled, agc_mode);
|
| voe_.GetNsStatus(ns_enabled, ns_mode);
|
| - highpass_filter_enabled = voe_.IsHighPassFilterEnabled();
|
| + highpass_filter_enabled = IsHighPassFilterEnabled();
|
| stereo_swapping_enabled = voe_.IsStereoChannelSwappingEnabled();
|
| voe_.GetTypingDetectionStatus(typing_detection_enabled);
|
| EXPECT_TRUE(ec_enabled);
|
|
|