From a8829eb5f32e85a99ed889fa987f58be2f980933 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 18 Sep 2024 09:08:15 +0000 Subject: [PATCH] macro cleanup: "(const override)" -> "(const, override)" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: Iffd5db39b1a5ae70b403193b40054df04cf5600b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/362800 Reviewed-by: Henrik Boström Reviewed-by: Björn Terelius Reviewed-by: Harald Alvestrand Auto-Submit: Mirko Bonadei Commit-Queue: Harald Alvestrand Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/main@{#43065} --- api/test/mock_dtmf_sender.h | 6 +++--- api/test/mock_media_stream_interface.h | 2 +- api/test/mock_peerconnectioninterface.h | 2 +- api/test/mock_rtpsender.h | 6 ++---- api/test/mock_transformable_audio_frame.h | 6 ++---- .../audio_coding/neteq/mock/mock_packet_arrival_history.h | 4 ++-- modules/rtp_rtcp/mocks/mock_rtp_rtcp.h | 6 ++---- pc/peer_connection_factory_unittest.cc | 6 ++---- test/network/network_emulation_unittest.cc | 3 ++- test/testsupport/mock/mock_frame_reader.h | 2 +- video/decode_synchronizer_unittest.cc | 2 +- 11 files changed, 19 insertions(+), 26 deletions(-) diff --git a/api/test/mock_dtmf_sender.h b/api/test/mock_dtmf_sender.h index ec60ccba25..4d6509ab26 100644 --- a/api/test/mock_dtmf_sender.h +++ b/api/test/mock_dtmf_sender.h @@ -45,9 +45,9 @@ class MockDtmfSender : public DtmfSenderInterface { (override)); MOCK_METHOD(void, UnregisterObserver, (), (override)); MOCK_METHOD(bool, CanInsertDtmf, (), (override)); - MOCK_METHOD(std::string, tones, (), (const override)); - MOCK_METHOD(int, duration, (), (const override)); - MOCK_METHOD(int, inter_tone_gap, (), (const override)); + MOCK_METHOD(std::string, tones, (), (const, override)); + MOCK_METHOD(int, duration, (), (const, override)); + MOCK_METHOD(int, inter_tone_gap, (), (const, override)); protected: MockDtmfSender() = default; diff --git a/api/test/mock_media_stream_interface.h b/api/test/mock_media_stream_interface.h index 34e0c6045a..a22b94079f 100644 --- a/api/test/mock_media_stream_interface.h +++ b/api/test/mock_media_stream_interface.h @@ -89,7 +89,7 @@ class MockAudioTrack : public rtc::RefCountedObject { class MockMediaStream : public MediaStreamInterface { public: - MOCK_METHOD(std::string, id, (), (const override)); + MOCK_METHOD(std::string, id, (), (const, override)); MOCK_METHOD(AudioTrackVector, GetAudioTracks, (), (override)); MOCK_METHOD(VideoTrackVector, GetVideoTracks, (), (override)); MOCK_METHOD(rtc::scoped_refptr, diff --git a/api/test/mock_peerconnectioninterface.h b/api/test/mock_peerconnectioninterface.h index 2b985f431f..f607448012 100644 --- a/api/test/mock_peerconnectioninterface.h +++ b/api/test/mock_peerconnectioninterface.h @@ -234,7 +234,7 @@ class MockPeerConnectionInterface : public webrtc::PeerConnectionInterface { (override)); MOCK_METHOD(void, StopRtcEventLog, (), (override)); MOCK_METHOD(void, Close, (), (override)); - MOCK_METHOD(rtc::Thread*, signaling_thread, (), (const override)); + MOCK_METHOD(rtc::Thread*, signaling_thread, (), (const, override)); MOCK_METHOD(NetworkControllerInterface*, GetNetworkController, (), diff --git a/api/test/mock_rtpsender.h b/api/test/mock_rtpsender.h index 6e85451195..4552281f9d 100644 --- a/api/test/mock_rtpsender.h +++ b/api/test/mock_rtpsender.h @@ -45,10 +45,8 @@ class MockRtpSender : public RtpSenderInterface { track, (), (const, override)); - MOCK_METHOD(rtc::scoped_refptr, - dtls_transport, - (), - (const override)); + MOCK_METHOD(rtc::scoped_refptr, dtls_transport, (), + (const, override)); MOCK_METHOD(uint32_t, ssrc, (), (const, override)); MOCK_METHOD(cricket::MediaType, media_type, (), (const, override)); MOCK_METHOD(std::string, id, (), (const, override)); diff --git a/api/test/mock_transformable_audio_frame.h b/api/test/mock_transformable_audio_frame.h index 899624b986..7806dd15fd 100644 --- a/api/test/mock_transformable_audio_frame.h +++ b/api/test/mock_transformable_audio_frame.h @@ -33,10 +33,8 @@ class MockTransformableAudioFrame : public TransformableAudioFrameInterface { MOCK_METHOD(uint32_t, GetSsrc, (), (const, override)); MOCK_METHOD(uint32_t, GetTimestamp, (), (const, override)); MOCK_METHOD(std::string, GetMimeType, (), (const, override)); - MOCK_METHOD(rtc::ArrayView, - GetContributingSources, - (), - (const override)); + MOCK_METHOD(rtc::ArrayView, GetContributingSources, (), + (const, override)); MOCK_METHOD(const std::optional, SequenceNumber, (), diff --git a/modules/audio_coding/neteq/mock/mock_packet_arrival_history.h b/modules/audio_coding/neteq/mock/mock_packet_arrival_history.h index d4217cf2f8..23731d093b 100644 --- a/modules/audio_coding/neteq/mock/mock_packet_arrival_history.h +++ b/modules/audio_coding/neteq/mock/mock_packet_arrival_history.h @@ -22,8 +22,8 @@ class MockPacketArrivalHistory : public PacketArrivalHistory { MockPacketArrivalHistory(const TickTimer* tick_timer) : PacketArrivalHistory(tick_timer, 0) {} - MOCK_METHOD(int, GetDelayMs, (uint32_t rtp_timestamp), (const override)); - MOCK_METHOD(int, GetMaxDelayMs, (), (const override)); + MOCK_METHOD(int, GetDelayMs, (uint32_t rtp_timestamp), (const, override)); + MOCK_METHOD(int, GetMaxDelayMs, (), (const, override)); }; } // namespace webrtc diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h index 4406ad6483..0255ff3259 100644 --- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h +++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h @@ -83,10 +83,8 @@ class MockRtpRtcpInterface : public RtpRtcpInterface { OnSendingRtpFrame, (uint32_t, int64_t, int, bool), (override)); - MOCK_METHOD(bool, - CanSendPacket, - (const RtpPacketToSend& packet), - (const override)); + MOCK_METHOD(bool, CanSendPacket, (const RtpPacketToSend& packet), + (const, override)); MOCK_METHOD(void, AssignSequenceNumber, (RtpPacketToSend & packet), diff --git a/pc/peer_connection_factory_unittest.cc b/pc/peer_connection_factory_unittest.cc index eb10a6c4dd..a9fb648dc0 100644 --- a/pc/peer_connection_factory_unittest.cc +++ b/pc/peer_connection_factory_unittest.cc @@ -114,10 +114,8 @@ class MockNetworkManager : public rtc::NetworkManager { public: MOCK_METHOD(void, StartUpdating, (), (override)); MOCK_METHOD(void, StopUpdating, (), (override)); - MOCK_METHOD(std::vector, - GetNetworks, - (), - (const override)); + MOCK_METHOD(std::vector, GetNetworks, (), + (const, override)); MOCK_METHOD(std::vector, GetAnyAddressNetworks, (), diff --git a/test/network/network_emulation_unittest.cc b/test/network/network_emulation_unittest.cc index b6443612d1..1057d6d769 100644 --- a/test/network/network_emulation_unittest.cc +++ b/test/network/network_emulation_unittest.cc @@ -88,7 +88,8 @@ class MockNetworkBehaviourInterface : public NetworkBehaviorInterface { DequeueDeliverablePackets, (int64_t), (override)); - MOCK_METHOD(std::optional, NextDeliveryTimeUs, (), (const override)); + MOCK_METHOD(std::optional, NextDeliveryTimeUs, (), + (const, override)); MOCK_METHOD(void, RegisterDeliveryTimeChangedCallback, (absl::AnyInvocable), diff --git a/test/testsupport/mock/mock_frame_reader.h b/test/testsupport/mock/mock_frame_reader.h index f68bbf8368..ee35c2e268 100644 --- a/test/testsupport/mock/mock_frame_reader.h +++ b/test/testsupport/mock/mock_frame_reader.h @@ -31,7 +31,7 @@ class MockFrameReader : public FrameReader { ReadFrame, (int, Resolution), (override)); - MOCK_METHOD(int, num_frames, (), (const override)); + MOCK_METHOD(int, num_frames, (), (const, override)); }; } // namespace test diff --git a/video/decode_synchronizer_unittest.cc b/video/decode_synchronizer_unittest.cc index fb48a7e3f6..2f4f89018b 100644 --- a/video/decode_synchronizer_unittest.cc +++ b/video/decode_synchronizer_unittest.cc @@ -39,7 +39,7 @@ class MockMetronome : public Metronome { RequestCallOnNextTick, (absl::AnyInvocable callback), (override)); - MOCK_METHOD(TimeDelta, TickPeriod, (), (const override)); + MOCK_METHOD(TimeDelta, TickPeriod, (), (const, override)); }; class DecodeSynchronizerTest : public ::testing::Test {