Reland of Enable GN check for webrtc/base

webrtc/test/BUILD.gn

Index: webrtc/test/BUILD.gn
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index c696979dd11105b7c4aed5bc81b74c28fca2978f..40ffc3854e1287ff33e4162f6ed0ed8d091d9658 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -22,12 +22,17 @@ group("test") {
     ":field_trial",
     ":rtp_test_utils",
     ":test_common",
-    ":test_main",
     ":test_renderer",
     ":test_support",
-    ":test_support_unittests",
     ":video_test_common",
   ]
+
+  if (!build_with_chromium) {
+    deps += [
+      ":test_main",
+      ":test_support_unittests",
+    ]
+  }
 }
 
 rtc_source_set("video_test_common") {
@@ -96,23 +101,50 @@ rtc_source_set("field_trial") {
   ]
 }
 
-test_support_unittests_resources = [
-  "//resources/foreman_cif_short.yuv",
-  "//resources/video_coding/frame-ethernet-ii.pcap",
-  "//resources/video_coding/frame-loopback.pcap",
-  "//resources/video_coding/pltype103.rtp",
-  "//resources/video_coding/pltype103_header_only.rtp",
-  "//resources/video_coding/ssrcs-2.pcap",
-  "//resources/video_coding/ssrcs-3.pcap",
-]
-
-if (is_ios) {
-  bundle_data("test_support_unittests_bundle_data") {
-    testonly = true
-    sources = test_support_unittests_resources
-    outputs = [
-      "{{bundle_resources_dir}}/{{source_file_part}}",
-    ]
+rtc_source_set("test_support") {
+  testonly = true
+
+  sources = [
+    "gmock.h",
+    "gtest.h",
+    "testsupport/packet_reader.cc",
+    "testsupport/packet_reader.h",
+    "testsupport/perf_test.cc",
+    "testsupport/perf_test.h",
+    "testsupport/trace_to_stderr.cc",
+    "testsupport/trace_to_stderr.h",
+    "testsupport/unittest_utils.h",
+  ]
+
+  deps = [
+    "..:webrtc_common",
+    "../base:gtest_prod",
+    "../base:rtc_base_approved",
+    "../common_video",
+    "../system_wrappers",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+
+  public_deps = [
+    ":fileutils",
+  ]
+
+  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_android) {
+    deps += [ "//base:base" ]
+  }
+
+  if (is_ios && !build_with_chromium) {

[kjellander_webrtc, 2017/04/28 11:52:24]

Actually, for the WebRTC build, this dependency should be moved to the
:fileutils target since that's where it's used (from
testsupport/iosfileutils.mm). 
I tried compiling with it moved and it passed as expected. Can you move it? Can
be done in a follow-up CL though, no need to block this.

[mbonadei, 2017/04/28 11:54:33]

Ok, I land this right away because I would like to avoid to run the trybots
again. I will open a CL in a few minutes.

[kjellander_webrtc, 2017/04/28 12:24:49]

After https://codereview.webrtc.org/2849823002/ we can let this remain a part of
test_support target, since it's only one object being pulled in. I'll let you
land first though, and rebase mine.

+    deps += [ "//webrtc/sdk:rtc_sdk_common_objc" ]
+  }
+
+  if (rtc_use_memcheck) {
+    data = valgrind_webrtc_dependencies
   }
 }
 
@@ -186,52 +218,36 @@ if (!build_with_chromium) {
     }
   }
 
-  rtc_source_set("test_support") {
+  rtc_source_set("test_support_isolated_output") {
     testonly = true
-
     sources = [
-      "gmock.h",
-      "gtest.h",
       "testsupport/isolated_output.cc",
       "testsupport/isolated_output.h",
-      "testsupport/packet_reader.cc",
-      "testsupport/packet_reader.h",
-      "testsupport/perf_test.cc",
-      "testsupport/perf_test.h",
-      "testsupport/trace_to_stderr.cc",
-      "testsupport/trace_to_stderr.h",
-      "testsupport/unittest_utils.h",
     ]
-
     deps = [
-      "../base:gtest_prod",
+      ":fileutils",
       "../base:rtc_base_approved",
-      "../common_video",
-      "../system_wrappers",
-      "//testing/gmock",
-      "//testing/gtest",
       "//third_party/gflags",
     ]
+  }
 
-    public_deps = [
-      ":fileutils",
-    ]
-
-    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_android) {
-      deps += [ "//base:base" ]
-    }
-
-    if (is_ios) {
-      deps += [ "//webrtc/sdk:rtc_sdk_common_objc" ]
-    }
+  test_support_unittests_resources = [
+    "//resources/foreman_cif_short.yuv",
+    "//resources/video_coding/frame-ethernet-ii.pcap",
+    "//resources/video_coding/frame-loopback.pcap",
+    "//resources/video_coding/pltype103.rtp",
+    "//resources/video_coding/pltype103_header_only.rtp",
+    "//resources/video_coding/ssrcs-2.pcap",
+    "//resources/video_coding/ssrcs-3.pcap",
+  ]
 
-    if (rtc_use_memcheck) {
-      data = valgrind_webrtc_dependencies
+  if (is_ios) {
+    bundle_data("test_support_unittests_bundle_data") {
+      testonly = true
+      sources = test_support_unittests_resources
+      outputs = [
+        "{{bundle_resources_dir}}/{{source_file_part}}",
+      ]
     }
   }
 
@@ -281,6 +297,7 @@ if (!build_with_chromium) {
       ":fileutils_unittests",
       ":test_common",
       ":test_main",
+      ":test_support_isolated_output",
       ":video_test_common",
       ":video_test_support",
       "../modules/video_capture",
@@ -423,7 +440,7 @@ rtc_source_set("test_common") {
     "//testing/gmock",
     "//testing/gtest",
   ]
-  if (!is_android) {
+  if (!is_android && !build_with_chromium) {
     deps += [ "../modules/video_capture:video_capture_internal_impl" ]
   }
 }