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

webrtc/p2p/BUILD.gn

 # Copyright (c) 2016 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 69 matching lines @@
     "client/basicportallocator.h",
     "client/socketmonitor.cc",
     "client/socketmonitor.h",
   ]
 
   defines = []
 
   deps = [
     "../api:libjingle_peerconnection_api",
     "../api:ortc_api",
-    "../rtc_base:rtc_base",
+    "../base:rtc_base",
     "../system_wrappers:field_trial_api",
   ]
 
   public_configs = [ ":rtc_p2p_inherited_config" ]
 
   if (build_with_chromium) {
     if (is_nacl) {
       deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
     }
   } else {
@@ skipping 47 matching lines @@
       "base/fakeportallocator.h",
       "base/faketransportcontroller.h",
       "base/mockicetransport.h",
       "base/testrelayserver.h",
       "base/teststunserver.h",
       "base/testturnserver.h",
     ]
     deps = [
       ":rtc_p2p",
       "../api:ortc_api",
-      "../rtc_base:rtc_base",
-      "../rtc_base:rtc_base_approved",
-      "../rtc_base:rtc_base_tests_utils",
+      "../base:rtc_base",
+      "../base:rtc_base_approved",
+      "../base:rtc_base_tests_utils",
       "../test:test_support",
       "//testing/gmock",
     ]
   }
 
   rtc_source_set("rtc_p2p_unittests") {
     testonly = true
 
     # Skip restricting visibility on mobile platforms since the tests on those
     # gets additional generated targets which would require many lines here to
@@ skipping 31 matching lines @@
         "quic/quictransport_unittest.cc",
         "quic/quictransportchannel_unittest.cc",
         "quic/reliablequicstream_unittest.cc",
       ]
     }
     deps = [
       ":p2p_test_utils",
       ":rtc_p2p",
       "../api:fakemetricsobserver",
       "../api:ortc_api",
-      "../rtc_base:rtc_base",
-      "../rtc_base:rtc_base_approved",
-      "../rtc_base:rtc_base_tests_utils",
+      "../base:rtc_base",
+      "../base:rtc_base_approved",
+      "../base:rtc_base_tests_utils",
       "../test:test_support",
       "//testing/gmock",
       "//testing/gtest",
     ]
     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 = [ "GTEST_RELATIVE_PATH" ]
   }
 }
 
 rtc_static_library("libstunprober") {
   sources = [
     "stunprober/stunprober.cc",
   ]
 
   if (!build_with_chromium && is_clang) {
     # Suppress warnings from Chrome's Clang plugins.
     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 
   deps = [
     ":rtc_p2p",
     "..:webrtc_common",
-    "../rtc_base:rtc_base",
+    "../base:rtc_base",
   ]
 }
 
 if (rtc_include_tests) {
   rtc_source_set("libstunprober_unittests") {
     testonly = true
 
     # Skip restricting visibility on mobile platforms since the tests on those
     # gets additional generated targets which would require many lines here to
     # cover (which would be confusing to read and hard to maintain).
     if (!is_android && !is_ios) {
       visibility = [ "//webrtc:rtc_unittests" ]
     }
     sources = [
       "stunprober/stunprober_unittest.cc",
     ]
     deps = [
       ":libstunprober",
       ":p2p_test_utils",
       ":rtc_p2p",
-      "../rtc_base:rtc_base",
-      "../rtc_base:rtc_base_tests_utils",
+      "../base:rtc_base",
+      "../base:rtc_base_tests_utils",
       "//testing/gmock",
       "//testing/gtest",
     ]
     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 = [ "GTEST_RELATIVE_PATH" ]
   }
 }