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

webrtc/common_audio/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("../webrtc.gni")
@@ skipping 45 matching lines @@
     "wav_file.h",
     "wav_header.cc",
     "wav_header.h",
     "window_generator.cc",
     "window_generator.h",
   ]
 
   deps = [
     ":sinc_resampler",
     "..:webrtc_common",
-    "../rtc_base:gtest_prod",
-    "../rtc_base:rtc_base_approved",
+    "../base:gtest_prod",
+    "../base:rtc_base_approved",
     "../system_wrappers",
   ]
   public_deps = [
     ":common_audio_c",
   ]
 
   defines = []
   if (rtc_use_openmax_dl) {
     sources += [
       "real_fourier_openmax.cc",
@@ skipping 124 matching lines @@
 
   if (is_win) {
     cflags = [ "/wd4334" ]  # Ignore warning on shift operator promotion.
   }
 
   public_configs = [ ":common_audio_config" ]
   deps = [
     ":common_audio_c_arm_asm",
     ":common_audio_cc",
     "..:webrtc_common",
-    "../rtc_base:compile_assert_c",
-    "../rtc_base:rtc_base_approved",
+    "../base:compile_assert_c",
+    "../base:rtc_base_approved",
     "../system_wrappers:system_wrappers",
   ]
 }
 
 rtc_source_set("common_audio_cc") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
     "signal_processing/dot_product_with_scale.cc",
     "signal_processing/dot_product_with_scale.h",
   ]
 
   public_configs = [ ":common_audio_config" ]
   deps = [
     "..:webrtc_common",
-    "../rtc_base:rtc_base_approved",
+    "../base:rtc_base_approved",
     "../system_wrappers:system_wrappers",
   ]
 }
 
 rtc_source_set("sinc_resampler") {
   sources = [
     "resampler/sinc_resampler.h",
   ]
   deps = [
     "..:webrtc_common",
-    "../rtc_base:gtest_prod",
-    "../rtc_base:rtc_base_approved",
+    "../base:gtest_prod",
+    "../base:rtc_base_approved",
     "../system_wrappers",
   ]
 }
 
 if (current_cpu == "x86" || current_cpu == "x64") {
   rtc_static_library("common_audio_sse2") {
     # TODO(kjellander): Remove (bugs.webrtc.org/6828)
     # Enabling GN check triggers dependency cycle:
     #   //webrtc/common_audio:common_audio ->
     #   //webrtc/common_audio:common_audio_sse2 ->
@@ skipping 86 matching lines @@
         "-ffat-lto-objects",
       ]
     }
 
     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 = [
       ":common_audio_c",
-      "../rtc_base:rtc_base_approved",
+      "../base:rtc_base_approved",
     ]
   }
 }
 
 if (rtc_include_tests) {
   rtc_test("common_audio_unittests") {
     testonly = true
 
     sources = [
       "audio_converter_unittest.cc",
@@ skipping 36 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 = [
       ":common_audio",
       ":sinc_resampler",
       "..:webrtc_common",
-      "../rtc_base:rtc_base_approved",
-      "../rtc_base:rtc_base_tests_utils",
+      "../base:rtc_base_approved",
+      "../base:rtc_base_tests_utils",
       "../system_wrappers",
       "../test:test_main",
       "//testing/gmock",
       "//testing/gtest",
     ]
 
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_support" ]
 
       shard_timeout = 900
     }
   }
 }