Move tests in chrome_app_unittests into unit_tests

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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_unit_tests_sources': [
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
@@ skipping 1383 matching lines @@
       'browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc',
       'browser/ui/views/tabs/tab_strip_unittest.cc',
       'browser/ui/views/tabs/tab_unittest.cc',
       'browser/ui/views/toolbar/reload_button_unittest.cc',
       'browser/ui/views/toolbar/toolbar_action_view_unittest.cc',
       'browser/ui/views/translate/translate_bubble_view_unittest.cc',
       'browser/ui/views/validation_message_bubble_delegate_unittest.cc',
     ],
     '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',
     ],
     'chrome_unit_tests_mac_sources': [
       'browser/media_galleries/fileapi/iphoto_file_util_unittest.cc',
       'utility/media_galleries/iphoto_library_parser_unittest.cc',
     ],
     'chrome_unit_tests_win_mac_sources': [
       'browser/media_galleries/fileapi/itunes_file_util_unittest.cc',
       'browser/media_galleries/fileapi/picasa_file_util_unittest.cc',
@@ skipping 775 matching lines @@
         '../ui/gfx/gfx.gyp:gfx_test_support',
         '../ui/resources/ui_resources.gyp:ui_resources',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
       ],
       'include_dirs': [
         '..',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
+          'AdditionalDependencies': [ 'wintrust.lib' ],
           'conditions': [
             ['incremental_chrome_dll==1', {
               'UseLibraryDependencyInputs': "true",
             }],
           ],
         },
       },
       'sources': [
         '<@(chrome_unit_tests_sources)',
         '<@(chrome_unit_tests_js_sources)',
@@ skipping 369 matching lines @@
               },
             },
           },
         }],
         ['OS=="win"', {
           'dependencies': [
             'browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp:verifier_test_dll_1',
             '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',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '<(allocator_target)',
               ],
             }],
             ['branding!="Chrome"', {
@@ skipping 122 matching lines @@
         }],
         ['enable_plugin_installation==0', {
           'sources!': [
             'browser/plugins/plugin_installer_unittest.cc',
           ],
         }],
         # Adding more conditions? Don't forget to update the GN build.
       ],
     },
     {
-      # 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
       'target_name': 'ipc_protobuf_message_test_proto',
       'type': 'static_library',
       'sources': [
         'common/safe_browsing/ipc_protobuf_message_test.proto'
       ],
       'variables': {
         'proto_in_dir': 'common/safe_browsing',
@@ skipping 82 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }