Revert of Enable GN check for webrtc/base

webrtc/base/BUILD.gn

Index: webrtc/base/BUILD.gn
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 746f0fc44f72423af32031d1db3f350abe9d2399..6014809661234e6a2f9cc5987c87821f715b8a01 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -92,10 +92,6 @@
 
 # The subset of rtc_base approved for use outside of libjingle.
 rtc_static_library("rtc_base_approved") {
-  # TODO(kjellander): Remove (bugs.webrtc.org/7480)
-  # Enabling GN check triggers a cyclic dependency caused by rate_limiter.cc:
-  #   :rtc_base_approved -> //webrtc/system_wrappers -> :rtc_base_approved
-  check_includes = false
   defines = []
   libs = []
   deps = []
@@ -140,6 +136,8 @@
     "location.h",
     "md5.cc",
     "md5.h",
+    "md5digest.cc",
+    "md5digest.h",
     "mod_ops.h",
     "onetimeevent.h",
     "optional.cc",
@@ -173,7 +171,6 @@
     "string_to_number.h",
     "stringencode.cc",
     "stringencode.h",
-    "stringize_macros.h",
     "stringutils.cc",
     "stringutils.h",
     "swap_queue.h",
@@ -657,74 +654,21 @@
   ]
 }
 
-config("rtc_base_tests_utils_exported_config") {
-  defines = [ "GTEST_RELATIVE_PATH" ]
-}
-
-config("rtc_base_tests_utils_warnings_config") {
-  if (is_win && is_clang) {
-    cflags = [
-      # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6270
-      "-Wno-reorder",
-      "-Wno-sign-compare",
-    ]
-  }
-}
-
-rtc_source_set("rtc_base_tests_utils") {
-  testonly = true
-  sources = [
-    # Also use this as a convenient dumping ground for misc files that are
-    # included by multiple targets below.
-    "cpu_time.cc",
-    "cpu_time.h",
-    "fakeclock.cc",
-    "fakeclock.h",
-    "fakenetwork.h",
-    "fakesslidentity.h",
-    "firewallsocketserver.cc",
-    "firewallsocketserver.h",
-    "gunit.h",
-    "httpserver.cc",
-    "httpserver.h",
-    "md5digest.cc",
-    "md5digest.h",
-    "memory_usage.cc",
-    "memory_usage.h",
-    "natserver.cc",
-    "natserver.h",
-    "natsocketfactory.cc",
-    "natsocketfactory.h",
-    "nattypes.cc",
-    "nattypes.h",
-    "proxyserver.cc",
-    "proxyserver.h",
-    "sigslottester.h",
-    "sigslottester.h.pump",
-    "testbase64.h",
-    "testechoserver.h",
-    "testutils.h",
-    "timedelta.h",
-  ]
-  configs += [ ":rtc_base_tests_utils_warnings_config" ]
-  public_configs = [ ":rtc_base_tests_utils_exported_config" ]
-  deps = [
-    ":rtc_base",
-    "../test:field_trial",
-    "../test:test_support",
-  ]
-  public_deps = [
-    "//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" ]
-  }
-}
-
 if (rtc_include_tests) {
+  config("rtc_base_tests_utils_exported_config") {
+    defines = [ "GTEST_RELATIVE_PATH" ]
+  }
+
+  config("rtc_base_tests_utils_warnings_config") {
+    if (is_win && is_clang) {
+      cflags = [
+        # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6270
+        "-Wno-reorder",
+        "-Wno-sign-compare",
+      ]
+    }
+  }
+
   rtc_source_set("rtc_base_tests_main") {
     testonly = true
     sources = [
@@ -732,9 +676,56 @@
     ]
     public_configs = [ ":rtc_base_tests_utils_exported_config" ]
     deps = [
+      ":rtc_base_tests_utils",
+    ]
+    public_deps = [
+      "//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" ]
+    }
+  }
+
+  rtc_source_set("rtc_base_tests_utils") {
+    testonly = true
+    sources = [
+      # Also use this as a convenient dumping ground for misc files that are
+      # included by multiple targets below.
+      "cpu_time.cc",
+      "cpu_time.h",
+      "fakeclock.cc",
+      "fakeclock.h",
+      "fakenetwork.h",
+      "fakesslidentity.h",
+      "firewallsocketserver.cc",
+      "firewallsocketserver.h",
+      "gunit.h",
+      "httpserver.cc",
+      "httpserver.h",
+      "memory_usage.cc",
+      "memory_usage.h",
+      "natserver.cc",
+      "natserver.h",
+      "natsocketfactory.cc",
+      "natsocketfactory.h",
+      "nattypes.cc",
+      "nattypes.h",
+      "proxyserver.cc",
+      "proxyserver.h",
+      "sigslottester.h",
+      "sigslottester.h.pump",
+      "testbase64.h",
+      "testechoserver.h",
+      "testutils.h",
+      "timedelta.h",
+    ]
+    configs += [ ":rtc_base_tests_utils_warnings_config" ]
+    public_configs = [ ":rtc_base_tests_utils_exported_config" ]
+    deps = [
       ":rtc_base",
-      ":rtc_base_approved",
-      ":rtc_base_tests_utils",
       "../test:field_trial",
       "../test:test_support",
     ]
@@ -771,9 +762,6 @@
     deps = [
       ":rtc_base",
       ":rtc_base_tests_main",
-      ":rtc_base_tests_utils",
-      "../system_wrappers:system_wrappers",
-      "../test:test_support",
       "//testing/gtest",
     ]
     if (is_win) {
@@ -827,7 +815,6 @@
       "safe_compare_unittest.cc",
       "string_to_number_unittest.cc",
       "stringencode_unittest.cc",
-      "stringize_macros_unittest.cc",
       "stringutils_unittest.cc",
       "swap_queue_unittest.cc",
       "thread_annotations_unittest.cc",
@@ -836,13 +823,8 @@
       "timeutils_unittest.cc",
     ]
     deps = [
-      ":rtc_base",
       ":rtc_base_approved",
       ":rtc_base_tests_main",
-      ":rtc_base_tests_utils",
-      ":rtc_task_queue",
-      "../system_wrappers:system_wrappers",
-      "../test:test_support",
     ]
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@@ -866,9 +848,7 @@
     ]
     deps = [
       ":rtc_base_tests_main",
-      ":rtc_base_tests_utils",
       ":rtc_task_queue",
-      "../test:test_support",
     ]
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@@ -890,10 +870,8 @@
       "numerics/percentile_filter_unittest.cc",
     ]
     deps = [
-      ":rtc_base_approved",
       ":rtc_base_tests_main",
       ":rtc_numerics",
-      "../test:test_support",
     ]
   }
 
@@ -959,8 +937,6 @@
     }
     deps = [
       ":rtc_base_tests_main",
-      ":rtc_base_tests_utils",
-      "../test:test_support",
     ]
     public_deps = [
       ":rtc_base",