Move content_gl_tests.isolate to content.

I noticed this while looking through isolate files. Since the test target is in content, the isolate file should be alongside.

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

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

chrome/chrome_tests.gypi

@@ -2956,21 +2956,6 @@
                 'angle_unittests.isolate',
               ],
             },
-            {
-              'target_name': 'content_gl_tests_run',
-              'type': 'none',
-              'dependencies': [
-                '../content/content_shell_and_tests.gyp:content_gl_tests',
-                'chrome_run',
-              ],
-              'includes': [
-                '../build/isolate.gypi',
-                'content_gl_tests.isolate',
-              ],
-              'sources': [
-                'content_gl_tests.isolate',
-              ],
-            },
             {
               'target_name': 'gl_tests_run',
               'type': 'none',

chrome/content_gl_tests.isolate → content/content_gl_tests.isolate

@@ -2,12 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
-  # TODO(kbr): including all of chrome.isolate is overkill -- the only
-  # real dependency is on ffmpegsumo. However, wait to refactor
-  # chrome.isolate (perhaps adding a media.isolate) for the moment.
-  'includes': [
-    'chrome.isolate',
-  ],
   'conditions': [
     ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
@@ -30,5 +24,33 @@
         ],
       },
     }],
+    ['OS=="linux"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+        ],
+      },
+    }],
+    ['OS=="mac"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/ffmpegsumo.so',
+        ],
+      },
+    }],
+    ['OS=="win"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/d3dcompiler_46.dll',
+          '<(PRODUCT_DIR)/libEGL.dll',
+          '<(PRODUCT_DIR)/libGLESv2.dll',
+          '<(PRODUCT_DIR)/ffmpegsumo.dll',
+          '<(PRODUCT_DIR)/osmesa.dll',
+        ],
+      },
+    }],
+  ],
+  'includes': [
+    '../third_party/icu/icu.isolate',
   ],
 }

content/content_tests.gypi

@@ -987,7 +987,27 @@
           'sources': [
             'content_unittests.isolate',
           ],
-       },
+        },
+      ],
+      'conditions': [
+        ['archive_gpu_tests==1', {
+          'targets': [
+            {
+              'target_name': 'content_gl_tests_run',
+              'type': 'none',
+              'dependencies': [
+                'content_shell_and_tests.gyp:content_gl_tests',
+              ],
+              'includes': [
+                '../build/isolate.gypi',
+                'content_gl_tests.isolate',
+              ],
+              'sources': [
+                'content_gl_tests.isolate',
+              ],
+            },
+          ],
+        }],
       ],
     }],
     ['OS!="ios"', {
@@ -1392,6 +1412,12 @@
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
               ],
+            }, {
+              'dependencies': [
+                # Runtime dependencis.
+                '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+                '../third_party/mesa/mesa.gyp:osmesa',
+              ],
             }],
           ],
         },