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

webrtc/modules/audio_device/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 33 matching lines @@
     ]
   }
 }
 
 rtc_static_library("audio_device") {
   public_configs = [ ":audio_device_config" ]
 
   deps = [
     "..:module_api",
     "../..:webrtc_common",
+    "../../base:rtc_base_approved",
+    "../../base:rtc_task_queue",
     "../../common_audio",
-    "../../rtc_base:rtc_base_approved",
-    "../../rtc_base:rtc_task_queue",
     "../../system_wrappers",
     "../utility",
   ]
 
   sources = [
     "audio_device_buffer.cc",
     "audio_device_buffer.h",
     "audio_device_config.h",
     "audio_device_generic.cc",
     "audio_device_generic.h",
@@ skipping 103 matching lines @@
 
           "AudioToolbox.framework",
           "CoreAudio.framework",
 
           # Needed for CGEventSourceKeyState in audio_device_mac.cc:
           "CoreGraphics.framework",
         ]
       }
       if (is_ios) {
         public_deps = [
-          "../../rtc_base:gtest_prod",
-          "../../rtc_base:rtc_base",
+          "../../base:gtest_prod",
+          "../../base:rtc_base",
           "../../sdk:objc_audio",
           "../../sdk:objc_common",
         ]
         sources += [
           "ios/audio_device_ios.h",
           "ios/audio_device_ios.mm",
           "ios/audio_device_not_implemented_ios.mm",
           "ios/audio_session_observer.h",
           "ios/objc/RTCAudioSessionDelegateAdapter.h",
           "ios/objc/RTCAudioSessionDelegateAdapter.mm",
@@ skipping 82 matching lines @@
     # cover (which would be confusing to read and hard to maintain).
     if (!is_android && !is_ios) {
       visibility = [ "//webrtc/modules:modules_unittests" ]
     }
     sources = [
       "fine_audio_buffer_unittest.cc",
     ]
     deps = [
       ":audio_device",
       ":mock_audio_device",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers",
       "../../test:test_support",
       "../utility:utility",
       "//testing/gmock",
     ]
     if (is_linux || is_mac || is_win) {
       sources += [ "audio_device_unittest.cc" ]
     }
     if (is_android) {
       # Need to disable error due to the line in
@@ skipping 29 matching lines @@
     # https://bugs.chromium.org/p/webrtc/issues/detail?id=4755
     rtc_executable("audio_device_tests") {
       testonly = true
       sources = [
         "test/audio_device_test_api.cc",
         "test/audio_device_test_defines.h",
       ]
       deps = [
         ":audio_device",
         "../..:webrtc_common",
-        "../../rtc_base:rtc_base_approved",
+        "../../base:rtc_base_approved",
         "../../system_wrappers",
         "../../test:test_main",
         "../../test:test_support",
         "../rtp_rtcp",
         "../utility",
         "//testing/gtest",
       ]
       public_configs = [ ":audio_device_config" ]
     }
   }
 }
 
 if (!build_with_chromium && is_android) {
   android_library("audio_device_java") {
     java_files = [
       "android/java/src/org/webrtc/voiceengine/BuildInfo.java",
       "android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java",
       "android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java",
       "android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java",
       "android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java",
       "android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java",
     ]
     deps = [
       "//webrtc/rtc_base:base_java",
     ]
   }
 }