From 79f3287fcf1c19eea26e0466caf33ea6eb95c0b1 Mon Sep 17 00:00:00 2001
From: Sebastian Jansson <srte@webrtc.org>
Date: Fri, 4 Oct 2019 09:25:06 +0200
Subject: [PATCH] Cleanup of simple TODO(srte) comments.

Just fixing some minor TODOs in my name. Not worth splitting into
separate CLs as the changes are minor.

Bug: webrtc:9883
Change-Id: I05c54b76507a1d51b92cad080ca4e2dfe8546bf1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/155520
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29377}
---
 BUILD.gn                                       | 1 -
 api/transport/BUILD.gn                         | 1 +
 api/transport/network_control.h                | 3 +--
 api/transport/network_types.cc                 | 3 +--
 modules/congestion_controller/goog_cc/BUILD.gn | 4 ----
 test/frame_generator.h                         | 2 --
 test/frame_generator_capturer.h                | 2 +-
 7 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index baedb3992c..32fcfa29f1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -538,7 +538,6 @@ if (rtc_include_tests) {
   rtc_test("slow_tests") {
     testonly = true
     deps = [
-      "modules/congestion_controller/goog_cc:goog_cc_slow_tests",
       "rtc_base/task_utils:repeating_task_unittests",
       "test:test_main",
     ]
diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn
index 365e5aeeee..3c11a1a2c8 100644
--- a/api/transport/BUILD.gn
+++ b/api/transport/BUILD.gn
@@ -38,6 +38,7 @@ rtc_static_library("network_control") {
   deps = [
     ":webrtc_key_value_config",
     "../../rtc_base:deprecation",
+    "../rtc_event_log",
     "../units:data_rate",
     "../units:data_size",
     "../units:time_delta",
diff --git a/api/transport/network_control.h b/api/transport/network_control.h
index 8b2958c8aa..1ba65eee2c 100644
--- a/api/transport/network_control.h
+++ b/api/transport/network_control.h
@@ -14,12 +14,11 @@
 
 #include <memory>
 
+#include "api/rtc_event_log/rtc_event_log.h"
 #include "api/transport/network_types.h"
 #include "api/transport/webrtc_key_value_config.h"
 
 namespace webrtc {
-// TODO(srte): Remove this forward declaration when this is in api.
-class RtcEventLog;
 
 class TargetTransferRateObserver {
  public:
diff --git a/api/transport/network_types.cc b/api/transport/network_types.cc
index d0a0c4a05f..88b67b3a47 100644
--- a/api/transport/network_types.cc
+++ b/api/transport/network_types.cc
@@ -13,8 +13,7 @@
 #include <algorithm>
 
 namespace webrtc {
-// TODO(srte): Revert to using default after removing union member.
-StreamsConfig::StreamsConfig() {}
+StreamsConfig::StreamsConfig() = default;
 StreamsConfig::StreamsConfig(const StreamsConfig&) = default;
 StreamsConfig::~StreamsConfig() = default;
 
diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn
index 5782ea2661..8e8d2ba8fa 100644
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ b/modules/congestion_controller/goog_cc/BUILD.gn
@@ -280,8 +280,4 @@ if (rtc_include_tests) {
       "//testing/gmock",
     ]
   }
-
-  # TODO(srte): Remove this target when dependency in root BUILD is gone.
-  rtc_source_set("goog_cc_slow_tests") {
-  }
 }
diff --git a/test/frame_generator.h b/test/frame_generator.h
index 31543bc6d1..8cc0ac3729 100644
--- a/test/frame_generator.h
+++ b/test/frame_generator.h
@@ -60,8 +60,6 @@ class FrameGenerator {
 
   enum class OutputType {
     kI420,
-    // TODO(srte): Remove alias when downstream is updated.
-    I420 = kI420,
     kI420A,
     kI010
   };
diff --git a/test/frame_generator_capturer.h b/test/frame_generator_capturer.h
index 7a675c6b24..faf049843d 100644
--- a/test/frame_generator_capturer.h
+++ b/test/frame_generator_capturer.h
@@ -38,7 +38,7 @@ class AutoOpt : public absl::optional<T> {
 struct FrameGeneratorCapturerConfig {
   struct SquaresVideo {
     int framerate = 30;
-    FrameGenerator::OutputType pixel_format = FrameGenerator::OutputType::I420;
+    FrameGenerator::OutputType pixel_format = FrameGenerator::OutputType::kI420;
     int width = 320;
     int height = 180;
     int num_squares = 10;