Provide angle_unittests_run independent of archive_gpu_tests.

chrome/chrome_tests.gypi

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 3213 matching lines @@
               ],
             }],
             ['OS=="win"', {
               'dependencies': [
                 'chrome.gyp:crash_service',
               ],
             }],
           ],
         },
         {
+          'target_name': 'gpu_tests_base',
+          'type': 'none',
+          'dependencies': [
+            # depend on icu to fix races. http://crbug.com/417583
+            '../third_party/icu/icu.gyp:icudata',
+          ],
+          # Set this so we aren't included as a target in files that
+          # include this file via a wildcard (such as chrome_tests.gypi).
+          # If we didn't do this the All target ends up with a rule that
+          # makes it unnecessarily compile in certain situations.
+          'suppress_wildcard': 1,
+          'direct_dependent_settings': {
+            'includes': [
+              '../build/isolate.gypi',
+            ],
+          },
+        },
+        {
+          # GN: //gpu:angle_unittests_run
+          'target_name': 'angle_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            '../gpu/gpu.gyp:angle_unittests',
+            'gpu_tests_base',
+          ],
+          'sources': [
+            'angle_unittests.isolate',
+          ],
+        },
+        {
           'target_name': 'browser_tests_run',
           'type': 'none',
           'dependencies': [
             '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin',
             'browser_tests',
             'chrome',
           ],
           'includes': [
             '../build/isolate.gypi',
           ],
@@ skipping 107 matching lines @@
           ],
           'sources': [
             'sync_integration_tests.isolate',
           ],
         },
       ],
       'conditions': [
         ['archive_gpu_tests==1', {
           'targets': [
             {
-              'target_name': 'gpu_tests_base',
-              'type': 'none',
-              'dependencies': [
-                # depend on icu to fix races. http://crbug.com/417583
-                '../third_party/icu/icu.gyp:icudata',
-              ],
-              # Set this so we aren't included as a target in files that
-              # include this file via a wildcard (such as chrome_tests.gypi).
-              # If we didn't do this the All target ends up with a rule that
-              # makes it unnecessarily compile in certain situations.
-              'suppress_wildcard': 1,
-              'direct_dependent_settings': {
-                'includes': [
-                  '../build/isolate.gypi',
-                ],
-              },
-            },
-            {
-              # GN: //gpu:angle_unittests_run
-              'target_name': 'angle_unittests_run',
-              'type': 'none',
-              'dependencies': [
-                '../gpu/gpu.gyp:angle_unittests',
-                'gpu_tests_base',
-              ],
-              'sources': [
-                'angle_unittests.isolate',
-              ],
-            },
-            {
               # GN: //gpu:gl_tests_run
               'target_name': 'gl_tests_run',
               'type': 'none',
               'dependencies': [
                 '../gpu/gpu.gyp:gl_tests',
                 'gpu_tests_base',
               ],
               'sources': [
                 'gl_tests.isolate',
               ],
@@ skipping 109 matching lines @@
             'browser',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }