commit 2df9e30d00807dc8bfc47a08b0ab1cef1742c0c2 parent 2d3b84910161279bc6bf3ddaa27e38dc81d81c2d Author: Michael Froman <mfroman@mozilla.com> Date: Wed, 8 Oct 2025 17:43:35 -0500 Bug 1993083 - Vendor libwebrtc from 0bdeb7818c Upstream commit: https://webrtc.googlesource.com/src/+/0bdeb7818cb6248017867b5e7d4e1cba33500dfc Remove re-exported symbols from rtc and cricket namespaces Change generated by running git grep -E -l 'namespace (rtc|cricket)\b \{' > /tmp/export_files.txt xargs -a /tmp/export_files.txt -L 1 \ ex -s -c "/#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES/norm d]#" -c "x" xargs -a /tmp/export_files.txt sed -i \ -e '/\/\/ Re-export symbols from/d' \ -e '/\/\/ TODO(bugs.webrtc.org\/4222596): Remove once/d' \ -e '/\/\/ Backwards compatibe aliases/d' \ -e '/\/\/ TODO: https:\/\/issues.webrtc.org\/42225969/d' Bug: webrtc:4222596 Change-Id: Ie62e14b53466da41a2c6421305973e0974fe7e0c No-IWYU: LSC Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/396080 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Evan Shrubsole <eshr@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45057} Diffstat:
235 files changed, 7 insertions(+), 2836 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T22:42:19.983469+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T22:43:27.408388+00:00. # base of lastest vendoring -c432ba14db +0bdeb7818c diff --git a/third_party/libwebrtc/api/array_view.h b/third_party/libwebrtc/api/array_view.h @@ -332,16 +332,5 @@ inline ArrayView<U, Size> reinterpret_array_view(ArrayView<T, Size> view) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -template <typename T, - std::ptrdiff_t Size = webrtc::array_view_internal::kArrayViewVarSize> -using ArrayView = ::webrtc::ArrayView<T, Size>; -using ::webrtc::MakeArrayView; -using ::webrtc::reinterpret_array_view; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_ARRAY_VIEW_H_ diff --git a/third_party/libwebrtc/api/audio_options.h b/third_party/libwebrtc/api/audio_options.h @@ -70,12 +70,5 @@ struct RTC_EXPORT AudioOptions { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::AudioOptions; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_AUDIO_OPTIONS_H_ diff --git a/third_party/libwebrtc/api/candidate.h b/third_party/libwebrtc/api/candidate.h @@ -289,17 +289,5 @@ class RTC_EXPORT Candidate { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::Candidate; -using ::webrtc::kMaxTurnServers; -using ::webrtc::LOCAL_PORT_TYPE; -using ::webrtc::PRFLX_PORT_TYPE; -using ::webrtc::RELAY_PORT_TYPE; -using ::webrtc::STUN_PORT_TYPE; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_CANDIDATE_H_ diff --git a/third_party/libwebrtc/api/function_view.h b/third_party/libwebrtc/api/function_view.h @@ -128,12 +128,5 @@ class FunctionView<RetT(ArgT...)> final { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::FunctionView; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_FUNCTION_VIEW_H_ diff --git a/third_party/libwebrtc/api/make_ref_counted.h b/third_party/libwebrtc/api/make_ref_counted.h @@ -121,12 +121,5 @@ absl_nonnull scoped_refptr<FinalRefCountedObject<T>> make_ref_counted( } // namespace webrtc -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -// Backwards compatibe alias. -// TODO: bugs.webrtc.org/42225969 - deprecate and remove. -using ::webrtc::make_ref_counted; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_MAKE_REF_COUNTED_H_ diff --git a/third_party/libwebrtc/api/media_types.h b/third_party/libwebrtc/api/media_types.h @@ -49,24 +49,5 @@ extern const char kMediaTypeData[]; // They used to be incompatible, but now cricket is defined in terms of the // webrtc definition. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { - -using MediaType ABSL_DEPRECATE_AND_INLINE() = webrtc::MediaType; -using webrtc::kMediaTypeAudio; -using webrtc::kMediaTypeData; -using webrtc::kMediaTypeVideo; -using webrtc::MediaTypeToString; - -// Backwards compatibility values for cricket::MediaType users -// TODO: https://issues.webrtc.org/42222911 - remove -[[deprecated]] constexpr MediaType MEDIA_TYPE_AUDIO = webrtc::MediaType::AUDIO; -[[deprecated]] constexpr MediaType MEDIA_TYPE_VIDEO = webrtc::MediaType::VIDEO; -[[deprecated]] constexpr MediaType MEDIA_TYPE_DATA = webrtc::MediaType::DATA; -[[deprecated]] constexpr MediaType MEDIA_TYPE_UNSUPPORTED = - webrtc::MediaType::UNSUPPORTED; - -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_MEDIA_TYPES_H_ diff --git a/third_party/libwebrtc/api/packet_socket_factory.h b/third_party/libwebrtc/api/packet_socket_factory.h @@ -78,13 +78,5 @@ class RTC_EXPORT PacketSocketFactory { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::PacketSocketFactory; -using ::webrtc::PacketSocketTcpOptions; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_PACKET_SOCKET_FACTORY_H_ diff --git a/third_party/libwebrtc/api/ref_counted_base.h b/third_party/libwebrtc/api/ref_counted_base.h @@ -96,14 +96,5 @@ class RefCountedNonVirtual { } // namespace webrtc -// Backwards compatibe aliases. -// TODO: https://issues.webrtc.org/42225969 - deprecate and remove. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using RefCountedBase = webrtc::RefCountedBase; -template <typename T> -using RefCountedNonVirtual = webrtc::RefCountedNonVirtual<T>; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_REF_COUNTED_BASE_H_ diff --git a/third_party/libwebrtc/api/scoped_refptr.h b/third_party/libwebrtc/api/scoped_refptr.h @@ -219,12 +219,5 @@ bool operator<(const scoped_refptr<T>& a, const scoped_refptr<U>& b) { } // namespace webrtc -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -// Backwards compatible alias. -// TODO: bugs.webrtc.org/42225969 - Deprecate and remove. -using ::webrtc::scoped_refptr; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_SCOPED_REFPTR_H_ diff --git a/third_party/libwebrtc/api/test/mock_packet_socket_factory.h b/third_party/libwebrtc/api/test/mock_packet_socket_factory.h @@ -48,12 +48,5 @@ static_assert(!std::is_abstract_v<MockPacketSocketFactory>, ""); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::MockPacketSocketFactory; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_TEST_MOCK_PACKET_SOCKET_FACTORY_H_ diff --git a/third_party/libwebrtc/api/transport/stun.h b/third_party/libwebrtc/api/transport/stun.h @@ -761,149 +761,5 @@ class IceMessage : public StunMessage { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::ComputeStunCredentialHash; -using ::webrtc::CopyStunAttribute; -using ::webrtc::GetStunErrorResponseType; -using ::webrtc::GetStunSuccessResponseType; -using ::webrtc::GOOG_PING_ERROR_RESPONSE; -using ::webrtc::GOOG_PING_REQUEST; -using ::webrtc::GOOG_PING_RESPONSE; -using ::webrtc::IceAttributeType; -using ::webrtc::IceErrorCode; -using ::webrtc::IceGoogMiscInfoBindingRequestAttributeIndex; -using ::webrtc::IceGoogMiscInfoBindingResponseAttributeIndex; -using ::webrtc::IceMessage; -using ::webrtc::IsStunErrorResponseType; -using ::webrtc::IsStunIndicationType; -using ::webrtc::IsStunRequestType; -using ::webrtc::IsStunSuccessResponseType; -using ::webrtc::kStunAttributeHeaderSize; -using ::webrtc::kStunHeaderSize; -using ::webrtc::kStunLegacyTransactionIdLength; -using ::webrtc::kStunMagicCookie; -using ::webrtc::kStunMagicCookieLength; -using ::webrtc::kStunMessageIntegrity32Size; -using ::webrtc::kStunMessageIntegritySize; -using ::webrtc::kStunTransactionIdLength; -using ::webrtc::kStunTransactionIdOffset; -using ::webrtc::kStunTypeMask; -using ::webrtc::SERVER_NOT_REACHABLE_ERROR; -using ::webrtc::STUN_ADDRESS_IPV4; -using ::webrtc::STUN_ADDRESS_IPV6; -using ::webrtc::STUN_ADDRESS_UNDEF; -using ::webrtc::STUN_ALLOCATE_ERROR_RESPONSE; -using ::webrtc::STUN_ALLOCATE_REQUEST; -using ::webrtc::STUN_ALLOCATE_RESPONSE; -using ::webrtc::STUN_ATTR_ALTERNATE_SERVER; -using ::webrtc::STUN_ATTR_CHANNEL_NUMBER; -using ::webrtc::STUN_ATTR_DATA; -using ::webrtc::STUN_ATTR_DONT_FRAGMENT; -using ::webrtc::STUN_ATTR_ERROR_CODE; -using ::webrtc::STUN_ATTR_EVEN_PORT; -using ::webrtc::STUN_ATTR_FINGERPRINT; -using ::webrtc::STUN_ATTR_GOOG_CONNECTION_ID; -using ::webrtc::STUN_ATTR_GOOG_DELTA; -using ::webrtc::STUN_ATTR_GOOG_DELTA_ACK; -using ::webrtc::STUN_ATTR_GOOG_DELTA_SYNC_REQ; -using ::webrtc::STUN_ATTR_GOOG_LAST_ICE_CHECK_RECEIVED; -using ::webrtc::STUN_ATTR_GOOG_MESSAGE_INTEGRITY_32; -using ::webrtc::STUN_ATTR_GOOG_MISC_INFO; -using ::webrtc::STUN_ATTR_GOOG_NETWORK_INFO; -using ::webrtc::STUN_ATTR_GOOG_OBSOLETE_1; -using ::webrtc::STUN_ATTR_ICE_CONTROLLED; -using ::webrtc::STUN_ATTR_ICE_CONTROLLING; -using ::webrtc::STUN_ATTR_LIFETIME; -using ::webrtc::STUN_ATTR_MAPPED_ADDRESS; -using ::webrtc::STUN_ATTR_MESSAGE_INTEGRITY; -using ::webrtc::STUN_ATTR_META_DTLS_IN_STUN; -using ::webrtc::STUN_ATTR_META_DTLS_IN_STUN_ACK; -using ::webrtc::STUN_ATTR_NOMINATION; -using ::webrtc::STUN_ATTR_NONCE; -using ::webrtc::STUN_ATTR_PRIORITY; -using ::webrtc::STUN_ATTR_REALM; -using ::webrtc::STUN_ATTR_REQUESTED_TRANSPORT; -using ::webrtc::STUN_ATTR_RESERVATION_TOKEN; -using ::webrtc::STUN_ATTR_RETRANSMIT_COUNT; -using ::webrtc::STUN_ATTR_SOFTWARE; -using ::webrtc::STUN_ATTR_UNKNOWN_ATTRIBUTES; -using ::webrtc::STUN_ATTR_USE_CANDIDATE; -using ::webrtc::STUN_ATTR_USERNAME; -using ::webrtc::STUN_ATTR_XOR_MAPPED_ADDRESS; -using ::webrtc::STUN_ATTR_XOR_PEER_ADDRESS; -using ::webrtc::STUN_ATTR_XOR_RELAYED_ADDRESS; -using ::webrtc::STUN_BINDING_ERROR_RESPONSE; -using ::webrtc::STUN_BINDING_INDICATION; -using ::webrtc::STUN_BINDING_REQUEST; -using ::webrtc::STUN_BINDING_RESPONSE; -using ::webrtc::STUN_ERROR_ALLOCATION_MISMATCH; -using ::webrtc::STUN_ERROR_BAD_REQUEST; -using ::webrtc::STUN_ERROR_FORBIDDEN; -using ::webrtc::STUN_ERROR_GLOBAL_FAILURE; -using ::webrtc::STUN_ERROR_NOT_AN_ERROR; -using ::webrtc::STUN_ERROR_REASON_ALLOCATION_MISMATCH; -using ::webrtc::STUN_ERROR_REASON_BAD_REQUEST; -using ::webrtc::STUN_ERROR_REASON_FORBIDDEN; -using ::webrtc::STUN_ERROR_REASON_ROLE_CONFLICT; -using ::webrtc::STUN_ERROR_REASON_SERVER_ERROR; -using ::webrtc::STUN_ERROR_REASON_STALE_NONCE; -using ::webrtc::STUN_ERROR_REASON_TRY_ALTERNATE_SERVER; -using ::webrtc::STUN_ERROR_REASON_UNAUTHORIZED; -using ::webrtc::STUN_ERROR_REASON_UNKNOWN_ATTRIBUTE; -using ::webrtc::STUN_ERROR_REASON_UNSUPPORTED_PROTOCOL; -using ::webrtc::STUN_ERROR_REASON_WRONG_CREDENTIALS; -using ::webrtc::STUN_ERROR_ROLE_CONFLICT; -using ::webrtc::STUN_ERROR_SERVER_ERROR; -using ::webrtc::STUN_ERROR_SERVER_NOT_REACHABLE; -using ::webrtc::STUN_ERROR_STALE_NONCE; -using ::webrtc::STUN_ERROR_TRY_ALTERNATE; -using ::webrtc::STUN_ERROR_UNAUTHORIZED; -using ::webrtc::STUN_ERROR_UNKNOWN_ATTRIBUTE; -using ::webrtc::STUN_ERROR_UNSUPPORTED_PROTOCOL; -using ::webrtc::STUN_ERROR_WRONG_CREDENTIALS; -using ::webrtc::STUN_INVALID_MESSAGE_TYPE; -using ::webrtc::STUN_VALUE_ADDRESS; -using ::webrtc::STUN_VALUE_BYTE_STRING; -using ::webrtc::STUN_VALUE_ERROR_CODE; -using ::webrtc::STUN_VALUE_UINT16_LIST; -using ::webrtc::STUN_VALUE_UINT32; -using ::webrtc::STUN_VALUE_UINT64; -using ::webrtc::STUN_VALUE_UNKNOWN; -using ::webrtc::STUN_VALUE_XOR_ADDRESS; -using ::webrtc::StunAddressAttribute; -using ::webrtc::StunAddressFamily; -using ::webrtc::StunAttribute; -using ::webrtc::StunAttributeType; -using ::webrtc::StunAttributeValueType; -using ::webrtc::StunByteStringAttribute; -using ::webrtc::StunErrorCode; -using ::webrtc::StunErrorCodeAttribute; -using ::webrtc::StunMessage; -using ::webrtc::StunMessageType; -using ::webrtc::StunMethodToString; -using ::webrtc::StunUInt16ListAttribute; -using ::webrtc::StunUInt32Attribute; -using ::webrtc::StunUInt64Attribute; -using ::webrtc::StunXorAddressAttribute; -using ::webrtc::TURN_CHANNEL_BIND_ERROR_RESPONSE; -using ::webrtc::TURN_CHANNEL_BIND_REQUEST; -using ::webrtc::TURN_CHANNEL_BIND_RESPONSE; -using ::webrtc::TURN_CREATE_PERMISSION_ERROR_RESPONSE; -using ::webrtc::TURN_CREATE_PERMISSION_REQUEST; -using ::webrtc::TURN_CREATE_PERMISSION_RESPONSE; -using ::webrtc::TURN_DATA_INDICATION; -using ::webrtc::TURN_REFRESH_ERROR_RESPONSE; -using ::webrtc::TURN_REFRESH_REQUEST; -using ::webrtc::TURN_REFRESH_RESPONSE; -using ::webrtc::TURN_SEND_INDICATION; -using ::webrtc::TurnAttributeType; -using ::webrtc::TurnErrorType; -using ::webrtc::TurnMessage; -using ::webrtc::TurnMessageType; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_TRANSPORT_STUN_H_ diff --git a/third_party/libwebrtc/api/video/video_sink_interface.h b/third_party/libwebrtc/api/video/video_sink_interface.h @@ -34,12 +34,5 @@ class VideoSinkInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::VideoSinkInterface; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_VIDEO_VIDEO_SINK_INTERFACE_H_ diff --git a/third_party/libwebrtc/api/video/video_source_interface.h b/third_party/libwebrtc/api/video/video_source_interface.h @@ -134,12 +134,4 @@ class VideoSourceInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::VideoSinkWants; -using ::webrtc::VideoSourceInterface; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // API_VIDEO_VIDEO_SOURCE_INTERFACE_H_ diff --git a/third_party/libwebrtc/media/base/adapted_video_track_source.h b/third_party/libwebrtc/media/base/adapted_video_track_source.h @@ -104,12 +104,5 @@ class RTC_EXPORT AdaptedVideoTrackSource } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AdaptedVideoTrackSource; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_ADAPTED_VIDEO_TRACK_SOURCE_H_ diff --git a/third_party/libwebrtc/media/base/audio_source.h b/third_party/libwebrtc/media/base/audio_source.h @@ -55,12 +55,5 @@ class AudioSource { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::AudioSource; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_AUDIO_SOURCE_H_ diff --git a/third_party/libwebrtc/media/base/codec.h b/third_party/libwebrtc/media/base/codec.h @@ -265,97 +265,5 @@ RTC_EXPORT void AddH264ConstrainedBaselineProfileToSupportedFormats( std::vector<SdpVideoFormat>* supported_formats); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { - -using FeedbackParam ABSL_DEPRECATE_AND_INLINE() = webrtc::FeedbackParam; -using FeedbackParams ABSL_DEPRECATE_AND_INLINE() = webrtc::FeedbackParams; -using Codec ABSL_DEPRECATE_AND_INLINE() = webrtc::Codec; -using Codecs ABSL_DEPRECATE_AND_INLINE() = webrtc::Codecs; - -// TODO(webrtc:15214): Compatibility names, to be migrated away and removed. -using VideoCodec ABSL_DEPRECATE_AND_INLINE() = webrtc::Codec; -using AudioCodec ABSL_DEPRECATE_AND_INLINE() = webrtc::Codec; -using VideoCodecs ABSL_DEPRECATE_AND_INLINE() = webrtc::Codecs; -using AudioCodecs ABSL_DEPRECATE_AND_INLINE() = webrtc::Codecs; -using ::webrtc::AddH264ConstrainedBaselineProfileToSupportedFormats; - -ABSL_DEPRECATE_AND_INLINE() -inline webrtc::Codec CreateAudioCodec(int id, - const std::string& name, - int clockrate, - size_t channels) { - return webrtc::CreateAudioCodec(id, name, clockrate, channels); -} -ABSL_DEPRECATE_AND_INLINE() -inline webrtc::Codec CreateAudioCodec(const webrtc::SdpAudioFormat& c) { - return webrtc::CreateAudioCodec(c); -} -ABSL_DEPRECATE_AND_INLINE() -inline webrtc::Codec CreateAudioRtxCodec(int rtx_payload_type, - int associated_payload_type) { - return webrtc::CreateAudioRtxCodec(rtx_payload_type, associated_payload_type); -} -ABSL_DEPRECATE_AND_INLINE() -inline webrtc::Codec CreateVideoCodec(const std::string& name) { - return webrtc::CreateVideoCodec(name); -} -ABSL_DEPRECATE_AND_INLINE() -inline webrtc::Codec CreateVideoCodec(int id, const std::string& name) { - return webrtc::CreateVideoCodec(id, name); -} -ABSL_DEPRECATE_AND_INLINE() -inline webrtc::Codec CreateVideoCodec(const webrtc::SdpVideoFormat& c) { - return webrtc::CreateVideoCodec(c); -} -ABSL_DEPRECATE_AND_INLINE() -inline webrtc::Codec CreateVideoCodec(int id, const webrtc::SdpVideoFormat& c) { - return webrtc::CreateVideoCodec(id, c); -} -ABSL_DEPRECATE_AND_INLINE() -inline webrtc::Codec CreateVideoRtxCodec(int rtx_payload_type, - int associated_payload_type) { - return webrtc::CreateVideoRtxCodec(rtx_payload_type, associated_payload_type); -} - -ABSL_DEPRECATE_AND_INLINE() -inline const webrtc::Codec* FindCodecById( - const std::vector<webrtc::Codec>& codecs, - int payload_type) { - return webrtc::FindCodecById(codecs, payload_type); -} - -ABSL_DEPRECATE_AND_INLINE() -inline bool HasLntf(const webrtc::Codec& codec) { - return webrtc::HasLntf(codec); -} -ABSL_DEPRECATE_AND_INLINE() -inline bool HasNack(const webrtc::Codec& codec) { - return webrtc::HasNack(codec); -} -ABSL_DEPRECATE_AND_INLINE() -inline bool HasRemb(const webrtc::Codec& codec) { - return webrtc::HasRemb(codec); -} -ABSL_DEPRECATE_AND_INLINE() inline bool HasRrtr(const webrtc::Codec& codec) { - return webrtc::HasRrtr(codec); -} -ABSL_DEPRECATE_AND_INLINE() -inline const webrtc::Codec* FindMatchingVideoCodec( - const webrtc::Codecs& supported_codecs, - const webrtc::Codec& codec) { - return webrtc::FindMatchingVideoCodec(supported_codecs, codec); -} -ABSL_DEPRECATE_AND_INLINE() -inline std::vector<const webrtc::Codec*> FindAllMatchingCodecs( - const webrtc::Codecs& supported_codecs, - const webrtc::Codec& codec) { - return webrtc::FindAllMatchingCodecs(supported_codecs, codec); -} - -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_CODEC_H_ diff --git a/third_party/libwebrtc/media/base/codec_list.h b/third_party/libwebrtc/media/base/codec_list.h @@ -85,12 +85,5 @@ class CodecList { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::CodecList; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_CODEC_LIST_H_ diff --git a/third_party/libwebrtc/media/base/fake_frame_source.h b/third_party/libwebrtc/media/base/fake_frame_source.h @@ -49,12 +49,5 @@ class FakeFrameSource { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::FakeFrameSource; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_FAKE_FRAME_SOURCE_H_ diff --git a/third_party/libwebrtc/media/base/fake_media_engine.h b/third_party/libwebrtc/media/base/fake_media_engine.h @@ -958,21 +958,5 @@ class FakeMediaEngine : public CompositeMediaEngine { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::CompareDtmfInfo; -using ::webrtc::FakeMediaEngine; -using ::webrtc::FakeVideoEngine; -using ::webrtc::FakeVideoMediaReceiveChannel; -using ::webrtc::FakeVideoMediaSendChannel; -using ::webrtc::FakeVoiceEngine; -using ::webrtc::FakeVoiceMediaReceiveChannel; -using ::webrtc::FakeVoiceMediaSendChannel; -using ::webrtc::RtpReceiveChannelHelper; -using ::webrtc::RtpSendChannelHelper; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_FAKE_MEDIA_ENGINE_H_ diff --git a/third_party/libwebrtc/media/base/fake_network_interface.h b/third_party/libwebrtc/media/base/fake_network_interface.h @@ -233,12 +233,5 @@ class FakeNetworkInterface : public MediaChannelNetworkInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::FakeNetworkInterface; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_FAKE_NETWORK_INTERFACE_H_ diff --git a/third_party/libwebrtc/media/base/fake_video_renderer.h b/third_party/libwebrtc/media/base/fake_video_renderer.h @@ -68,12 +68,5 @@ class FakeVideoRenderer : public VideoSinkInterface<VideoFrame> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::FakeVideoRenderer; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_FAKE_VIDEO_RENDERER_H_ diff --git a/third_party/libwebrtc/media/base/media_channel.h b/third_party/libwebrtc/media/base/media_channel.h @@ -1003,45 +1003,5 @@ class VideoMediaReceiveChannelInterface : public MediaReceiveChannelInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using RtcpParameters = ::webrtc::MediaChannelParameters::RtcpParameters; -using ::webrtc::AudioReceiverParameters; -using ::webrtc::AudioSenderParameter; -using ::webrtc::BandwidthEstimationInfo; -using ::webrtc::kScreencastDefaultFps; -using ::webrtc::MediaChannelNetworkInterface; -using ::webrtc::MediaChannelParameters; -using ::webrtc::MediaReceiveChannelInterface; -using ::webrtc::MediaReceiverInfo; -using ::webrtc::MediaSendChannelInterface; -using ::webrtc::MediaSenderInfo; -using ::webrtc::RtpCodecParametersMap; -using ::webrtc::SenderParameters; -using ::webrtc::SsrcReceiverInfo; -using ::webrtc::SsrcSenderInfo; -using ::webrtc::ToStringIfSet; -using ::webrtc::VectorToString; -using ::webrtc::VideoMediaInfo; -using ::webrtc::VideoMediaReceiveChannelInterface; -using ::webrtc::VideoMediaReceiveInfo; -using ::webrtc::VideoMediaSendChannelInterface; -using ::webrtc::VideoMediaSendInfo; -using ::webrtc::VideoOptions; -using ::webrtc::VideoReceiverInfo; -using ::webrtc::VideoReceiverParameters; -using ::webrtc::VideoSenderInfo; -using ::webrtc::VideoSenderParameters; -using ::webrtc::VoiceMediaInfo; -using ::webrtc::VoiceMediaReceiveChannelInterface; -using ::webrtc::VoiceMediaReceiveInfo; -using ::webrtc::VoiceMediaSendChannelInterface; -using ::webrtc::VoiceMediaSendInfo; -using ::webrtc::VoiceReceiverInfo; -using ::webrtc::VoiceSenderInfo; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_MEDIA_CHANNEL_H_ diff --git a/third_party/libwebrtc/media/base/media_config.h b/third_party/libwebrtc/media/base/media_config.h @@ -106,12 +106,5 @@ struct MediaConfig { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::MediaConfig; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_MEDIA_CONFIG_H_ diff --git a/third_party/libwebrtc/media/base/media_constants.h b/third_party/libwebrtc/media/base/media_constants.h @@ -169,107 +169,5 @@ extern const char kApplicationSpecificBandwidth[]; extern const char kTransportSpecificBandwidth[]; } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::kApplicationSpecificBandwidth; -using ::webrtc::kAv1CodecName; -using ::webrtc::kAv1FmtpLevelIdx; -using ::webrtc::kAv1FmtpProfile; -using ::webrtc::kAv1FmtpTier; -using ::webrtc::kCnCodecName; -using ::webrtc::kCodecParamAssociatedCodecName; -using ::webrtc::kCodecParamAssociatedPayloadType; -using ::webrtc::kCodecParamCbr; -using ::webrtc::kCodecParamMaxAverageBitrate; -using ::webrtc::kCodecParamMaxBitrate; -using ::webrtc::kCodecParamMaxPlaybackRate; -using ::webrtc::kCodecParamMaxPTime; -using ::webrtc::kCodecParamMaxQuantization; -using ::webrtc::kCodecParamMinBitrate; -using ::webrtc::kCodecParamMinPTime; -using ::webrtc::kCodecParamNotInNameValueFormat; -using ::webrtc::kCodecParamPerLayerPictureLossIndication; -using ::webrtc::kCodecParamPTime; -using ::webrtc::kCodecParamRtxTime; -using ::webrtc::kCodecParamSPropStereo; -using ::webrtc::kCodecParamStartBitrate; -using ::webrtc::kCodecParamStereo; -using ::webrtc::kCodecParamUseDtx; -using ::webrtc::kCodecParamUseInbandFec; -using ::webrtc::kComfortNoiseCodecName; -using ::webrtc::kConferenceDefaultNumTemporalLayers; -using ::webrtc::kConferenceMaxNumSpatialLayers; -using ::webrtc::kConferenceMaxNumTemporalLayers; -using ::webrtc::kDefaultVideoMaxFramerate; -using ::webrtc::kDefaultVideoMaxQpAv1; -using ::webrtc::kDefaultVideoMaxQpH26x; -using ::webrtc::kDefaultVideoMaxQpVpx; -using ::webrtc::kDtmfCodecName; -using ::webrtc::kFlexfecCodecName; -using ::webrtc::kFlexfecFmtpRepairWindow; -using ::webrtc::kG722CodecName; -using ::webrtc::kH264CodecName; -using ::webrtc::kH264FmtpLevelAsymmetryAllowed; -using ::webrtc::kH264FmtpPacketizationMode; -using ::webrtc::kH264FmtpProfileLevelId; -using ::webrtc::kH264FmtpSpropParameterSets; -using ::webrtc::kH264FmtpSpsPpsIdrInKeyframe; -using ::webrtc::kH264ProfileLevelConstrainedBaseline; -using ::webrtc::kH264ProfileLevelConstrainedHigh; -using ::webrtc::kH265CodecName; -using ::webrtc::kH265FmtpInteropConstraints; -using ::webrtc::kH265FmtpLevelId; -using ::webrtc::kH265FmtpProfileCompatibilityIndicator; -using ::webrtc::kH265FmtpProfileId; -using ::webrtc::kH265FmtpProfileSpace; -using ::webrtc::kH265FmtpTierFlag; -using ::webrtc::kH265FmtpTxMode; -using ::webrtc::kHighSystemCpuThreshold; -using ::webrtc::kL16CodecName; -using ::webrtc::kLowSystemCpuThreshold; -using ::webrtc::kMultiplexCodecName; -using ::webrtc::kOpusCodecName; -using ::webrtc::kOpusDefaultMaxPlaybackRate; -using ::webrtc::kOpusDefaultMaxPTime; -using ::webrtc::kOpusDefaultMinPTime; -using ::webrtc::kOpusDefaultPTime; -using ::webrtc::kOpusDefaultSPropStereo; -using ::webrtc::kOpusDefaultStereo; -using ::webrtc::kOpusDefaultUseDtx; -using ::webrtc::kOpusDefaultUseInbandFec; -using ::webrtc::kPacketizationParamRaw; -using ::webrtc::kParamValueEmpty; -using ::webrtc::kParamValueTrue; -using ::webrtc::kPcmaCodecName; -using ::webrtc::kPcmuCodecName; -using ::webrtc::kPreferredMaxPTime; -using ::webrtc::kPreferredMinPTime; -using ::webrtc::kPreferredSPropStereo; -using ::webrtc::kPreferredStereo; -using ::webrtc::kPreferredUseInbandFec; -using ::webrtc::kProcessCpuThreshold; -using ::webrtc::kRedCodecName; -using ::webrtc::kRtcpFbCcmParamFir; -using ::webrtc::kRtcpFbNackParamPli; -using ::webrtc::kRtcpFbParamCcm; -using ::webrtc::kRtcpFbParamLntf; -using ::webrtc::kRtcpFbParamNack; -using ::webrtc::kRtcpFbParamRemb; -using ::webrtc::kRtcpFbParamRrtr; -using ::webrtc::kRtcpFbParamTransportCc; -using ::webrtc::kRtxCodecName; -using ::webrtc::kTransportSpecificBandwidth; -using ::webrtc::kUlpfecCodecName; -using ::webrtc::kVideoCodecClockrate; -using ::webrtc::kVideoMtu; -using ::webrtc::kVideoRtpRecvBufferSize; -using ::webrtc::kVideoRtpSendBufferSize; -using ::webrtc::kVp8CodecName; -using ::webrtc::kVp9CodecName; -using ::webrtc::kVP9ProfileId; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_MEDIA_CONSTANTS_H_ diff --git a/third_party/libwebrtc/media/base/media_engine.h b/third_party/libwebrtc/media/base/media_engine.h @@ -238,22 +238,5 @@ std::vector<RtpExtension> GetDefaultEnabledRtpHeaderExtensions( } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::CheckRtpParametersInvalidModificationAndValues; -using ::webrtc::CheckRtpParametersValues; -using ::webrtc::CheckScalabilityModeValues; -using ::webrtc::CompositeMediaEngine; -using ::webrtc::CreateRtpParametersWithEncodings; -using ::webrtc::CreateRtpParametersWithOneEncoding; -using ::webrtc::GetDefaultEnabledRtpHeaderExtensions; -using ::webrtc::MediaEngineInterface; -using ::webrtc::RtpHeaderExtensionQueryInterface; -using ::webrtc::VideoEngineInterface; -using ::webrtc::VoiceEngineInterface; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_MEDIA_ENGINE_H_ diff --git a/third_party/libwebrtc/media/base/rid_description.h b/third_party/libwebrtc/media/base/rid_description.h @@ -94,13 +94,5 @@ struct RidDescription final { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::RidDescription; -using ::webrtc::RidDirection; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_RID_DESCRIPTION_H_ diff --git a/third_party/libwebrtc/media/base/rtp_utils.h b/third_party/libwebrtc/media/base/rtp_utils.h @@ -76,32 +76,5 @@ ApplyPacketOptions(uint8_t* data, } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::ApplyPacketOptions; -using ::webrtc::GetRtcpSsrc; -using ::webrtc::GetRtcpType; -using ::webrtc::InferRtpPacketType; -using ::webrtc::IsValidRtpPacketSize; -using ::webrtc::IsValidRtpPayloadType; -using ::webrtc::kMaxRtpPacketLen; -using ::webrtc::kMinRtcpPacketLen; -using ::webrtc::kMinRtpPacketLen; -using ::webrtc::kRtcpTypeApp; -using ::webrtc::kRtcpTypeBye; -using ::webrtc::kRtcpTypePSFB; -using ::webrtc::kRtcpTypeRR; -using ::webrtc::kRtcpTypeRTPFB; -using ::webrtc::kRtcpTypeSDES; -using ::webrtc::kRtcpTypeSR; -using ::webrtc::RtcpTypes; -using ::webrtc::RtpPacketType; -using ::webrtc::RtpPacketTypeToString; -using ::webrtc::UpdateRtpAbsSendTimeExtension; -using ::webrtc::ValidateRtpHeader; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_RTP_UTILS_H_ diff --git a/third_party/libwebrtc/media/base/stream_params.h b/third_party/libwebrtc/media/base/stream_params.h @@ -318,26 +318,5 @@ inline bool RemoveStreamByIds(StreamParamsVec* streams, const std::string& id) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::GetStream; -using ::webrtc::GetStreamByIds; -using ::webrtc::GetStreamBySsrc; -using ::webrtc::HasStreamWithNoSsrcs; -using ::webrtc::kFecFrSsrcGroupSemantics; -using ::webrtc::kFecSsrcGroupSemantics; -using ::webrtc::kFidSsrcGroupSemantics; -using ::webrtc::kSimSsrcGroupSemantics; -using ::webrtc::RemoveStream; -using ::webrtc::RemoveStreamByIds; -using ::webrtc::RemoveStreamBySsrc; -using ::webrtc::SsrcGroup; -using ::webrtc::StreamParams; -using ::webrtc::StreamParamsVec; -using ::webrtc::StreamSelector; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_STREAM_PARAMS_H_ diff --git a/third_party/libwebrtc/media/base/test_utils.h b/third_party/libwebrtc/media/base/test_utils.h @@ -53,15 +53,5 @@ StreamParams CreatePrimaryWithFecFrStreamParams(const std::string& cname, } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::CreatePrimaryWithFecFrStreamParams; -using ::webrtc::CreateSimStreamParams; -using ::webrtc::CreateSimWithRtxStreamParams; -using ::webrtc::MakeVector; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_TEST_UTILS_H_ diff --git a/third_party/libwebrtc/media/base/turn_utils.h b/third_party/libwebrtc/media/base/turn_utils.h @@ -27,12 +27,5 @@ bool RTC_EXPORT UnwrapTurnPacket(const uint8_t* packet, } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::UnwrapTurnPacket; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_TURN_UTILS_H_ diff --git a/third_party/libwebrtc/media/base/video_adapter.h b/third_party/libwebrtc/media/base/video_adapter.h @@ -169,12 +169,5 @@ class RTC_EXPORT VideoAdapter { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::VideoAdapter; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_VIDEO_ADAPTER_H_ diff --git a/third_party/libwebrtc/media/base/video_broadcaster.h b/third_party/libwebrtc/media/base/video_broadcaster.h @@ -81,12 +81,5 @@ class VideoBroadcaster : public VideoSourceBase, } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::VideoBroadcaster; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_VIDEO_BROADCASTER_H_ diff --git a/third_party/libwebrtc/media/base/video_common.h b/third_party/libwebrtc/media/base/video_common.h @@ -222,64 +222,5 @@ ABSL_DEPRECATE_AND_INLINE() int LeastCommonMultiple(int a, int b); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::CanonicalFourCC; -using ::webrtc::FourCC; -using ::webrtc::FOURCC_24BG; -using ::webrtc::FOURCC_2VUY; -using ::webrtc::FOURCC_ABGR; -using ::webrtc::FOURCC_ANY; -using ::webrtc::FOURCC_ARGB; -using ::webrtc::FOURCC_BA81; -using ::webrtc::FOURCC_BGGR; -using ::webrtc::FOURCC_BGR3; -using ::webrtc::FOURCC_BGRA; -using ::webrtc::FOURCC_CM24; -using ::webrtc::FOURCC_CM32; -using ::webrtc::FOURCC_DMB1; -using ::webrtc::FOURCC_GBRG; -using ::webrtc::FOURCC_GRBG; -using ::webrtc::FOURCC_H264; -using ::webrtc::FOURCC_HDYC; -using ::webrtc::FOURCC_I400; -using ::webrtc::FOURCC_I411; -using ::webrtc::FOURCC_I420; -using ::webrtc::FOURCC_I422; -using ::webrtc::FOURCC_I444; -using ::webrtc::FOURCC_IYUV; -using ::webrtc::FOURCC_J400; -using ::webrtc::FOURCC_J420; -using ::webrtc::FOURCC_JPEG; -using ::webrtc::FOURCC_M420; -using ::webrtc::FOURCC_MJPG; -using ::webrtc::FOURCC_NV12; -using ::webrtc::FOURCC_NV21; -using ::webrtc::FOURCC_R444; -using ::webrtc::FOURCC_RAW; -using ::webrtc::FOURCC_RGB3; -using ::webrtc::FOURCC_RGBA; -using ::webrtc::FOURCC_RGBO; -using ::webrtc::FOURCC_RGBP; -using ::webrtc::FOURCC_RGGB; -using ::webrtc::FOURCC_UYVY; -using ::webrtc::FOURCC_YU12; -using ::webrtc::FOURCC_YU16; -using ::webrtc::FOURCC_YU24; -using ::webrtc::FOURCC_YUVS; -using ::webrtc::FOURCC_YUY2; -using ::webrtc::FOURCC_YUYV; -using ::webrtc::FOURCC_YV12; -using ::webrtc::FOURCC_YV16; -using ::webrtc::FOURCC_YV24; -using ::webrtc::GetFourccName; -using ::webrtc::GreatestCommonDivisor; -using ::webrtc::LeastCommonMultiple; -using ::webrtc::VideoFormat; -using ::webrtc::VideoFormatPod; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_VIDEO_COMMON_H_ diff --git a/third_party/libwebrtc/media/base/video_source_base.h b/third_party/libwebrtc/media/base/video_source_base.h @@ -81,13 +81,5 @@ class VideoSourceBaseGuarded : public VideoSourceInterface<VideoFrame> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::VideoSourceBase; -using ::webrtc::VideoSourceBaseGuarded; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_BASE_VIDEO_SOURCE_BASE_H_ diff --git a/third_party/libwebrtc/media/engine/fake_webrtc_call.h b/third_party/libwebrtc/media/engine/fake_webrtc_call.h @@ -529,16 +529,4 @@ class FakeCall final : public Call, public PacketReceiver { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::FakeAudioReceiveStream; -using ::webrtc::FakeAudioSendStream; -using ::webrtc::FakeCall; -using ::webrtc::FakeFlexfecReceiveStream; -using ::webrtc::FakeVideoReceiveStream; -using ::webrtc::FakeVideoSendStream; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_ENGINE_FAKE_WEBRTC_CALL_H_ diff --git a/third_party/libwebrtc/media/engine/fake_webrtc_video_engine.h b/third_party/libwebrtc/media/engine/fake_webrtc_video_engine.h @@ -142,15 +142,5 @@ class FakeWebRtcVideoEncoderFactory : public VideoEncoderFactory { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::FakeWebRtcVideoDecoder; -using ::webrtc::FakeWebRtcVideoDecoderFactory; -using ::webrtc::FakeWebRtcVideoEncoder; -using ::webrtc::FakeWebRtcVideoEncoderFactory; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_ENGINE_FAKE_WEBRTC_VIDEO_ENGINE_H_ diff --git a/third_party/libwebrtc/media/engine/webrtc_media_engine.h b/third_party/libwebrtc/media/engine/webrtc_media_engine.h @@ -41,14 +41,5 @@ BitrateConstraints GetBitrateConfigForCodec(const Codec& codec); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::FilterRtpExtensions; -using ::webrtc::GetBitrateConfigForCodec; -using ::webrtc::ValidateRtpExtensions; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_ENGINE_WEBRTC_MEDIA_ENGINE_H_ diff --git a/third_party/libwebrtc/media/engine/webrtc_video_engine.h b/third_party/libwebrtc/media/engine/webrtc_video_engine.h @@ -861,17 +861,5 @@ class WebRtcVideoChannel : public WebRtcVideoSendChannel { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::MergeInfoAboutOutboundRtpSubstreamsForTesting; -using ::webrtc::VideoCodecSettings; -using ::webrtc::WebRtcVideoChannel; -using ::webrtc::WebRtcVideoEngine; -using ::webrtc::WebRtcVideoReceiveChannel; -using ::webrtc::WebRtcVideoSendChannel; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_ENGINE_WEBRTC_VIDEO_ENGINE_H_ diff --git a/third_party/libwebrtc/media/engine/webrtc_voice_engine.h b/third_party/libwebrtc/media/engine/webrtc_voice_engine.h @@ -499,14 +499,5 @@ class WebRtcVoiceReceiveChannel final } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::WebRtcVoiceEngine; -using ::webrtc::WebRtcVoiceReceiveChannel; -using ::webrtc::WebRtcVoiceSendChannel; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_ENGINE_WEBRTC_VOICE_ENGINE_H_ diff --git a/third_party/libwebrtc/media/sctp/sctp_transport_factory.h b/third_party/libwebrtc/media/sctp/sctp_transport_factory.h @@ -34,12 +34,5 @@ class SctpTransportFactory : public SctpTransportFactoryInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::SctpTransportFactory; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_SCTP_SCTP_TRANSPORT_FACTORY_H__ diff --git a/third_party/libwebrtc/media/sctp/sctp_transport_internal.h b/third_party/libwebrtc/media/sctp/sctp_transport_internal.h @@ -150,18 +150,5 @@ class SctpTransportInternal { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::kMaxSctpSid; -using ::webrtc::kMaxSctpStreams; -using ::webrtc::kMinSctpSid; -using ::webrtc::kSctpDefaultPort; -using ::webrtc::kSpecMaxSctpSid; -using ::webrtc::SctpErrorCauseCode; -using ::webrtc::SctpTransportInternal; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // MEDIA_SCTP_SCTP_TRANSPORT_INTERNAL_H_ diff --git a/third_party/libwebrtc/moz-patch-stack/s0001.patch b/third_party/libwebrtc/moz-patch-stack/s0001.patch @@ -1446,7 +1446,7 @@ index 1a07e9641e..de97fe9446 100644 // The list of logging streams currently configured. // Note: we explicitly do not clean this up, because of the uncertain ordering diff --git a/rtc_base/logging.h b/rtc_base/logging.h -index c87e707ebc..caea4e8a51 100644 +index c24826dde4..937e0edd30 100644 --- a/rtc_base/logging.h +++ b/rtc_base/logging.h @@ -554,6 +554,12 @@ class LogMessage { diff --git a/third_party/libwebrtc/moz-patch-stack/s0009.patch b/third_party/libwebrtc/moz-patch-stack/s0009.patch @@ -89,7 +89,7 @@ index 0b57cfe90c..1c635ea440 100644 #include <new> #include <string> diff --git a/rtc_base/byte_order.h b/rtc_base/byte_order.h -index 95c8ebc864..9098998a52 100644 +index cd4fd421ca..c8efa9ac83 100644 --- a/rtc_base/byte_order.h +++ b/rtc_base/byte_order.h @@ -90,6 +90,8 @@ diff --git a/third_party/libwebrtc/moz-patch-stack/s0027.patch b/third_party/libwebrtc/moz-patch-stack/s0027.patch @@ -684,7 +684,7 @@ index 421e7ba136..309af412f7 100644 rtc_library("rtc_audio_video") { diff --git a/media/base/media_channel.h b/media/base/media_channel.h -index 1a74631f17..810af57631 100644 +index f920b55ed5..91f2105c5d 100644 --- a/media/base/media_channel.h +++ b/media/base/media_channel.h @@ -67,9 +67,6 @@ namespace webrtc { diff --git a/third_party/libwebrtc/moz-patch-stack/s0121.patch b/third_party/libwebrtc/moz-patch-stack/s0121.patch @@ -9,7 +9,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/8fee7e6d9736f8d1d 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rtc_base/ssl_stream_adapter.h b/rtc_base/ssl_stream_adapter.h -index ed908dd89c..b19e1916ec 100644 +index ca2f6c48c4..24fc299b82 100644 --- a/rtc_base/ssl_stream_adapter.h +++ b/rtc_base/ssl_stream_adapter.h @@ -244,11 +244,12 @@ class SSLStreamAdapter : public StreamInterface { diff --git a/third_party/libwebrtc/moz-patch-stack/s0131.patch b/third_party/libwebrtc/moz-patch-stack/s0131.patch @@ -9,7 +9,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/293f1877fead30723 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtc_base/ssl_stream_adapter.h b/rtc_base/ssl_stream_adapter.h -index b19e1916ec..308df14736 100644 +index 24fc299b82..ec16887eac 100644 --- a/rtc_base/ssl_stream_adapter.h +++ b/rtc_base/ssl_stream_adapter.h @@ -247,7 +247,7 @@ class SSLStreamAdapter : public StreamInterface { diff --git a/third_party/libwebrtc/p2p/base/active_ice_controller_factory_interface.h b/third_party/libwebrtc/p2p/base/active_ice_controller_factory_interface.h @@ -36,13 +36,5 @@ class ActiveIceControllerFactoryInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::ActiveIceControllerFactoryArgs; -using ::webrtc::ActiveIceControllerFactoryInterface; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_ACTIVE_ICE_CONTROLLER_FACTORY_INTERFACE_H_ diff --git a/third_party/libwebrtc/p2p/base/active_ice_controller_interface.h b/third_party/libwebrtc/p2p/base/active_ice_controller_interface.h @@ -80,12 +80,5 @@ class ActiveIceControllerInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::ActiveIceControllerInterface; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_ACTIVE_ICE_CONTROLLER_INTERFACE_H_ diff --git a/third_party/libwebrtc/p2p/base/async_stun_tcp_socket.h b/third_party/libwebrtc/p2p/base/async_stun_tcp_socket.h @@ -50,12 +50,5 @@ class AsyncStunTCPSocket : public AsyncTCPSocketBase { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::AsyncStunTCPSocket; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_ diff --git a/third_party/libwebrtc/p2p/base/basic_ice_controller.h b/third_party/libwebrtc/p2p/base/basic_ice_controller.h @@ -175,12 +175,5 @@ class BasicIceController : public IceControllerInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::BasicIceController; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_BASIC_ICE_CONTROLLER_H_ diff --git a/third_party/libwebrtc/p2p/base/basic_packet_socket_factory.h b/third_party/libwebrtc/p2p/base/basic_packet_socket_factory.h @@ -54,12 +54,5 @@ class RTC_EXPORT BasicPacketSocketFactory : public PacketSocketFactory { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::BasicPacketSocketFactory; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_ diff --git a/third_party/libwebrtc/p2p/base/candidate_pair_interface.h b/third_party/libwebrtc/p2p/base/candidate_pair_interface.h @@ -37,13 +37,5 @@ struct CandidatePair final : public CandidatePairInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::CandidatePair; -using ::webrtc::CandidatePairInterface; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_CANDIDATE_PAIR_INTERFACE_H_ diff --git a/third_party/libwebrtc/p2p/base/connection.h b/third_party/libwebrtc/p2p/base/connection.h @@ -541,15 +541,5 @@ class ProxyConnection : public Connection { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::Connection; -using ::webrtc::kGoogPingVersion; -using ::webrtc::kMaxStunBindingLength; -using ::webrtc::ProxyConnection; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_CONNECTION_H_ diff --git a/third_party/libwebrtc/p2p/base/connection_info.h b/third_party/libwebrtc/p2p/base/connection_info.h @@ -86,14 +86,5 @@ typedef std::vector<ConnectionInfo> ConnectionInfos; } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::ConnectionInfo; -using ::webrtc::ConnectionInfos; -using ::webrtc::IceCandidatePairState; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_CONNECTION_INFO_H_ diff --git a/third_party/libwebrtc/p2p/base/ice_agent_interface.h b/third_party/libwebrtc/p2p/base/ice_agent_interface.h @@ -80,12 +80,5 @@ class IceAgentInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::IceAgentInterface; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_ICE_AGENT_INTERFACE_H_ diff --git a/third_party/libwebrtc/p2p/base/ice_controller_factory_interface.h b/third_party/libwebrtc/p2p/base/ice_controller_factory_interface.h @@ -41,13 +41,5 @@ class IceControllerFactoryInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::IceControllerFactoryArgs; -using ::webrtc::IceControllerFactoryInterface; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_ICE_CONTROLLER_FACTORY_INTERFACE_H_ diff --git a/third_party/libwebrtc/p2p/base/ice_controller_interface.h b/third_party/libwebrtc/p2p/base/ice_controller_interface.h @@ -149,13 +149,5 @@ class IceControllerInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::IceControllerInterface; -using ::webrtc::IceRecheckEvent; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_ICE_CONTROLLER_INTERFACE_H_ diff --git a/third_party/libwebrtc/p2p/base/ice_credentials_iterator.h b/third_party/libwebrtc/p2p/base/ice_credentials_iterator.h @@ -34,12 +34,5 @@ class IceCredentialsIterator { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::IceCredentialsIterator; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_ICE_CREDENTIALS_ITERATOR_H_ diff --git a/third_party/libwebrtc/p2p/base/ice_switch_reason.h b/third_party/libwebrtc/p2p/base/ice_switch_reason.h @@ -40,13 +40,5 @@ RTC_EXPORT std::string IceSwitchReasonToString(IceSwitchReason reason); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::IceSwitchReason; -using ::webrtc::IceSwitchReasonToString; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_ICE_SWITCH_REASON_H_ diff --git a/third_party/libwebrtc/p2p/base/ice_transport_internal.h b/third_party/libwebrtc/p2p/base/ice_transport_internal.h @@ -445,32 +445,5 @@ class RTC_EXPORT IceTransportInternal : public PacketTransportInternal { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::Candidates; -using ::webrtc::ContinualGatheringPolicy; -using ::webrtc::GATHER_CONTINUALLY; -using ::webrtc::GATHER_ONCE; -using ::webrtc::IceConfig; -using ::webrtc::IceConnectionState; -using ::webrtc::IceGatheringState; -using ::webrtc::IceTransportInternal; -using ::webrtc::IceTransportStats; -using ::webrtc::kIceConnectionCompleted; -using ::webrtc::kIceConnectionConnected; -using ::webrtc::kIceConnectionConnecting; -using ::webrtc::kIceConnectionFailed; -using ::webrtc::kIceGatheringComplete; -using ::webrtc::kIceGatheringGathering; -using ::webrtc::kIceGatheringNew; -using ::webrtc::NominationMode; -using ::webrtc::VerifyCandidate; -using ::webrtc::VerifyCandidates; - -using IceTransportState = ::webrtc::IceTransportStateInternal; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_ICE_TRANSPORT_INTERNAL_H_ diff --git a/third_party/libwebrtc/p2p/base/p2p_constants.h b/third_party/libwebrtc/p2p/base/p2p_constants.h @@ -128,57 +128,5 @@ const int kMaxTurnUsernameLength = 509; // RFC 8489 section 14.3 } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::BACKUP_CONNECTION_PING_INTERVAL; -using ::webrtc::CN_AUDIO; -using ::webrtc::CN_DATA; -using ::webrtc::CN_OTHER; -using ::webrtc::CN_VIDEO; -using ::webrtc::CONNECTION_RESPONSE_TIMEOUT; -using ::webrtc::CONNECTION_WRITE_CONNECT_FAILURES; -using ::webrtc::CONNECTION_WRITE_CONNECT_TIMEOUT; -using ::webrtc::CONNECTION_WRITE_TIMEOUT; -using ::webrtc::CONNECTIONROLE_ACTIVE_STR; -using ::webrtc::CONNECTIONROLE_ACTPASS_STR; -using ::webrtc::CONNECTIONROLE_HOLDCONN_STR; -using ::webrtc::CONNECTIONROLE_PASSIVE_STR; -using ::webrtc::DEAD_CONNECTION_RECEIVE_TIMEOUT; -using ::webrtc::GROUP_TYPE_BUNDLE; -using ::webrtc::ICE_CANDIDATE_COMPONENT_DEFAULT; -using ::webrtc::ICE_CANDIDATE_COMPONENT_RTCP; -using ::webrtc::ICE_CANDIDATE_COMPONENT_RTP; -using ::webrtc::ICE_PWD_LENGTH; -using ::webrtc::ICE_PWD_MAX_LENGTH; -using ::webrtc::ICE_PWD_MIN_LENGTH; -using ::webrtc::ICE_TYPE_PREFERENCE_HOST; -using ::webrtc::ICE_TYPE_PREFERENCE_HOST_TCP; -using ::webrtc::ICE_TYPE_PREFERENCE_PRFLX; -using ::webrtc::ICE_TYPE_PREFERENCE_PRFLX_TCP; -using ::webrtc::ICE_TYPE_PREFERENCE_RELAY_TCP; -using ::webrtc::ICE_TYPE_PREFERENCE_RELAY_TLS; -using ::webrtc::ICE_TYPE_PREFERENCE_RELAY_UDP; -using ::webrtc::ICE_TYPE_PREFERENCE_SRFLX; -using ::webrtc::ICE_UFRAG_LENGTH; -using ::webrtc::ICE_UFRAG_MAX_LENGTH; -using ::webrtc::ICE_UFRAG_MIN_LENGTH; -using ::webrtc::IcePriorityValue; -using ::webrtc::LOCAL_TLD; -using ::webrtc::MIN_CHECK_RECEIVING_INTERVAL; -using ::webrtc::MIN_CONNECTION_LIFETIME; -using ::webrtc::MIN_PINGS_AT_WEAK_PING_INTERVAL; -using ::webrtc::RECEIVING_SWITCHING_DELAY; -using ::webrtc::RECEIVING_TIMEOUT; -using ::webrtc::REGATHER_ON_FAILED_NETWORKS_INTERVAL; -using ::webrtc::STRONG_AND_STABLE_WRITABLE_CONNECTION_PING_INTERVAL; -using ::webrtc::STRONG_PING_INTERVAL; -using ::webrtc::STUN_KEEPALIVE_INTERVAL; -using ::webrtc::WEAK_CONNECTION_RECEIVE_TIMEOUT; -using ::webrtc::WEAK_OR_STABILIZING_WRITABLE_CONNECTION_PING_INTERVAL; -using ::webrtc::WEAK_PING_INTERVAL; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_P2P_CONSTANTS_H_ diff --git a/third_party/libwebrtc/p2p/base/p2p_transport_channel.h b/third_party/libwebrtc/p2p/base/p2p_transport_channel.h @@ -543,14 +543,5 @@ class RTC_EXPORT P2PTransportChannel : public IceTransportInternal, } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::IceCredentialsChanged; -using ::webrtc::P2PTransportChannel; -using ::webrtc::RemoteCandidate; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_P2P_TRANSPORT_CHANNEL_H_ diff --git a/third_party/libwebrtc/p2p/base/p2p_transport_channel_ice_field_trials.h b/third_party/libwebrtc/p2p/base/p2p_transport_channel_ice_field_trials.h @@ -78,12 +78,5 @@ struct IceFieldTrials { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::IceFieldTrials; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_P2P_TRANSPORT_CHANNEL_ICE_FIELD_TRIALS_H_ diff --git a/third_party/libwebrtc/p2p/base/packet_transport_internal.h b/third_party/libwebrtc/p2p/base/packet_transport_internal.h @@ -116,12 +116,5 @@ class RTC_EXPORT PacketTransportInternal : public sigslot::has_slots<> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::PacketTransportInternal; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_PACKET_TRANSPORT_INTERNAL_H_ diff --git a/third_party/libwebrtc/p2p/base/port.h b/third_party/libwebrtc/p2p/base/port.h @@ -501,26 +501,5 @@ class RTC_EXPORT Port : public PortInterface, public sigslot::has_slots<> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::CandidatePairChangeEvent; -using ::webrtc::CandidateStats; -using ::webrtc::CandidateStatsList; -using ::webrtc::DISCARD_PORT; -using ::webrtc::IceCandidateErrorEvent; -using ::webrtc::MdnsNameRegistrationStatus; -using ::webrtc::Port; -using ::webrtc::ProtocolAddress; -using ::webrtc::ProtoToString; -using ::webrtc::ServerAddresses; -using ::webrtc::StringToProto; -using ::webrtc::StunStats; -using ::webrtc::TCPTYPE_ACTIVE_STR; -using ::webrtc::TCPTYPE_PASSIVE_STR; -using ::webrtc::TCPTYPE_SIMOPEN_STR; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_PORT_H_ diff --git a/third_party/libwebrtc/p2p/base/port_allocator.h b/third_party/libwebrtc/p2p/base/port_allocator.h @@ -642,41 +642,5 @@ class RTC_EXPORT PortAllocator : public sigslot::has_slots<> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::CF_ALL; -using ::webrtc::CF_HOST; -using ::webrtc::CF_NONE; -using ::webrtc::CF_REFLEXIVE; -using ::webrtc::CF_RELAY; -using ::webrtc::IceRegatheringReason; -using ::webrtc::kDefaultMaxIPv6Networks; -using ::webrtc::kDefaultPortAllocatorFlags; -using ::webrtc::kDefaultStepDelay; -using ::webrtc::kMinimumStepDelay; -using ::webrtc::PortAllocator; -using ::webrtc::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION; -using ::webrtc::PORTALLOCATOR_DISABLE_COSTLY_NETWORKS; -using ::webrtc::PORTALLOCATOR_DISABLE_DEFAULT_LOCAL_CANDIDATE; -using ::webrtc::PORTALLOCATOR_DISABLE_LINK_LOCAL_NETWORKS; -using ::webrtc::PORTALLOCATOR_DISABLE_RELAY; -using ::webrtc::PORTALLOCATOR_DISABLE_STUN; -using ::webrtc::PORTALLOCATOR_DISABLE_TCP; -using ::webrtc::PORTALLOCATOR_DISABLE_UDP; -using ::webrtc::PORTALLOCATOR_DISABLE_UDP_RELAY; -using ::webrtc::PORTALLOCATOR_ENABLE_ANY_ADDRESS_PORTS; -using ::webrtc::PORTALLOCATOR_ENABLE_IPV6; -using ::webrtc::PORTALLOCATOR_ENABLE_IPV6_ON_WIFI; -using ::webrtc::PORTALLOCATOR_ENABLE_SHARED_SOCKET; -using ::webrtc::PORTALLOCATOR_ENABLE_STUN_RETRANSMIT_ATTRIBUTE; -using ::webrtc::PortAllocatorSession; -using ::webrtc::PortList; -using ::webrtc::RelayCredentials; -using ::webrtc::RelayServerConfig; -using ::webrtc::TlsCertPolicy; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_PORT_ALLOCATOR_H_ diff --git a/third_party/libwebrtc/p2p/base/port_interface.h b/third_party/libwebrtc/p2p/base/port_interface.h @@ -205,18 +205,5 @@ class PortInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::PortInterface; -using ::webrtc::PROTO_LAST; -using ::webrtc::PROTO_SSLTCP; -using ::webrtc::PROTO_TCP; -using ::webrtc::PROTO_TLS; -using ::webrtc::PROTO_UDP; -using ::webrtc::ProtocolType; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_PORT_INTERFACE_H_ diff --git a/third_party/libwebrtc/p2p/base/pseudo_tcp.h b/third_party/libwebrtc/p2p/base/pseudo_tcp.h @@ -292,13 +292,5 @@ class RTC_EXPORT PseudoTcp { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::IPseudoTcpNotify; -using ::webrtc::PseudoTcp; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_PSEUDO_TCP_H_ diff --git a/third_party/libwebrtc/p2p/base/stun_dictionary.h b/third_party/libwebrtc/p2p/base/stun_dictionary.h @@ -204,13 +204,5 @@ class StunDictionaryWriter { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::StunDictionaryView; -using ::webrtc::StunDictionaryWriter; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_STUN_DICTIONARY_H_ diff --git a/third_party/libwebrtc/p2p/base/stun_port.h b/third_party/libwebrtc/p2p/base/stun_port.h @@ -269,15 +269,5 @@ class StunPort : public UDPPort { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::HIGH_COST_PORT_KEEPALIVE_LIFETIME; -using ::webrtc::INFINITE_LIFETIME; -using ::webrtc::StunPort; -using ::webrtc::UDPPort; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_STUN_PORT_H_ diff --git a/third_party/libwebrtc/p2p/base/stun_request.h b/third_party/libwebrtc/p2p/base/stun_request.h @@ -164,15 +164,5 @@ class StunRequest { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::kAllRequestsForTest; -using ::webrtc::STUN_TOTAL_TIMEOUT; -using ::webrtc::StunRequest; -using ::webrtc::StunRequestManager; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_STUN_REQUEST_H_ diff --git a/third_party/libwebrtc/p2p/base/tcp_port.h b/third_party/libwebrtc/p2p/base/tcp_port.h @@ -201,13 +201,5 @@ class TCPConnection : public Connection, public sigslot::has_slots<> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::TCPConnection; -using ::webrtc::TCPPort; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_TCP_PORT_H_ diff --git a/third_party/libwebrtc/p2p/base/transport_description.h b/third_party/libwebrtc/p2p/base/transport_description.h @@ -135,30 +135,5 @@ struct TransportDescription { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::ConnectionRole; -using ::webrtc::CONNECTIONROLE_ACTIVE; -using ::webrtc::CONNECTIONROLE_ACTPASS; -using ::webrtc::CONNECTIONROLE_HOLDCONN; -using ::webrtc::CONNECTIONROLE_NONE; -using ::webrtc::CONNECTIONROLE_PASSIVE; -using ::webrtc::ConnectionRoleToString; -using ::webrtc::ICE_OPTION_RENOMINATION; -using ::webrtc::ICE_OPTION_TRICKLE; -using ::webrtc::IceMode; -using ::webrtc::ICEMODE_FULL; -using ::webrtc::ICEMODE_LITE; -using ::webrtc::IceParameters; -using ::webrtc::IceRole; -using ::webrtc::ICEROLE_CONTROLLED; -using ::webrtc::ICEROLE_CONTROLLING; -using ::webrtc::ICEROLE_UNKNOWN; -using ::webrtc::StringToConnectionRole; -using ::webrtc::TransportDescription; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_TRANSPORT_DESCRIPTION_H_ diff --git a/third_party/libwebrtc/p2p/base/transport_description_factory.h b/third_party/libwebrtc/p2p/base/transport_description_factory.h @@ -87,13 +87,5 @@ class TransportDescriptionFactory { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::TransportDescriptionFactory; -using ::webrtc::TransportOptions; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_TRANSPORT_DESCRIPTION_FACTORY_H_ diff --git a/third_party/libwebrtc/p2p/base/transport_info.h b/third_party/libwebrtc/p2p/base/transport_info.h @@ -36,13 +36,5 @@ typedef std::vector<TransportInfo> TransportInfos; } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::TransportInfo; -using ::webrtc::TransportInfos; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_TRANSPORT_INFO_H_ diff --git a/third_party/libwebrtc/p2p/base/turn_port.h b/third_party/libwebrtc/p2p/base/turn_port.h @@ -367,12 +367,5 @@ class TurnPort : public Port { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::TurnPort; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_TURN_PORT_H_ diff --git a/third_party/libwebrtc/p2p/base/wrapping_active_ice_controller.h b/third_party/libwebrtc/p2p/base/wrapping_active_ice_controller.h @@ -93,12 +93,5 @@ class WrappingActiveIceController : public ActiveIceControllerInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::WrappingActiveIceController; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_BASE_WRAPPING_ACTIVE_ICE_CONTROLLER_H_ diff --git a/third_party/libwebrtc/p2p/client/basic_port_allocator.h b/third_party/libwebrtc/p2p/client/basic_port_allocator.h @@ -416,16 +416,5 @@ class AllocationSequence { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::AllocationSequence; -using ::webrtc::BasicPortAllocator; -using ::webrtc::BasicPortAllocatorSession; -using ::webrtc::PortConfiguration; -using ::webrtc::SessionState; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_ diff --git a/third_party/libwebrtc/p2p/client/relay_port_factory_interface.h b/third_party/libwebrtc/p2p/client/relay_port_factory_interface.h @@ -64,13 +64,5 @@ class RelayPortFactoryInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::CreateRelayPortArgs; -using ::webrtc::RelayPortFactoryInterface; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_CLIENT_RELAY_PORT_FACTORY_INTERFACE_H_ diff --git a/third_party/libwebrtc/p2p/client/turn_port_factory.h b/third_party/libwebrtc/p2p/client/turn_port_factory.h @@ -34,12 +34,5 @@ class TurnPortFactory : public RelayPortFactoryInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::TurnPortFactory; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_CLIENT_TURN_PORT_FACTORY_H_ diff --git a/third_party/libwebrtc/p2p/dtls/dtls_stun_piggyback_callbacks.h b/third_party/libwebrtc/p2p/dtls/dtls_stun_piggyback_callbacks.h @@ -81,12 +81,5 @@ class DtlsStunPiggybackCallbacks { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::DtlsStunPiggybackCallbacks; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_DTLS_DTLS_STUN_PIGGYBACK_CALLBACKS_H_ diff --git a/third_party/libwebrtc/p2p/dtls/dtls_stun_piggyback_controller.h b/third_party/libwebrtc/p2p/dtls/dtls_stun_piggyback_controller.h @@ -107,12 +107,5 @@ class DtlsStunPiggybackController { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::DtlsStunPiggybackController; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_DTLS_DTLS_STUN_PIGGYBACK_CONTROLLER_H_ diff --git a/third_party/libwebrtc/p2p/dtls/dtls_transport.h b/third_party/libwebrtc/p2p/dtls/dtls_transport.h @@ -327,13 +327,5 @@ class DtlsTransportInternalImpl : public DtlsTransportInternal { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using DtlsTransport = ::webrtc::DtlsTransportInternalImpl; -using ::webrtc::StreamInterfaceChannel; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_DTLS_DTLS_TRANSPORT_H_ diff --git a/third_party/libwebrtc/p2p/dtls/dtls_transport_factory.h b/third_party/libwebrtc/p2p/dtls/dtls_transport_factory.h @@ -38,12 +38,5 @@ class DtlsTransportFactory { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::DtlsTransportFactory; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_DTLS_DTLS_TRANSPORT_FACTORY_H_ diff --git a/third_party/libwebrtc/p2p/dtls/dtls_transport_internal.h b/third_party/libwebrtc/p2p/dtls/dtls_transport_internal.h @@ -157,15 +157,5 @@ class DtlsTransportInternal : public PacketTransportInternal { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::DtlsTransportInternal; -using ::webrtc::PacketFlags; -using ::webrtc::PF_NORMAL; -using ::webrtc::PF_SRTP_BYPASS; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_DTLS_DTLS_TRANSPORT_INTERNAL_H_ diff --git a/third_party/libwebrtc/p2p/dtls/dtls_utils.h b/third_party/libwebrtc/p2p/dtls/dtls_utils.h @@ -67,16 +67,5 @@ class PacketStash { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::IsDtlsClientHelloPacket; -using ::webrtc::IsDtlsHandshakePacket; -using ::webrtc::IsDtlsPacket; -using ::webrtc::kDtlsRecordHeaderLen; -using ::webrtc::kMaxDtlsPacketLen; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_DTLS_DTLS_UTILS_H_ diff --git a/third_party/libwebrtc/p2p/dtls/fake_dtls_transport.h b/third_party/libwebrtc/p2p/dtls/fake_dtls_transport.h @@ -334,12 +334,5 @@ class FakeDtlsTransport : public DtlsTransportInternal { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::FakeDtlsTransport; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_DTLS_FAKE_DTLS_TRANSPORT_H_ diff --git a/third_party/libwebrtc/p2p/test/fake_ice_transport.h b/third_party/libwebrtc/p2p/test/fake_ice_transport.h @@ -684,15 +684,5 @@ class FakeIceTransportWrapper : public IceTransportInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::FakeIceTransport; -using ::webrtc::FakeIceTransportWrapper; -using ::webrtc::SafeTask; -using ::webrtc::TimeDelta; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_FAKE_ICE_TRANSPORT_H_ diff --git a/third_party/libwebrtc/p2p/test/fake_packet_transport.h b/third_party/libwebrtc/p2p/test/fake_packet_transport.h @@ -156,12 +156,5 @@ class FakePacketTransport : public PacketTransportInternal { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::FakePacketTransport; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_FAKE_PACKET_TRANSPORT_H_ diff --git a/third_party/libwebrtc/p2p/test/fake_port_allocator.h b/third_party/libwebrtc/p2p/test/fake_port_allocator.h @@ -267,14 +267,5 @@ class FakePortAllocator : public PortAllocator { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::FakePortAllocator; -using ::webrtc::FakePortAllocatorSession; -using ::webrtc::TestUDPPort; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_FAKE_PORT_ALLOCATOR_H_ diff --git a/third_party/libwebrtc/p2p/test/mock_active_ice_controller.h b/third_party/libwebrtc/p2p/test/mock_active_ice_controller.h @@ -67,13 +67,5 @@ class MockActiveIceControllerFactory } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::MockActiveIceController; -using ::webrtc::MockActiveIceControllerFactory; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_MOCK_ACTIVE_ICE_CONTROLLER_H_ diff --git a/third_party/libwebrtc/p2p/test/mock_dns_resolving_packet_socket_factory.h b/third_party/libwebrtc/p2p/test/mock_dns_resolving_packet_socket_factory.h @@ -51,12 +51,5 @@ class MockDnsResolvingPacketSocketFactory : public BasicPacketSocketFactory { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::MockDnsResolvingPacketSocketFactory; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_MOCK_DNS_RESOLVING_PACKET_SOCKET_FACTORY_H_ diff --git a/third_party/libwebrtc/p2p/test/mock_ice_agent.h b/third_party/libwebrtc/p2p/test/mock_ice_agent.h @@ -48,12 +48,5 @@ class MockIceAgent : public IceAgentInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::MockIceAgent; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_MOCK_ICE_AGENT_H_ diff --git a/third_party/libwebrtc/p2p/test/mock_ice_controller.h b/third_party/libwebrtc/p2p/test/mock_ice_controller.h @@ -77,13 +77,5 @@ class MockIceControllerFactory : public IceControllerFactoryInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::MockIceController; -using ::webrtc::MockIceControllerFactory; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_MOCK_ICE_CONTROLLER_H_ diff --git a/third_party/libwebrtc/p2p/test/mock_ice_transport.h b/third_party/libwebrtc/p2p/test/mock_ice_transport.h @@ -82,12 +82,5 @@ class MockIceTransport : public IceTransportInternal { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::MockIceTransport; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_MOCK_ICE_TRANSPORT_H_ diff --git a/third_party/libwebrtc/p2p/test/nat_server.h b/third_party/libwebrtc/p2p/test/nat_server.h @@ -130,16 +130,5 @@ class NATServer { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AddrCmp; -using ::webrtc::NAT_SERVER_TCP_PORT; -using ::webrtc::NAT_SERVER_UDP_PORT; -using ::webrtc::NATServer; -using ::webrtc::RouteCmp; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_NAT_SERVER_H_ diff --git a/third_party/libwebrtc/p2p/test/nat_socket_factory.h b/third_party/libwebrtc/p2p/test/nat_socket_factory.h @@ -177,18 +177,5 @@ size_t UnpackAddressFromNAT(ArrayView<const uint8_t> buf, SocketAddress* remote_addr); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::kNATEncodedIPv4AddressSize; -using ::webrtc::kNATEncodedIPv6AddressSize; -using ::webrtc::NATInternalSocketFactory; -using ::webrtc::NATSocketFactory; -using ::webrtc::NATSocketServer; -using ::webrtc::PackAddressForNAT; -using ::webrtc::UnpackAddressFromNAT; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_NAT_SOCKET_FACTORY_H_ diff --git a/third_party/libwebrtc/p2p/test/nat_types.h b/third_party/libwebrtc/p2p/test/nat_types.h @@ -44,17 +44,5 @@ class NAT { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::NAT; -using ::webrtc::NAT_ADDR_RESTRICTED; -using ::webrtc::NAT_OPEN_CONE; -using ::webrtc::NAT_PORT_RESTRICTED; -using ::webrtc::NAT_SYMMETRIC; -using ::webrtc::NATType; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_NAT_TYPES_H_ diff --git a/third_party/libwebrtc/p2p/test/stun_server.h b/third_party/libwebrtc/p2p/test/stun_server.h @@ -63,13 +63,5 @@ class StunServer { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::STUN_SERVER_PORT; -using ::webrtc::StunServer; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_STUN_SERVER_H_ diff --git a/third_party/libwebrtc/p2p/test/test_stun_server.h b/third_party/libwebrtc/p2p/test/test_stun_server.h @@ -51,12 +51,5 @@ class TestStunServer : StunServer { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::TestStunServer; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_TEST_STUN_SERVER_H_ diff --git a/third_party/libwebrtc/p2p/test/test_turn_customizer.h b/third_party/libwebrtc/p2p/test/test_turn_customizer.h @@ -59,12 +59,5 @@ class TestTurnCustomizer : public TurnCustomizer { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::TestTurnCustomizer; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_TEST_TURN_CUSTOMIZER_H_ diff --git a/third_party/libwebrtc/p2p/test/test_turn_server.h b/third_party/libwebrtc/p2p/test/test_turn_server.h @@ -165,15 +165,5 @@ class TestTurnServer : public TurnAuthInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::kTestRealm; -using ::webrtc::kTestSoftware; -using ::webrtc::TestTurnRedirector; -using ::webrtc::TestTurnServer; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_TEST_TURN_SERVER_H_ diff --git a/third_party/libwebrtc/p2p/test/turn_server.h b/third_party/libwebrtc/p2p/test/turn_server.h @@ -368,20 +368,5 @@ class TurnServer : public sigslot::has_slots<> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::kMaxTurnChannelNumber; -using ::webrtc::kMinTurnChannelNumber; -using ::webrtc::StunMessageObserver; -using ::webrtc::TURN_SERVER_PORT; -using ::webrtc::TurnAuthInterface; -using ::webrtc::TurnRedirectInterface; -using ::webrtc::TurnServer; -using ::webrtc::TurnServerAllocation; -using ::webrtc::TurnServerConnection; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // P2P_TEST_TURN_SERVER_H_ diff --git a/third_party/libwebrtc/pc/channel.h b/third_party/libwebrtc/pc/channel.h @@ -501,14 +501,5 @@ class VideoChannel : public BaseChannel { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::BaseChannel; -using ::webrtc::VideoChannel; -using ::webrtc::VoiceChannel; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_CHANNEL_H_ diff --git a/third_party/libwebrtc/pc/channel_interface.h b/third_party/libwebrtc/pc/channel_interface.h @@ -103,12 +103,5 @@ class ChannelInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::ChannelInterface; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_CHANNEL_INTERFACE_H_ diff --git a/third_party/libwebrtc/pc/codec_vendor.h b/third_party/libwebrtc/pc/codec_vendor.h @@ -128,13 +128,5 @@ class CodecLookupHelper { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::CodecLookupHelper; -using ::webrtc::CodecVendor; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_CODEC_VENDOR_H_ diff --git a/third_party/libwebrtc/pc/jsep_transport.h b/third_party/libwebrtc/pc/jsep_transport.h @@ -329,13 +329,5 @@ class JsepTransport { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::JsepTransport; -using ::webrtc::JsepTransportDescription; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_JSEP_TRANSPORT_H_ diff --git a/third_party/libwebrtc/pc/media_options.h b/third_party/libwebrtc/pc/media_options.h @@ -117,15 +117,5 @@ struct MediaSessionOptions { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::kDefaultRtcpCname; -using ::webrtc::MediaDescriptionOptions; -using ::webrtc::MediaSessionOptions; -using ::webrtc::SenderOptions; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_MEDIA_OPTIONS_H_ diff --git a/third_party/libwebrtc/pc/media_protocol_names.h b/third_party/libwebrtc/pc/media_protocol_names.h @@ -44,24 +44,5 @@ bool IsDtlsRtp(absl::string_view protocol); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::IsDtlsRtp; -using ::webrtc::IsDtlsSctp; -using ::webrtc::IsPlainRtp; -using ::webrtc::IsPlainSctp; -using ::webrtc::IsRtpProtocol; -using ::webrtc::IsSctpProtocol; -using ::webrtc::kMediaProtocolAvpf; -using ::webrtc::kMediaProtocolDtlsSavpf; -using ::webrtc::kMediaProtocolDtlsSctp; -using ::webrtc::kMediaProtocolSavpf; -using ::webrtc::kMediaProtocolSctp; -using ::webrtc::kMediaProtocolTcpDtlsSctp; -using ::webrtc::kMediaProtocolUdpDtlsSctp; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_MEDIA_PROTOCOL_NAMES_H_ diff --git a/third_party/libwebrtc/pc/media_session.h b/third_party/libwebrtc/pc/media_session.h @@ -225,24 +225,5 @@ SctpDataContentDescription* GetFirstSctpDataContentDescription( } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::GetFirstAudioContent; -using ::webrtc::GetFirstAudioContentDescription; -using ::webrtc::GetFirstDataContent; -using ::webrtc::GetFirstMediaContent; -using ::webrtc::GetFirstSctpDataContentDescription; -using ::webrtc::GetFirstVideoContent; -using ::webrtc::GetFirstVideoContentDescription; -using ::webrtc::IsAudioContent; -using ::webrtc::IsDataContent; -using ::webrtc::IsMediaContent; -using ::webrtc::IsUnsupportedContent; -using ::webrtc::IsVideoContent; -using ::webrtc::MediaSessionDescriptionFactory; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_MEDIA_SESSION_H_ diff --git a/third_party/libwebrtc/pc/rtcp_mux_filter.h b/third_party/libwebrtc/pc/rtcp_mux_filter.h @@ -75,12 +75,5 @@ class RtcpMuxFilter { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::RtcpMuxFilter; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_RTCP_MUX_FILTER_H_ diff --git a/third_party/libwebrtc/pc/session_description.h b/third_party/libwebrtc/pc/session_description.h @@ -586,34 +586,5 @@ enum ContentSource { CS_LOCAL, CS_REMOTE }; } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::AudioContentDescription; -using ::webrtc::ContentGroup; -using ::webrtc::ContentGroups; -using ::webrtc::ContentInfo; -using ::webrtc::ContentInfos; -using ::webrtc::ContentNames; -using ::webrtc::ContentSource; -using ::webrtc::CS_LOCAL; -using ::webrtc::CS_REMOTE; -using ::webrtc::kAutoBandwidth; -using ::webrtc::kMsidSignalingMediaSection; -using ::webrtc::kMsidSignalingNotUsed; -using ::webrtc::kMsidSignalingSemantic; -using ::webrtc::kMsidSignalingSsrcAttribute; -using ::webrtc::MediaContentDescription; -using ::webrtc::MediaProtocolType; -using ::webrtc::MsidSignaling; -using ::webrtc::RtpHeaderExtensions; -using ::webrtc::RtpMediaContentDescription; -using ::webrtc::SctpDataContentDescription; -using ::webrtc::SessionDescription; -using ::webrtc::UnsupportedContentDescription; -using ::webrtc::VideoContentDescription; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_SESSION_DESCRIPTION_H_ diff --git a/third_party/libwebrtc/pc/simulcast_description.h b/third_party/libwebrtc/pc/simulcast_description.h @@ -112,14 +112,5 @@ class SimulcastDescription final { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::SimulcastDescription; -using ::webrtc::SimulcastLayer; -using ::webrtc::SimulcastLayerList; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_SIMULCAST_DESCRIPTION_H_ diff --git a/third_party/libwebrtc/pc/srtp_session.h b/third_party/libwebrtc/pc/srtp_session.h @@ -163,13 +163,5 @@ class SrtpSession { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::ProhibitLibsrtpInitialization; -using ::webrtc::SrtpSession; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_SRTP_SESSION_H_ diff --git a/third_party/libwebrtc/pc/test/mock_channel_interface.h b/third_party/libwebrtc/pc/test/mock_channel_interface.h @@ -88,12 +88,5 @@ class MockChannelInterface : public ChannelInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::MockChannelInterface; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_TEST_MOCK_CHANNEL_INTERFACE_H_ diff --git a/third_party/libwebrtc/pc/test/mock_voice_media_receive_channel_interface.h b/third_party/libwebrtc/pc/test/mock_voice_media_receive_channel_interface.h @@ -137,12 +137,5 @@ static_assert(!std::is_abstract_v<MockVoiceMediaReceiveChannelInterface>, ""); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::MockVoiceMediaReceiveChannelInterface; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_TEST_MOCK_VOICE_MEDIA_RECEIVE_CHANNEL_INTERFACE_H_ diff --git a/third_party/libwebrtc/pc/test/srtp_test_util.h b/third_party/libwebrtc/pc/test/srtp_test_util.h @@ -53,15 +53,5 @@ static int rtcp_auth_tag_len(int crypto_suite) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::kTestKey1; -using ::webrtc::kTestKey2; -using ::webrtc::rtcp_auth_tag_len; -using ::webrtc::rtp_auth_tag_len; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_TEST_SRTP_TEST_UTIL_H_ diff --git a/third_party/libwebrtc/pc/transport_stats.h b/third_party/libwebrtc/pc/transport_stats.h @@ -51,14 +51,5 @@ struct TransportStats { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::TransportChannelStats; -using ::webrtc::TransportChannelStatsList; -using ::webrtc::TransportStats; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_TRANSPORT_STATS_H_ diff --git a/third_party/libwebrtc/pc/typed_codec_vendor.h b/third_party/libwebrtc/pc/typed_codec_vendor.h @@ -43,12 +43,5 @@ class TypedCodecVendor { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::TypedCodecVendor; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_TYPED_CODEC_VENDOR_H_ diff --git a/third_party/libwebrtc/pc/used_ids.h b/third_party/libwebrtc/pc/used_ids.h @@ -185,14 +185,5 @@ class UsedRtpHeaderExtensionIds : public UsedIds<RtpExtension> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::UsedIds; -using ::webrtc::UsedPayloadTypes; -using ::webrtc::UsedRtpHeaderExtensionIds; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // PC_USED_IDS_H_ diff --git a/third_party/libwebrtc/rtc_base/async_packet_socket.h b/third_party/libwebrtc/rtc_base/async_packet_socket.h @@ -200,16 +200,5 @@ void CopySocketInformationToPacketInfo(size_t packet_size_bytes, } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AsyncListenSocket; -using ::webrtc::AsyncPacketSocket; -using ::webrtc::CopySocketInformationToPacketInfo; -using ::webrtc::PacketTimeUpdateParams; -using PacketOptions = ::webrtc::AsyncSocketPacketOptions; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_ASYNC_PACKET_SOCKET_H_ diff --git a/third_party/libwebrtc/rtc_base/async_socket.h b/third_party/libwebrtc/rtc_base/async_socket.h @@ -62,12 +62,5 @@ class AsyncSocketAdapter : public Socket, public sigslot::has_slots<> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AsyncSocketAdapter; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_ASYNC_SOCKET_H_ diff --git a/third_party/libwebrtc/rtc_base/async_tcp_socket.h b/third_party/libwebrtc/rtc_base/async_tcp_socket.h @@ -123,14 +123,5 @@ class AsyncTcpListenSocket : public AsyncListenSocket { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AsyncTcpListenSocket; -using ::webrtc::AsyncTCPSocket; -using ::webrtc::AsyncTCPSocketBase; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_ASYNC_TCP_SOCKET_H_ diff --git a/third_party/libwebrtc/rtc_base/async_udp_socket.h b/third_party/libwebrtc/rtc_base/async_udp_socket.h @@ -77,12 +77,5 @@ class AsyncUDPSocket : public AsyncPacketSocket { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AsyncUDPSocket; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_ASYNC_UDP_SOCKET_H_ diff --git a/third_party/libwebrtc/rtc_base/bit_buffer.h b/third_party/libwebrtc/rtc_base/bit_buffer.h @@ -96,12 +96,5 @@ class BitBufferWriter { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::BitBufferWriter; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_BIT_BUFFER_H_ diff --git a/third_party/libwebrtc/rtc_base/boringssl_certificate.h b/third_party/libwebrtc/rtc_base/boringssl_certificate.h @@ -70,12 +70,5 @@ class BoringSSLCertificate final : public SSLCertificate { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::BoringSSLCertificate; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_BORINGSSL_CERTIFICATE_H_ diff --git a/third_party/libwebrtc/rtc_base/boringssl_identity.h b/third_party/libwebrtc/rtc_base/boringssl_identity.h @@ -74,12 +74,5 @@ class BoringSSLIdentity final : public SSLIdentity { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::BoringSSLIdentity; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_BORINGSSL_IDENTITY_H_ diff --git a/third_party/libwebrtc/rtc_base/buffer.h b/third_party/libwebrtc/rtc_base/buffer.h @@ -449,16 +449,5 @@ using ZeroOnFreeBuffer = BufferT<T, true>; } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -template <typename T, bool ZeroOnFree = false> -using BufferT = ::webrtc::BufferT<T, ZeroOnFree>; -using ::webrtc::Buffer; -template <typename T> -using ZeroOnFreeBuffer = ::webrtc::ZeroOnFreeBuffer<T>; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_BUFFER_H_ diff --git a/third_party/libwebrtc/rtc_base/buffer_queue.h b/third_party/libwebrtc/rtc_base/buffer_queue.h @@ -67,12 +67,5 @@ class BufferQueue final { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::BufferQueue; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_BUFFER_QUEUE_H_ diff --git a/third_party/libwebrtc/rtc_base/byte_buffer.h b/third_party/libwebrtc/rtc_base/byte_buffer.h @@ -207,14 +207,5 @@ class ByteBufferReader { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::ByteBufferReader; -using ::webrtc::ByteBufferWriter; -using ::webrtc::ByteBufferWriterT; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_BYTE_BUFFER_H_ diff --git a/third_party/libwebrtc/rtc_base/byte_order.h b/third_party/libwebrtc/rtc_base/byte_order.h @@ -211,32 +211,5 @@ inline uint64_t NetworkToHost64(uint64_t n) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::Get8; -using ::webrtc::GetBE16; -using ::webrtc::GetBE32; -using ::webrtc::GetBE64; -using ::webrtc::GetLE16; -using ::webrtc::GetLE32; -using ::webrtc::GetLE64; -using ::webrtc::HostToNetwork16; -using ::webrtc::HostToNetwork32; -using ::webrtc::HostToNetwork64; -using ::webrtc::IsHostBigEndian; -using ::webrtc::NetworkToHost16; -using ::webrtc::NetworkToHost32; -using ::webrtc::NetworkToHost64; -using ::webrtc::Set8; -using ::webrtc::SetBE16; -using ::webrtc::SetBE32; -using ::webrtc::SetBE64; -using ::webrtc::SetLE16; -using ::webrtc::SetLE32; -using ::webrtc::SetLE64; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_BYTE_ORDER_H_ diff --git a/third_party/libwebrtc/rtc_base/checks.h b/third_party/libwebrtc/rtc_base/checks.h @@ -489,13 +489,6 @@ inline T CheckedDivExact(T a, T b) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::CheckedDivExact; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #else // __cplusplus not defined // C version. Lacks many features compared to the C++ version, but usage diff --git a/third_party/libwebrtc/rtc_base/copy_on_write_buffer.h b/third_party/libwebrtc/rtc_base/copy_on_write_buffer.h @@ -317,12 +317,5 @@ class RTC_EXPORT CopyOnWriteBuffer { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::CopyOnWriteBuffer; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_COPY_ON_WRITE_BUFFER_H_ diff --git a/third_party/libwebrtc/rtc_base/cpu_time.h b/third_party/libwebrtc/rtc_base/cpu_time.h @@ -25,13 +25,5 @@ int64_t GetThreadCpuTimeNanos(); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::GetProcessCpuTimeNanos; -using ::webrtc::GetThreadCpuTimeNanos; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_CPU_TIME_H_ diff --git a/third_party/libwebrtc/rtc_base/crc32.h b/third_party/libwebrtc/rtc_base/crc32.h @@ -34,13 +34,5 @@ inline uint32_t ComputeCrc32(absl::string_view str) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::ComputeCrc32; -using ::webrtc::UpdateCrc32; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_CRC32_H_ diff --git a/third_party/libwebrtc/rtc_base/crypto_random.h b/third_party/libwebrtc/rtc_base/crypto_random.h @@ -85,23 +85,5 @@ double CreateRandomDouble(); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::CreateRandomData; -using ::webrtc::CreateRandomDouble; -using ::webrtc::CreateRandomId; -using ::webrtc::CreateRandomId64; -using ::webrtc::CreateRandomNonZeroId; -using ::webrtc::CreateRandomString; -using ::webrtc::CreateRandomUuid; -using ::webrtc::InitRandom; -using ::webrtc::RandomGenerator; -using ::webrtc::SetDefaultRandomGenerator; -using ::webrtc::SetRandomGenerator; -using ::webrtc::SetRandomTestMode; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_CRYPTO_RANDOM_H_ diff --git a/third_party/libwebrtc/rtc_base/data_rate_limiter.h b/third_party/libwebrtc/rtc_base/data_rate_limiter.h @@ -55,12 +55,5 @@ class RTC_EXPORT DataRateLimiter { }; } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::DataRateLimiter; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_DATA_RATE_LIMITER_H_ diff --git a/third_party/libwebrtc/rtc_base/deprecated/recursive_critical_section.h b/third_party/libwebrtc/rtc_base/deprecated/recursive_critical_section.h @@ -104,13 +104,5 @@ class RTC_SCOPED_LOCKABLE CritScope { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::CritScope; -using ::webrtc::RecursiveCriticalSection; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_DEPRECATED_RECURSIVE_CRITICAL_SECTION_H_ diff --git a/third_party/libwebrtc/rtc_base/dscp.h b/third_party/libwebrtc/rtc_base/dscp.h @@ -42,35 +42,5 @@ enum DiffServCodePoint { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::DiffServCodePoint; -using ::webrtc::DSCP_AF11; -using ::webrtc::DSCP_AF12; -using ::webrtc::DSCP_AF13; -using ::webrtc::DSCP_AF21; -using ::webrtc::DSCP_AF22; -using ::webrtc::DSCP_AF23; -using ::webrtc::DSCP_AF31; -using ::webrtc::DSCP_AF32; -using ::webrtc::DSCP_AF33; -using ::webrtc::DSCP_AF41; -using ::webrtc::DSCP_AF42; -using ::webrtc::DSCP_AF43; -using ::webrtc::DSCP_CS0; -using ::webrtc::DSCP_CS1; -using ::webrtc::DSCP_CS2; -using ::webrtc::DSCP_CS3; -using ::webrtc::DSCP_CS4; -using ::webrtc::DSCP_CS5; -using ::webrtc::DSCP_CS6; -using ::webrtc::DSCP_CS7; -using ::webrtc::DSCP_DEFAULT; -using ::webrtc::DSCP_EF; -using ::webrtc::DSCP_NO_CHANGE; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_DSCP_H_ diff --git a/third_party/libwebrtc/rtc_base/event.h b/third_party/libwebrtc/rtc_base/event.h @@ -134,14 +134,5 @@ class ScopedDisallowWait { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::Event; -using ::webrtc::ScopedAllowBaseSyncPrimitives; -using ::webrtc::ScopedAllowBaseSyncPrimitivesForTesting; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_EVENT_H_ diff --git a/third_party/libwebrtc/rtc_base/event_tracer.h b/third_party/libwebrtc/rtc_base/event_tracer.h @@ -85,18 +85,5 @@ RTC_EXPORT void ShutdownInternalTracer(); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -namespace tracing { -using ::webrtc::tracing::SetupInternalTracer; -using ::webrtc::tracing::ShutdownInternalTracer; -using ::webrtc::tracing::StartInternalCapture; -using ::webrtc::tracing::StartInternalCaptureToFile; -using ::webrtc::tracing::StopInternalCapture; -} // namespace tracing -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_EVENT_TRACER_H_ diff --git a/third_party/libwebrtc/rtc_base/fake_clock.h b/third_party/libwebrtc/rtc_base/fake_clock.h @@ -80,15 +80,5 @@ class ScopedFakeClock : public ThreadProcessingFakeClock { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::FakeClock; -using ::webrtc::ScopedBaseFakeClock; -using ::webrtc::ScopedFakeClock; -using ::webrtc::ThreadProcessingFakeClock; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_FAKE_CLOCK_H_ diff --git a/third_party/libwebrtc/rtc_base/fake_network.h b/third_party/libwebrtc/rtc_base/fake_network.h @@ -163,14 +163,5 @@ class FakeNetworkManager : public NetworkManagerBase { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::FakeNetworkManager; -using ::webrtc::kFakeIPv4NetworkPrefixLength; -using ::webrtc::kFakeIPv6NetworkPrefixLength; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_FAKE_NETWORK_H_ diff --git a/third_party/libwebrtc/rtc_base/fake_ssl_identity.h b/third_party/libwebrtc/rtc_base/fake_ssl_identity.h @@ -82,13 +82,5 @@ class FakeSSLIdentity : public SSLIdentity { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::FakeSSLCertificate; -using ::webrtc::FakeSSLIdentity; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_FAKE_SSL_IDENTITY_H_ diff --git a/third_party/libwebrtc/rtc_base/file_rotating_stream.h b/third_party/libwebrtc/rtc_base/file_rotating_stream.h @@ -169,15 +169,5 @@ class CallSessionFileRotatingStreamReader : public FileRotatingStreamReader { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::CallSessionFileRotatingStream; -using ::webrtc::CallSessionFileRotatingStreamReader; -using ::webrtc::FileRotatingStream; -using ::webrtc::FileRotatingStreamReader; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_FILE_ROTATING_STREAM_H_ diff --git a/third_party/libwebrtc/rtc_base/firewall_socket_server.h b/third_party/libwebrtc/rtc_base/firewall_socket_server.h @@ -127,21 +127,5 @@ class FirewallManager { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::FD_ANY; -using ::webrtc::FD_IN; -using ::webrtc::FD_OUT; -using ::webrtc::FirewallDirection; -using ::webrtc::FirewallManager; -using ::webrtc::FirewallProtocol; -using ::webrtc::FirewallSocketServer; -using ::webrtc::FP_ANY; -using ::webrtc::FP_TCP; -using ::webrtc::FP_UDP; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_FIREWALL_SOCKET_SERVER_H_ diff --git a/third_party/libwebrtc/rtc_base/ifaddrs_converter.h b/third_party/libwebrtc/rtc_base/ifaddrs_converter.h @@ -44,13 +44,5 @@ IfAddrsConverter* CreateIfAddrsConverter(); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::CreateIfAddrsConverter; -using ::webrtc::IfAddrsConverter; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_IFADDRS_CONVERTER_H_ diff --git a/third_party/libwebrtc/rtc_base/internal/default_socket_server.h b/third_party/libwebrtc/rtc_base/internal/default_socket_server.h @@ -21,12 +21,5 @@ std::unique_ptr<SocketServer> CreateDefaultSocketServer(); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::CreateDefaultSocketServer; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_INTERNAL_DEFAULT_SOCKET_SERVER_H_ diff --git a/third_party/libwebrtc/rtc_base/ip_address.h b/third_party/libwebrtc/rtc_base/ip_address.h @@ -213,40 +213,5 @@ int CountIPMaskBits(const IPAddress& mask); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::CountIPMaskBits; -using ::webrtc::GetAnyIP; -using ::webrtc::GetLoopbackIP; -using ::webrtc::HashIP; -using ::webrtc::InterfaceAddress; -using ::webrtc::IPAddress; -using ::webrtc::IPAddressPrecedence; -using ::webrtc::IPFromAddrInfo; -using ::webrtc::IPFromString; -using ::webrtc::IPIs6Bone; -using ::webrtc::IPIs6To4; -using ::webrtc::IPIsAny; -using ::webrtc::IPIsLinkLocal; -using ::webrtc::IPIsLoopback; -using ::webrtc::IPIsMacBased; -using ::webrtc::IPIsPrivate; -using ::webrtc::IPIsPrivateNetwork; -using ::webrtc::IPIsSharedNetwork; -using ::webrtc::IPIsSiteLocal; -using ::webrtc::IPIsTeredo; -using ::webrtc::IPIsULA; -using ::webrtc::IPIsUnspec; -using ::webrtc::IPIsV4Compatibility; -using ::webrtc::IPIsV4Mapped; -using ::webrtc::IPV6_ADDRESS_FLAG_DEPRECATED; -using ::webrtc::IPV6_ADDRESS_FLAG_NONE; -using ::webrtc::IPV6_ADDRESS_FLAG_TEMPORARY; -using ::webrtc::IPv6AddressFlag; -using ::webrtc::TruncateIP; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_IP_ADDRESS_H_ diff --git a/third_party/libwebrtc/rtc_base/log_sinks.h b/third_party/libwebrtc/rtc_base/log_sinks.h @@ -77,13 +77,5 @@ class CallSessionFileRotatingLogSink : public FileRotatingLogSink { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::CallSessionFileRotatingLogSink; -using ::webrtc::FileRotatingLogSink; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_LOG_SINKS_H_ diff --git a/third_party/libwebrtc/rtc_base/logging.h b/third_party/libwebrtc/rtc_base/logging.h @@ -738,20 +738,5 @@ inline const char* AdaptString(const std::string& str) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::LoggingSeverity; -using ::webrtc::LogLineRef; -using ::webrtc::LogMessage; -using ::webrtc::LogSink; -using ::webrtc::LS_ERROR; -using ::webrtc::LS_INFO; -using ::webrtc::LS_NONE; -using ::webrtc::LS_VERBOSE; -using ::webrtc::LS_WARNING; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_LOGGING_H_ diff --git a/third_party/libwebrtc/rtc_base/memory/fifo_buffer.h b/third_party/libwebrtc/rtc_base/memory/fifo_buffer.h @@ -120,12 +120,5 @@ class FifoBuffer final : public StreamInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::FifoBuffer; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_MEMORY_FIFO_BUFFER_H_ diff --git a/third_party/libwebrtc/rtc_base/memory_stream.h b/third_party/libwebrtc/rtc_base/memory_stream.h @@ -59,12 +59,5 @@ class MemoryStream final : public StreamInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::MemoryStream; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_MEMORY_STREAM_H_ diff --git a/third_party/libwebrtc/rtc_base/memory_usage.h b/third_party/libwebrtc/rtc_base/memory_usage.h @@ -21,12 +21,5 @@ int64_t GetProcessResidentSizeBytes(); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::GetProcessResidentSizeBytes; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_MEMORY_USAGE_H_ diff --git a/third_party/libwebrtc/rtc_base/message_digest.h b/third_party/libwebrtc/rtc_base/message_digest.h @@ -130,23 +130,5 @@ bool ComputeHmac(absl::string_view alg, } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::ComputeDigest; -using ::webrtc::ComputeHmac; -using ::webrtc::DIGEST_MD5; -using ::webrtc::DIGEST_SHA_1; -using ::webrtc::DIGEST_SHA_224; -using ::webrtc::DIGEST_SHA_256; -using ::webrtc::DIGEST_SHA_384; -using ::webrtc::DIGEST_SHA_512; -using ::webrtc::IsFips180DigestAlgorithm; -using ::webrtc::MD5; -using ::webrtc::MessageDigest; -using ::webrtc::MessageDigestFactory; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_MESSAGE_DIGEST_H_ diff --git a/third_party/libwebrtc/rtc_base/net_helper.h b/third_party/libwebrtc/rtc_base/net_helper.h @@ -31,18 +31,5 @@ int GetProtocolOverhead(absl::string_view protocol); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::GetProtocolOverhead; -using ::webrtc::kTcpHeaderSize; -using ::webrtc::kUdpHeaderSize; -using ::webrtc::SSLTCP_PROTOCOL_NAME; -using ::webrtc::TCP_PROTOCOL_NAME; -using ::webrtc::TLS_PROTOCOL_NAME; -using ::webrtc::UDP_PROTOCOL_NAME; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NET_HELPER_H_ diff --git a/third_party/libwebrtc/rtc_base/net_helpers.h b/third_party/libwebrtc/rtc_base/net_helpers.h @@ -30,13 +30,5 @@ int inet_pton(int af, absl::string_view src, void* dst); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::inet_ntop; -using ::webrtc::inet_pton; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NET_HELPERS_H_ diff --git a/third_party/libwebrtc/rtc_base/net_test_helpers.h b/third_party/libwebrtc/rtc_base/net_test_helpers.h @@ -20,11 +20,5 @@ RTC_EXPORT bool HasIPv6Enabled(); } // namespace webrtc -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using webrtc::HasIPv4Enabled; -using webrtc::HasIPv6Enabled; -} -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NET_TEST_HELPERS_H_ diff --git a/third_party/libwebrtc/rtc_base/network.h b/third_party/libwebrtc/rtc_base/network.h @@ -578,23 +578,5 @@ class RTC_EXPORT BasicNetworkManager : public NetworkManagerBase, } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::BasicNetworkManager; -using ::webrtc::DefaultLocalAddressProvider; -using ::webrtc::GetAdapterTypeFromName; -using ::webrtc::kDefaultNetworkIgnoreMask; -using ::webrtc::kPublicIPv4Host; -using ::webrtc::kPublicIPv6Host; -using ::webrtc::MakeNetworkKey; -using ::webrtc::MdnsResponderProvider; -using ::webrtc::Network; -using ::webrtc::NetworkManager; -using ::webrtc::NetworkManagerBase; -using ::webrtc::NetworkMask; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NETWORK_H_ diff --git a/third_party/libwebrtc/rtc_base/network/ecn_marking.h b/third_party/libwebrtc/rtc_base/network/ecn_marking.h @@ -13,10 +13,5 @@ // // TODO: bugs.webrtc.org/42225697 - delete this file. #include "api/transport/ecn_marking.h" -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::EcnMarking; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NETWORK_ECN_MARKING_H_ diff --git a/third_party/libwebrtc/rtc_base/network/received_packet.h b/third_party/libwebrtc/rtc_base/network/received_packet.h @@ -83,12 +83,5 @@ class RTC_EXPORT ReceivedIpPacket { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ReceivedPacket = ::webrtc::ReceivedIpPacket; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NETWORK_RECEIVED_PACKET_H_ diff --git a/third_party/libwebrtc/rtc_base/network/sent_packet.h b/third_party/libwebrtc/rtc_base/network/sent_packet.h @@ -70,15 +70,5 @@ struct RTC_EXPORT SentPacketInfo { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::PacketInfo; -using SentPacket = ::webrtc::SentPacketInfo; -using ::webrtc::PacketInfoProtocolType; -using ::webrtc::PacketType; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NETWORK_SENT_PACKET_H_ diff --git a/third_party/libwebrtc/rtc_base/network_constants.h b/third_party/libwebrtc/rtc_base/network_constants.h @@ -69,36 +69,5 @@ constexpr AdapterType kAllAdapterTypes[] = { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::ADAPTER_TYPE_ANY; -using ::webrtc::ADAPTER_TYPE_CELLULAR; -using ::webrtc::ADAPTER_TYPE_CELLULAR_2G; -using ::webrtc::ADAPTER_TYPE_CELLULAR_3G; -using ::webrtc::ADAPTER_TYPE_CELLULAR_4G; -using ::webrtc::ADAPTER_TYPE_CELLULAR_5G; -using ::webrtc::ADAPTER_TYPE_ETHERNET; -using ::webrtc::ADAPTER_TYPE_LOOPBACK; -using ::webrtc::ADAPTER_TYPE_UNKNOWN; -using ::webrtc::ADAPTER_TYPE_VPN; -using ::webrtc::ADAPTER_TYPE_WIFI; -using ::webrtc::AdapterType; -using ::webrtc::AdapterTypeToString; -using ::webrtc::kAllAdapterTypes; -using ::webrtc::kNetworkCostCellular; -using ::webrtc::kNetworkCostCellular2G; -using ::webrtc::kNetworkCostCellular3G; -using ::webrtc::kNetworkCostCellular4G; -using ::webrtc::kNetworkCostCellular5G; -using ::webrtc::kNetworkCostHigh; -using ::webrtc::kNetworkCostLow; -using ::webrtc::kNetworkCostMax; -using ::webrtc::kNetworkCostMin; -using ::webrtc::kNetworkCostUnknown; -using ::webrtc::kNetworkCostVpn; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NETWORK_CONSTANTS_H_ diff --git a/third_party/libwebrtc/rtc_base/network_monitor.h b/third_party/libwebrtc/rtc_base/network_monitor.h @@ -135,16 +135,5 @@ class NetworkMonitorInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::NetworkBinderInterface; -using ::webrtc::NetworkBindingResult; -using ::webrtc::NetworkMonitorInterface; -using ::webrtc::NetworkPreference; -using ::webrtc::NetworkPreferenceToString; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NETWORK_MONITOR_H_ diff --git a/third_party/libwebrtc/rtc_base/network_monitor_factory.h b/third_party/libwebrtc/rtc_base/network_monitor_factory.h @@ -39,12 +39,5 @@ class NetworkMonitorFactory { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::NetworkMonitorFactory; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NETWORK_MONITOR_FACTORY_H_ diff --git a/third_party/libwebrtc/rtc_base/network_route.h b/third_party/libwebrtc/rtc_base/network_route.h @@ -93,13 +93,5 @@ struct NetworkRoute { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::NetworkRoute; -using ::webrtc::RouteEndpoint; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NETWORK_ROUTE_H_ diff --git a/third_party/libwebrtc/rtc_base/null_socket_server.h b/third_party/libwebrtc/rtc_base/null_socket_server.h @@ -34,12 +34,5 @@ class RTC_EXPORT NullSocketServer : public SocketServer { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::NullSocketServer; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NULL_SOCKET_SERVER_H_ diff --git a/third_party/libwebrtc/rtc_base/numerics/event_based_exponential_moving_average.h b/third_party/libwebrtc/rtc_base/numerics/event_based_exponential_moving_average.h @@ -67,12 +67,5 @@ class EventBasedExponentialMovingAverage { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::EventBasedExponentialMovingAverage; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NUMERICS_EVENT_BASED_EXPONENTIAL_MOVING_AVERAGE_H_ diff --git a/third_party/libwebrtc/rtc_base/numerics/exp_filter.h b/third_party/libwebrtc/rtc_base/numerics/exp_filter.h @@ -45,12 +45,5 @@ class ExpFilter { }; } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::ExpFilter; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NUMERICS_EXP_FILTER_H_ diff --git a/third_party/libwebrtc/rtc_base/numerics/histogram_percentile_counter.h b/third_party/libwebrtc/rtc_base/numerics/histogram_percentile_counter.h @@ -42,11 +42,4 @@ class HistogramPercentileCounter { }; } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::HistogramPercentileCounter; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NUMERICS_HISTOGRAM_PERCENTILE_COUNTER_H_ diff --git a/third_party/libwebrtc/rtc_base/numerics/moving_average.h b/third_party/libwebrtc/rtc_base/numerics/moving_average.h @@ -63,11 +63,4 @@ class MovingAverage { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::MovingAverage; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NUMERICS_MOVING_AVERAGE_H_ diff --git a/third_party/libwebrtc/rtc_base/numerics/moving_max_counter.h b/third_party/libwebrtc/rtc_base/numerics/moving_max_counter.h @@ -115,12 +115,5 @@ void MovingMaxCounter<T>::RollWindow(int64_t new_time_ms) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::MovingMaxCounter; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NUMERICS_MOVING_MAX_COUNTER_H_ diff --git a/third_party/libwebrtc/rtc_base/numerics/safe_compare.h b/third_party/libwebrtc/rtc_base/numerics/safe_compare.h @@ -172,17 +172,5 @@ RTC_SAFECMP_MAKE_FUN(Ge) } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::SafeEq; -using ::webrtc::SafeGe; -using ::webrtc::SafeGt; -using ::webrtc::SafeLe; -using ::webrtc::SafeLt; -using ::webrtc::SafeNe; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NUMERICS_SAFE_COMPARE_H_ diff --git a/third_party/libwebrtc/rtc_base/numerics/safe_conversions.h b/third_party/libwebrtc/rtc_base/numerics/safe_conversions.h @@ -71,15 +71,5 @@ inline constexpr Dst saturated_cast(Src value) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::checked_cast; -using ::webrtc::dchecked_cast; -using ::webrtc::IsValueInRangeForNumericType; -using ::webrtc::saturated_cast; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_ diff --git a/third_party/libwebrtc/rtc_base/numerics/safe_minmax.h b/third_party/libwebrtc/rtc_base/numerics/safe_minmax.h @@ -333,14 +333,5 @@ R2 SafeClamp(T x, L min, H max) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::SafeClamp; -using ::webrtc::SafeMax; -using ::webrtc::SafeMin; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NUMERICS_SAFE_MINMAX_H_ diff --git a/third_party/libwebrtc/rtc_base/numerics/sample_counter.h b/third_party/libwebrtc/rtc_base/numerics/sample_counter.h @@ -58,12 +58,4 @@ class SampleCounterWithVariance : public SampleCounter { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::SampleCounter; -using ::webrtc::SampleCounterWithVariance; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_NUMERICS_SAMPLE_COUNTER_H_ diff --git a/third_party/libwebrtc/rtc_base/openssl_adapter.h b/third_party/libwebrtc/rtc_base/openssl_adapter.h @@ -235,14 +235,5 @@ std::string TransformAlpnProtocols(const std::vector<std::string>& protos); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::OpenSSLAdapter; -using ::webrtc::OpenSSLAdapterFactory; -using ::webrtc::TransformAlpnProtocols; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_OPENSSL_ADAPTER_H_ diff --git a/third_party/libwebrtc/rtc_base/openssl_certificate.h b/third_party/libwebrtc/rtc_base/openssl_certificate.h @@ -68,14 +68,5 @@ class OpenSSLCertificate final : public SSLCertificate { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { - -using ::webrtc::OpenSSLCertificate; - -} -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_OPENSSL_CERTIFICATE_H_ diff --git a/third_party/libwebrtc/rtc_base/openssl_digest.h b/third_party/libwebrtc/rtc_base/openssl_digest.h @@ -48,12 +48,5 @@ class OpenSSLDigest final : public MessageDigest { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::OpenSSLDigest; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_OPENSSL_DIGEST_H_ diff --git a/third_party/libwebrtc/rtc_base/openssl_identity.h b/third_party/libwebrtc/rtc_base/openssl_identity.h @@ -73,12 +73,5 @@ class OpenSSLIdentity final : public SSLIdentity { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::OpenSSLIdentity; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_OPENSSL_IDENTITY_H_ diff --git a/third_party/libwebrtc/rtc_base/openssl_key_pair.h b/third_party/libwebrtc/rtc_base/openssl_key_pair.h @@ -58,12 +58,5 @@ class OpenSSLKeyPair final { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::OpenSSLKeyPair; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_OPENSSL_KEY_PAIR_H_ diff --git a/third_party/libwebrtc/rtc_base/openssl_session_cache.h b/third_party/libwebrtc/rtc_base/openssl_session_cache.h @@ -69,12 +69,5 @@ class OpenSSLSessionCache final { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::OpenSSLSessionCache; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_OPENSSL_SESSION_CACHE_H_ diff --git a/third_party/libwebrtc/rtc_base/openssl_stream_adapter.h b/third_party/libwebrtc/rtc_base/openssl_stream_adapter.h @@ -277,12 +277,5 @@ class OpenSSLStreamAdapter final : public SSLStreamAdapter { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::OpenSSLStreamAdapter; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_OPENSSL_STREAM_ADAPTER_H_ diff --git a/third_party/libwebrtc/rtc_base/openssl_utility.h b/third_party/libwebrtc/rtc_base/openssl_utility.h @@ -57,26 +57,5 @@ CRYPTO_BUFFER_POOL* GetBufferPool(); } // namespace openssl } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -namespace openssl { - -#ifndef WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS -using ::webrtc::openssl::LoadBuiltinSSLRootCertificates; -#endif - -using ::webrtc::openssl::LogSSLErrors; -using ::webrtc::openssl::VerifyPeerCertMatchesHost; - -#ifdef OPENSSL_IS_BORINGSSL -using ::webrtc::openssl::GetBufferPool; -using ::webrtc::openssl::ParseCertificate; -#endif - -} // namespace openssl -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_OPENSSL_UTILITY_H_ diff --git a/third_party/libwebrtc/rtc_base/operations_chain.h b/third_party/libwebrtc/rtc_base/operations_chain.h @@ -198,12 +198,5 @@ class OperationsChain final : public RefCountedNonVirtual<OperationsChain> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::OperationsChain; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_OPERATIONS_CHAIN_H_ diff --git a/third_party/libwebrtc/rtc_base/physical_socket_server.h b/third_party/libwebrtc/rtc_base/physical_socket_server.h @@ -310,21 +310,5 @@ class SocketDispatcher : public Dispatcher, public PhysicalSocket { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::DE_ACCEPT; -using ::webrtc::DE_CLOSE; -using ::webrtc::DE_CONNECT; -using ::webrtc::DE_READ; -using ::webrtc::DE_WRITE; -using ::webrtc::Dispatcher; -using ::webrtc::DispatcherEvent; -using ::webrtc::PhysicalSocket; -using ::webrtc::PhysicalSocketServer; -using ::webrtc::SocketDispatcher; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ diff --git a/third_party/libwebrtc/rtc_base/platform_thread.h b/third_party/libwebrtc/rtc_base/platform_thread.h @@ -118,14 +118,5 @@ class PlatformThread final { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::PlatformThread; -using ::webrtc::ThreadAttributes; -using ::webrtc::ThreadPriority; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_PLATFORM_THREAD_H_ diff --git a/third_party/libwebrtc/rtc_base/platform_thread_types.h b/third_party/libwebrtc/rtc_base/platform_thread_types.h @@ -61,17 +61,5 @@ void SetCurrentThreadName(const char* name); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::CurrentThreadId; -using ::webrtc::CurrentThreadRef; -using ::webrtc::IsThreadRefEqual; -using ::webrtc::PlatformThreadId; -using ::webrtc::PlatformThreadRef; -using ::webrtc::SetCurrentThreadName; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_PLATFORM_THREAD_TYPES_H_ diff --git a/third_party/libwebrtc/rtc_base/proxy_server.h b/third_party/libwebrtc/rtc_base/proxy_server.h @@ -90,13 +90,5 @@ class ProxyServer : public sigslot::has_slots<> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::ProxyBinding; -using ::webrtc::ProxyServer; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_PROXY_SERVER_H_ diff --git a/third_party/libwebrtc/rtc_base/race_checker.h b/third_party/libwebrtc/rtc_base/race_checker.h @@ -62,13 +62,6 @@ class RTC_SCOPED_LOCKABLE RaceCheckerScopeDoNothing { } // namespace internal } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::RaceChecker; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #define RTC_CHECK_RUNS_SERIALIZED(x) RTC_CHECK_RUNS_SERIALIZED_NEXT(x, __LINE__) diff --git a/third_party/libwebrtc/rtc_base/rate_tracker.h b/third_party/libwebrtc/rtc_base/rate_tracker.h @@ -69,12 +69,5 @@ class RateTracker { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::RateTracker; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_RATE_TRACKER_H_ diff --git a/third_party/libwebrtc/rtc_base/ref_count.h b/third_party/libwebrtc/rtc_base/ref_count.h @@ -15,17 +15,5 @@ #include "api/ref_count.h" -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { - -// TODO(bugs.webrtc.org/15622): Deprecate and remove these aliases. -using RefCountInterface [[deprecated("Use webrtc::RefCountInterface")]] = - webrtc::RefCountInterface; -using RefCountReleaseStatus - [[deprecated("Use webrtc::RefCountReleaseStatus")]] = - webrtc::RefCountReleaseStatus; - -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_REF_COUNT_H_ diff --git a/third_party/libwebrtc/rtc_base/ref_counted_object.h b/third_party/libwebrtc/rtc_base/ref_counted_object.h @@ -87,13 +87,5 @@ class FinalRefCountedObject final : public T { } // namespace webrtc -// Backwards compatibe aliases. -// TODO: https://issues.webrtc.org/42225969 - deprecate and remove. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::FinalRefCountedObject; -using ::webrtc::RefCountedObject; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_REF_COUNTED_OBJECT_H_ diff --git a/third_party/libwebrtc/rtc_base/rolling_accumulator.h b/third_party/libwebrtc/rtc_base/rolling_accumulator.h @@ -142,12 +142,5 @@ class RollingAccumulator { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::RollingAccumulator; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_ROLLING_ACCUMULATOR_H_ diff --git a/third_party/libwebrtc/rtc_base/rtc_certificate.h b/third_party/libwebrtc/rtc_base/rtc_certificate.h @@ -91,13 +91,5 @@ class RTC_EXPORT RTCCertificate final } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::RTCCertificate; -using ::webrtc::RTCCertificatePEM; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_RTC_CERTIFICATE_H_ diff --git a/third_party/libwebrtc/rtc_base/rtc_certificate_generator.h b/third_party/libwebrtc/rtc_base/rtc_certificate_generator.h @@ -80,13 +80,5 @@ class RTC_EXPORT RTCCertificateGenerator } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::RTCCertificateGenerator; -using ::webrtc::RTCCertificateGeneratorInterface; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_RTC_CERTIFICATE_GENERATOR_H_ diff --git a/third_party/libwebrtc/rtc_base/sanitizer.h b/third_party/libwebrtc/rtc_base/sanitizer.h @@ -159,17 +159,6 @@ inline void MsanCheckInitialized(const T& mem) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AsanPoison; -using ::webrtc::AsanUnpoison; -using ::webrtc::MsanCheckInitialized; -using ::webrtc::MsanMarkUninitialized; -using ::webrtc::MsanUninitialized; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // __cplusplus diff --git a/third_party/libwebrtc/rtc_base/server_socket_adapters.h b/third_party/libwebrtc/rtc_base/server_socket_adapters.h @@ -45,13 +45,5 @@ class AsyncSSLServerSocket : public BufferedReadAdapter { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AsyncProxyServerSocket; -using ::webrtc::AsyncSSLServerSocket; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SERVER_SOCKET_ADAPTERS_H_ diff --git a/third_party/libwebrtc/rtc_base/socket.h b/third_party/libwebrtc/rtc_base/socket.h @@ -174,13 +174,5 @@ class RTC_EXPORT Socket { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::IsBlockingError; -using ::webrtc::Socket; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SOCKET_H_ diff --git a/third_party/libwebrtc/rtc_base/socket_adapters.h b/third_party/libwebrtc/rtc_base/socket_adapters.h @@ -76,13 +76,5 @@ class AsyncSSLSocket : public BufferedReadAdapter { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AsyncSSLSocket; -using ::webrtc::BufferedReadAdapter; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SOCKET_ADAPTERS_H_ diff --git a/third_party/libwebrtc/rtc_base/socket_address.h b/third_party/libwebrtc/rtc_base/socket_address.h @@ -201,14 +201,5 @@ SocketAddress EmptySocketAddressWithFamily(int family); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::EmptySocketAddressWithFamily; -using ::webrtc::SocketAddress; -using ::webrtc::SocketAddressFromSockAddrStorage; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SOCKET_ADDRESS_H_ diff --git a/third_party/libwebrtc/rtc_base/socket_address_pair.h b/third_party/libwebrtc/rtc_base/socket_address_pair.h @@ -40,12 +40,5 @@ class SocketAddressPair { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::SocketAddressPair; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SOCKET_ADDRESS_PAIR_H_ diff --git a/third_party/libwebrtc/rtc_base/socket_factory.h b/third_party/libwebrtc/rtc_base/socket_factory.h @@ -25,12 +25,5 @@ class SocketFactory { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::SocketFactory; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SOCKET_FACTORY_H_ diff --git a/third_party/libwebrtc/rtc_base/socket_server.h b/third_party/libwebrtc/rtc_base/socket_server.h @@ -66,12 +66,5 @@ class SocketServer : public SocketFactory { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::SocketServer; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SOCKET_SERVER_H_ diff --git a/third_party/libwebrtc/rtc_base/socket_unittest.h b/third_party/libwebrtc/rtc_base/socket_unittest.h @@ -110,13 +110,5 @@ bool IsUnspecOrEmptyIP(const IPAddress& address); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::IsUnspecOrEmptyIP; -using ::webrtc::SocketTest; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SOCKET_UNITTEST_H_ diff --git a/third_party/libwebrtc/rtc_base/ssl_adapter.h b/third_party/libwebrtc/rtc_base/ssl_adapter.h @@ -125,15 +125,5 @@ RTC_EXPORT bool CleanupSSL(); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::CleanupSSL; -using ::webrtc::InitializeSSL; -using ::webrtc::SSLAdapter; -using ::webrtc::SSLAdapterFactory; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SSL_ADAPTER_H_ diff --git a/third_party/libwebrtc/rtc_base/ssl_certificate.h b/third_party/libwebrtc/rtc_base/ssl_certificate.h @@ -137,15 +137,5 @@ class SSLCertificateVerifier { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::SSLCertChain; -using ::webrtc::SSLCertificate; -using ::webrtc::SSLCertificateStats; -using ::webrtc::SSLCertificateVerifier; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SSL_CERTIFICATE_H_ diff --git a/third_party/libwebrtc/rtc_base/ssl_fingerprint.h b/third_party/libwebrtc/rtc_base/ssl_fingerprint.h @@ -74,12 +74,5 @@ struct RTC_EXPORT SSLFingerprint { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::SSLFingerprint; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SSL_FINGERPRINT_H_ diff --git a/third_party/libwebrtc/rtc_base/ssl_identity.h b/third_party/libwebrtc/rtc_base/ssl_identity.h @@ -165,33 +165,5 @@ extern const char kPemTypeEcPrivateKey[]; } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::ASN1TimeToSec; -using ::webrtc::EC_LAST; -using ::webrtc::EC_NIST_P256; -using ::webrtc::ECCurve; -using ::webrtc::kCertificateWindowInSeconds; -using ::webrtc::kDefaultCertificateLifetimeInSeconds; -using ::webrtc::KeyParams; -using ::webrtc::KeyType; -using ::webrtc::kPemTypeCertificate; -using ::webrtc::kPemTypeEcPrivateKey; -using ::webrtc::kPemTypeRsaPrivateKey; -using ::webrtc::kRsaDefaultExponent; -using ::webrtc::kRsaDefaultModSize; -using ::webrtc::kRsaMaxModSize; -using ::webrtc::kRsaMinModSize; -using ::webrtc::KT_DEFAULT; -using ::webrtc::KT_ECDSA; -using ::webrtc::KT_LAST; -using ::webrtc::KT_RSA; -using ::webrtc::RSAParams; -using ::webrtc::SSLIdentity; -using ::webrtc::SSLIdentityParams; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SSL_IDENTITY_H_ diff --git a/third_party/libwebrtc/rtc_base/ssl_stream_adapter.h b/third_party/libwebrtc/rtc_base/ssl_stream_adapter.h @@ -294,50 +294,5 @@ class SSLStreamAdapter : public StreamInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::GetSrtpKeyAndSaltLengths; -using ::webrtc::IsGcmCryptoSuite; -using ::webrtc::kCsAeadAes128Gcm; -using ::webrtc::kCsAeadAes256Gcm; -using ::webrtc::kCsAesCm128HmacSha1_32; -using ::webrtc::kCsAesCm128HmacSha1_80; -using ::webrtc::kDtls10VersionBytes; -using ::webrtc::kDtls12VersionBytes; -using ::webrtc::kDtls13VersionBytes; -using ::webrtc::kSrtpAeadAes128Gcm; -using ::webrtc::kSrtpAeadAes256Gcm; -using ::webrtc::kSrtpAes128CmSha1_32; -using ::webrtc::kSrtpAes128CmSha1_80; -using ::webrtc::kSrtpCryptoSuiteMaxValue; -using ::webrtc::kSrtpInvalidCryptoSuite; -using ::webrtc::kSslCipherSuiteMaxValue; -using ::webrtc::kSslSignatureAlgorithmMaxValue; -using ::webrtc::kSslSignatureAlgorithmUnknown; -using ::webrtc::kTlsNullWithNullNull; -using ::webrtc::SrtpCryptoSuiteToName; -using ::webrtc::SSE_MSG_TRUNC; -using ::webrtc::SSL_CLIENT; -using ::webrtc::SSL_MODE_DTLS; -using ::webrtc::SSL_MODE_TLS; -using ::webrtc::SSL_PROTOCOL_DTLS_10; -using ::webrtc::SSL_PROTOCOL_DTLS_12; -using ::webrtc::SSL_PROTOCOL_DTLS_13; -using ::webrtc::SSL_PROTOCOL_NOT_GIVEN; -using ::webrtc::SSL_PROTOCOL_TLS_10; -using ::webrtc::SSL_PROTOCOL_TLS_11; -using ::webrtc::SSL_PROTOCOL_TLS_12; -using ::webrtc::SSL_PROTOCOL_TLS_13; -using ::webrtc::SSL_SERVER; -using ::webrtc::SSLHandshakeError; -using ::webrtc::SSLMode; -using ::webrtc::SSLPeerCertificateDigestError; -using ::webrtc::SSLProtocolVersion; -using ::webrtc::SSLRole; -using ::webrtc::SSLStreamAdapter; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SSL_STREAM_ADAPTER_H_ diff --git a/third_party/libwebrtc/rtc_base/stream.h b/third_party/libwebrtc/rtc_base/stream.h @@ -149,26 +149,5 @@ class RTC_EXPORT StreamInterface { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::SE_CLOSE; -using ::webrtc::SE_OPEN; -using ::webrtc::SE_READ; -using ::webrtc::SE_WRITE; -using ::webrtc::SR_BLOCK; -using ::webrtc::SR_EOS; -using ::webrtc::SR_ERROR; -using ::webrtc::SR_SUCCESS; -using ::webrtc::SS_CLOSED; -using ::webrtc::SS_OPEN; -using ::webrtc::SS_OPENING; -using ::webrtc::StreamEvent; -using ::webrtc::StreamInterface; -using ::webrtc::StreamResult; -using ::webrtc::StreamState; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_STREAM_H_ diff --git a/third_party/libwebrtc/rtc_base/string_encode.h b/third_party/libwebrtc/rtc_base/string_encode.h @@ -94,56 +94,5 @@ static inline T FromString(absl::string_view str) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::FromString; -using ::webrtc::hex_decode; -using ::webrtc::hex_decode_with_delimiter; -using ::webrtc::hex_encode; -using ::webrtc::hex_encode_with_delimiter; -using ::webrtc::split; -using ::webrtc::tokenize; -using ::webrtc::tokenize_first; - -namespace internal { -template <typename T, typename = void> -struct is_absl_strcat_callable : std::false_type {}; - -template <typename T> -struct is_absl_strcat_callable< - T, - std::void_t<decltype(absl::StrCat(std::declval<T>()))>> : std::true_type {}; -} // namespace internal - -template <typename T> -ABSL_DEPRECATE_AND_INLINE() -inline auto ToString(T value) -> - typename std::enable_if<!std::is_same_v<T, bool> && - internal::is_absl_strcat_callable<T>::value, - std::string>::type { - return absl::StrCat(value); -} - -template <typename T> -ABSL_DEPRECATE_AND_INLINE() -inline auto ToString(T p) -> - typename std::enable_if<!internal::is_absl_strcat_callable<T>::value && - std::is_pointer<T>::value, - std::string>::type { - return webrtc::StringFormat("%p", p); -} - -template <typename T> -ABSL_DEPRECATE_AND_INLINE() -inline auto ToString(T value) -> - typename std::enable_if<!std::is_pointer_v<T> && std::is_same_v<T, bool>, - std::string>::type { - return webrtc::BoolToString(value); -} - -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_STRING_ENCODE_H__ diff --git a/third_party/libwebrtc/rtc_base/string_to_number.h b/third_party/libwebrtc/rtc_base/string_to_number.h @@ -101,12 +101,5 @@ StringToNumber(absl::string_view str, int /* base */ = 10) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::StringToNumber; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_STRING_TO_NUMBER_H_ diff --git a/third_party/libwebrtc/rtc_base/string_utils.h b/third_party/libwebrtc/rtc_base/string_utils.h @@ -132,16 +132,5 @@ constexpr auto MakeCompileTimeString(const char (&a)[N]) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AbslStringViewCmp; -using ::webrtc::MakeCompileTimeString; -using ::webrtc::SIZE_UNKNOWN; -using ::webrtc::strcpyn; -using ::webrtc::ToHex; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_STRING_UTILS_H_ diff --git a/third_party/libwebrtc/rtc_base/strings/json.h b/third_party/libwebrtc/rtc_base/strings/json.h @@ -83,41 +83,5 @@ std::string JsonValueToString(const Json::Value& json); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::BoolVectorToJsonArray; -using ::webrtc::DoubleVectorToJsonArray; -using ::webrtc::GetBoolFromJson; -using ::webrtc::GetBoolFromJsonArray; -using ::webrtc::GetBoolFromJsonObject; -using ::webrtc::GetDoubleFromJson; -using ::webrtc::GetDoubleFromJsonArray; -using ::webrtc::GetDoubleFromJsonObject; -using ::webrtc::GetIntFromJson; -using ::webrtc::GetIntFromJsonArray; -using ::webrtc::GetIntFromJsonObject; -using ::webrtc::GetStringFromJson; -using ::webrtc::GetStringFromJsonArray; -using ::webrtc::GetStringFromJsonObject; -using ::webrtc::GetUIntFromJson; -using ::webrtc::GetUIntFromJsonArray; -using ::webrtc::GetUIntFromJsonObject; -using ::webrtc::GetValueFromJsonArray; -using ::webrtc::GetValueFromJsonObject; -using ::webrtc::IntVectorToJsonArray; -using ::webrtc::JsonArrayToBoolVector; -using ::webrtc::JsonArrayToDoubleVector; -using ::webrtc::JsonArrayToIntVector; -using ::webrtc::JsonArrayToStringVector; -using ::webrtc::JsonArrayToUIntVector; -using ::webrtc::JsonArrayToValueVector; -using ::webrtc::JsonValueToString; -using ::webrtc::StringVectorToJsonArray; -using ::webrtc::UIntVectorToJsonArray; -using ::webrtc::ValueVectorToJsonArray; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_STRINGS_JSON_H_ diff --git a/third_party/libwebrtc/rtc_base/strings/string_builder.h b/third_party/libwebrtc/rtc_base/strings/string_builder.h @@ -162,13 +162,5 @@ class StringBuilder { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::SimpleStringBuilder; -using ::webrtc::StringBuilder; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_STRINGS_STRING_BUILDER_H_ diff --git a/third_party/libwebrtc/rtc_base/strings/string_format.h b/third_party/libwebrtc/rtc_base/strings/string_format.h @@ -28,12 +28,5 @@ namespace webrtc { std::string StringFormat(const char* fmt, ...) RTC_PRINTF_FORMAT(1, 2); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::StringFormat; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_STRINGS_STRING_FORMAT_H_ diff --git a/third_party/libwebrtc/rtc_base/synchronization/yield_policy.h b/third_party/libwebrtc/rtc_base/synchronization/yield_policy.h @@ -35,13 +35,5 @@ class ScopedYieldPolicy final { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::ScopedYieldPolicy; -using ::webrtc::YieldInterface; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SYNCHRONIZATION_YIELD_POLICY_H_ diff --git a/third_party/libwebrtc/rtc_base/system_time.h b/third_party/libwebrtc/rtc_base/system_time.h @@ -21,15 +21,7 @@ int64_t SystemTimeNanos(); } // namespace webrtc -// TODO(bugs.webrtc.org/4222596): Remove once Chrome has migrated. #define RTC_SYSTEM_TIME_IN_WEBRTC_NAMESPACE 1 -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::SystemTimeNanos; -} -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_SYSTEM_TIME_H_ diff --git a/third_party/libwebrtc/rtc_base/test_certificate_verifier.h b/third_party/libwebrtc/rtc_base/test_certificate_verifier.h @@ -33,12 +33,5 @@ class TestCertificateVerifier : public SSLCertificateVerifier { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::TestCertificateVerifier; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_TEST_CERTIFICATE_VERIFIER_H_ diff --git a/third_party/libwebrtc/rtc_base/test_client.h b/third_party/libwebrtc/rtc_base/test_client.h @@ -116,12 +116,5 @@ class TestClient : public sigslot::has_slots<> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::TestClient; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_TEST_CLIENT_H_ diff --git a/third_party/libwebrtc/rtc_base/test_echo_server.h b/third_party/libwebrtc/rtc_base/test_echo_server.h @@ -74,12 +74,5 @@ class TestEchoServer : public sigslot::has_slots<> { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::TestEchoServer; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_TEST_ECHO_SERVER_H_ diff --git a/third_party/libwebrtc/rtc_base/thread.h b/third_party/libwebrtc/rtc_base/thread.h @@ -566,15 +566,5 @@ class AutoSocketServerThread : public Thread { }; } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AutoSocketServerThread; -using ::webrtc::AutoThread; -using ::webrtc::Thread; -using ::webrtc::ThreadManager; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_THREAD_H_ diff --git a/third_party/libwebrtc/rtc_base/time_utils.h b/third_party/libwebrtc/rtc_base/time_utils.h @@ -137,35 +137,5 @@ RTC_EXPORT int64_t TimeUTCMillis(); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::ClockInterface; -using ::webrtc::GetClockForTesting; -using ::webrtc::kNtpJan1970Millisecs; -using ::webrtc::kNumMicrosecsPerMillisec; -using ::webrtc::kNumMicrosecsPerSec; -using ::webrtc::kNumMillisecsPerSec; -using ::webrtc::kNumNanosecsPerMicrosec; -using ::webrtc::kNumNanosecsPerMillisec; -using ::webrtc::kNumNanosecsPerSec; -using ::webrtc::SetClockForTesting; -using ::webrtc::SystemTimeMillis; -using ::webrtc::Time; -using ::webrtc::Time32; -using ::webrtc::TimeAfter; -using ::webrtc::TimeDiff; -using ::webrtc::TimeDiff32; -using ::webrtc::TimeMicros; -using ::webrtc::TimeMillis; -using ::webrtc::TimeNanos; -using ::webrtc::TimeSince; -using ::webrtc::TimeUntil; -using ::webrtc::TimeUTCMicros; -using ::webrtc::TimeUTCMillis; -using ::webrtc::TmToSeconds; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_TIME_UTILS_H_ diff --git a/third_party/libwebrtc/rtc_base/timestamp_aligner.h b/third_party/libwebrtc/rtc_base/timestamp_aligner.h @@ -90,12 +90,5 @@ class RTC_EXPORT TimestampAligner { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::TimestampAligner; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_TIMESTAMP_ALIGNER_H_ diff --git a/third_party/libwebrtc/rtc_base/type_traits.h b/third_party/libwebrtc/rtc_base/type_traits.h @@ -137,15 +137,5 @@ static_assert(!IsIntlike<S>::value, ""); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -template <typename DS, typename T> -using HasDataAndSize = ::webrtc::HasDataAndSize<DS, T>; -template <typename T> -using IsIntlike = ::webrtc::IsIntlike<T>; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_TYPE_TRAITS_H_ diff --git a/third_party/libwebrtc/rtc_base/unique_id_generator.h b/third_party/libwebrtc/rtc_base/unique_id_generator.h @@ -151,14 +151,5 @@ bool UniqueNumberGenerator<TIntegral>::AddKnownId(TIntegral value) { } } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::UniqueNumberGenerator; -using ::webrtc::UniqueRandomIdGenerator; -using ::webrtc::UniqueStringGenerator; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_UNIQUE_ID_GENERATOR_H_ diff --git a/third_party/libwebrtc/rtc_base/virtual_socket_server.h b/third_party/libwebrtc/rtc_base/virtual_socket_server.h @@ -480,12 +480,5 @@ class VirtualSocketServer : public SocketServer { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::VirtualSocketServer; -} -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_VIRTUAL_SOCKET_SERVER_H_ diff --git a/third_party/libwebrtc/rtc_base/weak_ptr.h b/third_party/libwebrtc/rtc_base/weak_ptr.h @@ -278,13 +278,5 @@ class WeakPtrFactory { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::WeakPtr; -using ::webrtc::WeakPtrFactory; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_WEAK_PTR_H_ diff --git a/third_party/libwebrtc/rtc_base/win32.h b/third_party/libwebrtc/rtc_base/win32.h @@ -45,13 +45,5 @@ int win32_inet_pton(int af, const char* src, void* dst); } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::win32_inet_ntop; -using ::webrtc::win32_inet_pton; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_WIN32_H_ diff --git a/third_party/libwebrtc/rtc_base/zero_memory.h b/third_party/libwebrtc/rtc_base/zero_memory.h @@ -32,12 +32,5 @@ void ExplicitZeroMemory(ArrayView<T> a) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::ExplicitZeroMemory; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // RTC_BASE_ZERO_MEMORY_H_ diff --git a/third_party/libwebrtc/sdk/objc/helpers/scoped_cftyperef.h b/third_party/libwebrtc/sdk/objc/helpers/scoped_cftyperef.h @@ -114,15 +114,5 @@ static ScopedCFTypeRef<T> ScopedCF(T cftype) { } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace rtc { -using ::webrtc::AdoptCF; -using ::webrtc::RetainPolicy; -using ::webrtc::ScopedCF; -using ::webrtc::ScopedCFTypeRef; -} // namespace rtc -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // SDK_OBJC_HELPERS_SCOPED_CFTYPEREF_H_ diff --git a/third_party/libwebrtc/video/config/encoder_stream_factory.h b/third_party/libwebrtc/video/config/encoder_stream_factory.h @@ -66,12 +66,5 @@ class EncoderStreamFactory } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::EncoderStreamFactory; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // VIDEO_CONFIG_ENCODER_STREAM_FACTORY_H_ diff --git a/third_party/libwebrtc/video/config/simulcast.h b/third_party/libwebrtc/video/config/simulcast.h @@ -52,15 +52,5 @@ std::vector<VideoStream> GetSimulcastConfig( } // namespace webrtc -// Re-export symbols from the webrtc namespace for backwards compatibility. -// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. -#ifdef WEBRTC_ALLOW_DEPRECATED_NAMESPACES -namespace cricket { -using ::webrtc::BoostMaxSimulcastLayer; -using ::webrtc::GetSimulcastConfig; -using ::webrtc::GetTotalMaxBitrate; -using ::webrtc::LimitSimulcastLayerCount; -} // namespace cricket -#endif // WEBRTC_ALLOW_DEPRECATED_NAMESPACES #endif // VIDEO_CONFIG_SIMULCAST_H_