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

webrtc/modules/video_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")
 
@@ skipping 79 matching lines @@
 
   deps = [
     ":video_coding_utility",
     ":webrtc_h264",
     ":webrtc_i420",
     ":webrtc_vp8",
     ":webrtc_vp9",
     "..:module_api",
     "../..:video_stream_api",
     "../..:webrtc_common",
+    "../../base:rtc_base",
+    "../../base:rtc_base_approved",
+    "../../base:rtc_numerics",
+    "../../base:rtc_task_queue",
+    "../../base:sequenced_task_checker",
     "../../common_video",
-    "../../rtc_base:rtc_base",
-    "../../rtc_base:rtc_base_approved",
-    "../../rtc_base:rtc_numerics",
-    "../../rtc_base:rtc_task_queue",
-    "../../rtc_base:sequenced_task_checker",
     "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp",
     "../utility:utility",
   ]
 }
 
 rtc_static_library("video_coding_utility") {
   sources = [
     "utility/default_video_bitrate_allocator.cc",
     "utility/default_video_bitrate_allocator.h",
@@ skipping 13 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 = [
     "..:module_api",
     "../..:webrtc_common",
     "../../api/video_codecs:video_codecs_api",
+    "../../base:rtc_base_approved",
+    "../../base:rtc_numerics",
+    "../../base:rtc_task_queue",
+    "../../base:sequenced_task_checker",
     "../../common_video",
     "../../modules/rtp_rtcp:rtp_rtcp",
-    "../../rtc_base:rtc_base_approved",
-    "../../rtc_base:rtc_numerics",
-    "../../rtc_base:rtc_task_queue",
-    "../../rtc_base:sequenced_task_checker",
     "../../system_wrappers",
   ]
 }
 
 rtc_static_library("webrtc_h264") {
   sources = [
     "codecs/h264/h264.cc",
     "codecs/h264/include/h264.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" ]
   }
 
   defines = []
   deps = [
     ":video_coding_utility",
+    "../../base:rtc_base_approved",
     "../../media:rtc_media_base",
-    "../../rtc_base:rtc_base_approved",
     "../../system_wrappers",
   ]
 
   if (rtc_use_h264) {
     defines += [ "WEBRTC_USE_H264" ]
     if (rtc_initialize_ffmpeg) {
       defines += [ "WEBRTC_INITIALIZE_FFMPEG" ]
     }
     sources += [
       "codecs/h264/h264_decoder_impl.cc",
@@ skipping 16 matching lines @@
     "codecs/i420/include/i420.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 = [
     "../..:webrtc_common",
+    "../../base:rtc_base_approved",
     "../../common_video:common_video",
-    "../../rtc_base:rtc_base_approved",
     "../../system_wrappers",
   ]
 }
 
 rtc_static_library("webrtc_vp8") {
   sources = [
     "codecs/vp8/default_temporal_layers.cc",
     "codecs/vp8/default_temporal_layers.h",
     "codecs/vp8/include/vp8.h",
     "codecs/vp8/include/vp8_common_types.h",
@@ skipping 12 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 = [
     ":video_coding_utility",
     "..:module_api",
     "../..:webrtc_common",
     "../../api/video_codecs:video_codecs_api",
+    "../../base:rtc_base_approved",
+    "../../base:sequenced_task_checker",
     "../../common_video",
-    "../../rtc_base:rtc_base_approved",
-    "../../rtc_base:sequenced_task_checker",
     "../../system_wrappers",
   ]
   if (rtc_build_libvpx) {
     deps += [ rtc_libvpx_dir ]
   }
 }
 
 rtc_static_library("webrtc_vp9") {
   if (rtc_libvpx_build_vp9) {
     sources = [
@@ skipping 12 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 = [
     ":video_coding_utility",
     "..:module_api",
+    "../../base:rtc_base_approved",
     "../../common_video",
-    "../../rtc_base:rtc_base_approved",
     "../../system_wrappers",
   ]
   if (rtc_build_libvpx) {
     deps += [ rtc_libvpx_dir ]
   }
 }
 
 if (rtc_include_tests) {
   rtc_source_set("simulcast_test_utility") {
     testonly = true
     sources = [
       "codecs/vp8/simulcast_test_utility.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 = [
       ":video_coding",
       ":webrtc_vp8",
       "../../api:video_frame_api",
+      "../../base:rtc_base_approved",
       "../../common_video:common_video",
-      "../../rtc_base:rtc_base_approved",
       "../../test:test_support",
     ]
   }
 
   rtc_executable("video_quality_measurement") {
     testonly = true
 
     sources = [
       "codecs/tools/video_quality_measurement.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 = [
       ":video_codecs_test_framework",
       ":video_coding",
       ":webrtc_vp8",
       "../..:webrtc_common",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../system_wrappers:field_trial_default",
       "../../system_wrappers:metrics_default",
       "../../system_wrappers:system_wrappers",
       "../../test:test_support",
       "../../test:video_test_common",
       "../../test:video_test_support",
       "../video_capture",
       "//third_party/gflags",
     ]
   }  # video_quality_measurement
@@ skipping 18 matching lines @@
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
     deps = [
       ":video_coding",
       ":video_coding_utility",
       ":webrtc_vp8",
       "../..:webrtc_common",
       "../../api/video_codecs:video_codecs_api",
+      "../../base:rtc_base_approved",
       "../../common_video:common_video",
-      "../../rtc_base:rtc_base_approved",
       "../../system_wrappers:system_wrappers",
       "../../test:test_support",
       "../../test:video_test_common",
       "../../test:video_test_support",
     ]
   }
 
   rtc_source_set("video_coding_videoprocessor_integration_test") {
     testonly = true
 
     sources = [
       "codecs/test/videoprocessor_integrationtest.h",
     ]
 
     deps = [
       ":video_codecs_test_framework",
       ":video_coding",
       ":video_coding_utility",
       ":webrtc_h264",
       ":webrtc_vp8",
       ":webrtc_vp9",
       "../..:webrtc_common",
+      "../../base:rtc_base_approved",
       "../../media:rtc_media",
-      "../../rtc_base:rtc_base_approved",
       "../../test:test_support",
       "../../test:video_test_support",
     ]
 
     if (is_android) {
       sources += [
         "codecs/test/android_test_initializer.cc",
         "codecs/test/android_test_initializer.h",
       ]
 
       deps += [
-        "../../rtc_base:rtc_base_approved",
+        "../../base:rtc_base_approved",
         "../../sdk/android:libjingle_peerconnection_jni",
         "//base",
       ]
     }
 
     if (is_ios || is_mac) {
       deps += [
         "../../media:rtc_media_base",
         "../../sdk:objc_videotoolbox",
       ]
@@ skipping 16 matching lines @@
       "codecs/vp9/test/vp9_impl_unittest.cc",
     ]
 
     deps = [
       ":video_codecs_test_framework",
       ":video_coding_videoprocessor_integration_test",
       ":webrtc_h264",
       ":webrtc_vp8",
       ":webrtc_vp9",
       "../../api:video_frame_api",
+      "../../base:rtc_base_approved",
       "../../common_video:common_video",
-      "../../rtc_base:rtc_base_approved",
       "../../test:test_support",
       "../../test:video_test_common",
       "../video_capture",
     ]
 
     if (rtc_use_h264) {
       defines = [ "WEBRTC_VIDEOPROCESSOR_H264_TESTS" ]
     }
 
     if (!build_with_chromium && is_clang) {
@@ skipping 33 matching lines @@
       ":video_coding_videoprocessor_integration_test",
       "../../test:test_main",
       "../../test:video_test_common",
       "../video_capture",
     ]
 
     data = plot_videoprocessor_integrationtest_resources
 
     if (is_android) {
       deps += [
-        "../../rtc_base:rtc_base_approved",
+        "../../base:rtc_base_approved",
 
         # TODO(brandtr): Figure out if the java dep below could be moved into
         # :video_coding_videoprocessor_integration_test, where it belongs.
         # When that is done, support for Android HW codecs can be added to the
         # modules_tests target as well.
         "../../sdk/android:libjingle_peerconnection_java",
         "../../sdk/android:libjingle_peerconnection_jni",
         "//base",
         "//testing/android/native_test:native_test_support",
       ]
@@ skipping 71 matching lines @@
       ":video_codecs_test_framework",
       ":video_coding",
       ":video_coding_utility",
       ":webrtc_h264",
       ":webrtc_vp8",
       ":webrtc_vp9",
       "..:module_api",
       "../..:webrtc_common",
       "../../api:video_frame_api",
       "../../api/video_codecs:video_codecs_api",
+      "../../base:rtc_base",
+      "../../base:rtc_base_approved",
+      "../../base:rtc_task_queue",
       "../../common_video:common_video",
-      "../../rtc_base:rtc_base",
-      "../../rtc_base:rtc_base_approved",
-      "../../rtc_base:rtc_task_queue",
       "../../system_wrappers:metrics_default",
       "../../system_wrappers:system_wrappers",
       "../../test:field_trial",
       "../../test:test_support",
       "../../test:video_test_common",
       "../../test:video_test_support",
       "../rtp_rtcp:rtp_rtcp",
       "//testing/gmock",
     ]
     if (rtc_build_libvpx) {
       deps += [ rtc_libvpx_dir ]
     }
     if (is_win) {
       cflags = [
         # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
         "/wd4373",  # virtual function override.
       ]
     }
 
     # TODO(jschuh): bugs.webrtc.org/1348: fix this warning.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
     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" ]
     }
   }
 }