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

webrtc/common_video/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 39 matching lines @@
 
   public_configs = [ ":common_video_config" ]
 
   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",
+    "../base:rtc_task_queue",
     "../media:rtc_h264_profile_id",
     "../modules:module_api",
-    "../rtc_base:rtc_base",
-    "../rtc_base:rtc_task_queue",
     "../system_wrappers",
   ]
   public_deps = [
     "../api:video_frame_api",
   ]
 
   if (rtc_build_libyuv) {
     deps += [ "$rtc_libyuv_dir" ]
     public_deps += [ "$rtc_libyuv_dir" ]
   } else {
@@ skipping 33 matching lines @@
     # TODO(jschuh): Bug 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" ]
     }
 
     deps = [
       ":common_video",
+      "../base:rtc_base",
+      "../base:rtc_base_approved",
       "../modules/video_capture:video_capture",
-      "../rtc_base:rtc_base",
-      "../rtc_base:rtc_base_approved",
       "../system_wrappers:system_wrappers",
       "../test:test_main",
       "../test:video_test_common",
       "//testing/gmock",
       "//testing/gtest",
     ]
 
     data = common_video_resources
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_support" ]
       shard_timeout = 900
     }
 
     if (is_ios) {
       deps += [ ":common_video_unittests_bundle_data" ]
     }
   }
 }