Move tests in chrome_app_unittests into unit_tests

chrome/test/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_tests.gni")
 import("//chrome/test/base/js2gtest.gni")
@@ skipping 1839 matching lines @@
               "//chrome")
     }
     if (enable_plugins && !enable_plugin_installation) {
       sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
     }
   }
 
   if (is_win || (is_linux && !is_chromeos)) {
     # TODO(GYP): Figure out which of these work and are needed on other
     # platforms.
-    test("chrome_app_unittests") {
-      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",
-      ]
-
-      deps = [
-        ":test_support",
-        "//breakpad:client",
-        "//chrome/browser",
-        "//chrome/child",
-        "//base/test:run_all_unittests",
-        "//base/test:test_support",
-      ]
-      if (cld_version == 2) {
-        # Use whatever CLD2 data access mode that the
-        # application embedder is using.
-        deps += [ "//third_party/cld_2:cld2_platform_impl" ]
-      }
-    }
-
     test("performance_browser_tests") {
       sources = rebase_path(
               chrome_tests_gypi_values.performance_browser_tests_sources,
               ".",
               "//chrome")
 
       defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
       deps = [
         ":test_support",
@@ skipping 56 matching lines @@
     "//third_party/mojo/src/mojo/edk/system",
   ]
 
   if (!is_android && use_ash) {
     sources += rebase_path(
             chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources,
             ".",
             "//chrome")
   }
 }