Moves GoogCC factory to API.

Bug: None
Change-Id: Ib5be0e984eff3a652504106552b0779be2c316ca
Reviewed-on: https://webrtc-review.googlesource.com/c/104941
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Bjorn Mellem <mellem@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25076}

api/DEPS

@@ -24,5 +24,6 @@ specific_include_rules = {
     "+modules/audio_coding",
     "+modules/audio_processing",
     "+modules/video_coding",
+    "+modules/congestion_controller",
   ],
 }

api/transport/BUILD.gn

@@ -35,6 +35,18 @@ rtc_static_library("network_control") {
   ]
 }
 
+rtc_static_library("goog_cc") {
+  sources = [
+    "goog_cc_factory.cc",
+    "goog_cc_factory.h",
+  ]
+  deps = [
+    ":network_control",
+    "../../modules/congestion_controller/goog_cc",
+    "//third_party/abseil-cpp/absl/memory",
+  ]
+}
+
 if (rtc_include_tests) {
   rtc_source_set("network_control_test") {
     testonly = true

api/transport/goog_cc_factory.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/congestion_controller/goog_cc/include/goog_cc_factory.h"
+#include "api/transport/goog_cc_factory.h"
 
 #include "absl/memory/memory.h"
 #include "modules/congestion_controller/goog_cc/goog_cc_network_control.h"

api/transport/goog_cc_factory.h

@@ -8,14 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_
+#ifndef API_TRANSPORT_GOOG_CC_FACTORY_H_
+#define API_TRANSPORT_GOOG_CC_FACTORY_H_
 #include <memory>
 
 #include "api/transport/network_control.h"
 
 namespace webrtc {
-class Clock;
 class RtcEventLog;
 
 class GoogCcNetworkControllerFactory
@@ -45,4 +44,4 @@ class GoogCcFeedbackNetworkControllerFactory
 };
 }  // namespace webrtc
 
-#endif  // MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_
+#endif  // API_TRANSPORT_GOOG_CC_FACTORY_H_

modules/congestion_controller/goog_cc/BUILD.gn

@@ -19,10 +19,8 @@ config("bwe_test_logging") {
 rtc_static_library("goog_cc") {
   configs += [ ":bwe_test_logging" ]
   sources = [
-    "goog_cc_factory.cc",
     "goog_cc_network_control.cc",
     "goog_cc_network_control.h",
-    "include/goog_cc_factory.h",
   ]
 
   deps = [
@@ -149,6 +147,7 @@ if (rtc_include_tests) {
       ":estimators",
       ":goog_cc",
       "..:test_controller_printer",
+      "../../../api/transport:goog_cc",
     ]
   }
   rtc_source_set("goog_cc_unittests") {
@@ -175,6 +174,7 @@ if (rtc_include_tests) {
       ":estimators",
       ":goog_cc",
       ":probe_controller",
+      "../../../api/transport:goog_cc",
       "../../../api/transport:network_control",
       "../../../api/transport:network_control_test",
       "../../../logging:mocks",

modules/congestion_controller/goog_cc/goog_cc_network_control.cc

@@ -22,7 +22,6 @@
 #include "absl/memory/memory.h"
 #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h"
 #include "modules/congestion_controller/goog_cc/alr_detector.h"
-#include "modules/congestion_controller/goog_cc/include/goog_cc_factory.h"
 #include "modules/congestion_controller/goog_cc/probe_controller.h"
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"

modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/transport/goog_cc_factory.h"
 #include "api/transport/test/network_control_tester.h"
 #include "logging/rtc_event_log/mock/mock_rtc_event_log.h"
-#include "modules/congestion_controller/goog_cc/include/goog_cc_factory.h"
 #include "test/scenario/scenario.h"
 
 #include "test/gtest.h"

modules/congestion_controller/goog_cc/test/goog_cc_printer.h

@@ -12,8 +12,8 @@
 
 #include <memory>
 
+#include "api/transport/goog_cc_factory.h"
 #include "modules/congestion_controller/goog_cc/goog_cc_network_control.h"
-#include "modules/congestion_controller/goog_cc/include/goog_cc_factory.h"
 #include "modules/congestion_controller/test/controller_printer.h"
 
 namespace webrtc {

modules/congestion_controller/rtp/BUILD.gn

@@ -36,6 +36,7 @@ rtc_static_library("congestion_controller") {
     "../:congestion_controller",
     "../..:module_api",
     "../../..:webrtc_common",
+    "../../../api/transport:goog_cc",
     "../../../api/transport:network_control",
     "../../../rtc_base:checks",
     "../../../rtc_base:rate_limiter",
@@ -48,7 +49,6 @@ rtc_static_library("congestion_controller") {
     "../../pacing",
     "../../remote_bitrate_estimator",
     "../../rtp_rtcp:rtp_rtcp_format",
-    "../goog_cc",
     "//third_party/abseil-cpp/absl/memory",
   ]
 

modules/congestion_controller/rtp/send_side_congestion_controller.cc

@@ -15,9 +15,9 @@
 #include <memory>
 #include <vector>
 #include "absl/memory/memory.h"
+#include "api/transport/goog_cc_factory.h"
 #include "api/transport/network_types.h"
 #include "modules/congestion_controller/congestion_window_pushback_controller.h"
-#include "modules/congestion_controller/goog_cc/include/goog_cc_factory.h"
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"