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

webrtc/voice_engine/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")
 
@@ skipping 19 matching lines @@
 }
 
 rtc_static_library("file_player") {
   sources = [
     "file_player.cc",
     "file_player.h",
   ]
   deps = [
     ":audio_coder",
     "..:webrtc_common",
+    "../base:rtc_base_approved",
     "../common_audio",
     "../modules:module_api",
     "../modules/media_file",
-    "../rtc_base:rtc_base_approved",
   ]
 
   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_static_library("file_recorder") {
   sources = [
     "file_recorder.cc",
     "file_recorder.h",
   ]
   deps = [
     ":audio_coder",
     "..:webrtc_common",
     "../audio/utility:audio_frame_operations",
+    "../base:rtc_base_approved",
     "../common_audio",
     "../modules:module_api",
     "../modules/media_file:media_file",
-    "../rtc_base:rtc_base_approved",
     "../system_wrappers",
   ]
 
   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_static_library("voice_engine") {
@@ skipping 61 matching lines @@
     ":file_recorder",
     "..:webrtc_common",
     "../api:audio_mixer_api",
     "../api:call_api",
     "../api:libjingle_peerconnection_api",
     "../api:transport_api",
     "../api/audio_codecs:audio_codecs_api",
     "../api/audio_codecs:builtin_audio_decoder_factory",
     "../api/audio_codecs:builtin_audio_encoder_factory",
     "../audio/utility:audio_frame_operations",
+    "../base:rtc_base_approved",
+    "../base:rtc_task_queue",
     "../call:rtp_interfaces",
     "../common_audio",
     "../logging:rtc_event_log_api",
     "../modules:module_api",
     "../modules/audio_coding:audio_format_conversion",
     "../modules/audio_coding:rent_a_codec",
     "../modules/audio_conference_mixer",
     "../modules/audio_device",
     "../modules/audio_processing",
     "../modules/bitrate_controller",
     "../modules/media_file",
     "../modules/pacing",
     "../modules/rtp_rtcp",
     "../modules/utility",
-    "../rtc_base:rtc_base_approved",
-    "../rtc_base:rtc_task_queue",
     "../system_wrappers",
   ]
 }
 
 rtc_static_library("audio_level") {
   sources = [
     "audio_level.cc",
     "audio_level.h",
   ]
 
   deps = [
     "..:webrtc_common",
+    "../base:rtc_base_approved",
     "../common_audio",
     "../modules:module_api",
-    "../rtc_base:rtc_base_approved",
   ]
 }
 
 if (rtc_include_tests) {
   rtc_test("voice_engine_unittests") {
     deps = [
       ":file_player",
       ":voice_engine",
+      "../base:rtc_base_approved",
+      "../base:rtc_base_tests_utils",
       "../modules:module_api",
-      "../rtc_base:rtc_base_approved",
-      "../rtc_base:rtc_base_tests_utils",
       "../test:test_common",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/gflags",
       "//webrtc/common_audio",
       "//webrtc/modules/audio_coding",
       "//webrtc/modules/audio_conference_mixer",
       "//webrtc/modules/audio_device",
       "//webrtc/modules/audio_processing",
       "//webrtc/modules/media_file",
@@ skipping 42 matching lines @@
     }
   }
 
   if (!is_ios) {
     rtc_executable("voe_auto_test") {
       testonly = true
 
       deps = [
         ":voice_engine",
         "..:webrtc_common",
+        "../base:rtc_base_approved",
         "../modules:module_api",
         "../modules/audio_device:audio_device",
         "../modules/audio_processing:audio_processing",
         "../modules/rtp_rtcp:rtp_rtcp",
-        "../rtc_base:rtc_base_approved",
         "//testing/gmock",
         "//testing/gtest",
         "//third_party/gflags",
         "//webrtc/logging:rtc_event_log_api",
         "//webrtc/modules/video_capture",
         "//webrtc/system_wrappers",
         "//webrtc/system_wrappers/:system_wrappers_default",
         "//webrtc/test/:test_common",
         "//webrtc/test/:test_support",
         "//webrtc/test/:video_test_common",
@@ skipping 41 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" ]
       }
     }
   }
 }