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

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

Issue 2296973002: Moves ash content specific tests into ash_content_unittests (Closed)
Patch Set: add dep to base test suport 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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 } 221 }
222 222
223 if (use_ash) { 223 if (use_ash) {
224 sources += [ 224 sources += [
225 "base/default_ash_event_generator_delegate.cc", 225 "base/default_ash_event_generator_delegate.cc",
226 "base/default_ash_event_generator_delegate.h", 226 "base/default_ash_event_generator_delegate.h",
227 ] 227 ]
228 228
229 public_deps += [ 229 public_deps += [
230 "//ash", 230 "//ash",
231 "//ash:test_support", 231 "//ash:test_support_without_content",
232 "//ui/aura", 232 "//ui/aura",
233 "//ui/aura:test_support", 233 "//ui/aura:test_support",
234 ] 234 ]
235 } 235 }
236 if (toolkit_views) { 236 if (toolkit_views) {
237 public_deps += [ "//ui/views:test_support" ] 237 public_deps += [ "//ui/views:test_support" ]
238 } 238 }
239 239
240 if (enable_extensions) { 240 if (enable_extensions) {
241 public_deps += [ 241 public_deps += [
(...skipping 1793 matching lines...) Expand 10 before | Expand all | Expand 10 after
2035 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", 2035 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc",
2036 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", 2036 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc",
2037 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", 2037 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h",
2038 "../browser/ui/ash/shelf_browsertest.cc", 2038 "../browser/ui/ash/shelf_browsertest.cc",
2039 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc ", 2039 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc ",
2040 "../browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc", 2040 "../browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc",
2041 "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome os.cc", 2041 "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome os.cc",
2042 "../browser/ui/ash/volume_controller_browsertest_chromeos.cc", 2042 "../browser/ui/ash/volume_controller_browsertest_chromeos.cc",
2043 "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest .cc", 2043 "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest .cc",
2044 ] 2044 ]
2045 deps += [ "//ash:test_support" ] 2045 deps += [ "//ash:test_support_without_content" ]
2046 2046
2047 if (enable_app_list) { 2047 if (enable_app_list) {
2048 deps += [ ":test_support_applist_ash" ] 2048 deps += [ ":test_support_applist_ash" ]
2049 } 2049 }
2050 } 2050 }
2051 if (use_aura || toolkit_views) { 2051 if (use_aura || toolkit_views) {
2052 deps += [ "//ui/events:test_support" ] 2052 deps += [ "//ui/events:test_support" ]
2053 } 2053 }
2054 if (toolkit_views) { 2054 if (toolkit_views) {
2055 sources += [ 2055 sources += [
(...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after
3142 ".", 3142 ".",
3143 "//chrome") 3143 "//chrome")
3144 } 3144 }
3145 } 3145 }
3146 if (use_ash) { 3146 if (use_ash) {
3147 sources += 3147 sources +=
3148 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources, 3148 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources,
3149 ".", 3149 ".",
3150 "//chrome") 3150 "//chrome")
3151 deps += [ 3151 deps += [
3152 "//ash:test_support", 3152 "//ash:test_support_with_content",
3153 "//ash/common/strings", 3153 "//ash/common/strings",
3154 "//ash/resources", 3154 "//ash/resources",
3155 ] 3155 ]
3156 3156
3157 # We eventually want to compile both in Win Aura builds, see 3157 # We eventually want to compile both in Win Aura builds, see
3158 # http://crbug.com/155545. 3158 # http://crbug.com/155545.
3159 if (!is_win) { 3159 if (!is_win) {
3160 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ] 3160 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ]
3161 } 3161 }
3162 } 3162 }
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
3288 } 3288 }
3289 if (is_chromeos) { 3289 if (is_chromeos) {
3290 deps += [ 3290 deps += [
3291 "//chrome/browser/chromeos:unit_tests", 3291 "//chrome/browser/chromeos:unit_tests",
3292 "//chromeos/ime:gencode", 3292 "//chromeos/ime:gencode",
3293 ] 3293 ]
3294 sources -= [ 3294 sources -= [
3295 "../browser/policy/cloud/user_policy_signin_service_unittest.cc", 3295 "../browser/policy/cloud/user_policy_signin_service_unittest.cc",
3296 "../browser/signin/signin_manager_unittest.cc", 3296 "../browser/signin/signin_manager_unittest.cc",
3297 ] 3297 ]
3298 sources += [
3299 "base/ash_test_environment_chrome.cc",
3300 "base/ash_test_environment_chrome.h",
3301 ]
3298 } 3302 }
3299 if (use_x11) { 3303 if (use_x11) {
3300 deps += [ "//ui/events/devices" ] 3304 deps += [ "//ui/events/devices" ]
3301 data_deps += [ "//tools/xdisplaycheck" ] 3305 data_deps += [ "//tools/xdisplaycheck" ]
3302 } else { 3306 } else {
3303 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ] 3307 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
3304 } 3308 }
3305 if (use_gnome_keyring && current_cpu == "x64") { 3309 if (use_gnome_keyring && current_cpu == "x64") {
3306 # Only add this test for 64 bit builds because otherwise we need the 32 3310 # Only add this test for 64 bit builds because otherwise we need the 32
3307 # bit library on 64 bit systems when running this test. 3311 # bit library on 64 bit systems when running this test.
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
3704 "touch_hud", 3708 "touch_hud",
3705 "ui", 3709 "ui",
3706 ] 3710 ]
3707 3711
3708 if (is_linux && !is_android) { 3712 if (is_linux && !is_android) {
3709 deps += [ "//components/font_service:manifest" ] 3713 deps += [ "//components/font_service:manifest" ]
3710 packaged_services += [ "font_service" ] 3714 packaged_services += [ "font_service" ]
3711 } 3715 }
3712 } 3716 }
3713 } 3717 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698