Revert of Convert compositor_unittests to run exclusively on Swarming (patchset #6 id:100001 of https://codereview.chromium.org/1211053005/)

Reason for revert:
Causing steps exception compositor_unittests on Linux ChromiumOS Tests (dbg)(1)
Link: https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%281%29/builds/4229

Shard https://chromium-swarm.appspot.com/user/task/286f8616fee52710 says

Outputs:
Output:
Sending the crash report ... done.
Report URL: https://isolateserver.appspot.com/restricted/ereporter2/errors/5669961011822592
IsolatedFile a8902feeee5e075f3f92ec6ae3299106595667a3 is retrieved recursively

Original issue's description:
> Convert compositor_unittests to run exclusively on Swarming
>
> 0 configs already ran on Swarming
> 18 used to run locally and were converted:
> - chromium.chromiumos.json: Linux ChromiumOS Tests (1)
> - chromium.chromiumos.json: Linux ChromiumOS Tests (dbg)(1)
> - chromium.fyi.json: ClangToTLinux tester
> - chromium.fyi.json: Linux Trusty
> - chromium.fyi.json: Linux Trusty (dbg)
> - chromium.linux.json: Linux Tests
> - chromium.linux.json: Linux Tests (dbg)(1)
> - chromium.linux.json: Linux Tests (dbg)(1)(32)
> - chromium.memory.fyi.json: Linux ChromeOS MSan Tests
> - chromium.memory.fyi.json: Linux MSan Tests
> - chromium.memory.json: Linux Chromium OS ASan LSan Tests (1)
> - chromium.webkit.json: Linux ChromiumOS Tests (1)
> - chromium.webkit.json: Linux ChromiumOS Tests (dbg)(1)
> - chromium.win.json: Vista Tests (1)
> - chromium.win.json: Win 7 Tests x64 (1)
> - chromium.win.json: Win7 Tests (1)
> - chromium.win.json: Win7 Tests (dbg)(1)
> - chromium.win.json: XP Tests (1)
>
> Ran:
>   ./manage.py --convert compositor_unittests
>
> BUG=98637
>
> Committed: https://crrev.com/db1d33845c8847693ab97db88fbcff754c6b3a5b
> Cr-Commit-Position: refs/heads/master@{#337334}

TBR=danakj@chromium.org,maruel@chromium.org,thakis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=98637

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

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

10 files changed, 0 insertions, 129 deletions

diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 061a741..0323765 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -546,7 +546,6 @@
             '../tools/gn/gn.gyp:gn_unittests_run',
             '../ui/accessibility/accessibility.gyp:accessibility_unittests_run',
             '../ui/app_list/app_list.gyp:app_list_unittests_run',
-            '../ui/compositor/compositor.gyp:compositor_unittests_run',
             '../ui/events/events.gyp:events_unittests_run',
             '../ui/gl/gl_tests.gyp:gl_unittests_run',
             '../ui/message_center/message_center.gyp:message_center_unittests_run',
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 2a361f1..18283da 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -447,9 +447,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
@@ -716,9 +713,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index cd61ab3..c3c3302 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -222,9 +222,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
@@ -2949,9 +2946,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
@@ -3402,9 +3396,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 7b9c208..313a863 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -541,9 +541,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
@@ -863,9 +860,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
@@ -1177,9 +1171,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json
index 6fa18c9..2b246dd 100644
--- a/testing/buildbot/chromium.memory.fyi.json
+++ b/testing/buildbot/chromium.memory.fyi.json
@@ -60,9 +60,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
@@ -327,9 +324,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index 2d9d2b8..b580ffc 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -295,9 +295,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json
index da2ecb0..b284387 100644
--- a/testing/buildbot/chromium.webkit.json
+++ b/testing/buildbot/chromium.webkit.json
@@ -66,9 +66,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
@@ -326,9 +323,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 72cf4b9..53dbd2c 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -63,9 +63,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
@@ -367,9 +364,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
@@ -805,9 +799,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
@@ -1126,9 +1117,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
@@ -1581,9 +1569,6 @@
         "test": "components_unittests"
       },
       {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "compositor_unittests"
       },
       {
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index 1e3dc7b..99392af 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -195,19 +195,4 @@
       ],
     },
   ],
-  'conditions': [
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          'target_name': 'compositor_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'compositor_unittests',
-          ],
-          'includes': [ '../../build/isolate.gypi' ],
-          'sources': [ 'compositor_unittests.isolate' ],
-        },
-      ],
-    }],
-  ],
 }
diff --git a/ui/compositor/compositor_unittests.isolate b/ui/compositor/compositor_unittests.isolate
deleted file mode 100644
index 8586bfb..0000000
--- a/ui/compositor/compositor_unittests.isolate
+++ /dev/null
@@ -1,59 +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.
-{
-  'conditions': [
-    ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==0', {
-      'variables': {
-        'command': [
-          '../../testing/test_env.py',
-          '<(PRODUCT_DIR)/compositor_unittests<(EXECUTABLE_SUFFIX)',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--msan=<(msan)',
-          '--tsan=<(tsan)',
-        ],
-      },
-    }],
-    ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==1', {
-      'variables': {
-        'command': [
-          '../../testing/xvfb.py',
-          '<(PRODUCT_DIR)',
-          '<(PRODUCT_DIR)/compositor_unittests',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--msan=<(msan)',
-          '--tsan=<(tsan)',
-        ],
-        'files': [
-          '../../testing/xvfb.py',
-          '<(PRODUCT_DIR)/xdisplaycheck',
-        ],
-      },
-    }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'files': [
-          '../../testing/test_env.py',
-          '../gfx/test/data/compositor/',
-          '<(PRODUCT_DIR)/compositor_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-    ['OS=="linux"', {
-      'variables': { 'files': [ '<(PRODUCT_DIR)/libosmesa.so' ] },
-    }],
-    ['OS=="mac"', {
-      'variables': { 'files': [ '<(PRODUCT_DIR)/osmesa.so' ] },
-    }],
-    ['OS=="win"', {
-      'variables': { 'files': [ '<(PRODUCT_DIR)/osmesa.dll' ] },
-    }],
-  ],
-  'includes': [
-    '../../base/base.isolate',
-  ],
-}