Removes redundant AlrDetector.

This replaces the old AlrDetector used by the pacer with the one in
GoogCC. This reduces the risk of accidentally changing only one version.

Note that the pacer instance will be removed when moving over to the
task queue based send side congestion controller.

Bug: webrtc:8415
Change-Id: Id4b2000ee5a04b94565092c29a84572a7750d2f5
Reviewed-on: https://webrtc-review.googlesource.com/85363
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23791}

modules/congestion_controller/goog_cc/BUILD.gn

@@ -19,8 +19,6 @@ config("bwe_test_logging") {
 rtc_static_library("goog_cc") {
   configs += [ ":bwe_test_logging" ]
   sources = [
-    "alr_detector.cc",
-    "alr_detector.h",
     "goog_cc_factory.cc",
     "goog_cc_network_control.cc",
     "goog_cc_network_control.h",
@@ -35,6 +33,7 @@ rtc_static_library("goog_cc") {
   }
 
   deps = [
+    ":alr_detector",
     ":delay_based_bwe",
     ":estimators",
     "../..:module_api",
@@ -50,13 +49,34 @@ rtc_static_library("goog_cc") {
     "../../../system_wrappers:field_trial_api",
     "../../../system_wrappers:metrics_api",
     "../../bitrate_controller",
-    "../../pacing",
     "../../remote_bitrate_estimator",
     "../../rtp_rtcp:rtp_rtcp_format",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
 
+rtc_source_set("alr_detector") {
+  sources = [
+    "alr_detector.cc",
+    "alr_detector.h",
+  ]
+  if (!build_with_chromium && is_clang) {
+    # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+    suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+  }
+  deps = [
+    "../../..:webrtc_common",
+    "../../../:typedefs",
+    "../../../logging:rtc_event_log_api",
+    "../../../logging:rtc_event_pacing",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base/experiments:alr_experiment",
+    "../../../system_wrappers:field_trial_api",
+    "../../pacing:interval_budget",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
+}
 rtc_source_set("estimators") {
   configs += [ ":bwe_test_logging" ]
   sources = [
@@ -138,6 +158,7 @@ if (rtc_include_tests) {
       "trendline_estimator_unittest.cc",
     ]
     deps = [
+      ":alr_detector",
       ":delay_based_bwe",
       ":estimators",
       ":goog_cc",

modules/congestion_controller/goog_cc/alr_detector.cc

@@ -20,12 +20,12 @@
 #include "rtc_base/experiments/alr_experiment.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/ptr_util.h"
 #include "rtc_base/timeutils.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
-namespace webrtc_cc {
 AlrDetector::AlrDetector() : AlrDetector(nullptr) {}
 
 AlrDetector::AlrDetector(RtcEventLog* event_log)
@@ -93,5 +93,4 @@ absl::optional<int64_t> AlrDetector::GetApplicationLimitedRegionStartTime()
     const {
   return alr_started_time_ms_;
 }
-}  // namespace webrtc_cc
 }  // namespace webrtc

modules/congestion_controller/goog_cc/alr_detector.h

@@ -14,7 +14,6 @@
 #include "absl/types/optional.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/pacing/interval_budget.h"
-#include "modules/pacing/paced_sender.h"
 #include "rtc_base/rate_statistics.h"
 #include "typedefs.h"  // NOLINT(build/include)
 
@@ -22,8 +21,6 @@ namespace webrtc {
 
 class RtcEventLog;
 
-namespace webrtc_cc {
-
 // Application limited region detector is a class that utilizes signals of
 // elapsed time and bytes sent to estimate whether network traffic is
 // currently limited by the application's ability to generate traffic.
@@ -70,8 +67,6 @@ class AlrDetector {
 
   RtcEventLog* event_log_;
 };
-
-}  // namespace webrtc_cc
 }  // namespace webrtc
 
 #endif  // MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_