Revert of Run telemetry_perf_unittests via isolate on "Mac tests", "Linux tests" and trybot with swarming. (patchset #2 id:20001 of https://codereview.chromium.org/1419143006/ )

Reason for revert:
speculative revert to see if it's the cause of massive benchmarks.benchmark_smoke_unittest failures on  Mac10.9 Tests (dbg)

Original issue's description:
> Run telemetry_perf_unittests via isolate on "Mac tests", "Linux tests" and trybot with swarming.
>
> Swarming on Mac 10.9 is disabled temporarily because of
> crbug.com/551405 (patch 2)
>
> Swarmed telemetry_perf_unittest passed on Mac 10.6, 10.8:
>
> http://build.chromium.org/p/chromium.mac/builders/Mac10.6%20Tests/builds/8616/steps/telemetry_perf_unittests%20on%20Mac-10.6/logs/stdio
>
> http://build.chromium.org/p/chromium.mac/builders/Mac10.8%20Tests/builds/10641/steps/telemetry_perf_unittests/logs/stdio
>
> This is a reland of https://codereview.chromium.org/1412333004/.
>
> Committed: https://crrev.com/3b8e8ebdd60de034d880ad05915b598a0594d7f4
> Cr-Commit-Position: refs/heads/master@{#357848}

TBR=phajdan.jr@chromium.org,maruel@chromium.org,thakis@chromium.org,mostynb@opera.com,nednguyen@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1413673005

Cr-Commit-Position: refs/heads/master@{#358046}

8 files changed, 74 insertions, 172 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 55d4fa9..582e098 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3181,30 +3181,6 @@
     ['test_isolation_mode != "noop"', {
       'targets': [
         {
-          'target_name': 'telemetry_chrome_test_base',
-          'type': 'none',
-          'dependencies': [
-            '../content/content_shell_and_tests.gyp:telemetry_base',
-          ],
-          'conditions': [
-            ['OS=="linux" or OS=="mac"', {
-              'dependencies': [
-                '../breakpad/breakpad.gyp:dump_syms',
-              ],
-            }],
-            ['OS=="mac"', {
-              'dependencies': [
-                '../third_party/crashpad/crashpad/tools/tools.gyp:crashpad_database_util',
-              ],
-            }],
-            ['OS=="win"', {
-              'dependencies': [
-                'chrome.gyp:crash_service',
-              ],
-            }],
-          ],
-        },
-        {
           'target_name': 'browser_tests_run',
           'type': 'none',
           'dependencies': [
@@ -3227,20 +3203,6 @@
           ],
         },
         {
-         'target_name': 'telemetry_perf_unittests',
-         'type': 'none',
-         'dependencies': [
-            'chrome_run',
-            'telemetry_chrome_test_base'
-         ],
-         'includes': [
-           '../build/isolate.gypi',
-          ],
-          'sources': [
-            'telemetry_perf_unittests.isolate',
-          ],
-        },
-        {
          'target_name': 'telemetry_gpu_unittests',
          'type': 'none',
          'dependencies': [
@@ -3336,6 +3298,30 @@
               },
             },
             {
+              'target_name': 'telemetry_chrome_test_base',
+              'type': 'none',
+              'dependencies': [
+                '../content/content_shell_and_tests.gyp:telemetry_base',
+              ],
+              'conditions': [
+                ['OS=="linux" or OS=="mac"', {
+                  'dependencies': [
+                    '../breakpad/breakpad.gyp:dump_syms',
+                  ],
+                }],
+                ['OS=="mac"', {
+                  'dependencies': [
+                    '../third_party/crashpad/crashpad/tools/tools.gyp:crashpad_database_util',
+                  ],
+                }],
+                ['OS=="win"', {
+                  'dependencies': [
+                    'chrome.gyp:crash_service',
+                  ],
+                }],
+              ],
+            },
+            {
               # GN: //gpu:angle_unittests_run
               'target_name': 'angle_unittests_run',
               'type': 'none',
diff --git a/chrome/telemetry_perf_unittests.isolate b/chrome/telemetry_perf_unittests.isolate
deleted file mode 100644
index 36dcaac..0000000
--- a/chrome/telemetry_perf_unittests.isolate
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2015 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.
-{
-  'includes': [
-    '../tools/perf/perf.isolate',
-  ],
-  'conditions': [
-    ['OS=="mac" or OS=="win"', {
-      'variables': {
-        'files': [
-          # Other dependencies of the tests and their harness.
-          '../testing/test_env.py',
-          '../testing/xvfb.py',
-          '../testing/scripts/common.py',
-          '../testing/scripts/run_telemetry_as_googletest.py',
-        ],
-        'command': [
-          '../testing/scripts/run_telemetry_as_googletest.py',
-          '../tools/perf/run_tests',
-          '-v',
-        ],
-      },
-    }],
-  ]
-}
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index a409e70..5f30a04 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -506,13 +506,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
       }
     ],
     "scripts": [
@@ -521,6 +514,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
@@ -1433,13 +1430,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
       }
     ],
     "scripts": [
@@ -1448,6 +1438,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
@@ -1647,13 +1641,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
       }
     ],
     "scripts": [
@@ -1662,6 +1649,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
@@ -4718,13 +4709,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
       }
     ],
     "scripts": [
@@ -4733,6 +4717,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
@@ -4916,13 +4904,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
       }
     ],
     "scripts": [
@@ -4931,6 +4912,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
@@ -5219,13 +5204,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
       }
     ],
     "scripts": [
@@ -5234,6 +5212,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
@@ -5405,13 +5387,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
       }
     ],
     "scripts": [
@@ -5420,6 +5395,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index e5499ad..7c008ca 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -675,10 +675,7 @@
       },
       {
         "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "name": "telemetry_perf_unittests"
       }
     ],
     "scripts": [
@@ -1047,10 +1044,7 @@
       },
       {
         "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "name": "telemetry_perf_unittests"
       }
     ],
     "scripts": [
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 59b1edf..cff0500 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -314,13 +314,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
       }
     ],
     "scripts": [
@@ -329,6 +322,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
@@ -603,13 +600,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
       }
     ],
     "scripts": [
@@ -618,6 +608,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
@@ -892,13 +886,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
       }
     ],
     "scripts": [
@@ -907,6 +894,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
@@ -1181,10 +1172,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests"
       }
     ],
     "scripts": [
@@ -1193,6 +1180,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
@@ -1468,10 +1459,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         }
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests"
       }
     ],
     "scripts": [
@@ -1480,6 +1467,10 @@
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
diff --git a/tools/perf/benchmarks/benchmark_smoke_unittest.py b/tools/perf/benchmarks/benchmark_smoke_unittest.py
index 7955921..e8e7bd9 100644
--- a/tools/perf/benchmarks/benchmark_smoke_unittest.py
+++ b/tools/perf/benchmarks/benchmark_smoke_unittest.py
@@ -18,7 +18,6 @@ from telemetry.core import discover
 from telemetry.testing import options_for_unittests
 from telemetry.testing import progress_reporter
 
-from benchmarks import chrome_signin_startup
 from benchmarks import image_decoding
 from benchmarks import indexeddb_perf
 from benchmarks import jetstream
@@ -84,7 +83,6 @@ _BLACK_LIST_TEST_MODULES = {
     octane,  # Often fails & take long time to timeout on cq bot.
     rasterize_and_record_micro,  # Always fails on cq bot.
     repaint,  # Often fails & takes long time to timeout on cq bot.
-    chrome_signin_startup,  # Failed on linux swarming bot (crbug.com/551236)
     spaceport,  # Takes 451 seconds.
     speedometer,  # Takes 101 seconds.
     jetstream,  # Take 206 seconds.
diff --git a/tools/perf/perf.isolate b/tools/perf/perf.isolate
deleted file mode 100644
index 520864f..0000000
--- a/tools/perf/perf.isolate
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2015 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.
-{
-  'includes': [
-    './chrome_telemetry_build/telemetry_chrome_test.isolate',
-  ],
-  'conditions': [
-    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'files': [
-          './',
-          # Field trial configs
-          '../variations/',
-        ],
-      },
-    }],
-  ]
-}
diff --git a/tools/telemetry/telemetry.isolate b/tools/telemetry/telemetry.isolate
index 44bea2c..fc922e3 100644
--- a/tools/telemetry/telemetry.isolate
+++ b/tools/telemetry/telemetry.isolate
@@ -8,7 +8,6 @@
         'files': [
           '../../build/android/pylib/',
           '../../build/android/devil/',
-          '../../third_party/catapult/',
           './',
           # For Telemetry's screenshot support.
           '<(PRODUCT_DIR)/bitmaptools<(EXECUTABLE_SUFFIX)',