diff --git a/audio/BUILD.gn b/audio/BUILD.gn index 488d62d0e5..82c64821f2 100644 --- a/audio/BUILD.gn +++ b/audio/BUILD.gn @@ -149,7 +149,6 @@ if (rtc_include_tests) { "../modules/audio_mixer:audio_mixer_impl", "../modules/audio_processing:audio_processing_statistics", "../modules/audio_processing:mocks", - "../modules/bitrate_controller:mocks", "../modules/pacing:pacing", "../modules/rtp_rtcp:mock_rtp_rtcp", "../modules/rtp_rtcp:rtp_rtcp_format", diff --git a/audio/audio_receive_stream_unittest.cc b/audio/audio_receive_stream_unittest.cc index 1ba9b69c77..76ebeae4d4 100644 --- a/audio/audio_receive_stream_unittest.cc +++ b/audio/audio_receive_stream_unittest.cc @@ -22,7 +22,6 @@ #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "modules/audio_device/include/mock_audio_device.h" #include "modules/audio_processing/include/mock_audio_processing.h" -#include "modules/bitrate_controller/include/mock/mock_bitrate_controller.h" #include "modules/pacing/packet_router.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "rtc_base/time_utils.h" diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn index 0767c56ace..1f013f89db 100644 --- a/modules/bitrate_controller/BUILD.gn +++ b/modules/bitrate_controller/BUILD.gn @@ -53,17 +53,6 @@ rtc_static_library("bitrate_controller") { } if (rtc_include_tests) { - rtc_source_set("mocks") { - testonly = true - sources = [ - "include/mock/mock_bitrate_controller.h", - ] - deps = [ - ":bitrate_controller", - "../../test:test_support", - ] - } - rtc_source_set("bitrate_controller_unittests") { testonly = true diff --git a/modules/bitrate_controller/include/mock/mock_bitrate_controller.h b/modules/bitrate_controller/include/mock/mock_bitrate_controller.h deleted file mode 100644 index d33f07b216..0000000000 --- a/modules/bitrate_controller/include/mock/mock_bitrate_controller.h +++ /dev/null @@ -1,53 +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. - */ - -#ifndef MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_ -#define MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_ - -#include "modules/bitrate_controller/include/bitrate_controller.h" -#include "test/gmock.h" - -namespace webrtc { -namespace test { - -class MockBitrateObserver : public BitrateObserver { - public: - MOCK_METHOD3(OnNetworkChanged, - void(uint32_t bitrate_bps, - uint8_t fraction_loss, - int64_t rtt_ms)); -}; - -class MockBitrateController : public BitrateController { - public: - MOCK_METHOD0(CreateRtcpBandwidthObserver, RtcpBandwidthObserver*()); - MOCK_METHOD1(SetStartBitrate, void(int start_bitrate_bps)); - MOCK_METHOD2(SetMinMaxBitrate, - void(int min_bitrate_bps, int max_bitrate_bps)); - MOCK_METHOD3(SetBitrates, - void(int start_bitrate_bps, - int min_bitrate_bps, - int max_bitrate_bps)); - MOCK_METHOD3(ResetBitrates, - void(int bitrate_bps, int min_bitrate_bps, int max_bitrate_bps)); - MOCK_METHOD1(UpdateDelayBasedEstimate, void(uint32_t bitrate_bps)); - MOCK_METHOD1(UpdateProbeBitrate, void(uint32_t bitrate_bps)); - MOCK_METHOD1(SetEventLog, void(RtcEventLog* event_log)); - MOCK_CONST_METHOD1(AvailableBandwidth, bool(uint32_t* bandwidth)); - MOCK_METHOD3(GetNetworkParameters, - bool(uint32_t* bitrate, uint8_t* fraction_loss, int64_t* rtt)); - - MOCK_METHOD0(Process, void()); - MOCK_METHOD0(TimeUntilNextProcess, int64_t()); -}; -} // namespace test -} // namespace webrtc - -#endif // MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_ diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn index 194464d7ee..0a9943310b 100644 --- a/modules/congestion_controller/BUILD.gn +++ b/modules/congestion_controller/BUILD.gn @@ -120,7 +120,6 @@ if (rtc_include_tests) { "../../test:field_trial", "../../test:test_support", "../bitrate_controller:bitrate_controller", - "../bitrate_controller:mocks", "../pacing:mock_paced_sender", "../pacing:pacing", "../remote_bitrate_estimator:remote_bitrate_estimator", diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn index ce792105a1..d3c705c7c7 100644 --- a/modules/congestion_controller/rtp/BUILD.gn +++ b/modules/congestion_controller/rtp/BUILD.gn @@ -91,7 +91,6 @@ if (rtc_include_tests) { "../../../system_wrappers", "../../../test:field_trial", "../../../test:test_support", - "../../bitrate_controller:mocks", "../../pacing:mock_paced_sender", "../../pacing:pacing", "../../remote_bitrate_estimator:remote_bitrate_estimator", diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc index e48ac5984d..fe982e241f 100644 --- a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc +++ b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc @@ -12,7 +12,6 @@ #include #include -#include "modules/bitrate_controller/include/mock/mock_bitrate_controller.h" #include "modules/congestion_controller/rtp/congestion_controller_unittests_helper.h" #include "modules/congestion_controller/rtp/transport_feedback_adapter.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/modules/congestion_controller/transport_feedback_adapter_unittest.cc b/modules/congestion_controller/transport_feedback_adapter_unittest.cc index dc4eab13d6..eca4a94e65 100644 --- a/modules/congestion_controller/transport_feedback_adapter_unittest.cc +++ b/modules/congestion_controller/transport_feedback_adapter_unittest.cc @@ -12,7 +12,6 @@ #include #include -#include "modules/bitrate_controller/include/mock/mock_bitrate_controller.h" #include "modules/congestion_controller/rtp/congestion_controller_unittests_helper.h" #include "modules/congestion_controller/transport_feedback_adapter.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"