diff --git a/media/base/media_channel.h b/media/base/media_channel.h index f23df8b987..ea6384ab95 100644 --- a/media/base/media_channel.h +++ b/media/base/media_channel.h @@ -255,10 +255,6 @@ class MediaSendChannelInterface { // TODO(bugs.webrtc.org/13931): Remove when configuration is more sensible virtual void SetSendCodecChangedCallback( absl::AnyInvocable callback) = 0; - - // Get the underlying send/receive implementation channel for testing. - // TODO(bugs.webrtc.org/13931): Remove method and the fakes that depend on it. - virtual MediaChannel* ImplForTesting() = 0; }; class MediaReceiveChannelInterface : public Delayable { @@ -313,9 +309,6 @@ class MediaReceiveChannelInterface : public Delayable { uint32_t ssrc, rtc::scoped_refptr frame_transformer) = 0; - // Get the underlying send/receive implementation channel for testing. - // TODO(bugs.webrtc.org/13931): Remove method and the fakes that depend on it. - virtual MediaChannel* ImplForTesting() = 0; }; // The stats information is structured as follows: diff --git a/media/base/media_channel_impl.h b/media/base/media_channel_impl.h index 66c2f3e508..33007d07ee 100644 --- a/media/base/media_channel_impl.h +++ b/media/base/media_channel_impl.h @@ -302,10 +302,6 @@ class VideoMediaChannel : public MediaChannel, bool HasNetworkInterface() const override { return MediaChannel::HasNetworkInterface(); } - MediaChannel* ImplForTesting() override { - // This class and its subclasses are not interface classes. - RTC_CHECK_NOTREACHED(); - } }; // Base class for implementation classes @@ -379,13 +375,6 @@ class VoiceMediaChannel : public MediaChannel, bool get_and_clear_legacy_stats) override { return GetReceiveStats(info, get_and_clear_legacy_stats); } - - private: - // Functions not implemented on this interface - MediaChannel* ImplForTesting() override { - // This class and its subclasses are not interface classes. - RTC_CHECK_NOTREACHED(); - } }; } // namespace cricket diff --git a/media/base/media_channel_shim.h b/media/base/media_channel_shim.h index 335fae216d..e4dbee700d 100644 --- a/media/base/media_channel_shim.h +++ b/media/base/media_channel_shim.h @@ -83,12 +83,6 @@ class VoiceMediaShimChannel : public VoiceMediaChannel { } } - // Not really valid for this mode - MediaChannel* ImplForTesting() override { - RTC_CHECK_NOTREACHED(); - return nullptr; - } - // Implementation of MediaBaseChannelInterface cricket::MediaType media_type() const override { return MEDIA_TYPE_AUDIO; } @@ -331,12 +325,6 @@ class VideoMediaShimChannel : public VideoMediaChannel { } } - // Not really valid for this mode - MediaChannel* ImplForTesting() override { - RTC_CHECK_NOTREACHED(); - return nullptr; - } - // Implementation of MediaBaseChannelInterface cricket::MediaType media_type() const override { return MEDIA_TYPE_VIDEO; } diff --git a/media/engine/webrtc_video_engine.h b/media/engine/webrtc_video_engine.h index 3635c21d04..e210f040bf 100644 --- a/media/engine/webrtc_video_engine.h +++ b/media/engine/webrtc_video_engine.h @@ -478,11 +478,6 @@ class WebRtcVideoSendChannel : public MediaChannelUtil, const absl::optional& send_codec() const { return send_codec_; } - // Disabled function from interface - MediaChannel* ImplForTesting() override { - RTC_CHECK_NOTREACHED(); - return nullptr; - } webrtc::TaskQueueBase* const worker_thread_; webrtc::ScopedTaskSafety task_safety_; RTC_NO_UNIQUE_ADDRESS webrtc::SequenceChecker network_thread_checker_{ @@ -834,12 +829,6 @@ class WebRtcVideoReceiveChannel : public MediaChannelUtil, RTC_DCHECK_RUN_ON(&thread_checker_); return unsignaled_stream_params_; } - - // Disabled function from API - MediaChannel* ImplForTesting() override { - RTC_CHECK_NOTREACHED(); - return nullptr; - } // Variables. webrtc::TaskQueueBase* const worker_thread_; webrtc::ScopedTaskSafety task_safety_; diff --git a/media/engine/webrtc_voice_engine.h b/media/engine/webrtc_voice_engine.h index 327beed3d0..0f7313ea10 100644 --- a/media/engine/webrtc_voice_engine.h +++ b/media/engine/webrtc_voice_engine.h @@ -302,10 +302,6 @@ class WebRtcVoiceSendChannel final : public MediaChannelUtil, absl::AnyInvocable callback) override { send_codec_changed_callback_ = std::move(callback); } - MediaChannel* ImplForTesting() override { - RTC_CHECK_NOTREACHED(); - return nullptr; - } private: bool SetOptions(const AudioOptions& options); @@ -458,11 +454,6 @@ class WebRtcVoiceReceiveChannel final void SetReceiveNackEnabled(bool enabled) override; void SetReceiveNonSenderRttEnabled(bool enabled) override; - MediaChannel* ImplForTesting() override { - RTC_CHECK_NOTREACHED(); - return nullptr; - } - private: bool SetOptions(const AudioOptions& options); bool SetRecvCodecs(const std::vector& codecs);