Make tab_capture_end2end_tests work as a regular windowed_test_launcher.

content/test/gpu/generate_buildbot_json.py

Index: content/test/gpu/generate_buildbot_json.py
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
index 57fde945f83ef0d203bb86f33b9ac76587640a69..2fae5bba62aee7203afb816b56df42ddea6a5665 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -1470,6 +1470,15 @@ COMMON_GTESTS = {
         'os_types': ['android'],
       },
     ],
+    'args': [
+      '--enable-gpu',
+      '--test-launcher-bot-mode',
+      '--test-launcher-jobs=1',
+      '--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:' + \
+          'TabCaptureApiPixelTest.EndToEnd*'
+    ],
+    'linux_args': [ '--no-xvfb' ],
+    'test': 'browser_tests',
   },
   'video_decode_accelerator_d3d11_unittest': {
     'tester_configs': [
@@ -1547,6 +1556,7 @@ NON_SWARMED_GTESTS = {
     'test': 'browser_tests',
     'args': [
       '--enable-gpu',
+      '--no-xvfb',
       '--test-launcher-jobs=1',
       '--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:' + \
           'TabCaptureApiPixelTest.EndToEnd*'
@@ -2086,6 +2096,9 @@ def matches_swarming_dimensions(tester_config, dimension_sets):
 def is_android(tester_config):
   return tester_config['os_type'] == 'android'
 
+def is_linux(tester_config):
+  return tester_config['os_type'] == 'linux'
+
 def is_asan(tester_config):
   return tester_config.get('is_asan', False)
 
@@ -2200,20 +2213,20 @@ def generate_gtest(tester_name, tester_config, test, test_config):
           }
         ]
       })
-  if 'desktop_args' in result:
-    if not is_android(tester_config):
-      if not 'args' in result:
-        result['args'] = []
-      result['args'] += result['desktop_args']
-    # Don't put the desktop args in the JSON.
-    result.pop('desktop_args')
-  if 'android_args' in result:
-    if is_android(tester_config):
-      if not 'args' in result:
-        result['args'] = []
-      result['args'] += result['android_args']
-    # Don't put the android args in the JSON.
-    result.pop('android_args')
+
+  def add_conditional_args(key, fn):
+    if key in result:
+      if fn(tester_config):
+        if not 'args' in result:
+          result['args'] = []
+        result['args'] += result[key]
+      # Don't put the conditional args in the JSON.
+      result.pop(key)

[Ken Russell (switch to Gerrit), 2017/04/26 00:55:44]

Nice cleanup. Thanks.

+
+  add_conditional_args('desktop_args', lambda cfg: not is_android(cfg))
+  add_conditional_args('linux_args', is_linux)
+  add_conditional_args('android_args', is_android)
+
   if 'desktop_swarming' in result:
     if not is_android(tester_config):
       result['swarming'].update(result['desktop_swarming'])