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

webrtc/modules/rtp_rtcp/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 152 matching lines @@
     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 
   deps = [
     "..:module_api",
     "../..:webrtc_common",
     "../../api:libjingle_peerconnection_api",
     "../../api:transport_api",
     "../../api/audio_codecs:audio_codecs_api",
+    "../../base:gtest_prod",
+    "../../base:rtc_base_approved",
+    "../../base:sequenced_task_checker",
     "../../common_video",
     "../../logging:rtc_event_log_api",
-    "../../rtc_base:gtest_prod",
-    "../../rtc_base:rtc_base_approved",
-    "../../rtc_base:sequenced_task_checker",
     "../../system_wrappers",
     "../audio_coding:audio_format_conversion",
     "../remote_bitrate_estimator",
   ]
 
   # TODO(jschuh): Bug 1348: fix this warning.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   if (is_win) {
     cflags = [
       # TODO(kjellander): Bug 261: fix this warning.
       "/wd4373",  # virtual function override.
     ]
   }
 }
 
 rtc_source_set("fec_test_helper") {
   testonly = true
   sources = [
     "source/fec_test_helper.cc",
     "source/fec_test_helper.h",
   ]
   deps = [
     ":rtp_rtcp",
     "..:module_api",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
   ]
 
   # TODO(jschuh): bugs.webrtc.org/1348: fix this warning.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
   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("mock_rtp_rtcp") {
   testonly = true
   sources = [
     "mocks/mock_recovered_packet_receiver.h",
     "mocks/mock_rtcp_rtt_stats.h",
     "mocks/mock_rtp_rtcp.h",
   ]
   deps = [
     ":rtp_rtcp",
     "..:module_api",
-    "../../rtc_base:rtc_base_approved",
+    "../../base:rtc_base_approved",
     "../../test:test_support",
   ]
 }
 
 if (rtc_include_tests) {
   rtc_executable("test_packet_masks_metrics") {
     testonly = true
 
     sources = [
       "test/testFec/average_residual_loss_xor_codes.h",
@@ skipping 14 matching lines @@
     # 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/modules:modules_tests" ]
     }
     sources = [
       "test/testFec/test_fec.cc",
     ]
     deps = [
       ":rtp_rtcp",
-      "../../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("rtp_rtcp_unittests") {
     testonly = true
@@ skipping 65 matching lines @@
       "test/testAPI/test_api_rtcp.cc",
       "test/testAPI/test_api_video.cc",
     ]
     deps = [
       ":fec_test_helper",
       ":mock_rtp_rtcp",
       ":rtp_rtcp",
       "..:module_api",
       "../..:webrtc_common",
       "../../api:transport_api",
+      "../../base:rtc_base_approved",
       "../../common_video:common_video",
-      "../../rtc_base:rtc_base_approved",
       "../../system_wrappers:system_wrappers",
       "../../test:field_trial",
       "../../test:rtp_test_utils",
       "../../test:test_common",
       "../../test:test_support",
       "//testing/gmock",
     ]
 
     # TODO(jschuh): bugs.webrtc.org/1348: fix this warning.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
     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" ]
     }
   }
 }