From d3289d2ec0363d5a7b9cb591ca3e902b4909c180 Mon Sep 17 00:00:00 2001
From: Philipp Hancke <phancke@microsoft.com>
Date: Thu, 9 Mar 2023 17:03:16 +0100
Subject: [PATCH] Reland "stats: remove RTCRtpInboundRTPStream and
 RTCRtpoutboundRTPStream aliases"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a reland of commit 9671d60925b81baefd4a0d6b05ad539fa4a782d7
after fixing more downstream dependencies

Original change's description:
> stats: remove RTCRtpInboundRTPStream and RTCRtpoutboundRTPStream aliases
>
> after upgrading downstream projects
>
> BUG=webrtc:14973
>
> Change-Id: I5df8e95a1c70b1d6078e255166c36ed01f868b6a
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/296820
> Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Philipp Hancke <phancke@microsoft.com>
> Cr-Commit-Position: refs/heads/main@{#39526}

No-Try: True
Bug: webrtc:14973
Change-Id: I33bd99ca211a82ed77e3e8676e00256915fde168
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/296881
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39533}
---
 api/stats/rtcstats_objects.h                      | 4 ----
 pc/peer_connection_mediachannel_split_unittest.cc | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h
index b4b272d2af..790b3b1351 100644
--- a/api/stats/rtcstats_objects.h
+++ b/api/stats/rtcstats_objects.h
@@ -493,8 +493,6 @@ class RTC_EXPORT RTCInboundRtpStreamStats final
   // The former googMinPlayoutDelayMs (in seconds).
   RTCNonStandardStatsMember<double> min_playout_delay;
 };
-// TODO(bugs.webrtc.org/14973): remove name alias.
-using RTCInboundRTPStreamStats = RTCInboundRtpStreamStats;
 
 // https://w3c.github.io/webrtc-stats/#outboundrtpstats-dict*
 class RTC_EXPORT RTCOutboundRtpStreamStats final
@@ -546,8 +544,6 @@ class RTC_EXPORT RTCOutboundRtpStreamStats final
       power_efficient_encoder;
   RTCStatsMember<std::string> scalability_mode;
 };
-// TODO(bugs.webrtc.org/14973): remove name alias.
-using RTCOutboundRTPStreamStats = RTCOutboundRtpStreamStats;
 
 // https://w3c.github.io/webrtc-stats/#remoteinboundrtpstats-dict*
 class RTC_EXPORT RTCRemoteInboundRtpStreamStats final
diff --git a/pc/peer_connection_mediachannel_split_unittest.cc b/pc/peer_connection_mediachannel_split_unittest.cc
index 3eca104add..a6b9640269 100644
--- a/pc/peer_connection_mediachannel_split_unittest.cc
+++ b/pc/peer_connection_mediachannel_split_unittest.cc
@@ -48,7 +48,7 @@ class PeerConnectionMediaChannelSplitTest
 
 int NacksReceivedCount(PeerConnectionIntegrationWrapper& pc) {
   rtc::scoped_refptr<const webrtc::RTCStatsReport> report = pc.NewGetStats();
-  auto sender_stats = report->GetStatsOfType<RTCOutboundRTPStreamStats>();
+  auto sender_stats = report->GetStatsOfType<RTCOutboundRtpStreamStats>();
   if (sender_stats.size() != 1) {
     ADD_FAILURE();
     return 0;
@@ -61,7 +61,7 @@ int NacksReceivedCount(PeerConnectionIntegrationWrapper& pc) {
 
 int NacksSentCount(PeerConnectionIntegrationWrapper& pc) {
   rtc::scoped_refptr<const webrtc::RTCStatsReport> report = pc.NewGetStats();
-  auto receiver_stats = report->GetStatsOfType<RTCInboundRTPStreamStats>();
+  auto receiver_stats = report->GetStatsOfType<RTCInboundRtpStreamStats>();
   if (receiver_stats.size() != 1) {
     ADD_FAILURE();
     return 0;