Revert of Swarm gpu_unittests. (patchset #3 id:60001 of https://codereview.chromium.org/848173004/)

Reason for revert:
This seems to be causing builds to not be triggered

Original issue's description:
> Swarm gpu_unittests.
>
> BUG=448877
>
> Committed: https://crrev.com/ceca415be1b0af7f18dd22e8058c8b88401c46ef
> Cr-Commit-Position: refs/heads/master@{#311755}

TBR=sievers@chromium.org,jam@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=448877

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

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

6 files changed, 9 insertions, 137 deletions

diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 752a960..7787884 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -673,22 +673,5 @@
         },
       ],
     }],
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          'target_name': 'gpu_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'gpu_unittests',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-          ],
-          'sources': [
-            'gpu_unittests.isolate',
-          ],
-        },
-      ],
-    }],
   ],
 }
diff --git a/gpu/gpu_unittests.isolate b/gpu/gpu_unittests.isolate
deleted file mode 100644
index 3380606..0000000
--- a/gpu/gpu_unittests.isolate
+++ /dev/null
@@ -1,66 +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.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'files': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-    ['OS=="linux"', {
-      'variables': {
-        'command': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)',
-          '<(PRODUCT_DIR)/gpu_unittests',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--lsan=<(lsan)',
-        ],
-        'files': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/xdisplaycheck',
-        ],
-      },
-    }],
-    ['OS=="mac"', {
-      'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/gpu_unittests',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--lsan=<(lsan)',
-        ],
-      },
-    }],
-    ['OS=="win"', {
-      'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/gpu_unittests.exe',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--lsan=<(lsan)',
-        ],
-      },
-    }],
-    ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/gpu_unittests.exe.pdb',
-        ],
-      },
-    }],
-  ],
-  'includes': [
-    '../base/base.isolate',
-  ],
-}
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 57434fa..4efca3c 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -66,12 +66,7 @@
         }
       },
       "google_apis_unittests",
-      {
-        "test": "gpu_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "gpu_unittests",
       {
         "test": "interactive_ui_tests",
         "swarming": {
@@ -221,12 +216,7 @@
         }
       },
       "google_apis_unittests",
-      {
-        "test": "gpu_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "gpu_unittests",
       {
         "test": "interactive_ui_tests",
         "swarming": {
@@ -364,12 +354,7 @@
         }
       },
       "google_apis_unittests",
-      {
-        "test": "gpu_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "gpu_unittests",
       {
         "test": "interactive_ui_tests",
         "swarming": {
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 0f82147..897a3ba 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -52,12 +52,7 @@
           "can_use_on_swarming_builders": true
         }
       },
-      {
-        "test": "gpu_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "gpu_unittests",
       "google_apis_unittests",
       {
         "test": "interactive_ui_tests",
@@ -186,12 +181,7 @@
           "can_use_on_swarming_builders": true
         }
       },
-      {
-        "test": "gpu_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "gpu_unittests",
       "google_apis_unittests",
       {
         "test": "interactive_ui_tests",
@@ -320,12 +310,7 @@
           "can_use_on_swarming_builders": true
         }
       },
-      {
-        "test": "gpu_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "gpu_unittests",
       "google_apis_unittests",
       {
         "test": "interactive_ui_tests",
@@ -454,12 +439,7 @@
           "can_use_on_swarming_builders": true
         }
       },
-      {
-        "test": "gpu_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "gpu_unittests",
       "google_apis_unittests",
       {
         "test": "interactive_ui_tests",
diff --git a/testing/buildbot/chromium_memory_trybot.json b/testing/buildbot/chromium_memory_trybot.json
index 4281684..915c6e7 100644
--- a/testing/buildbot/chromium_memory_trybot.json
+++ b/testing/buildbot/chromium_memory_trybot.json
@@ -39,12 +39,7 @@
     "gcm_unit_tests",
     "gfx_unittests",
     "google_apis_unittests",
-    {
-      "test": "gpu_unittests",
-      "swarming": {
-        "can_use_on_swarming_builders": true
-      }
-    },
+    "gpu_unittests",
     {
       "test": "interactive_ui_tests",
       "swarming": {
diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json
index 63c3f39..3f8b2d5 100644
--- a/testing/buildbot/chromium_trybot.json
+++ b/testing/buildbot/chromium_trybot.json
@@ -112,12 +112,7 @@
       }
     },
     "google_apis_unittests",
-    {
-      "test": "gpu_unittests",
-      "swarming": {
-        "can_use_on_swarming_builders": true
-      }
-    },
+    "gpu_unittests",
     {
       "test": "interactive_ui_tests",
       "swarming": {