Revert of Rework tab_capture_end2end_tests' test definition.

content/test/gpu/generate_buildbot_json.py

 #!/usr/bin/env python
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Script to generate chromium.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 1452 matching lines @@
     ],
     # Don't run these tests on Android.
     'disabled_tester_configs': [
       {
         'names': [
           'Linux ChromiumOS Ozone (Intel)',
         ],
         'os_types': ['android'],
       },
     ],
-    'args': [
-      '--enable-gpu',
-      '--test-launcher-jobs=1',
-      '--test-launcher-filter-file=../../testing/buildbot/filters/' + \
-      'tab-capture-end2end-tests.browser_tests.filter',
-    ],
-    'test': 'browser_tests',
   },
   'video_decode_accelerator_d3d11_unittest': {
     'tester_configs': [
       {
         'os_types': ['win']
       },
     ],
     'args': [
       '--use-angle=d3d11',
       '--use-test-data-path',
@@ skipping 58 matching lines @@
         'names': [
           'Linux ChromiumOS Ozone (Intel)',
         ],
         'os_types': ['android'],
       },
     ],
     'test': 'browser_tests',
     'args': [
       '--enable-gpu',
       '--test-launcher-jobs=1',
-      '--test-launcher-filter-file=../../testing/buildbot/filters/' + \
-      'tab-capture-end2end-tests.browser_tests.filter',
+      '--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:' + \
+          'TabCaptureApiPixelTest.EndToEnd*'
     ],
     'swarming': {
       'can_use_on_swarming_builders': False,
     },
   }
 }
 
 # These tests use Telemetry's new browser_test_runner, which is a much
 # simpler harness for correctness testing.
 TELEMETRY_GPU_INTEGRATION_TESTS = {
@@ skipping 811 matching lines @@
   install_parent_links(WATERFALL)
   install_parent_links(V8_FYI_WATERFALL)
 
   generate_all_tests(FYI_WATERFALL, 'chromium.gpu.fyi.json')
   generate_all_tests(WATERFALL, 'chromium.gpu.json')
   generate_all_tests(V8_FYI_WATERFALL, 'client.v8.fyi.json')
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())