diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 17:21:03 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 16:25:15 +0000 |
commit | c551f43206405019121bd2b2c93714319a0a3300 (patch) | |
tree | 1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/chrome/test/data | |
parent | 7961cea6d1041e3e454dae6a1da660b453efd238 (diff) |
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/test/data')
-rw-r--r-- | chromium/chrome/test/data/nacl/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/chrome/test/data/webui/BUILD.gn | 41 | ||||
-rw-r--r-- | chromium/chrome/test/data/webui/cr_components/BUILD.gn | 10 | ||||
-rw-r--r-- | chromium/chrome/test/data/webui/cr_elements/BUILD.gn | 13 |
4 files changed, 58 insertions, 9 deletions
diff --git a/chromium/chrome/test/data/nacl/BUILD.gn b/chromium/chrome/test/data/nacl/BUILD.gn index 2c14fa35754..559219f8586 100644 --- a/chromium/chrome/test/data/nacl/BUILD.gn +++ b/chromium/chrome/test/data/nacl/BUILD.gn @@ -612,6 +612,9 @@ if (is_linux && is_clang) { # Do not use any sanitizers or coverage tools, which require a few symbols. configs -= [ "//build/config/sanitizers:default_sanitizer_flags" ] configs -= [ "//build/config/coverage:default_coverage" ] + # Disable default_init_stack_vars because it inserts memset() calls, but + # memset() is not available in this libc-free context. + configs -= [ "//build/config/compiler:default_init_stack_vars" ] configs += [ ":nonsfi_libc_free_nexe_config" ] } diff --git a/chromium/chrome/test/data/webui/BUILD.gn b/chromium/chrome/test/data/webui/BUILD.gn index a0177117724..163875a76cf 100644 --- a/chromium/chrome/test/data/webui/BUILD.gn +++ b/chromium/chrome/test/data/webui/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/sanitizers/sanitizers.gni") import("//chrome/common/features.gni") import("//chrome/test/base/js2gtest.gni") import("//ui/webui/resources/tools/js_modulizer.gni") @@ -32,7 +33,9 @@ js2gtest("interactive_ui_tests_js_webui") { "//chrome/browser/ui", ] data = [ + "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_action_menu_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_checkbox_test.m.js", + "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_expand_button_focus_tests.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_icon_button_focus_tests.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_input_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_tabs_test.m.js", @@ -52,15 +55,13 @@ js2gtest("browser_tests_js_webui") { sources = [ "../../../browser/ui/webui/identity_internals_ui_browsertest.js", "../../../browser/ui/webui/sync_internals_browsertest.js", - "//third_party/axe-core/axe.js", - "a11y/accessibility_audit_rules.js", - "a11y/accessibility_test.js", "about_invalidations_browsertest.js", "assertions.js", "async_gen.js", "bookmarks/bookmarks_browsertest.js", "chrome_send_browsertest.js", "cr_components/cr_components_browsertest.js", + "cr_components/cr_components_v3_browsertest.js", "cr_elements/cr_elements_browsertest.js", "cr_elements/cr_elements_v3_browsertest.js", "find_shortcut_behavior_browsertest.js", @@ -76,7 +77,6 @@ js2gtest("browser_tests_js_webui") { "net_internals/main.js", "net_internals/net_internals_test.js", "ntp4.js", - "polymer_browser_test_base.js", "resources/webui_resources_browsertest.js", "sandboxstatus_browsertest.js", "settings/a11y/about_a11y_test.js", @@ -84,18 +84,29 @@ js2gtest("browser_tests_js_webui") { "settings/a11y/basic_a11y_test.js", "settings/a11y/edit_dictionary_a11y_test.js", "settings/a11y/passwords_a11y_test.js", - "settings/a11y/settings_accessibility_test.js", "settings/advanced_page_browsertest.js", "settings/basic_page_browsertest.js", "settings/cr_settings_browsertest.js", "settings/help_page_browsertest.js", "settings/settings_idle_load_browsertest.js", - "settings/settings_page_browsertest.js", "settings/site_settings_page_browsertest.js", "text_defaults_browsertest.js", "webui_resource_async_browsertest.js", ] + gen_include_files = [ + "a11y/accessibility_audit_rules.js", + "a11y/accessibility_test.js", + "polymer_browser_test_base.js", + "settings/a11y/settings_accessibility_test.js", + "settings/settings_page_browsertest.js", + "//third_party/axe-core/axe.js", + ] + + if (is_chromeos) { + gen_include_files += [ "settings/a11y/crostini_accessibility_test.js" ] + } + extra_js_files = [ "test_browser_proxy.js", "settings/test_password_manager_proxy.js", @@ -112,7 +123,6 @@ js2gtest("browser_tests_js_webui") { "../chromeos/oobe_webui_browsertest.js", "certificate_viewer_dialog_test.js", "set_time_dialog_browsertest.js", - "settings/a11y/crostini_accessibility_test.js", "settings/a11y/crostini_settings_details_a11y_test.js", "settings/a11y/crostini_settings_export_import_a11y_test.js", "settings/a11y/crostini_settings_shared_paths_a11y_test.js", @@ -156,31 +166,44 @@ js2gtest("browser_tests_js_webui") { } deps = [ ":modulize", + "//build:branding_buildflags", "//chrome/browser/ui", + "//services/network/public/cpp", "//skia", ] data = [ + "$root_gen_dir/chrome/test/data/webui/cr_components/managed_footnote_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_button_tests.m.js", + "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_container_shadow_behavior_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_dialog_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_drawer_tests.m.js", + "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_expand_button_tests.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_icon_button_tests.m.js", + "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_lazy_render_tests.m.js", + "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_link_row_tests.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_radio_button_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_radio_group_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_search_field_tests.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_test.m.js", + "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_manager_test.m.js", + "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toolbar_search_field_tests.m.js", "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_view_manager_test.m.js", "$root_gen_dir/chrome/test/data/webui/mock_timer.m.js", "$root_gen_dir/chrome/test/data/webui/test_browser_proxy.m.js", "$root_gen_dir/chrome/test/data/webui/test_util.m.js", ] defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + + # https://crbug.com/1013656 + if (is_cfi) { + defines += [ "IS_CFI" ] + } } js2gtest("browser_tests_js_mojo_lite_webui") { test_type = "mojo_lite_webui" sources = [ - "app_management/app_management_browsertest.js", "bluetooth_internals_browsertest.js", "downloads/downloads_browsertest.js", "engagement/site_engagement_browsertest.js", @@ -199,6 +222,7 @@ js2gtest("browser_tests_js_mojo_lite_webui") { if (is_chromeos) { sources += [ + "chromeos/crostini_installer_browsertest.js", "chromeos/machine_learning_internals_browsertest.js", "multidevice_setup/multidevice_setup_browsertest.js", ] @@ -252,6 +276,7 @@ js2gtest("unit_tests_js") { group("modulize") { deps = [ ":modulize_local", + "./cr_components:modulize", "./cr_elements:modulize", ] } diff --git a/chromium/chrome/test/data/webui/cr_components/BUILD.gn b/chromium/chrome/test/data/webui/cr_components/BUILD.gn new file mode 100644 index 00000000000..8f4f8378325 --- /dev/null +++ b/chromium/chrome/test/data/webui/cr_components/BUILD.gn @@ -0,0 +1,10 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//ui/webui/resources/tools/js_modulizer.gni") + +js_modulizer("modulize") { + input_files = [ "managed_footnote_test.js" ] + namespace_rewrites = [ "cr.isChromeOS|isChromeOS" ] +} diff --git a/chromium/chrome/test/data/webui/cr_elements/BUILD.gn b/chromium/chrome/test/data/webui/cr_elements/BUILD.gn index 0ffea8858c6..10bf92894c9 100644 --- a/chromium/chrome/test/data/webui/cr_elements/BUILD.gn +++ b/chromium/chrome/test/data/webui/cr_elements/BUILD.gn @@ -6,22 +6,34 @@ import("//ui/webui/resources/tools/js_modulizer.gni") js_modulizer("modulize") { input_files = [ + "cr_action_menu_test.js", "cr_button_tests.js", "cr_checkbox_test.js", + "cr_container_shadow_behavior_test.js", "cr_dialog_test.js", "cr_drawer_tests.js", + "cr_expand_button_tests.js", + "cr_expand_button_focus_tests.js", "cr_icon_button_tests.js", "cr_icon_button_focus_tests.js", "cr_input_test.js", + "cr_lazy_render_tests.js", + "cr_link_row_tests.js", "cr_radio_button_test.js", "cr_radio_group_test.js", "cr_search_field_tests.js", + "cr_toolbar_search_field_tests.js", "cr_tabs_test.js", "cr_toast_test.js", + "cr_toast_manager_test.js", "cr_toggle_test.js", "cr_view_manager_test.js", ] namespace_rewrites = [ + "cr.isMac|isMac", + "cr.isWindows|isWindows", + "cr.toastManager.getInstance|getInstance", + "MockInteractions.blur|blur", "MockInteractions.downAndUp|downAndUp", "MockInteractions.keyDownOn|keyDownOn", "MockInteractions.keyEventOn|keyEventOn", @@ -29,7 +41,6 @@ js_modulizer("modulize") { "MockInteractions.pressAndReleaseKeyOn|pressAndReleaseKeyOn", "MockInteractions.tap|tap", "Polymer.dom.flush|flush", - "PolymerTest.importHtml|importHtml", "test_util.eventToPromise|eventToPromise", "test_util.flushTasks|flushTasks", "test_util.isVisible|isVisible", |