Remove //rtc_base:logging from public deps

Bug: webrtc:8603
Change-Id: I2704da8618f88032adac7ae9eb2a0f47fce4a836
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/257908
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Auto-Submit: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36443}
diff --git a/api/BUILD.gn b/api/BUILD.gn
index 259b73c..a6c4558 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -187,6 +187,7 @@
     ":scoped_refptr",
     ":sequence_checker",
     "../call:rtp_interfaces",
+    "../rtc_base:logging",
     "../rtc_base:network_constants",
     "adaptation:resource_adaptation_api",
     "audio:audio_mixer_api",
@@ -592,6 +593,7 @@
   deps = [
     ":libjingle_logging_api",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/system:file_wrapper",
     "rtc_event_log",
diff --git a/api/audio/BUILD.gn b/api/audio/BUILD.gn
index 49cf95d..70f6bcf 100644
--- a/api/audio/BUILD.gn
+++ b/api/audio/BUILD.gn
@@ -20,6 +20,7 @@
   deps = [
     "..:rtp_packet_info",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
   ]
 }
@@ -63,6 +64,7 @@
   deps = [
     ":aec3_config",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_json",
     "../../rtc_base/system:rtc_export",
diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn
index 39157b0..9c7bfbd 100644
--- a/api/transport/BUILD.gn
+++ b/api/transport/BUILD.gn
@@ -101,6 +101,7 @@
     "../../api:array_view",
     "../../rtc_base:checks",
     "../../rtc_base:ip_address",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:socket_address",
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index dd78cac..e38973f 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -28,6 +28,7 @@
 
   deps = [
     "..:array_view",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/system:rtc_export",
     "../units:data_rate",
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index 198c7f4..be0432c 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -191,6 +191,7 @@
     "../../modules/video_coding:video_codec_interface",
     "../../modules/video_coding:video_coding_utility",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/system:rtc_export",
     "../../system_wrappers:field_trial",
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 6ff2975..b6860c5 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -87,6 +87,7 @@
     "../rtc_base",
     "../rtc_base:audio_format_to_string",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rate_limiter",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
diff --git a/audio/utility/BUILD.gn b/audio/utility/BUILD.gn
index 933553d..27b9dba 100644
--- a/audio/utility/BUILD.gn
+++ b/audio/utility/BUILD.gn
@@ -26,6 +26,7 @@
     "../../api/audio:audio_frame_api",
     "../../common_audio",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../system_wrappers:field_trial",
   ]
@@ -44,6 +45,7 @@
       ":audio_frame_operations",
       "../../api/audio:audio_frame_api",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../test:field_trial",
       "../../test:test_support",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 7bbb44d..2270ff2 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -147,6 +147,7 @@
     "../modules/rtp_rtcp",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/containers:flat_map",
     "../rtc_base/containers:flat_set",
@@ -205,6 +206,7 @@
     "../modules/video_coding:video_codec_interface",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rate_limiter",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
@@ -250,6 +252,7 @@
     "../api/units:data_rate",
     "../api/units:time_delta",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:safe_minmax",
     "../rtc_base/system:no_unique_address",
@@ -308,6 +311,7 @@
     "../modules/utility",
     "../modules/video_coding",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rate_limiter",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
@@ -415,6 +419,7 @@
     "../api:transport_api",
     "../modules/utility",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/synchronization:mutex",
     "../system_wrappers",
@@ -544,6 +549,7 @@
         "../modules/rtp_rtcp:rtp_rtcp_format",
         "../rtc_base",
         "../rtc_base:checks",
+        "../rtc_base:logging",
         "../rtc_base:rtc_base_approved",
         "../rtc_base:task_queue_for_test",
         "../rtc_base:threading",
diff --git a/call/adaptation/BUILD.gn b/call/adaptation/BUILD.gn
index 9ce8ccd..bf07c2a 100644
--- a/call/adaptation/BUILD.gn
+++ b/call/adaptation/BUILD.gn
@@ -44,6 +44,7 @@
     "../../api/video_codecs:video_codecs_api",
     "../../modules/video_coding:video_coding_utility",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base/experiments:balanced_degradation_settings",
diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn
index 5b1e581..9fff129 100644
--- a/common_audio/BUILD.gn
+++ b/common_audio/BUILD.gn
@@ -48,6 +48,7 @@
     "../api:array_view",
     "../rtc_base:checks",
     "../rtc_base:gtest_prod",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:sanitizer",
     "../rtc_base/memory:aligned_malloc",
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index 30eddc6..1c9050f 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -58,6 +58,7 @@
     "../rtc_base",
     "../rtc_base:bitstream_reader",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:safe_minmax",
     "../rtc_base/synchronization:mutex",
@@ -114,6 +115,7 @@
       "../api/video_codecs:video_codecs_api",
       "../rtc_base",
       "../rtc_base:checks",
+      "../rtc_base:logging",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
       "../system_wrappers:system_wrappers",
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 0a5ee10..3d1de5d 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -684,6 +684,7 @@
       "../p2p:rtc_p2p",
       "../pc:video_track_source",
       "../rtc_base:checks",
+      "../rtc_base:logging",
       "../rtc_base:net_helpers",
       "../rtc_base:threading",
       "../rtc_base/third_party/sigslot",
@@ -919,6 +920,7 @@
       "../p2p:rtc_p2p",
       "../rtc_base",
       "../rtc_base:checks",
+      "../rtc_base:logging",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:socket_address",
       "../rtc_base:threading",
diff --git a/examples/androidvoip/BUILD.gn b/examples/androidvoip/BUILD.gn
index 66dde94..95b9191 100644
--- a/examples/androidvoip/BUILD.gn
+++ b/examples/androidvoip/BUILD.gn
@@ -56,6 +56,7 @@
 
     deps = [
       ":generated_jni",
+      "../../rtc_base:logging",
       "../../rtc_base:socket_address",
       "../../rtc_base:socket_server",
       "../../rtc_base:threading",
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 1b79931..8347102 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -302,6 +302,7 @@
     "../rtc_base:bitstream_reader",
     "../rtc_base:checks",
     "../rtc_base:ignore_wundef",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
   ]
   absl_deps = [
@@ -365,6 +366,7 @@
       "../api/rtc_event_log",
       "../api/task_queue",
       "../rtc_base:checks",
+      "../rtc_base:logging",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_task_queue",
       "../rtc_base:safe_minmax",
@@ -443,6 +445,7 @@
       "../modules/rtp_rtcp:rtp_rtcp_format",
       "../rtc_base:checks",
       "../rtc_base:ignore_wundef",
+      "../rtc_base:logging",
       "../rtc_base:protobuf_utils",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_numerics",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 060ffeb..878f21f 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -80,6 +80,7 @@
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
@@ -156,6 +157,7 @@
     "../modules/video_coding:video_coding_utility",
     "../rtc_base:atomicops",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/experiments:encoder_info_settings",
     "../rtc_base/experiments:rate_control_settings",
@@ -214,6 +216,7 @@
     "../modules/video_coding/codecs/av1:libaom_av1_decoder",
     "../modules/video_coding/codecs/av1:libaom_av1_encoder_if_supported",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/system:rtc_export",
     "../system_wrappers:field_trial",
@@ -291,6 +294,7 @@
     "../rtc_base:audio_format_to_string",
     "../rtc_base:checks",
     "../rtc_base:ignore_wundef",
+    "../rtc_base:logging",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:stringutils",
     "../rtc_base:threading",
@@ -402,6 +406,7 @@
       "../net/dcsctp/timer:task_queue_timeout",
       "../p2p:rtc_p2p",
       "../rtc_base:checks",
+      "../rtc_base:logging",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:socket",
       "../rtc_base:threading",
@@ -594,6 +599,7 @@
         "../rtc_base",
         "../rtc_base:checks",
         "../rtc_base:gunit_helpers",
+        "../rtc_base:logging",
         "../rtc_base:rtc_base_approved",
         "../rtc_base:rtc_base_tests_utils",
         "../rtc_base:rtc_task_queue",
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 8866b47..42b0d2b 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -51,6 +51,7 @@
     "../../common_audio:common_audio_c",
     "../../rtc_base:audio_format_to_string",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/synchronization:mutex",
     "../../system_wrappers",
@@ -123,6 +124,7 @@
     "../../api/units:time_delta",
     "../../common_audio",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
@@ -209,6 +211,7 @@
     "../../api/units:time_delta",
     "../../common_audio",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
@@ -752,6 +755,7 @@
     "../../api/audio_codecs/opus:audio_encoder_opus_config",
     "../../common_audio",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:protobuf_utils",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
@@ -900,6 +904,7 @@
     "../../logging:rtc_event_audio",
     "../../rtc_base:checks",
     "../../rtc_base:ignore_wundef",
+    "../../rtc_base:logging",
     "../../rtc_base:protobuf_utils",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/system:file_wrapper",
@@ -1008,6 +1013,7 @@
     "../../rtc_base:audio_format_to_string",
     "../../rtc_base:checks",
     "../../rtc_base:gtest_prod",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:safe_minmax",
     "../../rtc_base:sanitizer",
@@ -1393,6 +1399,7 @@
       "../../api/audio_codecs/opus:audio_encoder_opus",
       "../../common_audio",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/synchronization:mutex",
       "../../test:fileutils",
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index d441479..23eeba9 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -71,6 +71,7 @@
     "../../api/task_queue",
     "../../common_audio:common_audio_c",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base/synchronization:mutex",
@@ -87,6 +88,7 @@
   deps = [
     ":audio_device_api",
     ":audio_device_buffer",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
   ]
 }
@@ -110,6 +112,7 @@
       ":audio_device_name",
       "../../api/units:time_delta",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
     ]
 
@@ -146,6 +149,7 @@
       "../../api:scoped_refptr",
       "../../api/task_queue",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
     ]
     absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
@@ -170,6 +174,7 @@
     "../../common_audio:common_audio_c",
     "../../rtc_base",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base/synchronization:mutex",
@@ -389,6 +394,7 @@
       "../../common_audio",
       "../../rtc_base:checks",
       "../../rtc_base:ignore_wundef",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/synchronization:mutex",
       "../../system_wrappers",
diff --git a/modules/audio_mixer/BUILD.gn b/modules/audio_mixer/BUILD.gn
index d51be4a..ed509f2 100644
--- a/modules/audio_mixer/BUILD.gn
+++ b/modules/audio_mixer/BUILD.gn
@@ -46,6 +46,7 @@
     "../../audio/utility:audio_frame_operations",
     "../../common_audio",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:safe_conversions",
     "../../rtc_base/synchronization:mutex",
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 3028b45..2febbc2 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -178,6 +178,7 @@
     "../../rtc_base:checks",
     "../../rtc_base:gtest_prod",
     "../../rtc_base:ignore_wundef",
+    "../../rtc_base:logging",
     "../../rtc_base:refcount",
     "../../rtc_base:safe_minmax",
     "../../rtc_base:sanitizer",
@@ -491,6 +492,7 @@
       "../../api/audio:audio_frame_api",
       "../../common_audio",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:safe_minmax",
       "agc:gain_map",
@@ -530,6 +532,7 @@
         "../../common_audio",
         "../../rtc_base:checks",
         "../../rtc_base:ignore_wundef",
+        "../../rtc_base:logging",
         "../../rtc_base:protobuf_utils",
         "../../rtc_base:rtc_base_approved",
         "../../rtc_base:rtc_json",
diff --git a/modules/audio_processing/aec3/BUILD.gn b/modules/audio_processing/aec3/BUILD.gn
index 2c4d26f..c988dd4 100644
--- a/modules/audio_processing/aec3/BUILD.gn
+++ b/modules/audio_processing/aec3/BUILD.gn
@@ -141,6 +141,7 @@
     "../../../common_audio:common_audio_c",
     "../../../rtc_base:atomicops",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../../../rtc_base:safe_minmax",
     "../../../rtc_base/experiments:field_trial_parser",
diff --git a/modules/audio_processing/aec_dump/BUILD.gn b/modules/audio_processing/aec_dump/BUILD.gn
index 9887f7d..dd4928d 100644
--- a/modules/audio_processing/aec_dump/BUILD.gn
+++ b/modules/audio_processing/aec_dump/BUILD.gn
@@ -70,6 +70,7 @@
       "../../../api/task_queue",
       "../../../rtc_base:checks",
       "../../../rtc_base:ignore_wundef",
+      "../../../rtc_base:logging",
       "../../../rtc_base:protobuf_utils",
       "../../../rtc_base:rtc_base_approved",
       "../../../rtc_base:rtc_task_queue",
diff --git a/modules/audio_processing/agc2/rnn_vad/BUILD.gn b/modules/audio_processing/agc2/rnn_vad/BUILD.gn
index f0d7093..5d9386b 100644
--- a/modules/audio_processing/agc2/rnn_vad/BUILD.gn
+++ b/modules/audio_processing/agc2/rnn_vad/BUILD.gn
@@ -322,6 +322,7 @@
         "..:cpu_features",
         "../../../../api:array_view",
         "../../../../common_audio",
+        "../../../../rtc_base:logging",
         "../../../../rtc_base:rtc_base_approved",
         "../../../../rtc_base:safe_compare",
         "../../../../test:test_support",
diff --git a/modules/audio_processing/test/conversational_speech/BUILD.gn b/modules/audio_processing/test/conversational_speech/BUILD.gn
index 42707af..64e0fcb 100644
--- a/modules/audio_processing/test/conversational_speech/BUILD.gn
+++ b/modules/audio_processing/test/conversational_speech/BUILD.gn
@@ -47,6 +47,7 @@
     "../../../../api:array_view",
     "../../../../common_audio",
     "../../../../rtc_base:checks",
+    "../../../../rtc_base:logging",
     "../../../../rtc_base:rtc_base_approved",
     "../../../../test:fileutils",
   ]
@@ -66,6 +67,7 @@
     ":lib",
     "../../../../api:array_view",
     "../../../../common_audio",
+    "../../../../rtc_base:logging",
     "../../../../rtc_base:rtc_base_approved",
     "../../../../test:fileutils",
     "../../../../test:test_support",
diff --git a/modules/audio_processing/test/py_quality_assessment/BUILD.gn b/modules/audio_processing/test/py_quality_assessment/BUILD.gn
index 9ec86d1..f5678f1 100644
--- a/modules/audio_processing/test/py_quality_assessment/BUILD.gn
+++ b/modules/audio_processing/test/py_quality_assessment/BUILD.gn
@@ -114,6 +114,7 @@
     sources = [ "quality_assessment/vad.cc" ]
     deps = [
       "../../../../common_audio",
+      "../../../../rtc_base:logging",
       "../../../../rtc_base:rtc_base_approved",
       "//third_party/abseil-cpp/absl/flags:flag",
       "//third_party/abseil-cpp/absl/flags:parse",
@@ -126,6 +127,7 @@
     deps = [
       "../..",
       "../../../../common_audio",
+      "../../../../rtc_base:logging",
       "../../../../rtc_base:rtc_base_approved",
       "../../vad",
       "//third_party/abseil-cpp/absl/flags:flag",
@@ -139,6 +141,7 @@
     deps = [
       "../..",
       "../../../../common_audio",
+      "../../../../rtc_base:logging",
       "../../../../rtc_base:rtc_base_approved",
       "//third_party/abseil-cpp/absl/flags:flag",
       "//third_party/abseil-cpp/absl/flags:parse",
diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn
index c0b064d..0495efb 100644
--- a/modules/congestion_controller/BUILD.gn
+++ b/modules/congestion_controller/BUILD.gn
@@ -33,6 +33,7 @@
     "../../api/units:data_rate",
     "../../api/units:time_delta",
     "../../api/units:timestamp",
+    "../../rtc_base:logging",
     "../../rtc_base/synchronization:mutex",
     "../pacing",
     "../remote_bitrate_estimator",
diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn
index 9daedc6..bbe199b 100644
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ b/modules/congestion_controller/goog_cc/BUILD.gn
@@ -236,6 +236,7 @@
     "../../../api/units:timestamp",
     "../../../logging:rtc_event_bwe",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../../../rtc_base/experiments:field_trial_parser",
     "../../../system_wrappers:metrics",
@@ -342,6 +343,7 @@
         "../../../logging:mocks",
         "../../../logging:rtc_event_bwe",
         "../../../rtc_base:checks",
+        "../../../rtc_base:logging",
         "../../../rtc_base:rtc_base_approved",
         "../../../rtc_base:rtc_base_tests_utils",
         "../../../rtc_base:stringutils",
diff --git a/modules/congestion_controller/pcc/BUILD.gn b/modules/congestion_controller/pcc/BUILD.gn
index 38a3b8a..ad7ce2a 100644
--- a/modules/congestion_controller/pcc/BUILD.gn
+++ b/modules/congestion_controller/pcc/BUILD.gn
@@ -52,6 +52,7 @@
     "../../../api/units:data_size",
     "../../../api/units:time_delta",
     "../../../api/units:timestamp",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
   ]
 }
diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn
index 39d4d68..ccd32b9 100644
--- a/modules/congestion_controller/rtp/BUILD.gn
+++ b/modules/congestion_controller/rtp/BUILD.gn
@@ -30,6 +30,7 @@
     "../../../api/units:data_size",
     "../../../api/units:time_delta",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:safe_minmax",
     "../../../rtc_base/system:no_unique_address",
     "../../../system_wrappers:field_trial",
@@ -58,6 +59,7 @@
     "../../../api/units:timestamp",
     "../../../rtc_base",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../../../rtc_base/network:sent_packet",
     "../../../rtc_base/synchronization:mutex",
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index 580a886..2b10279 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -59,6 +59,7 @@
       "../../api:function_view",
       "../../api:scoped_refptr",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
     ]
     if (rtc_desktop_capture_supported) {
       deps += [
@@ -119,6 +120,7 @@
       ":desktop_capture_mock",
       ":primitives",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
 
       # TODO(bugs.webrtc.org/9987): Remove this dep on rtc_base:rtc_base once
       # rtc_base:threading is fully defined.
@@ -177,6 +179,7 @@
       ":primitives",
       "../../api:scoped_refptr",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
     ]
@@ -312,6 +315,7 @@
       "../../api:scoped_refptr",
       "../../rtc_base",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/system:rtc_export",
       "../../sdk:helpers_objc",
@@ -475,6 +479,7 @@
     "../../api:sequence_checker",
     "../../rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base/synchronization:mutex",
     "../../rtc_base/system:arch",
     "../../rtc_base/system:no_unique_address",
diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
index 97b3a7b..ff681fd 100644
--- a/modules/pacing/BUILD.gn
+++ b/modules/pacing/BUILD.gn
@@ -48,6 +48,7 @@
     "../../logging:rtc_event_bwe",
     "../../logging:rtc_event_pacing",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index b49e028..c925bdd 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -55,6 +55,7 @@
     "../../modules/congestion_controller/goog_cc:link_capacity_estimator",
     "../../modules/rtp_rtcp:rtp_rtcp_format",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:safe_minmax",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index e6640fe..97d28c4 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -121,6 +121,7 @@
     "../../rtc_base:bitstream_reader",
     "../../rtc_base:checks",
     "../../rtc_base:divide_round",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../system_wrappers",
     "../video_coding:codec_globals_headers",
@@ -292,6 +293,7 @@
     "../../rtc_base:checks",
     "../../rtc_base:divide_round",
     "../../rtc_base:gtest_prod",
+    "../../rtc_base:logging",
     "../../rtc_base:rate_limiter",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
@@ -342,6 +344,7 @@
     "../../logging:rtc_event_rtp_rtcp",
     "../../rtc_base:checks",
     "../../rtc_base:gtest_prod",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/synchronization:mutex",
     "../../system_wrappers",
@@ -378,6 +381,7 @@
     "../../api/video:video_bitrate_allocation",
     "../../rtc_base:checks",
     "../../rtc_base:divide_round",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/containers:flat_map",
     "../../rtc_base/task_utils:repeating_task",
@@ -607,6 +611,7 @@
       "../../common_video/test:utilities",
       "../../logging:mocks",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rate_limiter",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_base_tests_utils",
diff --git a/modules/utility/BUILD.gn b/modules/utility/BUILD.gn
index aca7b1e..5409214 100644
--- a/modules/utility/BUILD.gn
+++ b/modules/utility/BUILD.gn
@@ -35,6 +35,7 @@
     "../../api/task_queue",
     "../../common_audio",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/system:arch",
     "../../system_wrappers",
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index 75c2648..e9bce23 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -32,6 +32,7 @@
     "../../api/video:video_rtp_headers",
     "../../common_video",
     "../../media:rtc_media_base",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:stringutils",
     "../../rtc_base/synchronization:mutex",
@@ -48,6 +49,7 @@
       ":video_capture_module",
       "../../api:scoped_refptr",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/synchronization:mutex",
       "../../system_wrappers",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index ebc8303..9c55b2f 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -87,6 +87,7 @@
     "../../api/units:time_delta",
     "../../api/units:timestamp",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
@@ -336,6 +337,7 @@
     "../../common_video",
     "../../rtc_base",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
@@ -514,6 +516,7 @@
     "../../modules/rtp_rtcp",
     "../../rtc_base:bitstream_reader",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
@@ -565,6 +568,7 @@
     "../../media:rtc_media_base",
     "../../rtc_base",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base/system:rtc_export",
     "../../system_wrappers:field_trial",
     "../../system_wrappers:metrics",
@@ -611,6 +615,7 @@
     "../../media:rtc_media_base",
     "../../rtc_base",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base/synchronization:mutex",
     "../rtp_rtcp:rtp_rtcp_format",
   ]
@@ -666,6 +671,7 @@
     "../../api/video_codecs:vp8_temporal_layers_factory",
     "../../common_video",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base/experiments:cpu_speed_experiment",
@@ -705,6 +711,7 @@
     "../../api:fec_controller_api",
     "../../api/video_codecs:video_codecs_api",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../system_wrappers:field_trial",
@@ -767,6 +774,7 @@
     "../../media:rtc_media_base",
     "../../rtc_base",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "../../rtc_base/experiments:encoder_info_settings",
     "../../rtc_base/experiments:field_trial_parser",
     "../../rtc_base/experiments:rate_control_settings",
@@ -981,6 +989,7 @@
       "../../media:rtc_internal_video_codecs",
       "../../media:rtc_media_base",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_base_tests_utils",
       "../../rtc_base:task_queue_for_test",
diff --git a/net/dcsctp/fuzzers/BUILD.gn b/net/dcsctp/fuzzers/BUILD.gn
index 13d9b75..e0a16cc 100644
--- a/net/dcsctp/fuzzers/BUILD.gn
+++ b/net/dcsctp/fuzzers/BUILD.gn
@@ -14,6 +14,7 @@
     "../../../api:array_view",
     "../../../api/task_queue:task_queue",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:math",
     "../packet:chunk",
@@ -38,6 +39,7 @@
       "../../../api:array_view",
       "../../../rtc_base:checks",
       "../../../rtc_base:gunit_helpers",
+      "../../../rtc_base:logging",
       "../../../rtc_base:rtc_base_approved",
       "../../../test:test_support",
       "../packet:sctp_packet",
diff --git a/net/dcsctp/packet/BUILD.gn b/net/dcsctp/packet/BUILD.gn
index 7541633..d981c5e 100644
--- a/net/dcsctp/packet/BUILD.gn
+++ b/net/dcsctp/packet/BUILD.gn
@@ -29,6 +29,7 @@
     ":bounded_io",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
   ]
   absl_deps = [
@@ -71,6 +72,7 @@
     ":tlv_trait",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:internal_types",
     "../common:math",
@@ -115,6 +117,7 @@
     ":tlv_trait",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:internal_types",
     "../common:math",
@@ -167,6 +170,7 @@
     ":tlv_trait",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:math",
     "../common:str_join",
@@ -223,6 +227,7 @@
   deps = [
     ":chunk",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
   ]
   sources = [
@@ -238,6 +243,7 @@
     ":crc32c",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:internal_types",
     "../common:math",
diff --git a/net/dcsctp/rx/BUILD.gn b/net/dcsctp/rx/BUILD.gn
index ef13676..1f3aa87 100644
--- a/net/dcsctp/rx/BUILD.gn
+++ b/net/dcsctp/rx/BUILD.gn
@@ -12,6 +12,7 @@
   deps = [
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:sequence_numbers",
     "../packet:chunk",
@@ -48,6 +49,7 @@
     ":reassembly_streams",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:sequence_numbers",
     "../packet:chunk",
@@ -71,6 +73,7 @@
     ":traditional_reassembly_streams",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:internal_types",
     "../common:sequence_numbers",
diff --git a/net/dcsctp/socket/BUILD.gn b/net/dcsctp/socket/BUILD.gn
index c6915f0..b573080 100644
--- a/net/dcsctp/socket/BUILD.gn
+++ b/net/dcsctp/socket/BUILD.gn
@@ -24,6 +24,7 @@
     ":context",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../packet:bounded_io",
     "../packet:chunk",
@@ -49,6 +50,7 @@
     ":context",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../../../rtc_base/containers:flat_set",
     "../common:internal_types",
@@ -98,6 +100,7 @@
     "../../../api:array_view",
     "../../../api/task_queue:task_queue",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:sequence_numbers",
     "../packet:chunk",
@@ -136,6 +139,7 @@
     "../../../api:scoped_refptr",
     "../../../api/task_queue:task_queue",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:internal_types",
     "../packet:bounded_io",
@@ -228,6 +232,7 @@
       "../../../call:simulated_network",
       "../../../rtc_base:checks",
       "../../../rtc_base:gunit_helpers",
+      "../../../rtc_base:logging",
       "../../../rtc_base:rtc_base_approved",
       "../../../rtc_base:rtc_base_tests_utils",
       "../../../rtc_base:socket_address",
diff --git a/net/dcsctp/timer/BUILD.gn b/net/dcsctp/timer/BUILD.gn
index 8579b74..6297bb1 100644
--- a/net/dcsctp/timer/BUILD.gn
+++ b/net/dcsctp/timer/BUILD.gn
@@ -35,6 +35,7 @@
     "../../../api:array_view",
     "../../../api/task_queue:task_queue",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../../../rtc_base/task_utils:pending_task_safety_flag",
     "../../../rtc_base/task_utils:to_queued_task",
diff --git a/net/dcsctp/tx/BUILD.gn b/net/dcsctp/tx/BUILD.gn
index 44dbd0b..7995776 100644
--- a/net/dcsctp/tx/BUILD.gn
+++ b/net/dcsctp/tx/BUILD.gn
@@ -25,6 +25,7 @@
     ":send_queue",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../packet:data",
     "../public:socket",
@@ -45,6 +46,7 @@
 rtc_library("retransmission_error_counter") {
   deps = [
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../public:types",
   ]
@@ -73,6 +75,7 @@
     ":send_queue",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:math",
     "../common:sequence_numbers",
@@ -101,6 +104,7 @@
     ":send_queue",
     "../../../api:array_view",
     "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../common:math",
     "../common:sequence_numbers",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index f5e05c1..384e9e0 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -105,6 +105,7 @@
     "../rtc_base:callback_list",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
+    "../rtc_base:logging",
     "../rtc_base:net_helpers",
     "../rtc_base:network_constants",
     "../rtc_base:rtc_numerics",
@@ -250,6 +251,7 @@
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
+      "../rtc_base:logging",
       "../rtc_base:net_helpers",
       "../rtc_base:network_constants",
       "../rtc_base:rtc_base_approved",
@@ -290,6 +292,7 @@
     "../api/transport:stun_types",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_tests_utils",
     "../rtc_base:socket_address",
     "../rtc_base:threading",
@@ -318,6 +321,7 @@
     "../rtc_base:async_resolver_interface",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
+    "../rtc_base:logging",
     "../rtc_base:socket_address",
     "../rtc_base:threading",
     "../rtc_base/system:rtc_export",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 964c51e..14990ce 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -186,7 +186,10 @@
     "external_hmac.cc",
     "external_hmac.h",
   ]
-  deps = [ "../rtc_base:rtc_base_approved" ]
+  deps = [
+    "../rtc_base:logging",
+    "../rtc_base:rtc_base_approved",
+  ]
   if (rtc_build_libsrtp) {
     deps += [ "//third_party/libsrtp" ]
   }
@@ -336,6 +339,7 @@
     "../p2p:rtc_p2p",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base/third_party/base64",
   ]
   absl_deps = [
@@ -499,6 +503,7 @@
     "../p2p:rtc_p2p",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:threading",
@@ -521,6 +526,7 @@
     "../api:priority",
     "../api/transport:datagram_transport_interface",
     "../media:rtc_media_base",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
@@ -592,6 +598,7 @@
     "../p2p:rtc_p2p",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/third_party/base64",
     "../rtc_base/third_party/sigslot",
@@ -1590,6 +1597,7 @@
     "../media:rtc_media_base",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:threading",
     "../rtc_base:weak_ptr",
     "../rtc_base/third_party/sigslot",
@@ -1714,6 +1722,7 @@
     "../media:rtc_media_base",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:threading",
     "../rtc_base/system:no_unique_address",
@@ -1855,6 +1864,7 @@
     "../api/crypto:frame_encryptor_interface",
     "../media:rtc_media_base",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base",
     "../rtc_base:threading",
     "../rtc_base/synchronization:mutex",
@@ -1881,6 +1891,7 @@
     "../api:rtp_parameters",
     "../media:rtc_media_base",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base",
   ]
   absl_deps = [
@@ -1901,6 +1912,7 @@
     "../api:libjingle_peerconnection_api",
     "../api:scoped_refptr",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base",
     "../rtc_base:threading",
     "../rtc_base/task_utils:pending_task_safety_flag",
@@ -2059,6 +2071,7 @@
       "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
+      "../rtc_base:logging",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:socket_address",
@@ -2148,6 +2161,7 @@
       "../api:scoped_refptr",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
+      "../rtc_base:logging",
       "../rtc_base:rtc_base_approved",
       "../test:test_support",
     ]
@@ -2307,6 +2321,7 @@
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
+      "../rtc_base:logging",
       "../rtc_base:network_constants",
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:rtc_json",
@@ -2486,6 +2501,7 @@
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
+      "../rtc_base:logging",
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:rtc_json",
       "../rtc_base:socket_address",
@@ -2584,6 +2600,7 @@
       "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
+      "../rtc_base:logging",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_task_queue",
       "../rtc_base:task_queue_for_test",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index a1fa72a..84a919d 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -82,6 +82,7 @@
   deps = [
     ":atomicops",
     ":checks",
+    ":logging",
     ":rtc_task_queue",
     ":safe_compare",
     ":type_traits",
@@ -173,7 +174,6 @@
   }
 
   public_deps += [  # no-presubmit-check TODO(webrtc:8603)
-    ":logging",
     ":macromagic",
     ":platform_thread",
     ":platform_thread_types",
@@ -908,6 +908,7 @@
 
     deps = [
       ":checks",
+      ":logging",
       ":macromagic",
       ":rtc_base_approved",
     ]
@@ -933,6 +934,7 @@
     ":async_socket",
     ":checks",
     ":ip_address",
+    ":logging",
     ":network_constants",
     ":null_socket_server",
     ":rtc_task_queue",
@@ -1225,6 +1227,7 @@
     ":async_socket",
     ":checks",
     ":ip_address",
+    ":logging",
     ":rtc_base",
     ":socket",
     ":socket_address",
@@ -1321,6 +1324,7 @@
         ":checks",
         ":gunit_helpers",
         ":ip_address",
+        ":logging",
         ":net_helpers",
         ":null_socket_server",
         ":rtc_base",
@@ -1401,6 +1405,7 @@
         ":divide_round",
         ":gunit_helpers",
         ":ip_address",
+        ":logging",
         ":null_socket_server",
         ":rate_limiter",
         ":rtc_base",
@@ -1537,6 +1542,7 @@
         ":checks",
         ":gunit_helpers",
         ":ip_address",
+        ":logging",
         ":net_helpers",
         ":null_socket_server",
         ":rtc_base_tests_utils",
diff --git a/rtc_base/experiments/BUILD.gn b/rtc_base/experiments/BUILD.gn
index 2836352..281767b 100644
--- a/rtc_base/experiments/BUILD.gn
+++ b/rtc_base/experiments/BUILD.gn
@@ -14,6 +14,7 @@
     "alr_experiment.h",
   ]
   deps = [
+    "..:logging",
     "../:rtc_base_approved",
     "../../api:field_trials_view",
     "../../api/transport:field_trial_based_config",
@@ -55,6 +56,7 @@
   ]
   deps = [
     ":field_trial_parser",
+    "..:logging",
     "../:rtc_base_approved",
     "../../api:field_trials_view",
     "../../api/transport:field_trial_based_config",
@@ -70,6 +72,7 @@
   ]
   deps = [
     ":field_trial_parser",
+    "..:logging",
     "../:rtc_base_approved",
     "../../api:field_trials_view",
     "../../api/transport:field_trial_based_config",
@@ -85,6 +88,7 @@
   ]
   deps = [
     ":field_trial_parser",
+    "..:logging",
     "../:rtc_base_approved",
     "../../api:field_trials_view",
     "../../api/transport:field_trial_based_config",
@@ -99,6 +103,7 @@
     "quality_scaling_experiment.h",
   ]
   deps = [
+    "..:logging",
     "../:rtc_base_approved",
     "../../api/video_codecs:video_codecs_api",
     "../../system_wrappers:field_trial",
@@ -112,6 +117,7 @@
     "normalize_simulcast_size_experiment.h",
   ]
   deps = [
+    "..:logging",
     "../:rtc_base_approved",
     "../../system_wrappers:field_trial",
   ]
@@ -125,6 +131,7 @@
   ]
   deps = [
     ":field_trial_parser",
+    "..:logging",
     "../:rtc_base_approved",
     "../../api:field_trials_view",
     "../../api/video_codecs:video_codecs_api",
@@ -140,6 +147,7 @@
   ]
   deps = [
     ":field_trial_parser",
+    "..:logging",
     "../:rtc_base_approved",
     "../../system_wrappers:field_trial",
   ]
@@ -153,6 +161,7 @@
   ]
   deps = [
     ":field_trial_parser",
+    "..:logging",
     "../:rtc_base_approved",
     "../../api/video_codecs:video_codecs_api",
     "../../system_wrappers:field_trial",
@@ -169,6 +178,7 @@
     "rtt_mult_experiment.h",
   ]
   deps = [
+    "..:logging",
     "../:rtc_base_approved",
     "../../system_wrappers:field_trial",
   ]
@@ -181,6 +191,7 @@
     "jitter_upper_bound_experiment.h",
   ]
   deps = [
+    "..:logging",
     "../:rtc_base_approved",
     "../../system_wrappers:field_trial",
   ]
@@ -194,6 +205,7 @@
   ]
   deps = [
     ":field_trial_parser",
+    "..:logging",
     "../:rtc_base_approved",
     "../../api:field_trials_view",
     "../../api/transport:field_trial_based_config",
diff --git a/rtc_base/task_utils/BUILD.gn b/rtc_base/task_utils/BUILD.gn
index 8767e9e..d22c3f20 100644
--- a/rtc_base/task_utils/BUILD.gn
+++ b/rtc_base/task_utils/BUILD.gn
@@ -56,6 +56,7 @@
     deps = [
       ":pending_task_safety_flag",
       ":to_queued_task",
+      "..:logging",
       "..:rtc_base_approved",
       "..:rtc_task_queue",
       "..:task_queue_for_test",
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index fa17013..86396e2 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -62,6 +62,7 @@
     "../api/video:video_frame",
     "../api/video:video_rtp_headers",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
   ]
   absl_deps = [
@@ -80,6 +81,7 @@
     "../api:scoped_refptr",
     "../api/video:video_frame",
     "../api/video:video_rtp_headers",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
   ]
   absl_deps = [
@@ -110,6 +112,7 @@
     "../api/video:video_rtp_headers",
     "../common_video",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../test:perf_test",
     "//third_party/libyuv",
@@ -376,6 +379,7 @@
         "../api:function_view",
         "../api:network_state_predictor_api",
         "../rtc_base:ignore_wundef",
+        "../rtc_base:logging",
 
         # TODO(kwiberg): Remove this dependency.
         "../api/audio_codecs:audio_codecs_api",
@@ -471,6 +475,7 @@
           "../modules/audio_coding:neteq",
           "../modules/rtp_rtcp:rtp_rtcp_format",
           "../rtc_base:checks",
+          "../rtc_base:logging",
           "../rtc_base:protobuf_utils",
           "../rtc_base:rtc_base_approved",
           "../system_wrappers:field_trial",
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index b19cb09..371bfde 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -124,6 +124,7 @@
     deps = [
       "../rtc_base",
       "../rtc_base:checks",
+      "../rtc_base:logging",
     ]
     configs += [
       "..:common_objc",
@@ -232,6 +233,7 @@
           "../modules/audio_device:audio_device_api",
           "../modules/audio_device:audio_device_generic",
           "../rtc_base:checks",
+          "../rtc_base:logging",
           "../rtc_base:rtc_base_approved",
           "../system_wrappers",
         ]
@@ -275,6 +277,7 @@
           "../rtc_base",
           "../rtc_base:atomicops",
           "../rtc_base:checks",
+          "../rtc_base:logging",
           "../rtc_base:threading",
           "../system_wrappers:field_trial",
           "../system_wrappers:metrics",
@@ -429,6 +432,7 @@
       ]
       deps = [
         ":base_objc",
+        "../rtc_base:logging",
         "//api/video:video_frame",
         "//api/video:video_rtp_headers",
         "//common_video",
@@ -494,6 +498,7 @@
         "../media:rtc_media_base",
         "../rtc_base",
         "../rtc_base:checks",
+        "../rtc_base:logging",
       ]
       absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 
@@ -1023,6 +1028,7 @@
         "../pc:peerconnection",
         "../rtc_base",
         "../rtc_base:checks",
+        "../rtc_base:logging",
         "../rtc_base:network_constants",
         "../system_wrappers:field_trial",
         "../system_wrappers:metrics",
@@ -1565,6 +1571,7 @@
         "../api/video_codecs:video_codecs_api",
         "../common_video",
         "../rtc_base",
+        "../rtc_base:logging",
         "../rtc_base:threading",
       ]
       if (is_ios) {
@@ -1588,6 +1595,7 @@
           "../api:field_trials_view",
           "../api:sequence_checker",
           "../rtc_base",
+          "../rtc_base:logging",
           "../rtc_base:threading",
           "../rtc_base/task_utils:pending_task_safety_flag",
           "../rtc_base/task_utils:to_queued_task",
@@ -1634,6 +1642,7 @@
         "../modules/video_coding:video_codec_interface",
         "../rtc_base",
         "../rtc_base:checks",
+        "../rtc_base:logging",
       ]
     }
 
@@ -1652,6 +1661,7 @@
         "../common_video",
         "../modules/video_coding:webrtc_h264",
         "../rtc_base:checks",
+        "../rtc_base:logging",
         "../rtc_base:rtc_base_approved",
       ]
     }
@@ -1690,6 +1700,7 @@
         "../common_video",
         "../modules/video_coding:video_codec_interface",
         "../rtc_base:checks",
+        "../rtc_base:logging",
         "../rtc_base:rtc_base_approved",
         "//third_party/libyuv",
       ]
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 89d2ea4..2f401dd 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -586,6 +586,7 @@
       "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:ip_address",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:threading",
       "../../rtc_base/task_utils:pending_task_safety_flag",
@@ -689,6 +690,7 @@
       "../../modules/video_coding/svc:scalable_video_controller",
       "../../rtc_base",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_task_queue",
       "../../rtc_base:threading",
       "../../rtc_base/synchronization:mutex",
@@ -793,6 +795,7 @@
       "../../pc:webrtc_sdp",
       "../../rtc_base",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_task_queue",
       "../../rtc_base:threading",
@@ -979,6 +982,7 @@
       "../../api:scoped_refptr",
       "../../modules/audio_device",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
       "../../system_wrappers:metrics",
@@ -1140,6 +1144,7 @@
       ":generated_logging_jni",
       ":native_api_jni",
       "../../rtc_base",
+      "../../rtc_base:logging",
     ]
 
     absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
@@ -1163,6 +1168,7 @@
       "../../modules/audio_device:audio_device_api",
       "../../modules/audio_device:audio_device_buffer",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers:metrics",
     ]
@@ -1185,6 +1191,7 @@
       "../../modules/audio_device",
       "../../modules/audio_device:audio_device_buffer",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers:field_trial",
       "../../system_wrappers:metrics",
@@ -1240,6 +1247,7 @@
       "../../modules/audio_device",
       "../../modules/audio_device:audio_device_buffer",
       "../../rtc_base:checks",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
     ]
     absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
@@ -1561,6 +1569,7 @@
       ":native_api_jni",
       ":videoframe_jni",
       "../../api/video:video_frame",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
     ]
   }
@@ -1616,6 +1625,7 @@
       "../../pc:libjingle_peerconnection",
       "../../rtc_base:checks",
       "../../rtc_base:ip_address",
+      "../../rtc_base:logging",
       "../../rtc_base:rtc_base",
       "../../rtc_base:threading",
       "../../rtc_base/synchronization:mutex",
diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn
index 1f66b63..dd0b860 100644
--- a/system_wrappers/BUILD.gn
+++ b/system_wrappers/BUILD.gn
@@ -36,6 +36,7 @@
     "../api/units:timestamp",
     "../modules:module_api_public",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base/synchronization:mutex",
     "../rtc_base/system:arch",
     "../rtc_base/system:rtc_export",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 6b9524e..ae0e226 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -68,6 +68,7 @@
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:criticalsection",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_event",
     "../rtc_base/synchronization:mutex",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 60aa5d6..47cda45 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -13,6 +13,7 @@
 rtc_library("webrtc_fuzzer_main") {
   sources = [ "webrtc_fuzzer_main.cc" ]
   deps = [
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "//testing/libfuzzer:libfuzzer_main",
   ]
@@ -659,6 +660,7 @@
     "../../net/dcsctp/public:socket",
     "../../net/dcsctp/public:types",
     "../../net/dcsctp/socket:dcsctp_socket",
+    "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
   ]
 }
diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn
index 30cfb18..25ace38 100644
--- a/test/network/BUILD.gn
+++ b/test/network/BUILD.gn
@@ -58,6 +58,7 @@
     "../../p2p:rtc_p2p",
     "../../rtc_base",
     "../../rtc_base:ip_address",
+    "../../rtc_base:logging",
     "../../rtc_base:network_constants",
     "../../rtc_base:rtc_base_tests_utils",
     "../../rtc_base:rtc_task_queue",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 32a4ff9..71c3dac 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -111,6 +111,7 @@
     "../modules/video_processing",
     "../rtc_base:atomicops",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rate_limiter",
     "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
@@ -200,6 +201,7 @@
     "../modules/video_coding:video_coding_utility",
     "../modules/video_coding/deprecated:nack_module",
     "../rtc_base:checks",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_numerics",
     "../rtc_base:rtc_task_queue",
@@ -241,6 +243,7 @@
     "../api/video_codecs:video_codecs_api",
     "../modules/video_coding",
     "../modules/video_coding:timing",
+    "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
     "../rtc_base/memory:always_valid_pointer",
@@ -884,6 +887,7 @@
       "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
+      "../rtc_base:logging",
       "../rtc_base:rate_limiter",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
@@ -950,6 +954,7 @@
       "../modules/utility",
       "../modules/video_coding",
       "../modules/video_coding:video_codec_interface",
+      "../rtc_base:logging",
       "../rtc_base:rtc_base_approved",
       "../rtc_base/task_utils:to_queued_task",
       "../system_wrappers",