Remove build-side specification of instrumentation tests.

scripts/slave/recipe_modules/chromium_tests/chromium_linux.py

 # Copyright 2014 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.
 
 from . import steps
 
 SPEC = {
   'settings': {
     'build_gs_bucket': 'chromium-linux-archive',
     # WARNING: src-side runtest.py is only tested with chromium CQ builders.
@@ skipping 231 matching lines @@
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 32,
         'TARGET_PLATFORM': 'android',
       },
       'bot_type': 'tester',
       'parent_buildername': 'Android Builder (dbg)',
       'android_config': 'main_builder',
       'root_devices': True,
       'tests': [
-        steps.AndroidInstrumentationTest('AndroidWebViewTest'),
-        steps.AndroidInstrumentationTest('ChromePublicTest'),
-        steps.AndroidInstrumentationTest('ContentShellTest'),
-        steps.AndroidInstrumentationTest('ChromeSyncShellTest'),
         steps.AndroidJunitTest('base_junit_tests'),
         steps.AndroidJunitTest('chrome_junit_tests'),
         steps.AndroidJunitTest('components_junit_tests'),
         steps.AndroidJunitTest('content_junit_tests'),
         steps.AndroidJunitTest('junit_unit_tests'),
         steps.AndroidJunitTest('net_junit_tests'),
       ],
       'test_generators': [
         steps.generate_gtest,
+        steps.generate_instrumentation_test,
+        steps.generate_isolated_script,
         steps.generate_script,
-        steps.generate_isolated_script,
       ],
       'testing': {
         'platform': 'linux',
       },
       'enable_swarming': True,
     },
 
     'Android Builder': {
       'chromium_config': 'android',
       'gclient_config': 'chromium',
@@ skipping 21 matching lines @@
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
         'TARGET_PLATFORM': 'android',
       },
       'bot_type': 'tester',
       'parent_buildername': 'Android Builder',
       'android_config': 'main_builder',
       'root_devices': True,
       'tests': [
-        steps.AndroidInstrumentationTest('AndroidWebViewTest'),
-        steps.AndroidInstrumentationTest('ChromePublicTest'),
-        steps.AndroidInstrumentationTest('ContentShellTest'),
-        steps.AndroidInstrumentationTest('ChromeSyncShellTest'),
         steps.AndroidJunitTest('base_junit_tests'),
         steps.AndroidJunitTest('chrome_junit_tests'),
         steps.AndroidJunitTest('components_junit_tests'),
         steps.AndroidJunitTest('content_junit_tests'),
         steps.AndroidJunitTest('junit_unit_tests'),
         steps.AndroidJunitTest('net_junit_tests'),
       ],
       'test_generators': [
         steps.generate_gtest,
+        steps.generate_instrumentation_test,
+        steps.generate_isolated_script,
         steps.generate_script,
-        steps.generate_isolated_script,
-        steps.generate_instrumentation_test,
       ],
       'testing': {
         'platform': 'linux',
       },
       'enable_swarming': True,
     },
 
     'Android Clang Builder (dbg)': {
       'chromium_config': 'android_clang',
       'chromium_apply_config': ['errorprone'],
@@ skipping 47 matching lines @@
         'TARGET_BITS': 32,
         'TARGET_PLATFORM': 'android',
       },
       'android_config': 'cast_builder',
       'testing': {
         'platform': 'linux',
       },
     },
   },
 }