diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc index f2a14ea9cf..b40332e5db 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc +++ b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc @@ -92,7 +92,7 @@ class BitrateControllerTest : public ::testing::Test { TestBitrateObserver bitrate_observer_; BitrateController* controller_; RtcpBandwidthObserver* bandwidth_observer_; - webrtc::MockRtcEventLog event_log_; + testing::NiceMock event_log_; }; TEST_F(BitrateControllerTest, DefaultMinMaxBitrate) { @@ -109,7 +109,6 @@ TEST_F(BitrateControllerTest, DefaultMinMaxBitrate) { TEST_F(BitrateControllerTest, OneBitrateObserverOneRtcpObserver) { // First REMB applies immediately. - EXPECT_CALL(event_log_, LogBwePacketLossEvent(testing::Gt(0), 0, 0)).Times(8); int64_t time_ms = 1001; webrtc::ReportBlockList report_blocks; report_blocks.push_back(CreateReportBlock(1, 2, 0, 1)); @@ -186,7 +185,6 @@ TEST_F(BitrateControllerTest, OneBitrateObserverOneRtcpObserver) { TEST_F(BitrateControllerTest, OneBitrateObserverTwoRtcpObservers) { // REMBs during the first 2 seconds apply immediately. - EXPECT_CALL(event_log_, LogBwePacketLossEvent(testing::Gt(0), 0, 0)).Times(9); int64_t time_ms = 1; webrtc::ReportBlockList report_blocks; report_blocks.push_back(CreateReportBlock(1, 2, 0, 1)); @@ -282,13 +280,6 @@ TEST_F(BitrateControllerTest, OneBitrateObserverTwoRtcpObservers) { } TEST_F(BitrateControllerTest, OneBitrateObserverMultipleReportBlocks) { - testing::Expectation first_calls = - EXPECT_CALL(event_log_, LogBwePacketLossEvent(testing::Gt(0), 0, 0)) - .Times(7); - EXPECT_CALL(event_log_, - LogBwePacketLossEvent(testing::Gt(0), testing::Gt(0), 0)) - .Times(2) - .After(first_calls); uint32_t sequence_number[2] = {0, 0xFF00}; const int kStartBitrate = 200000; const int kMinBitrate = 100000; diff --git a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc index aa4a5d3330..ce2258bf5e 100644 --- a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc +++ b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc @@ -52,7 +52,7 @@ class CongestionControllerTest : public ::testing::Test { StrictMock observer_; NiceMock* pacer_; NiceMock remote_bitrate_observer_; - MockRtcEventLog event_log_; + NiceMock event_log_; std::unique_ptr bandwidth_observer_; std::unique_ptr controller_; const uint32_t kInitialBitrateBps = 60000; diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h index 5840aef963..d9e4f571f3 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h @@ -46,7 +46,7 @@ class RembBweSender : public BweSender { private: Clock* clock_; - MockRtcEventLog event_log_; + ::testing::NiceMock event_log_; RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RembBweSender); }; diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h index 9eb0c1a1d3..bbe3eac01c 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h @@ -47,7 +47,7 @@ class FullBweSender : public BweSender, public RemoteBitrateObserver { bool has_received_ack_; uint16_t last_acked_seq_num_; int64_t last_log_time_ms_; - MockRtcEventLog event_log_; + ::testing::NiceMock event_log_; RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FullBweSender); };