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

webrtc/video/BUILD.gn

Index: webrtc/video/BUILD.gn
diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn
index 529a73c1000e8cb4988f2f91e42399a41295a239..5faf28048e0fb11646c6d2ba24955e89020a87c7 100644
--- a/webrtc/video/BUILD.gn
+++ b/webrtc/video/BUILD.gn
@@ -58,6 +58,11 @@ rtc_static_library("video") {
     "..:webrtc_common",
     "../api:transport_api",
     "../api/video_codecs:video_codecs_api",
+    "../base:rtc_base_approved",
+    "../base:rtc_numerics",
+    "../base:rtc_task_queue",
+    "../base:sequenced_task_checker",
+    "../base:weak_ptr",
     "../call:call_interfaces",
     "../call:rtp_interfaces",
     "../common_video",
@@ -74,11 +79,6 @@ rtc_static_library("video") {
     "../modules/video_coding:video_coding_utility",
     "../modules/video_coding:webrtc_vp8",
     "../modules/video_processing",
-    "../rtc_base:rtc_base_approved",
-    "../rtc_base:rtc_numerics",
-    "../rtc_base:rtc_task_queue",
-    "../rtc_base:sequenced_task_checker",
-    "../rtc_base:weak_ptr",
     "../system_wrappers",
     "../voice_engine",
   ]
@@ -93,6 +93,8 @@ if (rtc_include_tests) {
       "video_quality_test.h",
     ]
     deps = [
+      "../base:rtc_base_tests_utils",
+      "../base:rtc_task_queue",
       "../call:call_interfaces",
       "../common_video",
       "../logging:rtc_event_log_api",
@@ -103,8 +105,6 @@ if (rtc_include_tests) {
       "../modules/video_coding:webrtc_h264",
       "../modules/video_coding:webrtc_vp8",
       "../modules/video_coding:webrtc_vp9",
-      "../rtc_base:rtc_base_tests_utils",
-      "../rtc_base:rtc_task_queue",
       "../system_wrappers",
       "../test:test_common",
       "../test:test_support",
@@ -155,7 +155,7 @@ if (rtc_include_tests) {
     ]
     deps = [
       ":video_quality_test",
-      "../rtc_base:rtc_base_approved",
+      "../base:rtc_base_approved",
       "../system_wrappers:metrics_default",
       "../test:field_trial",
       "../test:run_test",
@@ -180,7 +180,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":video_quality_test",
-      "../rtc_base:rtc_base_approved",
+      "../base:rtc_base_approved",
       "../system_wrappers:metrics_default",
       "../test:field_trial",
       "../test:run_test",
@@ -203,11 +203,11 @@ if (rtc_include_tests) {
     deps = [
       "..:webrtc_common",
       "../api/video_codecs:video_codecs_api",
+      "../base:rtc_base_approved",
       "../call:call_interfaces",
       "../common_video",
       "../logging:rtc_event_log_api",
       "../modules/rtp_rtcp",
-      "../rtc_base:rtc_base_approved",
       "../system_wrappers",
       "../system_wrappers:metrics_default",
       "../test:field_trial",
@@ -260,6 +260,8 @@ if (rtc_include_tests) {
       "..:video_stream_api",
       "../api:video_frame_api",
       "../api/video_codecs:video_codecs_api",
+      "../base:rtc_base_approved",
+      "../base:rtc_base_tests_utils",
       "../call:call_interfaces",
       "../call:rtp_receiver",
       "../common_video",
@@ -277,8 +279,6 @@ if (rtc_include_tests) {
       "../modules/video_coding:webrtc_h264",
       "../modules/video_coding:webrtc_vp8",
       "../modules/video_coding:webrtc_vp9",
-      "../rtc_base:rtc_base_approved",
-      "../rtc_base:rtc_base_tests_utils",
       "../system_wrappers",
       "../system_wrappers:field_trial_default",
       "../system_wrappers:metrics_api",