Replace "(const override)" with "(const, override)" in GMOCKs
Just applied a short sed script. See bug description for
the motiviation for this change.
This is the command that was used to generate the changes:
$ find . -type f \( -iname '*.cc' -o -iname '*.h' \) -print0 | \
xargs -0 sed -i -e 's/(const override)/(const, override)/'
Bug: webrtc:13090
Change-Id: Iec7d280f9d55263a972dbb3bd644ebfcd2eb38cf
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/249088
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Ali Tofigh <alito@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35801}
diff --git a/api/test/mock_async_dns_resolver.h b/api/test/mock_async_dns_resolver.h
index e863cac..7cc17a8 100644
--- a/api/test/mock_async_dns_resolver.h
+++ b/api/test/mock_async_dns_resolver.h
@@ -24,8 +24,8 @@
MOCK_METHOD(bool,
GetResolvedAddress,
(int, rtc::SocketAddress*),
- (const override));
- MOCK_METHOD(int, GetError, (), (const override));
+ (const, override));
+ MOCK_METHOD(int, GetError, (), (const, override));
};
class MockAsyncDnsResolver : public AsyncDnsResolverInterface {
@@ -34,7 +34,7 @@
Start,
(const rtc::SocketAddress&, std::function<void()>),
(override));
- MOCK_METHOD(AsyncDnsResolverResult&, result, (), (const override));
+ MOCK_METHOD(AsyncDnsResolverResult&, result, (), (const, override));
};
class MockAsyncDnsResolverFactory : public AsyncDnsResolverFactoryInterface {
diff --git a/api/test/mock_media_stream_interface.h b/api/test/mock_media_stream_interface.h
index 95d581d..17a30a8 100644
--- a/api/test/mock_media_stream_interface.h
+++ b/api/test/mock_media_stream_interface.h
@@ -67,7 +67,7 @@
(ObserverInterface * observer),
(override));
MOCK_METHOD(std::string, kind, (), (const, override));
- MOCK_METHOD(std::string, id, (), (const override));
+ MOCK_METHOD(std::string, id, (), (const, override));
MOCK_METHOD(bool, enabled, (), (const, override));
MOCK_METHOD(bool, set_enabled, (bool enable), (override));
MOCK_METHOD(TrackState, state, (), (const, override));
diff --git a/api/test/mock_peer_connection_factory_interface.h b/api/test/mock_peer_connection_factory_interface.h
index 0454d89..6bab595 100644
--- a/api/test/mock_peer_connection_factory_interface.h
+++ b/api/test/mock_peer_connection_factory_interface.h
@@ -48,11 +48,11 @@
MOCK_METHOD(RtpCapabilities,
GetRtpSenderCapabilities,
(cricket::MediaType),
- (const override));
+ (const, override));
MOCK_METHOD(RtpCapabilities,
GetRtpReceiverCapabilities,
(cricket::MediaType),
- (const override));
+ (const, override));
MOCK_METHOD(rtc::scoped_refptr<MediaStreamInterface>,
CreateLocalMediaStream,
(const std::string&),
diff --git a/api/test/mock_peerconnectioninterface.h b/api/test/mock_peerconnectioninterface.h
index 025e19c..dac9944 100644
--- a/api/test/mock_peerconnectioninterface.h
+++ b/api/test/mock_peerconnectioninterface.h
@@ -77,15 +77,15 @@
MOCK_METHOD(std::vector<rtc::scoped_refptr<RtpSenderInterface>>,
GetSenders,
(),
- (const override));
+ (const, override));
MOCK_METHOD(std::vector<rtc::scoped_refptr<RtpReceiverInterface>>,
GetReceivers,
(),
- (const override));
+ (const, override));
MOCK_METHOD(std::vector<rtc::scoped_refptr<RtpTransceiverInterface>>,
GetTransceivers,
(),
- (const override));
+ (const, override));
MOCK_METHOD(bool,
GetStats,
(StatsObserver*, MediaStreamTrackInterface*, StatsOutputLevel),
@@ -105,7 +105,7 @@
MOCK_METHOD(rtc::scoped_refptr<SctpTransportInterface>,
GetSctpTransport,
(),
- (const override));
+ (const, override));
MOCK_METHOD(RTCErrorOr<rtc::scoped_refptr<DataChannelInterface>>,
CreateDataChannelOrError,
(const std::string&, const DataChannelInit*),
@@ -113,27 +113,27 @@
MOCK_METHOD(const SessionDescriptionInterface*,
local_description,
(),
- (const override));
+ (const, override));
MOCK_METHOD(const SessionDescriptionInterface*,
remote_description,
(),
- (const override));
+ (const, override));
MOCK_METHOD(const SessionDescriptionInterface*,
current_local_description,
(),
- (const override));
+ (const, override));
MOCK_METHOD(const SessionDescriptionInterface*,
current_remote_description,
(),
- (const override));
+ (const, override));
MOCK_METHOD(const SessionDescriptionInterface*,
pending_local_description,
(),
- (const override));
+ (const, override));
MOCK_METHOD(const SessionDescriptionInterface*,
pending_remote_description,
(),
- (const override));
+ (const, override));
MOCK_METHOD(void, RestartIce, (), (override));
MOCK_METHOD(void,
CreateOffer,
diff --git a/api/test/mock_rtpreceiver.h b/api/test/mock_rtpreceiver.h
index a0b79e0..4bcf064 100644
--- a/api/test/mock_rtpreceiver.h
+++ b/api/test/mock_rtpreceiver.h
@@ -24,20 +24,20 @@
MOCK_METHOD(rtc::scoped_refptr<MediaStreamTrackInterface>,
track,
(),
- (const override));
+ (const, override));
MOCK_METHOD(std::vector<rtc::scoped_refptr<MediaStreamInterface>>,
streams,
(),
- (const override));
- MOCK_METHOD(cricket::MediaType, media_type, (), (const override));
- MOCK_METHOD(std::string, id, (), (const override));
- MOCK_METHOD(RtpParameters, GetParameters, (), (const override));
+ (const, override));
+ MOCK_METHOD(cricket::MediaType, media_type, (), (const, override));
+ MOCK_METHOD(std::string, id, (), (const, override));
+ MOCK_METHOD(RtpParameters, GetParameters, (), (const, override));
MOCK_METHOD(void, SetObserver, (RtpReceiverObserverInterface*), (override));
MOCK_METHOD(void,
SetJitterBufferMinimumDelay,
(absl::optional<double>),
(override));
- MOCK_METHOD(std::vector<RtpSource>, GetSources, (), (const override));
+ MOCK_METHOD(std::vector<RtpSource>, GetSources, (), (const, override));
};
} // namespace webrtc
diff --git a/api/test/mock_rtpsender.h b/api/test/mock_rtpsender.h
index f12a618..e4d6399 100644
--- a/api/test/mock_rtpsender.h
+++ b/api/test/mock_rtpsender.h
@@ -25,21 +25,21 @@
MOCK_METHOD(rtc::scoped_refptr<MediaStreamTrackInterface>,
track,
(),
- (const override));
- MOCK_METHOD(uint32_t, ssrc, (), (const override));
- MOCK_METHOD(cricket::MediaType, media_type, (), (const override));
- MOCK_METHOD(std::string, id, (), (const override));
- MOCK_METHOD(std::vector<std::string>, stream_ids, (), (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));
+ MOCK_METHOD(std::vector<std::string>, stream_ids, (), (const, override));
MOCK_METHOD(std::vector<RtpEncodingParameters>,
init_send_encodings,
(),
- (const override));
- MOCK_METHOD(RtpParameters, GetParameters, (), (const override));
+ (const, override));
+ MOCK_METHOD(RtpParameters, GetParameters, (), (const, override));
MOCK_METHOD(RTCError, SetParameters, (const RtpParameters&), (override));
MOCK_METHOD(rtc::scoped_refptr<DtmfSenderInterface>,
GetDtmfSender,
(),
- (const override));
+ (const, override));
};
} // namespace webrtc
diff --git a/api/test/mock_transformable_video_frame.h b/api/test/mock_transformable_video_frame.h
index 36798b5..5cebcab 100644
--- a/api/test/mock_transformable_video_frame.h
+++ b/api/test/mock_transformable_video_frame.h
@@ -21,9 +21,9 @@
class MockTransformableVideoFrame
: public webrtc::TransformableVideoFrameInterface {
public:
- MOCK_METHOD(rtc::ArrayView<const uint8_t>, GetData, (), (const override));
+ MOCK_METHOD(rtc::ArrayView<const uint8_t>, GetData, (), (const, override));
MOCK_METHOD(void, SetData, (rtc::ArrayView<const uint8_t> data), (override));
- MOCK_METHOD(uint32_t, GetTimestamp, (), (const override));
+ MOCK_METHOD(uint32_t, GetTimestamp, (), (const, override));
MOCK_METHOD(uint32_t, GetSsrc, (), (const, override));
MOCK_METHOD(bool, IsKeyFrame, (), (const, override));
MOCK_METHOD(std::vector<uint8_t>, GetAdditionalData, (), (const, override));