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

webrtc/modules/audio_processing/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("//build/config/arm.gni")
 import("//third_party/protobuf/proto_library.gni")
@@ skipping 220 matching lines @@
     "voice_detection_impl.cc",
     "voice_detection_impl.h",
   ]
 
   defines = []
   deps = [
     ":aec_dump_interface",
     "..:module_api",
     "../..:webrtc_common",
     "../../audio/utility:audio_frame_operations",
-    "../../rtc_base:gtest_prod",
-    "../../rtc_base:protobuf_utils",
+    "../../base:gtest_prod",
+    "../../base:protobuf_utils",
     "../audio_coding:isac",
   ]
   public_deps = [
     ":audio_processing_c",
   ]
 
   if (apm_debug_dump) {
     defines += [ "WEBRTC_APM_DEBUG_DUMP=1" ]
   } else {
     defines += [ "WEBRTC_APM_DEBUG_DUMP=0" ]
@@ skipping 43 matching lines @@
       ]
     }
   } else {
     sources += [ "aecm/aecm_core_c.cc" ]
   }
 
   # TODO(jschuh): Bug 1348: fix this warning.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   deps += [
+    "../../base:rtc_base_approved",
     "../../common_audio",
-    "../../rtc_base:rtc_base_approved",
     "../../system_wrappers",
   ]
 }
 
 rtc_source_set("aec_dump_interface") {
   sources = [
     "include/aec_dump.cc",
     "include/aec_dump.h",
   ]
 
   deps = [
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
   ]
 }
 
 rtc_source_set("audio_processing_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
     "agc/legacy/analog_agc.c",
     "agc/legacy/analog_agc.h",
     "agc/legacy/digital_agc.c",
     "agc/legacy/digital_agc.h",
@@ skipping 19 matching lines @@
       "ns/noise_suppression.c",
       "ns/noise_suppression.h",
       "ns/ns_core.c",
       "ns/ns_core.h",
       "ns/windows_private.h",
     ]
   }
 
   deps = [
     "../..:webrtc_common",
+    "../../base:rtc_base_approved",
     "../../common_audio",
-    "../../rtc_base:rtc_base_approved",
     "../../system_wrappers",
   ]
 
   if (rtc_build_with_neon) {
     deps += [ ":audio_processing_neon_c" ]
   }
 }
 
 if (rtc_enable_protobuf) {
   proto_library("audioproc_debug_proto") {
@@ skipping 92 matching lines @@
 
     # Disable LTO on NEON targets due to compiler bug.
     # TODO(fdegans): Enable this. See crbug.com/408997.
     if (rtc_use_lto) {
       cflags -= [
         "-flto",
         "-ffat-lto-objects",
       ]
     }
     deps = [
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
     ]
   }
 }
 
 if (rtc_include_tests) {
   group("audio_processing_tests") {
     testonly = true
     public_deps = [
       ":audioproc_test_utils",
       ":click_annotate",
@@ skipping 59 matching lines @@
       "vad/vad_audio_proc_unittest.cc",
       "vad/vad_circular_buffer_unittest.cc",
       "vad/voice_activity_detector_unittest.cc",
     ]
 
     deps = [
       ":audio_processing",
       ":audioproc_test_utils",
       "..:module_api",
       "../..:webrtc_common",
+      "../../base:gtest_prod",
+      "../../base:protobuf_utils",
+      "../../base:rtc_base",
+      "../../base:rtc_base_approved",
       "../../common_audio:common_audio",
-      "../../rtc_base:gtest_prod",
-      "../../rtc_base:protobuf_utils",
-      "../../rtc_base:rtc_base",
-      "../../rtc_base:rtc_base_approved",
       "../../system_wrappers:system_wrappers",
       "../../test:test_support",
       "../audio_coding:neteq_tools",
       "aec_dump:mock_aec_dump_unittests",
       "test/conversational_speech:unittest",
       "//testing/gmock",
       "//testing/gtest",
     ]
 
     defines = []
@@ skipping 19 matching lines @@
     } else {
       defines += [ "WEBRTC_AUDIOPROC_FLOAT_PROFILE" ]
     }
 
     if (rtc_enable_protobuf) {
       defines += [ "WEBRTC_AUDIOPROC_DEBUG_DUMP" ]
       deps += [
         ":audioproc_debug_proto",
         ":audioproc_protobuf_utils",
         ":audioproc_unittest_proto",
-        "../../rtc_base:rtc_task_queue",
+        "../../base:rtc_task_queue",
         "aec_dump",
         "aec_dump:aec_dump_unittests",
       ]
       sources += [
         "aec3/adaptive_fir_filter_unittest.cc",
         "aec3/aec3_fft_unittest.cc",
         "aec3/aec_state_unittest.cc",
         "aec3/block_framer_unittest.cc",
         "aec3/block_processor_metrics_unittest.cc",
         "aec3/block_processor_unittest.cc",
@@ skipping 81 matching lines @@
       visibility = [ "//webrtc:webrtc_perf_tests" ]
     }
     sources = [
       "audio_processing_performance_unittest.cc",
       "level_controller/level_controller_complexity_unittest.cc",
       "residual_echo_detector_complexity_unittest.cc",
     ]
     deps = [
       ":audio_processing",
       ":audioproc_test_utils",
-      "../../rtc_base:protobuf_utils",
+      "../../base:protobuf_utils",
       "//testing/gtest",
     ]
 
     if (rtc_enable_intelligibility_enhancer) {
       defines = [ "WEBRTC_INTELLIGIBILITY_ENHANCER=1" ]
     } else {
       defines = [ "WEBRTC_INTELLIGIBILITY_ENHANCER=0" ]
     }
   }
 
   if (rtc_enable_protobuf) {
     rtc_executable("unpack_aecdump") {
       testonly = true
       sources = [
         "test/unpack.cc",
       ]
 
       deps = [
         ":audio_processing",
         ":audioproc_debug_proto",
         ":audioproc_protobuf_utils",
         ":audioproc_test_utils",
         "../..:webrtc_common",
+        "../../base:protobuf_utils",
+        "../../base:rtc_base_approved",
         "../../common_audio",
-        "../../rtc_base:protobuf_utils",
-        "../../rtc_base:rtc_base_approved",
         "../../system_wrappers:system_wrappers_default",
         "//third_party/gflags:gflags",
       ]
     }  # unpack_aecdump
 
     rtc_executable("audioproc_f") {
       testonly = true
       sources = [
         "test/aec_dump_based_simulator.cc",
         "test/aec_dump_based_simulator.h",
         "test/audio_processing_simulator.cc",
         "test/audio_processing_simulator.h",
         "test/audioproc_float.cc",
         "test/wav_based_simulator.cc",
         "test/wav_based_simulator.h",
       ]
 
       deps = [
         ":audio_processing",
         ":audioproc_debug_proto",
         ":audioproc_protobuf_utils",
         ":audioproc_test_utils",
+        "../../base:protobuf_utils",
+        "../../base:rtc_base_approved",
+        "../../base:rtc_task_queue",
         "../../common_audio:common_audio",
-        "../../rtc_base:protobuf_utils",
-        "../../rtc_base:rtc_base_approved",
-        "../../rtc_base:rtc_task_queue",
         "../../system_wrappers",
         "../../system_wrappers:system_wrappers_default",
         "../../test:test_support",
         "aec_dump",
         "aec_dump:aec_dump_impl",
         "//testing/gtest",
         "//third_party/gflags:gflags",
       ]
     }  # audioproc_f
   }
 
   rtc_source_set("audioproc_test_utils") {
     testonly = true
     sources = [
       "test/audio_buffer_tools.cc",
       "test/audio_buffer_tools.h",
       "test/performance_timer.cc",
       "test/performance_timer.h",
       "test/simulator_buffers.cc",
       "test/simulator_buffers.h",
       "test/test_utils.cc",
       "test/test_utils.h",
     ]
 
     deps = [
       ":audio_processing",
       "..:module_api",
+      "../../base:rtc_base_approved",
       "../../common_audio",
-      "../../rtc_base:rtc_base_approved",
       "../../system_wrappers:system_wrappers",
     ]
   }
 
   rtc_executable("transient_suppression_test") {
     testonly = true
     sources = [
       "transient/file_utils.cc",
       "transient/file_utils.h",
       "transient/transient_suppression_test.cc",
@@ skipping 27 matching lines @@
   }
 
   rtc_executable("nonlinear_beamformer_test") {
     testonly = true
     sources = [
       "beamformer/nonlinear_beamformer_test.cc",
     ]
     deps = [
       ":audio_processing",
       ":audioproc_test_utils",
+      "../../base:rtc_base_approved",
       "../../common_audio:common_audio",
-      "../../rtc_base:rtc_base_approved",
       "../../system_wrappers:metrics_default",
       "//third_party/gflags",
     ]
   }
 
   if (rtc_enable_intelligibility_enhancer) {
     rtc_executable("intelligibility_proc") {
       testonly = true
       sources = [
         "intelligibility/test/intelligibility_proc.cc",
@@ skipping 19 matching lines @@
 
     rtc_static_library("audioproc_protobuf_utils") {
       sources = [
         "test/protobuf_utils.cc",
         "test/protobuf_utils.h",
       ]
 
       deps = [
         ":audioproc_debug_proto",
         "../..:webrtc_common",
-        "../../rtc_base:protobuf_utils",
-        "../../rtc_base:rtc_base_approved",
+        "../../base:protobuf_utils",
+        "../../base:rtc_base_approved",
       ]
     }
   }
 }