zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace "(const override)" with "(const, override)" in GMOCKs

Browse Source 
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}
This commit is contained in:
Ali Tofigh
2022-01-25 14:06:33 +01:00
committed by WebRTC LUCI CQ
parent 236d7e7e46
commit c98687a2ef
9 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/test/mock_async_dns_resolver.h
View File

@ -24,8 +24,8 @@ class MockAsyncDnsResolverResult : public AsyncDnsResolverResult {
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 @@ class MockAsyncDnsResolver : public AsyncDnsResolverInterface {
Start,
(const rtc::SocketAddress&, std::function<void()>),
(override));
MOCK_METHOD(AsyncDnsResolverResult&, result, (), (const override));
MOCK_METHOD(AsyncDnsResolverResult&, result, (), (const, override));
};
class MockAsyncDnsResolverFactory : public AsyncDnsResolverFactoryInterface {

2
api/test/mock_media_stream_interface.h
View File

@ -67,7 +67,7 @@ class MockAudioTrack final : public rtc::RefCountedObject<AudioTrackInterface> {
(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));

4
api/test/mock_peer_connection_factory_interface.h
View File

@ -48,11 +48,11 @@ class MockPeerConnectionFactoryInterface final
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&),

20
api/test/mock_peerconnectioninterface.h
View File

@ -77,15 +77,15 @@ class MockPeerConnectionInterface
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 @@ class MockPeerConnectionInterface
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 @@ class MockPeerConnectionInterface
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,

12
api/test/mock_rtpreceiver.h
View File

@ -24,20 +24,20 @@ class MockRtpReceiver : public rtc::RefCountedObject<RtpReceiverInterface> {
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

16
api/test/mock_rtpsender.h
View File

@ -25,21 +25,21 @@ class MockRtpSender : public rtc::RefCountedObject<RtpSenderInterface> {
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

4
api/test/mock_transformable_video_frame.h
View File

@ -21,9 +21,9 @@ namespace webrtc {
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));

2
modules/audio_processing/agc2/vad_wrapper_unittest.cc
View File

@ -40,7 +40,7 @@ constexpr int kSampleRate8kHz = 8000;
class MockVad : public VoiceActivityDetectorWrapper::MonoVad {
public:
MOCK_METHOD(int, SampleRateHz, (), (const override));
MOCK_METHOD(int, SampleRateHz, (), (const, override));
MOCK_METHOD(void, Reset, (), (override));
MOCK_METHOD(float, Analyze, (rtc::ArrayView<const float> frame), (override));
};

12
pc/test/mock_voice_media_channel.h
View File

@ -50,7 +50,7 @@ class MockVoiceMediaChannel : public VoiceMediaChannel {
MOCK_METHOD(void, ResetUnsignaledRecvStream, (), (override));
MOCK_METHOD(void, OnDemuxerCriteriaUpdatePending, (), (override));
MOCK_METHOD(void, OnDemuxerCriteriaUpdateComplete, (), (override));
MOCK_METHOD(int, GetRtpSendTimeExtnId, (), (const override));
MOCK_METHOD(int, GetRtpSendTimeExtnId, (), (const, override));
MOCK_METHOD(
void,
SetFrameEncryptor,
@ -67,7 +67,7 @@ class MockVoiceMediaChannel : public VoiceMediaChannel {
MOCK_METHOD(webrtc::RtpParameters,
GetRtpSendParameters,
(uint32_t ssrc),
(const override));
(const, override));
MOCK_METHOD(webrtc::RTCError,
SetRtpSendParameters,
(uint32_t ssrc, const webrtc::RtpParameters& parameters),
@ -96,11 +96,11 @@ class MockVoiceMediaChannel : public VoiceMediaChannel {
MOCK_METHOD(webrtc::RtpParameters,
GetRtpReceiveParameters,
(uint32_t ssrc),
(const override));
(const, override));
MOCK_METHOD(webrtc::RtpParameters,
GetDefaultRtpReceiveParameters,
(),
(const override));
(const, override));
MOCK_METHOD(void, SetPlayout, (bool playout), (override));
MOCK_METHOD(void, SetSend, (bool send), (override));
MOCK_METHOD(bool,
@ -135,7 +135,7 @@ class MockVoiceMediaChannel : public VoiceMediaChannel {
MOCK_METHOD(std::vector<webrtc::RtpSource>,
GetSources,
(uint32_t ssrc),
(const override));
(const, override));
MOCK_METHOD(bool,
SetBaseMinimumPlayoutDelayMs,
@ -144,7 +144,7 @@ class MockVoiceMediaChannel : public VoiceMediaChannel {
MOCK_METHOD(absl::optional<int>,
GetBaseMinimumPlayoutDelayMs,
(uint32_t ssrc),
(const override));
(const, override));
};
} // namespace cricket