diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-12 15:59:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-25 06:57:22 +0000 |
| commit | f7eaed5286974984ba5f9e3189d8f49d03e99f81 (patch) | |
| tree | caed19b2af2024f35449fb0b781d0a25e09d4f8f /chromium/ios/web_view | |
| parent | 9729c4479fe23554eae6e6dd1f30ff488f470c84 (diff) | |
| download | qtwebengine-chromium-f7eaed5286974984ba5f9e3189d8f49d03e99f81.tar.gz | |
BASELINE: Update Chromium to 100.0.4896.167
Change-Id: I98cbeb5d7543d966ffe04d8cefded0c493a11333
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ios/web_view')
| -rw-r--r-- | chromium/ios/web_view/BUILD.gn | 4 | ||||
| -rw-r--r-- | chromium/ios/web_view/test/BUILD.gn | 37 |
2 files changed, 27 insertions, 14 deletions
diff --git a/chromium/ios/web_view/BUILD.gn b/chromium/ios/web_view/BUILD.gn index 0f68d632bfc..5a3f8193c9b 100644 --- a/chromium/ios/web_view/BUILD.gn +++ b/chromium/ios/web_view/BUILD.gn @@ -165,6 +165,8 @@ source_set("web_view_sources") { "internal/passwords/cwv_password_internal.h", "internal/passwords/web_view_account_password_store_factory.h", "internal/passwords/web_view_account_password_store_factory.mm", + "internal/passwords/web_view_password_change_success_tracker_factory.h", + "internal/passwords/web_view_password_change_success_tracker_factory.mm", "internal/passwords/web_view_password_feature_manager.h", "internal/passwords/web_view_password_feature_manager.mm", "internal/passwords/web_view_password_manager_client.h", @@ -287,6 +289,7 @@ source_set("web_view_sources") { "//components/password_manager/core/browser:affiliation", "//components/password_manager/core/browser:password_generator", "//components/password_manager/core/common", + "//components/password_manager/core/common:features", "//components/password_manager/ios", "//components/password_manager/ios:password_manager_feature", "//components/pref_registry", @@ -477,6 +480,7 @@ test("ios_web_view_unittests") { "//ios/web/public/js_messaging", "//ios/web/public/security", "//ios/web/public/test", + "//ios/web/public/test:test_fixture", "//testing/gtest", "//third_party/ocmock", ] diff --git a/chromium/ios/web_view/test/BUILD.gn b/chromium/ios/web_view/test/BUILD.gn index af47a3e4dd7..ed98c52d977 100644 --- a/chromium/ios/web_view/test/BUILD.gn +++ b/chromium/ios/web_view/test/BUILD.gn @@ -4,24 +4,33 @@ import("//build/config/ios/rules.gni") import("//ios/build/config.gni") +import("//ios/web_view/features.gni") import("//testing/test.gni") source_set("inttests") { testonly = true - sources = [ - "navigation_delegate_inttest.mm", - "scroll_view_kvo_inttest.mm", - "ui_delegate_inttest.mm", - "web_view_autofill_inttest.mm", - "web_view_back_forward_list_inttest.mm", - "web_view_from_wk_web_view_configuration_inttest.mm", - "web_view_inttest.mm", - "web_view_inttest_base.h", - "web_view_inttest_base.mm", - "web_view_kvo_inttest.mm", - "web_view_restorable_state_inttest.mm", - "web_view_script_command_inttest.mm", - ] + sources = [] + + # All those test files use framework import, thus they depend on the name + # of the framework. If some bot build the framework with a different name, + # their compilation fail. So only build those files if the framework has + # not be renamed. + if (ios_web_view_output_name == "ChromeWebView") { + sources += [ + "navigation_delegate_inttest.mm", + "scroll_view_kvo_inttest.mm", + "ui_delegate_inttest.mm", + "web_view_autofill_inttest.mm", + "web_view_back_forward_list_inttest.mm", + "web_view_from_wk_web_view_configuration_inttest.mm", + "web_view_inttest.mm", + "web_view_inttest_base.h", + "web_view_inttest_base.mm", + "web_view_kvo_inttest.mm", + "web_view_restorable_state_inttest.mm", + "web_view_script_command_inttest.mm", + ] + } deps = [ ":test_support", |