Revert of Swarm gpu_unittests and media_unittests (patchset #1 id:1 of https://codereview.chromium.org/832083006/)

Reason for revert:
you landed previous revisions of those cls, they had been updated since then..

Original issue's description:
> Swarm gpu_unittests and media_unittests
>
> This is a relanding of https://codereview.chromium.org/851013002
> and https://codereview.chromium.org/848173004 .
>
> TBR=scherkus,sievers,jam
>
> BUG=448877, 450000
>
> Committed: https://chromium.googlesource.com/chromium/src/+/b96c31b45db661d826040d3cda409a03479f00fc

TBR=scherkus@chromium.org,sievers@chromium.org,phajdan.jr@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=448877, 450000

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

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

8 files changed, 30 insertions, 228 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/media/media.gyp b/media/media.gyp
index c21223c..5b7f026 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1908,7 +1908,7 @@
         },
       ],
     }],
-    ['test_isolation_mode != "noop"', {
+    ['test_isolation_mode != "noop" and archive_gpu_tests==1', {
       'targets': [
         {
           'target_name': 'media_unittests_run',
diff --git a/media/media_unittests.isolate b/media/media_unittests.isolate
index 157d51f..3a17689 100644
--- a/media/media_unittests.isolate
+++ b/media/media_unittests.isolate
@@ -6,67 +6,42 @@
     '../base/base.isolate',
   ],
   'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
+    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
           'test/data/',
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)',
-          '<(PRODUCT_DIR)/media_unittests',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--lsan=<(lsan)',
+          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'files': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/libffmpegsumo.so',
-          '<(PRODUCT_DIR)/xdisplaycheck',
+          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="mac"', {
+    # TODO(jmadill): should be automatic. http://crbug.com/418146
+    ['OS=="win"', {
       'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/media_unittests',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--lsan=<(lsan)',
-        ],
         'files': [
-          '<(PRODUCT_DIR)/ffmpegsumo.so',
+          '<(PRODUCT_DIR)/ffmpegsumo.dll',
         ],
       },
     }],
-    ['OS=="win"', {
+    ['OS=="mac"', {
       'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/media_unittests.exe',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--lsan=<(lsan)',
-        ],
         'files': [
-          '<(PRODUCT_DIR)/ffmpegsumo.dll',
+          '<(PRODUCT_DIR)/ffmpegsumo.so',
         ],
       },
     }],
-    ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
+    ['OS=="linux"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/media_unittests.exe.pdb',
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
         ],
       },
     }],
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 6e73e8f..3f5b2a3 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": {
@@ -81,12 +76,7 @@
       "ipc_mojo_unittests",
       "ipc_tests",
       "jingle_unittests",
-      {
-        "test": "media_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "media_unittests",
       "mojo_common_unittests",
       "mojo_public_bindings_unittests",
       "mojo_public_environment_unittests",
@@ -229,12 +219,7 @@
         }
       },
       "google_apis_unittests",
-      {
-        "test": "gpu_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "gpu_unittests",
       {
         "test": "interactive_ui_tests",
         "swarming": {
@@ -244,12 +229,7 @@
       "ipc_mojo_unittests",
       "ipc_tests",
       "jingle_unittests",
-      {
-        "test": "media_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "media_unittests",
       "mojo_common_unittests",
       "mojo_public_bindings_unittests",
       "mojo_public_environment_unittests",
@@ -372,12 +352,7 @@
         }
       },
       "google_apis_unittests",
-      {
-        "test": "gpu_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "gpu_unittests",
       {
         "test": "interactive_ui_tests",
         "swarming": {
@@ -388,12 +363,7 @@
       "ipc_mojo_unittests",
       "ipc_tests",
       "jingle_unittests",
-      {
-        "test": "media_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "media_unittests",
       "mojo_common_unittests",
       "mojo_public_bindings_unittests",
       "mojo_public_environment_unittests",
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 0f82147..cfc0a2a 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",
@@ -67,12 +62,7 @@
       },
       "ipc_tests",
       "jingle_unittests",
-      {
-        "test": "media_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "media_unittests",
       {
         "test": "message_center_unittests",
         "swarming": {
@@ -186,12 +176,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",
@@ -201,12 +186,7 @@
       },
       "ipc_tests",
       "jingle_unittests",
-      {
-        "test": "media_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "media_unittests",
       {
         "test": "message_center_unittests",
         "swarming": {
@@ -320,12 +300,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",
@@ -335,12 +310,7 @@
       },
       "ipc_tests",
       "jingle_unittests",
-      {
-        "test": "media_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "media_unittests",
       {
         "test": "message_center_unittests",
         "swarming": {
@@ -454,12 +424,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",
@@ -470,12 +435,7 @@
       },
       "ipc_tests",
       "jingle_unittests",
-      {
-        "test": "media_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "media_unittests",
       {
         "test": "message_center_unittests",
         "swarming": {
diff --git a/testing/buildbot/chromium_memory_trybot.json b/testing/buildbot/chromium_memory_trybot.json
index 4281684..fef6f23 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": {
@@ -54,12 +49,7 @@
     },
     "ipc_tests",
     "jingle_unittests",
-    {
-      "test": "media_unittests",
-      "swarming": {
-        "can_use_on_swarming_builders": true
-      }
-    },
+    "media_unittests",
     {
       "test": "net_unittests",
       "swarming": {
diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json
index 63c3f39..e52d932 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": {
@@ -140,12 +135,7 @@
       "platforms": ["linux", "win"]
     },
     "media_perftests",
-    {
-      "test": "media_unittests",
-      "swarming": {
-        "can_use_on_swarming_builders": true
-      }
-    },
+    "media_unittests",
     {
       "test": "message_center_unittests",
       "swarming": {