From e1b777717bc969b262c1720323eb8a2a79e0385b Mon Sep 17 00:00:00 2001
From: Sebastian Jansson <srte@webrtc.org>
Date: Tue, 17 Sep 2019 12:47:17 +0200
Subject: [PATCH] Removing deprecated min_pacing_rate alias in StreamsConfig.

Bug: webrtc:9883
Change-Id: I8ca9f51b60b5fc24233f14404c13b411a5f2c253
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153343
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29206}
---
 api/transport/BUILD.gn          | 2 +-
 api/transport/goog_cc_factory.h | 1 +
 api/transport/network_types.h   | 8 ++------
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn
index b07021bb29..c4d6338884 100644
--- a/api/transport/BUILD.gn
+++ b/api/transport/BUILD.gn
@@ -37,7 +37,6 @@ rtc_static_library("network_control") {
 
   deps = [
     ":webrtc_key_value_config",
-    "../../rtc_base:deprecation",
     "../units:data_rate",
     "../units:data_size",
     "../units:time_delta",
@@ -99,6 +98,7 @@ rtc_static_library("goog_cc") {
     ":webrtc_key_value_config",
     "..:network_state_predictor_api",
     "../../modules/congestion_controller/goog_cc",
+    "../../rtc_base:deprecation",
     "//third_party/abseil-cpp/absl/memory",
   ]
 }
diff --git a/api/transport/goog_cc_factory.h b/api/transport/goog_cc_factory.h
index a988c61420..b14d6dcd78 100644
--- a/api/transport/goog_cc_factory.h
+++ b/api/transport/goog_cc_factory.h
@@ -14,6 +14,7 @@
 
 #include "api/network_state_predictor.h"
 #include "api/transport/network_control.h"
+#include "rtc_base/deprecation.h"
 
 namespace webrtc {
 class RtcEventLog;
diff --git a/api/transport/network_types.h b/api/transport/network_types.h
index 22c7d23cf2..038f151a77 100644
--- a/api/transport/network_types.h
+++ b/api/transport/network_types.h
@@ -19,7 +19,6 @@
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
-#include "rtc_base/deprecation.h"
 
 namespace webrtc {
 
@@ -35,11 +34,8 @@ struct StreamsConfig {
   Timestamp at_time = Timestamp::PlusInfinity();
   absl::optional<bool> requests_alr_probing;
   absl::optional<double> pacing_factor;
-  union {
-    absl::optional<DataRate> min_total_allocated_bitrate = absl::nullopt;
-    // Use min_total_allocated_bitrate instead.
-    RTC_DEPRECATED absl::optional<DataRate> min_pacing_rate;
-  };
+
+  absl::optional<DataRate> min_total_allocated_bitrate;
   absl::optional<DataRate> max_padding_rate;
   absl::optional<DataRate> max_total_allocated_bitrate;
 };