macro cleanup: "(const override)" -> "(const, override)"

Bug: None
Change-Id: Iffd5db39b1a5ae70b403193b40054df04cf5600b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/362800
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43065}

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(std::string, tones, (), (const, override));
-  MOCK_METHOD(int, duration, (), (const override));
+  MOCK_METHOD(int, duration, (), (const, override));
-  MOCK_METHOD(int, inter_tone_gap, (), (const override));
+  MOCK_METHOD(int, inter_tone_gap, (), (const, override));
 
  protected:
   MockDtmfSender() = default;

api/test/mock_media_stream_interface.h

@@ -89,7 +89,7 @@ class MockAudioTrack : public rtc::RefCountedObject<AudioTrackInterface> {
 
 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<AudioTrackInterface>,

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,
               (),

api/test/mock_rtpsender.h

@@ -45,10 +45,8 @@ class MockRtpSender : public RtpSenderInterface {
               track,
               (),
               (const, override));
-  MOCK_METHOD(rtc::scoped_refptr<DtlsTransportInterface>,
+  MOCK_METHOD(rtc::scoped_refptr<DtlsTransportInterface>, dtls_transport, (),
-              dtls_transport,
+              (const, override));
-              (),
-              (const override));
   MOCK_METHOD(uint32_t, ssrc, (), (const, override));
   MOCK_METHOD(cricket::MediaType, media_type, (), (const, override));
   MOCK_METHOD(std::string, id, (), (const, override));

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<const uint32_t>,
+  MOCK_METHOD(rtc::ArrayView<const uint32_t>, GetContributingSources, (),
-              GetContributingSources,
+              (const, override));
-              (),
-              (const override));
   MOCK_METHOD(const std::optional<uint16_t>,
               SequenceNumber,
               (),

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, GetDelayMs, (uint32_t rtp_timestamp), (const, override));
-  MOCK_METHOD(int, GetMaxDelayMs, (), (const override));
+  MOCK_METHOD(int, GetMaxDelayMs, (), (const, override));
 };
 
 }  // namespace webrtc

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,
+  MOCK_METHOD(bool, CanSendPacket, (const RtpPacketToSend& packet),
-              CanSendPacket,
+              (const, override));
-              (const RtpPacketToSend& packet),
-              (const override));
   MOCK_METHOD(void,
               AssignSequenceNumber,
               (RtpPacketToSend & packet),

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<const rtc::Network*>,
+  MOCK_METHOD(std::vector<const rtc::Network*>, GetNetworks, (),
-              GetNetworks,
+              (const, override));
-              (),
-              (const override));
   MOCK_METHOD(std::vector<const rtc::Network*>,
               GetAnyAddressNetworks,
               (),

test/network/network_emulation_unittest.cc

@@ -88,7 +88,8 @@ class MockNetworkBehaviourInterface : public NetworkBehaviorInterface {
               DequeueDeliverablePackets,
               (int64_t),
               (override));
-  MOCK_METHOD(std::optional<int64_t>, NextDeliveryTimeUs, (), (const override));
+  MOCK_METHOD(std::optional<int64_t>, NextDeliveryTimeUs, (),
+              (const, override));
   MOCK_METHOD(void,
               RegisterDeliveryTimeChangedCallback,
               (absl::AnyInvocable<void()>),

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

video/decode_synchronizer_unittest.cc

@@ -39,7 +39,7 @@ class MockMetronome : public Metronome {
               RequestCallOnNextTick,
               (absl::AnyInvocable<void() &&> callback),
               (override));
-  MOCK_METHOD(TimeDelta, TickPeriod, (), (const override));
+  MOCK_METHOD(TimeDelta, TickPeriod, (), (const, override));
 };
 
 class DecodeSynchronizerTest : public ::testing::Test {