Revert of Swarm media_unittests.

media/media_unittests.isolate

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