Revert of Address some TODO(GYP_GONE)s

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 f32b73f791a257f6a0fcf0524b102af533afaab5..5178161e7072dfb8db84d7817e102d09fa917c08 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -1470,6 +1470,9 @@
         'os_types': ['android'],
       },
     ],
+    'override_compile_targets': [
+      'tab_capture_end2end_tests_run',
+    ],
   },
   'video_decode_accelerator_d3d11_unittest': {
     'tester_configs': [
@@ -2310,7 +2313,7 @@
   return generate_isolated_test(tester_name, tester_config, test,
                                 test_config, extra_browser_args,
                                 'telemetry_gpu_integration_test',
-                                ['telemetry_gpu_integration_test'],
+                                ['telemetry_gpu_integration_test_run'],
                                 prefix_args)
 
 def generate_telemetry_tests(tester_name, tester_config,