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

webrtc/modules/remote_bitrate_estimator/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 33 matching lines @@
     defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
   }
 
   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",
-    "../../rtc_base:rtc_base",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base",
+    "../../base:rtc_base_approved",
     "../../system_wrappers",
   ]
 }
 
 if (rtc_include_tests) {
   rtc_static_library("bwe_simulator_lib") {
     testonly = true
     sources = [
       "test/bwe.cc",
       "test/bwe.h",
@@ skipping 44 matching lines @@
       cflags = [
         # TODO(kjellander): Bug 261: fix this warning.
         "/wd4373",  # virtual function override.
       ]
     }
 
     deps = [
       ":remote_bitrate_estimator",
       "..:module_api",
       "../..:webrtc_common",
-      "../../rtc_base:gtest_prod",
-      "../../rtc_base:rtc_base",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:gtest_prod",
+      "../../base:rtc_base",
+      "../../base:rtc_base_approved",
       "../../system_wrappers",
       "../../test:test_support",
       "../../voice_engine",
       "../bitrate_controller",
       "../congestion_controller",
       "../pacing",
       "../rtp_rtcp",
       "//testing/gmock",
       "//testing/gtest",
     ]
   }
 
   rtc_source_set("remote_bitrate_estimator_perf_tests") {
     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:webrtc_perf_tests" ]
     }
     sources = [
       "remote_bitrate_estimators_test.cc",
     ]
     deps = [
       ":bwe_simulator_lib",
       ":remote_bitrate_estimator",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../test:test_support",
     ]
     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" ]
     }
   }
 
   rtc_source_set("remote_bitrate_estimator_unittests") {
     testonly = true
@@ skipping 17 matching lines @@
       "test/bwe_test_framework_unittest.cc",
       "test/bwe_unittest.cc",
       "test/estimators/nada_unittest.cc",
       "test/metric_recorder_unittest.cc",
     ]
     deps = [
       ":bwe_simulator_lib",
       ":mock_remote_bitrate_observer",
       ":remote_bitrate_estimator",
       "../..:webrtc_common",
-      "../../rtc_base:rtc_base",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base",
+      "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers",
       "../../test:field_trial",
       "../../test:test_support",
       "../pacing:pacing",
       "../rtp_rtcp:rtp_rtcp",
       "//testing/gmock",
     ]
     if (is_win) {
       cflags = [
         # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
@@ skipping 20 matching lines @@
   rtc_test("bwe_simulations_tests") {
     testonly = true
 
     sources = [
       "bwe_simulations.cc",
     ]
     deps = [
       ":bwe_simulator_lib",
       ":remote_bitrate_estimator",
       "../..:webrtc_common",
-      "../../rtc_base:rtc_base_approved",
+      "../../base:rtc_base_approved",
       "../../test:test_main",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/gflags",
     ]
 
     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" ]
     }
 
     if (is_win) {
       cflags = [
         # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
         "/wd4373",  # virtual function override.
       ]
     }
   }
 }