Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(934)

Side by Side Diff: chrome/test/BUILD.gn

Issue 2296973002: Moves ash content specific tests into ash_content_unittests (Closed)
Patch Set: remove GetMessageLoop and merge Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//chrome/chrome_tests.gni") 10 import("//chrome/chrome_tests.gni")
(...skipping 1942 matching lines...) Expand 10 before | Expand all | Expand 10 after
1953 ".", 1953 ".",
1954 "//chrome") 1954 "//chrome")
1955 } 1955 }
1956 } 1956 }
1957 if (use_ash) { 1957 if (use_ash) {
1958 sources += 1958 sources +=
1959 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources, 1959 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources,
1960 ".", 1960 ".",
1961 "//chrome") 1961 "//chrome")
1962 deps += [ 1962 deps += [
1963 "//ash:test_support", 1963 "//ash:test_support_with_content",
1964 "//ash/common/strings", 1964 "//ash/common/strings",
1965 "//ash/resources", 1965 "//ash/resources",
1966 ] 1966 ]
1967 1967
1968 # We eventually want to compile both in Win Aura builds, see 1968 # We eventually want to compile both in Win Aura builds, see
1969 # http://crbug.com/155545. 1969 # http://crbug.com/155545.
1970 if (!is_win) { 1970 if (!is_win) {
1971 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ] 1971 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ]
1972 } 1972 }
1973 } 1973 }
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
2099 } 2099 }
2100 if (is_chromeos) { 2100 if (is_chromeos) {
2101 deps += [ 2101 deps += [
2102 "//chrome/browser/chromeos:unit_tests", 2102 "//chrome/browser/chromeos:unit_tests",
2103 "//chromeos/ime:gencode", 2103 "//chromeos/ime:gencode",
2104 ] 2104 ]
2105 sources -= [ 2105 sources -= [
2106 "../browser/policy/cloud/user_policy_signin_service_unittest.cc", 2106 "../browser/policy/cloud/user_policy_signin_service_unittest.cc",
2107 "../browser/signin/signin_manager_unittest.cc", 2107 "../browser/signin/signin_manager_unittest.cc",
2108 ] 2108 ]
2109 sources += [
2110 "base/ash_test_environment_chrome.cc",
2111 "base/ash_test_environment_chrome.h",
2112 ]
2109 } 2113 }
2110 if (use_x11) { 2114 if (use_x11) {
2111 deps += [ "//ui/events/devices" ] 2115 deps += [ "//ui/events/devices" ]
2112 data_deps += [ "//tools/xdisplaycheck" ] 2116 data_deps += [ "//tools/xdisplaycheck" ]
2113 } else { 2117 } else {
2114 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ] 2118 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
2115 } 2119 }
2116 if (use_gnome_keyring && current_cpu == "x64") { 2120 if (use_gnome_keyring && current_cpu == "x64") {
2117 # Only add this test for 64 bit builds because otherwise we need the 32 2121 # Only add this test for 64 bit builds because otherwise we need the 32
2118 # bit library on 64 bit systems when running this test. 2122 # bit library on 64 bit systems when running this test.
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
2499 "touch_hud", 2503 "touch_hud",
2500 "ui", 2504 "ui",
2501 ] 2505 ]
2502 2506
2503 if (is_linux && !is_android) { 2507 if (is_linux && !is_android) {
2504 deps += [ "//components/font_service:manifest" ] 2508 deps += [ "//components/font_service:manifest" ]
2505 packaged_services += [ "font_service" ] 2509 packaged_services += [ "font_service" ]
2506 } 2510 }
2507 } 2511 }
2508 } 2512 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698