diff options
Diffstat (limited to 'chromium/ios')
183 files changed, 1793 insertions, 490 deletions
diff --git a/chromium/ios/build/chrome_build.gni b/chromium/ios/build/chrome_build.gni index ea7abee8bc5..9c69ff80d9d 100644 --- a/chromium/ios/build/chrome_build.gni +++ b/chromium/ios/build/chrome_build.gni @@ -38,14 +38,6 @@ declare_args() { # Controls whether ScreenTime API is used. ios_enable_screen_time = true - # When set the main plist CFBundleVersion will be set to ios_lock_to_version, - # followed by the milestone and patch in one tuple, e.g. 86.0.4240.8720 where - # 87 is the milestone and 20 is the stable patch. Note that CFBundleVersion - # is mostly unused by Chrome and should not affect how the actual version - # number is handled internally by Chrome. - # TODO(crbug.com/1140474): Remove once iOS 14.2 reaches mass adoption. - ios_lock_to_version = "" - # Value of the encryption export compliance code. See "Cryptography and # U.S. Export Compliance" in "Submitting the App to App Review" in the # Apple developer documentation (https://goo.gl/yv1xEF). diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn index 23523876167..21adee9e8b3 100644 --- a/chromium/ios/chrome/app/BUILD.gn +++ b/chromium/ios/chrome/app/BUILD.gn @@ -121,11 +121,6 @@ if (!is_fat_secondary_toolchain) { "--branding=$chromium_short_name", "--add-gtm-metadata=1", ] - - # TODO(crbug.com/1140474): Remove once iOS 14.2 reaches mass adoption. - if (ios_lock_to_version != "") { - args += [ "--lock-to-version=$ios_lock_to_version" ] - } } compile_entitlements("entitlements") { diff --git a/chromium/ios/chrome/app/application_delegate/BUILD.gn b/chromium/ios/chrome/app/application_delegate/BUILD.gn index fa0657fd5f3..4701c7295d6 100644 --- a/chromium/ios/chrome/app/application_delegate/BUILD.gn +++ b/chromium/ios/chrome/app/application_delegate/BUILD.gn @@ -209,6 +209,7 @@ source_set("application_delegate_internal") { "//ios/chrome/app:mode", "//ios/chrome/app/spotlight", "//ios/chrome/app/startup", + "//ios/chrome/app/startup:ios_enable_sandbox_dump_buildflags", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browsing_data", @@ -219,7 +220,6 @@ source_set("application_delegate_internal") { "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics", "//ios/chrome/browser/metrics:metrics_internal", - "//ios/chrome/browser/net", "//ios/chrome/browser/ntp_snippets:ntp_snippets", "//ios/chrome/browser/policy:policy_util", "//ios/chrome/browser/search_engines", diff --git a/chromium/ios/chrome/app/resources/ios_chrome_repack.gni b/chromium/ios/chrome/app/resources/ios_chrome_repack.gni index 08474dbf186..94bab42eee7 100644 --- a/chromium/ios/chrome/app/resources/ios_chrome_repack.gni +++ b/chromium/ios/chrome/app/resources/ios_chrome_repack.gni @@ -35,6 +35,7 @@ template("ios_chrome_repack_locales") { "${root_gen_dir}/ios/chrome/ios_strings_", "${root_gen_dir}/third_party/libaddressinput/address_input_strings_", "${root_gen_dir}/ui/strings/app_locale_settings_", + "${root_gen_dir}/ui/strings/ax_strings_", "${root_gen_dir}/ui/strings/ui_strings_", ] @@ -55,6 +56,7 @@ template("ios_chrome_repack_locales") { "//ios/chrome/app/strings:ios_strings", "//third_party/libaddressinput:strings", "//ui/strings:app_locale_settings", + "//ui/strings:ax_strings", "//ui/strings:ui_strings", ] diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn index 9b6954d27c1..9a0669d790f 100644 --- a/chromium/ios/chrome/browser/BUILD.gn +++ b/chromium/ios/chrome/browser/BUILD.gn @@ -42,8 +42,6 @@ source_set("browser") { "chrome_root_coordinator.mm", "chrome_url_util.h", "chrome_url_util.mm", - "file_metadata_util.h", - "file_metadata_util.mm", "install_time_util.h", "install_time_util.mm", "installation_notifier.h", @@ -238,11 +236,13 @@ source_set("browser_impl") { "//ios/chrome/browser/prefs:browser_prefs", "//ios/chrome/browser/safe_browsing", "//ios/chrome/browser/send_tab_to_self", + "//ios/chrome/browser/signin", "//ios/chrome/browser/translate", "//ios/chrome/browser/update_client", "//ios/chrome/common", "//ios/chrome/common/app_group", "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/app_distribution:app_distribution_api", "//ios/web", "//ios/web/public/init", "//mojo/public/cpp/bindings", diff --git a/chromium/ios/chrome/browser/autocomplete/BUILD.gn b/chromium/ios/chrome/browser/autocomplete/BUILD.gn index 0422617f859..c8bf9afb235 100644 --- a/chromium/ios/chrome/browser/autocomplete/BUILD.gn +++ b/chromium/ios/chrome/browser/autocomplete/BUILD.gn @@ -16,6 +16,8 @@ source_set("autocomplete") { "remote_suggestions_service_factory.mm", "shortcuts_backend_factory.h", "shortcuts_backend_factory.mm", + "tab_matcher_impl.h", + "tab_matcher_impl.mm", ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn index 018f1a8535d..3dbe2d45bc8 100644 --- a/chromium/ios/chrome/browser/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/autofill/BUILD.gn @@ -56,6 +56,7 @@ source_set("autofill") { "//components/keyed_service/ios", "//components/leveldb_proto", "//components/prefs", + "//components/sync/driver", "//components/variations/service", "//ios/chrome/app/strings", "//ios/chrome/browser", @@ -316,6 +317,7 @@ autofill_test_files = [ "//components/test/data/autofill/heuristics/input/177_reichelt.html", "//components/test/data/autofill/heuristics/input/178_zip_file_extension.html", "//components/test/data/autofill/heuristics/input/179_twtcgirls.html", + "//components/test/data/autofill/heuristics/input/180_namesurname.html", "//components/test/data/autofill/heuristics/output/000_i18n_de.out", "//components/test/data/autofill/heuristics/output/001_i18n_de2.out", "//components/test/data/autofill/heuristics/output/002_i18n_en.out", @@ -495,6 +497,7 @@ autofill_test_files = [ "//components/test/data/autofill/heuristics/output/177_reichelt.out", "//components/test/data/autofill/heuristics/output/178_zip_file_extension.out", "//components/test/data/autofill/heuristics/output/179_twtcgirls.out", + "//components/test/data/autofill/heuristics/output/180_namesurname.out", ] # Generate a file containing the list of test input files. This list will @@ -559,6 +562,7 @@ source_set("unit_tests") { "//ios/testing:block_swizzler", "//ios/web/public/js_messaging", "//ios/web/public/test", + "//testing/data_driven_testing", "//testing/gtest", "//third_party/leveldatabase", "//third_party/ocmock", @@ -580,7 +584,6 @@ bundle_data("unit_tests_bundle_data_list") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/autofill/automation/BUILD.gn b/chromium/ios/chrome/browser/autofill/automation/BUILD.gn index e91d050ab7c..c32cdad0745 100644 --- a/chromium/ios/chrome/browser/autofill/automation/BUILD.gn +++ b/chromium/ios/chrome/browser/autofill/automation/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -13,10 +12,10 @@ source_set("eg2_tests") { "automation_action.h", "automation_action.mm", "automation_action_egtest.mm", - "automation_app_interface.h", "automation_egtest.mm", ] deps = [ + ":eg_test_support+eg2", "//base", "//base/test:test_support", "//components/autofill/core/browser", @@ -35,7 +34,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -61,3 +59,16 @@ source_set("eg_app_support+eg2") { ] frameworks = [ "XCTest.framework" ] } + +source_set("eg_test_support+eg2") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "automation_app_interface.h", + "automation_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] +} diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn index 2e64eeb5960..e515ab2b1c2 100644 --- a/chromium/ios/chrome/browser/browser_state/BUILD.gn +++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn @@ -123,6 +123,7 @@ source_set("browser_state_impl") { "//ios/chrome/browser/reading_list", "//ios/chrome/browser/safe_browsing", "//ios/chrome/browser/screen_time:buildflags", + "//ios/chrome/browser/search:search_factory", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/send_tab_to_self", "//ios/chrome/browser/sessions", diff --git a/chromium/ios/chrome/browser/commerce/BUILD.gn b/chromium/ios/chrome/browser/commerce/BUILD.gn index f3f3b2dcbab..f2eb4c3aaa3 100644 --- a/chromium/ios/chrome/browser/commerce/BUILD.gn +++ b/chromium/ios/chrome/browser/commerce/BUILD.gn @@ -16,6 +16,7 @@ source_set("commerce") { "//components/prefs:prefs", "//components/unified_consent:unified_consent", "//ios/chrome/browser", + "//ios/chrome/browser:pref_names", "//ios/chrome/browser/browser_state:browser_state", "//ios/chrome/browser/optimization_guide:optimization_guide", "//ios/chrome/browser/signin:signin", @@ -40,6 +41,7 @@ source_set("unit_tests") { "//components/optimization_guide/core:test_support", "//components/sync_preferences:test_support", "//components/unified_consent:unified_consent", + "//ios/chrome/browser:pref_names", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/optimization_guide:optimization_guide", "//ios/chrome/browser/optimization_guide:unit_tests", diff --git a/chromium/ios/chrome/browser/component_updater/BUILD.gn b/chromium/ios/chrome/browser/component_updater/BUILD.gn index b19196fa09d..70f3291a50c 100644 --- a/chromium/ios/chrome/browser/component_updater/BUILD.gn +++ b/chromium/ios/chrome/browser/component_updater/BUILD.gn @@ -18,7 +18,6 @@ source_set("component_updater") { "//components/update_client:common_impl", "//ios/chrome/browser", "//ios/chrome/common", - "//ios/public/provider/chrome/browser/app_distribution:app_distribution_api", "//ios/web", ] } diff --git a/chromium/ios/chrome/browser/crash_report/BUILD.gn b/chromium/ios/chrome/browser/crash_report/BUILD.gn index 05b326e2c01..62ea9d86bc5 100644 --- a/chromium/ios/chrome/browser/crash_report/BUILD.gn +++ b/chromium/ios/chrome/browser/crash_report/BUILD.gn @@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//testing/libfuzzer/fuzzer_test.gni") + source_set("crash_report") { sources = [ "crash_helper.h", @@ -125,3 +127,30 @@ source_set("unit_tests") { "//third_party/ocmock", ] } + +group("crashpad_fuzzer_tests") { + testonly = true + deps = [ + ":crashpad_intermediate_dump_fuzzer", + ":crashpad_process_snapshot_intermediate_dump_fuzzer", + ] +} + +fuzzer_test("crashpad_intermediate_dump_fuzzer") { + additional_configs = [ "//testing/libfuzzer:build_for_ios_clusterfuzz_job" ] + sources = [ "crashpad_intermediate_dump_fuzzer.cc" ] + deps = [ + "//base", + "//third_party/crashpad/crashpad/util", + ] +} + +fuzzer_test("crashpad_process_snapshot_intermediate_dump_fuzzer") { + additional_configs = [ "//testing/libfuzzer:build_for_ios_clusterfuzz_job" ] + sources = [ "crashpad_process_snapshot_intermediate_dump_fuzzer.cc" ] + deps = [ + "//base", + "//third_party/crashpad/crashpad/snapshot", + ] + seed_corpuses = [ "seed_corpuses" ] +} diff --git a/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn b/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn index ddf7c06170f..53e8ab048ad 100644 --- a/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn +++ b/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn @@ -38,8 +38,8 @@ source_set("breadcrumbs") { source_set("application_breadcrumbs_logger") { sources = [ - "application_breadcrumbs_logger_ios.h", - "application_breadcrumbs_logger_ios.mm", + "application_breadcrumbs_logger.h", + "application_breadcrumbs_logger.mm", ] configs += [ "//build/config/compiler:enable_arc" ] @@ -84,9 +84,8 @@ source_set("unit_tests") { ] sources = [ - "application_breadcrumbs_logger_ios_unittest.mm", + "application_breadcrumbs_logger_unittest.mm", "breadcrumb_manager_browser_agent_unittest.mm", "breadcrumb_manager_tab_helper_unittest.mm", - "breadcrumb_persistent_storage_manager_unittest.mm", ] } diff --git a/chromium/ios/chrome/browser/device_sharing/BUILD.gn b/chromium/ios/chrome/browser/device_sharing/BUILD.gn index 89735c26281..7c65d3c4319 100644 --- a/chromium/ios/chrome/browser/device_sharing/BUILD.gn +++ b/chromium/ios/chrome/browser/device_sharing/BUILD.gn @@ -51,7 +51,6 @@ source_set("unit_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -69,18 +68,20 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "handoff_manager_app_interface.h" ] + sources = [ + "handoff_manager_app_interface.h", + "handoff_manager_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/download/BUILD.gn b/chromium/ios/chrome/browser/download/BUILD.gn index bd215707e4a..cfe7a77e95b 100644 --- a/chromium/ios/chrome/browser/download/BUILD.gn +++ b/chromium/ios/chrome/browser/download/BUILD.gn @@ -29,6 +29,9 @@ source_set("download") { "pass_kit_tab_helper.h", "pass_kit_tab_helper.mm", "pass_kit_tab_helper_delegate.h", + "vcard_tab_helper.h", + "vcard_tab_helper.mm", + "vcard_tab_helper_delegate.h", ] public_deps = [ ":mime_types" ] @@ -82,12 +85,15 @@ source_set("unit_tests") { "download_manager_tab_helper_unittest.mm", "google_drive_app_util_unittest.mm", "pass_kit_tab_helper_unittest.mm", + "vcard_tab_helper_unittest.mm", ] deps = [ ":test_support", "//base/test:test_support", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/download", + "//ios/chrome/browser/ui/download:features", + "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/test/fakes", "//ios/web/public", "//ios/web/public/download", diff --git a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn index f61911cc004..d933f9170b3 100644 --- a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn +++ b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn @@ -28,7 +28,6 @@ source_set("feature_engagement") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -52,18 +51,22 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "feature_engagement_app_interface.h" ] - deps = [ "//base" ] + sources = [ + "feature_engagement_app_interface.h", + "feature_engagement_app_interface_stub.mm", + ] + deps = [ + "//base", + "//ios/third_party/earl_grey2:test_lib", + ] } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/geolocation/BUILD.gn b/chromium/ios/chrome/browser/geolocation/BUILD.gn index d16f974b0ac..049eb2e1e56 100644 --- a/chromium/ios/chrome/browser/geolocation/BUILD.gn +++ b/chromium/ios/chrome/browser/geolocation/BUILD.gn @@ -5,8 +5,8 @@ source_set("geolocation") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "omnibox_geolocation_controller.h", - "omnibox_geolocation_controller.mm", + "geolocation_logger.h", + "geolocation_logger.mm", ] deps = [ "//base", @@ -27,18 +27,3 @@ source_set("geolocation") { ] frameworks = [ "CoreLocation.framework" ] } - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ "omnibox_geolocation_controller_unittest.mm" ] - deps = [ - ":geolocation", - "//base", - "//components/prefs:test_support", - "//ios/chrome/test:test_support", - "//ios/public/provider/chrome/browser", - "//ios/testing:block_swizzler", - "//testing/gtest", - ] -} diff --git a/chromium/ios/chrome/browser/link_to_text/BUILD.gn b/chromium/ios/chrome/browser/link_to_text/BUILD.gn index 4004b2e47bb..270a344f1ea 100644 --- a/chromium/ios/chrome/browser/link_to_text/BUILD.gn +++ b/chromium/ios/chrome/browser/link_to_text/BUILD.gn @@ -2,8 +2,12 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//ios/web/js_compile.gni") + source_set("link_to_text") { sources = [ + "link_to_text_java_script_feature.h", + "link_to_text_java_script_feature.mm", "link_to_text_payload.h", "link_to_text_payload.mm", "link_to_text_response.h", @@ -13,6 +17,7 @@ source_set("link_to_text") { ] deps = [ ":internal", + ":link_to_text_js", "//components/shared_highlighting/core/common", "//components/ukm/ios:ukm_url_recorder", "//ios/chrome/browser/tabs", @@ -56,3 +61,14 @@ source_set("unit_tests") { "//url", ] } + +js_compile_bundle("link_to_text_js") { + visibility = [ ":link_to_text" ] + closure_entry_point = "__crWeb.linkToText" + + sources = [ + "//third_party/text-fragments-polyfill/src/src/fragment-generation-utils.js", + "//third_party/text-fragments-polyfill/src/src/text-fragment-utils.js", + "resources/link_to_text.js", + ] +} diff --git a/chromium/ios/chrome/browser/main/BUILD.gn b/chromium/ios/chrome/browser/main/BUILD.gn index 98caa816f6f..3a17e19b726 100644 --- a/chromium/ios/chrome/browser/main/BUILD.gn +++ b/chromium/ios/chrome/browser/main/BUILD.gn @@ -64,6 +64,7 @@ source_set("main") { "//ios/chrome/browser/ui/start_surface", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web", + "//ios/chrome/browser/web:delegate", "//ios/chrome/browser/web:tab_id_tab_helper", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:agents", diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn index c8d413bbf3a..89e6572c421 100644 --- a/chromium/ios/chrome/browser/metrics/BUILD.gn +++ b/chromium/ios/chrome/browser/metrics/BUILD.gn @@ -241,7 +241,6 @@ source_set("unit_tests_internal") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -283,7 +282,6 @@ generate_expired_histograms_array("expired_histograms_array") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -314,7 +312,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/net/BUILD.gn b/chromium/ios/chrome/browser/net/BUILD.gn index ac0b58efc6b..0ffb3024963 100644 --- a/chromium/ios/chrome/browser/net/BUILD.gn +++ b/chromium/ios/chrome/browser/net/BUILD.gn @@ -72,7 +72,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn b/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn index f02ab11a8be..074bee4c763 100644 --- a/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn +++ b/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn @@ -31,7 +31,6 @@ source_set("ntp_tiles") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/optimization_guide/BUILD.gn b/chromium/ios/chrome/browser/optimization_guide/BUILD.gn index 5071c666c3b..f68d5b872a9 100644 --- a/chromium/ios/chrome/browser/optimization_guide/BUILD.gn +++ b/chromium/ios/chrome/browser/optimization_guide/BUILD.gn @@ -69,7 +69,6 @@ source_set("unit_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -92,18 +91,22 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "optimization_guide_test_app_interface.h" ] - deps = [ "//components/optimization_guide/proto:optimization_guide_proto" ] + sources = [ + "optimization_guide_test_app_interface.h", + "optimization_guide_test_app_interface_stub.mm", + ] + deps = [ + "//components/optimization_guide/proto:optimization_guide_proto", + "//ios/third_party/earl_grey2:test_lib", + ] } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/overlays/public/infobar_banner/BUILD.gn b/chromium/ios/chrome/browser/overlays/public/infobar_banner/BUILD.gn index a94ad8ab06a..4ebe6d52cb5 100644 --- a/chromium/ios/chrome/browser/overlays/public/infobar_banner/BUILD.gn +++ b/chromium/ios/chrome/browser/overlays/public/infobar_banner/BUILD.gn @@ -30,6 +30,7 @@ source_set("infobar_banner") { "//base", "//components/autofill/core/browser", "//components/infobars/core", + "//components/password_manager/core/common", "//components/translate/core/browser", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/infobars", @@ -40,6 +41,8 @@ source_set("infobar_banner") { "//ios/chrome/browser/passwords:infobar_delegates", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/reading_list:infobar", + "//ios/chrome/browser/ui/resources:legacy_password_key", + "//ios/chrome/browser/ui/resources:password_key", "//ui/base", ] } diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn index c59d28a1609..76db31a3dbb 100644 --- a/chromium/ios/chrome/browser/passwords/BUILD.gn +++ b/chromium/ios/chrome/browser/passwords/BUILD.gn @@ -160,9 +160,11 @@ source_set("infobar_delegates") { "//base", "//components/infobars/core", "//components/password_manager/core/browser", + "//components/password_manager/core/common", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/app/theme", + "//ios/chrome/browser/signin", "//ui/base", ] } @@ -237,7 +239,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -265,7 +266,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -289,12 +289,15 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "password_manager_app_interface.h" ] + sources = [ + "password_manager_app_interface.h", + "password_manager_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } diff --git a/chromium/ios/chrome/browser/policy/BUILD.gn b/chromium/ios/chrome/browser/policy/BUILD.gn index def71407fc6..fdcee3bf601 100644 --- a/chromium/ios/chrome/browser/policy/BUILD.gn +++ b/chromium/ios/chrome/browser/policy/BUILD.gn @@ -37,6 +37,8 @@ source_set("policy") { "reporting/report_scheduler_ios.mm", "reporting/reporting_delegate_factory_ios.h", "reporting/reporting_delegate_factory_ios.mm", + "restrict_accounts_policy_handler.cc", + "restrict_accounts_policy_handler.h", "schema_registry_factory.h", "schema_registry_factory.mm", ] @@ -172,6 +174,7 @@ source_set("unit_tests") { "reporting/profile_report_generator_ios_unittest.mm", "reporting/report_generator_ios_unittest.mm", "reporting/report_scheduler_ios_unittest.mm", + "restrict_accounts_policy_handler_unittest.cc", ] deps = [ ":policy", @@ -211,7 +214,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -265,7 +267,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ @@ -288,7 +289,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -297,8 +297,11 @@ source_set("eg_test_support+eg2") { sources = [ "policy_app_interface.h", "policy_app_interface_stub.mm", + "policy_earl_grey_utils.h", + "policy_earl_grey_utils.mm", ] deps = [ + "//base", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", ] diff --git a/chromium/ios/chrome/browser/policy_url_blocking/BUILD.gn b/chromium/ios/chrome/browser/policy_url_blocking/BUILD.gn index 488486d66aa..30aba08e887 100644 --- a/chromium/ios/chrome/browser/policy_url_blocking/BUILD.gn +++ b/chromium/ios/chrome/browser/policy_url_blocking/BUILD.gn @@ -36,7 +36,6 @@ source_set("util") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/prefs/BUILD.gn b/chromium/ios/chrome/browser/prefs/BUILD.gn index 0525a679749..48c33a3f3c4 100644 --- a/chromium/ios/chrome/browser/prefs/BUILD.gn +++ b/chromium/ios/chrome/browser/prefs/BUILD.gn @@ -33,7 +33,8 @@ source_set("browser_prefs") { deps = [ "//components/autofill/core/browser", "//components/browsing_data/core", - "//components/component_updater/installer_policies:installer_policies", + "//components/component_updater", + "//components/component_updater/installer_policies", "//components/content_settings/core/browser", "//components/dom_distiller/core", "//components/enterprise", diff --git a/chromium/ios/chrome/browser/prerender/BUILD.gn b/chromium/ios/chrome/browser/prerender/BUILD.gn index ebfdf209868..e7725e5da00 100644 --- a/chromium/ios/chrome/browser/prerender/BUILD.gn +++ b/chromium/ios/chrome/browser/prerender/BUILD.gn @@ -94,7 +94,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/providers/BUILD.gn b/chromium/ios/chrome/browser/providers/BUILD.gn index 762ef01a5b4..b8d4e462f02 100644 --- a/chromium/ios/chrome/browser/providers/BUILD.gn +++ b/chromium/ios/chrome/browser/providers/BUILD.gn @@ -46,6 +46,7 @@ group("chromium_providers") { "//ios/chrome/browser/providers/modals:chromium_modals", "//ios/chrome/browser/providers/omaha:chromium_omaha", "//ios/chrome/browser/providers/overrides:chromium_overrides", + "//ios/chrome/browser/providers/password_auto_fill:chromium_password_auto_fill", "//ios/chrome/browser/providers/risk_data:chromium_risk_data", "//ios/chrome/browser/providers/signin:chromium_signin_error", "//ios/chrome/browser/providers/signin:chromium_signin_resources", diff --git a/chromium/ios/chrome/browser/providers/password_auto_fill/BUILD.gn b/chromium/ios/chrome/browser/providers/password_auto_fill/BUILD.gn new file mode 100644 index 00000000000..fda11b2eb3a --- /dev/null +++ b/chromium/ios/chrome/browser/providers/password_auto_fill/BUILD.gn @@ -0,0 +1,10 @@ +# Copyright 2021 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. + +source_set("chromium_password_auto_fill") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ "chromium_password_auto_fill.mm" ] + deps = [ "//ios/public/provider/chrome/browser/password_auto_fill:password_auto_fill_api" ] + frameworks = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn index 9be0b5c033f..e236fc2d68b 100644 --- a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn +++ b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn @@ -34,8 +34,8 @@ source_set("safe_browsing") { "safe_browsing_unsafe_resource_container.mm", "url_checker_delegate_impl.h", "url_checker_delegate_impl.mm", - "user_population.h", - "user_population.mm", + "user_population_helper.h", + "user_population_helper.mm", "verdict_cache_manager_factory.h", "verdict_cache_manager_factory.mm", ] @@ -159,7 +159,6 @@ source_set("util") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/search/BUILD.gn b/chromium/ios/chrome/browser/search/BUILD.gn new file mode 100644 index 00000000000..00f6bbeeca1 --- /dev/null +++ b/chromium/ios/chrome/browser/search/BUILD.gn @@ -0,0 +1,28 @@ +# Copyright 2021 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. + +source_set("search") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "search_service.h", + "search_service.mm", + ] + + deps = [ "//components/keyed_service/core" ] +} + +source_set("search_factory") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "search_service_factory.h", + "search_service_factory.mm", + ] + + deps = [ + ":search", + "//base", + "//components/keyed_service/ios", + "//ios/chrome/browser/browser_state", + ] +} diff --git a/chromium/ios/chrome/browser/search_engines/BUILD.gn b/chromium/ios/chrome/browser/search_engines/BUILD.gn index 391db8ff58f..948ae265d91 100644 --- a/chromium/ios/chrome/browser/search_engines/BUILD.gn +++ b/chromium/ios/chrome/browser/search_engines/BUILD.gn @@ -7,10 +7,14 @@ import("//rlz/buildflags/buildflags.gni") source_set("search_engines") { sources = [ + "search_engine_java_script_feature.h", + "search_engine_java_script_feature.mm", "search_engine_observer_bridge.h", "search_engine_observer_bridge.mm", "search_engine_tab_helper.h", "search_engine_tab_helper.mm", + "search_engine_tab_helper_factory.h", + "search_engine_tab_helper_factory.mm", "search_engines_util.cc", "search_engines_util.h", "template_url_fetcher_factory.cc", @@ -23,6 +27,7 @@ source_set("search_engines") { "ui_thread_search_terms_data.h", ] deps = [ + ":search_engine_js", "//base", "//components/country_codes", "//components/favicon/ios", @@ -42,7 +47,8 @@ source_set("search_engines") { "//ios/chrome/browser/webdata_services", "//ios/chrome/common", "//ios/public/provider/chrome/browser/app_distribution:app_distribution_api", - "//ios/web", + "//ios/web/public", + "//ios/web/public/js_messaging", "//net", "//rlz/buildflags", "//ui/base", @@ -80,7 +86,6 @@ source_set("unit_tests") { ] deps = [ ":extension_search_engine_data_updater", - ":search_engine_js", ":search_engines", "//base:base", "//base/test:test_support", @@ -91,6 +96,7 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/favicon:favicon", "//ios/chrome/browser/web:test_support", + "//ios/chrome/browser/web:web_internal", "//ios/chrome/common/app_group", "//ios/web", "//ios/web/public/test", diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn index ada442113dd..e9ac93890fb 100644 --- a/chromium/ios/chrome/browser/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/signin/BUILD.gn @@ -27,8 +27,6 @@ source_set("signin") { "chrome_account_manager_service_observer_bridge.mm", "chrome_identity_service_observer_bridge.h", "chrome_identity_service_observer_bridge.mm", - "constants.h", - "constants.mm", "device_accounts_provider_impl.h", "device_accounts_provider_impl.mm", "gaia_auth_fetcher_ios.h", @@ -56,8 +54,6 @@ source_set("signin") { "signin_client_factory.h", "signin_error_controller_factory.cc", "signin_error_controller_factory.h", - "signin_util.h", - "signin_util.mm", "user_approved_account_list_manager.h", "user_approved_account_list_manager.mm", ] @@ -91,6 +87,7 @@ source_set("signin") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/webdata_services", "//ios/chrome/common", + "//ios/chrome/common/ui/util:image_util", "//ios/net", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", @@ -101,6 +98,53 @@ source_set("signin") { "//net", "//url", ] + public_deps = [ + ":constants", + ":signin_util", + ] +} + +source_set("signin_util") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "signin_util.h", + "signin_util.mm", + ] + deps = [ + ":constants", + ":signin_util_internal", + "//base", + "//components/signin/public/identity_manager", + "//ios/chrome/browser", + "//ios/public/provider/chrome/browser/signin", + "//ios/public/provider/chrome/browser/signin:signin_error_api", + ] +} + +source_set("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "constants.h", + "constants.mm", + ] + deps = [ "//base" ] +} + +source_set("signin_util_internal") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "signin_util_internal.h", + "signin_util_internal.mm", + ] + visibility = [ + ":signin_util", + ":signin_util_internal_unit_tests", + ] + deps = [ + "//base", + "//components/signin/public/identity_manager", + "//ios/chrome/browser", + ] } source_set("test_support") { @@ -129,6 +173,18 @@ source_set("test_support") { ] } +source_set("signin_util_internal_unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "signin_util_internal_unittest.mm" ] + deps = [ + ":signin_util_internal", + "//base", + "//base/test:test_support", + "//components/signin/public/identity_manager", + ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn index c70b2e93393..1c875f770ab 100644 --- a/chromium/ios/chrome/browser/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/tabs/BUILD.gn @@ -95,17 +95,17 @@ source_set("tabs_internal") { "//ios/chrome/browser/ui/download:features", "//ios/chrome/browser/voice", "//ios/chrome/browser/web", + "//ios/chrome/browser/web:delegate", "//ios/chrome/browser/web:feature_flags", "//ios/chrome/browser/web:page_placeholder", - "//ios/chrome/browser/web:web_internal", "//ios/chrome/browser/web/font_size", "//ios/chrome/browser/web/image_fetch", "//ios/chrome/browser/web/print", "//ios/chrome/browser/web/session_state", + "//ios/chrome/browser/web/web_performance_metrics", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list/web_usage_enabler", "//ios/components/security_interstitials", - "//ios/components/security_interstitials/legacy_tls", "//ios/components/security_interstitials/lookalikes", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/text_zoom:text_zoom_api", diff --git a/chromium/ios/chrome/browser/translate/BUILD.gn b/chromium/ios/chrome/browser/translate/BUILD.gn index 3cb31ef14b0..4bf674dfaaf 100644 --- a/chromium/ios/chrome/browser/translate/BUILD.gn +++ b/chromium/ios/chrome/browser/translate/BUILD.gn @@ -112,7 +112,6 @@ source_set("test_support") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -137,7 +136,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn index afc359de8b3..d632b9bd22c 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn @@ -95,7 +95,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn index 44ba4122485..bfa4656f871 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn @@ -28,8 +28,8 @@ source_set("data") { "//ios/chrome/browser/send_tab_to_self", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util:url_with_title", + "//ios/chrome/common/ui/util:image_util", "//ios/web/common:user_agent", "//ios/web/public", "//ios/web/public:web_state_observer", diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn index 588aa6eab17..c5357250125 100644 --- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn @@ -34,7 +34,6 @@ source_set("authentication") { "//components/consent_auditor", "//components/infobars/core", "//components/prefs", - "//components/signin/ios/browser", "//components/signin/public/identity_manager", "//components/signin/public/identity_manager/objc", "//components/strings", @@ -50,6 +49,7 @@ source_set("authentication") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication/cells", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", "//ios/chrome/browser/ui/authentication/signin:signin_headers", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", @@ -157,7 +157,6 @@ source_set("unit_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -198,7 +197,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -209,8 +207,8 @@ source_set("eg_test_support+eg2") { "signin_earl_grey.mm", "signin_earl_grey_app_interface.h", "signin_earl_grey_app_interface_stub.mm", - "signin_earl_grey_ui.h", - "signin_earl_grey_ui.mm", + "signin_earl_grey_ui_test_util.h", + "signin_earl_grey_ui_test_util.mm", "signin_matchers.h", "signin_matchers.mm", ] diff --git a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn index 0a2fe85bacd..4178acb228b 100644 --- a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn @@ -37,6 +37,7 @@ source_set("cells") { "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/util", + "//ios/chrome/common/ui/util:image_util", "//ios/public/provider/chrome/browser/signin:signin_resources_api", "//ui/base", ] @@ -80,6 +81,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util:image_util", "//ios/chrome/test:test_support", "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/signin:signin_resources_api", diff --git a/chromium/ios/chrome/browser/ui/authentication/enterprise/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/enterprise/BUILD.gn index 58bb62b8186..053d5d73400 100644 --- a/chromium/ios/chrome/browser/ui/authentication/enterprise/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/enterprise/BUILD.gn @@ -14,6 +14,7 @@ source_set("enterprise_utils") { "//components/prefs", "//components/signin/public/base", "//components/sync/base", + "//components/sync/driver", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/policy:policy_util", diff --git a/chromium/ios/chrome/browser/ui/authentication/enterprise/enterprise_signout/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/enterprise/enterprise_signout/BUILD.gn index a66e31fe78b..6cdd6d0b366 100644 --- a/chromium/ios/chrome/browser/ui/authentication/enterprise/enterprise_signout/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/enterprise/enterprise_signout/BUILD.gn @@ -11,15 +11,10 @@ source_set("enterprise_signout") { "enterprise_signout_view_controller.mm", ] deps = [ - "//components/signin/public/base", - "//components/signin/public/identity_manager/objc", "//ios/chrome/app/strings", "//ios/chrome/app/strings:ios_google_chrome_strings", - "//ios/chrome/browser/browser_state", "//ios/chrome/browser/main:public", "//ios/chrome/browser/policy/resources:enterprise_grey_icon_large", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/common/ui/confirmation_alert", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn index bd78a0d1a46..9ca7dde9b1f 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn @@ -80,7 +80,6 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//components/pref_registry", - "//components/signin/ios/browser:features", "//components/sync/base", "//components/sync_preferences", "//components/sync_preferences:test_support", @@ -113,7 +112,6 @@ source_set("constants") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -123,12 +121,13 @@ source_set("eg2_tests") { deps = [ "//base", "//base/test:test_support", - "//components/signin/ios/browser:features", + "//components/policy:policy_code_generate", "//components/signin/public/base", "//components/strings:components_strings_grit", "//ios/chrome/app/strings", "//ios/chrome/browser:pref_names", "//ios/chrome/browser/metrics:eg_test_support+eg2", + "//ios/chrome/browser/policy:eg_test_support+eg2", "//ios/chrome/browser/policy:policy_util", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication/views:views_constants", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn index 90b923d5807..bb1228edffb 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn @@ -76,7 +76,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn index e764698bf7d..db6f12031c6 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn @@ -9,6 +9,8 @@ source_set("consistency_promo_signin") { sources = [ "consistency_promo_signin_coordinator.h", "consistency_promo_signin_coordinator.mm", + "consistency_promo_signin_mediator.h", + "consistency_promo_signin_mediator.mm", ] deps = [ ":layout", @@ -43,8 +45,30 @@ source_set("layout") { deps = [ "//ui/base" ] } +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "consistency_promo_signin_mediator_unittest.mm" ] + deps = [ + ":consistency_promo_signin", + "//base", + "//base/test:test_support", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/objc", + "//components/sync_preferences:test_support", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/signin:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/web/public/test", + "//testing/gtest", + "//third_party/ocmock", + ] +} + source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -53,8 +77,9 @@ source_set("eg2_tests") { sources = [ "consistency_promo_signin_coordinator_egtest.mm" ] deps = [ "//base", + "//base/test:test_support", + "//ios/chrome/app/strings", "//ios/chrome/browser:pref_names", - "//ios/chrome/browser/metrics:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication/signin:constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn index 8ebca4b0682..647717cd2c2 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn @@ -19,8 +19,41 @@ source_set("forced_signin") { "//ios/chrome/browser/ui/first_run:screen_delegate", "//ios/chrome/browser/ui/first_run:utils", "//ios/chrome/browser/ui/first_run/signin", - "//ios/chrome/browser/ui/first_run/sync", "//ios/chrome/browser/ui/screen:screen_provider", "//ios/chrome/browser/ui/screen:screen_type", ] } + +source_set("eg2_tests") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "forced_signin_egtest.mm" ] + deps = [ + "//base", + "//base/test:test_support", + "//components/policy:policy_code_generate", + "//components/policy/core/common:common_constants", + "//ios/chrome/app/strings:ios_chromium_strings_grit", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/policy:policy_util", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", + "//ios/chrome/browser/ui/authentication/signin:constants", + "//ios/chrome/browser/ui/authentication/views:views_constants", + "//ios/chrome/browser/ui/first_run:constants", + "//ios/chrome/browser/ui/first_run:eg_test_support+eg2", + "//ios/chrome/browser/ui/settings/google_services:constants", + "//ios/chrome/common", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/public/provider/chrome/browser/signin:constants", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ui/base", + ] + frameworks = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn index d7977073882..dec15681040 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn @@ -83,6 +83,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/signin/user_signin/logging", "//ios/chrome/browser/unified_consent", + "//ios/chrome/test:test_support", "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/public/provider/chrome/browser/signin:test_support", @@ -94,7 +95,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn new file mode 100644 index 00000000000..2a1deceb1c3 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn @@ -0,0 +1,109 @@ +# Copyright 2021 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("//build/config/chrome_build.gni") + +source_set("signin_sync") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "signin_sync_coordinator.h", + "signin_sync_coordinator.mm", + "signin_sync_mediator.h", + "signin_sync_mediator.mm", + "signin_sync_mediator_delegate.h", + ] + deps = [ + ":signin_sync_ui", + "//base", + "//components/consent_auditor", + "//components/prefs", + "//components/unified_consent", + "//ios/chrome/app/application_delegate:app_state_header", + "//ios/chrome/app/strings", + "//ios/chrome/browser", + "//ios/chrome/browser/first_run", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/policy", + "//ios/chrome/browser/policy:policy_util", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", + "//ios/chrome/browser/ui/authentication/enterprise/user_policy_signout", + "//ios/chrome/browser/ui/authentication/signin:signin_headers", + "//ios/chrome/browser/ui/authentication/signin/user_signin/logging", + "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/first_run:field_trial", + "//ios/chrome/browser/ui/first_run:interruptible_chrome_coordinator", + "//ios/chrome/browser/ui/first_run:screen_delegate", + "//ios/chrome/browser/ui/first_run:utils", + "//ios/chrome/browser/ui/main:scene_state_header", + "//ios/chrome/browser/unified_consent", + "//ios/chrome/browser/url_loading", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/signin", + ] +} + +source_set("signin_sync_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "signin_sync_consumer.h", + "signin_sync_view_controller.h", + "signin_sync_view_controller.mm", + "signin_sync_view_controller_delegate.h", + ] + deps = [ + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication:authentication_constants", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", + "//ios/chrome/browser/ui/authentication/views", + "//ios/chrome/browser/ui/elements:elements_internal", + "//ios/chrome/browser/ui/first_run:field_trial", + "//ios/chrome/browser/ui/settings/elements:constants", + "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller", + "//ios/chrome/common", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/elements:popover_label_view_controller", + "//ios/chrome/common/ui/promo_style", + "//ios/chrome/common/ui/util", + "//ui/base", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "signin_sync_mediator_unittest.mm" ] + deps = [ + ":signin_sync", + ":signin_sync_ui", + "//base", + "//base/test:test_support", + "//components/consent_auditor", + "//components/consent_auditor:test_support", + "//components/prefs", + "//components/signin/public/identity_manager", + "//components/sync/driver", + "//components/sync/driver:test_support", + "//components/unified_consent", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/signin:test_support", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/sync:test_support", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/unified_consent", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/test:test_support", + "//ios/public/provider/chrome/browser:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/web/public/test", + "//third_party/ocmock", + ] +} diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn index 15646db3d3d..c34102539f0 100644 --- a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn @@ -21,6 +21,7 @@ source_set("unified_consent") { "//ios/chrome/browser/signin", "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser", + "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/public/provider/chrome/browser/signin", ] diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn index 5e657d22458..e81fef5970e 100644 --- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn @@ -156,7 +156,6 @@ source_set("autofill_metrics") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -191,7 +190,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -223,7 +221,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn index ac9c62e4a5b..093950b61d2 100644 --- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn @@ -118,6 +118,7 @@ source_set("manual_fill_ui") { ] deps = [ "//base", + "//components/password_manager/core/common", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser", "//ios/chrome/browser/autofill/manual_fill:manual_fill", @@ -125,6 +126,7 @@ source_set("manual_fill_ui") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_keyboard", "//ios/chrome/browser/ui/list_model:list_model", + "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view:table_view", "//ios/chrome/common/ui/favicon", @@ -211,7 +213,6 @@ source_set("requesters") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/badges/BUILD.gn b/chromium/ios/chrome/browser/ui/badges/BUILD.gn index 30e14aad71f..883838bed27 100644 --- a/chromium/ios/chrome/browser/ui/badges/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/badges/BUILD.gn @@ -52,6 +52,7 @@ source_set("badges") { "resources:incognito_small_badge", "resources:wrench_badge", "//base", + "//components/password_manager/core/common", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state", @@ -73,6 +74,7 @@ source_set("badges") { "//ios/chrome/browser/ui/infobars/resources:infobar_settings_icon", "//ios/chrome/browser/ui/infobars/resources:infobar_translate_icon", "//ios/chrome/browser/ui/list_model", + "//ios/chrome/browser/ui/resources:legacy_password_key", "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web", @@ -97,6 +99,7 @@ source_set("badges_popup_menu") { ":badges", ":public", "//base", + "//components/password_manager/core/common", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/infobars", "//ios/chrome/browser/infobars:public", @@ -109,6 +112,8 @@ source_set("badges_popup_menu") { "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui", "//ios/chrome/browser/ui/popup_menu/public/cells", + "//ios/chrome/browser/ui/resources:legacy_password_key", + "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn index e6df126b776..94a2fa33612 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn @@ -66,6 +66,7 @@ source_set("bookmarks") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication:signin_presenter", "//ios/chrome/browser/ui/authentication/cells", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", "//ios/chrome/browser/ui/bookmarks/cells", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/default_promo:utils", @@ -241,7 +242,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -282,7 +282,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -319,7 +318,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -329,6 +327,7 @@ source_set("eg_test_support+eg2") { "bookmark_earl_grey.h", "bookmark_earl_grey.mm", "bookmark_earl_grey_app_interface.h", + "bookmark_earl_grey_app_interface_stub.mm", "bookmark_earl_grey_ui.h", "bookmark_earl_grey_ui.mm", ] diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn index 4a13fd794d8..a5d0f3abfcf 100644 --- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn @@ -27,12 +27,10 @@ source_set("browser_view") { "//components/omnibox/browser", "//components/profile_metrics", "//components/reading_list/core", - "//components/search_engines", "//components/sessions", "//components/signin/core/browser", "//components/signin/ios/browser", "//components/signin/ios/browser:active_state_manager", - "//components/signin/public/identity_manager", "//components/strings", "//components/translate/core/browser", "//components/ukm/ios:ukm_url_recorder", @@ -51,7 +49,6 @@ source_set("browser_view") { "//ios/chrome/browser/favicon", "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/find_in_page", - "//ios/chrome/browser/first_run", "//ios/chrome/browser/geolocation", "//ios/chrome/browser/infobars", "//ios/chrome/browser/language", @@ -66,11 +63,9 @@ source_set("browser_view") { "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/overscroll_actions", "//ios/chrome/browser/passwords", - "//ios/chrome/browser/policy:policy_util", "//ios/chrome/browser/prefs", "//ios/chrome/browser/prerender", "//ios/chrome/browser/reading_list", - "//ios/chrome/browser/search_engines", "//ios/chrome/browser/send_tab_to_self", "//ios/chrome/browser/sessions", "//ios/chrome/browser/sessions:restoration_agent", @@ -100,6 +95,7 @@ source_set("browser_view") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", + "//ios/chrome/browser/ui/content_suggestions:feature_flags", "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/default_promo", @@ -116,7 +112,6 @@ source_set("browser_view") { "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/gestures", "//ios/chrome/browser/ui/history", - "//ios/chrome/browser/ui/image_util:web", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_commands", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_ui", @@ -127,7 +122,6 @@ source_set("browser_view") { "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/main_content:main_content_ui", "//ios/chrome/browser/ui/main_content:main_content_ui_broadcasting_util", - "//ios/chrome/browser/ui/menu", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/ntp:coordinator", "//ios/chrome/browser/ui/ntp:logo", @@ -157,8 +151,10 @@ source_set("browser_view") { "//ios/chrome/browser/ui/snackbar", "//ios/chrome/browser/ui/tab_switcher/tab_strip", "//ios/chrome/browser/ui/tabs", + "//ios/chrome/browser/ui/tabs:constants", "//ios/chrome/browser/ui/tabs:coordinator", "//ios/chrome/browser/ui/tabs/requirements", + "//ios/chrome/browser/ui/text_fragments", "//ios/chrome/browser/ui/text_zoom", "//ios/chrome/browser/ui/text_zoom:text_zoom_ui", "//ios/chrome/browser/ui/thumb_strip", @@ -179,18 +175,16 @@ source_set("browser_view") { "//ios/chrome/browser/url_loading", "//ios/chrome/browser/voice:voice", "//ios/chrome/browser/web", + "//ios/chrome/browser/web:delegate", "//ios/chrome/browser/web:feature_flags", "//ios/chrome/browser/web:page_placeholder", "//ios/chrome/browser/web:tab_helper_delegates", - "//ios/chrome/browser/web:web_internal", "//ios/chrome/browser/web/font_size", - "//ios/chrome/browser/web/image_fetch", "//ios/chrome/browser/web/print", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:agents", "//ios/chrome/browser/web_state_list/web_usage_enabler", "//ios/chrome/browser/webui", - "//ios/chrome/browser/window_activities", "//ios/chrome/common", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/promo_style", @@ -205,7 +199,6 @@ source_set("browser_view") { "//ios/third_party/material_components_ios", "//ios/third_party/webkit", "//ios/web", - "//ios/web/common", "//ios/web/public", "//ios/web/public/deprecated", "//ios/web/public/deprecated:deprecated_web_util", @@ -273,7 +266,9 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading:url_loading", "//ios/chrome/browser/web", + "//ios/chrome/browser/web:delegate", "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:agents", "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/browser/web_state_list/web_usage_enabler", "//ios/chrome/common/ui/reauthentication:reauthentication", @@ -296,7 +291,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/commerce/BUILD.gn b/chromium/ios/chrome/browser/ui/commerce/BUILD.gn index c7544fb550a..8e3917f48cb 100644 --- a/chromium/ios/chrome/browser/ui/commerce/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/commerce/BUILD.gn @@ -16,11 +16,13 @@ source_set("price_card") { ] deps = [ "price_card/resources:colors", + "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/commerce:commerce", "//ios/chrome/browser/web:tab_id_tab_helper", "//ios/chrome/browser/web_state_list:web_state_list", "//ios/chrome/common/ui/colors", "//ios/web", + "//ui/base:base", ] configs += [ "//build/config/compiler:enable_arc" ] } diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn index 5c9ac4955c5..f679ab8ddf3 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn @@ -20,7 +20,6 @@ source_set("content_suggestions") { "ntp_home_mediator.mm", "ntp_home_metrics.h", "ntp_home_metrics.mm", - "theme_change_delegate.h", ] deps = [ ":constants", @@ -29,7 +28,6 @@ source_set("content_suggestions") { "//base", "//components/favicon/core", "//components/favicon/ios", - "//components/feature_engagement/public", "//components/feed/core/shared_prefs:feed_shared_prefs", "//components/feed/core/v2/public/ios:feed_ios_public", "//components/ntp_snippets", @@ -48,10 +46,8 @@ source_set("content_suggestions") { "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/discover_feed", "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/favicon", - "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/ntp", @@ -96,7 +92,6 @@ source_set("content_suggestions") { "//ios/chrome/common/ui/favicon", "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/discover_feed", "//ui/base", "//ui/strings", ] @@ -138,10 +133,7 @@ source_set("content_suggestions_ui") { "content_suggestions_view_controller.h", "content_suggestions_view_controller.mm", "content_suggestions_view_controller_audience.h", - "discover_feed_header_changing.h", - "discover_feed_menu_commands.h", "ntp_home_consumer.h", - "theme_change_delegate.h", "user_account_image_update_delegate.h", ] deps = [ @@ -159,7 +151,6 @@ source_set("content_suggestions_ui") { "//ios/chrome/browser", "//ios/chrome/browser/ntp", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions/cells", @@ -180,7 +171,6 @@ source_set("content_suggestions_ui") { "//ios/chrome/common/ui/favicon", "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/discover_feed", "//ios/web/common", "//ui/base", ] @@ -294,7 +284,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -319,6 +308,7 @@ source_set("eg2_tests") { "//ios/chrome/browser:utils", "//ios/chrome/browser/ui/ntp:constants", "//ios/chrome/browser/ui/ntp:feature_flags", + "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/settings:constants", "//ios/chrome/browser/ui/start_surface:feature_flags", "//ios/chrome/browser/ui/toolbar/public:constants", @@ -334,14 +324,16 @@ source_set("eg2_tests") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "new_tab_page_app_interface.h" ] + sources = [ + "new_tab_page_app_interface.h", + "new_tab_page_app_interface_stub.mm", + ] deps = [ "//ios/third_party/earl_grey2:test_lib" ] } @@ -352,7 +344,6 @@ source_set("eg_app_support+eg2") { "//build/config/ios:xctest_config", ] testonly = true - defines = [ "CHROME_EARL_GREY_2" ] sources = [ "new_tab_page_app_interface.h", diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn index b6d0a04c2bc..a06f0a04c0f 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn @@ -31,8 +31,6 @@ source_set("cells") { source_set("cells_ui") { sources = [ - "content_suggestions_discover_header_item.h", - "content_suggestions_discover_header_item.mm", "content_suggestions_header_item.h", "content_suggestions_header_item.mm", "content_suggestions_most_visited_action_cell.h", diff --git a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn index ec9bafcd62e..0a6036b28bc 100644 --- a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn @@ -13,6 +13,7 @@ source_set("context_menu") { "//base", "//components/search_engines", "//ios/chrome/app/strings", + "//ios/chrome/browser:pref_names", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", "//ios/chrome/browser/policy:policy_util", @@ -20,9 +21,11 @@ source_set("context_menu") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/context_menu/link_preview", "//ios/chrome/browser/ui/image_util:web", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_commands", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", + "//ios/chrome/browser/ui/lens:lens_availability", "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/menu", "//ios/chrome/browser/ui/util", @@ -81,7 +84,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn b/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn index 15725fdcd46..ef91569edc1 100644 --- a/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn @@ -122,7 +122,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn index a36102e8826..cfc172cdfd0 100644 --- a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn @@ -102,7 +102,6 @@ source_set("unit_tests_internal") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/download/BUILD.gn b/chromium/ios/chrome/browser/ui/download/BUILD.gn index 7e054041c69..b1f5061f229 100644 --- a/chromium/ios/chrome/browser/ui/download/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/download/BUILD.gn @@ -25,6 +25,8 @@ source_set("download") { "pass_kit_coordinator.mm", "radial_progress_view.h", "radial_progress_view.mm", + "vcard_coordinator.h", + "vcard_coordinator.mm", ] deps = [ "resources:background_compact", @@ -82,6 +84,7 @@ source_set("unit_tests") { "download_manager_view_controller_unittest.mm", "mobileconfig_coordinator_unittest.mm", "pass_kit_coordinator_unittest.mm", + "vcard_coordinator_unittest.mm", ] deps = [ ":download", @@ -120,7 +123,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/elements/BUILD.gn index 1a36c2220bc..b1bc5a49f98 100644 --- a/chromium/ios/chrome/browser/ui/elements/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/elements/BUILD.gn @@ -15,6 +15,8 @@ source_set("elements") { "gray_highlight_button.mm", "home_waiting_view.h", "home_waiting_view.mm", + "instruction_view.h", + "instruction_view.mm", "selector_picker_presentation_controller.h", "selector_picker_presentation_controller.mm", "selector_picker_view_controller.h", @@ -32,14 +34,17 @@ source_set("elements") { "windowed_container_view.mm", ] deps = [ + ":instruction_view_constants", "//base", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/util", + "//ios/chrome/common", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/favicon", "//ios/chrome/common/ui/util", + "//ios/chrome/common/ui/util:dynamic_type_util", ] } @@ -59,6 +64,14 @@ source_set("selector_coordinator") { ] } +source_set("instruction_view_constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "instruction_view_constants.h", + "instruction_view_constants.mm", + ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true diff --git a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn index 661b0fd0c4a..f984bdf552c 100644 --- a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn @@ -56,7 +56,6 @@ source_set("constants") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -82,7 +81,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -96,11 +94,14 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "find_in_page_controller_app_interface.h" ] + sources = [ + "find_in_page_controller_app_interface.h", + "find_in_page_controller_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn index ff8c5e97fe7..6c0e989a938 100644 --- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn @@ -5,8 +5,6 @@ source_set("field_trial") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "default_browser_promo_field_trial.cc", - "default_browser_promo_field_trial.h", "fre_field_trial.cc", "fre_field_trial.h", "ios_first_run_field_trials.cc", @@ -28,11 +26,6 @@ source_set("first_run") { sources = [ "first_run_coordinator.h", "first_run_coordinator.mm", - "location_permissions_commands.h", - "location_permissions_coordinator.h", - "location_permissions_coordinator.mm", - "location_permissions_view_controller.h", - "location_permissions_view_controller.mm", "orientation_limiting_navigation_controller.h", "orientation_limiting_navigation_controller.mm", "welcome_to_chrome_view.h", @@ -49,7 +42,6 @@ source_set("first_run") { ":utils", "resources:checkbox", "resources:checkbox_checked", - "resources:first_run_location_permissions", "resources:read_more_arrow", "//base", "//base:i18n", @@ -72,6 +64,7 @@ source_set("first_run") { "//ios/chrome/browser/ui/authentication/signin", "//ios/chrome/browser/ui/authentication/signin/add_account_signin", "//ios/chrome/browser/ui/authentication/signin/user_signin/logging", + "//ios/chrome/browser/ui/authentication/signin_sync", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser", "//ios/chrome/browser/ui/authentication/views", "//ios/chrome/browser/ui/commands", @@ -173,6 +166,20 @@ source_set("static_file_ui") { ] } +source_set("interruptible_chrome_coordinator") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "interruptible_chrome_coordinator.h", + "interruptible_chrome_coordinator.mm", + ] + deps = [ + "//base", + "//ios/chrome/browser/ui/authentication/signin:constants", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + ] + frameworks = [ "UIKit.framework" ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -201,7 +208,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -216,13 +222,17 @@ source_set("eg2_tests") { ":eg_test_support+eg2", "//base", "//base/test:test_support", + "//components/policy:policy_code_generate", "//components/policy/core/common:common_constants", "//ios/chrome/app/strings:ios_chromium_strings_grit", "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/policy:eg_test_support+eg2", "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/authentication:authentication_constants", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication/signin:constants", "//ios/chrome/browser/ui/authentication/views:views_constants", + "//ios/chrome/browser/ui/elements:instruction_view_constants", "//ios/chrome/browser/ui/settings/google_services:constants", "//ios/chrome/common", "//ios/chrome/test/earl_grey:eg_test_support+eg2", @@ -236,7 +246,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -263,7 +272,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn index 865388f3076..6c319814b6a 100644 --- a/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn @@ -24,20 +24,14 @@ source_set("default_browser_ui") { sources = [ "default_browser_screen_view_controller.h", "default_browser_screen_view_controller.mm", - "instruction_view.h", - "instruction_view.mm", ] deps = [ "//ios/chrome/app/strings", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/first_run:constants", "//ios/chrome/browser/ui/first_run/resources:default_browser_screen_banner", - "//ios/chrome/browser/ui/table_view/cells:cells_constants", - "//ios/chrome/common", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/promo_style", - "//ios/chrome/common/ui/util", - "//ios/chrome/common/ui/util:dynamic_type_util", "//ui/base", ] frameworks = [ "UIKit.framework" ] diff --git a/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn index b5c7f6f9c6b..f59ad2001df 100644 --- a/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn @@ -36,16 +36,6 @@ imageset("default_browser_screen_banner") { ] } -imageset("first_run_location_permissions") { - sources = [ - "first_run_location_permissions.imageset/Contents.json", - "first_run_location_permissions.imageset/first_run_location_permissions_dark@2x.png", - "first_run_location_permissions.imageset/first_run_location_permissions_dark@3x.png", - "first_run_location_permissions.imageset/first_run_location_permissions_light@2x.png", - "first_run_location_permissions.imageset/first_run_location_permissions_light@3x.png", - ] -} - imageset("signin_screen_banner") { sources = [ "signin_screen_banner.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn index 6a31abb127d..7f6914e1bb8 100644 --- a/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn @@ -13,6 +13,7 @@ source_set("signin") { deps = [ ":signin_ui", "//components/prefs", + "//ios/chrome/app/application_delegate:app_state_header", "//ios/chrome/browser", "//ios/chrome/browser/first_run", "//ios/chrome/browser/main:public", @@ -25,8 +26,10 @@ source_set("signin") { "//ios/chrome/browser/ui/authentication/signin/user_signin/logging", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/first_run:interruptible_chrome_coordinator", "//ios/chrome/browser/ui/first_run:screen_delegate", "//ios/chrome/browser/ui/first_run:utils", + "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/unified_consent", "//ios/chrome/browser/url_loading", "//ios/public/provider/chrome/browser", diff --git a/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn index e351249512c..24f2ac311ab 100644 --- a/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn @@ -16,6 +16,7 @@ source_set("sync") { "//base:base", "//components/consent_auditor", "//components/unified_consent", + "//ios/chrome/app/application_delegate:app_state_header", "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/first_run", @@ -26,9 +27,12 @@ source_set("sync") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", "//ios/chrome/browser/ui/authentication/enterprise/user_policy_signout", + "//ios/chrome/browser/ui/authentication/signin:signin_headers", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/first_run:interruptible_chrome_coordinator", "//ios/chrome/browser/ui/first_run:screen_delegate", + "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/unified_consent", "//ios/public/provider/chrome/browser/signin", ] @@ -77,6 +81,7 @@ source_set("unit_tests") { "//components/prefs", "//components/sync/driver:test_support", "//components/unified_consent", + "//ios/chrome/app/application_delegate:app_state_header", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/policy", @@ -86,6 +91,7 @@ source_set("unit_tests") { "//ios/chrome/browser/sync:test_support", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/first_run:screen_delegate", + "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/unified_consent", "//ios/public/provider/chrome/browser:test_support", "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", diff --git a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn index 83cbb993a0e..1a001d43d26 100644 --- a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn @@ -166,7 +166,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn index a55425b0012..f8f006c10f2 100644 --- a/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn @@ -30,7 +30,6 @@ source_set("test") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ @@ -49,7 +48,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn index cd641615a1e..869dc156976 100644 --- a/chromium/ios/chrome/browser/ui/history/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn @@ -152,7 +152,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn index 9acfdc7ec9c..d8c8aaee6b4 100644 --- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn @@ -15,7 +15,6 @@ source_set("constants") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -68,7 +67,6 @@ source_set("test_support") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -93,11 +91,14 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "infobar_manager_app_interface.h" ] + sources = [ + "infobar_manager_app_interface.h", + "infobar_manager_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } diff --git a/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn b/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn index dbc1536d747..101d70f878a 100644 --- a/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn index c94642eed6d..fbb7d892ac5 100644 --- a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn @@ -27,7 +27,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/lens/BUILD.gn b/chromium/ios/chrome/browser/ui/lens/BUILD.gn new file mode 100644 index 00000000000..66ba7672c0b --- /dev/null +++ b/chromium/ios/chrome/browser/ui/lens/BUILD.gn @@ -0,0 +1,12 @@ +# Copyright 2021 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. + +source_set("lens_availability") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "lens_availability.h", + "lens_availability.mm", + ] + deps = [] +} diff --git a/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn b/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn index a02812d0d38..0297f2aa1f3 100644 --- a/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn @@ -41,7 +41,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn index 681d56957a5..1f0d2883303 100644 --- a/chromium/ios/chrome/browser/ui/main/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn @@ -124,7 +124,6 @@ source_set("scene") { "//components/prefs", "//components/prefs/ios", "//components/previous_session_info", - "//components/signin/ios/browser:features", "//components/signin/public/base", "//components/signin/public/identity_manager", "//components/signin/public/identity_manager/objc", @@ -269,6 +268,7 @@ source_set("main") { "//ios/chrome/browser/ui/recent_tabs", "//ios/chrome/browser/ui/settings/sync", "//ios/chrome/browser/ui/snackbar", + "//ios/chrome/browser/ui/tabs:constants", "//ios/chrome/browser/ui/thumb_strip", "//ios/chrome/browser/ui/thumb_strip:feature_flags", "//ios/chrome/browser/ui/thumb_strip:public", @@ -277,6 +277,7 @@ source_set("main") { "//ios/chrome/browser/web:tab_helper_delegates", "//ios/chrome/browser/web:web_internal", "//ios/chrome/browser/web_state_list", + "//ios/chrome/common/ui/colors", "//ios/public/provider/chrome/browser", "//net", ] diff --git a/chromium/ios/chrome/browser/ui/menu/BUILD.gn b/chromium/ios/chrome/browser/ui/menu/BUILD.gn index 9a811be5b49..d6def306ced 100644 --- a/chromium/ios/chrome/browser/ui/menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/menu/BUILD.gn @@ -21,6 +21,7 @@ source_set("menu") { "resources:delete", "resources:download", "resources:edit", + "resources:hide_preview", "resources:lens_icon", "resources:mark_read", "resources:move_folder", @@ -35,8 +36,12 @@ source_set("menu") { "resources:search_image", "resources:select", "resources:share", + "resources:show_preview", "//base", + "//components/prefs", "//ios/chrome/app/strings", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", diff --git a/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn index 1e1ab6da3ef..dcba3b4e3ec 100644 --- a/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn @@ -60,6 +60,14 @@ imageset("edit") { ] } +imageset("hide_preview") { + sources = [ + "hide_preview.imageset/Contents.json", + "hide_preview.imageset/hide_preview@2x.png", + "hide_preview.imageset/hide_preview@3x.png", + ] +} + imageset("lens_icon") { sources = [ "lens_icon.imageset/Contents.json", @@ -132,6 +140,14 @@ imageset("share") { ] } +imageset("show_preview") { + sources = [ + "show_preview.imageset/Contents.json", + "show_preview.imageset/show_preview@2x.png", + "show_preview.imageset/show_preview@3x.png", + ] +} + imageset("move_folder") { sources = [ "move_folder.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn index 4b8f16337f4..0a93ce8f98f 100644 --- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn @@ -57,12 +57,14 @@ source_set("coordinator") { "//components/prefs/ios", "//components/search_engines", "//ios/chrome/app:tests_hook", + "//ios/chrome/app/strings", "//ios/chrome/browser:pref_names", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/discover_feed", "//ios/chrome/browser/main:public", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/signin", + "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui", @@ -73,6 +75,7 @@ source_set("coordinator") { "//ios/chrome/browser/ui/main:scene_state_observer", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/voice", "//ios/chrome/browser/web_state_list", @@ -80,6 +83,7 @@ source_set("coordinator") { "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/discover_feed", "//ios/web/public", + "//ui/base", ] } @@ -101,6 +105,9 @@ source_set("ntp_internal") { sources = [ "discover_feed_wrapper_view_controller.h", "discover_feed_wrapper_view_controller.mm", + "feed_header_view_controller.h", + "feed_header_view_controller.mm", + "feed_menu_commands.h", "incognito_view.h", "incognito_view.mm", "incognito_view_controller.h", @@ -158,6 +165,7 @@ source_set("ntp_internal") { "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/bookmarks", + "//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui", @@ -181,6 +189,7 @@ source_set("ntp_internal") { "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/branded_images:branded_images_api", + "//ios/public/provider/chrome/browser/discover_feed", "//ios/third_party/material_components_ios", "//ios/web", "//net", @@ -252,7 +261,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn index 4ae942b651c..d8e18da3565 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn @@ -189,8 +189,7 @@ source_set("omnibox_internal") { ] } -source_set("app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_app_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -216,18 +215,20 @@ source_set("app_support+eg2") { "//ui/base:test_support", ] } -source_set("test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_test_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "omnibox_app_interface.h" ] + sources = [ + "omnibox_app_interface.h", + "omnibox_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -235,10 +236,11 @@ source_set("eg2_tests") { testonly = true sources = [ "omnibox_egtest.mm" ] deps = [ - ":test_support+eg2", + ":eg_test_support+eg2", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/omnibox/popup:popup_accessibility_identifier_constants", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn index 04dec86e242..349ccaa6b4c 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn @@ -19,7 +19,7 @@ source_set("popup") { ":popup_internal", ":popup_ui", "//base", - "//components/image_fetcher/ios", + "//components/image_fetcher/core", "//components/omnibox/browser", "//components/open_from_clipboard", "//components/search_engines", @@ -147,7 +147,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn index e965a46f49d..4786240fdc5 100644 --- a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn @@ -79,7 +79,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn index ee7c03c7ab9..944494af1d5 100644 --- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn @@ -50,7 +50,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/infobars/banners/test", "//ios/chrome/browser/ui/infobars/test", "//ios/chrome/browser/ui/overlays/test", - "//ios/chrome/browser/ui/resources:password_key", + "//ios/chrome/browser/ui/resources:legacy_password_key", "//testing/gmock", "//testing/gtest", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn index b59dff33bab..be4f17b684a 100644 --- a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn @@ -101,7 +101,6 @@ source_set("coordinator") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn index dd6248407ac..a81d7829be7 100644 --- a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn @@ -49,8 +49,7 @@ source_set("constants") { ] } -source_set("app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_app_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -69,22 +68,24 @@ source_set("app_support+eg2") { ] } -source_set("test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_test_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "password_breach_app_interface.h" ] + sources = [ + "password_breach_app_interface.h", + "password_breach_app_interface_stub.mm", + ] deps = [ ":constants", "//base", + "//ios/third_party/earl_grey2:test_lib", ] } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -93,7 +94,7 @@ source_set("eg2_tests") { sources = [ "password_breach_egtest.mm" ] deps = [ ":constants", - ":test_support+eg2", + ":eg_test_support+eg2", "//base", "//base/test:test_support", "//components/password_manager/core/common", diff --git a/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn index 97882463549..1cb9b5a71e7 100644 --- a/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn @@ -6,13 +6,37 @@ import("//build/config/ios/asset_catalog.gni") import("//build/config/ios/rules.gni") group("resources") { - deps = [ ":password_breach_illustration" ] + deps = [ + ":legacy_password_breach_illustration", + ":password_breach_illustration", + ":passwords_logo_colored", + ] } imageset("password_breach_illustration") { sources = [ "password_breach_illustration.imageset/Contents.json", - "password_breach_illustration.imageset/illustration_dark.png", - "password_breach_illustration.imageset/illustration_light.png", + "password_breach_illustration.imageset/password_check_alert@2x.png", + "password_breach_illustration.imageset/password_check_alert@3x.png", + "password_breach_illustration.imageset/password_check_alert_dark@2x.png", + "password_breach_illustration.imageset/password_check_alert_dark@3x.png", + ] +} + +imageset("passwords_logo_colored") { + sources = [ + "passwords_logo_colored.imageset/Contents.json", + "passwords_logo_colored.imageset/passwords_logo_colored@2x.png", + "passwords_logo_colored.imageset/passwords_logo_colored@3x.png", + "passwords_logo_colored.imageset/passwords_logo_colored_dark@2x.png", + "passwords_logo_colored.imageset/passwords_logo_colored_dark@3x.png", + ] +} + +imageset("legacy_password_breach_illustration") { + sources = [ + "legacy_password_breach_illustration.imageset/Contents.json", + "legacy_password_breach_illustration.imageset/illustration_dark.png", + "legacy_password_breach_illustration.imageset/illustration_light.png", ] } diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn index 85f2478167f..eca4022e7e6 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn @@ -172,7 +172,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn index f4da6c721f6..14ec91afbca 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn @@ -11,9 +11,60 @@ source_set("overflow_menu") { "overflow_menu_mediator.mm", ] deps = [ + ":feature_flags", ":overflow_menu_swift", + "resources:overflow_menu_action_bookmark", + "resources:overflow_menu_action_edit_bookmark", + "resources:overflow_menu_action_find_in_page", + "resources:overflow_menu_action_help", + "resources:overflow_menu_action_incognito", + "resources:overflow_menu_action_new_tab", + "resources:overflow_menu_action_new_window", + "resources:overflow_menu_action_read_later", + "resources:overflow_menu_action_reload", + "resources:overflow_menu_action_report_issue", + "resources:overflow_menu_action_request_desktop", + "resources:overflow_menu_action_request_mobile", + "resources:overflow_menu_action_stop", + "resources:overflow_menu_action_text_zoom", + "resources:overflow_menu_action_translate", + "resources:overflow_menu_destination_bookmarks", + "resources:overflow_menu_destination_downloads", + "resources:overflow_menu_destination_history", + "resources:overflow_menu_destination_passwords", + "resources:overflow_menu_destination_passwords_rebrand", + "resources:overflow_menu_destination_reading_list", + "resources:overflow_menu_destination_recent_tabs", + "resources:overflow_menu_destination_settings", + "resources:overflow_menu_destination_site_info", + "resources:overflow_menu_footer_managed", + "//components/bookmarks/browser", + "//components/bookmarks/common", + "//components/language/ios/browser", + "//components/prefs", + "//components/prefs/ios", + "//components/profile_metrics", + "//components/translate/core/browser", "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser:chrome_url_constants", + "//ios/chrome/browser/find_in_page", + "//ios/chrome/browser/overlays", "//ios/chrome/browser/policy", + "//ios/chrome/browser/policy:policy_util", + "//ios/chrome/browser/reading_list", + "//ios/chrome/browser/translate", + "//ios/chrome/browser/ui/activity_services", + "//ios/chrome/browser/ui/bookmarks:core", + "//ios/chrome/browser/ui/browser_container:ui", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/default_promo:utils", + "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/web", + "//ios/chrome/browser/web/font_size", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/window_activities", + "//ios/web/common:user_agent", + "//ios/web/public", "//ui/base", ] } @@ -21,14 +72,24 @@ source_set("overflow_menu") { swift_source_set("overflow_menu_swift") { sources = [ "overflow_menu_action.swift", + "overflow_menu_action_group.swift", "overflow_menu_action_list.swift", "overflow_menu_action_row.swift", + "overflow_menu_action_section.swift", "overflow_menu_destination.swift", + "overflow_menu_destination_list.swift", + "overflow_menu_destination_view.swift", + "overflow_menu_footer.swift", + "overflow_menu_footer_row.swift", + "overflow_menu_hosting_controller.swift", + "overflow_menu_item.swift", "overflow_menu_model.swift", "overflow_menu_view.swift", "overflow_menu_view_provider.swift", ] + deps = [ "//ios/chrome/common/ui/colors:swift" ] + frameworks = [ "Foundation.framework", "SwiftUI.framework", @@ -41,5 +102,9 @@ source_set("feature_flags") { "feature_flags.h", "feature_flags.mm", ] - deps = [ "//base" ] + deps = [ + "//base", + "//components/password_manager/core/common", + "//ios/chrome/browser/ui:feature_flags", + ] } diff --git a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/resources/BUILD.gn new file mode 100644 index 00000000000..80dadaad397 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/resources/BUILD.gn @@ -0,0 +1,225 @@ +# Copyright 2021 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("//build/config/ios/asset_catalog.gni") + +imageset("overflow_menu_action_bookmark") { + sources = [ + "overflow_menu_action_bookmark.imageset/Contents.json", + "overflow_menu_action_bookmark.imageset/overflow_menu_action_bookmark@2x.png", + "overflow_menu_action_bookmark.imageset/overflow_menu_action_bookmark@3x.png", + ] +} + +imageset("overflow_menu_action_find_in_page") { + sources = [ + "overflow_menu_action_find_in_page.imageset/Contents.json", + "overflow_menu_action_find_in_page.imageset/overflow_menu_action_find_in_page@2x.png", + "overflow_menu_action_find_in_page.imageset/overflow_menu_action_find_in_page@3x.png", + ] +} + +imageset("overflow_menu_action_edit_bookmark") { + sources = [ + "overflow_menu_action_edit_bookmark.imageset/Contents.json", + "overflow_menu_action_edit_bookmark.imageset/overflow_menu_action_edit_bookmark@2x.png", + "overflow_menu_action_edit_bookmark.imageset/overflow_menu_action_edit_bookmark@3x.png", + ] +} + +imageset("overflow_menu_action_help") { + sources = [ + "overflow_menu_action_help.imageset/Contents.json", + "overflow_menu_action_help.imageset/overflow_menu_action_help@2x.png", + "overflow_menu_action_help.imageset/overflow_menu_action_help@3x.png", + ] +} + +imageset("overflow_menu_action_incognito") { + sources = [ + "overflow_menu_action_incognito.imageset/Contents.json", + "overflow_menu_action_incognito.imageset/overflow_menu_action_incognito@2x.png", + "overflow_menu_action_incognito.imageset/overflow_menu_action_incognito@3x.png", + ] +} + +imageset("overflow_menu_action_new_tab") { + sources = [ + "overflow_menu_action_new_tab.imageset/Contents.json", + "overflow_menu_action_new_tab.imageset/overflow_menu_action_new_tab@2x.png", + "overflow_menu_action_new_tab.imageset/overflow_menu_action_new_tab@3x.png", + ] +} + +imageset("overflow_menu_action_new_window") { + sources = [ + "overflow_menu_action_new_window.imageset/Contents.json", + "overflow_menu_action_new_window.imageset/overflow_menu_action_new_window@2x.png", + "overflow_menu_action_new_window.imageset/overflow_menu_action_new_window@3x.png", + ] +} + +imageset("overflow_menu_action_read_later") { + sources = [ + "overflow_menu_action_read_later.imageset/Contents.json", + "overflow_menu_action_read_later.imageset/overflow_menu_action_read_later@2x.png", + "overflow_menu_action_read_later.imageset/overflow_menu_action_read_later@3x.png", + ] +} + +imageset("overflow_menu_action_reload") { + sources = [ + "overflow_menu_action_reload.imageset/Contents.json", + "overflow_menu_action_reload.imageset/overflow_menu_action_reload@2x.png", + "overflow_menu_action_reload.imageset/overflow_menu_action_reload@3x.png", + ] +} + +imageset("overflow_menu_action_report_issue") { + sources = [ + "overflow_menu_action_report_issue.imageset/Contents.json", + "overflow_menu_action_report_issue.imageset/overflow_menu_action_report_issue@2x.png", + "overflow_menu_action_report_issue.imageset/overflow_menu_action_report_issue@3x.png", + ] +} + +imageset("overflow_menu_action_request_desktop") { + sources = [ + "overflow_menu_action_request_desktop.imageset/Contents.json", + "overflow_menu_action_request_desktop.imageset/overflow_menu_action_request_desktop@2x.png", + "overflow_menu_action_request_desktop.imageset/overflow_menu_action_request_desktop@3x.png", + ] +} + +imageset("overflow_menu_action_request_mobile") { + sources = [ + "overflow_menu_action_request_mobile.imageset/Contents.json", + "overflow_menu_action_request_mobile.imageset/overflow_menu_action_request_mobile@2x.png", + "overflow_menu_action_request_mobile.imageset/overflow_menu_action_request_mobile@3x.png", + ] +} + +imageset("overflow_menu_action_stop") { + sources = [ + "overflow_menu_action_stop.imageset/Contents.json", + "overflow_menu_action_stop.imageset/overflow_menu_action_stop@2x.png", + "overflow_menu_action_stop.imageset/overflow_menu_action_stop@3x.png", + ] +} + +imageset("overflow_menu_action_text_zoom") { + sources = [ + "overflow_menu_action_text_zoom.imageset/Contents.json", + "overflow_menu_action_text_zoom.imageset/overflow_menu_action_text_zoom@2x.png", + "overflow_menu_action_text_zoom.imageset/overflow_menu_action_text_zoom@3x.png", + ] +} + +imageset("overflow_menu_action_translate") { + sources = [ + "overflow_menu_action_translate.imageset/Contents.json", + "overflow_menu_action_translate.imageset/overflow_menu_action_translate@2x.png", + "overflow_menu_action_translate.imageset/overflow_menu_action_translate@3x.png", + ] +} + +imageset("overflow_menu_destination_bookmarks") { + sources = [ + "overflow_menu_destination_bookmarks.imageset/Contents.json", + "overflow_menu_destination_bookmarks.imageset/overflow_menu_destination_bookmarks@2x.png", + "overflow_menu_destination_bookmarks.imageset/overflow_menu_destination_bookmarks@3x.png", + "overflow_menu_destination_bookmarks.imageset/overflow_menu_destination_bookmarks_dark@2x.png", + "overflow_menu_destination_bookmarks.imageset/overflow_menu_destination_bookmarks_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_downloads") { + sources = [ + "overflow_menu_destination_downloads.imageset/Contents.json", + "overflow_menu_destination_downloads.imageset/overflow_menu_destination_downloads@2x.png", + "overflow_menu_destination_downloads.imageset/overflow_menu_destination_downloads@3x.png", + "overflow_menu_destination_downloads.imageset/overflow_menu_destination_downloads_dark@2x.png", + "overflow_menu_destination_downloads.imageset/overflow_menu_destination_downloads_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_history") { + sources = [ + "overflow_menu_destination_history.imageset/Contents.json", + "overflow_menu_destination_history.imageset/overflow_menu_destination_history@2x.png", + "overflow_menu_destination_history.imageset/overflow_menu_destination_history@3x.png", + "overflow_menu_destination_history.imageset/overflow_menu_destination_history_dark@2x.png", + "overflow_menu_destination_history.imageset/overflow_menu_destination_history_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_passwords") { + sources = [ + "overflow_menu_destination_passwords.imageset/Contents.json", + "overflow_menu_destination_passwords.imageset/overflow_menu_destination_passwords@2x.png", + "overflow_menu_destination_passwords.imageset/overflow_menu_destination_passwords@3x.png", + "overflow_menu_destination_passwords.imageset/overflow_menu_destination_passwords_dark@2x.png", + "overflow_menu_destination_passwords.imageset/overflow_menu_destination_passwords_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_passwords_rebrand") { + sources = [ + "overflow_menu_destination_passwords_rebrand.imageset/Contents.json", + "overflow_menu_destination_passwords_rebrand.imageset/overflow_menu_destination_passwords@2x.png", + "overflow_menu_destination_passwords_rebrand.imageset/overflow_menu_destination_passwords@3x.png", + "overflow_menu_destination_passwords_rebrand.imageset/overflow_menu_destination_passwords_dark@2x.png", + "overflow_menu_destination_passwords_rebrand.imageset/overflow_menu_destination_passwords_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_reading_list") { + sources = [ + "overflow_menu_destination_reading_list.imageset/Contents.json", + "overflow_menu_destination_reading_list.imageset/overflow_menu_destination_reading_list@2x.png", + "overflow_menu_destination_reading_list.imageset/overflow_menu_destination_reading_list@3x.png", + "overflow_menu_destination_reading_list.imageset/overflow_menu_destination_reading_list_dark@2x.png", + "overflow_menu_destination_reading_list.imageset/overflow_menu_destination_reading_list_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_recent_tabs") { + sources = [ + "overflow_menu_destination_recent_tabs.imageset/Contents.json", + "overflow_menu_destination_recent_tabs.imageset/overflow_menu_destination_recent_tabs@2x.png", + "overflow_menu_destination_recent_tabs.imageset/overflow_menu_destination_recent_tabs@3x.png", + "overflow_menu_destination_recent_tabs.imageset/overflow_menu_destination_recent_tabs_dark@2x.png", + "overflow_menu_destination_recent_tabs.imageset/overflow_menu_destination_recent_tabs_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_settings") { + sources = [ + "overflow_menu_destination_settings.imageset/Contents.json", + "overflow_menu_destination_settings.imageset/overflow_menu_destination_settings@2x.png", + "overflow_menu_destination_settings.imageset/overflow_menu_destination_settings@3x.png", + "overflow_menu_destination_settings.imageset/overflow_menu_destination_settings_dark@2x.png", + "overflow_menu_destination_settings.imageset/overflow_menu_destination_settings_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_site_info") { + sources = [ + "overflow_menu_destination_site_info.imageset/Contents.json", + "overflow_menu_destination_site_info.imageset/overflow_menu_destination_site_info@2x.png", + "overflow_menu_destination_site_info.imageset/overflow_menu_destination_site_info@3x.png", + "overflow_menu_destination_site_info.imageset/overflow_menu_destination_site_info_dark@2x.png", + "overflow_menu_destination_site_info.imageset/overflow_menu_destination_site_info_dark@3x.png", + ] +} + +imageset("overflow_menu_footer_managed") { + sources = [ + "overflow_menu_footer_managed.imageset/Contents.json", + "overflow_menu_footer_managed.imageset/overflow_menu_footer_managed@2x.png", + "overflow_menu_footer_managed.imageset/overflow_menu_footer_managed@3x.png", + "overflow_menu_footer_managed.imageset/overflow_menu_footer_managed_dark@2x.png", + "overflow_menu_footer_managed.imageset/overflow_menu_footer_managed_dark@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn index 17eb8518f4b..a1caa0adf69 100644 --- a/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn @@ -16,7 +16,10 @@ source_set("ui") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/confirmation_alert", + "//ios/chrome/common/ui/util", + "//ios/chrome/common/ui/util:image_util", "//ui/base", "//url:url", ] diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn index 8954eb3fa51..6cc60a166fd 100644 --- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn @@ -51,7 +51,6 @@ source_set("coordinator") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -78,7 +77,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -111,13 +109,18 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "qr_scanner_app_interface.h" ] - deps = [ "//ios/chrome/browser/ui/scanner:camera_state" ] + sources = [ + "qr_scanner_app_interface.h", + "qr_scanner_app_interface_stub.mm", + ] + deps = [ + "//ios/chrome/browser/ui/scanner:camera_state", + "//ios/third_party/earl_grey2:test_lib", + ] } diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn index 51264f83cc9..cbb1bee1061 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn @@ -39,7 +39,6 @@ source_set("reading_list") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", "//ios/chrome/browser/feature_engagement", - "//ios/chrome/browser/main", "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/policy:policy_util", @@ -86,6 +85,7 @@ source_set("reading_list_javascript_feature") { ] deps = [ ":distiller_js", + ":features", "//base", "//components/dom_distiller/core", "//components/infobars/core", @@ -150,8 +150,6 @@ js_compile_bundle("distiller_js") { source_set("reading_list_ui") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "empty_reading_list_message_util.h", - "empty_reading_list_message_util.mm", "number_badge_view.h", "number_badge_view.mm", "reading_list_data_sink.h", @@ -176,7 +174,6 @@ source_set("reading_list_ui") { ":reading_list_constants", "resources:reading_list_empty", "resources:reading_list_empty_state", - "resources:reading_list_tools_icon", "//base", "//base:i18n", "//components/prefs", @@ -247,7 +244,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -278,7 +274,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -298,7 +293,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn index 931edbb362a..d7f959fffd7 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn @@ -30,12 +30,3 @@ imageset("reading_list_empty_state") { "reading_list_empty_state.imageset/reading_list_empty_state@3x.png", ] } - -imageset("reading_list_tools_icon") { - sources = [ - "reading_list_tools_icon.imageset/Contents.json", - "reading_list_tools_icon.imageset/reading_list_tools_icon.png", - "reading_list_tools_icon.imageset/reading_list_tools_icon@2x.png", - "reading_list_tools_icon.imageset/reading_list_tools_icon@3x.png", - ] -} diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn index 125934d5303..e395284e4d7 100644 --- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn @@ -92,6 +92,7 @@ source_set("recent_tabs_ui") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication:signin_presenter", "//ios/chrome/browser/ui/authentication/cells", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", "//ios/chrome/browser/ui/authentication/signin:signin_headers", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/settings/sync/utils", @@ -145,8 +146,7 @@ source_set("unit_tests") { ] } -source_set("app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_app_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -165,19 +165,23 @@ source_set("app_support+eg2") { ] } -source_set("test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_test_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "recent_tabs_app_interface.h" ] - deps = [ "//base" ] + sources = [ + "recent_tabs_app_interface.h", + "recent_tabs_app_interface_stub.mm", + ] + deps = [ + "//base", + "//ios/third_party/earl_grey2:test_lib", + ] } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -185,11 +189,14 @@ source_set("eg2_tests") { testonly = true sources = [ "recent_tabs_egtest.mm" ] deps = [ + ":eg_test_support+eg2", ":recent_tabs_ui_constants", - ":test_support+eg2", "//base/test:test_support", + "//components/policy:policy_code_generate", + "//components/policy/core/common:common_constants", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/policy:eg_test_support+eg2", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication/cells:constants", diff --git a/chromium/ios/chrome/browser/ui/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/resources/BUILD.gn index ac7c7686fe3..c0f9ea220c3 100644 --- a/chromium/ios/chrome/browser/ui/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/resources/BUILD.gn @@ -13,6 +13,14 @@ imageset("menu_shadow") { ] } +imageset("legacy_password_key") { + sources = [ + "legacy_password_key.imageset/Contents.json", + "legacy_password_key.imageset/password_key@2x.png", + "legacy_password_key.imageset/password_key@3x.png", + ] +} + imageset("password_key") { sources = [ "password_key.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn index 373a97e9b34..d973c8082b5 100644 --- a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn @@ -82,7 +82,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn index d5f28750080..9363a767478 100644 --- a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn @@ -31,7 +31,6 @@ source_set("safe_mode") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -48,18 +47,20 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "safe_mode_app_interface.h" ] + sources = [ + "safe_mode_app_interface.h", + "safe_mode_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -90,6 +91,7 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//ios/chrome/browser/crash_report", + "//ios/chrome/common/crash_report", "//ios/chrome/test/ocmock", "//ios/testing:block_swizzler", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn index f4078082a2d..5c83645c85c 100644 --- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn @@ -47,14 +47,6 @@ source_set("settings") { sources = [ "about_chrome_table_view_controller.h", "about_chrome_table_view_controller.mm", - "bandwidth_management_table_view_controller.h", - "bandwidth_management_table_view_controller.mm", - "block_popups_table_view_controller.h", - "block_popups_table_view_controller.mm", - "content_settings_table_view_controller.h", - "content_settings_table_view_controller.mm", - "dataplan_usage_table_view_controller.h", - "dataplan_usage_table_view_controller.mm", "import_data_table_view_controller.h", "import_data_table_view_controller.mm", "search_engine_table_view_controller.h", @@ -75,6 +67,8 @@ source_set("settings") { "resources:app_icon_placeholder", "resources:encryption_error", "resources:enterprise_icon", + "resources:legacy_settings_passwords", + "resources:round_settings_unsafe_state", "resources:settings_about_chrome", "resources:settings_accounts_add_account", "resources:settings_addresses", @@ -161,11 +155,14 @@ source_set("settings") { "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/ntp:feature_flags", + "//ios/chrome/browser/ui/resources:legacy_password_key", "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/settings/autofill", + "//ios/chrome/browser/ui/settings/bandwidth", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/cells:public", "//ios/chrome/browser/ui/settings/clear_browsing_data", + "//ios/chrome/browser/ui/settings/content_settings", "//ios/chrome/browser/ui/settings/default_browser", "//ios/chrome/browser/ui/settings/default_browser/resources:default_browser_world", "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller", @@ -198,6 +195,7 @@ source_set("settings") { "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/signin:signin_resources_api", "//ios/public/provider/chrome/browser/user_feedback", + "//ios/web/common:features", "//net", "//ui/base", "//url", @@ -269,10 +267,6 @@ source_set("unit_tests") { testonly = true sources = [ "about_chrome_table_view_controller_unittest.mm", - "bandwidth_management_table_view_controller_unittest.mm", - "block_popups_table_view_controller_unittest.mm", - "content_settings_table_view_controller_unittest.mm", - "dataplan_usage_table_view_controller_unittest.mm", "import_data_table_view_controller_unittest.mm", "search_engine_table_view_controller_unittest.mm", "settings_navigation_controller_unittest.mm", @@ -298,7 +292,6 @@ source_set("unit_tests") { "//components/pref_registry", "//components/prefs:test_support", "//components/search_engines", - "//components/signin/ios/browser", "//components/signin/public/base", "//components/strings", "//components/sync/driver:test_support", @@ -357,12 +350,9 @@ source_set("unit_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "block_popups_app_interface.h", - "block_popups_app_interface.mm", "settings_app_interface.h", "settings_app_interface.mm", "signin_settings_app_interface.h", @@ -387,27 +377,28 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "block_popups_app_interface.h", "settings_app_interface.h", + "settings_app_interface_stub.mm", "signin_settings_app_interface.h", + "signin_settings_app_interface_stub.mm", ] public_deps = [ "//components/content_settings/core/common" ] - deps = [ "//base" ] + deps = [ + "//base", + "//ios/third_party/earl_grey2:test_lib", + ] } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true sources = [ - "block_popups_egtest.mm", "search_engine_settings_egtest.mm", "settings_accessibility_egtest.mm", "settings_egtest.mm", @@ -418,13 +409,17 @@ source_set("eg2_tests") { "//base", "//base/test:test_support", "//build:branding_buildflags", + "//components/policy:generated", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/policy:eg_test_support+eg2", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication/cells:constants", "//ios/chrome/browser/ui/authentication/signin:constants", "//ios/chrome/browser/ui/settings:constants", + "//ios/chrome/browser/ui/settings/elements:constants", + "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/testing/earl_grey:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn index a1d9b5a460f..497dfeccc19 100644 --- a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn @@ -17,6 +17,8 @@ source_set("autofill") { "autofill_credit_card_edit_table_view_controller.mm", "autofill_credit_card_table_view_controller.h", "autofill_credit_card_table_view_controller.mm", + "autofill_credit_card_util.h", + "autofill_credit_card_util.mm", "autofill_edit_table_view_controller+protected.h", "autofill_edit_table_view_controller.h", "autofill_edit_table_view_controller.mm", @@ -77,6 +79,7 @@ source_set("unit_tests") { sources = [ "autofill_add_credit_card_mediator_unittest.mm", "autofill_credit_card_table_view_controller_unittest.mm", + "autofill_credit_card_util_unittest.mm", "autofill_profile_edit_table_view_controller_unittest.mm", "autofill_profile_table_view_controller_unittest.mm", ] @@ -84,6 +87,7 @@ source_set("unit_tests") { ":autofill", "//base/test:test_support", "//components/autofill/core/browser", + "//components/autofill/core/browser:test_support", "//components/strings", "//ios/chrome/browser", "//ios/chrome/browser/autofill", @@ -101,7 +105,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/settings/bandwidth/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/bandwidth/BUILD.gn new file mode 100644 index 00000000000..f4836a68010 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/bandwidth/BUILD.gn @@ -0,0 +1,61 @@ +# Copyright 2021 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. + +source_set("bandwidth") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "bandwidth_management_table_view_controller.h", + "bandwidth_management_table_view_controller.mm", + "dataplan_usage_table_view_controller.h", + "dataplan_usage_table_view_controller.mm", + ] + deps = [ + "//base", + "//components/prefs", + "//components/prefs/ios", + "//ios/chrome/app/strings", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/prerender:prerender_pref", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/settings:constants", + "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/table_view:styler", + "//ios/chrome/browser/ui/table_view:utils", + "//ios/chrome/browser/ui/table_view/cells", + "//ios/chrome/browser/ui/util", + "//ui/base", + "//url", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "bandwidth_management_table_view_controller_unittest.mm", + "dataplan_usage_table_view_controller_unittest.mm", + ] + deps = [ + ":bandwidth", + "//base", + "//base/test:test_support", + "//components/pref_registry", + "//components/prefs:test_support", + "//components/sync_preferences", + "//components/sync_preferences:test_support", + "//ios/chrome/app/strings", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/prefs:browser_prefs", + "//ios/chrome/browser/prerender:prerender_pref", + "//ios/chrome/browser/ui/table_view", + "//ios/chrome/browser/ui/table_view:test_support", + "//ios/chrome/test:test_support", + "//ios/web/public/test", + "//testing/gmock", + "//testing/gtest", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn index 5fa9c102994..05a20e42964 100644 --- a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn @@ -26,6 +26,7 @@ source_set("clear_browsing_data") { "//components/browsing_data/core", "//components/feature_engagement/public", "//components/history/core/browser", + "//components/password_manager/core/common", "//components/prefs/ios", "//components/search_engines", "//components/signin/public/identity_manager", @@ -49,6 +50,7 @@ source_set("clear_browsing_data") { "//ios/chrome/browser/ui/elements:elements_internal", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/list_model", + "//ios/chrome/browser/ui/resources:legacy_password_key", "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/settings/cells", @@ -127,7 +129,6 @@ source_set("test_support") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/settings/content_settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/content_settings/BUILD.gn new file mode 100644 index 00000000000..35eedfb2fd1 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/content_settings/BUILD.gn @@ -0,0 +1,115 @@ +# Copyright 2021 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. + +source_set("content_settings") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "block_popups_table_view_controller.h", + "block_popups_table_view_controller.mm", + "content_settings_table_view_controller.h", + "content_settings_table_view_controller.mm", + ] + deps = [ + "//base", + "//components/content_settings/core/browser", + "//components/content_settings/core/common", + "//components/prefs", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/content_settings", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/ntp:feature_flags", + "//ios/chrome/browser/ui/settings:constants", + "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller", + "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/browser/ui/table_view:utils", + "//ios/chrome/browser/ui/table_view/cells", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/mailto", + "//ios/web/common:features", + "//ui/base", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "block_popups_table_view_controller_unittest.mm", + "content_settings_table_view_controller_unittest.mm", + ] + deps = [ + ":content_settings", + "//base/test:test_support", + "//components/content_settings/core/browser", + "//ios/chrome/app/strings", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/content_settings", + "//ios/chrome/browser/ui/table_view:test_support", + "//ios/chrome/browser/ui/table_view/cells", + "//ios/web/public/test", + "//testing/gtest", + "//ui/base", + ] +} + +source_set("eg_app_support+eg2") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "block_popups_app_interface.h", + "block_popups_app_interface.mm", + ] + deps = [ + ":content_settings", + "//base", + "//components/content_settings/core/browser", + "//ios/chrome/app:app_internal", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/content_settings", + "//ios/chrome/test/app:test_support", + ] +} + +source_set("eg_test_support+eg2") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "block_popups_app_interface.h", + "block_popups_app_interface_stub.mm", + ] + deps = [ + "//base", + "//components/content_settings/core/common", + "//ios/third_party/earl_grey2:test_lib", + ] +} + +source_set("eg2_tests") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "block_popups_egtest.mm" ] + deps = [ + ":eg_test_support+eg2", + "//base", + "//base/test:test_support", + "//build:branding_buildflags", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ios/web/public/test/http_server", + "//net:test_support", + "//ui/base", + "//url", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn index db9d6ed5462..874cd3ffe86 100644 --- a/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn @@ -11,10 +11,10 @@ source_set("default_browser") { deps = [ "resources:chrome_icon", "resources:default_browser_world", - "resources:settings", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/settings/resources:settings", "//ios/chrome/browser/ui/table_view:utils", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/common/ui/colors", diff --git a/chromium/ios/chrome/browser/ui/settings/default_browser/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/default_browser/resources/BUILD.gn index b62b14912c9..6e89224eab0 100644 --- a/chromium/ios/chrome/browser/ui/settings/default_browser/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/default_browser/resources/BUILD.gn @@ -19,11 +19,3 @@ imageset("default_browser_world") { "default_browser_world.imageset/default_browser_world@3x.png", ] } - -imageset("settings") { - sources = [ - "settings.imageset/Contents.json", - "settings.imageset/settings@2x.png", - "settings.imageset/settings@3x.png", - ] -} diff --git a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn index 60891b3fcca..ea7856f43ba 100644 --- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn @@ -49,7 +49,8 @@ source_set("google_services") { "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/main", + "//ios/chrome/browser/commerce:commerce", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/policy:policy_util", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", @@ -98,7 +99,6 @@ source_set("constants") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -117,17 +117,19 @@ source_set("eg_app_support+eg2") { ] } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "google_services_settings_app_interface.h" ] + sources = [ + "google_services_settings_app_interface.h", + "google_services_settings_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -136,6 +138,7 @@ source_set("eg2_tests") { sources = [ "accounts_table_egtest.mm", "google_services_settings_egtest.mm", + "manage_sync_settings_egtest.mm", ] deps = [ ":eg_test_support+eg2", @@ -146,7 +149,6 @@ source_set("eg2_tests") { "//components/policy/core/common:common_constants", "//components/safe_browsing/core/common", "//components/safe_browsing/core/common:safe_browsing_prefs", - "//components/signin/ios/browser:features", "//components/signin/public/base", "//components/strings", "//ios/chrome/app/strings", diff --git a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn index 09b5c57c94f..225dad90c27 100644 --- a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn @@ -102,7 +102,6 @@ source_set("unit_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ @@ -119,7 +118,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -136,7 +134,6 @@ source_set("eg_test_support+eg2") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn index 4782b2d0dac..e3a57bf2f59 100644 --- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn @@ -35,6 +35,8 @@ source_set("password") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/settings/password/password_details", + "//ios/chrome/browser/ui/settings/password/passwords_in_other_apps", + "//ios/chrome/browser/ui/settings/utils", "//ios/chrome/browser/ui/table_view:utils", "//ios/chrome/common", "//ios/chrome/common/ui/colors", @@ -155,6 +157,7 @@ source_set("unit_tests") { "//ios/chrome/browser/sync:sync", "//ios/chrome/browser/sync:test_support", "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/settings/utils", "//ios/chrome/browser/ui/table_view:test_support", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", @@ -164,10 +167,8 @@ source_set("unit_tests") { "//ios/chrome/common/ui/reauthentication", "//ios/chrome/test/app:test_support", "//ios/web/public/test", - "//ios/web/public/test", "//testing/gmock", "//testing/gtest", - "//testing/gtest", "//third_party/ocmock", "//ui/base", "//url", @@ -175,15 +176,14 @@ source_set("unit_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true sources = [ - "passwords_settings_app_interface.h", - "passwords_settings_app_interface.mm", + "password_settings_app_interface.h", + "password_settings_app_interface.mm", ] deps = [ ":password", @@ -207,20 +207,24 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "passwords_settings_app_interface.h" ] + sources = [ + "password_settings_app_interface.h", + "password_settings_app_interface_stub.mm", + ] - deps = [ "//ios/chrome/common/ui/reauthentication" ] + deps = [ + "//ios/chrome/common/ui/reauthentication", + "//ios/third_party/earl_grey2:test_lib", + ] } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn index f8c8343a1a1..aa46dc83787 100644 --- a/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn @@ -28,6 +28,8 @@ source_set("password_details") { "//ios/chrome/browser", "//ios/chrome/browser/main:public", "//ios/chrome/browser/passwords", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/sync", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", diff --git a/chromium/ios/chrome/browser/ui/settings/password/passwords_in_other_apps/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/passwords_in_other_apps/BUILD.gn new file mode 100644 index 00000000000..c58e9344ed3 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/password/passwords_in_other_apps/BUILD.gn @@ -0,0 +1,124 @@ +# Copyright 2021 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. + +source_set("passwords_in_other_apps") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "passwords_in_other_apps_coordinator.h", + "passwords_in_other_apps_coordinator.mm", + "passwords_in_other_apps_mediator.h", + "passwords_in_other_apps_mediator.mm", + ] + deps = [ + ":passwords_in_other_apps_ui", + "//base", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/settings/utils", + "//ios/public/provider/chrome/browser/password_auto_fill:password_auto_fill_api", + ] +} + +source_set("passwords_in_other_apps_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "passwords_in_other_apps_consumer.h", + "passwords_in_other_apps_view_controller.h", + "passwords_in_other_apps_view_controller.mm", + "passwords_in_other_apps_view_controller_delegate.h", + ] + deps = [ + ":constants", + "//base", + "//components/password_manager/core/common", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/settings/resources:legacy_settings_passwords_in_other_apps_banner", + "//ios/chrome/browser/ui/settings/resources:settings", + "//ios/chrome/browser/ui/settings/resources:settings_passwords_in_other_apps_banner", + "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", + "//ios/chrome/common/ui/util:image_util", + "//ios/public/provider/chrome/browser/password_auto_fill:password_auto_fill_api", + "//ui/base", + ] +} + +source_set("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "constants.h", + "constants.mm", + ] + frameworks = [ "Foundation.framework" ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "passwords_in_other_apps_mediator_unittest.mm" ] + deps = [ + ":passwords_in_other_apps", + ":passwords_in_other_apps_ui", + "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/test:test_support", + "//testing/gtest:gtest", + ] +} + +source_set("eg_app_support+eg2") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "passwords_in_other_apps_app_interface.h", + "passwords_in_other_apps_app_interface.mm", + ] + deps = [ + "//base/test:test_support", + "//ios/chrome/test/fakes", + "//ios/testing/earl_grey:eg_app_support+eg2", + ] +} + +source_set("eg_test_support+eg2") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "passwords_in_other_apps_app_interface.h", + "passwords_in_other_apps_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] +} + +source_set("eg2_tests") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "passwords_in_other_apps_egtest.mm" ] + deps = [ + ":constants", + ":eg_test_support+eg2", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/settings/password:password_constants", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ui/base", + ] + frameworks = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn index 2432c5f7b34..38e475d77af 100644 --- a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn @@ -87,7 +87,6 @@ source_set("unit_tests") { "//components/handoff", "//components/prefs", "//components/prefs/ios", - "//components/signin/ios/browser:features", "//components/strings", "//components/sync/driver:test_support", "//components/sync_preferences", diff --git a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn index f37ade521dd..15df4a9fde6 100644 --- a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn @@ -32,6 +32,24 @@ imageset("enterprise_icon") { ] } +imageset("round_settings_unsafe_state") { + sources = [ + "round_settings_unsafe_state.imageset/Contents.json", + "round_settings_unsafe_state.imageset/round_settings_unsafe_state@2x.png", + "round_settings_unsafe_state.imageset/round_settings_unsafe_state@3x.png", + "round_settings_unsafe_state.imageset/round_settings_unsafe_state_dark@2x.png", + "round_settings_unsafe_state.imageset/round_settings_unsafe_state_dark@3x.png", + ] +} + +imageset("settings") { + sources = [ + "settings.imageset/Contents.json", + "settings.imageset/settings@2x.png", + "settings.imageset/settings@3x.png", + ] +} + imageset("settings_accounts_add_account") { sources = [ "settings_accounts_add_account.imageset/Contents.json", @@ -96,11 +114,41 @@ imageset("settings_language_settings") { ] } +imageset("legacy_settings_passwords") { + sources = [ + "legacy_settings_passwords.imageset/Contents.json", + "legacy_settings_passwords.imageset/settings_passwords@2x.png", + "legacy_settings_passwords.imageset/settings_passwords@3x.png", + ] +} + imageset("settings_passwords") { sources = [ "settings_passwords.imageset/Contents.json", "settings_passwords.imageset/settings_passwords@2x.png", "settings_passwords.imageset/settings_passwords@3x.png", + "settings_passwords.imageset/settings_passwords_dark@2x.png", + "settings_passwords.imageset/settings_passwords_dark@3x.png", + ] +} + +imageset("legacy_settings_passwords_in_other_apps_banner") { + sources = [ + "legacy_settings_passwords_in_other_apps_banner.imageset/Contents.json", + "legacy_settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_dark@2x.png", + "legacy_settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_dark@3x.png", + "legacy_settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_light@2x.png", + "legacy_settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_light@3x.png", + ] +} + +imageset("settings_passwords_in_other_apps_banner") { + sources = [ + "settings_passwords_in_other_apps_banner.imageset/Contents.json", + "settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_dark@2x.png", + "settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_dark@3x.png", + "settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_light@2x.png", + "settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_light@3x.png", ] } diff --git a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn index 7e458c361cb..6a7627750f9 100644 --- a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn @@ -56,6 +56,8 @@ source_set("safety_check") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/resources:legacy_password_key", + "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/cells:public", diff --git a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn index db15f0e02ea..d9b51b3477e 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn @@ -101,7 +101,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn index 3ba21e7b5e6..215390ff0f1 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn @@ -54,7 +54,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn index 9999f667a91..6b41d853a66 100644 --- a/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn @@ -8,6 +8,9 @@ source_set("utils") { "content_setting_backed_boolean.h", "content_setting_backed_boolean.mm", "observable_boolean.h", + "password_auto_fill_status_manager.h", + "password_auto_fill_status_manager.mm", + "password_auto_fill_status_observer.h", "pref_backed_boolean.h", "pref_backed_boolean.mm", "settings_utils.h", diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn index 1ff742cb87c..981f79f8d2d 100644 --- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn @@ -72,7 +72,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn b/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn index 2018766c6e8..d93907ba8ab 100644 --- a/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn @@ -36,6 +36,8 @@ source_set("start_surface") { "//components/favicon/ios", "//ios/chrome/app/application_delegate:app_state_header", "//ios/chrome/app/strings:ios_strings", + "//ios/chrome/browser", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/main:browser_interface_provider", "//ios/chrome/browser/ui/main:observing_scene_agent", "//ios/chrome/browser/ui/main:scene_state_header", @@ -46,8 +48,29 @@ source_set("start_surface") { ] } +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + + sources = [ "start_surface_scene_agent_unittest.mm" ] + deps = [ + ":feature_flags", + ":start_surface", + "//base", + "//base/test:test_support", + "//ios/chrome/browser", + "//ios/chrome/browser:chrome_url_constants", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/main:browser_interface_provider", + "//ios/chrome/browser/ui/main:scene", + "//ios/chrome/browser/ui/main/test", + "//ios/chrome/browser/web_state_list", + "//ios/web/public/test/fakes", + "//testing/gtest", + ] +} + source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn index c8428149cde..61b9efca4b7 100644 --- a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn @@ -180,9 +180,12 @@ source_set("unit_tests") { "//components/bookmarks/browser", "//components/bookmarks/test", "//components/sessions", + "//components/sync_preferences:test_support", + "//components/unified_consent:unified_consent", "//ios/chrome/browser", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/commerce:commerce", "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ntp", "//ios/chrome/browser/sessions", @@ -193,6 +196,7 @@ source_set("unit_tests") { "//ios/chrome/browser/snapshots", "//ios/chrome/browser/tabs", "//ios/chrome/browser/tabs:tabs_internal", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/tab_switcher", @@ -206,6 +210,7 @@ source_set("unit_tests") { "//ios/chrome/browser/web_state_list/web_usage_enabler", "//ios/chrome/test:block_cleanup_test", "//ios/chrome/test:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/web/common", "//ios/web/public/test", "//ios/web/public/test/fakes", @@ -215,7 +220,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn index e5165c4e352..98c12d053fb 100644 --- a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn @@ -78,6 +78,7 @@ source_set("grid_ui") { "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser/modals:modals_api", + "//ios/third_party/material_components_ios", "//ui/base", ] } diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn index a31438039ea..0afe5f94635 100644 --- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn @@ -98,7 +98,6 @@ source_set("unit_tests") { "table_view_header_footer_item_unittest.mm", "table_view_image_item_unittest.mm", "table_view_item_unittest.mm", - "table_view_link_header_footer_item_unittest.mm", "table_view_multi_detail_text_item_unittest.mm", "table_view_text_button_item_unittest.mm", "table_view_text_edit_item_unittest.mm", diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn index 02a082409b6..62c63c13c5a 100644 --- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn @@ -26,6 +26,7 @@ source_set("tabs") { ] public_deps = [ "//ios/chrome/browser/tabs" ] deps = [ + ":constants", "resources:open_new_tab_background", "resources:tabstrip_background_tab", "resources:tabstrip_foreground_tab", @@ -95,6 +96,14 @@ source_set("coordinator") { ] } +source_set("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "tab_strip_constants.h", + "tab_strip_constants.mm", + ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -122,7 +131,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -130,6 +138,7 @@ source_set("eg2_tests") { testonly = true sources = [ "tab_strip_egtest.mm" ] deps = [ + ":constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", diff --git a/chromium/ios/chrome/browser/ui/text_fragments/BUILD.gn b/chromium/ios/chrome/browser/ui/text_fragments/BUILD.gn new file mode 100644 index 00000000000..4d3360dea7b --- /dev/null +++ b/chromium/ios/chrome/browser/ui/text_fragments/BUILD.gn @@ -0,0 +1,19 @@ +# Copyright 2021 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. + +source_set("text_fragments") { + sources = [ + "text_fragments_coordinator.h", + "text_fragments_coordinator.mm", + "text_fragments_mediator.h", + "text_fragments_mediator.mm", + ] + deps = [ + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/web_state_list", + "//ios/web/public/text_fragments", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn b/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn index 3fc0a5fd217..014621c857f 100644 --- a/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn @@ -49,7 +49,6 @@ source_set("feature_flags") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn index 65bf97a82a7..12d7724d1a1 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn @@ -159,7 +159,6 @@ source_set("unit_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -178,14 +177,18 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "adaptive_toolbar_app_interface.h" ] + sources = [ + "adaptive_toolbar_app_interface.h", + "adaptive_toolbar_app_interface_stub.mm", + ] + + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } source_set("eg2_tests") { @@ -193,7 +196,6 @@ source_set("eg2_tests") { "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] - defines = [ "CHROME_EARL_GREY_2" ] testonly = true sources = [ "adaptive_toolbar_egtest.mm", diff --git a/chromium/ios/chrome/browser/ui/util/BUILD.gn b/chromium/ios/chrome/browser/ui/util/BUILD.gn index 73de8c46dab..276ba109f03 100644 --- a/chromium/ios/chrome/browser/ui/util/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/util/BUILD.gn @@ -184,7 +184,6 @@ bundle_data("terms_resources") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -203,7 +202,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/webui/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/BUILD.gn index 49bd3b13f10..2ab192c46f6 100644 --- a/chromium/ios/chrome/browser/ui/webui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/BUILD.gn @@ -47,6 +47,7 @@ source_set("webui") { "//build:branding_buildflags", "//components/autofill/core/browser", "//components/crash/core/browser", + "//components/crash/core/common:reporter_running_ios", "//components/download/public/background_service:public", "//components/download/resources/download_internals:resources", "//components/flags_ui", @@ -131,7 +132,6 @@ source_set("webui_internal") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn index b63ff572580..00f434e4eb7 100644 --- a/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn @@ -44,7 +44,6 @@ source_set("constants") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/variations/BUILD.gn b/chromium/ios/chrome/browser/variations/BUILD.gn index 3037df2dd80..2b331a58678 100644 --- a/chromium/ios/chrome/browser/variations/BUILD.gn +++ b/chromium/ios/chrome/browser/variations/BUILD.gn @@ -44,7 +44,6 @@ generate_ui_string_overrider("ios_chrome_ui_string_overrider_factory") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -67,17 +66,19 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "variations_app_interface.h" ] + sources = [ + "variations_app_interface.h", + "variations_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn index a1de3ca40c5..43e3da81011 100644 --- a/chromium/ios/chrome/browser/web/BUILD.gn +++ b/chromium/ios/chrome/browser/web/BUILD.gn @@ -7,6 +7,8 @@ import("//ios/web/js_compile.gni") source_set("web") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "blocked_popup_tab_helper.h", + "blocked_popup_tab_helper.mm", "certificate_policy_app_agent.h", "certificate_policy_app_agent.mm", "dom_altering_lock.h", @@ -28,15 +30,15 @@ source_set("web") { "web_navigation_ntp_delegate.h", "web_navigation_util.h", "web_navigation_util.mm", - "web_state_delegate_tab_helper.h", - "web_state_delegate_tab_helper.mm", ] deps = [ ":feature_flags", ":page_placeholder", ":tab_helper_delegates", "//base", + "//components/content_settings/core/browser", "//components/error_page/common", + "//components/infobars/core", "//components/pref_registry", "//components/resources:components_resources_grit", "//components/resources:dev_ui_components_resources_grit", @@ -47,13 +49,12 @@ source_set("web") { "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/content_settings", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/infobars:public", "//ios/chrome/browser/main:public", "//ios/chrome/browser/ntp", - "//ios/chrome/browser/overlays", - "//ios/chrome/browser/overlays/public/web_content_area", - "//ios/chrome/browser/snapshots", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/dialogs:dialogs_internal", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/fullscreen", "//ios/chrome/browser/ui/util", @@ -74,6 +75,35 @@ source_set("web") { public_deps = [ ":tab_id_tab_helper" ] } +source_set("delegate") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "web_state_delegate_browser_agent.h", + "web_state_delegate_browser_agent.mm", + ] + deps = [ + ":tab_helper_delegates", + ":web", + "//base", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", + "//ios/chrome/browser/snapshots", + "//ios/chrome/browser/ui/context_menu", + "//ios/chrome/browser/ui/dialogs:dialogs_internal", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:agents", + "//ios/components/security_interstitials", + "//ios/web/public", + "//url", + ] + + frameworks = [ + "UIKit.framework", + "Foundation.framework", + ] +} + source_set("page_placeholder") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -109,7 +139,9 @@ source_set("tab_helper_delegates") { sources = [ "repost_form_tab_helper_delegate.h", "sad_tab_tab_helper_delegate.h", + "web_state_container_view_provider.h", ] + deps = [ "//ios/web/public" ] } source_set("unit_tests") { @@ -126,9 +158,10 @@ source_set("unit_tests") { "tab_id_tab_helper_unittest.mm", "web_navigation_browser_agent_unittest.mm", "web_navigation_util_unittest.mm", - "web_state_delegate_tab_helper_unittest.mm", + "web_state_delegate_browser_agent_unittest.mm", ] deps = [ + ":delegate", ":page_placeholder", ":tab_helper_delegates", ":test_support", @@ -154,6 +187,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web:feature_flags", "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:agents", "//ios/chrome/test:test_support", "//ios/net", "//ios/net:test_support", @@ -177,8 +211,6 @@ js_compile_bundle("chrome_bundle_main_frame") { closure_entry_point = "__crWeb.chromeBundleMainFrame" sources = [ "//components/translate/ios/browser/resources/language_detection.js", - "//ios/chrome/browser/link_to_text/resources/link_to_text.js", - "//ios/chrome/browser/search_engines/resources/search_engine.js", "//third_party/text-fragments-polyfill/src/src/fragment-generation-utils.js", "//third_party/text-fragments-polyfill/src/src/text-fragment-utils.js", "resources/chrome_bundle_main_frame.js", @@ -188,8 +220,6 @@ js_compile_bundle("chrome_bundle_main_frame") { source_set("web_internal") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "blocked_popup_tab_helper.h", - "blocked_popup_tab_helper.mm", "chrome_web_client.h", "chrome_web_client.mm", ] @@ -199,10 +229,8 @@ source_set("web_internal") { "//base", "//components/autofill/ios/browser", "//components/autofill/ios/form_util:form_handler_feature", - "//components/content_settings/core/browser", "//components/dom_distiller/core", "//components/google/core/common", - "//components/infobars/core", "//components/password_manager/core/common", "//components/password_manager/ios:password_manager_feature", "//components/payments/core", @@ -215,12 +243,12 @@ source_set("web_internal") { "//ios/chrome/browser", "//ios/chrome/browser:browser_impl", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/content_settings", - "//ios/chrome/browser/infobars", - "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/link_to_text", + "//ios/chrome/browser/ntp", "//ios/chrome/browser/passwords", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/safe_browsing", + "//ios/chrome/browser/search_engines", "//ios/chrome/browser/ssl", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/elements", @@ -234,8 +262,8 @@ source_set("web_internal") { "//ios/chrome/browser/web/java_script_console", "//ios/chrome/browser/web/print", "//ios/chrome/browser/web/session_state", + "//ios/chrome/browser/web/web_performance_metrics", "//ios/components/security_interstitials", - "//ios/components/security_interstitials/legacy_tls", "//ios/components/security_interstitials/lookalikes", "//ios/components/webui:url_constants", "//ios/net", @@ -309,7 +337,6 @@ source_set("unit_tests_internal") { "//ios/chrome/browser/web", "//ios/chrome/test/fakes", "//ios/components/security_interstitials", - "//ios/components/security_interstitials/legacy_tls", "//ios/components/security_interstitials/lookalikes", "//ios/net", "//ios/web/common:features", @@ -336,7 +363,6 @@ source_set("constants") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -345,7 +371,9 @@ source_set("eg_test_support+eg2") { sources = [ "lookalike_url_app_interface.h", + "lookalike_url_app_interface_stub.mm", "progress_indicator_app_interface.h", + "progress_indicator_app_interface_stub.mm", ] deps = [ @@ -360,7 +388,6 @@ source_set("eg_app_support+eg2") { "//build/config/ios:xctest_config", ] testonly = true - defines = [ "CHROME_EARL_GREY_2" ] sources = [ "lookalike_url_app_interface.h", @@ -384,7 +411,6 @@ source_set("eg_app_support+eg2") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -401,7 +427,6 @@ source_set("eg2_tests") { "forms_egtest.mm", "http_auth_egtest.mm", "js_print_egtest.mm", - "legacy_tls_egtest.mm", "lookalike_url_egtest.mm", "navigation_egtest.mm", "progress_indicator_egtest.mm", diff --git a/chromium/ios/chrome/browser/web/image_fetch/BUILD.gn b/chromium/ios/chrome/browser/web/image_fetch/BUILD.gn index 8597c6697e3..1d5276b620c 100644 --- a/chromium/ios/chrome/browser/web/image_fetch/BUILD.gn +++ b/chromium/ios/chrome/browser/web/image_fetch/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//ios/web/js_compile.gni") +import("//testing/libfuzzer/fuzzer_test.gni") source_set("image_fetch") { configs += [ "//build/config/compiler:enable_arc" ] @@ -15,7 +16,7 @@ source_set("image_fetch") { deps = [ ":image_fetch_js", "//base", - "//components/image_fetcher/ios", + "//components/image_fetcher/core", "//ios/web", "//ios/web/common", "//ios/web/public/js_messaging", @@ -52,3 +53,22 @@ source_set("unit_tests") { "//services/network:test_support", ] } + +fuzzer_test("image_fetch_java_script_feature_fuzzer") { + additional_configs = [ + "//build/config/compiler:enable_arc", + "//testing/libfuzzer:build_for_ios_clusterfuzz_job", + ] + + sources = [ "image_fetch_java_script_feature_fuzzer.mm" ] + deps = [ + ":image_fetch", + "//base", + "//ios/web/public/js_messaging", + "//ios/web/public/js_messaging/fuzzer_support", + "//ios/web/public/js_messaging/fuzzer_support:js_message_proto", + "//ios/web/public/test:fuzzer_support", + "//third_party/libprotobuf-mutator", + ] + seed_corpus = "fuzzer_corpus" +} diff --git a/chromium/ios/chrome/browser/web/session_state/BUILD.gn b/chromium/ios/chrome/browser/web/session_state/BUILD.gn index 7e7650c69ca..033d2235b5c 100644 --- a/chromium/ios/chrome/browser/web/session_state/BUILD.gn +++ b/chromium/ios/chrome/browser/web/session_state/BUILD.gn @@ -24,7 +24,6 @@ source_set("session_state") { "//ios/chrome/browser:chrome_url_constants", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/main:public", - "//ios/chrome/browser/reading_list", "//ios/chrome/browser/web:feature_flags", "//ios/chrome/browser/web:tab_id_tab_helper", "//ios/chrome/browser/web_state_list", @@ -55,6 +54,8 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/web", "//ios/chrome/browser/web:feature_flags", + "//ios/chrome/browser/web:test_support", + "//ios/chrome/browser/web:web_internal", "//ios/web/common:features", "//ios/web/navigation:wk_navigation_util", "//ios/web/public/session", diff --git a/chromium/ios/chrome/browser/web/web_performance_metrics/BUILD.gn b/chromium/ios/chrome/browser/web/web_performance_metrics/BUILD.gn new file mode 100644 index 00000000000..ed1e2adc894 --- /dev/null +++ b/chromium/ios/chrome/browser/web/web_performance_metrics/BUILD.gn @@ -0,0 +1,47 @@ +# Copyright 2021 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("//ios/build/config.gni") +import("//ios/web/js_compile.gni") + +source_set("web_performance_metrics") { + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":web_performance_metrics_js", + "//base", + "//ios/web/public:public", + "//ios/web/public:web_state_observer", + "//ios/web/public/js_messaging", + ] + + sources = [ + "web_performance_metrics_java_script_feature.h", + "web_performance_metrics_java_script_feature.mm", + "web_performance_metrics_java_script_feature_util.h", + "web_performance_metrics_java_script_feature_util.mm", + "web_performance_metrics_tab_helper.h", + "web_performance_metrics_tab_helper.mm", + ] +} + +source_set("unit_tests") { + testonly = true + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":web_performance_metrics", + "//base", + "//testing/gtest", + ] + + sources = [ "web_performance_metrics_java_script_feature_unittest.mm" ] +} + +js_compile_bundle("web_performance_metrics_js") { + visibility = [ ":web_performance_metrics" ] + closure_entry_point = "__crWeb.webPerformanceMetrics" + + sources = [ "resources/web_performance_metrics.js" ] +} diff --git a/chromium/ios/chrome/browser/web_state_list/BUILD.gn b/chromium/ios/chrome/browser/web_state_list/BUILD.gn index a0cab940a85..8e6c961a323 100644 --- a/chromium/ios/chrome/browser/web_state_list/BUILD.gn +++ b/chromium/ios/chrome/browser/web_state_list/BUILD.gn @@ -20,6 +20,10 @@ source_set("web_state_list") { "active_web_state_observation_forwarder.mm", "all_web_state_observation_forwarder.h", "all_web_state_observation_forwarder.mm", + "web_state_dependency_installation_observer.h", + "web_state_dependency_installation_observer.mm", + "web_state_dependency_installer_bridge.h", + "web_state_dependency_installer_bridge.mm", "web_state_list.h", "web_state_list.mm", "web_state_list_delegate.h", @@ -54,6 +58,8 @@ source_set("agents") { sources = [ "tab_insertion_browser_agent.h", "tab_insertion_browser_agent.mm", + "view_source_browser_agent.h", + "view_source_browser_agent.mm", "web_state_list_metrics_browser_agent.h", "web_state_list_metrics_browser_agent.mm", ] @@ -69,8 +75,13 @@ source_set("agents") { "//ios/chrome/browser/main:public", "//ios/chrome/browser/sessions:restoration_agent", "//ios/chrome/browser/sessions:restoration_observer", + "//ios/chrome/browser/snapshots", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/web", + "//ios/chrome/browser/web:tab_helper_delegates", + "//ios/components/security_interstitials:security_interstitials", "//ios/web/public", + "//ios/web/public/deprecated", ] frameworks = [ "Foundation.framework" ] configs += [ "//build/config/compiler:enable_arc" ] @@ -96,6 +107,7 @@ source_set("unit_tests") { "all_web_state_observation_forwarder_unittest.mm", "session_metrics_unittest.cc", "tab_insertion_browser_agent_unittest.mm", + "web_state_dependency_installation_observer_unittest.mm", "web_state_list_favicon_driver_observer_unittest.mm", "web_state_list_order_controller_unittest.mm", "web_state_list_serialization_unittest.mm", diff --git a/chromium/ios/chrome/common/ui/colors/BUILD.gn b/chromium/ios/chrome/common/ui/colors/BUILD.gn index bcd47b2333e..097dd79bb7d 100644 --- a/chromium/ios/chrome/common/ui/colors/BUILD.gn +++ b/chromium/ios/chrome/common/ui/colors/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/config/chrome_build.gni") +import("//build/config/ios/swift_source_set.gni") source_set("colors") { sources = [ @@ -12,3 +13,17 @@ source_set("colors") { deps = [ "resources" ] configs += [ "//build/config/compiler:enable_arc" ] } + +swift_source_set("swift") { + bridge_header = "swift_bridge.h" + sources = [ "Color+Chrome.swift" ] + deps = [ + ":colors", + "resources", + ] + + frameworks = [ + "Foundation.framework", + "SwiftUI.framework", + ] +} diff --git a/chromium/ios/chrome/common/ui/promo_style/BUILD.gn b/chromium/ios/chrome/common/ui/promo_style/BUILD.gn index 32e085aded7..4a14d84d9fb 100644 --- a/chromium/ios/chrome/common/ui/promo_style/BUILD.gn +++ b/chromium/ios/chrome/common/ui/promo_style/BUILD.gn @@ -15,6 +15,7 @@ source_set("promo_style") { "promo_style_view_controller_delegate.h", ] deps = [ + ":constants", "//base", "//base:i18n", "//ios/chrome/app/strings", @@ -23,6 +24,16 @@ source_set("promo_style") { "//ios/chrome/common/ui/resources:help_icon", "//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util:dynamic_type_util", + "//ios/chrome/common/ui/util:image_util", ] frameworks = [ "UIKit.framework" ] } + +source_set("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "constants.h", + "constants.mm", + ] + frameworks = [ "Foundation.framework" ] +} diff --git a/chromium/ios/chrome/common/ui/util/BUILD.gn b/chromium/ios/chrome/common/ui/util/BUILD.gn index 442f617dfdc..b4612400e28 100644 --- a/chromium/ios/chrome/common/ui/util/BUILD.gn +++ b/chromium/ios/chrome/common/ui/util/BUILD.gn @@ -15,8 +15,6 @@ source_set("util") { "constraints_ui_util.mm", "device_util.h", "device_util.mm", - "image_util.h", - "image_util.mm", "pointer_interaction_util.h", "pointer_interaction_util.mm", ] @@ -24,7 +22,6 @@ source_set("util") { "//base", "//ios/chrome/common:constants", "//ios/chrome/common/ui/colors", - "//ui/gfx:resize_image_dimensions", ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -38,12 +35,26 @@ source_set("dynamic_type_util") { frameworks = [ "UIKit.framework" ] } +source_set("image_util") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "image_util.h", + "image_util.mm", + ] + deps = [ "//ui/gfx:resize_image_dimensions" ] + frameworks = [ "UIKit.framework" ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ "dynamic_type_util_unittest.mm" ] + sources = [ + "dynamic_type_util_unittest.mm", + "image_util_unittest.mm", + ] deps = [ ":dynamic_type_util", + ":image_util", "//base", "//testing/gtest", "//third_party/ocmock", diff --git a/chromium/ios/chrome/content_widget_extension/BUILD.gn b/chromium/ios/chrome/content_widget_extension/BUILD.gn index bc8986cc9ba..77079554a01 100644 --- a/chromium/ios/chrome/content_widget_extension/BUILD.gn +++ b/chromium/ios/chrome/content_widget_extension/BUILD.gn @@ -20,11 +20,6 @@ assert( tweak_info_plist("tweak_info_plist") { info_plist = "Info.plist" - - # TODO(crbug.com/1140474): Remove once iOS 14.2 reaches mass adoption. - if (ios_lock_to_version != "") { - args = [ "--lock-to-version=$ios_lock_to_version" ] - } } compile_entitlements("entitlements") { diff --git a/chromium/ios/chrome/credential_provider_extension/BUILD.gn b/chromium/ios/chrome/credential_provider_extension/BUILD.gn index cd782f4ec74..9f84d88d228 100644 --- a/chromium/ios/chrome/credential_provider_extension/BUILD.gn +++ b/chromium/ios/chrome/credential_provider_extension/BUILD.gn @@ -29,11 +29,6 @@ extension_repack_all_locales("packed_resources") { tweak_info_plist("tweak_info_plist") { info_plist = "Info.plist" - - # TODO(crbug.com/1140474): Remove once iOS 14.2 reaches mass adoption. - if (ios_lock_to_version != "") { - args = [ "--lock-to-version=$ios_lock_to_version" ] - } } compile_entitlements("entitlements") { diff --git a/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn b/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn index bd8b861b8ab..a7bdd02bc8e 100644 --- a/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn +++ b/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn @@ -6,6 +6,10 @@ source_set("ui") { sources = [ "consent_coordinator.h", "consent_coordinator.mm", + "consent_legacy_coordinator.h", + "consent_legacy_coordinator.mm", + "consent_legacy_view_controller.h", + "consent_legacy_view_controller.mm", "consent_view_controller.h", "consent_view_controller.mm", "credential_details_consumer.h", @@ -14,6 +18,8 @@ source_set("ui") { "credential_list_consumer.h", "credential_list_coordinator.h", "credential_list_coordinator.mm", + "credential_list_global_header_view.h", + "credential_list_global_header_view.mm", "credential_list_header_view.h", "credential_list_header_view.mm", "credential_list_mediator.h", @@ -54,6 +60,7 @@ source_set("ui") { "//ios/chrome/common/ui/elements", "//ios/chrome/common/ui/elements:form_input_accessory", "//ios/chrome/common/ui/elements:popover_label_view_controller", + "//ios/chrome/common/ui/promo_style", "//ios/chrome/common/ui/resources:default_world_favicon", "//ios/chrome/common/ui/util", "//ios/chrome/credential_provider_extension:metrics_util", diff --git a/chromium/ios/chrome/credential_provider_extension/ui/resources/BUILD.gn b/chromium/ios/chrome/credential_provider_extension/ui/resources/BUILD.gn index fcd7da95e7c..62d48aeaf1a 100644 --- a/chromium/ios/chrome/credential_provider_extension/ui/resources/BUILD.gn +++ b/chromium/ios/chrome/credential_provider_extension/ui/resources/BUILD.gn @@ -8,13 +8,25 @@ import("//build/config/ios/rules.gni") group("resources") { deps = [ ":consent_illustration", + ":consent_view_controller", ":empty_credentials_illustration", ":info_icon", + ":legacy_consent_view_controller", ":password_hide_icon", ":password_reveal_icon", ] } +imageset("consent_view_controller") { + sources = [ + "consent_view_controller.imageset/Contents.json", + "consent_view_controller.imageset/promo_passwords_in_other_apps@2x.png", + "consent_view_controller.imageset/promo_passwords_in_other_apps@3x.png", + "consent_view_controller.imageset/promo_passwords_in_other_apps_dark@2x.png", + "consent_view_controller.imageset/promo_passwords_in_other_apps_dark@3x.png", + ] +} + imageset("consent_illustration") { sources = [ "consent_illustration.imageset/Contents.json", @@ -25,6 +37,16 @@ imageset("consent_illustration") { ] } +imageset("legacy_consent_view_controller") { + sources = [ + "legacy_consent_view_controller.imageset/Contents.json", + "legacy_consent_view_controller.imageset/promo-passwords_in_other_apps-dark@2x.png", + "legacy_consent_view_controller.imageset/promo-passwords_in_other_apps-dark@3x.png", + "legacy_consent_view_controller.imageset/promo-passwords_in_other_apps-light@2x.png", + "legacy_consent_view_controller.imageset/promo-passwords_in_other_apps-light@3x.png", + ] +} + imageset("empty_credentials_illustration") { sources = [ "empty_credentials_illustration.imageset/Contents.json", diff --git a/chromium/ios/chrome/search_widget_extension/BUILD.gn b/chromium/ios/chrome/search_widget_extension/BUILD.gn index b91eed7db64..db5938dbac4 100644 --- a/chromium/ios/chrome/search_widget_extension/BUILD.gn +++ b/chromium/ios/chrome/search_widget_extension/BUILD.gn @@ -20,11 +20,6 @@ assert( tweak_info_plist("tweak_info_plist") { info_plist = "Info.plist" - - # TODO(crbug.com/1140474): Remove once iOS 14.2 reaches mass adoption. - if (ios_lock_to_version != "") { - args = [ "--lock-to-version=$ios_lock_to_version" ] - } } compile_entitlements("entitlements") { @@ -78,6 +73,7 @@ source_set("search_widget") { "//ios/chrome/common/crash_report", "//ios/chrome/common/ui/elements", "//ios/chrome/common/ui/util", + "//ios/chrome/common/ui/util:image_util", ] frameworks = [ diff --git a/chromium/ios/chrome/share_extension/BUILD.gn b/chromium/ios/chrome/share_extension/BUILD.gn index 50bf0eca927..22e327a5231 100644 --- a/chromium/ios/chrome/share_extension/BUILD.gn +++ b/chromium/ios/chrome/share_extension/BUILD.gn @@ -28,11 +28,6 @@ extension_repack_all_locales("packed_resources") { tweak_info_plist("tweak_info_plist") { info_plist = "Info.plist" - - # TODO(crbug.com/1140474): Remove once iOS 14.2 reaches mass adoption. - if (ios_lock_to_version != "") { - args = [ "--lock-to-version=$ios_lock_to_version" ] - } } compile_entitlements("entitlements") { diff --git a/chromium/ios/chrome/test/BUILD.gn b/chromium/ios/chrome/test/BUILD.gn index 748d7d6f22a..4752886dc32 100644 --- a/chromium/ios/chrome/test/BUILD.gn +++ b/chromium/ios/chrome/test/BUILD.gn @@ -14,12 +14,18 @@ import("//third_party/protobuf/proto_library.gni") group("all_tests") { testonly = true deps = [ + ":all_fuzzer_tests", ":ios_chrome_unittests", "//ios/chrome/test/xcuitest:ios_chrome_device_check_xcuitests_module", "//ios/chrome/test/xcuitest:ios_chrome_xcuitests", ] } +group("all_fuzzer_tests") { + testonly = true + deps = [ "//ios/chrome/browser/crash_report:crashpad_fuzzer_tests" ] +} + source_set("test_support") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -70,7 +76,6 @@ source_set("test_support") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -117,6 +122,7 @@ source_set("ios_chrome_unit_test_suite") { "//ios/chrome/browser:chrome_paths", "//ios/chrome/browser:chrome_url_constants", "//ios/chrome/browser/browser_state:browser_state_impl", + "//ios/chrome/browser/web/web_performance_metrics:unit_tests", "//ios/chrome/test:test_support", "//ios/components/webui:url_constants", "//ios/public/provider/chrome/browser", @@ -189,7 +195,6 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/favicon:unit_tests", "//ios/chrome/browser/find_in_page:unit_tests", "//ios/chrome/browser/flags:unit_tests", - "//ios/chrome/browser/geolocation:unit_tests", "//ios/chrome/browser/history:unit_tests", "//ios/chrome/browser/infobars:unit_tests", "//ios/chrome/browser/infobars/overlays:unit_tests", @@ -227,6 +232,7 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/search_engines:unit_tests", "//ios/chrome/browser/send_tab_to_self:unit_tests", "//ios/chrome/browser/sessions:unit_tests", + "//ios/chrome/browser/signin:signin_util_internal_unit_tests", "//ios/chrome/browser/signin:unit_tests", "//ios/chrome/browser/snapshots:unit_tests", "//ios/chrome/browser/ssl:unit_tests", @@ -245,8 +251,10 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/ui/authentication/signin:unit_tests", "//ios/chrome/browser/ui/authentication/signin/add_account_signin:unit_tests", "//ios/chrome/browser/ui/authentication/signin/advanced_settings_signin:unit_tests", + "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin:unit_tests", "//ios/chrome/browser/ui/authentication/signin/trusted_vault_reauthentication:unit_tests", "//ios/chrome/browser/ui/authentication/signin/user_signin:unit_tests", + "//ios/chrome/browser/ui/authentication/signin_sync:unit_tests", "//ios/chrome/browser/ui/authentication/unified_consent:unit_tests", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:unit_tests", "//ios/chrome/browser/ui/autofill/cells:unit_tests", @@ -318,13 +326,16 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/ui/safe_mode:unit_tests", "//ios/chrome/browser/ui/settings:unit_tests", "//ios/chrome/browser/ui/settings/autofill:unit_tests", + "//ios/chrome/browser/ui/settings/bandwidth:unit_tests", "//ios/chrome/browser/ui/settings/cells:unit_tests", "//ios/chrome/browser/ui/settings/clear_browsing_data:unit_tests", + "//ios/chrome/browser/ui/settings/content_settings:unit_tests", "//ios/chrome/browser/ui/settings/default_browser:unit_tests", "//ios/chrome/browser/ui/settings/google_services:unit_tests", "//ios/chrome/browser/ui/settings/language:unit_tests", "//ios/chrome/browser/ui/settings/password:unit_tests", "//ios/chrome/browser/ui/settings/password/password_details:unit_tests", + "//ios/chrome/browser/ui/settings/password/passwords_in_other_apps:unit_tests", "//ios/chrome/browser/ui/settings/privacy:unit_tests", "//ios/chrome/browser/ui/settings/safety_check:unit_tests", "//ios/chrome/browser/ui/settings/sync:unit_tests", @@ -332,6 +343,7 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/ui/settings/utils:unit_tests", "//ios/chrome/browser/ui/sharing:unit_tests", "//ios/chrome/browser/ui/side_swipe:unit_tests", + "//ios/chrome/browser/ui/start_surface:unit_tests", "//ios/chrome/browser/ui/tab_switcher/tab_grid:unit_tests", "//ios/chrome/browser/ui/tab_switcher/tab_grid/grid:unit_tests", "//ios/chrome/browser/ui/table_view:unit_tests", diff --git a/chromium/ios/chrome/test/app/BUILD.gn b/chromium/ios/chrome/test/app/BUILD.gn index 9d265c99473..9ab213fa27a 100644 --- a/chromium/ios/chrome/test/app/BUILD.gn +++ b/chromium/ios/chrome/test/app/BUILD.gn @@ -71,6 +71,7 @@ source_set("test_support") { "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/browser_view", "//ios/chrome/browser/ui/commands", diff --git a/chromium/ios/chrome/test/earl_grey/BUILD.gn b/chromium/ios/chrome/test/earl_grey/BUILD.gn index ebc628c02e8..1b81cd1c755 100644 --- a/chromium/ios/chrome/test/earl_grey/BUILD.gn +++ b/chromium/ios/chrome/test/earl_grey/BUILD.gn @@ -5,7 +5,6 @@ # This target is only used in routinely device checks. Thus, the target name is # different from other EG2 tests. source_set("device_check_eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -41,7 +40,6 @@ source_set("hooks") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -120,14 +118,14 @@ source_set("eg_app_support+eg2") { "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/ntp", - "//ios/chrome/browser/ui/omnibox:app_support+eg2", + "//ios/chrome/browser/ui/omnibox:eg_app_support+eg2", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/omnibox/keyboard_assist", - "//ios/chrome/browser/ui/passwords:app_support+eg2", + "//ios/chrome/browser/ui/passwords:eg_app_support+eg2", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/qr_scanner:eg_app_support+eg2", "//ios/chrome/browser/ui/reading_list:eg_app_support+eg2", - "//ios/chrome/browser/ui/recent_tabs:app_support+eg2", + "//ios/chrome/browser/ui/recent_tabs:eg_app_support+eg2", "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", "//ios/chrome/browser/ui/safe_mode", "//ios/chrome/browser/ui/safe_mode:eg_app_support+eg2", @@ -140,11 +138,13 @@ source_set("eg_app_support+eg2") { "//ios/chrome/browser/ui/settings/autofill:constants", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/clear_browsing_data", + "//ios/chrome/browser/ui/settings/content_settings:eg_app_support+eg2", "//ios/chrome/browser/ui/settings/google_services:constants", "//ios/chrome/browser/ui/settings/google_services:eg_app_support+eg2", "//ios/chrome/browser/ui/settings/language:eg_app_support+eg2", "//ios/chrome/browser/ui/settings/password:eg_app_support+eg2", "//ios/chrome/browser/ui/settings/password:password_constants", + "//ios/chrome/browser/ui/settings/password/passwords_in_other_apps:eg_app_support+eg2", "//ios/chrome/browser/ui/settings/privacy:privacy_ui", "//ios/chrome/browser/ui/settings/sync", "//ios/chrome/browser/ui/tab_switcher/tab_grid:features", @@ -164,6 +164,7 @@ source_set("eg_app_support+eg2") { "//ios/chrome/browser/web_state_list", "//ios/chrome/test/app:test_support", "//ios/chrome/test/variations_smoke_test:eg_app_support+eg2", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/testing:block_swizzler", "//ios/testing:hardware_keyboarr_support", "//ios/testing:nserror_support", @@ -190,7 +191,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -203,22 +203,27 @@ source_set("eg_test_support+eg2") { "chrome_actions.h", "chrome_actions.mm", "chrome_actions_app_interface.h", + "chrome_actions_app_interface_stub.mm", "chrome_earl_grey.h", "chrome_earl_grey.mm", "chrome_earl_grey_app_interface.h", + "chrome_earl_grey_app_interface_stub.mm", "chrome_earl_grey_ui.h", "chrome_earl_grey_ui.mm", "chrome_matchers.h", "chrome_matchers.mm", "chrome_matchers_app_interface.h", + "chrome_matchers_app_interface_stub.mm", "chrome_test_case.h", "chrome_test_case.mm", "chrome_test_case_app_interface.h", + "chrome_test_case_app_interface_stub.mm", "chrome_xcui_actions.h", "chrome_xcui_actions.mm", "earl_grey_scoped_block_swizzler.h", "earl_grey_scoped_block_swizzler.mm", "earl_grey_scoped_block_swizzler_app_interface.h", + "earl_grey_scoped_block_swizzler_app_interface_stub.mm", "scoped_block_popups_pref.h", "scoped_block_popups_pref.mm", "web_http_server_chrome_test_case.h", @@ -244,12 +249,14 @@ source_set("eg_test_support+eg2") { "//ios/chrome/browser/ui/tab_switcher/tab_grid/grid:grid_ui_constants", "//ios/chrome/browser/ui/table_view:constants", "//ios/chrome/browser/ui/toolbar:eg_test_support+eg2", + "//ios/chrome/browser/web:feature_flags", "//ios/chrome/test:eg_test_support+eg2", "//ios/testing:http_server_bundle_data", "//ios/testing:nserror_support", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", "//ios/third_party/gtx:gtx+link", + "//ios/web/common:features", "//ios/web/public/test:element_selector", "//ios/web/public/test/http_server", "//net:test_support", @@ -262,7 +269,6 @@ source_set("eg_test_support+eg2") { } source_set("chrome_egtest_bundle_main+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/test/earl_grey2/BUILD.gn b/chromium/ios/chrome/test/earl_grey2/BUILD.gn index 739231fefaa..806cb45c48d 100644 --- a/chromium/ios/chrome/test/earl_grey2/BUILD.gn +++ b/chromium/ios/chrome/test/earl_grey2/BUILD.gn @@ -125,9 +125,11 @@ chrome_ios_eg2_test("ios_chrome_settings_eg2tests_module") { "//ios/chrome/browser/ui/settings:eg2_tests", "//ios/chrome/browser/ui/settings/autofill:eg2_tests", "//ios/chrome/browser/ui/settings/clear_browsing_data:eg2_tests", + "//ios/chrome/browser/ui/settings/content_settings:eg2_tests", "//ios/chrome/browser/ui/settings/google_services:eg2_tests", "//ios/chrome/browser/ui/settings/language:eg2_tests", "//ios/chrome/browser/ui/settings/password:eg2_tests", + "//ios/chrome/browser/ui/settings/password/passwords_in_other_apps:eg2_tests", "//ios/chrome/browser/ui/settings/sync:eg2_tests", ] data_deps = [ ":ios_chrome_eg2tests" ] @@ -140,6 +142,7 @@ chrome_ios_eg2_test("ios_chrome_signin_eg2tests_module") { "//ios/chrome/browser/ui/authentication/signin:eg2_tests", "//ios/chrome/browser/ui/authentication/signin/advanced_settings_signin:eg2_tests", "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin:eg2_tests", + "//ios/chrome/browser/ui/authentication/signin/forced_signin:eg2_tests", "//ios/chrome/browser/ui/authentication/signin/user_signin:eg2_tests", ] data_deps = [ ":ios_chrome_eg2tests" ] @@ -197,7 +200,10 @@ chrome_ios_eg2_test("ios_chrome_variations_smoke_eg2tests_module") { _variations_seed_abs_path = "//ios/chrome/test/data/variations/variations_seed_ios.json" - data = [ _variations_seed_abs_path ] + data = [ + "//testing/scripts/variations_seed_access_helper.py", + _variations_seed_abs_path, + ] executable_args = [ "--variations-seed-path", @@ -214,7 +220,6 @@ chrome_ios_eg2_test("ios_chrome_web_eg2tests_module") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/test/fakes/BUILD.gn b/chromium/ios/chrome/test/fakes/BUILD.gn index 1d95ef9f2e8..d9e4615d9ee 100644 --- a/chromium/ios/chrome/test/fakes/BUILD.gn +++ b/chromium/ios/chrome/test/fakes/BUILD.gn @@ -21,6 +21,8 @@ source_set("fakes") { "fake_overscroll_actions_controller_delegate.mm", "fake_pass_kit_tab_helper_delegate.h", "fake_pass_kit_tab_helper_delegate.mm", + "fake_password_auto_fill_status_manager.h", + "fake_password_auto_fill_status_manager.mm", "fake_store_kit_launcher.h", "fake_store_kit_launcher.mm", "fake_ui_view_controller.h", @@ -39,6 +41,7 @@ source_set("fakes") { "//ios/chrome/browser/ui/download", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/presenters", + "//ios/chrome/browser/ui/settings/utils", "//ios/chrome/browser/web:web_internal", "//ios/chrome/browser/web_state_list", "//ios/web/public", diff --git a/chromium/ios/chrome/test/variations_smoke_test/BUILD.gn b/chromium/ios/chrome/test/variations_smoke_test/BUILD.gn index 31979474f26..f202a1868eb 100644 --- a/chromium/ios/chrome/test/variations_smoke_test/BUILD.gn +++ b/chromium/ios/chrome/test/variations_smoke_test/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -22,7 +21,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -41,11 +39,14 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "variations_smoke_test_app_interface.h" ] + sources = [ + "variations_smoke_test_app_interface.h", + "variations_smoke_test_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } diff --git a/chromium/ios/chrome/widget_kit_extension/BUILD.gn b/chromium/ios/chrome/widget_kit_extension/BUILD.gn index 3afe5303b54..01e6d323582 100644 --- a/chromium/ios/chrome/widget_kit_extension/BUILD.gn +++ b/chromium/ios/chrome/widget_kit_extension/BUILD.gn @@ -14,11 +14,6 @@ import("//ios/public/provider/chrome/browser/build_config.gni") tweak_info_plist("tweak_info_plist") { info_plist = "Info.plist" - - # TODO(crbug.com/1140474): Remove once iOS 14.2 reaches mass adoption. - if (ios_lock_to_version != "") { - args = [ "--lock-to-version=$ios_lock_to_version" ] - } } compile_entitlements("entitlements") { diff --git a/chromium/ios/components/security_interstitials/legacy_tls/BUILD.gn b/chromium/ios/components/security_interstitials/legacy_tls/BUILD.gn deleted file mode 100644 index b6c62338ff8..00000000000 --- a/chromium/ios/components/security_interstitials/legacy_tls/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2020 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. - -source_set("legacy_tls") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "legacy_tls_blocking_page.h", - "legacy_tls_blocking_page.mm", - "legacy_tls_controller_client.h", - "legacy_tls_controller_client.mm", - "legacy_tls_tab_allow_list.h", - "legacy_tls_tab_allow_list.mm", - ] - deps = [ - "//base", - "//components/security_interstitials/core", - "//components/strings:components_strings_grit", - "//ios/components/security_interstitials", - "//ios/web/public", - "//net", - "//ui/base", - ] -} diff --git a/chromium/ios/public/provider/chrome/browser/BUILD.gn b/chromium/ios/public/provider/chrome/browser/BUILD.gn index d155c43538c..ce779548b5d 100644 --- a/chromium/ios/public/provider/chrome/browser/BUILD.gn +++ b/chromium/ios/public/provider/chrome/browser/BUILD.gn @@ -45,6 +45,7 @@ group("provider_api") { "//ios/public/provider/chrome/browser/modals:modals_api", "//ios/public/provider/chrome/browser/omaha:omaha_api", "//ios/public/provider/chrome/browser/overrides:overrides_api", + "//ios/public/provider/chrome/browser/password_auto_fill:password_auto_fill_api", "//ios/public/provider/chrome/browser/risk_data:risk_data_api", "//ios/public/provider/chrome/browser/signin:signin_error_api", "//ios/public/provider/chrome/browser/signin:signin_resources_api", @@ -97,6 +98,7 @@ group("test_providers") { "//ios/public/provider/chrome/browser/modals:test_modals", "//ios/public/provider/chrome/browser/omaha:test_omaha", "//ios/public/provider/chrome/browser/overrides:test_overrides", + "//ios/public/provider/chrome/browser/password_auto_fill:test_password_auto_fill", "//ios/public/provider/chrome/browser/risk_data:test_risk_data", "//ios/public/provider/chrome/browser/signin:test_signin_error", "//ios/public/provider/chrome/browser/signin:test_signin_resources", diff --git a/chromium/ios/public/provider/chrome/browser/password_auto_fill/BUILD.gn b/chromium/ios/public/provider/chrome/browser/password_auto_fill/BUILD.gn new file mode 100644 index 00000000000..1755e23df01 --- /dev/null +++ b/chromium/ios/public/provider/chrome/browser/password_auto_fill/BUILD.gn @@ -0,0 +1,15 @@ +# Copyright 2021 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. + +source_set("password_auto_fill_api") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ "password_auto_fill_api.h" ] + frameworks = [ "Foundation.framework" ] +} + +source_set("test_password_auto_fill") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ "test_password_auto_fill.mm" ] + deps = [ ":password_auto_fill_api" ] +} diff --git a/chromium/ios/showcase/badges/BUILD.gn b/chromium/ios/showcase/badges/BUILD.gn index c2b327ec8b3..3c31d3c9312 100644 --- a/chromium/ios/showcase/badges/BUILD.gn +++ b/chromium/ios/showcase/badges/BUILD.gn @@ -30,7 +30,6 @@ source_set("badges_constants") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/showcase/bubble/BUILD.gn b/chromium/ios/showcase/bubble/BUILD.gn index 89ae640dd01..462bc0893d2 100644 --- a/chromium/ios/showcase/bubble/BUILD.gn +++ b/chromium/ios/showcase/bubble/BUILD.gn @@ -16,7 +16,6 @@ source_set("bubble") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/showcase/core/BUILD.gn b/chromium/ios/showcase/core/BUILD.gn index f8d356d6640..bc91f5438ea 100644 --- a/chromium/ios/showcase/core/BUILD.gn +++ b/chromium/ios/showcase/core/BUILD.gn @@ -72,7 +72,6 @@ source_set("main") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/showcase/credential_provider/BUILD.gn b/chromium/ios/showcase/credential_provider/BUILD.gn index 4363bbb11b4..00664b933c0 100644 --- a/chromium/ios/showcase/credential_provider/BUILD.gn +++ b/chromium/ios/showcase/credential_provider/BUILD.gn @@ -22,7 +22,6 @@ source_set("credential_provider") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -32,6 +31,7 @@ source_set("eg2_tests") { deps = [ "//base", "//ios/chrome/common/ui/confirmation_alert", + "//ios/chrome/common/ui/promo_style:constants", "//ios/showcase/test:eg2_test", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", diff --git a/chromium/ios/showcase/default_browser/BUILD.gn b/chromium/ios/showcase/default_browser/BUILD.gn index ed8e5bb2a01..af780f4bf54 100644 --- a/chromium/ios/showcase/default_browser/BUILD.gn +++ b/chromium/ios/showcase/default_browser/BUILD.gn @@ -17,7 +17,6 @@ source_set("default_browser") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/showcase/discover_feed_preview/BUILD.gn b/chromium/ios/showcase/discover_feed_preview/BUILD.gn index 6897d024c15..657a3ca9cb2 100644 --- a/chromium/ios/showcase/discover_feed_preview/BUILD.gn +++ b/chromium/ios/showcase/discover_feed_preview/BUILD.gn @@ -17,7 +17,6 @@ source_set("discover_feed_preview") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/showcase/infobars/BUILD.gn b/chromium/ios/showcase/infobars/BUILD.gn index 28bad84cc86..d3ad2fbb0bd 100644 --- a/chromium/ios/showcase/infobars/BUILD.gn +++ b/chromium/ios/showcase/infobars/BUILD.gn @@ -39,7 +39,6 @@ source_set("constants") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/showcase/test/BUILD.gn b/chromium/ios/showcase/test/BUILD.gn index bd40ad25067..251cbedbfab 100644 --- a/chromium/ios/showcase/test/BUILD.gn +++ b/chromium/ios/showcase/test/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. source_set("eg2_test") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -27,14 +26,16 @@ source_set("eg2_test") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "showcase_test_case_app_interface.h" ] + sources = [ + "showcase_test_case_app_interface.h", + "showcase_test_case_app_interface_stub.mm", + ] public_deps = [ "//base" ] @@ -52,7 +53,6 @@ source_set("eg_app_support+eg2") { "//build/config/ios:xctest_config", ] testonly = true - defines = [ "CHROME_EARL_GREY_2" ] sources = [ "showcase_test_case_app_interface.h", diff --git a/chromium/ios/showcase/text_badge_view/BUILD.gn b/chromium/ios/showcase/text_badge_view/BUILD.gn index 8eb500f08ff..9dfb0dadb3b 100644 --- a/chromium/ios/showcase/text_badge_view/BUILD.gn +++ b/chromium/ios/showcase/text_badge_view/BUILD.gn @@ -9,7 +9,6 @@ source_set("text_badge_view") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/testing/BUILD.gn b/chromium/ios/testing/BUILD.gn index 1b4fa29712a..37354aa9958 100644 --- a/chromium/ios/testing/BUILD.gn +++ b/chromium/ios/testing/BUILD.gn @@ -149,6 +149,7 @@ bundle_data("http_server_bundle_data") { "data/http_server_files/two_pages.pdf", "data/http_server_files/user_agent_test_page.html", "data/http_server_files/username_password_field_form.html", + "data/http_server_files/vcard.vcf", "data/http_server_files/video_sample.mov", "data/http_server_files/window_close.html", "data/http_server_files/window_location.html", diff --git a/chromium/ios/testing/earl_grey/BUILD.gn b/chromium/ios/testing/earl_grey/BUILD.gn index e2bac320ce9..6f5935bb900 100644 --- a/chromium/ios/testing/earl_grey/BUILD.gn +++ b/chromium/ios/testing/earl_grey/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -28,7 +27,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -41,9 +39,11 @@ source_set("eg_test_support+eg2") { "app_launch_manager.h", "app_launch_manager.mm", "app_launch_manager_app_interface.h", + "app_launch_manager_app_interface_stub.mm", "base_earl_grey_test_case.h", "base_earl_grey_test_case.mm", "base_earl_grey_test_case_app_interface.h", + "base_earl_grey_test_case_app_interface_stub.mm", "base_eg_test_helper_impl.h", "base_eg_test_helper_impl.mm", "coverage_utils.h", diff --git a/chromium/ios/third_party/earl_grey2/BUILD.gn b/chromium/ios/third_party/earl_grey2/BUILD.gn index 96d708d961a..5da8cf74c39 100644 --- a/chromium/ios/third_party/earl_grey2/BUILD.gn +++ b/chromium/ios/third_party/earl_grey2/BUILD.gn @@ -508,13 +508,13 @@ source_set("test_lib") { deps = [ ":app_framework_shared_headers", ":ui_lib_shared_headers", - "//build/config/ios:xctest", "//ios/third_party/edo", ] public_deps = [ ":common_lib", ":test_lib_shared_headers", + "//build/config/ios:xctest", ] frameworks = [ diff --git a/chromium/ios/third_party/material_components_ios/BUILD.gn b/chromium/ios/third_party/material_components_ios/BUILD.gn index eb6942ae3f3..a6821c3808c 100644 --- a/chromium/ios/third_party/material_components_ios/BUILD.gn +++ b/chromium/ios/third_party/material_components_ios/BUILD.gn @@ -68,8 +68,6 @@ _mdc_public_headers = [ "src/components/BottomNavigation/src/MaterialBottomNavigation+BottomNavigationController.h", "src/components/BottomNavigation/src/MaterialBottomNavigation.h", "src/components/BottomNavigation/src/PerformantShadowMigration/MDCBottomNavigationBar+ShadowsPrivate.h", - "src/components/BottomNavigation/src/Theming/MDCBottomNavigationBar+MaterialTheming.h", - "src/components/BottomNavigation/src/Theming/MaterialBottomNavigation+Theming.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationBar+Private.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationItemBadge.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationItemView.h", @@ -83,8 +81,6 @@ _mdc_public_headers = [ "src/components/BottomSheet/src/MDCBottomSheetTransitionControllerDelegate.h", "src/components/BottomSheet/src/MDCSheetState.h", "src/components/BottomSheet/src/MaterialBottomSheet.h", - "src/components/BottomSheet/src/ShapeThemer/MDCBottomSheetControllerShapeThemer.h", - "src/components/BottomSheet/src/ShapeThemer/MaterialBottomSheet+ShapeThemer.h", "src/components/BottomSheet/src/UIViewController+MaterialBottomSheet.h", "src/components/BottomSheet/src/private/MDCDraggableView.h", "src/components/BottomSheet/src/private/MDCDraggableViewDelegate.h", @@ -246,6 +242,7 @@ _mdc_public_headers = [ "src/components/List/src/Theming/MDCSelfSizingStereoCell+MaterialTheming.h", "src/components/List/src/Theming/MaterialList+Theming.h", "src/components/List/src/private/MDCSelfSizingStereoCellLayout.h", + "src/components/MinimumOS/src/MDCMinimumOS.h", "src/components/NavigationBar/src/ColorThemer/MDCNavigationBarColorThemer.h", "src/components/NavigationBar/src/ColorThemer/MaterialNavigationBar+ColorThemer.h", "src/components/NavigationBar/src/MDCNavigationBar.h", @@ -581,10 +578,8 @@ _mdc_include_dirs = [ "src/components/BottomAppBar/src/private", "src/components/BottomNavigation/src", "src/components/BottomNavigation/src/PerformantShadowMigration", - "src/components/BottomNavigation/src/Theming", "src/components/BottomNavigation/src/private", "src/components/BottomSheet/src", - "src/components/BottomSheet/src/ShapeThemer", "src/components/BottomSheet/src/private", "src/components/ButtonBar/src", "src/components/ButtonBar/src/private", @@ -626,6 +621,7 @@ _mdc_include_dirs = [ "src/components/List/src", "src/components/List/src/Theming", "src/components/List/src/private", + "src/components/MinimumOS/src", "src/components/NavigationBar/src", "src/components/NavigationBar/src/ColorThemer", "src/components/NavigationBar/src/TypographyThemer", @@ -803,9 +799,6 @@ _mdc_sources = [ "src/components/BottomNavigation/src/MaterialBottomNavigation+BottomNavigationController.h", "src/components/BottomNavigation/src/MaterialBottomNavigation.h", "src/components/BottomNavigation/src/PerformantShadowMigration/MDCBottomNavigationBar+ShadowsPrivate.h", - "src/components/BottomNavigation/src/Theming/MDCBottomNavigationBar+MaterialTheming.h", - "src/components/BottomNavigation/src/Theming/MDCBottomNavigationBar+MaterialTheming.m", - "src/components/BottomNavigation/src/Theming/MaterialBottomNavigation+Theming.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationBar+Private.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationItemBadge.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationItemBadge.m", @@ -826,9 +819,6 @@ _mdc_sources = [ "src/components/BottomSheet/src/MDCBottomSheetTransitionControllerDelegate.h", "src/components/BottomSheet/src/MDCSheetState.h", "src/components/BottomSheet/src/MaterialBottomSheet.h", - "src/components/BottomSheet/src/ShapeThemer/MDCBottomSheetControllerShapeThemer.h", - "src/components/BottomSheet/src/ShapeThemer/MDCBottomSheetControllerShapeThemer.m", - "src/components/BottomSheet/src/ShapeThemer/MaterialBottomSheet+ShapeThemer.h", "src/components/BottomSheet/src/UIViewController+MaterialBottomSheet.h", "src/components/BottomSheet/src/UIViewController+MaterialBottomSheet.m", "src/components/BottomSheet/src/private/MDCDraggableView.h", @@ -1076,6 +1066,7 @@ _mdc_sources = [ "src/components/List/src/Theming/MaterialList+Theming.h", "src/components/List/src/private/MDCSelfSizingStereoCellLayout.h", "src/components/List/src/private/MDCSelfSizingStereoCellLayout.m", + "src/components/MinimumOS/src/MDCMinimumOS.h", "src/components/NavigationBar/src/ColorThemer/MDCNavigationBarColorThemer.h", "src/components/NavigationBar/src/ColorThemer/MDCNavigationBarColorThemer.m", "src/components/NavigationBar/src/ColorThemer/MaterialNavigationBar+ColorThemer.h", @@ -1593,7 +1584,6 @@ ios_framework_bundle("material_components_ios") { "CoreText.framework", "QuartzCore.framework", "UIKit.framework", - "WebKit.framework", ] deps = [ @@ -1603,6 +1593,7 @@ ios_framework_bundle("material_components_ios") { "//ios/third_party/material_text_accessibility_ios", "//ios/third_party/motion_animator_objc", "//ios/third_party/motion_transitioning_objc", + "//ios/third_party/webkit", ] configs -= [ diff --git a/chromium/ios/third_party/webkit/BUILD.gn b/chromium/ios/third_party/webkit/BUILD.gn index 7d9f9672420..42dd2e7ae28 100644 --- a/chromium/ios/third_party/webkit/BUILD.gn +++ b/chromium/ios/third_party/webkit/BUILD.gn @@ -102,8 +102,6 @@ if (_build_ios_webkit) { "$_webkit_ios_out_product_dir/WebKitTestRunnerApp.app/Frameworks/libclang_rt.asan_iossim_dynamic.dylib", "$_webkit_ios_out_product_dir/com.apple.WebKit.Networking.xpc", "$_webkit_ios_out_product_dir/com.apple.WebKit.Networking.xpc/com.apple.WebKit.Networking.Development", - "$_webkit_ios_out_product_dir/com.apple.WebKit.Plugin.64.xpc", - "$_webkit_ios_out_product_dir/com.apple.WebKit.Plugin.64.xpc/com.apple.WebKit.Plugin.64.Development", "$_webkit_ios_out_product_dir/com.apple.WebKit.WebContent.Development.xpc", "$_webkit_ios_out_product_dir/com.apple.WebKit.WebContent.Development.xpc/com.apple.WebKit.WebContent.Development.Development", "$_webkit_ios_out_product_dir/com.apple.WebKit.WebContent.xpc", @@ -127,7 +125,6 @@ if (_build_ios_webkit) { "$_webkit_ios_out_product_dir/WebKitLegacy.framework", "$_webkit_ios_out_product_dir/WebKitTestRunnerApp.app/Frameworks/libclang_rt.asan_iossim_dynamic.dylib", "$_webkit_ios_out_product_dir/com.apple.WebKit.Networking.xpc", - "$_webkit_ios_out_product_dir/com.apple.WebKit.Plugin.64.xpc", "$_webkit_ios_out_product_dir/com.apple.WebKit.WebContent.Development.xpc", "$_webkit_ios_out_product_dir/com.apple.WebKit.WebContent.xpc", ] diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn index ccce2dd7a89..cc9ec299fba 100644 --- a/chromium/ios/web/BUILD.gn +++ b/chromium/ios/web/BUILD.gn @@ -40,6 +40,7 @@ source_set("web") { ":navigation_resources", ":plugin_placeholder_js", ":resources", + ":share_workaround_js", ":threads", "//base", "//components/leveldb_proto", @@ -105,7 +106,6 @@ source_set("core") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -278,6 +278,7 @@ source_set("ios_web_navigation_unittests") { "navigation/navigation_manager_util_unittest.mm", "navigation/nscoder_util_unittest.mm", "navigation/session_storage_builder_unittest.mm", + "navigation/synthesized_session_restore_unittest.mm", "navigation/wk_back_forward_list_item_holder_unittest.mm", "navigation/wk_navigation_action_policy_util_unittest.mm", "navigation/wk_navigation_action_util_unittest.mm", @@ -594,7 +595,6 @@ test("ios_web_inttests") { ] sources = [ "browser_state_web_view_partition_inttest.mm", - "cookie_blocking_inttest.mm", "find_in_page/find_in_page_manager_inttest.mm", "navigation/crw_error_page_helper_inttest.mm", "navigation/crw_wk_navigation_handler_inttest.mm", @@ -618,17 +618,6 @@ test("ios_web_inttests") { assert_no_deps = ios_assert_no_deps } -js_compile_bundle("all_frames_web_bundle") { - visibility = [ ":js_resources" ] - closure_entry_point = "__crWeb.allFramesWebBundle" - - sources = [ - "web_state/js/resources/all_frames_web_bundle.js", - "web_state/js/resources/cookie.js", - "web_state/js/resources/share_workaround.js", - ] -} - js_compile_bundle("plugin_placeholder_js") { visibility = [ ":web" ] closure_entry_point = "__crWeb.pluginPlaceholder" @@ -636,6 +625,13 @@ js_compile_bundle("plugin_placeholder_js") { sources = [ "web_state/js/resources/plugin_placeholder.js" ] } +js_compile_bundle("share_workaround_js") { + visibility = [ ":web" ] + closure_entry_point = "__crWeb.shareWorkaround" + + sources = [ "web_state/js/resources/share_workaround.js" ] +} + js_compile_bundle("base_js") { visibility = [ ":web" ] closure_entry_point = "__crWeb.base" @@ -658,8 +654,6 @@ js_compile_bundle("message_js") { } js_compile_checked("js_resources") { - public_deps = [ ":all_frames_web_bundle" ] - js_modules = [ "//ios/web/web_state/js/resources/base.js", "//ios/web/web_state/js/resources/common.js", diff --git a/chromium/ios/web/download/BUILD.gn b/chromium/ios/web/download/BUILD.gn index 3df4bc173ee..f9bf4b4d6e9 100644 --- a/chromium/ios/web/download/BUILD.gn +++ b/chromium/ios/web/download/BUILD.gn @@ -19,6 +19,12 @@ source_set("download") { sources = [ "download_controller_impl.h", "download_controller_impl.mm", + "download_native_task_bridge.h", + "download_native_task_bridge.mm", + "download_native_task_impl.h", + "download_native_task_impl.mm", + "download_session_task_impl.h", + "download_session_task_impl.mm", "download_task_impl.h", "download_task_impl.mm", ] @@ -68,7 +74,9 @@ source_set("download_unittests") { sources = [ "download_controller_impl_unittest.mm", + "download_native_task_impl_unittest.mm", "download_session_cookie_storage_unittest.mm", + "download_session_task_impl_unittest.mm", "download_task_impl_unittest.mm", ] } diff --git a/chromium/ios/web/navigation/BUILD.gn b/chromium/ios/web/navigation/BUILD.gn index 3a0246250ce..f61ddef83b5 100644 --- a/chromium/ios/web/navigation/BUILD.gn +++ b/chromium/ios/web/navigation/BUILD.gn @@ -97,6 +97,10 @@ source_set("core") { "navigation_manager_delegate.h", "navigation_manager_impl.h", "navigation_manager_impl.mm", + "synthesized_history_entry_data.h", + "synthesized_history_entry_data.mm", + "synthesized_session_restore.h", + "synthesized_session_restore.mm", "time_smoother.cc", "time_smoother.h", ] diff --git a/chromium/ios/web/public/BUILD.gn b/chromium/ios/web/public/BUILD.gn index 5acf350b4dd..2ef525c4539 100644 --- a/chromium/ios/web/public/BUILD.gn +++ b/chromium/ios/web/public/BUILD.gn @@ -7,7 +7,6 @@ import("//ios/build/config.gni") source_set("public") { public_deps = [ ":web_state_observer", - "//ios/web/public/browsing_data", "//ios/web/public/favicon", "//ios/web/public/navigation", "//ios/web/public/thread", diff --git a/chromium/ios/web/public/browsing_data/BUILD.gn b/chromium/ios/web/public/browsing_data/BUILD.gn index 2ee6ef21e98..b64bd947690 100644 --- a/chromium/ios/web/public/browsing_data/BUILD.gn +++ b/chromium/ios/web/public/browsing_data/BUILD.gn @@ -7,11 +7,8 @@ import("//ios/build/config.gni") source_set("browsing_data") { configs += [ "//build/config/compiler:enable_arc" ] - deps = [ "//base" ] - sources = [ "browsing_data_removing_util.h", - "cookie_blocking_mode.h", "system_cookie_store_util.h", ] } diff --git a/chromium/ios/web/public/js_messaging/fuzzer_support/BUILD.gn b/chromium/ios/web/public/js_messaging/fuzzer_support/BUILD.gn new file mode 100644 index 00000000000..fc01f315d7b --- /dev/null +++ b/chromium/ios/web/public/js_messaging/fuzzer_support/BUILD.gn @@ -0,0 +1,26 @@ +# Copyright 2021 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("//third_party/protobuf/proto_library.gni") + +source_set("fuzzer_support") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "fuzzer_env_with_java_script_feature.h", + "fuzzer_env_with_java_script_feature.mm", + "fuzzer_util.cc", + "fuzzer_util.h", + ] + deps = [ + ":js_message_proto", + "//base", + "//ios/web/public/js_messaging", + "//ios/web/public/test:fuzzer_support", + ] +} + +proto_library("js_message_proto") { + sources = [ "js_message.proto" ] +} diff --git a/chromium/ios/web/public/test/BUILD.gn b/chromium/ios/web/public/test/BUILD.gn index 176e323c06b..c886b3b5208 100644 --- a/chromium/ios/web/public/test/BUILD.gn +++ b/chromium/ios/web/public/test/BUILD.gn @@ -34,6 +34,8 @@ source_set("test") { "test_redirect_observer.h", "test_redirect_observer.mm", "test_web_thread.h", + "web_state_test_util.h", + "web_state_test_util.mm", "web_task_environment.h", "web_test.h", "web_test.mm", @@ -96,3 +98,19 @@ source_set("util") { "web_view_interaction_test_util.mm", ] } + +source_set("fuzzer_support") { + testonly = true + sources = [ + "fuzzer_env_with_web_state.h", + "fuzzer_env_with_web_state.mm", + ] + deps = [ + ":test", + "//base", + "//base/test:test_support", + "//ios/web/public", + "//ios/web/public/test/fakes", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/web/public/text_fragments/BUILD.gn b/chromium/ios/web/public/text_fragments/BUILD.gn index a28105b9d6a..5083e89e895 100644 --- a/chromium/ios/web/public/text_fragments/BUILD.gn +++ b/chromium/ios/web/public/text_fragments/BUILD.gn @@ -3,10 +3,9 @@ # found in the LICENSE file. source_set("text_fragments") { - deps = [ - "//base", - "//ios/web/public/", - ] + deps = [ "//base" ] + + public_deps = [ "//ios/web/public/" ] sources = [ "text_fragments_manager.h" ] diff --git a/chromium/ios/web/shell/test/BUILD.gn b/chromium/ios/web/shell/test/BUILD.gn index 83b74e9fddb..b272fdcd756 100644 --- a/chromium/ios/web/shell/test/BUILD.gn +++ b/chromium/ios/web/shell/test/BUILD.gn @@ -17,7 +17,6 @@ group("all_tests") { # EG2 targets. source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -56,7 +55,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -67,12 +65,15 @@ source_set("eg_test_support+eg2") { "earl_grey/shell_actions.h", "earl_grey/shell_actions.mm", "earl_grey/shell_actions_app_interface.h", + "earl_grey/shell_actions_app_interface_stub.mm", "earl_grey/shell_earl_grey.h", "earl_grey/shell_earl_grey.mm", "earl_grey/shell_earl_grey_app_interface.h", + "earl_grey/shell_earl_grey_app_interface_stub.mm", "earl_grey/shell_matchers.h", "earl_grey/shell_matchers.mm", "earl_grey/shell_matchers_app_interface.h", + "earl_grey/shell_matchers_app_interface_stub.mm", "earl_grey/web_shell_test_case.h", "earl_grey/web_shell_test_case.mm", ] @@ -91,7 +92,6 @@ source_set("eg_test_support+eg2") { } source_set("eg_tests+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/web/test/fakes/BUILD.gn b/chromium/ios/web/test/fakes/BUILD.gn index 6fa1fcb1252..231db570ea9 100644 --- a/chromium/ios/web/test/fakes/BUILD.gn +++ b/chromium/ios/web/test/fakes/BUILD.gn @@ -9,6 +9,7 @@ source_set("fakes") { deps = [ "//base", "//ios/third_party/webkit", + "//ios/web/download", "//ios/web/js_messaging", "//ios/web/navigation", "//ios/web/navigation:core", @@ -35,6 +36,8 @@ source_set("fakes") { "crw_fake_wk_navigation_action.mm", "fake_java_script_feature.h", "fake_java_script_feature.mm", + "fake_native_task_bridge.h", + "fake_native_task_bridge.mm", "fake_navigation_manager_delegate.h", "fake_navigation_manager_delegate.mm", "fake_web_frame_impl.cc", diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn index f901d33178f..bdfa6cb6937 100644 --- a/chromium/ios/web/web_state/BUILD.gn +++ b/chromium/ios/web/web_state/BUILD.gn @@ -19,6 +19,7 @@ source_set("web_state") { "//ios/web/public", "//ios/web/public/deprecated", "//ios/web/public/js_messaging", + "//ios/web/public/security", "//ios/web/public/session", "//ios/web/public/webui", "//ios/web/security", @@ -40,6 +41,10 @@ source_set("web_state") { "web_state_delegate.mm", "web_state_delegate_bridge.mm", "web_state_impl.mm", + "web_state_impl_realized_web_state.h", + "web_state_impl_realized_web_state.mm", + "web_state_impl_serialized_data.h", + "web_state_impl_serialized_data.mm", "web_state_observer.mm", "web_state_observer_bridge.mm", "web_state_policy_decider.mm", diff --git a/chromium/ios/web/web_state/ui/BUILD.gn b/chromium/ios/web/web_state/ui/BUILD.gn index ff6e1d71ba0..bac0f1673bc 100644 --- a/chromium/ios/web/web_state/ui/BUILD.gn +++ b/chromium/ios/web/web_state/ui/BUILD.gn @@ -57,8 +57,6 @@ source_set("ui") { ] sources = [ - "cookie_blocking_error_logger.h", - "cookie_blocking_error_logger.mm", "crw_swipe_recognizer_provider.h", "crw_touch_tracking_recognizer.mm", "crw_web_controller.mm", @@ -129,8 +127,6 @@ source_set("crw_context_menu_controller") { "crw_context_menu_element_fetcher.mm", "crw_html_element_fetch_request.h", "crw_html_element_fetch_request.mm", - "crw_legacy_context_menu_controller.h", - "crw_legacy_context_menu_controller.mm", ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/web/web_view_only/BUILD.gn b/chromium/ios/web/web_view_only/BUILD.gn index e4b06df39ae..31fca69c61d 100644 --- a/chromium/ios/web/web_view_only/BUILD.gn +++ b/chromium/ios/web/web_view_only/BUILD.gn @@ -34,11 +34,6 @@ source_set("unittests") { "//ios/web/public", "//ios/web/public/web_view_only", "//ios/web/test:test_support", - - # Even if this target doesn't depend on WebRTC, this dependency - # is needed in order to workaround a dependency issue among - # mojom components. - "//third_party/webrtc_overrides:webrtc_component", ] visibility = [ diff --git a/chromium/ios/web_view/BUILD.gn b/chromium/ios/web_view/BUILD.gn index 5dbd9071d24..0f68d632bfc 100644 --- a/chromium/ios/web_view/BUILD.gn +++ b/chromium/ios/web_view/BUILD.gn @@ -74,6 +74,9 @@ ios_web_view_public_headers = [ "public/cwv_translation_controller_delegate.h", "public/cwv_translation_language.h", "public/cwv_translation_policy.h", + "public/cwv_trusted_vault_observer.h", + "public/cwv_trusted_vault_provider.h", + "public/cwv_trusted_vault_utils.h", "public/cwv_ui_delegate.h", "public/cwv_user_content_controller.h", "public/cwv_user_script.h", @@ -189,6 +192,9 @@ source_set("web_view_sources") { "internal/signin/web_view_signin_client_factory.mm", "internal/sync/cwv_sync_controller.mm", "internal/sync/cwv_sync_controller_internal.h", + "internal/sync/cwv_trusted_vault_observer.mm", + "internal/sync/cwv_trusted_vault_observer_internal.h", + "internal/sync/cwv_trusted_vault_utils.mm", "internal/sync/web_view_device_info_sync_service_factory.h", "internal/sync/web_view_device_info_sync_service_factory.mm", "internal/sync/web_view_gcm_profile_service_factory.h", @@ -205,6 +211,8 @@ source_set("web_view_sources") { "internal/sync/web_view_sync_invalidations_service_factory.mm", "internal/sync/web_view_sync_service_factory.h", "internal/sync/web_view_sync_service_factory.mm", + "internal/sync/web_view_trusted_vault_client.h", + "internal/sync/web_view_trusted_vault_client.mm", "internal/translate/cwv_translation_controller.mm", "internal/translate/cwv_translation_controller_internal.h", "internal/translate/cwv_translation_language.mm", @@ -277,6 +285,7 @@ source_set("web_view_sources") { "//components/metrics/demographics", "//components/password_manager/core/browser", "//components/password_manager/core/browser:affiliation", + "//components/password_manager/core/browser:password_generator", "//components/password_manager/core/common", "//components/password_manager/ios", "//components/password_manager/ios:password_manager_feature", @@ -307,6 +316,7 @@ source_set("web_view_sources") { "//components/web_resource", "//components/webdata_services", "//google_apis", + "//ios/components/credential_provider_extension:password_spec_fetcher", "//ios/components/credential_provider_extension:password_util", "//ios/components/io_thread", "//ios/components/webui:provider", @@ -436,6 +446,7 @@ test("ios_web_view_unittests") { "internal/signin/web_view_device_accounts_provider_impl_unittest.mm", "internal/signin/web_view_gaia_auth_fetcher_unittest.mm", "internal/sync/cwv_sync_controller_unittest.mm", + "internal/sync/cwv_trusted_vault_observer_unittest.mm", "internal/sync/web_view_sync_client_unittest.mm", "internal/translate/cwv_translation_controller_unittest.mm", "internal/translate/cwv_translation_language_unittest.mm", @@ -501,6 +512,7 @@ repack_locales("repack_locales") { "${root_gen_dir}/components/strings/components_strings_", "${root_gen_dir}/components/strings/components_locale_settings_", "${root_gen_dir}/ui/strings/app_locale_settings_", + "${root_gen_dir}/ui/strings/ax_strings_", "${root_gen_dir}/ui/strings/ui_strings_", ] @@ -508,6 +520,7 @@ repack_locales("repack_locales") { "//components/strings:components_locale_settings", "//components/strings:components_strings", "//ui/strings:app_locale_settings", + "//ui/strings:ax_strings", "//ui/strings:ui_strings", ] input_locales = ios_packed_locales diff --git a/chromium/ios/web_view/shell/BUILD.gn b/chromium/ios/web_view/shell/BUILD.gn index e2bbcd4c431..582ada03d99 100644 --- a/chromium/ios/web_view/shell/BUILD.gn +++ b/chromium/ios/web_view/shell/BUILD.gn @@ -2,9 +2,15 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/ios/ios_sdk.gni") import("//build/config/ios/rules.gni") declare_args() { + # The bundle identifier. Overriding this will affect the provisioning profile + # used, and hence will affect the app's capabilities. + ios_web_view_shell_bundle_identifier = + "$ios_app_bundle_id_prefix.ios-web-view-shell" + # Authorization service implementation used in ios_web_view_shell. Uses a fake # implementation by default. Override this with a real implementation to make # Sync feature work in the shell. The real implementation must provide @@ -19,14 +25,14 @@ declare_args() { ios_web_view_shell_risk_data_loader = "//ios/web_view/shell:shell_risk_data_loader_fake_impl" + # Trusted vault requires 1p access to the authorization services. + # Override this with a real implementation to enable trusted vault. + ios_web_view_shell_trusted_vault_provider = + "//ios/web_view/shell:shell_trusted_vault_provider_fake_impl" + # Path to an entitlements file used in ios_web_view_shell. Can be overridden # to provide an alternative. ios_web_view_shell_entitlements_path = "//build/config/ios/entitlements.plist" - - # Controls whether WebView shell links with MaterialComponents.framework or - # gets the implementation from its downstream provider. Ignored if - # MaterialComponents is not build as a framework. - ios_web_view_shell_links_with_material_components_framework = true } ios_app_bundle("ios_web_view_shell") { @@ -38,18 +44,12 @@ ios_app_bundle("ios_web_view_shell") { "//ios/web_view/shell/resources", ] entitlements_path = ios_web_view_shell_entitlements_path + bundle_identifier = ios_web_view_shell_bundle_identifier - if (ios_web_view_shell_links_with_material_components_framework) { - deps += [ - "//ios/third_party/material_components_ios:material_components_ios+bundle", - "//ios/third_party/material_components_ios:material_components_ios+link", - ] - } else { - assert_no_deps = [ - "//ios/third_party/material_components_ios:material_components_ios+bundle", - "//ios/third_party/material_components_ios:material_components_ios+link", - ] - } + assert_no_deps = [ + "//ios/third_party/material_components_ios:material_components_ios+bundle", + "//ios/third_party/material_components_ios:material_components_ios+link", + ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -92,6 +92,28 @@ source_set("shell_risk_data_loader_fake_impl") { configs += [ "//build/config/compiler:enable_arc" ] } +source_set("shell_trusted_vault_provider_interface") { + sources = [ "shell_trusted_vault_provider.h" ] + + deps = [ + ":shell_auth_service_interface", + "//ios/web_view:web_view+link", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("shell_trusted_vault_provider_fake_impl") { + sources = [ "shell_trusted_vault_provider_fake.m" ] + + deps = [ + ":shell_trusted_vault_provider_interface", + "//ios/web_view:web_view+link", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + source_set("shell") { sources = [ "shell_app_delegate.h", @@ -108,10 +130,12 @@ source_set("shell") { deps = [ ":shell_auth_service_interface", ":shell_risk_data_loader_interface", + ":shell_trusted_vault_provider_interface", "//ios/third_party/webkit", "//ios/web_view:web_view+link", ios_web_view_shell_auth_service, ios_web_view_shell_risk_data_loader, + ios_web_view_shell_trusted_vault_provider, ] libs = [ "resolv" ] @@ -126,6 +150,7 @@ source_set("shell") { "Security.framework", "SystemConfiguration.framework", "UIKit.framework", + "UniformTypeIdentifiers.framework", ] configs += [ "//build/config/compiler:enable_arc" ] |