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

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

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

1 files changed, 36 insertions, 11 deletions

diff --git a/media/media_unittests.isolate b/media/media_unittests.isolate
index 3a17689..157d51f 100644
--- a/media/media_unittests.isolate
+++ b/media/media_unittests.isolate
@@ -6,42 +6,67 @@
     '../base/base.isolate',
   ],
   'conditions': [
-    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
           'test/data/',
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
+    ['OS=="linux"', {
       'variables': {
         'command': [
-          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)',
+          '<(PRODUCT_DIR)/media_unittests',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
         ],
         'files': [
-          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/xdisplaycheck',
         ],
       },
     }],
-    # TODO(jmadill): should be automatic. http://crbug.com/418146
-    ['OS=="win"', {
+    ['OS=="mac"', {
       '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.dll',
+          '<(PRODUCT_DIR)/ffmpegsumo.so',
         ],
       },
     }],
-    ['OS=="mac"', {
+    ['OS=="win"', {
       '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.so',
+          '<(PRODUCT_DIR)/ffmpegsumo.dll',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/media_unittests.exe.pdb',
         ],
       },
     }],