Index: chrome/test/BUILD.gn |
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn |
index 0202cffff192a90a0542db36a7b2d496c6a743ac..cdb61dbf631e4b369ea08534dc919c2067c2194d 100644 |
--- a/chrome/test/BUILD.gn |
+++ b/chrome/test/BUILD.gn |
@@ -1046,7 +1046,6 @@ |
] |
deps += [ |
"//chromeos/ime:gencode", |
- "//components/arc:arc_test_support", |
"//components/user_manager:test_support", |
"//dbus", |
"//dbus:test_support", |
@@ -1067,6 +1066,15 @@ |
} |
if (toolkit_views) { |
sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ] |
+ } |
+ } |
+ if (enable_configuration_policy) { |
+ sources += rebase_path( |
+ chrome_tests_gypi_values.chrome_browser_tests_policy_sources, |
+ ".", |
+ "//chrome") |
+ if (is_chromeos) { |
+ deps += [ "//components/arc:arc_test_support" ] |
} |
} |
if (enable_web_speech) { |
@@ -1638,7 +1646,6 @@ |
chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_sources, |
".", |
"//chrome") |
- sources -= [ "../browser/policy/policy_path_parser_unittest.cc" ] |
deps += [ |
":unit_tests_java", |
"//components/offline_pages:test_support", |
@@ -1665,10 +1672,7 @@ |
} |
if (!is_ios && !is_android) { |
- deps += [ |
- ":unit_tests_js", |
- "//components/bubble:test_support", |
- ] |
+ deps += [ ":unit_tests_js" ] |
sources += rebase_path( |
chrome_tests_unit_gypi_values.chrome_unit_tests_non_mobile_sources, |
".", |
@@ -1726,6 +1730,12 @@ |
"//extensions:extensions_resources", |
"//extensions/strings", |
] |
+ if (enable_configuration_policy) { |
+ sources += rebase_path( |
+ chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_policy_sources, |
+ ".", |
+ "//chrome") |
+ } |
if (enable_service_discovery) { |
sources += rebase_path( |
chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_service_discovery_sources, |
@@ -1771,7 +1781,6 @@ |
} |
if (!is_android && !is_ios && !is_chromeos) { |
sources += [ |
- "../browser/net/disk_cache_dir_policy_handler_unittest.cc", |
"//chrome/browser/profiles/profile_list_desktop_unittest.cc", |
"//chrome/browser/profiles/profile_statistics_unittest.cc", |
] |
@@ -1800,6 +1809,27 @@ |
chrome_tests_unit_gypi_values.chrome_unit_tests_service_discovery_sources, |
".", |
"//chrome") |
+ } |
+ if (enable_configuration_policy) { |
+ sources += rebase_path( |
+ chrome_tests_unit_gypi_values.chrome_unit_tests_configuration_policy_sources, |
+ ".", |
+ "//chrome") |
+ if (is_chromeos) { |
+ 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) { |
+ sources += [ "../browser/net/disk_cache_dir_policy_handler_unittest.cc" ] |
+ } |
+ if (!is_android && !is_ios) { |
+ sources += |
+ [ "../browser/download/download_dir_policy_handler_unittest.cc" ] |
+ |
+ deps += [ "//components/bubble:test_support" ] |
+ } |
} |
if (enable_web_speech) { |
sources += rebase_path( |
@@ -1887,10 +1917,7 @@ |
"//chrome/browser/chromeos:unit_tests", |
"//chromeos/ime:gencode", |
] |
- sources -= [ |
- "../browser/policy/cloud/user_policy_signin_service_unittest.cc", |
- "../browser/signin/signin_manager_unittest.cc", |
- ] |
+ sources -= [ "../browser/signin/signin_manager_unittest.cc" ] |
} |
if (use_x11) { |
deps += [ "//ui/events/devices" ] |