Move tests in chrome_app_unittests into unit_tests

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 07754b03f5e893438e1d598f0db423acfd4e03bd..1a135ea4117083edc32520b2bffba137d1aa5d6c 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1401,6 +1401,10 @@
     ],
     'chrome_unit_tests_win_sources': [
       'app/chrome_dll.rc',
+      'app/chrome_watcher_client_unittest_win.cc',
+      'app/chrome_watcher_command_line_unittest_win.cc',
+      'app/delay_load_hook_unittest_win.cc',
+      'app/signature_validator_win_unittest.cc',
       'browser/search_engines/template_url_scraper_unittest.cc',
       'test/data/resource.rc',
     ],
@@ -2196,6 +2200,7 @@
       ],
       'msvs_settings': {
         'VCLinkerTool': {
+          'AdditionalDependencies': [ 'wintrust.lib' ],
           'conditions': [
             ['incremental_chrome_dll==1', {
               'UseLibraryDependencyInputs': "true",
@@ -2585,7 +2590,9 @@
             'browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp:verifier_test_dll_2',
             'chrome_version_resources',
             'installer_util_strings',
+            '../breakpad/breakpad.gyp:*',
             '../chrome_elf/chrome_elf.gyp:blacklist_test_dll_1',
+            '../components/components.gyp:crash_component',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
           ],
@@ -2728,72 +2735,6 @@
       ],
     },
     {
-      # GN: //chrome/test:chrome_app_unittests
-      'target_name': 'chrome_app_unittests',
-      'type': 'executable',
-      'dependencies': [
-        # unit tests should only depend on
-        # 1) everything that the chrome binaries depend on:
-        '<@(chromium_browser_dependencies)',
-        '<@(chromium_child_dependencies)',
-        '../content/content.gyp:content_app_both',
-        # 2) test-specific support libraries:
-        '../base/base.gyp:run_all_unittests',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        'test_support_common',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'app/chrome_watcher_client_unittest_win.cc',
-        'app/chrome_watcher_client_win.cc',
-        'app/chrome_watcher_command_line_unittest_win.cc',
-        'app/chrome_watcher_command_line_win.cc',
-        'app/delay_load_hook_unittest_win.cc',
-        'app/delay_load_hook_win.cc',
-        'app/delay_load_hook_win.h',
-        'app/signature_validator_win.cc',
-        'app/signature_validator_win.h',
-        'app/signature_validator_win_unittest.cc',
-        'common/crash_keys.cc',
-        'common/crash_keys.h',
-      ],
-      'conditions': [
-        ['OS=="mac" or OS=="ios"', {
-          'include_dirs': [
-            '<(DEPTH)/breakpad/src',
-          ],
-        }],
-        ['OS=="mac"', {
-          # TODO(mark): We really want this for all non-static library targets,
-          # but when we tried to pull it up to the common.gypi level, it broke
-          # other things like the ui and startup tests. *shrug*
-          'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
-        }],
-        ['OS=="win"', {
-          'dependencies': [
-            # breakpad is currently only tested on Windows.
-            '../breakpad/breakpad.gyp:*',
-            '../components/components.gyp:crash_component',
-          ],
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'AdditionalDependencies': [ 'wintrust.lib' ],
-            },
-          },
-        }],
-      ],
-    },
-    {
       # Protobuf compiler / generator for IPC protobuf message tests.
 
       # GN version: //chrome/test:test_proto