Update content and media unittest isolate targets.

These two tests are planned to be run on the GPU bots. The isolates
needed a few fixes to get them running smoothly.

BUG=416594

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

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

content/content_tests.gypi

@@ -988,6 +988,13 @@
           'sources': [
             'content_unittests.isolate',
           ],
+          'conditions': [
+            ['OS=="linux" and use_ozone==0', {
+              'dependencies': [
+                '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+              ],
+            }],
+          ],
         },
       ],
       'conditions': [

media/media.gyp

@@ -1944,5 +1944,23 @@
         },
       ],
     }],
+    ['test_isolation_mode != "noop" and archive_gpu_tests==1', {
+      'targets': [
+        {
+          'target_name': 'media_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'media_unittests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+            'media_unittests.isolate',
+          ],
+          'sources': [
+            'media_unittests.isolate',
+          ],
+        },
+      ],
+    }],
   ],
 }

media/media_unittests.isolate

@@ -2,13 +2,48 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
+  'includes': [
+    '../base/base.isolate',
+  ],
   'conditions': [
-    ['OS=="android"', {
+    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'isolate_dependency_untracked': [
           'test/data/',
         ],
       },
     }],
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
+      'variables': {
+        'command': [
+          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
+        ],
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
+        ],
+      },
+    }],
+    # TODO(jmadill): should be automatic. http://crbug.com/418146
+    ['OS=="win"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/ffmpegsumo.dll',
+        ],
+      },
+    }],
+    ['OS=="mac"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/ffmpegsumo.so',
+        ],
+      },
+    }],
+    ['OS=="linux"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+        ],
+      },
+    }],
   ],
 }