Revert of Remove remains of webrtc/base (patchset #7 id:120001 of https://codereview.webrtc.org/297…

webrtc/modules/audio_coding/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../../webrtc.gni")
 import("audio_coding.gni")
@@ skipping 29 matching lines @@
                     ]
 
 rtc_static_library("audio_format_conversion") {
   sources = [
     "codecs/audio_format_conversion.cc",
     "codecs/audio_format_conversion.h",
   ]
   deps = [
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
   ]
 }
 
 rtc_static_library("builtin_audio_decoder_factory_internal") {
   sources = [
     "codecs/builtin_audio_decoder_factory_internal.cc",
     "codecs/builtin_audio_decoder_factory_internal.h",
   ]
   deps = [
            "../..:webrtc_common",
-           "../../rtc_base:protobuf_utils",
-           "../../rtc_base:rtc_base_approved",
+           "../../base:protobuf_utils",
+           "../../base:rtc_base_approved",
            "../../api/audio_codecs:audio_codecs_api",
          ] + audio_codec_deps
   defines = audio_codec_defines
 }
 
 rtc_static_library("builtin_audio_encoder_factory_internal") {
   sources = [
     "codecs/builtin_audio_encoder_factory_internal.cc",
     "codecs/builtin_audio_encoder_factory_internal.h",
   ]
   deps = [
            "../..:webrtc_common",
-           "../../rtc_base:protobuf_utils",
-           "../../rtc_base:rtc_base_approved",
+           "../../base:protobuf_utils",
+           "../../base:rtc_base_approved",
            "../../api/audio_codecs:audio_codecs_api",
          ] + audio_codec_deps
   defines = audio_codec_defines
 }
 
 rtc_static_library("rent_a_codec") {
   sources = [
     "acm2/acm_codec_database.cc",
     "acm2/acm_codec_database.h",
     "acm2/rent_a_codec.cc",
     "acm2/rent_a_codec.h",
   ]
   deps = [
            "../../api/audio_codecs:audio_codecs_api",
            "../..:webrtc_common",
-           "../../rtc_base:protobuf_utils",
-           "../../rtc_base:rtc_base_approved",
+           "../../base:protobuf_utils",
+           "../../base:rtc_base_approved",
            "../../system_wrappers",
            ":audio_coding_module_typedefs",
            ":isac_common",
            ":isac_fix_c",
            ":neteq_decoder_enum",
          ] + audio_codec_deps
 
   defines = audio_codec_defines
 }
 
@@ skipping 45 matching lines @@
     ]
   }
 
   deps = audio_coding_deps + [
            "..:module_api",
            "../../api/audio_codecs:audio_codecs_api",
            "../../api/audio_codecs:builtin_audio_decoder_factory",
            ":audio_coding_module_typedefs",
            ":neteq",
            ":rent_a_codec",
-           "../../rtc_base:rtc_base_approved",
+           "../../base:rtc_base_approved",
            "../../logging:rtc_event_log_api",
          ]
   defines = audio_coding_defines
 }
 
 rtc_static_library("legacy_encoded_audio_frame") {
   sources = [
     "codecs/legacy_encoded_audio_frame.cc",
     "codecs/legacy_encoded_audio_frame.h",
   ]
   deps = [
     "../../api/audio_codecs:audio_codecs_api",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
   ]
 }
 
 config("cng_config") {
   include_dirs = [
     "../../..",
     "codecs/cng/include",
   ]
 }
 
 rtc_static_library("cng") {
   sources = [
     "codecs/cng/audio_encoder_cng.cc",
     "codecs/cng/audio_encoder_cng.h",
     "codecs/cng/webrtc_cng.cc",
     "codecs/cng/webrtc_cng.h",
   ]
 
   public_configs = [ ":cng_config" ]
 
   deps = [
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
+    "../../base:rtc_base_approved",
     "../../common_audio",
-    "../../rtc_base:rtc_base_approved",
   ]
 }
 
 config("red_config") {
   include_dirs = [ "codecs/red" ]
 }
 
 rtc_static_library("red") {
   sources = [
     "codecs/red/audio_encoder_copy_red.cc",
     "codecs/red/audio_encoder_copy_red.h",
   ]
 
   public_configs = [ ":red_config" ]
 
   deps = [
     "../../api/audio_codecs:audio_codecs_api",
+    "../../base:rtc_base_approved",
     "../../common_audio",
-    "../../rtc_base:rtc_base_approved",
   ]
 }
 
 config("g711_config") {
   include_dirs = [
     "../../..",
     "codecs/g711/include",
   ]
 }
 
 rtc_static_library("g711") {
   sources = [
     "codecs/g711/audio_decoder_pcm.cc",
     "codecs/g711/audio_decoder_pcm.h",
     "codecs/g711/audio_encoder_pcm.cc",
     "codecs/g711/audio_encoder_pcm.h",
   ]
 
   public_configs = [ ":g711_config" ]
 
   deps = [
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
   ]
   public_deps = [
     ":g711_c",
   ]
 }
 
 rtc_source_set("g711_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
     "codecs/g711/g711.c",
@@ skipping 21 matching lines @@
     "codecs/g722/audio_encoder_g722.h",
   ]
 
   public_configs = [ ":g722_config" ]
 
   deps = [
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/audio_codecs/g722:audio_encoder_g722_config",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
   ]
   public_deps = [
     ":g722_c",
   ]
 }
 
 rtc_source_set("g722_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
     "codecs/g722/g722_decode.c",
@@ skipping 22 matching lines @@
     "codecs/ilbc/audio_encoder_ilbc.h",
   ]
 
   public_configs = [ ":ilbc_config" ]
 
   deps = [
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/audio_codecs/ilbc:audio_encoder_ilbc_config",
+    "../../base:rtc_base_approved",
     "../../common_audio",
-    "../../rtc_base:rtc_base_approved",
   ]
   public_deps = [
     ":ilbc_c",
   ]
 }
 
 rtc_source_set("ilbc_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
     "codecs/ilbc/abs_quant.c",
@@ skipping 135 matching lines @@
     "codecs/ilbc/window32_w32.h",
     "codecs/ilbc/xcorr_coef.c",
     "codecs/ilbc/xcorr_coef.h",
   ]
 
   public_configs = [ ":ilbc_config" ]
 
   deps = [
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
+    "../../base:rtc_base_approved",
     "../../common_audio",
-    "../../rtc_base:rtc_base_approved",
   ]
 }
 
 rtc_static_library("isac_common") {
   sources = [
     "codecs/isac/audio_encoder_isac_t.h",
     "codecs/isac/audio_encoder_isac_t_impl.h",
     "codecs/isac/locked_bandwidth_info.cc",
     "codecs/isac/locked_bandwidth_info.h",
   ]
   deps = [
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
   ]
 }
 
 config("isac_config") {
   include_dirs = [
     "../../..",
     "codecs/isac/main/include",
   ]
 }
 
@@ skipping 71 matching lines @@
 
   if (is_linux) {
     libs = [ "m" ]
   }
 
   public_configs = [ ":isac_config" ]
 
   deps = [
     ":isac_common",
     "../..:webrtc_common",
+    "../../base:compile_assert_c",
+    "../../base:rtc_base_approved",
     "../../common_audio",
-    "../../rtc_base:compile_assert_c",
-    "../../rtc_base:rtc_base_approved",
   ]
 }
 
 config("isac_fix_config") {
   include_dirs = [
     "../../..",
     "codecs/isac/fix/include",
   ]
 }
 
@@ skipping 87 matching lines @@
     "codecs/isac/fix/source/transform.c",
     "codecs/isac/fix/source/transform_tables.c",
   ]
 
   public_configs = [ ":isac_fix_config" ]
 
   deps = [
     ":isac_common",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
+    "../../base:compile_assert_c",
+    "../../base:rtc_base_approved",
     "../../common_audio",
-    "../../rtc_base:compile_assert_c",
-    "../../rtc_base:rtc_base_approved",
     "../../system_wrappers",
   ]
 
   public_deps = [
     ":isac_fix_common",
   ]
 
   if (rtc_build_with_neon) {
     deps += [ ":isac_neon" ]
   }
@@ skipping 53 matching lines @@
     # TODO(fdegans): Enable this. See crbug.com/408997.
     if (rtc_use_lto) {
       cflags -= [
         "-flto",
         "-ffat-lto-objects",
       ]
     }
 
     deps = [
       ":isac_fix_common",
+      "../../base:rtc_base_approved",
       "../../common_audio",
-      "../../rtc_base:rtc_base_approved",
     ]
   }
 }
 
 config("pcm16b_config") {
   include_dirs = [
     "../../..",
     "codecs/pcm16b/include",
   ]
 }
 
 rtc_static_library("pcm16b") {
   sources = [
     "codecs/pcm16b/audio_decoder_pcm16b.cc",
     "codecs/pcm16b/audio_decoder_pcm16b.h",
     "codecs/pcm16b/audio_encoder_pcm16b.cc",
     "codecs/pcm16b/audio_encoder_pcm16b.h",
   ]
 
   deps = [
     ":g711",
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
   ]
   public_deps = [
     ":pcm16b_c",
   ]
   public_configs = [ ":pcm16b_config" ]
 }
 
 rtc_source_set("pcm16b_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
@@ skipping 17 matching lines @@
     "codecs/opus/audio_decoder_opus.h",
     "codecs/opus/audio_encoder_opus.cc",
     "codecs/opus/audio_encoder_opus.h",
   ]
 
   deps = [
     ":audio_network_adaptor",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/audio_codecs/opus:audio_encoder_opus_config",
+    "../../base:protobuf_utils",
+    "../../base:rtc_base_approved",
+    "../../base:rtc_numerics",
     "../../common_audio",
-    "../../rtc_base:protobuf_utils",
-    "../../rtc_base:rtc_base_approved",
-    "../../rtc_base:rtc_numerics",
     "../../system_wrappers",
   ]
   public_deps = [
     ":webrtc_opus_c",
   ]
 
   defines = audio_codec_defines
 
   if (rtc_build_opus) {
     public_deps += [ rtc_opus_dir ]
@@ skipping 15 matching lines @@
   if (rtc_build_opus) {
     public_deps = [
       rtc_opus_dir,
     ]
   } else if (build_with_mozilla) {
     include_dirs = [ getenv("DIST") + "/include/opus" ]
   }
 
   deps = [
     "../..:webrtc_common",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
   ]
 }
 
 if (rtc_enable_protobuf) {
   proto_library("ana_debug_dump_proto") {
     sources = [
       "audio_network_adaptor/debug_dump.proto",
     ]
     proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor"
   }
@@ skipping 29 matching lines @@
     "audio_network_adaptor/fec_controller_rplr_based.cc",
     "audio_network_adaptor/fec_controller_rplr_based.h",
     "audio_network_adaptor/frame_length_controller.cc",
     "audio_network_adaptor/frame_length_controller.h",
     "audio_network_adaptor/include/audio_network_adaptor.h",
     "audio_network_adaptor/util/threshold_curve.h",
   ]
 
   deps = [
     "../..:webrtc_common",
+    "../../base:protobuf_utils",
+    "../../base:rtc_base_approved",
     "../../common_audio",
     "../../logging:rtc_event_log_api",
-    "../../rtc_base:protobuf_utils",
-    "../../rtc_base:rtc_base_approved",
     "../../system_wrappers",
   ]
 
   if (rtc_enable_protobuf) {
     deps += [
       ":ana_config_proto",
       ":ana_debug_dump_proto",
     ]
   }
 
   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" ]
   }
 }
 
 rtc_source_set("neteq_decoder_enum") {
   sources = [
     "neteq/neteq_decoder_enum.cc",
     "neteq/neteq_decoder_enum.h",
   ]
   deps = [
     "../../api/audio_codecs:audio_codecs_api",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
   ]
 }
 
 rtc_static_library("neteq") {
   sources = [
     "neteq/accelerate.cc",
     "neteq/accelerate.h",
     "neteq/audio_decoder_impl.cc",
     "neteq/audio_decoder_impl.h",
     "neteq/audio_multi_vector.cc",
@@ skipping 68 matching lines @@
   deps = [
     ":audio_coding_module_typedefs",
     ":cng",
     ":g711",
     ":isac_fix",
     ":neteq_decoder_enum",
     ":pcm16b",
     "..:module_api",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
+    "../../base:gtest_prod",
+    "../../base:rtc_base_approved",
     "../../common_audio",
-    "../../rtc_base:gtest_prod",
-    "../../rtc_base:rtc_base_approved",
     "../../system_wrappers",
   ]
 
   defines = []
 
   if (rtc_include_ilbc) {
     defines += [ "WEBRTC_CODEC_ILBC" ]
     deps += [ ":ilbc" ]
   }
   if (rtc_include_opus) {
@@ skipping 37 matching lines @@
     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 
   deps = [
     ":neteq",
     "..:module_api",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/audio_codecs:builtin_audio_decoder_factory",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
     "../rtp_rtcp",
   ]
 }
 
 rtc_source_set("neteq_test_tools") {
   testonly = true
   sources = [
     "neteq/tools/audio_checksum.h",
     "neteq/tools/audio_loop.cc",
     "neteq/tools/audio_loop.h",
@@ skipping 11 matching lines @@
 
   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 = [
     ":pcm16b",
     "..:module_api",
     "../..:webrtc_common",
+    "../../base:rtc_base_approved",
+    "../../base:rtc_base_tests_utils",
     "../../common_audio",
-    "../../rtc_base:rtc_base_approved",
-    "../../rtc_base:rtc_base_tests_utils",
     "../../test:rtp_test_utils",
     "../rtp_rtcp",
   ]
 
   public_deps = [
     ":neteq_tools",
     ":neteq_tools_minimal",
   ]
 
   if (rtc_enable_protobuf) {
@@ skipping 26 matching lines @@
   public_configs = [ ":neteq_tools_config" ]
 
   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",
     "../../api/audio_codecs:audio_codecs_api",
+    "../../base:rtc_base_approved",
     "../../common_audio",
-    "../../rtc_base:rtc_base_approved",
     "../rtp_rtcp",
   ]
 
   public_deps = [
     ":neteq_tools_minimal",
   ]
 }
 
 if (rtc_enable_protobuf) {
   rtc_static_library("rtc_event_log_source") {
     testonly = true
 
     # TODO(kjellander): Remove (bugs.webrtc.org/6828)
     # Needs call.h to be moved to webrtc/api first.
     check_includes = false
 
     sources = [
       "neteq/tools/rtc_event_log_source.cc",
       "neteq/tools/rtc_event_log_source.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 = [
+      "../../base:rtc_base_approved",
       "../../logging:rtc_event_log_parser",
-      "../../rtc_base:rtc_base_approved",
     ]
     public_deps = [
       "../../logging:rtc_event_log_proto",
     ]
   }
 }
 
 if (rtc_include_tests) {
   group("audio_coding_tests") {
     testonly = true
@@ skipping 73 matching lines @@
       "test/utility.h",
     ]
     deps = [
       ":audio_coding",
       ":audio_coding_module_typedefs",
       ":audio_format_conversion",
       ":pcm16b_c",
       "..:module_api",
       "../..:webrtc_common",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers",
       "../../test:test_support",
     ]
     defines = audio_coding_defines
     if (is_win) {
       cflags = [
         # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
         "/wd4373",  # virtual function override.
       ]
     }
@@ skipping 14 matching lines @@
     }
     sources = [
       "codecs/opus/opus_complexity_unittest.cc",
       "neteq/test/neteq_performance_unittest.cc",
     ]
     deps = [
       ":neteq_test_support",
       ":neteq_test_tools",
       ":webrtc_opus",
       "../..:webrtc_common",
-      "../../rtc_base:protobuf_utils",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:protobuf_utils",
+      "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers",
       "../../test:test_support",
     ]
 
     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" ]
     }
   }
 
   rtc_source_set("acm_receive_test") {
     testonly = true
     sources = [
       "acm2/acm_receive_test.cc",
       "acm2/acm_receive_test.h",
     ]
 
     defines = audio_coding_defines
 
     deps = audio_coding_deps + [
              ":audio_coding",
              ":audio_format_conversion",
              "../../api/audio_codecs:audio_codecs_api",
              "../../api/audio_codecs:builtin_audio_decoder_factory",
              ":neteq_tools",
-             "../../rtc_base:rtc_base_approved",
+             "../../base:rtc_base_approved",
              "../../test:test_support",
              "//testing/gtest",
            ]
   }
 
   rtc_source_set("acm_send_test") {
     testonly = true
     sources = [
       "acm2/acm_send_test.cc",
       "acm2/acm_send_test.h",
     ]
 
     defines = audio_coding_defines
 
     deps = audio_coding_deps + [
              ":audio_coding",
              ":neteq_tools",
              "../../api/audio_codecs:audio_codecs_api",
-             "../../rtc_base:rtc_base_approved",
+             "../../base:rtc_base_approved",
              "../../test:test_support",
              "//testing/gtest",
            ]
   }
 
   rtc_executable("delay_test") {
     testonly = true
     sources = [
       "test/Channel.cc",
       "test/Channel.h",
       "test/PCMFile.cc",
       "test/PCMFile.h",
       "test/delay_test.cc",
       "test/utility.cc",
       "test/utility.h",
     ]
 
     deps = [
       ":audio_coding",
       ":audio_coding_module_typedefs",
       ":audio_format_conversion",
       "..:module_api",
       "../../:webrtc_common",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../system_wrappers",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_support",
       "../rtp_rtcp",
       "//testing/gtest",
       "//third_party/gflags:gflags",
     ]
   }  # delay_test
 
   rtc_executable("insert_packet_with_timing") {
     testonly = true
     sources = [
       "test/Channel.cc",
       "test/Channel.h",
       "test/PCMFile.cc",
       "test/PCMFile.h",
       "test/insert_packet_with_timing.cc",
     ]
 
     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 = [
       ":audio_coding",
       ":audio_format_conversion",
       "..:module_api",
       "../../:webrtc_common",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../system_wrappers",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_support",
       "../rtp_rtcp",
       "//testing/gtest",
       "//third_party/gflags:gflags",
     ]
   }  # insert_packet_with_timing
 
   audio_decoder_unittests_resources =
@@ skipping 26 matching lines @@
 
     deps += audio_coding_deps
     deps += [
       ":ilbc",
       ":isac",
       ":isac_fix",
       ":neteq",
       ":neteq_tools",
       "../../api/audio_codecs:audio_codecs_api",
       "../../api/audio_codecs/opus:audio_encoder_opus",
+      "../../base:protobuf_utils",
       "../../common_audio",
-      "../../rtc_base:protobuf_utils",
       "../../test:test_main",
       "//testing/gtest",
     ]
 
     data = audio_decoder_unittests_resources
 
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_native_code" ]
       shard_timeout = 900
     }
@@ skipping 29 matching lines @@
         cflags = [
           # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
           "/wd4373",  # virtual function override.
         ]
       }
 
       deps += [
         ":neteq",
         ":neteq_test_tools",
         "../..:webrtc_common",
-        "../../rtc_base:rtc_base_approved",
+        "../../base:rtc_base_approved",
         "../../system_wrappers:system_wrappers_default",
         "../../test:test_support",
         "//third_party/gflags",
       ]
     }
   }
 
   rtc_test("audio_codec_speed_tests") {
     testonly = true
     defines = []
@@ skipping 12 matching lines @@
 
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_native_code" ]
       shard_timeout = 900
     }
 
     deps += [
       ":isac_fix",
       ":webrtc_opus",
       "../..:webrtc_common",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_main",
       "../audio_processing",
       "//testing/gtest",
     ]
   }
 
   rtc_source_set("neteq_test_support") {
     testonly = true
     sources = [
       "neteq/tools/neteq_external_decoder_test.cc",
       "neteq/tools/neteq_external_decoder_test.h",
       "neteq/tools/neteq_performance_test.cc",
       "neteq/tools/neteq_performance_test.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 = [
       ":neteq",
       ":neteq_test_tools",
       ":pcm16b",
       "..:module_api",
       "../..:webrtc_common",
       "../../api/audio_codecs:audio_codecs_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../system_wrappers",
       "../../test:test_support",
       "//testing/gtest",
     ]
   }
 
   rtc_source_set("neteq_quality_test_support") {
     testonly = true
     sources = [
       "neteq/tools/neteq_quality_test.cc",
       "neteq/tools/neteq_quality_test.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 = [
       ":neteq",
       ":neteq_test_tools",
       "..:module_api",
       "../..:webrtc_common",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../test:test_support",
       "//testing/gtest",
       "//third_party/gflags",
     ]
   }
 
   rtc_source_set("neteq_test_tools_deprecated") {
     testonly = true
     sources = [
       "neteq/test/NETEQTEST_DummyRTPpacket.cc",
@@ skipping 56 matching lines @@
       ":cng",
       ":g711",
       ":g722",
       ":ilbc",
       ":isac",
       ":neteq",
       ":neteq_test_tools_deprecated",
       ":pcm16b",
       ":webrtc_opus",
       "../..:webrtc_common",
+      "../../base:rtc_base_approved",
       "../../common_audio",
-      "../../rtc_base:rtc_base_approved",
     ]
 
     configs += [ ":RTPencode_config" ]
 
     sources = [
       "neteq/test/PayloadTypes.h",
       "neteq/test/RTPencode.cc",
     ]
 
     include_dirs = [
@@ skipping 22 matching lines @@
   }
 
   rtc_executable("rtpcat") {
     testonly = true
 
     sources = [
       "neteq/tools/rtpcat.cc",
     ]
 
     deps = [
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers_default",
       "../../test:rtp_test_utils",
       "//testing/gtest",
     ]
   }
 
   rtc_executable("RTPtimeshift") {
     testonly = true
 
     sources = [
       "neteq/test/RTPtimeshift.cc",
     ]
 
     deps = [
       ":neteq_test_tools_deprecated",
       "../../test:test_support",
       "//testing/gtest",
     ]
   }
 
   rtc_executable("RTPjitter") {
     testonly = true
     deps = [
       "../..:webrtc_common",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../test:test_support",
       "//testing/gtest",
     ]
     sources = [
       "neteq/test/RTPjitter.cc",
     ]
   }
 
   rtc_executable("rtp_analyze") {
     testonly = true
@@ skipping 58 matching lines @@
     sources = [
       "neteq/test/neteq_ilbc_quality_test.cc",
     ]
 
     deps = [
       ":ilbc",
       ":neteq",
       ":neteq_quality_test_support",
       ":neteq_tools",
       "../..:webrtc_common",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_main",
       "//testing/gtest",
       "//third_party/gflags",
     ]
   }
 
   rtc_executable("neteq_isac_quality_test") {
     testonly = true
 
     sources = [
       "neteq/test/neteq_isac_quality_test.cc",
     ]
 
     deps = [
       ":isac_fix",
       ":neteq",
       ":neteq_quality_test_support",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../test:test_main",
       "//testing/gtest",
       "//third_party/gflags",
     ]
   }
 
   rtc_executable("neteq_pcmu_quality_test") {
     testonly = true
 
     sources = [
       "neteq/test/neteq_pcmu_quality_test.cc",
     ]
 
     deps = [
       ":g711",
       ":neteq",
       ":neteq_quality_test_support",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../test:test_main",
       "//testing/gtest",
       "//third_party/gflags",
     ]
   }
 
   rtc_executable("isac_fix_test") {
     testonly = true
 
     sources = [
@@ skipping 39 matching lines @@
 
     include_dirs = [
       "codecs/isac/main/include",
       "codecs/isac/main/test",
       "codecs/isac/main/util",
     ]
 
     deps = [
       ":isac",
       ":isac_test_util",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
     ]
 
     configs += [ ":isac_test_warnings_config" ]
   }
 
   rtc_executable("g711_test") {
     testonly = true
 
     sources = [
       "codecs/g711/test/testG711.cc",
@@ skipping 20 matching lines @@
   rtc_executable("isac_api_test") {
     testonly = true
 
     sources = [
       "codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc",
     ]
 
     deps = [
       ":isac",
       ":isac_test_util",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
     ]
 
     include_dirs = [
       "codecs/isac/main/include",
       "codecs/isac/main/test",
       "codecs/isac/main/util",
     ]
   }
 
   rtc_executable("isac_switch_samprate_test") {
@@ skipping 30 matching lines @@
 
   rtc_executable("webrtc_opus_fec_test") {
     testonly = true
 
     sources = [
       "codecs/opus/opus_fec_test.cc",
     ]
 
     deps = [
       ":webrtc_opus",
+      "../../base:rtc_base_approved",
       "../../common_audio",
-      "../../rtc_base:rtc_base_approved",
       "../../test:test_main",
       "//testing/gtest",
     ]
 
     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" ]
     }
   }
 
@@ skipping 103 matching lines @@
       ":neteq_test_tools",
       ":pcm16b",
       ":red",
       ":rent_a_codec",
       ":webrtc_opus",
       "..:module_api",
       "../..:webrtc_common",
       "../../api/audio_codecs:audio_codecs_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../api/audio_codecs:builtin_audio_encoder_factory",
+      "../../base:protobuf_utils",
+      "../../base:rtc_base",
+      "../../base:rtc_base_approved",
+      "../../base:rtc_base_tests_utils",
       "../../common_audio",
-      "../../rtc_base:protobuf_utils",
-      "../../rtc_base:rtc_base",
-      "../../rtc_base:rtc_base_approved",
-      "../../rtc_base:rtc_base_tests_utils",
       "../../system_wrappers:system_wrappers",
       "../../test:audio_codec_mocks",
       "../../test:field_trial",
       "../../test:rtp_test_utils",
       "../../test:test_common",
       "../../test:test_support",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/gflags",
     ]
@@ skipping 55 matching lines @@
 # webrtc/api/audio_codecs:builtin_audio_decoder_factory instead.
 # TODO(ossu): Remove this.
 rtc_source_set("builtin_audio_encoder_factory") {
   sources = [
     "codecs/builtin_audio_encoder_factory.h",
   ]
   deps = [
     "../../api/audio_codecs:builtin_audio_encoder_factory",
   ]
 }