Remove build-side specification of instrumentation tests.

scripts/slave/recipe_modules/chromium_tests/chromium_linux.py

Index: scripts/slave/recipe_modules/chromium_tests/chromium_linux.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_linux.py b/scripts/slave/recipe_modules/chromium_tests/chromium_linux.py
index 3435aab76dc4d20bbe910a5fa739cef60b8d9988..698d04471ba3f2bb0e6e5c7774549218d8b7d1a1 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_linux.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_linux.py
@@ -249,10 +249,6 @@ SPEC = {
       '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'),
@@ -262,8 +258,9 @@ SPEC = {
       ],
       'test_generators': [
         steps.generate_gtest,
-        steps.generate_script,
+        steps.generate_instrumentation_test,
         steps.generate_isolated_script,
+        steps.generate_script,
       ],
       'testing': {
         'platform': 'linux',
@@ -305,10 +302,6 @@ SPEC = {
       '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'),
@@ -318,9 +311,9 @@ SPEC = {
       ],
       'test_generators': [
         steps.generate_gtest,
-        steps.generate_script,
-        steps.generate_isolated_script,
         steps.generate_instrumentation_test,
+        steps.generate_isolated_script,
+        steps.generate_script,
       ],
       'testing': {
         'platform': 'linux',