From ea562b40f8e0ccc210ff95694ba967d841bb9dee Mon Sep 17 00:00:00 2001
From: Sebastian Jansson <srte@webrtc.org>
Date: Mon, 7 May 2018 18:14:53 +0200
Subject: [PATCH] Removes dependency on Optional for unit classes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes the dependency graph simpler and prepares for moving the
unit classes to api/.

Bug: webrtc:9155
Change-Id: I1b36d5e05f75d70ba8951e880d76359f896f7741
Reviewed-on: https://webrtc-review.googlesource.com/74920
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23161}
---
 .../goog_cc/goog_cc_network_control.cc                 |  9 +++++++++
 .../network_control/units/BUILD.gn                     |  4 ----
 .../network_control/units/data_rate.h                  | 10 ----------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
index 04121b8514..b0bf6f31f0 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
@@ -101,6 +101,15 @@ std::vector<PacketFeedback> ReceivedPacketsFeedbackAsRtp(
   return packet_feedback_vector;
 }
 
+int64_t GetBpsOrDefault(const rtc::Optional<DataRate>& rate,
+                        int64_t fallback_bps) {
+  if (rate && rate->IsFinite()) {
+    return rate->bps();
+  } else {
+    return fallback_bps;
+  }
+}
+
 }  // namespace
 
 GoogCcNetworkController::GoogCcNetworkController(RtcEventLog* event_log,
diff --git a/modules/congestion_controller/network_control/units/BUILD.gn b/modules/congestion_controller/network_control/units/BUILD.gn
index 5cb5471d55..214b4ca61c 100644
--- a/modules/congestion_controller/network_control/units/BUILD.gn
+++ b/modules/congestion_controller/network_control/units/BUILD.gn
@@ -17,7 +17,6 @@ rtc_source_set("data_rate") {
   deps = [
     ":data_size",
     ":time_delta",
-    "../../../../api:optional",
     "../../../../rtc_base:checks",
     "../../../../rtc_base:rtc_base_approved",
   ]
@@ -30,7 +29,6 @@ rtc_source_set("data_size") {
   ]
 
   deps = [
-    "../../../../api:optional",
     "../../../../rtc_base:checks",
     "../../../../rtc_base:rtc_base_approved",
   ]
@@ -42,7 +40,6 @@ rtc_source_set("time_delta") {
   ]
 
   deps = [
-    "../../../../api:optional",
     "../../../../rtc_base:checks",
     "../../../../rtc_base:rtc_base_approved",
   ]
@@ -56,7 +53,6 @@ rtc_source_set("timestamp") {
 
   deps = [
     ":time_delta",
-    "../../../../api:optional",
     "../../../../rtc_base:checks",
     "../../../../rtc_base:rtc_base_approved",
   ]
diff --git a/modules/congestion_controller/network_control/units/data_rate.h b/modules/congestion_controller/network_control/units/data_rate.h
index 922fd67884..d71e27392d 100644
--- a/modules/congestion_controller/network_control/units/data_rate.h
+++ b/modules/congestion_controller/network_control/units/data_rate.h
@@ -16,7 +16,6 @@
 #include <limits>
 #include <string>
 
-#include "api/optional.h"
 #include "rtc_base/checks.h"
 
 #include "modules/congestion_controller/network_control/units/data_size.h"
@@ -128,15 +127,6 @@ inline DataSize operator*(const TimeDelta& duration, const DataRate& rate) {
   return rate * duration;
 }
 
-inline int64_t GetBpsOrDefault(const rtc::Optional<DataRate>& rate,
-                               int64_t fallback_bps) {
-  if (rate && rate->IsFinite()) {
-    return rate->bps();
-  } else {
-    return fallback_bps;
-  }
-}
-
 std::string ToString(const DataRate& value);
 
 }  // namespace webrtc