Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/third_party/libwebrtc/api/media_stream_interface.h b/third_party/libwebrtc/api/media_stream_interface.h
index 9d336739e4..4f9bffac85 100644
--- a/third_party/libwebrtc/api/media_stream_interface.h
+++ b/third_party/libwebrtc/api/media_stream_interface.h
@@ -23,6 +23,7 @@
 
 #include "absl/types/optional.h"
 #include "api/audio_options.h"
+#include "api/ref_count.h"
 #include "api/scoped_refptr.h"
 #include "api/video/recordable_encoded_frame.h"
 #include "api/video/video_frame.h"
@@ -30,7 +31,6 @@
 #include "api/video/video_source_interface.h"
 #include "api/video_track_source_constraints.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
-#include "rtc_base/ref_count.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
@@ -54,7 +54,7 @@ class NotifierInterface {
 
 // Base class for sources. A MediaStreamTrack has an underlying source that
 // provides media. A source can be shared by multiple tracks.
-class RTC_EXPORT MediaSourceInterface : public rtc::RefCountInterface,
+class RTC_EXPORT MediaSourceInterface : public webrtc::RefCountInterface,
                                         public NotifierInterface {
  public:
   enum SourceState { kInitializing, kLive, kEnded, kMuted };
@@ -69,7 +69,7 @@ class RTC_EXPORT MediaSourceInterface : public rtc::RefCountInterface,
 
 // C++ version of MediaStreamTrack.
 // See: https://www.w3.org/TR/mediacapture-streams/#mediastreamtrack
-class RTC_EXPORT MediaStreamTrackInterface : public rtc::RefCountInterface,
+class RTC_EXPORT MediaStreamTrackInterface : public webrtc::RefCountInterface,
                                              public NotifierInterface {
  public:
   enum TrackState {
@@ -267,7 +267,7 @@ class RTC_EXPORT AudioSourceInterface : public MediaSourceInterface {
 
 // Interface of the audio processor used by the audio track to collect
 // statistics.
-class AudioProcessorInterface : public rtc::RefCountInterface {
+class AudioProcessorInterface : public webrtc::RefCountInterface {
  public:
   struct AudioProcessorStatistics {
     bool typing_noise_detected = false;
@@ -321,7 +321,7 @@ typedef std::vector<rtc::scoped_refptr<VideoTrackInterface> > VideoTrackVector;
 // must be pushed down.
 //
 // Thus, this interface acts as simply a container for tracks.
-class MediaStreamInterface : public rtc::RefCountInterface,
+class MediaStreamInterface : public webrtc::RefCountInterface,
                              public NotifierInterface {
  public:
   virtual std::string id() const = 0;