Rework tab_capture_end2end_tests' test definition.

testing/buildbot/chromium.gpu.json

Index: testing/buildbot/chromium.gpu.json
diff --git a/testing/buildbot/chromium.gpu.json b/testing/buildbot/chromium.gpu.json
index b6b733e815d0c86ac8e9147c5cfe2fff1f43b03f..0fb25e382dd7760c400079bf901dc89fc3f6d25d 100644
--- a/testing/buildbot/chromium.gpu.json
+++ b/testing/buildbot/chromium.gpu.json
@@ -337,8 +337,11 @@
       },
       {
         "args": [
-          "--use-gpu-in-tests"
+          "--enable-gpu",
+          "--test-launcher-jobs=1",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/tab-capture-end2end-tests.browser_tests.filter"
         ],
+        "name": "tab_capture_end2end_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -348,7 +351,7 @@
             }
           ]
         },
-        "test": "gl_tests",
+        "test": "browser_tests",
         "use_xvfb": false
       },
       {
@@ -364,10 +367,13 @@
             }
           ]
         },
-        "test": "gl_unittests",
+        "test": "gl_tests",
         "use_xvfb": false
       },
       {
+        "args": [
+          "--use-gpu-in-tests"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -377,7 +383,7 @@
             }
           ]
         },
-        "test": "tab_capture_end2end_tests",
+        "test": "gl_unittests",
         "use_xvfb": false
       }
     ],
@@ -968,8 +974,11 @@
       },
       {
         "args": [
-          "--use-gpu-in-tests"
+          "--enable-gpu",
+          "--test-launcher-jobs=1",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/tab-capture-end2end-tests.browser_tests.filter"
         ],
+        "name": "tab_capture_end2end_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -979,7 +988,7 @@
             }
           ]
         },
-        "test": "gl_tests",
+        "test": "browser_tests",
         "use_xvfb": false
       },
       {
@@ -995,10 +1004,13 @@
             }
           ]
         },
-        "test": "gl_unittests",
+        "test": "gl_tests",
         "use_xvfb": false
       },
       {
+        "args": [
+          "--use-gpu-in-tests"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -1008,7 +1020,7 @@
             }
           ]
         },
-        "test": "tab_capture_end2end_tests",
+        "test": "gl_unittests",
         "use_xvfb": false
       }
     ],
@@ -1613,8 +1625,11 @@
       },
       {
         "args": [
-          "--use-gpu-in-tests"
+          "--enable-gpu",
+          "--test-launcher-jobs=1",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/tab-capture-end2end-tests.browser_tests.filter"
         ],
+        "name": "tab_capture_end2end_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -1625,7 +1640,7 @@
             }
           ]
         },
-        "test": "gl_tests",
+        "test": "browser_tests",
         "use_xvfb": false
       },
       {
@@ -1642,10 +1657,13 @@
             }
           ]
         },
-        "test": "gl_unittests",
+        "test": "gl_tests",
         "use_xvfb": false
       },
       {
+        "args": [
+          "--use-gpu-in-tests"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -1656,7 +1674,7 @@
             }
           ]
         },
-        "test": "tab_capture_end2end_tests",
+        "test": "gl_unittests",
         "use_xvfb": false
       }
     ],
@@ -2276,8 +2294,11 @@
       },
       {
         "args": [
-          "--use-gpu-in-tests"
+          "--enable-gpu",
+          "--test-launcher-jobs=1",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/tab-capture-end2end-tests.browser_tests.filter"
         ],
+        "name": "tab_capture_end2end_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -2287,7 +2308,7 @@
             }
           ]
         },
-        "test": "gl_tests",
+        "test": "browser_tests",
         "use_xvfb": false
       },
       {
@@ -2303,10 +2324,13 @@
             }
           ]
         },
-        "test": "gl_unittests",
+        "test": "gl_tests",
         "use_xvfb": false
       },
       {
+        "args": [
+          "--use-gpu-in-tests"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -2316,7 +2340,7 @@
             }
           ]
         },
-        "test": "tab_capture_end2end_tests",
+        "test": "gl_unittests",
         "use_xvfb": false
       },
       {