Revert of Use src-side launcher for telemetry_unittests in chromium_trybot recipe

scripts/slave/recipes/chromium_trybot.py

 # Copyright 2013 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.
 
 DEPS = [
   'bot_update',
   'chromium',
   'chromium_tests',
   'gclient',
   'isolate',
@@ skipping 776 matching lines @@
     compile_targets, gtest_tests = parse_test_spec(
         test_spec,
         bot_config.get('enable_swarming'),
         should_use_test)
     compile_targets.extend(bot_config.get('compile_targets', []))
     # TODO(phajdan.jr): Also compile 'all' on win, http://crbug.com/368831 .
     # Disabled for now because it takes too long and/or fails on Windows.
     if not api.platform.is_win and not bot_config.get('exclude_compile_all'):
       compile_targets = ['all'] + compile_targets
 
-    scripts_compile_targets = \
-        api.chromium.get_compile_targets_for_scripts().json.output
-
     # Tests that are only run if their compile_targets are going to be built.
     conditional_tests = [api.chromium.steps.NaclIntegrationTest()]
     if bot_config.get('add_telemetry_tests', True):
-      conditional_tests += [
-          api.chromium.steps.ScriptTest(
-              'telemetry_unittests', 'telemetry_unittests.py',
-              scripts_compile_targets),
-          api.chromium.steps.TelemetryPerfUnitTests()
-      ]
+      conditional_tests += [api.chromium.steps.TelemetryUnitTests(),
+                            api.chromium.steps.TelemetryPerfUnitTests()]
 
     # See if the patch needs to compile on the current platform.
     # Don't run analyze for other projects, such as blink, as there aren't that
     # many try jobs for them.
     requires_compile = True
     if isinstance(test_spec, dict) and api.properties.get('root') == 'src':
       analyze_config_file = bot_config['testing'].get('analyze_config_file',
                                          'trybot_analyze_config.json')
       requires_compile, matching_exes, compile_targets = \
           api.chromium_tests.analyze(
               get_test_names(gtest_tests) +
                   all_compile_targets(api, conditional_tests),
               compile_targets,
               analyze_config_file)
 
       gtest_tests = filter_tests(gtest_tests, matching_exes)
 
     tests = []
     # TODO(phajdan.jr): Re-enable checkdeps on Windows when it works with git.
     if not api.platform.is_win:
-      tests.append(api.chromium.steps.ScriptTest(
-          'checkdeps', 'checkdeps.py', scripts_compile_targets))
+      tests.append(api.chromium.steps.ScriptTest('checkdeps', 'checkdeps.py'))
     if api.platform.is_linux:
       tests.extend([
           api.chromium.steps.CheckpermsTest(),
           api.chromium.steps.ChecklicensesTest(),
       ])
 
     conditional_tests = tests_in_compile_targets(
         api, compile_targets, conditional_tests)
-    tests.extend(find_test_named('telemetry_unittests', conditional_tests))
+    tests.extend(find_test_named(api.chromium.steps.TelemetryUnitTests.name,
+                                 conditional_tests))
     tests.extend(find_test_named(api.chromium.steps.TelemetryPerfUnitTests.name,
                                  conditional_tests))
     tests.extend(gtest_tests)
     tests.extend(find_test_named(api.chromium.steps.NaclIntegrationTest.name,
                                  conditional_tests))
 
     if api.platform.is_win:
       tests.append(api.chromium.steps.MiniInstallerTest())
 
     if not requires_compile:
@@ skipping 716 matching lines @@
           },
         ],
       })
     ) +
     api.override_step_data(
       'analyze',
       api.json.output({'status': 'Found dependency',
                        'targets': ['browser_tests', 'base_unittests'],
                        'build_targets': ['base_unittests']}))
   )