Remove from chromium build targets that are not compatible with it.

We need to be able build chromium with rtc_include_tests = true. It
reveals a lot of targets that are not compatible with chromium but
aren't marked so.

`rtc_include_tests=true` has been considered a way to disable targets for the Chromium build, causing an overload on rtc_include_tests while the meaning of the two GN args (rtc_include_tests and build_with_chromium) should be kept separated.

Bug: webrtc:12404
Change-Id: I2f72825445916eae7c20ef9338672d6a07a9b9ff
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/203890
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Andrey Logvin <landrey@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33124}

BUILD.gn

@@ -527,7 +527,7 @@ if (use_libfuzzer || use_afl) {
   }
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   rtc_test("rtc_unittests") {
     testonly = true
 

api/BUILD.gn

@@ -434,6 +434,21 @@ rtc_library("test_dependency_factory") {
 }
 
 if (rtc_include_tests) {
+  # TODO(srte): Move to network_emulation sub directory.
+  rtc_library("create_network_emulation_manager") {
+    visibility = [ "*" ]
+    testonly = true
+    sources = [
+      "test/create_network_emulation_manager.cc",
+      "test/create_network_emulation_manager.h",
+    ]
+    deps = [
+      ":network_emulation_manager_api",
+      "../test/network:emulated_network",
+    ]
+  }
+
+  if (!build_with_chromium) {
     rtc_library("create_video_quality_test_fixture_api") {
       visibility = [ "*" ]
       testonly = true
@@ -450,20 +465,6 @@ if (rtc_include_tests) {
       ]
     }
 
-  # TODO(srte): Move to network_emulation sub directory.
-  rtc_library("create_network_emulation_manager") {
-    visibility = [ "*" ]
-    testonly = true
-    sources = [
-      "test/create_network_emulation_manager.cc",
-      "test/create_network_emulation_manager.h",
-    ]
-    deps = [
-      ":network_emulation_manager_api",
-      "../test/network:emulated_network",
-    ]
-  }
-
     rtc_library("create_peerconnection_quality_test_fixture") {
       visibility = [ "*" ]
       testonly = true
@@ -480,6 +481,7 @@ if (rtc_include_tests) {
         "../test/pc/e2e:peerconnection_quality_test",
       ]
     }
+  }
 }
 
 rtc_library("create_frame_generator") {
@@ -705,7 +707,7 @@ rtc_source_set("function_view") {
 }
 
 if (rtc_include_tests) {
-  if (rtc_enable_protobuf) {
+  if (rtc_enable_protobuf && !build_with_chromium) {
     rtc_library("audioproc_f_api") {
       visibility = [ "*" ]
       testonly = true

audio/BUILD.gn

@@ -192,7 +192,7 @@ if (rtc_include_tests) {
     ]
   }
 
-  if (rtc_enable_protobuf) {
+  if (rtc_enable_protobuf && !build_with_chromium) {
     rtc_test("low_bandwidth_audio_test") {
       testonly = true
 
@@ -279,6 +279,7 @@ if (rtc_include_tests) {
     }
   }
 
+  if (!build_with_chromium) {
     rtc_library("audio_perf_tests") {
       testonly = true
 
@@ -305,4 +306,5 @@ if (rtc_include_tests) {
 
       data = [ "//resources/voice_engine/audio_dtx16.wav" ]
     }
+  }
 }

audio/voip/test/BUILD.gn

@@ -19,6 +19,7 @@ if (rtc_include_tests) {
     ]
   }
 
+  if (!build_with_chromium) {
     rtc_library("voip_core_unittests") {
       testonly = true
       sources = [ "voip_core_unittest.cc" ]
@@ -35,6 +36,7 @@ if (rtc_include_tests) {
         "../../../test:test_support",
       ]
     }
+  }
 
   rtc_library("audio_channel_unittests") {
     testonly = true

call/BUILD.gn

@@ -387,6 +387,7 @@ rtc_library("fake_network") {
 }
 
 if (rtc_include_tests) {
+  if (!build_with_chromium) {
     rtc_library("call_tests") {
       testonly = true
 
@@ -527,6 +528,7 @@ if (rtc_include_tests) {
       ]
       absl_deps = [ "//third_party/abseil-cpp/absl/flags:flag" ]
     }
+  }
 
   # TODO(eladalon): This should be moved, as with the TODO for |rtp_interfaces|.
   rtc_source_set("mock_rtp_interfaces") {

common_audio/BUILD.gn

@@ -335,7 +335,7 @@ if (rtc_build_with_neon) {
   }
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   rtc_test("common_audio_unittests") {
     visibility += webrtc_default_visibility
     testonly = true

common_video/BUILD.gn

@@ -71,7 +71,7 @@ rtc_source_set("frame_counts") {
   sources = [ "frame_counts.h" ]
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   common_video_resources = [ "../resources/foreman_cif.yuv" ]
 
   if (is_ios) {

logging/BUILD.gn

@@ -408,6 +408,7 @@ if (rtc_enable_protobuf) {
       ]
     }
 
+    if (!build_with_chromium) {
       rtc_executable("rtc_event_log_rtp_dump") {
         testonly = true
         sources = [ "rtc_event_log/rtc_event_log2rtp_dump.cc" ]
@@ -430,6 +431,7 @@ if (rtc_enable_protobuf) {
         ]
       }
     }
+  }
 }
 
 rtc_library("ice_log") {

media/BUILD.gn

@@ -521,6 +521,7 @@ if (rtc_include_tests) {
     ]
   }
 
+  if (!build_with_chromium) {
     rtc_media_unittests_resources = [
       "../resources/media/captured-320x240-2s-48.frames",
       "../resources/media/faces.1280x720_P420.yuv",
@@ -677,4 +678,5 @@ if (rtc_include_tests) {
         deps += [ "//third_party/usrsctp" ]
       }
     }
+  }
 }

modules/BUILD.gn

@@ -47,7 +47,7 @@ rtc_source_set("module_fec_api") {
   sources = [ "include/module_fec_types.h" ]
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   modules_tests_resources = [
     "../resources/audio_coding/testfile16kHz.pcm",
     "../resources/audio_coding/testfile32kHz.pcm",

modules/audio_coding/BUILD.gn

@@ -1301,10 +1301,11 @@ if (rtc_include_tests) {
     ]
   }
 
+  if (!build_with_chromium) {
     group("audio_coding_tests") {
       visibility += webrtc_default_visibility
       testonly = true
-    public_deps = [
+      public_deps = [  # no-presubmit-check TODO(webrtc:8603)
         ":acm_receive_test",
         ":acm_send_test",
         ":audio_codec_speed_tests",
@@ -1330,7 +1331,9 @@ if (rtc_include_tests) {
         ":webrtc_opus_fec_test",
       ]
       if (rtc_enable_protobuf) {
-      public_deps += [ ":neteq_rtpplay" ]
+        public_deps +=  # no-presubmit-check TODO(webrtc:8603)
+            [ ":neteq_rtpplay" ]
+      }
     }
   }
 
@@ -1469,6 +1472,7 @@ if (rtc_include_tests) {
     absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
   }
 
+  if (!build_with_chromium) {
     audio_decoder_unittests_resources =
         [ "../../resources/audio_coding/testfile32kHz.pcm" ]
 
@@ -1512,6 +1516,7 @@ if (rtc_include_tests) {
         deps += [ ":audio_decoder_unittests_bundle_data" ]
       }
     }
+  }
 
   if (rtc_enable_protobuf) {
     rtc_library("neteq_test_factory") {
@@ -1539,7 +1544,9 @@ if (rtc_include_tests) {
         "../../test:test_support",
       ]
     }
+  }
 
+  if (rtc_enable_protobuf && !build_with_chromium) {
     rtc_executable("neteq_rtpplay") {
       testonly = true
       visibility += [ "*" ]
@@ -1560,6 +1567,7 @@ if (rtc_include_tests) {
     }
   }
 
+  if (!build_with_chromium) {
     audio_codec_speed_tests_resources = [
       "//resources/audio_coding/music_stereo_48kHz.pcm",
       "//resources/audio_coding/speech_mono_16kHz.pcm",
@@ -1606,6 +1614,7 @@ if (rtc_include_tests) {
         "//testing/gtest",
       ]
     }
+  }
 
   rtc_library("neteq_test_support") {
     testonly = true
@@ -1632,6 +1641,7 @@ if (rtc_include_tests) {
     ]
   }
 
+  if (!build_with_chromium) {
     rtc_library("neteq_quality_test_support") {
       testonly = true
       sources = [
@@ -1837,6 +1847,7 @@ if (rtc_include_tests) {
 
       data = [ "../../resources/speech_and_misc_wb.pcm" ]
     }
+  }
 
   rtc_library("isac_test_util") {
     testonly = true
@@ -1846,6 +1857,7 @@ if (rtc_include_tests) {
     ]
   }
 
+  if (!build_with_chromium) {
     rtc_executable("isac_test") {
       testonly = true
 
@@ -1857,6 +1869,7 @@ if (rtc_include_tests) {
         "../../rtc_base:rtc_base_approved",
       ]
     }
+  }
 
   rtc_executable("g711_test") {
     testonly = true
@@ -1874,6 +1887,7 @@ if (rtc_include_tests) {
     deps = [ ":g722" ]
   }
 
+  if (!build_with_chromium) {
     rtc_executable("isac_api_test") {
       testonly = true
 
@@ -1889,7 +1903,8 @@ if (rtc_include_tests) {
     rtc_executable("isac_switch_samprate_test") {
       testonly = true
 
-    sources = [ "codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc" ]
+      sources =
+          [ "codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc" ]
 
       deps = [
         ":isac",
@@ -2095,6 +2110,7 @@ if (rtc_include_tests) {
         ]
       }
     }
+  }
 }
 
 # For backwards compatibility only! Use

modules/audio_device/BUILD.gn

@@ -367,7 +367,7 @@ rtc_source_set("mock_audio_device") {
   ]
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   rtc_library("audio_device_unittests") {
     testonly = true
 

modules/audio_mixer/BUILD.gn

@@ -119,6 +119,7 @@ if (rtc_include_tests) {
     ]
   }
 
+  if (!build_with_chromium) {
     rtc_executable("audio_mixer_test") {
       testonly = true
       sources = [ "audio_mixer_test.cc" ]
@@ -132,4 +133,5 @@ if (rtc_include_tests) {
         "//third_party/abseil-cpp/absl/flags:parse",
       ]
     }
+  }
 }

modules/audio_processing/BUILD.gn

@@ -309,6 +309,7 @@ if (rtc_include_tests) {
     ]
   }
 
+  if (!build_with_chromium) {
     group("audio_processing_tests") {
       testonly = true
       deps = [
@@ -447,6 +448,7 @@ if (rtc_include_tests) {
         ]
       }
     }
+  }
 
   rtc_library("audio_processing_perf_tests") {
     testonly = true
@@ -482,7 +484,7 @@ if (rtc_include_tests) {
     absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
   }
 
-  if (rtc_enable_protobuf) {
+  if (rtc_enable_protobuf && !build_with_chromium) {
     rtc_library("audioproc_f_impl") {
       testonly = true
       configs += [ ":apm_debug_dump" ]

modules/audio_processing/aec3/BUILD.gn

@@ -302,7 +302,6 @@ if (rtc_include_tests) {
       "..:apm_logging",
       "..:audio_buffer",
       "..:audio_processing",
-      "..:audio_processing_unittests",
       "..:high_pass_filter",
       "../../../api:array_view",
       "../../../api/audio:aec3_config",
@@ -363,5 +362,9 @@ if (rtc_include_tests) {
         "vector_math_unittest.cc",
       ]
     }
+
+    if (!build_with_chromium) {
+      deps += [ "..:audio_processing_unittests" ]
+    }
   }
 }

modules/audio_processing/agc2/rnn_vad/BUILD.gn

@@ -312,6 +312,7 @@ if (rtc_include_tests) {
     }
   }
 
+  if (!build_with_chromium) {
     rtc_executable("rnn_vad_tool") {
       testonly = true
       sources = [ "rnn_vad_tool.cc" ]
@@ -328,4 +329,5 @@ if (rtc_include_tests) {
         "//third_party/abseil-cpp/absl/flags:parse",
       ]
     }
+  }
 }

modules/audio_processing/ns/BUILD.gn

@@ -80,7 +80,6 @@ if (rtc_include_tests) {
       "..:apm_logging",
       "..:audio_buffer",
       "..:audio_processing",
-      "..:audio_processing_unittests",
       "..:high_pass_filter",
       "../../../api:array_view",
       "../../../rtc_base:checks",
@@ -98,5 +97,9 @@ if (rtc_include_tests) {
     if (rtc_enable_protobuf) {
       sources += []
     }
+
+    if (!build_with_chromium) {
+      deps += [ "..:audio_processing_unittests" ]
+    }
   }
 }

modules/audio_processing/test/conversational_speech/BUILD.gn

@@ -8,12 +8,13 @@
 
 import("../../../../webrtc.gni")
 
-group("conversational_speech") {
+if (!build_with_chromium) {
+  group("conversational_speech") {
     testonly = true
     deps = [ ":conversational_speech_generator" ]
-}
+  }
 
-rtc_executable("conversational_speech_generator") {
+  rtc_executable("conversational_speech_generator") {
     testonly = true
     sources = [ "generator.cc" ]
     deps = [
@@ -23,6 +24,7 @@ rtc_executable("conversational_speech_generator") {
       "//third_party/abseil-cpp/absl/flags:flag",
       "//third_party/abseil-cpp/absl/flags:parse",
     ]
+  }
 }
 
 rtc_library("lib") {

modules/audio_processing/test/py_quality_assessment/BUILD.gn

@@ -8,15 +8,16 @@
 
 import("../../../../webrtc.gni")
 
-group("py_quality_assessment") {
+if (!build_with_chromium) {
+  group("py_quality_assessment") {
     testonly = true
     deps = [
       ":scripts",
       ":unit_tests",
     ]
-}
+  }
 
-copy("scripts") {
+  copy("scripts") {
     testonly = true
     sources = [
       "README.md",
@@ -35,18 +36,18 @@ copy("scripts") {
       "../../../../resources/audio_processing/test/py_quality_assessment:probing_signals",
       "../../../../rtc_tools:audioproc_f",
     ]
-}
+  }
 
-copy("apm_configs") {
+  copy("apm_configs") {
     testonly = true
     sources = [ "apm_configs/default.json" ]
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
     outputs = [
       "$root_build_dir/py_quality_assessment/apm_configs/{{source_file_part}}",
     ]
-}  # apm_configs
+  }  # apm_configs
 
-copy("lib") {
+  copy("lib") {
     testonly = true
     sources = [
       "quality_assessment/__init__.py",
@@ -75,17 +76,17 @@ copy("lib") {
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
     outputs = [ "$root_build_dir/py_quality_assessment/quality_assessment/{{source_file_part}}" ]
     deps = [ "../../../../resources/audio_processing/test/py_quality_assessment:noise_tracks" ]
-}
+  }
 
-copy("output") {
+  copy("output") {
     testonly = true
     sources = [ "output/README.md" ]
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
     outputs =
         [ "$root_build_dir/py_quality_assessment/output/{{source_file_part}}" ]
-}
+  }
 
-group("unit_tests") {
+  group("unit_tests") {
     testonly = true
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
     deps = [
@@ -95,9 +96,9 @@ group("unit_tests") {
       ":scripts_unit_tests",
       ":vad",
     ]
-}
+  }
 
-rtc_executable("fake_polqa") {
+  rtc_executable("fake_polqa") {
     testonly = true
     sources = [ "quality_assessment/fake_polqa.cc" ]
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
@@ -106,9 +107,9 @@ rtc_executable("fake_polqa") {
       "../../../../rtc_base:checks",
       "../../../../rtc_base:rtc_base_approved",
     ]
-}
+  }
 
-rtc_executable("vad") {
+  rtc_executable("vad") {
     testonly = true
     sources = [ "quality_assessment/vad.cc" ]
     deps = [
@@ -117,9 +118,9 @@ rtc_executable("vad") {
       "//third_party/abseil-cpp/absl/flags:flag",
       "//third_party/abseil-cpp/absl/flags:parse",
     ]
-}
+  }
 
-rtc_executable("apm_vad") {
+  rtc_executable("apm_vad") {
     testonly = true
     sources = [ "quality_assessment/apm_vad.cc" ]
     deps = [
@@ -130,9 +131,9 @@ rtc_executable("apm_vad") {
       "//third_party/abseil-cpp/absl/flags:flag",
       "//third_party/abseil-cpp/absl/flags:parse",
     ]
-}
+  }
 
-rtc_executable("sound_level") {
+  rtc_executable("sound_level") {
     testonly = true
     sources = [ "quality_assessment/sound_level.cc" ]
     deps = [
@@ -142,9 +143,9 @@ rtc_executable("sound_level") {
       "//third_party/abseil-cpp/absl/flags:flag",
       "//third_party/abseil-cpp/absl/flags:parse",
     ]
-}
+  }
 
-copy("lib_unit_tests") {
+  copy("lib_unit_tests") {
     testonly = true
     sources = [
       "quality_assessment/annotations_unittest.py",
@@ -158,11 +159,12 @@ copy("lib_unit_tests") {
     ]
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
     outputs = [ "$root_build_dir/py_quality_assessment/quality_assessment/{{source_file_part}}" ]
-}
+  }
 
-copy("scripts_unit_tests") {
+  copy("scripts_unit_tests") {
     testonly = true
     sources = [ "apm_quality_assessment_unittest.py" ]
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
     outputs = [ "$root_build_dir/py_quality_assessment/{{source_file_part}}" ]
+  }
 }

modules/audio_processing/transient/BUILD.gn

@@ -49,6 +49,7 @@ rtc_library("transient_suppressor_impl") {
 }
 
 if (rtc_include_tests) {
+  if (!build_with_chromium) {
     rtc_executable("click_annotate") {
       testonly = true
       sources = [
@@ -86,6 +87,7 @@ if (rtc_include_tests) {
         "//third_party/abseil-cpp/absl/flags:parse",
       ]
     }
+  }
 
   rtc_library("transient_suppression_unittests") {
     testonly = true

modules/congestion_controller/BUILD.gn

@@ -39,7 +39,7 @@ rtc_library("congestion_controller") {
   }
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   rtc_library("congestion_controller_unittests") {
     testonly = true
 

modules/congestion_controller/goog_cc/BUILD.gn

@@ -257,6 +257,7 @@ if (rtc_include_tests) {
     ]
     absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
   }
+  if (!build_with_chromium) {
     rtc_library("goog_cc_unittests") {
       testonly = true
 
@@ -306,4 +307,5 @@ if (rtc_include_tests) {
         "//testing/gmock",
       ]
     }
+  }
 }

modules/congestion_controller/pcc/BUILD.gn

@@ -98,7 +98,7 @@ rtc_library("bitrate_controller") {
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   rtc_library("pcc_unittests") {
     testonly = true
     sources = [

modules/rtp_rtcp/BUILD.gn

@@ -436,6 +436,7 @@ rtc_library("mock_rtp_rtcp") {
 }
 
 if (rtc_include_tests) {
+  if (!build_with_chromium) {
     rtc_executable("test_packet_masks_metrics") {
       testonly = true
 
@@ -452,6 +453,7 @@ if (rtc_include_tests) {
         "//testing/gtest",
       ]
     }  # test_packet_masks_metrics
+  }
 
   rtc_library("rtp_rtcp_modules_tests") {
     testonly = true

pc/BUILD.gn

@@ -809,7 +809,7 @@ rtc_source_set("libjingle_peerconnection") {
   ]
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   rtc_test("rtc_pc_unittests") {
     testonly = true
 

resources/audio_processing/test/py_quality_assessment/BUILD.gn

@@ -8,7 +8,7 @@
 
 import("../../../../webrtc.gni")
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   copy("noise_tracks") {
     testonly = true
     sources = [ "noise_tracks/city.wav" ]

rtc_base/BUILD.gn

@@ -1279,6 +1279,22 @@ if (rtc_include_tests) {
     ]
   }
 
+  rtc_library("rtc_operations_chain_unittests") {
+    testonly = true
+
+    sources = [ "operations_chain_unittest.cc" ]
+    deps = [
+      ":gunit_helpers",
+      ":rtc_base",
+      ":rtc_base_approved",
+      ":rtc_event",
+      ":rtc_operations_chain",
+      ":threading",
+      "../test:test_support",
+    ]
+  }
+
+  if (!build_with_chromium) {
     rtc_library("rtc_base_nonparallel_tests") {
       testonly = true
 
@@ -1425,21 +1441,6 @@ if (rtc_include_tests) {
       absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
     }
 
-  rtc_library("rtc_operations_chain_unittests") {
-    testonly = true
-
-    sources = [ "operations_chain_unittest.cc" ]
-    deps = [
-      ":gunit_helpers",
-      ":rtc_base",
-      ":rtc_base_approved",
-      ":rtc_event",
-      ":rtc_operations_chain",
-      ":threading",
-      "../test:test_support",
-    ]
-  }
-
     rtc_library("weak_ptr_unittests") {
       testonly = true
 
@@ -1580,6 +1581,7 @@ if (rtc_include_tests) {
         configs += [ ":external_ssl_library" ]
       }
     }
+  }
 }
 
 if (is_android) {

rtc_base/experiments/BUILD.gn

@@ -231,7 +231,7 @@ rtc_library("min_video_bitrate_experiment") {
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   rtc_library("experiments_unittests") {
     testonly = true
 

rtc_base/synchronization/BUILD.gn

@@ -106,6 +106,7 @@ if (rtc_include_tests) {
     }
   }
 
+  if (!build_with_chromium) {
     rtc_library("sequence_checker_unittests") {
       testonly = true
 
@@ -120,4 +121,5 @@ if (rtc_include_tests) {
         "../../test:test_support",
       ]
     }
+  }
 }

rtc_tools/BUILD.gn

@@ -24,27 +24,28 @@ group("rtc_tools") {
       ":rgba_to_i420_converter",
       ":video_quality_analysis",
     ]
-    if (rtc_enable_protobuf) {
+  }
+  if (!build_with_chromium && rtc_enable_protobuf) {
     deps += [ ":chart_proto" ]
   }
-  }
+  if (!build_with_chromium && rtc_include_tests) {
-
-  if (rtc_include_tests) {
     deps += [
       ":tools_unittests",
       ":yuv_to_ivf_converter",
     ]
-    if (rtc_enable_protobuf) {
-      if (!build_with_chromium) {
-        deps += [ ":event_log_visualizer" ]
   }
+  if (rtc_include_tests && rtc_enable_protobuf) {
     deps += [
-        ":audioproc_f",
       ":rtp_analyzer",
-        ":unpack_aecdump",
       "network_tester",
     ]
   }
+  if (rtc_include_tests && rtc_enable_protobuf && !build_with_chromium) {
+    deps += [
+      ":audioproc_f",
+      ":event_log_visualizer",
+      ":unpack_aecdump",
+    ]
   }
 }
 
@@ -403,6 +404,7 @@ if (!build_with_chromium) {
 }
 
 if (rtc_include_tests) {
+  if (!build_with_chromium) {
     rtc_executable("yuv_to_ivf_converter") {
       visibility = [ "*" ]
       testonly = true
@@ -438,7 +440,7 @@ if (rtc_include_tests) {
       ]
     }
 
-  if (rtc_enable_protobuf && !build_with_chromium) {
+    if (rtc_enable_protobuf) {
       rtc_executable("event_log_visualizer") {
         testonly = true
         sources = [ "rtc_event_log_visualizer/main.cc" ]
@@ -551,17 +553,6 @@ if (rtc_include_tests) {
         ]
       }
 
-    copy("rtp_analyzer") {
-      sources = [
-        "py_event_log_analyzer/misc.py",
-        "py_event_log_analyzer/pb_parse.py",
-        "py_event_log_analyzer/rtp_analyzer.py",
-        "py_event_log_analyzer/rtp_analyzer.sh",
-      ]
-      outputs = [ "$root_build_dir/{{source_file_part}}" ]
-      deps = [ "../logging:rtc_event_log_proto" ]
-    }  # rtp_analyzer
-
       rtc_executable("unpack_aecdump") {
         visibility = [ "*" ]
         testonly = true
@@ -583,4 +574,18 @@ if (rtc_include_tests) {
         ]
       }  # unpack_aecdump
     }
+  }
+
+  if (rtc_enable_protobuf) {
+    copy("rtp_analyzer") {
+      sources = [
+        "py_event_log_analyzer/misc.py",
+        "py_event_log_analyzer/pb_parse.py",
+        "py_event_log_analyzer/rtp_analyzer.py",
+        "py_event_log_analyzer/rtp_analyzer.sh",
+      ]
+      outputs = [ "$root_build_dir/{{source_file_part}}" ]
+      deps = [ "../logging:rtc_event_log_proto" ]
+    }  # rtp_analyzer
+  }
 }

stats/BUILD.gn

@@ -44,7 +44,7 @@ rtc_library("rtc_stats_test_utils") {
   ]
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   rtc_test("rtc_stats_unittests") {
     testonly = true
     sources = [

system_wrappers/BUILD.gn

@@ -108,7 +108,7 @@ rtc_library("metrics") {
   ]
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   rtc_test("system_wrappers_unittests") {
     testonly = true
     sources = [

test/BUILD.gn

@@ -13,7 +13,8 @@ if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
-group("test") {
+if (!build_with_chromium) {
+  group("test") {
     testonly = true
 
     deps = [
@@ -32,6 +33,7 @@ group("test") {
         "pc/e2e",
       ]
     }
+  }
 }
 
 rtc_library("frame_generator_impl") {
@@ -389,7 +391,16 @@ rtc_library("video_test_support") {
   }
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && enable_google_benchmarks) {
+  rtc_library("benchmark_main") {
+    testonly = true
+    sources = [ "benchmark_main.cc" ]
+
+    deps = [ "//third_party/google_benchmark" ]
+  }
+}
+
+if (rtc_include_tests && !build_with_chromium) {
   rtc_library("resources_dir_flag") {
     testonly = true
     visibility = [ "*" ]
@@ -446,15 +457,6 @@ if (rtc_include_tests) {
     ]
   }
 
-  if (enable_google_benchmarks) {
-    rtc_library("benchmark_main") {
-      testonly = true
-      sources = [ "benchmark_main.cc" ]
-
-      deps = [ "//third_party/google_benchmark" ]
-    }
-  }
-
   rtc_library("test_support_test_artifacts") {
     testonly = true
     sources = [
@@ -578,7 +580,7 @@ if (rtc_include_tests) {
       deps += [ ":test_support_unittests_bundle_data" ]
     }
 
-    if (!is_android && !build_with_chromium) {
+    if (!is_android) {
       # This is needed in order to avoid:
       # undefined symbol: webrtc::videocapturemodule::VideoCaptureImpl::Create
       deps += [ "../modules/video_capture:video_capture_internal_impl" ]

test/network/BUILD.gn

@@ -94,7 +94,7 @@ rtc_library("network_emulation_unittest") {
   ]
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   rtc_library("network_emulation_pc_unittest") {
     testonly = true
     sources = [ "network_emulation_pc_unittest.cc" ]
@@ -170,6 +170,7 @@ if (rtc_include_tests) {
     ]
   }
 
+  if (!build_with_chromium) {
     rtc_library("network_emulation_unittests") {
       testonly = true
       deps = [
@@ -179,4 +180,5 @@ if (rtc_include_tests) {
         ":network_emulation_unittest",
       ]
     }
+  }
 }

test/scenario/BUILD.gn

@@ -21,7 +21,7 @@ rtc_library("column_printer") {
   ]
 }
 
-if (rtc_include_tests) {
+if (rtc_include_tests && !build_with_chromium) {
   scenario_resources = [
     "../../resources/difficult_photo_1850_1110.yuv",
     "../../resources/photo_1850_1110.yuv",

video/BUILD.gn

@@ -335,7 +335,7 @@ if (rtc_include_tests) {
       "../test:test_support",
     ]
   }
-
+  if (!build_with_chromium) {
     rtc_library("video_quality_test") {
       testonly = true
 
@@ -569,6 +569,7 @@ if (rtc_include_tests) {
         "//third_party/abseil-cpp/absl/types:optional",
       ]
     }
+  }
 
   # TODO(pbos): Rename test suite.
   rtc_library("video_tests") {