Revert "Refactor rtc_base build targets."

This reverts commit 69241a9.

Reason for revert: Breaks WebRTC roll into Chromium.

Original change's description:
> Refactor rtc_base build targets.
>
> The "//rtc_base:rtc_base" build target has historically been one of the
> biggest targets in the WebRTC build. Big targets are the main source of
> circular dependencies and non-API types leakage.
>
> This CL is a step forward into splitting "//rtc_base:rtc_base" into
> smaller targets (as originally started in 2018).
>
> The only non-automated changes are (like re-wiring the build system):
> * The creation of //rtc_base/async_resolver.{h,cc} which allows to
>   break a circular dependency (is has been extracted from
>   //rtc_base/net_helpers.{h,cc}).
> * The creation of //rtc_base/internal/default_socket_server.{h,cc} to
>   break another circular dependency.
>
> Bug: webrtc:9987
> Change-Id: I0c8f5e7efe2c8fd8e6bffa0d6dd2dd494cf3df02
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196903
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#32941}

TBR=mbonadei@webrtc.org,hta@webrtc.org

# Not skipping CQ checks because original CL landed > 1 day ago.

No-Try: True
Bug: webrtc:9987
Change-Id: I1e36ad64cc60092f38d6886153a94f1a58339256
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/201840
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Markus Handell <handellm@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32986}

api/BUILD.gn

@@ -52,7 +52,6 @@ if (!build_with_chromium) {
       "../pc:peerconnection",
       "../rtc_base",
       "../rtc_base:rtc_base_approved",
-      "../rtc_base:threading",
       "audio:audio_mixer_api",
       "audio_codecs:audio_codecs_api",
       "task_queue:default_task_queue_factory",
@@ -175,7 +174,6 @@ rtc_library("libjingle_peerconnection_api") {
     ":rtp_parameters",
     ":rtp_transceiver_direction",
     ":scoped_refptr",
-    "../rtc_base:network_constants",
     "adaptation:resource_adaptation_api",
     "audio:audio_mixer_api",
     "audio_codecs:audio_codecs_api",
@@ -206,10 +204,7 @@ rtc_library("libjingle_peerconnection_api") {
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:deprecation",
-    "../rtc_base:ip_address",
     "../rtc_base:rtc_base_approved",
-    "../rtc_base:socket_address",
-    "../rtc_base:threading",
     "../rtc_base/system:rtc_export",
   ]
   absl_deps = [
@@ -253,7 +248,6 @@ rtc_source_set("packet_socket_factory") {
     "packet_socket_factory.h",
   ]
   deps = [
-    "../rtc_base:async_resolver_interface",
     "../rtc_base:rtc_base",
     "../rtc_base/system:rtc_export",
   ]
@@ -389,7 +383,6 @@ rtc_source_set("peer_connection_quality_test_fixture_api") {
     ":video_quality_analyzer_api",
     "../media:rtc_media_base",
     "../rtc_base:rtc_base",
-    "../rtc_base:threading",
     "rtc_event_log",
     "task_queue",
     "transport:network_control",
@@ -607,8 +600,6 @@ rtc_source_set("network_emulation_manager_api") {
     ":time_controller",
     "../call:simulated_network",
     "../rtc_base",
-    "../rtc_base:network_constants",
-    "../rtc_base:threading",
     "test/network_emulation",
     "units:data_rate",
     "units:data_size",
@@ -626,7 +617,6 @@ rtc_source_set("time_controller") {
   deps = [
     "../modules/utility",
     "../rtc_base",
-    "../rtc_base:threading",
     "../rtc_base/synchronization:yield_policy",
     "../system_wrappers",
     "task_queue",
@@ -680,7 +670,6 @@ rtc_library("ice_transport_factory") {
     ":scoped_refptr",
     "../p2p:rtc_p2p",
     "../rtc_base",
-    "../rtc_base:threading",
     "../rtc_base/system:rtc_export",
     "rtc_event_log:rtc_event_log",
   ]

api/test/network_emulation/BUILD.gn

@@ -20,9 +20,7 @@ rtc_library("network_emulation") {
     "../..:array_view",
     "../../../rtc_base",
     "../../../rtc_base:checks",
-    "../../../rtc_base:ip_address",
     "../../../rtc_base:rtc_base_approved",
-    "../../../rtc_base:socket_address",
     "../../numerics",
     "../../units:data_rate",
     "../../units:data_size",

api/transport/BUILD.gn

@@ -108,10 +108,8 @@ rtc_source_set("stun_types") {
   deps = [
     "../../api:array_view",
     "../../rtc_base:checks",
-    "../../rtc_base:ip_address",
     "../../rtc_base:rtc_base",
     "../../rtc_base:rtc_base_approved",
-    "../../rtc_base:socket_address",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
 }
@@ -149,7 +147,6 @@ if (rtc_include_tests) {
       ":stun_types",
       "../../rtc_base",
       "../../rtc_base:rtc_base_approved",
-      "../../rtc_base:socket_address",
       "../../test:test_support",
       "//testing/gtest",
     ]

audio/BUILD.gn

@@ -90,7 +90,6 @@ rtc_library("audio") {
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:safe_minmax",
-    "../rtc_base:threading",
     "../rtc_base/experiments:field_trial_parser",
     "../rtc_base/synchronization:mutex",
     "../rtc_base/synchronization:sequence_checker",

call/BUILD.gn

@@ -504,7 +504,6 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_base_approved",
       "../rtc_base:task_queue_for_test",
       "../rtc_base:task_queue_for_test",
-      "../rtc_base:threading",
       "../rtc_base/synchronization:mutex",
       "../rtc_base/task_utils:repeating_task",
       "../system_wrappers",

examples/BUILD.gn

@@ -686,8 +686,6 @@ if (is_linux || is_chromeos || is_win) {
       "../p2p:rtc_p2p",
       "../pc:video_track_source",
       "../rtc_base:checks",
-      "../rtc_base:net_helpers",
-      "../rtc_base:threading",
       "../rtc_base/third_party/sigslot",
       "../system_wrappers:field_trial",
       "../test:field_trial",
@@ -779,11 +777,7 @@ if (is_linux || is_chromeos || is_win) {
       "../p2p:rtc_p2p",
       "../pc:rtc_pc",
       "../rtc_base",
-      "../rtc_base:ip_address",
       "../rtc_base:rtc_base_approved",
-      "../rtc_base:socket_address",
-      "../rtc_base:socket_server",
-      "../rtc_base:threading",
     ]
   }
   rtc_executable("stunserver") {
@@ -795,9 +789,6 @@ if (is_linux || is_chromeos || is_win) {
       "../pc:rtc_pc",
       "../rtc_base",
       "../rtc_base:rtc_base_approved",
-      "../rtc_base:socket_address",
-      "../rtc_base:socket_server",
-      "../rtc_base:threading",
     ]
   }
 }
@@ -921,8 +912,6 @@ if (!build_with_chromium) {
       "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:rtc_base_approved",
-      "../rtc_base:socket_address",
-      "../rtc_base:threading",
       "//third_party/abseil-cpp/absl/flags:flag",
       "//third_party/abseil-cpp/absl/flags:parse",
     ]

examples/androidvoip/BUILD.gn

@@ -56,9 +56,6 @@ if (is_android) {
 
     deps = [
       ":generated_jni",
-      "../../rtc_base:socket_address",
-      "../../rtc_base:socket_server",
-      "../../rtc_base:threading",
       "//api:transport_api",
       "//api/audio_codecs:audio_codecs_api",
       "//api/audio_codecs:builtin_audio_decoder_factory",

logging/BUILD.gn

@@ -288,7 +288,6 @@ rtc_library("fake_rtc_event_log") {
     "../api/rtc_event_log",
     "../rtc_base",
     "../rtc_base:checks",
-    "../rtc_base:threading",
   ]
 }
 

media/BUILD.gn

@@ -113,7 +113,6 @@ rtc_library("rtc_media_base") {
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:sanitizer",
-    "../rtc_base:socket",
     "../rtc_base:stringutils",
     "../rtc_base/synchronization:mutex",
     "../rtc_base/synchronization:sequence_checker",
@@ -321,7 +320,6 @@ rtc_library("rtc_audio_video") {
     "../rtc_base:ignore_wundef",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:stringutils",
-    "../rtc_base:threading",
     "../rtc_base/experiments:field_trial_parser",
     "../rtc_base/experiments:min_video_bitrate_experiment",
     "../rtc_base/experiments:normalize_simulcast_size_experiment",
@@ -409,7 +407,6 @@ rtc_library("rtc_data") {
     "../p2p:rtc_p2p",
     "../rtc_base",
     "../rtc_base:rtc_base_approved",
-    "../rtc_base:threading",
     "../rtc_base/synchronization:mutex",
     "../rtc_base/task_utils:pending_task_safety_flag",
     "../rtc_base/task_utils:to_queued_task",
@@ -486,7 +483,6 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_task_queue",
       "../rtc_base:stringutils",
-      "../rtc_base:threading",
       "../rtc_base/synchronization:mutex",
       "../rtc_base/third_party/sigslot",
       "../test:test_support",
@@ -596,7 +592,6 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:rtc_task_queue",
       "../rtc_base:stringutils",
-      "../rtc_base:threading",
       "../rtc_base/experiments:min_video_bitrate_experiment",
       "../rtc_base/synchronization:mutex",
       "../rtc_base/third_party/sigslot",

modules/audio_processing/BUILD.gn

@@ -367,7 +367,6 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base_tests_utils",
       "../../rtc_base:safe_minmax",
       "../../rtc_base:task_queue_for_test",
-      "../../rtc_base:threading",
       "../../rtc_base/synchronization:mutex",
       "../../rtc_base/system:arch",
       "../../rtc_base/system:file_wrapper",

modules/video_coding/BUILD.gn

@@ -189,7 +189,6 @@ rtc_library("video_coding") {
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
-    "../../rtc_base:threading",
     "../../rtc_base/experiments:alr_experiment",
     "../../rtc_base/experiments:field_trial_parser",
     "../../rtc_base/experiments:jitter_upper_bound_experiment",

p2p/BUILD.gn

@@ -96,17 +96,8 @@ rtc_library("rtc_p2p") {
     "../api/transport:stun_types",
     "../logging:ice_log",
     "../rtc_base",
-    "../rtc_base:async_resolver_interface",
-    "../rtc_base:async_socket",
     "../rtc_base:checks",
-    "../rtc_base:ip_address",
-    "../rtc_base:net_helpers",
-    "../rtc_base:network_constants",
     "../rtc_base:rtc_numerics",
-    "../rtc_base:socket",
-    "../rtc_base:socket_address",
-    "../rtc_base:socket_server",
-    "../rtc_base:threading",
     "../rtc_base/experiments:field_trial_parser",
     "../rtc_base/synchronization:sequence_checker",
     "../rtc_base/system:no_unique_address",
@@ -157,8 +148,6 @@ if (rtc_include_tests) {
     deps = [
       ":rtc_p2p",
       "../rtc_base",
-      "../rtc_base:net_helpers",
-      "../rtc_base:threading",
     ]
   }
 
@@ -184,14 +173,9 @@ if (rtc_include_tests) {
       "../api/crypto:options",
       "../api/transport:stun_types",
       "../rtc_base",
-      "../rtc_base:async_resolver_interface",
-      "../rtc_base:async_socket",
       "../rtc_base:gunit_helpers",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
-      "../rtc_base:socket_address",
-      "../rtc_base:socket_server",
-      "../rtc_base:threading",
       "../rtc_base/third_party/sigslot",
       "../test:test_support",
     ]
@@ -237,18 +221,11 @@ if (rtc_include_tests) {
       "../api/transport:stun_types",
       "../api/units:time_delta",
       "../rtc_base",
-      "../rtc_base:async_socket",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
-      "../rtc_base:ip_address",
-      "../rtc_base:net_helpers",
-      "../rtc_base:network_constants",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
-      "../rtc_base:socket",
-      "../rtc_base:socket_address",
       "../rtc_base:testclient",
-      "../rtc_base:threading",
       "../rtc_base/network:sent_packet",
       "../rtc_base/third_party/sigslot",
       "../system_wrappers:metrics",
@@ -279,8 +256,6 @@ rtc_library("p2p_server_utils") {
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_tests_utils",
-    "../rtc_base:socket_address",
-    "../rtc_base:threading",
     "../rtc_base/third_party/sigslot",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/algorithm:container" ]
@@ -298,11 +273,7 @@ rtc_library("libstunprober") {
     "../api:packet_socket_factory",
     "../api/transport:stun_types",
     "../rtc_base",
-    "../rtc_base:async_resolver_interface",
     "../rtc_base:checks",
-    "../rtc_base:ip_address",
-    "../rtc_base:socket_address",
-    "../rtc_base:threading",
     "../rtc_base/system:rtc_export",
   ]
 }
@@ -319,7 +290,6 @@ if (rtc_include_tests) {
       "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
-      "../rtc_base:ip_address",
       "../rtc_base:rtc_base_tests_utils",
       "../test:test_support",
       "//testing/gtest",

p2p/base/basic_async_resolver_factory.cc

@@ -10,7 +10,7 @@
 
 #include "p2p/base/basic_async_resolver_factory.h"
 
-#include "rtc_base/async_resolver.h"
+#include "rtc_base/net_helpers.h"
 
 namespace webrtc {
 

p2p/base/basic_packet_socket_factory.cc

@@ -15,7 +15,6 @@
 #include <string>
 
 #include "p2p/base/async_stun_tcp_socket.h"
-#include "rtc_base/async_resolver.h"
 #include "rtc_base/async_tcp_socket.h"
 #include "rtc_base/async_udp_socket.h"
 #include "rtc_base/checks.h"

p2p/base/stun_port.cc

@@ -17,11 +17,11 @@
 #include "p2p/base/connection.h"
 #include "p2p/base/p2p_constants.h"
 #include "p2p/base/port_allocator.h"
-#include "rtc_base/async_resolver_interface.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/net_helpers.h"
 #include "rtc_base/strings/string_builder.h"
 
 namespace cricket {

p2p/base/turn_port.h

@@ -25,7 +25,6 @@
 #include "p2p/client/basic_port_allocator.h"
 #include "rtc_base/async_invoker.h"
 #include "rtc_base/async_packet_socket.h"
-#include "rtc_base/async_resolver_interface.h"
 #include "rtc_base/ssl_certificate.h"
 
 namespace webrtc {