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

webrtc/pc/BUILD.gn

Index: webrtc/pc/BUILD.gn
diff --git a/webrtc/pc/BUILD.gn b/webrtc/pc/BUILD.gn
index 768a25cf41ab6a3fe63f28b981eef3c06deeb8bc..2ff1a0af503a86c41f0a78919f6f9d059b646431 100644
--- a/webrtc/pc/BUILD.gn
+++ b/webrtc/pc/BUILD.gn
@@ -60,12 +60,12 @@ rtc_static_library("rtc_pc_base") {
     "../api:call_api",
     "../api:libjingle_peerconnection_api",
     "../api:ortc_api",
+    "../base:rtc_base",
+    "../base:rtc_task_queue",
     "../media:rtc_data",
     "../media:rtc_h264_profile_id",
     "../media:rtc_media_base",
     "../p2p:rtc_p2p",
-    "../rtc_base:rtc_base",
-    "../rtc_base:rtc_task_queue",
   ]
 
   if (rtc_build_libsrtp) {
@@ -165,13 +165,13 @@ rtc_static_library("peerconnection") {
     "../api:call_api",
     "../api:rtc_stats_api",
     "../api/video_codecs:video_codecs_api",
+    "../base:rtc_base",
+    "../base:rtc_base_approved",
     "../call:call_interfaces",
     "../logging:rtc_event_log_api",
     "../media:rtc_data",
     "../media:rtc_media_base",
     "../p2p:rtc_p2p",
-    "../rtc_base:rtc_base",
-    "../rtc_base:rtc_base_approved",
     "../stats",
     "../system_wrappers:system_wrappers",
   ]
@@ -198,14 +198,14 @@ rtc_static_library("create_pc_factory") {
     "../api/audio_codecs:audio_codecs_api",
     "../api/audio_codecs:builtin_audio_decoder_factory",
     "../api/audio_codecs:builtin_audio_encoder_factory",
+    "../base:rtc_base",
+    "../base:rtc_base_approved",
     "../call",
     "../call:call_interfaces",
     "../logging:rtc_event_log_api",
     "../media:rtc_audio_video",
     "../modules/audio_device:audio_device",
     "../modules/audio_processing:audio_processing",
-    "../rtc_base:rtc_base",
-    "../rtc_base:rtc_base_approved",
   ]
 
   configs += [ ":libjingle_peerconnection_warnings_config" ]
@@ -279,15 +279,15 @@ if (rtc_include_tests) {
     deps = [
       ":libjingle_peerconnection",
       ":rtc_pc",
+      "../base:rtc_base",
+      "../base:rtc_base_approved",
+      "../base:rtc_base_tests_main",
+      "../base:rtc_base_tests_utils",
       "../logging:rtc_event_log_api",
       "../media:rtc_media_base",
       "../media:rtc_media_tests_utils",
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
-      "../rtc_base:rtc_base",
-      "../rtc_base:rtc_base_approved",
-      "../rtc_base:rtc_base_tests_main",
-      "../rtc_base:rtc_base_tests_utils",
       "../system_wrappers:metrics_default",
     ]
 
@@ -325,15 +325,15 @@ if (rtc_include_tests) {
       "..:webrtc_common",
       "../api:libjingle_peerconnection_test_api",
       "../api:rtc_stats_api",
+      "../base:rtc_base",
+      "../base:rtc_base_approved",
+      "../base:rtc_base_tests_utils",
       "../call:call_interfaces",
       "../logging:rtc_event_log_api",
       "../media:rtc_media",
       "../media:rtc_media_tests_utils",
       "../modules/audio_device:audio_device",
       "../p2p:p2p_test_utils",
-      "../rtc_base:rtc_base",
-      "../rtc_base:rtc_base_approved",
-      "../rtc_base:rtc_base_tests_utils",
       "../test:test_support",
       "//testing/gmock",
     ]
@@ -442,10 +442,10 @@ if (rtc_include_tests) {
       ":pc_test_utils",
       "..:webrtc_common",
       "../api:fakemetricsobserver",
+      "../base:rtc_base_tests_main",
+      "../base:rtc_base_tests_utils",
       "../media:rtc_media_tests_utils",
       "../pc:rtc_pc",
-      "../rtc_base:rtc_base_tests_main",
-      "../rtc_base:rtc_base_tests_utils",
       "../system_wrappers:metrics_default",
       "../test:audio_codec_mocks",
       "//testing/gmock",