Revert of Run telemetry_perf_unittests via isolate on "Mac tests", "Linux tests" and trybot with swarming

chrome/chrome_tests.gypi

 # 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.
 {
   'variables': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 3163 matching lines @@
                   'telemetry_perf_unittests_android.isolate',
                 ],
             }],
           }
         ],
       ],
     }],
     ['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': [
             '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin',
             'browser_tests',
             'chrome',
           ],
           'includes': [
             '../build/isolate.gypi',
           ],
           'sources': [
             'browser_tests.isolate',
           ],
           'conditions': [
             ['use_x11==1', {
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
         {
-         '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': [
             '../content/content_shell_and_tests.gyp:telemetry_base',
          ],
          'includes': [
            '../build/isolate.gypi',
           ],
           'sources': [
             'telemetry_gpu_unittests.isolate',
@@ skipping 75 matching lines @@
               # If we didn't do this the All target ends up with a rule that
               # makes it unnecessarily compile in certain situations.
               'suppress_wildcard': 1,
               'direct_dependent_settings': {
                 'includes': [
                   '../build/isolate.gypi',
                 ],
               },
             },
             {
+              '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',
               'dependencies': [
                 '../gpu/gpu.gyp:angle_unittests',
                 'gpu_tests_base',
               ],
               'sources': [
                 'angle_unittests.isolate',
               ],
@@ skipping 109 matching lines @@
             'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }