Revert of Run telemetry_perf_unittests via isolate on "Windows Tests" & "Mac tests" and trybot.

testing/buildbot/chromium.fyi.json

 {
   "Android Tests (trial)(dbg)": {
     "scripts": [
       {
         "name": "telemetry_unittests",
         "script": "telemetry_unittests.py"
       }
     ]
   },
   "Browser Side Navigation Linux": {
@@ skipping 485 matching lines @@
         "test": "unit_tests"
       },
       {
         "test": "url_unittests"
       }
     ],
     "isolated_scripts": [
       {
         "isolate_name": "telemetry_gpu_unittests",
         "name": "telemetry_gpu_unittests"
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests"
       }
     ],
     "scripts": [
       {
         "name": "telemetry_unittests",
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
     ]
   },
   "Chromium Win 10": {
     "gtest_tests": [
       {
         "test": "angle_unittests"
       },
@@ skipping 720 matching lines @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "wtf_unittests"
       }
     ],
     "isolated_scripts": [
       {
         "isolate_name": "telemetry_gpu_unittests",
         "name": "telemetry_gpu_unittests"
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests"
       }
     ],
     "scripts": [
       {
         "name": "telemetry_unittests",
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
     ]
   },
   "ClangToTMacASan tester": {
     "gtest_tests": [
       {
         "test": "accessibility_unittests"
       },
@@ skipping 176 matching lines @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "wtf_unittests"
       }
     ],
     "isolated_scripts": [
       {
         "isolate_name": "telemetry_gpu_unittests",
         "name": "telemetry_gpu_unittests"
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests"
       }
     ],
     "scripts": [
       {
         "name": "telemetry_unittests",
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
     ]
   },
   "ClangToTWin tester": {
     "gtest_tests": [
       {
         "test": "angle_unittests"
       },
@@ skipping 3033 matching lines @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "wm_unittests"
       }
     ],
     "isolated_scripts": [
       {
         "isolate_name": "telemetry_gpu_unittests",
         "name": "telemetry_gpu_unittests"
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests"
       }
     ],
     "scripts": [
       {
         "name": "telemetry_unittests",
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
     ]
   },
   "Linux Trusty (32)": {
     "gtest_tests": [
       {
         "test": "accessibility_unittests"
       },
@@ skipping 160 matching lines @@
         "test": "views_unittests"
       },
       {
         "test": "wm_unittests"
       }
     ],
     "isolated_scripts": [
       {
         "isolate_name": "telemetry_gpu_unittests",
         "name": "telemetry_gpu_unittests"
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests"
       }
     ],
     "scripts": [
       {
         "name": "telemetry_unittests",
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
     ]
   },
   "Linux Trusty (dbg)": {
     "gtest_tests": [
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ skipping 265 matching lines @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "wm_unittests"
       }
     ],
     "isolated_scripts": [
       {
         "isolate_name": "telemetry_gpu_unittests",
         "name": "telemetry_gpu_unittests"
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests"
       }
     ],
     "scripts": [
       {
         "name": "telemetry_unittests",
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
     ]
   },
   "Linux Trusty (dbg)(32)": {
     "gtest_tests": [
       {
         "test": "accessibility_unittests"
       },
@@ skipping 148 matching lines @@
         "test": "views_unittests"
       },
       {
         "test": "wm_unittests"
       }
     ],
     "isolated_scripts": [
       {
         "isolate_name": "telemetry_gpu_unittests",
         "name": "telemetry_gpu_unittests"
-      },
-      {
-        "isolate_name": "telemetry_perf_unittests",
-        "name": "telemetry_perf_unittests"
       }
     ],
     "scripts": [
       {
         "name": "telemetry_unittests",
         "script": "telemetry_unittests.py"
       },
       {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
         "name": "nacl_integration",
         "script": "nacl_integration.py"
       }
     ]
   },
   "Site Isolation Linux": {
     "gtest_tests": [
       {
         "args": [
           "--site-per-process",
@@ skipping 48 matching lines @@
       {
         "args": [
           "--site-per-process",
           "--gtest_filter=-CaptivePortalTabHelperTest.HttpsSubframe*"
         ],
         "test": "unit_tests"
       }
     ]
   }
 }