Chromium Code Reviews| Index: chrome/test/BUILD.gn |
| diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn |
| index cdb61dbf631e4b369ea08534dc919c2067c2194d..91bcd43554cfbe800c0ff7dc3175f6cee85c8028 100644 |
| --- a/chrome/test/BUILD.gn |
| +++ b/chrome/test/BUILD.gn |
| @@ -1046,6 +1046,7 @@ if (!is_android) { |
| ] |
| deps += [ |
| "//chromeos/ime:gencode", |
| + "//components/arc:arc_test_support", |
| "//components/user_manager:test_support", |
| "//dbus", |
| "//dbus:test_support", |
| @@ -1068,15 +1069,6 @@ if (!is_android) { |
| 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) { |
| sources += rebase_path( |
| chrome_tests_gypi_values.chrome_browser_tests_speech_sources, |
| @@ -1646,6 +1638,7 @@ test("unit_tests") { |
| 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", |
| @@ -1672,11 +1665,15 @@ test("unit_tests") { |
| } |
| if (!is_ios && !is_android) { |
| - deps += [ ":unit_tests_js" ] |
| + deps += [ |
| + ":unit_tests_js", |
| + "//components/bubble:test_support", |
| + ] |
| sources += rebase_path( |
| chrome_tests_unit_gypi_values.chrome_unit_tests_non_mobile_sources, |
| ".", |
| "//chrome") |
|
Andrew T Wilson (Slow)
2016/03/22 00:01:27
nit: remove blank line?
|
| + |
| data += [ |
| "$root_out_dir/test_data/chrome/browser/resources/google_now/", |
| "$root_out_dir/test_data/chrome/browser/resources/print_preview/", |
| @@ -1730,12 +1727,6 @@ test("unit_tests") { |
| "//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, |
| @@ -1781,6 +1772,7 @@ test("unit_tests") { |
| } |
| 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", |
| ] |
| @@ -1810,27 +1802,6 @@ test("unit_tests") { |
| ".", |
| "//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( |
| chrome_tests_unit_gypi_values.chrome_unit_tests_speech_sources, |
| @@ -1917,7 +1888,10 @@ test("unit_tests") { |
| "//chrome/browser/chromeos:unit_tests", |
| "//chromeos/ime:gencode", |
| ] |
| - sources -= [ "../browser/signin/signin_manager_unittest.cc" ] |
| + sources -= [ |
| + "../browser/policy/cloud/user_policy_signin_service_unittest.cc", |
| + "../browser/signin/signin_manager_unittest.cc", |
| + ] |
| } |
| if (use_x11) { |
| deps += [ "//ui/events/devices" ] |