Revert of Get gn_all/gyp_remaining working for Windows.

build/gn_migration.gypi

 # Copyright (c) 2015 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.
 
 # This file defines three targets that we are using to
 # track the progress of the GYP->GN migration:
 #
 # If you run 'ninja gn_build gyp_remaining gyp_groups', and then
 # run 'ninja', the second ninja invocation should do nothing. This
 # indicates that everything built by a ninja build is in fact
@@ skipping 22 matching lines @@
       # as closely as possible, for ease of comparison.
       'target_name': 'gn_all',
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_i18n_perftests',
         '../base/base.gyp:base_perftests',
         '../base/base.gyp:base_unittests',
         '../base/base.gyp:build_utf8_validator_tables#host',
         '../base/base.gyp:check_example',
         '../base/base.gyp:protect_file_posix',
+        '../breakpad/breakpad.gyp:core-2-minidump',
+        '../breakpad/breakpad.gyp:microdump_stackwalk',
+        '../breakpad/breakpad.gyp:minidump_dump',
+        '../breakpad/breakpad.gyp:minidump_stackwalk',
+        '../build/sanitizers/sanitizers.gyp:llvm-symbolizer',
         '../cc/cc_tests.gyp:cc_perftests',
         '../cc/cc_tests.gyp:cc_unittests',
         '../cc/blink/cc_blink_tests.gyp:cc_blink_unittests',
         '../chrome/chrome.gyp:chrome',
         '../chrome/chrome.gyp:browser_tests',
         '../chrome/chrome.gyp:chrome_app_unittests',
         '../chrome/chrome.gyp:chromedriver',
         '../chrome/chrome.gyp:chromedriver_tests',
         '../chrome/chrome.gyp:chromedriver_unittests',
         '../chrome/chrome.gyp:interactive_ui_tests',
@@ skipping 19 matching lines @@
         '../content/content_shell_and_tests.gyp:content_perftests',
         '../content/content_shell_and_tests.gyp:content_shell',
         '../content/content_shell_and_tests.gyp:content_unittests',
         '../courgette/courgette.gyp:courgette',
         '../courgette/courgette.gyp:courgette_fuzz',
         '../courgette/courgette.gyp:courgette_minimal_tool',
         '../courgette/courgette.gyp:courgette_unittests',
         '../crypto/crypto.gyp:crypto_unittests',
         '../extensions/extensions_tests.gyp:extensions_browsertests',
         '../extensions/extensions_tests.gyp:extensions_unittests',
+        '../dbus/dbus.gyp:dbus_test_server',
         '../device/device_tests.gyp:device_unittests',
         '../gin/gin.gyp:gin_v8_snapshot_fingerprint',
         '../gin/gin.gyp:gin_shell',
         '../gin/gin.gyp:gin_unittests',
         '../google_apis/gcm/gcm.gyp:gcm_unit_tests',
         '../google_apis/gcm/gcm.gyp:mcs_probe',
         '../google_apis/google_apis.gyp:google_apis_unittests',
         '../gpu/gpu.gyp:angle_unittests',
         '../gpu/gpu.gyp:gl_tests',
         '../gpu/gpu.gyp:gpu_perftests',
         '../gpu/gpu.gyp:gpu_unittests',
         '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',  # TODO(GYP) crbug.com/471920
         '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',  # TODO(GYP) crbug.com/471920
         '../gpu/khronos_glcts_support/khronos_glcts_test.gyp:khronos_glcts_test',  # TODO(GYP) crbug.com/471903 to make this complete.
         '../ipc/ipc.gyp:ipc_perftests',
         '../ipc/ipc.gyp:ipc_tests',
         '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests',
         '../jingle/jingle.gyp:jingle_unittests',
         '../media/media.gyp:ffmpeg_regression_tests',  # TODO(GYP) this should be conditional on media_use_ffmpeg
         '../media/media.gyp:media_perftests',
         '../media/media.gyp:media_unittests',
         '../media/cast/cast.gyp:cast_benchmarks',
         '../media/cast/cast.gyp:cast_unittests',
         '../media/cast/cast.gyp:generate_barcode_video',
         '../media/cast/cast.gyp:generate_timecode_audio',
+        '../media/cast/cast.gyp:tap_proxy',
         '../mojo/mojo.gyp:mojo',
         '../mojo/mojo_base.gyp:mojo_application_chromium',
         '../mojo/mojo_base.gyp:mojo_common_unittests',
         '../net/net.gyp:crash_cache',
         '../net/net.gyp:crl_set_dump',
         '../net/net.gyp:dns_fuzz_stub',
         '../net/net.gyp:dump_cache',
         '../net/net.gyp:gdig',
         '../net/net.gyp:get_server_time',
         '../net/net.gyp:hpack_example_generator',
@@ skipping 31 matching lines @@
         '../ppapi/ppapi_internal.gyp:ppapi_example_scroll',
         '../ppapi/ppapi_internal.gyp:ppapi_example_simple_font',
         '../ppapi/ppapi_internal.gyp:ppapi_example_threading',
         '../ppapi/ppapi_internal.gyp:ppapi_example_url_loader',
         '../ppapi/ppapi_internal.gyp:ppapi_example_url_loader_file',
         '../ppapi/ppapi_internal.gyp:ppapi_example_vc',
         '../ppapi/ppapi_internal.gyp:ppapi_example_video_decode',
         '../ppapi/ppapi_internal.gyp:ppapi_example_video_decode_dev',
         '../ppapi/ppapi_internal.gyp:ppapi_example_video_effects',
         '../ppapi/ppapi_internal.gyp:ppapi_example_video_encode',
-        '../ppapi/ppapi_internal.gyp:ppapi_tests',
+        '../ppapi/ppapi_internal.gyp:ppapi_tests',  # TODO(GYP): Split out the examples and tests
         '../ppapi/ppapi_internal.gyp:ppapi_unittests',
         '../ppapi/tools/ppapi_tools.gyp:pepper_hash_for_uma',
         '../printing/printing.gyp:printing_unittests',
         '../skia/skia_tests.gyp:skia_unittests',
         '../skia/skia.gyp:filter_fuzz_stub',
         '../skia/skia.gyp:image_operations_bench',
         '../sql/sql.gyp:sql_unittests',
         '../sync/sync.gyp:run_sync_testserver',
         '../sync/sync.gyp:sync_endtoend_tests',
         '../sync/sync.gyp:sync_unit_tests',
         '../sync/tools/sync_tools.gyp:sync_client',
         '../sync/tools/sync_tools.gyp:sync_listen_notifications',
         '../testing/gmock.gyp:gmock_main',
         '../third_party/WebKit/public/all.gyp:blink_tests',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
         '../third_party/codesighs/codesighs.gyp:codesighs',
         '../third_party/codesighs/codesighs.gyp:maptsvdifftool',
         '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
         '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
         '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
         '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests',
         '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
         '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests',
         '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests',
         '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests',
         '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests',
         '../third_party/pdfium/samples/samples.gyp:pdfium_test',
         '../third_party/smhasher/smhasher.gyp:pmurhash',
+        '../third_party/sqlite/sqlite.gyp:sqlite_shell',
         '../tools/gn/gn.gyp:gn',
         '../tools/gn/gn.gyp:generate_test_gn_data',
         '../tools/gn/gn.gyp:gn_unittests',
         '../tools/imagediff/image_diff.gyp:image_diff',
         '../tools/perf/clear_system_cache/clear_system_cache.gyp:clear_system_cache',
         '../tools/telemetry/telemetry.gyp:bitmaptools#host',
         '../ui/accessibility/accessibility.gyp:accessibility_unittests',
         '../ui/app_list/app_list.gyp:app_list_unittests',
         '../ui/base/ui_base_tests.gyp:ui_base_unittests',
         '../ui/compositor/compositor.gyp:compositor_unittests',
         '../ui/display/display.gyp:display_unittests',
         '../ui/events/events.gyp:events_unittests',
         '../ui/gfx/gfx_tests.gyp:gfx_unittests',
         '../ui/keyboard/keyboard.gyp:keyboard_unittests',
         '../ui/message_center/message_center.gyp:message_center_unittests',
         '../ui/snapshot/snapshot.gyp:snapshot_unittests',
         '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
         '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
         '../url/url.gyp:url_unittests',
         '../v8/tools/gyp/v8.gyp:v8_snapshot',
         '../v8/tools/gyp/v8.gyp:postmortem-metadata',
       ],
       'conditions': [
         ['chromeos== 1 or use_ash==1', {
           'dependencies': [
             '../components/components.gyp:session_manager_component',
           ]
         }],
-        ['clang==1', {
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {
           'dependencies': [
-            '../build/sanitizers/sanitizers.gyp:llvm-symbolizer',
+             '../remoting/remoting.gyp:remoting_key_tester',
           ],
         }],
         ['disable_nacl==0 and disable_nacl_untrusted==0', {
           'dependencies': [
             '../components/nacl.gyp:nacl_loader_unittests',
           ]
         }],
         ['enable_extensions==1 and OS!="mac"', {
           'dependencies': [
             '../extensions/shell/app_shell.gyp:app_shell',
             '../extensions/shell/app_shell.gyp:app_shell_unittests',
           ],
         }],
         ['OS!="win"', {
           'dependencies': [
-            '../breakpad/breakpad.gyp:core-2-minidump',
-            '../breakpad/breakpad.gyp:microdump_stackwalk',
-            '../breakpad/breakpad.gyp:minidump_dump',
-            '../breakpad/breakpad.gyp:minidump_stackwalk',
             '../breakpad/breakpad.gyp:symupload',
           ],
         }],
         ['remoting==1', {
           'dependencies': [
             '../remoting/remoting.gyp:remoting_host',
             '../remoting/remoting.gyp:remoting_it2me_native_messaging_host',
             '../remoting/remoting.gyp:remoting_me2me_native_messaging_host',
             '../remoting/remoting.gyp:remoting_me2me_host',
             '../remoting/remoting.gyp:remoting_native_messaging_manifests',
             '../remoting/remoting.gyp:remoting_perftests',
             '../remoting/remoting.gyp:remoting_start_host',
             '../remoting/remoting.gyp:remoting_unittests',
           ],
         }],
-        ['remoting==1 and disable_nacl==0 and disable_nacl_untrusted==0', {
-          'dependencies': [
-             '../remoting/remoting.gyp:remoting_key_tester',
-          ],
-        }],
         ['use_x11==1', {
           'dependencies': [
             '../media/media.gyp:player_x11',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'conditions': [
             ['target_arch!="arm"', {
               'dependencies': [
                 '../gpu/tools/tools.gyp:compositor_model_bench',
               ],
@@ skipping 111 matching lines @@
             '../net/net.gyp:flip_in_mem_edsm_server_unittests',
             '../net/net.gyp:hpack_example_generator',
             '../net/net.gyp:hpack_fuzz_mutator',
             '../net/net.gyp:hpack_fuzz_wrapper',
             '../net/net.gyp:net_perftests',
             '../net/net.gyp:quic_client',
             '../net/net.gyp:quic_server',
             '../sandbox/sandbox.gyp:chrome_sandbox',
             '../sandbox/sandbox.gyp:sandbox_linux_unittests',
             '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests',
-            '../third_party/sqlite/sqlite.gyp:sqlite_shell',
          ],
         }],
         ['OS=="mac"', {
           'dependencies': [
             '../breakpad/breakpad.gyp:crash_inspector',
             '../breakpad/breakpad.gyp:dump_syms',
             '../breakpad/breakpad.gyp:symupload',
             '../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample_code',
             '../third_party/molokocacao/molokocacao.gyp:molokocacao',
 
@@ skipping 37 matching lines @@
             #"//extensions:extensions_browsertests",  # TODO(GYP)
             #"//extensions:extensions_unittests",  # TODO(GYP)
             #"//net:net_unittests",  # TODO(GYP)
             #"//third_party/usrsctp",  # TODO(GYP)
             #"//ui/app_list:app_list_unittests",  # TODO(GYP)
             #"//ui/gfx:gfx_unittests",  # TODO(GYP)
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
+            "//ui/metro_viewer",
             '../third_party/codesighs/codesighs.gyp:msdump2symdb',
-            '../win8/win8.gyp:metro_viewer',
+          ],
+          'dependencies!': [
+            "//crypto:crypto_unittests",  # TODO(GYP)
+            "//net:net_unittests",  # TODO(GYP)
           ],
         }, {
           'dependencies': [
             '../third_party/codesighs/codesighs.gyp:nm2tsv',
           ],
         }],
         ['OS=="android" or OS=="linux"', {
           'dependencies': [
             '../net/net.gyp:disk_cache_memory_test',
           ],
@@ skipping 12 matching lines @@
               ]
             }],
           ]
         }],
       ],
     },
     {
       'target_name': 'gyp_remaining',
       'type': 'none',
       'conditions': [
-        ['remoting==1', {
-          'dependencies': [
-            '../remoting/app_remoting_webapp.gyp:ar_sample_app',  # crbug.com/471916
-          ],
-        }],
-        ['remoting==1 and disable_nacl==0 and disable_nacl_untrusted==0', {
-           'dependencies': [
-             '../remoting/remoting.gyp:remoting_key_tester',
-           ],
-        }],
-        ['test_isolation_mode!="noop"', {
-          'dependencies': [
-            '../base/base.gyp:base_unittests_run',
-            '../cc/cc_tests.gyp:cc_unittests_run',
-            '../chrome/chrome.gyp:browser_tests_run',
-            '../chrome/chrome.gyp:chrome_run',
-            '../chrome/chrome.gyp:interactive_ui_tests_run',
-            '../chrome/chrome.gyp:sync_integration_tests_run',
-            '../chrome/chrome.gyp:unit_tests_run',
-            '../components/components_tests.gyp:components_browsertests_run',
-            '../components/components_tests.gyp:components_unittests_run',
-            '../content/content_shell_and_tests.gyp:content_browsertests_run',
-            '../content/content_shell_and_tests.gyp:content_unittests_run',
-            '../crypto/crypto.gyp:crypto_unittests_run',
-            '../courgette/courgette.gyp:courgette_unittests_run',
-            '../gpu/gpu.gyp:gpu_unittests_run',
-            '../media/cast/cast.gyp:cast_unittests_run',
-            '../media/media.gyp:media_unittests_run',
-            '../net/net.gyp:net_unittests_run',
-            '../sql/sql.gyp:sql_unittests_run',
-            '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests_run',
-            '../ui/accessibility/accessibility.gyp:accessibility_unittests_run',
-            '../ui/app_list/app_list.gyp:app_list_unittests_run',
-            '../ui/events/events.gyp:events_unittests_run',
-            '../ui/message_center/message_center.gyp:message_center_unittests_run',
-            '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests_run',
-          ],
-          'conditions': [
-            ['use_ash==1', {
-              'dependencies': [
-                '../ash/ash.gyp:ash_unittests_run',
-              ],
-            }],
-            ['OS=="linux"', {
-              'dependencies': [
-                '../sandbox/sandbox.gyp:sandbox_linux_unittests_run',
-              ],
-            }],
-          ],
-        }],
-        ['use_openssl==1', {
-          'dependencies': [
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_ecdsa_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_bn_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_pqueue_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_digest_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_cipher_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_hkdf_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_constant_time_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_thread_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_base64_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_gcm_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_bytestring_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_evp_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_dsa_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_rsa_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_hmac_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_aead_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_ssl_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_err_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_lhash_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_pbkdf_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_dh_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_pkcs12_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_example_mul',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_ec_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_bio_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_pkcs7_test',
-            '../third_party/boringssl/boringssl_tests.gyp:boringssl_unittests',
-          ],
-        }],
         ['OS=="linux"', {
           'dependencies': [
             '../third_party/webrtc/tools/tools.gyp:frame_analyzer',
             '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
           ],
-        }],
-        ['OS=="win"', {
-          'dependencies': [
-            '../base/allocator/allocator.gyp:allocator_unittests',
-            '../base/base.gyp:debug_message',
-            '../base/base.gyp:pe_image_test',
-            '../chrome/chrome.gyp:app_installer',
-            '../chrome/chrome.gyp:app_installer_unittests',
-            '../chrome/chrome.gyp:app_shim',
-            '../chrome/chrome.gyp:crash_service',
-            '../chrome/chrome.gyp:gcapi_dll',
-            '../chrome/chrome.gyp:gcapi_test',
-            '../chrome/chrome.gyp:installer_util_unittests',
-            '../chrome/chrome.gyp:pack_policy_templates',
-            '../chrome/chrome.gyp:sb_sigutil',
-            '../chrome/chrome.gyp:setup',
-            '../chrome/chrome.gyp:setup_unittests',
-            '../chrome/installer/mini_installer.gyp:mini_installer',
-            '../chrome/tools/crash_service/caps/caps.gyp:caps',
-            '../chrome_elf/chrome_elf.gyp:blacklist_test_dll_2',
-            '../chrome_elf/chrome_elf.gyp:blacklist_test_dll_3',
-            '../chrome_elf/chrome_elf.gyp:blacklist_test_main_dll',
-            '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests',
-            '../chrome_elf/chrome_elf.gyp:dll_hash_main',
-            '../cloud_print/gcp20/prototype/gcp20_device.gyp:gcp20_device',
-            '../cloud_print/gcp20/prototype/gcp20_device.gyp:gcp20_device_unittests',
-            '../cloud_print/service/service.gyp:cloud_print_service',
-            '../cloud_print/service/service.gyp:cloud_print_service_config',
-            '../cloud_print/service/service.gyp:cloud_print_service_setup',
-            '../cloud_print/virtual_driver/win/install/virtual_driver_install.gyp:virtual_driver_setup',
-            '../cloud_print/virtual_driver/win/virtual_driver.gyp:gcp_portmon',
-            '../components/components.gyp:wifi_test',
-            '../content/content_shell_and_tests.gyp:content_shell_crash_service',
-            '../content/content_shell_and_tests.gyp:layout_test_helper',
-            '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest',
-            '../gpu/gpu.gyp:angle_end2end_tests',
-            '../gpu/gpu.gyp:angle_perftests',
-            '../net/net.gyp:net_docs',
-            '../net/net.gyp:quic_client',
-            '../net/net.gyp:quic_server',
-            '../ppapi/ppapi_internal.gyp:ppapi_perftests',
-            '../remoting/app_remoting_test.gyp:ar_sample_test_driver',
-            '../remoting/remoting.gyp:remoting_breakpad_tester',
-            '../remoting/remoting.gyp:remoting_console',
-            '../remoting/remoting.gyp:remoting_desktop',
-            '../rlz/rlz.gyp:rlz',
-            '../rlz/rlz.gyp:rlz_id',
-            '../rlz/rlz.gyp:rlz_unittests',
-            '../sandbox/sandbox.gyp:pocdll',
-            '../sandbox/sandbox.gyp:sandbox_poc',
-            '../sandbox/sandbox.gyp:sbox_integration_tests',
-            '../sandbox/sandbox.gyp:sbox_unittests',
-            '../sandbox/sandbox.gyp:sbox_validation_tests',
-            '../testing/gtest.gyp:gtest_main',
-            '../third_party/codesighs/codesighs.gyp:msmap2tsv',
-            '../third_party/pdfium/samples/samples.gyp:pdfium_diff',
-            '../third_party/webrtc/tools/tools.gyp:frame_analyzer',
-            '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
-            '../tools/win/static_initializers/static_initializers.gyp:static_initializers',
+          'conditions': [
+            ['remoting==1', {
+              'dependencies': [
+                '../remoting/app_remoting_webapp.gyp:ar_sample_app',  # crbug.com/471916
+              ],
+              'conditions': [
+                ['disable_nacl==0 and disable_nacl_untrusted==0', {
+                  'dependencies': [
+                    '../remoting/remoting.gyp:remoting_key_tester',
+                  ]
+                }],
+              ],
+            }],
+            ['test_isolation_mode!="noop"', {
+              'dependencies': [
+                '../base/base.gyp:base_unittests_run',
+                '../cc/cc_tests.gyp:cc_unittests_run',
+                '../chrome/chrome.gyp:browser_tests_run',
+                '../chrome/chrome.gyp:chrome_run',
+                '../chrome/chrome.gyp:interactive_ui_tests_run',
+                '../chrome/chrome.gyp:sync_integration_tests_run',
+                '../chrome/chrome.gyp:unit_tests_run',
+                '../components/components_tests.gyp:components_browsertests_run',
+                '../components/components_tests.gyp:components_unittests_run',
+                '../content/content_shell_and_tests.gyp:content_browsertests_run',
+                '../content/content_shell_and_tests.gyp:content_unittests_run',
+                '../crypto/crypto.gyp:crypto_unittests_run',
+                '../courgette/courgette.gyp:courgette_unittests_run',
+                '../gpu/gpu.gyp:gpu_unittests_run',
+                '../media/cast/cast.gyp:cast_unittests_run',
+                '../media/media.gyp:media_unittests_run',
+                '../net/net.gyp:net_unittests_run',
+                '../sandbox/sandbox.gyp:sandbox_linux_unittests_run',
+                '../sql/sql.gyp:sql_unittests_run',
+                '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests_run',
+                '../ui/accessibility/accessibility.gyp:accessibility_unittests_run',
+                '../ui/app_list/app_list.gyp:app_list_unittests_run',
+                '../ui/events/events.gyp:events_unittests_run',
+                '../ui/message_center/message_center.gyp:message_center_unittests_run',
+                '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests_run',
+              ],
+              'conditions': [
+                ['use_ash==1', {
+                  'dependencies': [
+                    '../ash/ash.gyp:ash_unittests_run',
+                  ],
+                }],
+              ],
+            }],
           ],
         }],
-        ['OS=="win" and target_arch=="ia32"', {
-          'dependencies': [
-            '../base/base.gyp:base_win64',
-            '../base/base.gyp:base_i18n_nacl_win64',
-            '../chrome/chrome.gyp:crash_service_win64',
-            '../chrome/chrome.gyp:launcher_support64',
-            '../components/components.gyp:breakpad_win64',
-            '../courgette/courgette.gyp:courgette64',
-            '../crypto/crypto.gyp:crypto_nacl_win64',
-            '../ipc/ipc.gyp:ipc_win64',
-            '../sandbox/sandbox.gyp:sandbox_win64',
-            '../cloud_print/virtual_driver/win/virtual_driver64.gyp:gcp_portmon64',
-            '../cloud_print/virtual_driver/win/virtual_driver64.gyp:virtual_driver_lib64',
-          ],
-        }],
-        ['OS=="win" and target_arch=="ia32" and configuration_policy==1', {
-          'dependencies': [
-            '../components/components.gyp:policy_win64',
-          ]
-        }],
       ],
     },
     {
       # This target, when built, should cause no actual work
       # to be done, just update a bunch of stamp files.
       'target_name': 'gyp_groups',
       'type': 'none',
       'dependencies': [
         'All',
         'aura_builder',
         'blink_tests',
         'chromium_builder_asan',
         'chromium_builder_chromedriver',
         'chromium_builder_perf',
         'chromium_builder_tests',
         'chromium_builder_webrtc',
         'chromium_gpu_builder',
         'chromium_gpu_debug_builder',
       ],
     },
   ]
 }