Revert of Swarm media_unittests. (patchset #3 id:40001 of https://codereview.chromium.org/851013002/)

Reason for revert:
This seems to be causing us to not trigger new builds

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

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

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

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

6 files changed, 21 insertions, 91 deletions

diff --git a/media/media.gyp b/media/media.gyp
index 1c0f0a9..9aba019 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1907,7 +1907,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 4efca3c..3ff3be9 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -76,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",
@@ -226,12 +221,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",
@@ -365,12 +355,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 897a3ba..cfc0a2a 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -62,12 +62,7 @@
       },
       "ipc_tests",
       "jingle_unittests",
-      {
-        "test": "media_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "media_unittests",
       {
         "test": "message_center_unittests",
         "swarming": {
@@ -191,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 +310,7 @@
       },
       "ipc_tests",
       "jingle_unittests",
-      {
-        "test": "media_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "media_unittests",
       {
         "test": "message_center_unittests",
         "swarming": {
@@ -450,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 915c6e7..fef6f23 100644
--- a/testing/buildbot/chromium_memory_trybot.json
+++ b/testing/buildbot/chromium_memory_trybot.json
@@ -49,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 3f8b2d5..e52d932 100644
--- a/testing/buildbot/chromium_trybot.json
+++ b/testing/buildbot/chromium_trybot.json
@@ -135,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": {