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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/BUILD.gn

Issue 1291703008: Rename is_chromeos in chrome/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: retry Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/variations/BUILD.gn ('k') | chrome/third_party/chromevox/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index d3b7d9a5941eb4049a83a32247f51a65b207131d..6df34be182b913f20e37b5f0beb0549697f0d8bd 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -185,7 +185,7 @@ source_set("test_support") {
]
}
}
- if (is_chromeos) {
+ if (use_cros_fe) {
deps += [ "//components/ownership" ]
}
@@ -340,7 +340,7 @@ if (!is_android) {
# SendMouseMoveNotifyWhenDone
sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ]
}
- if (is_chromeos || !use_x11) {
+ if (use_cros_fe || !use_x11) {
sources -= [
"../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc",
"../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc",
@@ -351,7 +351,7 @@ if (!is_android) {
}
}
- if (is_linux && !is_chromeos) {
+ if (is_linux && !use_cros_fe) {
# Desktop linux.
sources -= [
# TODO(port): This times out. Attempts have been made to fix the
@@ -367,7 +367,7 @@ if (!is_android) {
"//chrome")
}
- if (is_chromeos) {
+ if (use_cros_fe) {
sources += rebase_path(
chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sources,
".",
@@ -484,7 +484,7 @@ if (!is_android) {
# Non-ChromeOS notifications tests (ChromeOS does not use cross-platform
# panels).
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources += [
"../browser/notifications/notification_browsertest.cc",
"../browser/notifications/platform_notification_service_browsertest.cc",
@@ -503,7 +503,7 @@ if (!is_android) {
}
} # enable_notifications
- if (use_aura || is_chromeos) {
+ if (use_aura || use_cros_fe) {
sources -=
[ "../../ui/views/corewm/desktop_capture_controller_unittest.cc" ]
}
@@ -546,7 +546,7 @@ if (!is_android) {
"../browser/sync/test/integration/sync_app_list_helper.h",
]
}
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources -= [
"../browser/sync/test/integration/wifi_credentials_helper.cc",
"../browser/sync/test/integration/wifi_credentials_helper.h",
@@ -564,7 +564,7 @@ if (!is_android) {
# crbug.com/230471
sources -= [ "data/webui/accessibility_audit_browsertest.js" ]
}
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources -= [ "data/webui/certificate_viewer_dialog_test.js" ]
}
if (!enable_app_list) {
@@ -784,7 +784,7 @@ if (!is_android) {
# "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_media_galleries", # TODO(GYP) bug 512900
# "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_packaged_app", # TODO(GYP) bug 512900
]
- if (is_chromeos) {
+ if (use_cros_fe) {
sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ]
deps += [
"//chrome/browser/chromeos",
@@ -838,7 +838,7 @@ if (!is_android) {
"//chrome")
}
}
- if (is_chromeos) {
+ if (use_cros_fe) {
sources += rebase_path(
chrome_tests_gypi_values.chrome_browser_tests_chromeos_sources,
".",
@@ -929,7 +929,7 @@ if (!is_android) {
"../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc",
]
}
- if (!is_chromeos && use_aura) {
+ if (!use_cros_fe && use_aura) {
sources -= [
# On Windows and Linux, we currently don't support enough of the
# ash environment to run these unit tests.
@@ -1002,7 +1002,7 @@ if (!is_android) {
]
deps += [ "//components/wifi:test_support" ]
}
- if (!is_posix || is_chromeos) {
+ if (!is_posix || use_cros_fe) {
sources -= [ "../common/time_format_browsertest.cc" ]
}
if (is_android) {
@@ -1013,7 +1013,7 @@ if (!is_android) {
"../renderer/spellchecker/spellcheck_unittest.cc",
]
}
- if (is_chromeos) {
+ if (use_cros_fe) {
sources += [
"../browser/extensions/api/networking_private/networking_private_apitest.cc",
"../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc",
@@ -1175,7 +1175,7 @@ if (!is_android) {
} else {
sources -= [ "../app/chrome_version.rc.version" ]
}
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources -= [
"../browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc",
"../browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc",
@@ -1280,7 +1280,7 @@ if (!is_android) {
rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_js_sources,
".",
"//chrome")
- if (is_chromeos) {
+ if (use_cros_fe) {
sources += rebase_path(
chrome_tests_unit_gypi_values.chrome_unit_tests_chromeos_gtestjs_sources,
".",
@@ -1429,7 +1429,7 @@ if (!is_android) {
".",
"//chrome")
}
- if (is_ios || is_chromeos) {
+ if (is_ios || use_cros_fe) {
sources -=
[ "../browser/metrics/signin_status_metrics_provider_unittest.cc" ]
}
@@ -1473,7 +1473,7 @@ if (!is_android) {
".",
"//chrome")
}
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources += rebase_path(
chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_non_chromeos_sources,
".",
@@ -1528,13 +1528,13 @@ if (!is_android) {
"//ui/views:test_support",
]
}
- if (!is_chromeos && is_linux) {
+ if (is_linux && !use_cros_fe) {
sources += rebase_path(
chrome_tests_unit_gypi_values.chrome_unit_tests_desktop_linux_sources,
".",
"//chrome")
}
- if (!is_chromeos && !use_ozone && is_linux) {
+ if (is_linux && !use_cros_fe && !use_ozone) {
deps += [
"//chrome/browser/ui/libgtk2ui",
"//build/config/linux:gio",
@@ -1564,13 +1564,13 @@ if (!is_android) {
chrome_tests_unit_gypi_values.chrome_unit_tests_configuration_policy_sources,
".",
"//chrome")
- if (is_chromeos) {
+ if (use_cros_fe) {
sources -=
[ "../browser/policy/cloud/user_policy_signin_service_unittest.cc" ]
} else if (is_android) {
sources -= [ "../browser/policy/policy_path_parser_unittest.cc" ]
}
- if (!is_android && !is_ios && !is_chromeos) {
+ if (!is_android && !is_ios && !use_cros_fe) {
sources +=
[ "../browser/net/disk_cache_dir_policy_handler_unittest.cc" ]
}
@@ -1670,7 +1670,7 @@ if (!is_android) {
".",
"//chrome")
}
- if (is_chromeos) {
+ if (use_cros_fe) {
deps += [ "//chrome/browser/chromeos:unit_tests" ]
sources -= [
"../browser/signin/signin_global_error_unittest.cc",
@@ -1698,7 +1698,7 @@ if (!is_android) {
"//chrome/browser:gnome_keyring_direct",
]
}
- if (is_linux && !is_chromeos) {
+ if (is_linux && !use_cros_fe) {
sources +=
[ "../browser/password_manager/native_backend_libsecret_unittest.cc" ]
}
@@ -1749,7 +1749,7 @@ if (!is_android) {
".",
"//chrome")
}
- if (is_win || is_mac || is_chromeos) {
+ if (is_win || is_mac || use_cros_fe) {
sources += [ "../common/extensions/api/networking_private/networking_private_crypto_unittest.cc" ]
}
if (enable_rlz_support) {
@@ -1801,7 +1801,7 @@ if (!is_android) {
sources -= [ "../browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc" ]
deps += [ "//chrome/tools/profile_reset:jtl_compiler_lib" ]
}
- if (!is_android && !is_chromeos) {
+ if (!is_android && !use_cros_fe) {
sources += rebase_path(
chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_or_chromeos_sources,
".",
@@ -1843,7 +1843,7 @@ if (!is_android) {
"//chrome")
deps += [ "//ui/app_list:test_support" ]
}
- if (enable_app_list && is_chromeos) {
+ if (enable_app_list && use_cros_fe) {
sources += rebase_path(
chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_chromeos_sources,
".",
@@ -1854,7 +1854,7 @@ if (!is_android) {
}
}
- if (is_win || (is_linux && !is_chromeos)) {
+ if (is_win || (is_linux && !use_cros_fe)) {
# TODO(GYP): Figure out which of these work and are needed on other
# platforms.
test("chrome_app_unittests") {
« no previous file with comments | « chrome/common/variations/BUILD.gn ('k') | chrome/third_party/chromevox/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698