GN: Tighten up test target visibility + refactorings

Make all rtc_source_test target that contains tests that
are included in a test executable only be visible to the
rtc_test target. Doing this exposed a couple of errors and
dependency problems that were resolved. Having this could
have prevented duplicated execution of tests like the case that
was recently fixed by deadbeef@ in
https://codereview.webrtc.org/2820263004

New targets:
* //webrtc/modules/rtp_rtcp:fec_test_helper
* //webrtc/modules/rtp_rtcp:mock_rtp_rtcp
* //webrtc/modules/remote_bitrate_estimator:mock_remote_bitrate_observer

The mock files and targets should probably be moved into webrtc/test in
the future, but that's out of the scope of this CL.

BUG=webrtc:5716
NOTRY=True

Review-Url: https://codereview.webrtc.org/2828793003
Cr-Commit-Position: refs/heads/master@{#17863}

webrtc/BUILD.gn

@@ -282,7 +282,6 @@ if (!build_with_chromium) {
         ":video_engine_tests",
         ":webrtc_nonparallel_tests",
         ":webrtc_perf_tests",
-        "api:rtc_api_unittests",
         "base:rtc_base_tests_utils",
         "common_audio:common_audio_unittests",
         "common_video:common_video_unittests",
@@ -303,7 +302,6 @@ if (!build_with_chromium) {
         "test",
         "video:screenshare_loopback",
         "video:video_loopback",
-        "video:video_tests",
         "voice_engine:voice_engine_unittests",
       ]
       if (is_android) {
@@ -475,7 +473,6 @@ if (rtc_include_tests) {
       "modules/remote_bitrate_estimator:remote_bitrate_estimator_perf_tests",
       "test:test_main",
       "video:video_full_stack_tests",
-      "video:video_quality_test",
     ]
 
     data = webrtc_perf_tests_resources

webrtc/api/BUILD.gn

@@ -243,6 +243,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("rtc_api_unittests") {
     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:rtc_unittests" ]
+    }
     sources = [
       "ortc/mediadescription_unittest.cc",
       "ortc/sessiondescription_unittest.cc",

webrtc/audio/BUILD.gn

@@ -54,6 +54,13 @@ if (rtc_include_tests) {
   rtc_source_set("audio_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:video_engine_tests" ]
+    }
+
     # TODO(kjellander): Remove (bugs.webrtc.org/6828)
     # This needs remote_bitrate_estimator to be moved to webrtc/api first.
     check_includes = false

webrtc/base/BUILD.gn

@@ -742,6 +742,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("rtc_base_nonparallel_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_nonparallel_tests" ]
+    }
     sources = [
       "cpu_time_unittest.cc",
       "filerotatingstream_unittest.cc",
@@ -769,6 +776,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("rtc_base_approved_unittests") {
     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:rtc_unittests" ]
+    }
     sources = [
       "array_view_unittest.cc",
       "atomicops_unittest.cc",
@@ -820,6 +834,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("rtc_task_queue_unittests") {
     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:rtc_unittests" ]
+    }
     sources = [
       "sequenced_task_checker_unittest.cc",
       "task_queue_unittest.cc",
@@ -837,6 +858,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("rtc_numerics_unittests") {
     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:rtc_unittests" ]
+    }
     sources = [
       "numerics/exp_filter_unittest.cc",
       "numerics/percentile_filter_unittest.cc",
@@ -854,6 +882,13 @@ if (rtc_include_tests) {
   }
   rtc_source_set("rtc_base_unittests") {
     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:rtc_unittests" ]
+    }
     sources = [
       "callback_unittest.cc",
       "crc32_unittest.cc",

webrtc/call/BUILD.gn

@@ -73,6 +73,13 @@ rtc_static_library("call") {
 if (rtc_include_tests) {
   rtc_source_set("call_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:video_engine_tests" ]
+    }
     sources = [
       "bitrate_allocator_unittest.cc",
       "bitrate_estimator_tests.cc",
@@ -105,6 +112,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("call_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 = [
       "call_perf_tests.cc",
       "rampup_tests.cc",

webrtc/modules/audio_coding/BUILD.gn

@@ -1168,6 +1168,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("audio_coding_modules_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/modules:modules_tests" ]
+    }
     sources = [
       "test/APITest.cc",
       "test/Channel.cc",
@@ -1212,6 +1219,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("audio_coding_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 = [
       "codecs/opus/opus_complexity_unittest.cc",
       "neteq/test/neteq_performance_unittest.cc",
@@ -2015,6 +2029,12 @@ if (rtc_include_tests) {
   rtc_source_set("audio_coding_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "acm2/acm_receiver_unittest.cc",
       "acm2/audio_coding_module_unittest.cc",

webrtc/modules/audio_conference_mixer/BUILD.gn

@@ -50,6 +50,13 @@ rtc_static_library("audio_conference_mixer") {
 if (rtc_include_tests) {
   rtc_source_set("audio_conference_mixer_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "test/audio_conference_mixer_unittest.cc",
     ]

webrtc/modules/audio_device/BUILD.gn

@@ -255,6 +255,13 @@ config("mock_audio_device_config") {
 if (rtc_include_tests) {
   rtc_source_set("audio_device_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "fine_audio_buffer_unittest.cc",
     ]

webrtc/modules/audio_mixer/BUILD.gn

@@ -66,6 +66,13 @@ rtc_static_library("audio_frame_manipulator") {
 if (rtc_include_tests) {
   rtc_source_set("audio_mixer_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "audio_frame_manipulator_unittest.cc",
       "audio_mixer_impl_unittest.cc",

webrtc/modules/audio_processing/BUILD.gn

@@ -485,6 +485,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("audio_processing_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "aec/echo_cancellation_unittest.cc",
       "aec/system_delay_unittest.cc",
@@ -651,6 +658,13 @@ if (rtc_include_tests) {
     #  //webrtc/modules:_modules_unittests__library
     check_includes = false
     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 = [
       "audio_processing_performance_unittest.cc",
       "level_controller/level_controller_complexity_unittest.cc",

webrtc/modules/bitrate_controller/BUILD.gn

@@ -46,6 +46,13 @@ rtc_static_library("bitrate_controller") {
 if (rtc_include_tests) {
   rtc_source_set("bitrate_controller_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "bitrate_controller_unittest.cc",
       "send_side_bandwidth_estimation_unittest.cc",

webrtc/modules/congestion_controller/BUILD.gn

@@ -62,6 +62,13 @@ rtc_static_library("congestion_controller") {
 if (rtc_include_tests) {
   rtc_source_set("congestion_controller_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "congestion_controller_unittest.cc",
       "congestion_controller_unittests_helper.cc",
@@ -83,8 +90,8 @@ if (rtc_include_tests) {
       "../../test:test_support",
       "../bitrate_controller:bitrate_controller",
       "../pacing:pacing",
+      "../remote_bitrate_estimator:mock_remote_bitrate_observer",
       "../remote_bitrate_estimator:remote_bitrate_estimator",
-      "../remote_bitrate_estimator:remote_bitrate_estimator_unittests",
       "../rtp_rtcp:rtp_rtcp",
       "//testing/gmock",
     ]

webrtc/modules/desktop_capture/BUILD.gn

@@ -35,6 +35,13 @@ rtc_static_library("primitives") {
 if (rtc_include_tests) {
   rtc_source_set("desktop_capture_modules_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/modules:modules_tests" ]
+    }
     sources = []
     deps = []
     if (rtc_desktop_capture_supported) {
@@ -57,6 +64,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("desktop_capture_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "blank_detector_desktop_capturer_wrapper_unittest.cc",
       "desktop_and_cursor_composer_unittest.cc",

webrtc/modules/media_file/BUILD.gn

@@ -43,6 +43,13 @@ rtc_static_library("media_file") {
 if (rtc_include_tests) {
   rtc_source_set("media_file_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "media_file_unittest.cc",
     ]

webrtc/modules/pacing/BUILD.gn

@@ -39,6 +39,13 @@ rtc_static_library("pacing") {
 if (rtc_include_tests) {
   rtc_source_set("pacing_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "alr_detector_unittest.cc",
       "bitrate_prober_unittest.cc",
@@ -52,7 +59,7 @@ if (rtc_include_tests) {
       "../../system_wrappers:system_wrappers",
       "../../test:test_support",
       "../rtp_rtcp",
-      "../rtp_rtcp:rtp_rtcp_unittests",
+      "../rtp_rtcp:mock_rtp_rtcp",
       "//testing/gmock",
     ]
 

webrtc/modules/remote_bitrate_estimator/BUILD.gn

@@ -127,6 +127,13 @@ if (rtc_include_tests) {
 
   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",
     ]
@@ -144,9 +151,15 @@ if (rtc_include_tests) {
 
   rtc_source_set("remote_bitrate_estimator_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "aimd_rate_control_unittest.cc",
-      "include/mock/mock_remote_bitrate_observer.h",
       "inter_arrival_unittest.cc",
       "overuse_detector_unittest.cc",
       "remote_bitrate_estimator_abs_send_time_unittest.cc",
@@ -162,6 +175,7 @@ if (rtc_include_tests) {
     ]
     deps = [
       ":bwe_simulator_lib",
+      ":mock_remote_bitrate_observer",
       ":remote_bitrate_estimator",
       "../..:webrtc_common",
       "../../base:rtc_base",
@@ -185,6 +199,17 @@ if (rtc_include_tests) {
     }
   }
 
+  rtc_source_set("mock_remote_bitrate_observer") {
+    testonly = true
+    sources = [
+      "include/mock/mock_remote_bitrate_observer.h",
+    ]
+    deps = [
+      ":remote_bitrate_estimator",
+      "../../test:test_support",
+    ]
+  }
+
   rtc_test("bwe_simulations_tests") {
     testonly = true
 

webrtc/modules/rtp_rtcp/BUILD.gn

@@ -192,6 +192,25 @@ rtc_static_library("rtp_rtcp") {
   }
 }
 
+rtc_source_set("fec_test_helper") {
+  testonly = true
+  sources = [
+    "source/fec_test_helper.cc",
+    "source/fec_test_helper.h",
+  ]
+  deps = [
+    ":rtp_rtcp",
+    "../../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" ]
+  }
+}
+
 if (rtc_include_tests) {
   rtc_executable("test_packet_masks_metrics") {
     testonly = true
@@ -210,6 +229,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("rtp_rtcp_modules_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/modules:modules_tests" ]
+    }
     sources = [
       "test/testFec/test_fec.cc",
     ]
@@ -224,13 +250,29 @@ if (rtc_include_tests) {
     }
   }
 
-  rtc_source_set("rtp_rtcp_unittests") {
+  rtc_source_set("mock_rtp_rtcp") {
     testonly = true
     sources = [
       "mocks/mock_rtp_rtcp.h",
+    ]
+    deps = [
+      ":rtp_rtcp",
+      "../../base:rtc_base_approved",
+      "../../test:test_support",
+    ]
+  }
+
+  rtc_source_set("rtp_rtcp_unittests") {
+    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/modules:modules_unittests" ]
+    }
+    sources = [
       "source/byte_io_unittest.cc",
-      "source/fec_test_helper.cc",
-      "source/fec_test_helper.h",
       "source/flexfec_header_reader_writer_unittest.cc",
       "source/flexfec_receiver_unittest.cc",
       "source/flexfec_sender_unittest.cc",
@@ -291,6 +333,8 @@ if (rtc_include_tests) {
       "test/testAPI/test_api_video.cc",
     ]
     deps = [
+      ":fec_test_helper",
+      ":mock_rtp_rtcp",
       ":rtp_rtcp",
       "../..:webrtc_common",
       "../../api:transport_api",

webrtc/modules/utility/BUILD.gn

@@ -42,6 +42,13 @@ rtc_static_library("utility") {
 if (rtc_include_tests) {
   rtc_source_set("utility_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "source/process_thread_impl_unittest.cc",
     ]

webrtc/modules/video_coding/BUILD.gn

@@ -379,6 +379,12 @@ if (rtc_include_tests) {
   rtc_source_set("video_coding_modules_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/modules:modules_tests" ]
+    }
     sources = [
       "codecs/h264/test/h264_impl_unittest.cc",
       "codecs/test/videoprocessor_integrationtest.cc",
@@ -479,6 +485,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("video_coding_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "codecs/test/packet_manipulator_unittest.cc",
       "codecs/test/stats_unittest.cc",

webrtc/modules/video_processing/BUILD.gn

@@ -98,6 +98,13 @@ if (rtc_build_with_neon) {
 if (rtc_include_tests) {
   rtc_source_set("video_processing_unittests") {
     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/modules:modules_unittests" ]
+    }
     sources = [
       "test/denoiser_test.cc",
     ]

webrtc/p2p/BUILD.gn

@@ -165,6 +165,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("rtc_p2p_unittests") {
     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:rtc_unittests" ]
+    }
     sources = [
       "base/asyncstuntcpsocket_unittest.cc",
       "base/dtlstransportchannel_unittest.cc",
@@ -238,6 +245,13 @@ rtc_static_library("libstunprober") {
 if (rtc_include_tests) {
   rtc_source_set("libstunprober_unittests") {
     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:rtc_unittests" ]
+    }
     sources = [
       "stunprober/stunprober_unittest.cc",
     ]

webrtc/sdk/BUILD.gn

@@ -263,6 +263,13 @@ if (is_ios || is_mac) {
   if (rtc_include_tests) {
     rtc_source_set("rtc_sdk_peerconnection_objc_unittests") {
       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:rtc_unittests" ]
+      }
       sources = [
         "objc/Framework/UnitTests/RTCConfigurationTest.mm",
         "objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm",

webrtc/test/BUILD.gn

@@ -308,6 +308,7 @@ rtc_test("test_support_unittests") {
 }
 rtc_source_set("fileutils_unittests") {
   testonly = true
+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
     "testsupport/fileutils_unittest.cc",
   ]

webrtc/test/fuzzers/BUILD.gn

@@ -82,7 +82,7 @@ webrtc_fuzzer_test("flexfec_header_reader_fuzzer") {
     "flexfec_header_reader_fuzzer.cc",
   ]
   deps = [
-    "../../modules/rtp_rtcp/",
+    "../../modules/rtp_rtcp",
   ]
 }
 
@@ -91,7 +91,7 @@ webrtc_fuzzer_test("flexfec_sender_fuzzer") {
     "flexfec_sender_fuzzer.cc",
   ]
   deps = [
-    "../../modules/rtp_rtcp/",
+    "../../modules/rtp_rtcp",
   ]
   libfuzzer_options = [ "max_len=200" ]
 }
@@ -101,7 +101,8 @@ webrtc_fuzzer_test("ulpfec_header_reader_fuzzer") {
     "ulpfec_header_reader_fuzzer.cc",
   ]
   deps = [
-    "../../modules/rtp_rtcp/",
+    "../../modules/rtp_rtcp",
+    "../../modules/rtp_rtcp:fec_test_helper",
   ]
 }
 
@@ -110,7 +111,9 @@ webrtc_fuzzer_test("ulpfec_generator_fuzzer") {
     "ulpfec_generator_fuzzer.cc",
   ]
   deps = [
-    "../../modules/rtp_rtcp/",
+    "../../base:rtc_base_approved",
+    "../../modules/rtp_rtcp",
+    "../../modules/rtp_rtcp:fec_test_helper",
   ]
 }
 
@@ -119,7 +122,7 @@ webrtc_fuzzer_test("flexfec_receiver_fuzzer") {
     "flexfec_receiver_fuzzer.cc",
   ]
   deps = [
-    "../../modules/rtp_rtcp/",
+    "../../modules/rtp_rtcp",
   ]
   libfuzzer_options = [ "max_len=2000" ]
 }
@@ -139,7 +142,7 @@ webrtc_fuzzer_test("rtcp_receiver_fuzzer") {
     "rtcp_receiver_fuzzer.cc",
   ]
   deps = [
-    "../../modules/rtp_rtcp/",
+    "../../modules/rtp_rtcp",
   ]
   seed_corpus = "corpora/rtcp-corpus"
 }
@@ -149,7 +152,7 @@ webrtc_fuzzer_test("rtp_packet_fuzzer") {
     "rtp_packet_fuzzer.cc",
   ]
   deps = [
-    "../../modules/rtp_rtcp/",
+    "../../modules/rtp_rtcp",
   ]
   seed_corpus = "corpora/rtp-corpus"
 }
@@ -159,7 +162,7 @@ webrtc_fuzzer_test("rtp_header_fuzzer") {
     "rtp_header_fuzzer.cc",
   ]
   deps = [
-    "../../modules/rtp_rtcp/",
+    "../../modules/rtp_rtcp",
   ]
 }
 

webrtc/tools/network_tester/BUILD.gn

@@ -68,11 +68,18 @@ if (rtc_enable_protobuf) {
   }
 
   rtc_source_set("network_tester_unittests") {
+    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/tools:tools_unittests" ]
+    }
     sources = [
       "network_tester_unittest.cc",
     ]
 
-    testonly = true
     deps = [
       ":network_tester",
       "//testing/gtest",

webrtc/video/BUILD.gn

@@ -82,6 +82,7 @@ rtc_static_library("video") {
 if (rtc_include_tests) {
   rtc_source_set("video_quality_test") {
     testonly = true
+    visibility = [ ":*" ]  # Only targets in this file can depend on this.
     sources = [
       "video_quality_test.cc",
       "video_quality_test.h",
@@ -114,6 +115,13 @@ if (rtc_include_tests) {
 
   rtc_source_set("video_full_stack_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 = [
       "full_stack_tests.cc",
     ]
@@ -213,6 +221,13 @@ if (rtc_include_tests) {
   # TODO(pbos): Rename test suite.
   rtc_source_set("video_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:video_engine_tests" ]
+    }
     defines = []
     sources = [
       "call_stats_unittest.cc",
@@ -245,7 +260,7 @@ if (rtc_include_tests) {
       "../media:rtc_media_tests_utils",
       "../modules/pacing",
       "../modules/rtp_rtcp",
-      "../modules/rtp_rtcp:rtp_rtcp_unittests",
+      "../modules/rtp_rtcp:mock_rtp_rtcp",
       "../modules/utility",
       "../modules/video_coding",
       "../modules/video_coding:video_coding_utility",