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

webrtc/system_wrappers/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.
 
 if (is_android) {
   import("//build/config/android/config.gni")
@@ skipping 89 matching lines @@
   }
 
   # TODO(jschuh): Bug 1348: fix this warning.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   if (is_win) {
     libs += [ "winmm.lib" ]
 
     cflags = [ "/wd4334" ]  # Ignore warning on shift operator promotion.
 
-    # Windows needs //webrtc/rtc_base:rtc_base due to include of
-    # webrtc/rtc_base/win32.h in source/clock.cc.
+    # Windows needs //webrtc/base:rtc_base due to include of webrtc/base/win32.h
+    # in source/clock.cc.
     # TODO(kjellander): Remove (bugs.webrtc.org/6828)
-    deps += [ "../rtc_base:rtc_base" ]
+    deps += [ "../base:rtc_base" ]
   }
 
   if (is_win && is_clang) {
     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 
-  deps += [ "../rtc_base:rtc_base_approved" ]
+  deps += [ "../base:rtc_base_approved" ]
 }
 
 rtc_source_set("cpu_features_api") {
   sources = [
     "include/cpu_features_wrapper.h",
   ]
   deps = [
     "..:webrtc_common",
   ]
 }
 
 rtc_source_set("asm_defines") {
   sources = [
     "include/asm_defines.h",
   ]
 }
 
 rtc_source_set("field_trial_api") {
   sources = [
     "include/field_trial.h",
   ]
 }
 
 rtc_source_set("metrics_api") {
   sources = [
     "include/metrics.h",
   ]
   deps = [
     "..:webrtc_common",
-    "../rtc_base:rtc_base_approved",
+    "../base:rtc_base_approved",
   ]
 }
 
 rtc_static_library("field_trial_default") {
   sources = [
     "include/field_trial_default.h",
     "source/field_trial_default.cc",
   ]
   deps = [
     ":field_trial_api",
   ]
 }
 
 rtc_static_library("metrics_default") {
   sources = [
     "include/metrics_default.h",
     "source/metrics_default.cc",
   ]
   deps = [
     ":metrics_api",
-    "../rtc_base:rtc_base_approved",
+    "../base:rtc_base_approved",
   ]
 }
 
 group("system_wrappers_default") {
   deps = [
     ":field_trial_default",
     ":metrics_default",
     ":system_wrappers",
   ]
 }
@@ skipping 38 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 = [
       ":metrics_default",
       ":system_wrappers",
       "..:webrtc_common",
-      "../rtc_base:rtc_base_approved",
+      "../base:rtc_base_approved",
       "../test:test_main",
       "//testing/gtest",
     ]
 
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_support" ]
 
       shard_timeout = 900
     }
   }
 }