Remove redundant webrtc:: prefixes in api/test
Created by
tools_webrtc/remove_extra_namespace.py --namespace webrtc
and manual adjustments.
This CL was uploaded by git cl split.
R=eshr@webrtc.org
No-IWYU: Refactoring
Bug: webrtc:42232595
Change-Id: Ic74bea96c06d7d9cfcb2e36bcb381a1b81b3d521
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/396164
Auto-Submit: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Reviewed-by: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44913}
diff --git a/api/test/fake_frame_decryptor.h b/api/test/fake_frame_decryptor.h
index f204a91..b3a7997 100644
--- a/api/test/fake_frame_decryptor.h
+++ b/api/test/fake_frame_decryptor.h
@@ -34,13 +34,13 @@
uint8_t expected_postfix_byte = 255);
// Fake decryption that just xors the payload with the 1 byte key and checks
// the postfix byte. This will always fail if fail_decryption_ is set to true.
- Result Decrypt(webrtc::MediaType media_type,
+ Result Decrypt(MediaType media_type,
const std::vector<uint32_t>& csrcs,
ArrayView<const uint8_t> additional_data,
ArrayView<const uint8_t> encrypted_frame,
ArrayView<uint8_t> frame) override;
// Always returns 1 less than the size of the encrypted frame.
- size_t GetMaxPlaintextByteSize(webrtc::MediaType media_type,
+ size_t GetMaxPlaintextByteSize(MediaType media_type,
size_t encrypted_frame_size) override;
// Sets the fake key to use for encryption.
void SetFakeKey(uint8_t fake_key);
diff --git a/api/test/fake_frame_encryptor.h b/api/test/fake_frame_encryptor.h
index 4cb615b..eae0e41 100644
--- a/api/test/fake_frame_encryptor.h
+++ b/api/test/fake_frame_encryptor.h
@@ -32,14 +32,14 @@
uint8_t postfix_byte = 255);
// Simply xors each payload with the provided fake key and adds the postfix
// bit to the end. This will always fail if fail_encryption_ is set to true.
- int Encrypt(webrtc::MediaType media_type,
+ int Encrypt(MediaType media_type,
uint32_t ssrc,
ArrayView<const uint8_t> additional_data,
ArrayView<const uint8_t> frame,
ArrayView<uint8_t> encrypted_frame,
size_t* bytes_written) override;
// Always returns 1 more than the size of the frame.
- size_t GetMaxCiphertextByteSize(webrtc::MediaType media_type,
+ size_t GetMaxCiphertextByteSize(MediaType media_type,
size_t frame_size) override;
// Sets the fake key to use during encryption.
void SetFakeKey(uint8_t fake_key);
diff --git a/api/test/mock_async_dns_resolver.h b/api/test/mock_async_dns_resolver.h
index 5848972..3ae0557 100644
--- a/api/test/mock_async_dns_resolver.h
+++ b/api/test/mock_async_dns_resolver.h
@@ -24,7 +24,7 @@
public:
MOCK_METHOD(bool,
GetResolvedAddress,
- (int, webrtc::SocketAddress*),
+ (int, SocketAddress*),
(const, override));
MOCK_METHOD(int, GetError, (), (const, override));
};
@@ -33,28 +33,26 @@
public:
MOCK_METHOD(void,
Start,
- (const webrtc::SocketAddress&, absl::AnyInvocable<void()>),
+ (const SocketAddress&, absl::AnyInvocable<void()>),
(override));
MOCK_METHOD(void,
Start,
- (const webrtc::SocketAddress&,
- int family,
- absl::AnyInvocable<void()>),
+ (const SocketAddress&, int family, absl::AnyInvocable<void()>),
(override));
MOCK_METHOD(AsyncDnsResolverResult&, result, (), (const, override));
};
class MockAsyncDnsResolverFactory : public AsyncDnsResolverFactoryInterface {
public:
- MOCK_METHOD(std::unique_ptr<webrtc::AsyncDnsResolverInterface>,
+ MOCK_METHOD(std::unique_ptr<AsyncDnsResolverInterface>,
CreateAndResolve,
- (const webrtc::SocketAddress&, absl::AnyInvocable<void()>),
+ (const SocketAddress&, absl::AnyInvocable<void()>),
(override));
- MOCK_METHOD(std::unique_ptr<webrtc::AsyncDnsResolverInterface>,
+ MOCK_METHOD(std::unique_ptr<AsyncDnsResolverInterface>,
CreateAndResolve,
- (const webrtc::SocketAddress&, int, absl::AnyInvocable<void()>),
+ (const SocketAddress&, int, absl::AnyInvocable<void()>),
(override));
- MOCK_METHOD(std::unique_ptr<webrtc::AsyncDnsResolverInterface>,
+ MOCK_METHOD(std::unique_ptr<AsyncDnsResolverInterface>,
Create,
(),
(override));
diff --git a/api/test/mock_audio_sink.h b/api/test/mock_audio_sink.h
index dcb01cc..c2463ca 100644
--- a/api/test/mock_audio_sink.h
+++ b/api/test/mock_audio_sink.h
@@ -20,7 +20,7 @@
namespace webrtc {
-class MockAudioSink : public webrtc::AudioTrackSinkInterface {
+class MockAudioSink : public AudioTrackSinkInterface {
public:
MOCK_METHOD(void,
OnData,
diff --git a/api/test/mock_data_channel.h b/api/test/mock_data_channel.h
index 9a8ff8c..494f9ec 100644
--- a/api/test/mock_data_channel.h
+++ b/api/test/mock_data_channel.h
@@ -25,8 +25,7 @@
namespace webrtc {
-class MockDataChannelInterface
- : public RefCountedObject<webrtc::DataChannelInterface> {
+class MockDataChannelInterface : public RefCountedObject<DataChannelInterface> {
public:
static scoped_refptr<MockDataChannelInterface> Create() {
return scoped_refptr<MockDataChannelInterface>(
diff --git a/api/test/mock_dtmf_sender.h b/api/test/mock_dtmf_sender.h
index 3164975..7351ecd 100644
--- a/api/test/mock_dtmf_sender.h
+++ b/api/test/mock_dtmf_sender.h
@@ -53,8 +53,7 @@
MockDtmfSender() = default;
};
-static_assert(!std::is_abstract_v<webrtc::RefCountedObject<MockDtmfSender>>,
- "");
+static_assert(!std::is_abstract_v<RefCountedObject<MockDtmfSender>>, "");
} // namespace webrtc
diff --git a/api/test/mock_frame_decryptor.h b/api/test/mock_frame_decryptor.h
index 79062ba..191a7dd 100644
--- a/api/test/mock_frame_decryptor.h
+++ b/api/test/mock_frame_decryptor.h
@@ -26,16 +26,16 @@
public:
MOCK_METHOD(Result,
Decrypt,
- (webrtc::MediaType,
+ (MediaType,
const std::vector<uint32_t>&,
- webrtc::ArrayView<const uint8_t>,
- webrtc::ArrayView<const uint8_t>,
- webrtc::ArrayView<uint8_t>),
+ ArrayView<const uint8_t>,
+ ArrayView<const uint8_t>,
+ ArrayView<uint8_t>),
(override));
MOCK_METHOD(size_t,
GetMaxPlaintextByteSize,
- (webrtc::MediaType, size_t encrypted_frame_size),
+ (MediaType, size_t encrypted_frame_size),
(override));
};
diff --git a/api/test/mock_frame_encryptor.h b/api/test/mock_frame_encryptor.h
index 31f0a2c..a449a29 100644
--- a/api/test/mock_frame_encryptor.h
+++ b/api/test/mock_frame_encryptor.h
@@ -25,17 +25,17 @@
public:
MOCK_METHOD(int,
Encrypt,
- (webrtc::MediaType,
+ (MediaType,
uint32_t,
- webrtc::ArrayView<const uint8_t>,
- webrtc::ArrayView<const uint8_t>,
- webrtc::ArrayView<uint8_t>,
+ ArrayView<const uint8_t>,
+ ArrayView<const uint8_t>,
+ ArrayView<uint8_t>,
size_t*),
(override));
MOCK_METHOD(size_t,
GetMaxCiphertextByteSize,
- (webrtc::MediaType media_type, size_t frame_size),
+ (MediaType media_type, size_t frame_size),
(override));
};
diff --git a/api/test/mock_frame_transformer.h b/api/test/mock_frame_transformer.h
index 8dd311c..0684513 100644
--- a/api/test/mock_frame_transformer.h
+++ b/api/test/mock_frame_transformer.h
@@ -28,11 +28,11 @@
(override));
MOCK_METHOD(void,
RegisterTransformedFrameCallback,
- (webrtc::scoped_refptr<TransformedFrameCallback>),
+ (scoped_refptr<TransformedFrameCallback>),
(override));
MOCK_METHOD(void,
RegisterTransformedFrameSinkCallback,
- (webrtc::scoped_refptr<TransformedFrameCallback>, uint32_t),
+ (scoped_refptr<TransformedFrameCallback>, uint32_t),
(override));
MOCK_METHOD(void, UnregisterTransformedFrameCallback, (), (override));
MOCK_METHOD(void,
diff --git a/api/test/mock_media_stream_interface.h b/api/test/mock_media_stream_interface.h
index 0910f1d..d0f4522 100644
--- a/api/test/mock_media_stream_interface.h
+++ b/api/test/mock_media_stream_interface.h
@@ -102,19 +102,19 @@
(override));
MOCK_METHOD(bool,
AddTrack,
- (webrtc::scoped_refptr<AudioTrackInterface> track),
+ (scoped_refptr<AudioTrackInterface> track),
(override));
MOCK_METHOD(bool,
AddTrack,
- (webrtc::scoped_refptr<VideoTrackInterface> track),
+ (scoped_refptr<VideoTrackInterface> track),
(override));
MOCK_METHOD(bool,
RemoveTrack,
- (webrtc::scoped_refptr<AudioTrackInterface> track),
+ (scoped_refptr<AudioTrackInterface> track),
(override));
MOCK_METHOD(bool,
RemoveTrack,
- (webrtc::scoped_refptr<VideoTrackInterface> track),
+ (scoped_refptr<VideoTrackInterface> track),
(override));
MOCK_METHOD(void,
RegisterObserver,
@@ -126,8 +126,7 @@
(override));
};
-static_assert(!std::is_abstract_v<webrtc::RefCountedObject<MockMediaStream>>,
- "");
+static_assert(!std::is_abstract_v<RefCountedObject<MockMediaStream>>, "");
} // namespace webrtc
diff --git a/api/test/mock_peer_connection_factory_interface.h b/api/test/mock_peer_connection_factory_interface.h
index a297e58..4e75a10 100644
--- a/api/test/mock_peer_connection_factory_interface.h
+++ b/api/test/mock_peer_connection_factory_interface.h
@@ -29,7 +29,7 @@
namespace webrtc {
class MockPeerConnectionFactoryInterface
- : public RefCountedObject<webrtc::PeerConnectionFactoryInterface> {
+ : public RefCountedObject<PeerConnectionFactoryInterface> {
public:
static scoped_refptr<MockPeerConnectionFactoryInterface> Create() {
return scoped_refptr<MockPeerConnectionFactoryInterface>(
@@ -44,11 +44,11 @@
(override));
MOCK_METHOD(RtpCapabilities,
GetRtpSenderCapabilities,
- (webrtc::MediaType),
+ (MediaType),
(const, override));
MOCK_METHOD(RtpCapabilities,
GetRtpReceiverCapabilities,
- (webrtc::MediaType),
+ (MediaType),
(const, override));
MOCK_METHOD(scoped_refptr<MediaStreamInterface>,
CreateLocalMediaStream,
@@ -56,7 +56,7 @@
(override));
MOCK_METHOD(scoped_refptr<AudioSourceInterface>,
CreateAudioSource,
- (const webrtc::AudioOptions&),
+ (const AudioOptions&),
(override));
MOCK_METHOD(scoped_refptr<VideoTrackInterface>,
CreateVideoTrack,
@@ -64,8 +64,7 @@
(override));
MOCK_METHOD(scoped_refptr<VideoTrackInterface>,
CreateVideoTrack,
- (webrtc::scoped_refptr<VideoTrackSourceInterface>,
- absl::string_view),
+ (scoped_refptr<VideoTrackSourceInterface>, absl::string_view),
(override));
MOCK_METHOD(scoped_refptr<AudioTrackInterface>,
CreateAudioTrack,
diff --git a/api/test/mock_peerconnectioninterface.h b/api/test/mock_peerconnectioninterface.h
index 26fde30..575f4bc 100644
--- a/api/test/mock_peerconnectioninterface.h
+++ b/api/test/mock_peerconnectioninterface.h
@@ -47,7 +47,7 @@
namespace webrtc {
-class MockPeerConnectionInterface : public webrtc::PeerConnectionInterface {
+class MockPeerConnectionInterface : public PeerConnectionInterface {
public:
static scoped_refptr<MockPeerConnectionInterface> Create() {
return make_ref_counted<MockPeerConnectionInterface>();
@@ -66,35 +66,35 @@
MOCK_METHOD(void, RemoveStream, (MediaStreamInterface*), (override));
MOCK_METHOD(RTCErrorOr<scoped_refptr<RtpSenderInterface>>,
AddTrack,
- (webrtc::scoped_refptr<MediaStreamTrackInterface>,
+ (scoped_refptr<MediaStreamTrackInterface>,
const std::vector<std::string>&),
(override));
MOCK_METHOD(RTCErrorOr<scoped_refptr<RtpSenderInterface>>,
AddTrack,
- (webrtc::scoped_refptr<MediaStreamTrackInterface>,
+ (scoped_refptr<MediaStreamTrackInterface>,
const std::vector<std::string>&,
const std::vector<RtpEncodingParameters>&),
(override));
MOCK_METHOD(RTCError,
RemoveTrackOrError,
- (webrtc::scoped_refptr<RtpSenderInterface>),
+ (scoped_refptr<RtpSenderInterface>),
(override));
MOCK_METHOD(RTCErrorOr<scoped_refptr<RtpTransceiverInterface>>,
AddTransceiver,
- (webrtc::scoped_refptr<MediaStreamTrackInterface>),
+ (scoped_refptr<MediaStreamTrackInterface>),
(override));
MOCK_METHOD(RTCErrorOr<scoped_refptr<RtpTransceiverInterface>>,
AddTransceiver,
- (webrtc::scoped_refptr<MediaStreamTrackInterface>,
+ (scoped_refptr<MediaStreamTrackInterface>,
const RtpTransceiverInit&),
(override));
MOCK_METHOD(RTCErrorOr<scoped_refptr<RtpTransceiverInterface>>,
AddTransceiver,
- (webrtc::MediaType),
+ (MediaType),
(override));
MOCK_METHOD(RTCErrorOr<scoped_refptr<RtpTransceiverInterface>>,
AddTransceiver,
- (webrtc::MediaType, const RtpTransceiverInit&),
+ (MediaType, const RtpTransceiverInit&),
(override));
MOCK_METHOD(scoped_refptr<RtpSenderInterface>,
CreateSender,
@@ -119,13 +119,13 @@
MOCK_METHOD(void, GetStats, (RTCStatsCollectorCallback*), (override));
MOCK_METHOD(void,
GetStats,
- (webrtc::scoped_refptr<RtpSenderInterface>,
- webrtc::scoped_refptr<RTCStatsCollectorCallback>),
+ (scoped_refptr<RtpSenderInterface>,
+ scoped_refptr<RTCStatsCollectorCallback>),
(override));
MOCK_METHOD(void,
GetStats,
- (webrtc::scoped_refptr<RtpReceiverInterface>,
- webrtc::scoped_refptr<RTCStatsCollectorCallback>),
+ (scoped_refptr<RtpReceiverInterface>,
+ scoped_refptr<RTCStatsCollectorCallback>),
(override));
MOCK_METHOD(void, ClearStatsCache, (), (override));
MOCK_METHOD(scoped_refptr<SctpTransportInterface>,
@@ -180,7 +180,7 @@
MOCK_METHOD(void,
SetRemoteDescription,
(std::unique_ptr<SessionDescriptionInterface>,
- webrtc::scoped_refptr<SetRemoteDescriptionObserverInterface>),
+ scoped_refptr<SetRemoteDescriptionObserverInterface>),
(override));
MOCK_METHOD(bool,
ShouldFireNegotiationNeededEvent,
@@ -197,7 +197,7 @@
MOCK_METHOD(bool, AddIceCandidate, (const IceCandidate*), (override));
MOCK_METHOD(bool,
RemoveIceCandidates,
- (const std::vector<webrtc::Candidate>&),
+ (const std::vector<Candidate>&),
(override));
MOCK_METHOD(RTCError, SetBitrate, (const BitrateSettings&), (override));
MOCK_METHOD(void,
@@ -220,7 +220,7 @@
MOCK_METHOD(IceGatheringState, ice_gathering_state, (), (override));
MOCK_METHOD(void,
AddAdaptationResource,
- (webrtc::scoped_refptr<Resource>),
+ (scoped_refptr<Resource>),
(override));
MOCK_METHOD(std::optional<bool>, can_trickle_ice_candidates, (), (override));
MOCK_METHOD(bool,
@@ -245,7 +245,7 @@
};
static_assert(
- !std::is_abstract_v<webrtc::RefCountedObject<MockPeerConnectionInterface>>,
+ !std::is_abstract_v<RefCountedObject<MockPeerConnectionInterface>>,
"");
} // namespace webrtc
diff --git a/api/test/mock_rtp_transceiver.h b/api/test/mock_rtp_transceiver.h
index 6992c54..1a55efa 100644
--- a/api/test/mock_rtp_transceiver.h
+++ b/api/test/mock_rtp_transceiver.h
@@ -37,7 +37,7 @@
return make_ref_counted<MockRtpTransceiver>();
}
- MOCK_METHOD(webrtc::MediaType, media_type, (), (const, override));
+ MOCK_METHOD(MediaType, media_type, (), (const, override));
MOCK_METHOD(std::optional<std::string>, mid, (), (const, override));
MOCK_METHOD(scoped_refptr<RtpSenderInterface>, sender, (), (const, override));
MOCK_METHOD(scoped_refptr<RtpReceiverInterface>,
@@ -68,7 +68,7 @@
MOCK_METHOD(void, Stop, (), (override));
MOCK_METHOD(RTCError,
SetCodecPreferences,
- (webrtc::ArrayView<RtpCodecCapability> codecs),
+ (ArrayView<RtpCodecCapability> codecs),
(override));
MOCK_METHOD(std::vector<RtpCodecCapability>,
codec_preferences,
@@ -82,11 +82,10 @@
GetNegotiatedHeaderExtensions,
(),
(const, override));
- MOCK_METHOD(
- webrtc::RTCError,
- SetHeaderExtensionsToNegotiate,
- (webrtc::ArrayView<const RtpHeaderExtensionCapability> header_extensions),
- (override));
+ MOCK_METHOD(RTCError,
+ SetHeaderExtensionsToNegotiate,
+ (ArrayView<const RtpHeaderExtensionCapability> header_extensions),
+ (override));
};
} // namespace webrtc
diff --git a/api/test/mock_rtpreceiver.h b/api/test/mock_rtpreceiver.h
index b0c34a2..ba375f8 100644
--- a/api/test/mock_rtpreceiver.h
+++ b/api/test/mock_rtpreceiver.h
@@ -37,12 +37,12 @@
streams,
(),
(const, override));
- MOCK_METHOD(webrtc::MediaType, media_type, (), (const, override));
+ MOCK_METHOD(MediaType, media_type, (), (const, override));
MOCK_METHOD(std::string, id, (), (const, override));
MOCK_METHOD(RtpParameters, GetParameters, (), (const, override));
MOCK_METHOD(bool,
SetParameters,
- (const webrtc::RtpParameters& parameters),
+ (const RtpParameters& parameters),
(override));
MOCK_METHOD(void, SetObserver, (RtpReceiverObserverInterface*), (override));
MOCK_METHOD(void,
@@ -52,9 +52,9 @@
MOCK_METHOD(std::vector<RtpSource>, GetSources, (), (const, override));
MOCK_METHOD(void,
SetFrameDecryptor,
- (webrtc::scoped_refptr<webrtc::FrameDecryptorInterface>),
+ (scoped_refptr<FrameDecryptorInterface>),
(override));
- MOCK_METHOD(scoped_refptr<webrtc::FrameDecryptorInterface>,
+ MOCK_METHOD(scoped_refptr<FrameDecryptorInterface>,
GetFrameDecryptor,
(),
(const, override));
diff --git a/api/test/mock_rtpsender.h b/api/test/mock_rtpsender.h
index da1078f..59da465 100644
--- a/api/test/mock_rtpsender.h
+++ b/api/test/mock_rtpsender.h
@@ -50,7 +50,7 @@
(),
(const, override));
MOCK_METHOD(uint32_t, ssrc, (), (const, override));
- MOCK_METHOD(webrtc::MediaType, media_type, (), (const, override));
+ MOCK_METHOD(MediaType, media_type, (), (const, override));
MOCK_METHOD(std::string, id, (), (const, override));
MOCK_METHOD(std::vector<std::string>, stream_ids, (), (const, override));
MOCK_METHOD(void, SetStreams, (const std::vector<std::string>&), (override));
@@ -70,7 +70,7 @@
(const, override));
MOCK_METHOD(void,
SetFrameEncryptor,
- (webrtc::scoped_refptr<FrameEncryptorInterface>),
+ (scoped_refptr<FrameEncryptorInterface>),
(override));
MOCK_METHOD(scoped_refptr<FrameEncryptorInterface>,
GetFrameEncryptor,
@@ -78,7 +78,7 @@
(const, override));
MOCK_METHOD(void,
SetFrameTransformer,
- (webrtc::scoped_refptr<FrameTransformerInterface>),
+ (scoped_refptr<FrameTransformerInterface>),
(override));
MOCK_METHOD(void,
SetEncoderSelector,
@@ -87,7 +87,7 @@
MOCK_METHOD(void, SetObserver, (RtpSenderObserverInterface*), (override));
};
-static_assert(!std::is_abstract_v<webrtc::RefCountedObject<MockRtpSender>>, "");
+static_assert(!std::is_abstract_v<RefCountedObject<MockRtpSender>>, "");
} // namespace webrtc
#endif // API_TEST_MOCK_RTPSENDER_H_
diff --git a/api/test/mock_session_description_interface.h b/api/test/mock_session_description_interface.h
index a9730a3..9934962 100644
--- a/api/test/mock_session_description_interface.h
+++ b/api/test/mock_session_description_interface.h
@@ -38,7 +38,7 @@
MOCK_METHOD(bool, AddCandidate, (const IceCandidate*), (override));
MOCK_METHOD(size_t,
RemoveCandidates,
- (const std::vector<webrtc::Candidate>&),
+ (const std::vector<Candidate>&),
(override));
MOCK_METHOD(size_t, number_of_mediasections, (), (const, override));
MOCK_METHOD(const IceCandidateCollection*,
diff --git a/api/test/mock_transformable_audio_frame.h b/api/test/mock_transformable_audio_frame.h
index c92624a..9de3c3f 100644
--- a/api/test/mock_transformable_audio_frame.h
+++ b/api/test/mock_transformable_audio_frame.h
@@ -28,7 +28,7 @@
MockTransformableAudioFrame() : TransformableAudioFrameInterface(Passkey()) {}
MOCK_METHOD(ArrayView<const uint8_t>, GetData, (), (const, override));
- MOCK_METHOD(void, SetData, (webrtc::ArrayView<const uint8_t>), (override));
+ MOCK_METHOD(void, SetData, (ArrayView<const uint8_t>), (override));
MOCK_METHOD(void, SetRTPTimestamp, (uint32_t), (override));
MOCK_METHOD(uint8_t, GetPayloadType, (), (const, override));
MOCK_METHOD(bool, CanSetPayloadType, (), (const, override));
diff --git a/api/test/mock_transformable_frame.h b/api/test/mock_transformable_frame.h
index e798340..252622a 100644
--- a/api/test/mock_transformable_frame.h
+++ b/api/test/mock_transformable_frame.h
@@ -30,14 +30,14 @@
MockTransformableFrame() : TransformableFrameInterface(Passkey()) {}
MOCK_METHOD(ArrayView<const uint8_t>, GetData, (), (const, override));
- MOCK_METHOD(void, SetData, (webrtc::ArrayView<const uint8_t>), (override));
+ MOCK_METHOD(void, SetData, (ArrayView<const uint8_t>), (override));
MOCK_METHOD(uint8_t, GetPayloadType, (), (const, override));
MOCK_METHOD(bool, CanSetPayloadType, (), (const, override));
MOCK_METHOD(void, SetPayloadType, (uint8_t), (override));
MOCK_METHOD(uint32_t, GetSsrc, (), (const, override));
MOCK_METHOD(uint32_t, GetTimestamp, (), (const, override));
MOCK_METHOD(void, SetRTPTimestamp, (uint32_t), (override));
- MOCK_METHOD(std::optional<webrtc::Timestamp>,
+ MOCK_METHOD(std::optional<Timestamp>,
GetPresentationTimestamp,
(),
(const, override));
diff --git a/api/test/mock_transformable_video_frame.h b/api/test/mock_transformable_video_frame.h
index 61207c2..2f6fd63 100644
--- a/api/test/mock_transformable_video_frame.h
+++ b/api/test/mock_transformable_video_frame.h
@@ -25,23 +25,16 @@
namespace webrtc {
-class MockTransformableVideoFrame
- : public webrtc::TransformableVideoFrameInterface {
+class MockTransformableVideoFrame : public TransformableVideoFrameInterface {
public:
MockTransformableVideoFrame() : TransformableVideoFrameInterface(Passkey()) {}
MOCK_METHOD(ArrayView<const uint8_t>, GetData, (), (const, override));
- MOCK_METHOD(void,
- SetData,
- (webrtc::ArrayView<const uint8_t> data),
- (override));
+ MOCK_METHOD(void, SetData, (ArrayView<const uint8_t> data), (override));
MOCK_METHOD(uint32_t, GetTimestamp, (), (const, override));
MOCK_METHOD(void, SetRTPTimestamp, (uint32_t), (override));
MOCK_METHOD(uint32_t, GetSsrc, (), (const, override));
MOCK_METHOD(bool, IsKeyFrame, (), (const, override));
- MOCK_METHOD(void,
- SetMetadata,
- (const webrtc::VideoFrameMetadata&),
- (override));
+ MOCK_METHOD(void, SetMetadata, (const VideoFrameMetadata&), (override));
MOCK_METHOD(uint8_t, GetPayloadType, (), (const, override));
MOCK_METHOD(bool, CanSetPayloadType, (), (const, override));
MOCK_METHOD(void, SetPayloadType, (uint8_t), (override));
diff --git a/api/test/mock_video_bitrate_allocator.h b/api/test/mock_video_bitrate_allocator.h
index de06d93..d933cf7 100644
--- a/api/test/mock_video_bitrate_allocator.h
+++ b/api/test/mock_video_bitrate_allocator.h
@@ -17,7 +17,7 @@
namespace webrtc {
-class MockVideoBitrateAllocator : public webrtc::VideoBitrateAllocator {
+class MockVideoBitrateAllocator : public VideoBitrateAllocator {
MOCK_METHOD(VideoBitrateAllocation,
Allocate,
(VideoBitrateAllocationParameters parameters),
diff --git a/api/test/mock_video_encoder_factory.h b/api/test/mock_video_encoder_factory.h
index beeba29..e1a8210 100644
--- a/api/test/mock_video_encoder_factory.h
+++ b/api/test/mock_video_encoder_factory.h
@@ -22,7 +22,7 @@
namespace webrtc {
-class MockVideoEncoderFactory : public webrtc::VideoEncoderFactory {
+class MockVideoEncoderFactory : public VideoEncoderFactory {
public:
~MockVideoEncoderFactory() override { Die(); }
diff --git a/api/test/mock_video_track.h b/api/test/mock_video_track.h
index 3bf083d..87fea70 100644
--- a/api/test/mock_video_track.h
+++ b/api/test/mock_video_track.h
@@ -23,7 +23,7 @@
namespace webrtc {
-class MockVideoTrack : public RefCountedObject<webrtc::VideoTrackInterface> {
+class MockVideoTrack : public RefCountedObject<VideoTrackInterface> {
public:
static scoped_refptr<MockVideoTrack> Create() {
return scoped_refptr<MockVideoTrack>(new MockVideoTrack());
@@ -49,14 +49,14 @@
// VideoSourceInterface
MOCK_METHOD(void,
AddOrUpdateSink,
- (webrtc::VideoSinkInterface<VideoFrame> * sink,
- const webrtc::VideoSinkWants& wants),
+ (VideoSinkInterface<VideoFrame> * sink,
+ const VideoSinkWants& wants),
(override));
// RemoveSink must guarantee that at the time the method returns,
// there is no current and no future calls to VideoSinkInterface::OnFrame.
MOCK_METHOD(void,
RemoveSink,
- (webrtc::VideoSinkInterface<VideoFrame> * sink),
+ (VideoSinkInterface<VideoFrame> * sink),
(override));
// VideoTrackInterface
diff --git a/api/test/network_emulation/schedulable_network_node_builder.h b/api/test/network_emulation/schedulable_network_node_builder.h
index 9ac6547..ee15215 100644
--- a/api/test/network_emulation/schedulable_network_node_builder.h
+++ b/api/test/network_emulation/schedulable_network_node_builder.h
@@ -23,25 +23,24 @@
class SchedulableNetworkNodeBuilder {
public:
SchedulableNetworkNodeBuilder(
- webrtc::NetworkEmulationManager& net,
+ NetworkEmulationManager& net,
network_behaviour::NetworkConfigSchedule schedule);
// set_start_condition allows a test to control when the schedule start.
// `start_condition` is invoked every time a packet is enqueued on the network
// until the first time `start_condition` returns true. Until then, the first
// NetworkConfigScheduleItem is used. There is no guarantee on which
// thread/task queue that will be used.
- void set_start_condition(
- absl::AnyInvocable<bool(webrtc::Timestamp)> start_condition);
+ void set_start_condition(absl::AnyInvocable<bool(Timestamp)> start_condition);
// If no random seed is provided, one will be created.
// The random seed is required for loss rate and to delay standard deviation.
- webrtc::EmulatedNetworkNode* Build(
+ EmulatedNetworkNode* Build(
std::optional<uint64_t> random_seed = std::nullopt);
private:
- webrtc::NetworkEmulationManager& net_;
+ NetworkEmulationManager& net_;
network_behaviour::NetworkConfigSchedule schedule_;
- absl::AnyInvocable<bool(webrtc::Timestamp)> start_condition_;
+ absl::AnyInvocable<bool(Timestamp)> start_condition_;
};
} // namespace webrtc
diff --git a/api/test/simulated_network.h b/api/test/simulated_network.h
index 6f31c60..174fc0b 100644
--- a/api/test/simulated_network.h
+++ b/api/test/simulated_network.h
@@ -28,23 +28,21 @@
PacketInFlightInfo(size_t size,
int64_t send_time_us,
uint64_t packet_id,
- webrtc::EcnMarking ecn)
+ EcnMarking ecn)
: size(size),
send_time_us(send_time_us),
packet_id(packet_id),
ecn(ecn) {}
PacketInFlightInfo(size_t size, int64_t send_time_us, uint64_t packet_id)
- : PacketInFlightInfo(size,
- send_time_us,
- packet_id,
- webrtc::EcnMarking::kNotEct) {}
+ : PacketInFlightInfo(size, send_time_us, packet_id, EcnMarking::kNotEct) {
+ }
size_t size;
int64_t send_time_us;
// Unique identifier for the packet in relation to other packets in flight.
uint64_t packet_id;
- webrtc::EcnMarking ecn;
+ EcnMarking ecn;
};
struct PacketDeliveryInfo {
@@ -61,7 +59,7 @@
int64_t receive_time_us;
uint64_t packet_id;
- webrtc::EcnMarking ecn;
+ EcnMarking ecn;
};
// BuiltInNetworkBehaviorConfig is a built-in network behavior configuration
diff --git a/api/test/time_controller.h b/api/test/time_controller.h
index 8d9cb7c..86669d5 100644
--- a/api/test/time_controller.h
+++ b/api/test/time_controller.h
@@ -39,14 +39,14 @@
// is destroyed.
std::unique_ptr<TaskQueueFactory> CreateTaskQueueFactory();
- // Creates an webrtc::Thread instance. If `socket_server` is nullptr, a
+ // Creates an Thread instance. If `socket_server` is nullptr, a
// default noop socket server is created. Returned thread is not null and
// started.
virtual std::unique_ptr<Thread> CreateThread(
const std::string& name,
std::unique_ptr<SocketServer> socket_server = nullptr) = 0;
- // Creates an webrtc::Thread instance that ensure that it's set as the current
+ // Creates an Thread instance that ensure that it's set as the current
// thread.
virtual Thread* GetMainThread() = 0;
// Allow task queues and process threads created by this instance to execute
diff --git a/api/test/video_quality_test_fixture.h b/api/test/video_quality_test_fixture.h
index 763dd7d..8d84cbe 100644
--- a/api/test/video_quality_test_fixture.h
+++ b/api/test/video_quality_test_fixture.h
@@ -140,7 +140,7 @@
virtual void RunWithAnalyzer(const Params& params) = 0;
virtual void RunWithRenderers(const Params& params) = 0;
- virtual const std::map<uint8_t, webrtc::MediaType>& payload_type_map() = 0;
+ virtual const std::map<uint8_t, MediaType>& payload_type_map() = 0;
};
} // namespace webrtc
