Compile proprietary codecs on more builders and trybots.

These bots weren't building with these codecs and should have been. In
at least one case (Win Builder), the fact that the waterfall bot wasn't
building with the codecs represented a mismatch in configuration between
the waterfall bot and trybot.

This CL affects the configurations of the following machines:

  chromium.linux:Linux Builder (dbg)
  chromium.linux:Linux Builder (dbg)(32)
  chromium.linux:Linux Builder
  chromium.mac:Mac Builder (dbg)
  chromium.win:Win Builder
  chromium.win:Win Builder (dbg)
  chromium.win:Win x64 Builder
  chromium.win:Win x64 Builder (dbg)
  tryserver.chromium.linux:linux_chromium_dbg_32_ng
  tryserver.chromium.linux:linux_chromium_dbg_ng
  tryserver.chromium.mac:mac_chromium_compile_dbg_ng
  tryserver.chromium.mac:mac_chromium_dbg_ng
  tryserver.chromium.win:win10_chromium_x64_dbg_ng
  tryserver.chromium.win:win10_chromium_x64_rel_ng
  tryserver.chromium.win:win_chromium_compile_dbg_ng
  tryserver.chromium.win:win_chromium_dbg_ng
  tryserver.chromium.win:win_chromium_x64_rel_ng

Bug: 867536
Change-Id: I04584548cb903df49ab1071535612ea151310c88
Reviewed-on: https://chromium-review.googlesource.com/1150450Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578766}

testing/buildbot/chromium.win.json

@@ -814,6 +814,9 @@
         "test": "boringssl_ssl_tests"
       },
       {
+        "args": [
+          "--disable-features=WebRTC-H264WithOpenH264FFmpeg"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "shards": 10
@@ -823,7 +826,8 @@
       {
         "args": [
           "--enable-features=NetworkService",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_browser_tests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_browser_tests.filter",
+          "--disable-features=WebRTC-H264WithOpenH264FFmpeg"
         ],
         "name": "network_service_browser_tests",
         "swarming": {
@@ -915,6 +919,9 @@
         "test": "compositor_unittests"
       },
       {
+        "args": [
+          "--disable-features=WebRTC-H264WithOpenH264FFmpeg"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -1545,6 +1552,9 @@
         "test": "compositor_unittests"
       },
       {
+        "args": [
+          "--disable-features=WebRTC-H264WithOpenH264FFmpeg"
+        ],
         "experiment_percentage": 100,
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/test_suite_exceptions.pyl

@@ -219,6 +219,12 @@
           'shards': 20,
         },
       },
+      'Win10 Tests x64': {
+        # crbug.com/868082
+        'args': [
+          '--disable-features=WebRTC-H264WithOpenH264FFmpeg',
+        ],
+      },
     },
   },
   'cast_shell_browsertests': {
@@ -442,6 +448,16 @@
       # chromium.win
       'Win10 Tests x64 (dbg)': {
         'experiment_percentage': 100,
+        # crbug.com/868082
+        'args': [
+          '--disable-features=WebRTC-H264WithOpenH264FFmpeg',
+        ],
+      },
+      'Win10 Tests x64': {
+        # crbug.com/868082
+        'args': [
+          '--disable-features=WebRTC-H264WithOpenH264FFmpeg',
+        ],
       },
     },
   },
@@ -833,6 +849,15 @@
       'Win7 Tests (1)',  # For swarming capacity reasons.
       'Win10 Tests x64 (dbg)',  # Matches browser_tests.
     ],
+    'modifications': {
+      # chromium.win
+      'Win10 Tests x64': {
+        # crbug.com/868082
+        'args': [
+          '--disable-features=WebRTC-H264WithOpenH264FFmpeg',
+        ],
+      },
+    },
   },
   'network_service_components_browsertests': {
     'remove_from': [

tools/mb/mb_config.pyl

@@ -305,9 +305,9 @@
       'Fuchsia x64 Cast Audio': 'release_bot_fuchsia_cast_audio',
       'Fuchsia x64': 'release_bot_fuchsia',
       'Leak Detection Linux': 'release_bot',
-      'Linux Builder (dbg)': 'debug_bot',
-      'Linux Builder (dbg)(32)': 'debug_bot_x86',
-      'Linux Builder': 'release_bot',
+      'Linux Builder (dbg)': 'gpu_tests_debug_bot',
+      'Linux Builder (dbg)(32)': 'gpu_tests_debug_bot_x86',
+      'Linux Builder': 'gpu_tests_release_bot',
       'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
       'linux-jumbo-rel': 'jumbo_release_bot_minimal_symbols',
       'linux-ozone-rel': 'ozone_linux_release_bot',
@@ -337,7 +337,7 @@
 
     'chromium.mac': {
       'Mac Builder': 'gpu_tests_release_bot',
-      'Mac Builder (dbg)': 'debug_bot',
+      'Mac Builder (dbg)': 'gpu_tests_debug_bot',
       'mac-jumbo-rel': 'jumbo_release_bot_minimal_symbols',
       'ios-device': 'ios',
       'ios-device-xcode-clang': 'ios',
@@ -439,8 +439,8 @@
 
     'chromium.webrtc': {
       'Android Builder': 'android_debug_static_bot_arm64',
-      'Linux Builder': 'release_bot_chrome_with_codecs',
-      'Mac Builder': 'release_bot_chrome_with_codecs',
+      'Linux Builder': 'gpu_tests_release_bot',
+      'Mac Builder': 'gpu_tests_release_bot',
       'Win Builder': 'release_bot_x86_minimal_symbols_no_com_init_hooks_with_codecs',
     },
 
@@ -448,9 +448,9 @@
       'Android Builder': 'android_release_bot_minimal_symbols',
       'Android Builder (dbg)': 'android_debug_static_bot',
       'Android Builder ARM64 (dbg)': 'android_debug_static_bot_arm64',
-      'Linux Builder': 'release_bot_chrome_with_codecs',
+      'Linux Builder': 'gpu_tests_release_bot',
       'Linux Builder (dbg)': 'debug_bot',
-      'Mac Builder': 'release_bot_chrome_with_codecs',
+      'Mac Builder': 'gpu_tests_release_bot',
       'Mac Builder (dbg)': 'debug_bot',
       'Win Builder': 'release_bot_x86_minimal_symbols_no_com_init_hooks_with_codecs',
       'Win Builder (dbg)': 'debug_bot_x86_minimal_symbols_no_com_init_hooks_with_codecs',
@@ -458,11 +458,11 @@
 
     'chromium.win': {
       # Windows bots take too long to link w/ full symbols and time out.
-      'Win Builder': 'release_bot_x86_minimal_symbols',
-      'Win Builder (dbg)': 'debug_bot_x86_minimal_symbols',
+      'Win Builder': 'gpu_tests_release_bot_x86_minimal_symbols',
+      'Win Builder (dbg)': 'gpu_tests_debug_bot_x86_minimal_symbols',
       'win-jumbo-rel': 'jumbo_release_bot_minimal_symbols',
-      'Win x64 Builder': 'release_bot_minimal_symbols',
-      'Win x64 Builder (dbg)': 'debug_bot_minimal_symbols',
+      'Win x64 Builder': 'gpu_tests_release_bot_minimal_symbols',
+      'Win x64 Builder (dbg)': 'gpu_tests_debug_bot_minimal_symbols',
     },
 
     'internal.client.kitchensync': {
@@ -594,8 +594,8 @@
       'linux_chromium_compile_dbg_32_ng': 'debug_trybot_x86',
       'linux_chromium_compile_dbg_ng': 'debug_trybot',
       'linux_chromium_compile_rel_ng': 'release_trybot',
-      'linux_chromium_dbg_32_ng': 'debug_trybot_x86',
-      'linux_chromium_dbg_ng': 'debug_trybot',
+      'linux_chromium_dbg_32_ng': 'gpu_tests_debug_trybot_x86',
+      'linux_chromium_dbg_ng': 'gpu_tests_debug_trybot',
       'linux_chromium_gn_upload': 'gn_linux_upload',
       'linux_chromium_headless_rel': 'headless_linux_release_trybot',
 
@@ -632,9 +632,9 @@
       'mac_chromium_10.13_rel_ng': 'release_trybot',
       'mac_chromium_archive_rel_ng': 'release_bot_mac_strip',
       'mac_chromium_asan_rel_ng': 'asan_dcheck_disable_nacl_release_bot',
-      'mac_chromium_compile_dbg_ng': 'debug_trybot',
+      'mac_chromium_compile_dbg_ng': 'gpu_tests_debug_trybot',
       'mac_chromium_compile_rel_ng': 'gpu_tests_release_trybot',
-      'mac_chromium_dbg_ng': 'debug_trybot',
+      'mac_chromium_dbg_ng': 'gpu_tests_debug_trybot',
       'mac_chromium_gn_upload': 'release_bot',
       'mac_chromium_rel_ng': 'gpu_tests_release_trybot',
       'mac_nacl_sdk': 'release_bot',
@@ -658,18 +658,18 @@
       'gpu_manual_try_win7_nvidia_rel': 'gpu_fyi_tests_release_trybot_x86',
       'win7_chromium_rel_ng': 'gpu_tests_release_trybot_x86_minimal_symbols',
       'win7_chromium_rel_loc_exp': 'gpu_tests_release_trybot_x86_minimal_symbols',
-      'win10_chromium_x64_dbg_ng': 'debug_trybot',
-      'win10_chromium_x64_rel_ng': 'release_trybot',
+      'win10_chromium_x64_dbg_ng': 'gpu_tests_debug_trybot',
+      'win10_chromium_x64_rel_ng': 'gpu_tests_release_trybot',
       'win10_chromium_x64_rel_ng_exp': 'release_trybot',
       'win-annotator-rel': 'release_trybot',
       'win-jumbo-rel': 'jumbo_release_bot_minimal_symbols',
       'win_chromium_gn_upload': 'release_bot_x86_minimal_symbols',
       'win_x64_archive': 'release_trybot',
       'win_archive': 'release_trybot_x86',
-      'win_chromium_compile_dbg_ng': 'debug_trybot_x86_minimal_symbols',
+      'win_chromium_compile_dbg_ng': 'gpu_tests_debug_trybot_x86_minimal_symbols',
       'win_chromium_compile_rel_ng': 'gpu_tests_release_trybot_x86_minimal_symbols',
-      'win_chromium_dbg_ng': 'debug_trybot_x86_minimal_symbols',
-      'win_chromium_x64_rel_ng': 'release_trybot_minimal_symbols',
+      'win_chromium_dbg_ng': 'gpu_tests_debug_trybot_x86_minimal_symbols',
+      'win_chromium_x64_rel_ng': 'gpu_tests_release_trybot_minimal_symbols',
       'win_mojo': 'release_trybot_x86',
       'win_nacl_sdk': 'release_bot_x86_minimal_symbols',
       'win_nacl_sdk_build': 'release_bot_x86_minimal_symbols',
@@ -1189,10 +1189,6 @@
       'debug_bot', 'fuchsia',
     ],
 
-    'debug_bot_x86': [
-      'debug_bot', 'x86',
-    ],
-
     # compiler.gni implicitly sets symbol_level=1 on Windows if goma is enabled,
     # if MSVC is used.  Explicitly set it here so that it's set consistently for
     # both MSVC and clang.
@@ -1287,14 +1283,42 @@
       'gpu_tests', 'android', 'vulkan', 'release_trybot', 'arm64',
     ],
 
+    'gpu_tests_debug_bot': [
+      'gpu_tests', 'debug_bot',
+    ],
+
+    'gpu_tests_debug_bot_minimal_symbols': [
+      'gpu_tests', 'debug_bot', 'minimal_symbols',
+    ],
+
+    'gpu_tests_debug_bot_x86': [
+      'gpu_tests', 'debug_bot', 'x86',
+    ],
+
+    'gpu_tests_debug_bot_x86_minimal_symbols': [
+      'gpu_tests', 'debug_bot', 'x86', 'minimal_symbols',
+    ],
+
     'gpu_tests_debug_trybot': [
       'gpu_tests', 'debug_trybot',
     ],
 
+    'gpu_tests_debug_trybot_x86': [
+      'gpu_tests', 'debug_trybot', 'x86',
+    ],
+
     'gpu_tests_debug_trybot_x86_minimal_symbols': [
       'gpu_tests', 'debug_trybot', 'x86', 'minimal_symbols',
     ],
 
+    'gpu_tests_release_bot_minimal_symbols': [
+      'gpu_tests', 'release_bot', 'minimal_symbols',
+    ],
+
+    'gpu_tests_release_bot_x86_minimal_symbols': [
+      'gpu_tests', 'release_bot', 'x86', 'minimal_symbols',
+    ],
+
     'gpu_tests_release_trybot': [
       'gpu_tests', 'release_trybot',
     ],
@@ -1307,6 +1331,10 @@
       'gpu_tests', 'release_trybot', 'v8_concurrent_marking',
     ],
 
+    'gpu_tests_release_trybot_minimal_symbols': [
+      'gpu_tests', 'release_trybot', 'minimal_symbols',
+    ],
+
     'gpu_tests_release_trybot_x86_minimal_symbols': [
       'gpu_tests', 'release_trybot', 'x86', 'minimal_symbols',
     ],
@@ -1443,10 +1471,6 @@
       'release_bot', 'arm',
     ],
 
-    'release_bot_chrome_with_codecs': [
-      'release_bot', 'chrome_with_codecs',
-    ],
-
     'release_bot_enable_blink_heap_verification_dcheck_always_on': [
       'release_bot', 'enable_blink_heap_verification', 'dcheck_always_on',
     ],
@@ -1505,10 +1529,6 @@
       'release_trybot', 'dcheck_off',
     ],
 
-    'release_trybot_minimal_symbols': [
-      'release_trybot', 'minimal_symbols',
-    ],
-
     'release_trybot_arm': [
       'release_trybot', 'arm',
     ],