BASELINE: Update Chromium to 83.0.4103.122

Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

5 files changed, 316 insertions, 300 deletions

diff --git a/chromium/ios/web_view/BUILD.gn b/chromium/ios/web_view/BUILD.gn
index 15dd523c97d..45276a901d3 100644
--- a/chromium/ios/web_view/BUILD.gn
+++ b/chromium/ios/web_view/BUILD.gn
@@ -44,6 +44,8 @@ config("config") {
 
 # These are defined as vars so they can be shared with different targets below.
 ios_web_view_public_headers = [
+  "public/cwv_back_forward_list.h",
+  "public/cwv_back_forward_list_item.h",
   "public/cwv_download_task.h",
   "public/cwv_export.h",
   "public/cwv_favicon.h",
@@ -87,6 +89,8 @@ if (ios_web_view_enable_autofill) {
     "public/cwv_autofill_profile.h",
     "public/cwv_autofill_suggestion.h",
     "public/cwv_credit_card.h",
+    "public/cwv_credit_card_expiration_fixer.h",
+    "public/cwv_credit_card_name_fixer.h",
     "public/cwv_credit_card_saver.h",
     "public/cwv_credit_card_verifier.h",
     "public/cwv_password.h",
@@ -96,238 +100,254 @@ if (ios_web_view_enable_autofill) {
   ]
 }
 
-ios_web_view_sources = [
-  "internal/app/application_context.h",
-  "internal/app/application_context.mm",
-  "internal/app/web_view_io_thread.h",
-  "internal/app/web_view_io_thread.mm",
-  "internal/autofill/web_view_autocomplete_history_manager_factory.h",
-  "internal/autofill/web_view_autocomplete_history_manager_factory.mm",
-  "internal/autofill/web_view_autofill_client_ios.h",
-  "internal/autofill/web_view_autofill_client_ios.mm",
-  "internal/autofill/web_view_autofill_log_router_factory.h",
-  "internal/autofill/web_view_autofill_log_router_factory.mm",
-  "internal/autofill/web_view_personal_data_manager_factory.h",
-  "internal/autofill/web_view_personal_data_manager_factory.mm",
-  "internal/autofill/web_view_strike_database_factory.h",
-  "internal/autofill/web_view_strike_database_factory.mm",
-  "internal/content_settings/web_view_cookie_settings_factory.h",
-  "internal/content_settings/web_view_cookie_settings_factory.mm",
-  "internal/content_settings/web_view_host_content_settings_map_factory.h",
-  "internal/content_settings/web_view_host_content_settings_map_factory.mm",
-  "internal/cwv_download_task.mm",
-  "internal/cwv_download_task_internal.h",
-  "internal/cwv_favicon.mm",
-  "internal/cwv_favicon_internal.h",
-  "internal/cwv_flags.mm",
-  "internal/cwv_flags_internal.h",
-  "internal/cwv_html_element.mm",
-  "internal/cwv_html_element_internal.h",
-  "internal/cwv_navigation_action.mm",
-  "internal/cwv_navigation_action_internal.h",
-  "internal/cwv_navigation_delegate.mm",
-  "internal/cwv_navigation_type.mm",
-  "internal/cwv_navigation_type_internal.h",
-  "internal/cwv_preferences.mm",
-  "internal/cwv_preferences_internal.h",
-  "internal/cwv_preview_element_info.mm",
-  "internal/cwv_preview_element_info_internal.h",
-  "internal/cwv_script_command.mm",
-  "internal/cwv_script_command_internal.h",
-  "internal/cwv_scroll_view.mm",
-  "internal/cwv_scroll_view_internal.h",
-  "internal/cwv_ssl_status.mm",
-  "internal/cwv_ssl_status_internal.h",
-  "internal/cwv_user_content_controller.mm",
-  "internal/cwv_user_content_controller_internal.h",
-  "internal/cwv_user_script.mm",
-  "internal/cwv_web_view.mm",
-  "internal/cwv_web_view_configuration.mm",
-  "internal/cwv_web_view_configuration_internal.h",
-  "internal/cwv_web_view_internal.h",
-  "internal/ios_global_state_web_view_configuration.mm",
-  "internal/language/web_view_language_model_manager_factory.h",
-  "internal/language/web_view_language_model_manager_factory.mm",
-  "internal/language/web_view_url_language_histogram_factory.h",
-  "internal/language/web_view_url_language_histogram_factory.mm",
-  "internal/passwords/web_view_password_feature_manager.h",
-  "internal/passwords/web_view_password_feature_manager.mm",
-  "internal/passwords/web_view_password_manager_client.h",
-  "internal/passwords/web_view_password_manager_client.mm",
-  "internal/passwords/web_view_password_manager_driver.h",
-  "internal/passwords/web_view_password_manager_driver.mm",
-  "internal/passwords/web_view_password_manager_log_router_factory.h",
-  "internal/passwords/web_view_password_manager_log_router_factory.mm",
-  "internal/passwords/web_view_password_store_factory.h",
-  "internal/passwords/web_view_password_store_factory.mm",
-  "internal/pref_names.h",
-  "internal/pref_names.mm",
-  "internal/signin/ios_web_view_signin_client.h",
-  "internal/signin/ios_web_view_signin_client.mm",
-  "internal/signin/web_view_device_accounts_provider_impl.h",
-  "internal/signin/web_view_device_accounts_provider_impl.mm",
-  "internal/signin/web_view_identity_manager_factory.h",
-  "internal/signin/web_view_identity_manager_factory.mm",
-  "internal/signin/web_view_signin_client_factory.h",
-  "internal/signin/web_view_signin_client_factory.mm",
-  "internal/signin/web_view_signin_error_controller_factory.h",
-  "internal/signin/web_view_signin_error_controller_factory.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",
-  "internal/sync/web_view_gcm_profile_service_factory.mm",
-  "internal/sync/web_view_model_type_store_service_factory.h",
-  "internal/sync/web_view_model_type_store_service_factory.mm",
-  "internal/sync/web_view_profile_invalidation_provider_factory.h",
-  "internal/sync/web_view_profile_invalidation_provider_factory.mm",
-  "internal/sync/web_view_profile_sync_service_factory.h",
-  "internal/sync/web_view_profile_sync_service_factory.mm",
-  "internal/sync/web_view_sync_client.h",
-  "internal/sync/web_view_sync_client.mm",
-  "internal/translate/cwv_translation_controller.mm",
-  "internal/translate/cwv_translation_controller_internal.h",
-  "internal/translate/cwv_translation_language.mm",
-  "internal/translate/cwv_translation_language_internal.h",
-  "internal/translate/cwv_translation_policy.mm",
-  "internal/translate/web_view_translate_accept_languages_factory.h",
-  "internal/translate/web_view_translate_accept_languages_factory.mm",
-  "internal/translate/web_view_translate_client.h",
-  "internal/translate/web_view_translate_client.mm",
-  "internal/translate/web_view_translate_ranker_factory.h",
-  "internal/translate/web_view_translate_ranker_factory.mm",
-  "internal/translate/web_view_translate_service.h",
-  "internal/translate/web_view_translate_service.mm",
-  "internal/utils/nsobject_description_utils.h",
-  "internal/utils/nsobject_description_utils.mm",
-  "internal/web_view_browser_state.h",
-  "internal/web_view_browser_state.mm",
-  "internal/web_view_download_manager.h",
-  "internal/web_view_download_manager.mm",
-  "internal/web_view_early_page_script_provider.h",
-  "internal/web_view_early_page_script_provider.mm",
-  "internal/web_view_global_state_util.h",
-  "internal/web_view_global_state_util.mm",
-  "internal/web_view_java_script_dialog_presenter.h",
-  "internal/web_view_java_script_dialog_presenter.mm",
-  "internal/web_view_url_request_context_getter.h",
-  "internal/web_view_url_request_context_getter.mm",
-  "internal/web_view_web_client.h",
-  "internal/web_view_web_client.mm",
-  "internal/web_view_web_main_delegate.h",
-  "internal/web_view_web_main_delegate.mm",
-  "internal/web_view_web_main_parts.h",
-  "internal/web_view_web_main_parts.mm",
-  "internal/web_view_web_state_policy_decider.h",
-  "internal/web_view_web_state_policy_decider.mm",
-  "internal/webdata_services/web_view_web_data_service_wrapper_factory.h",
-  "internal/webdata_services/web_view_web_data_service_wrapper_factory.mm",
-]
-ios_web_view_sources += ios_web_view_public_headers
-if (ios_web_view_enable_sync) {
-  ios_web_view_sources += [
-    "internal/signin/cwv_identity.mm",
-    "internal/sync/cwv_sync_controller.mm",
-    "internal/sync/cwv_sync_controller_internal.h",
+source_set("web_view_sources") {
+  sources = ios_web_view_public_headers
+  sources += [
+    "internal/app/application_context.h",
+    "internal/app/application_context.mm",
+    "internal/app/web_view_io_thread.h",
+    "internal/app/web_view_io_thread.mm",
+    "internal/autofill/web_view_autocomplete_history_manager_factory.h",
+    "internal/autofill/web_view_autocomplete_history_manager_factory.mm",
+    "internal/autofill/web_view_autofill_client_ios.h",
+    "internal/autofill/web_view_autofill_client_ios.mm",
+    "internal/autofill/web_view_autofill_log_router_factory.h",
+    "internal/autofill/web_view_autofill_log_router_factory.mm",
+    "internal/autofill/web_view_personal_data_manager_factory.h",
+    "internal/autofill/web_view_personal_data_manager_factory.mm",
+    "internal/autofill/web_view_strike_database_factory.h",
+    "internal/autofill/web_view_strike_database_factory.mm",
+    "internal/content_settings/web_view_cookie_settings_factory.h",
+    "internal/content_settings/web_view_cookie_settings_factory.mm",
+    "internal/content_settings/web_view_host_content_settings_map_factory.h",
+    "internal/content_settings/web_view_host_content_settings_map_factory.mm",
+    "internal/cwv_back_forward_list.mm",
+    "internal/cwv_back_forward_list_internal.h",
+    "internal/cwv_back_forward_list_item.mm",
+    "internal/cwv_back_forward_list_item_internal.h",
+    "internal/cwv_download_task.mm",
+    "internal/cwv_download_task_internal.h",
+    "internal/cwv_favicon.mm",
+    "internal/cwv_favicon_internal.h",
+    "internal/cwv_flags.mm",
+    "internal/cwv_flags_internal.h",
+    "internal/cwv_html_element.mm",
+    "internal/cwv_html_element_internal.h",
+    "internal/cwv_navigation_action.mm",
+    "internal/cwv_navigation_action_internal.h",
+    "internal/cwv_navigation_delegate.mm",
+    "internal/cwv_navigation_type.mm",
+    "internal/cwv_navigation_type_internal.h",
+    "internal/cwv_preferences.mm",
+    "internal/cwv_preferences_internal.h",
+    "internal/cwv_preview_element_info.mm",
+    "internal/cwv_preview_element_info_internal.h",
+    "internal/cwv_script_command.mm",
+    "internal/cwv_script_command_internal.h",
+    "internal/cwv_scroll_view.mm",
+    "internal/cwv_scroll_view_internal.h",
+    "internal/cwv_ssl_status.mm",
+    "internal/cwv_ssl_status_internal.h",
+    "internal/cwv_user_content_controller.mm",
+    "internal/cwv_user_content_controller_internal.h",
+    "internal/cwv_user_script.mm",
+    "internal/cwv_web_view.mm",
+    "internal/cwv_web_view_configuration.mm",
+    "internal/cwv_web_view_configuration_internal.h",
+    "internal/cwv_web_view_internal.h",
+    "internal/ios_global_state_web_view_configuration.mm",
+    "internal/language/web_view_language_model_manager_factory.h",
+    "internal/language/web_view_language_model_manager_factory.mm",
+    "internal/language/web_view_url_language_histogram_factory.h",
+    "internal/language/web_view_url_language_histogram_factory.mm",
+    "internal/passwords/web_view_password_feature_manager.h",
+    "internal/passwords/web_view_password_feature_manager.mm",
+    "internal/passwords/web_view_password_manager_client.h",
+    "internal/passwords/web_view_password_manager_client.mm",
+    "internal/passwords/web_view_password_manager_driver.h",
+    "internal/passwords/web_view_password_manager_driver.mm",
+    "internal/passwords/web_view_password_manager_log_router_factory.h",
+    "internal/passwords/web_view_password_manager_log_router_factory.mm",
+    "internal/passwords/web_view_password_store_factory.h",
+    "internal/passwords/web_view_password_store_factory.mm",
+    "internal/pref_names.h",
+    "internal/pref_names.mm",
+    "internal/signin/ios_web_view_signin_client.h",
+    "internal/signin/ios_web_view_signin_client.mm",
+    "internal/signin/web_view_device_accounts_provider_impl.h",
+    "internal/signin/web_view_device_accounts_provider_impl.mm",
+    "internal/signin/web_view_identity_manager_factory.h",
+    "internal/signin/web_view_identity_manager_factory.mm",
+    "internal/signin/web_view_signin_client_factory.h",
+    "internal/signin/web_view_signin_client_factory.mm",
+    "internal/signin/web_view_signin_error_controller_factory.h",
+    "internal/signin/web_view_signin_error_controller_factory.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",
+    "internal/sync/web_view_gcm_profile_service_factory.mm",
+    "internal/sync/web_view_instance_id_profile_service_factory.h",
+    "internal/sync/web_view_instance_id_profile_service_factory.mm",
+    "internal/sync/web_view_model_type_store_service_factory.h",
+    "internal/sync/web_view_model_type_store_service_factory.mm",
+    "internal/sync/web_view_profile_invalidation_provider_factory.h",
+    "internal/sync/web_view_profile_invalidation_provider_factory.mm",
+    "internal/sync/web_view_profile_sync_service_factory.h",
+    "internal/sync/web_view_profile_sync_service_factory.mm",
+    "internal/sync/web_view_sync_client.h",
+    "internal/sync/web_view_sync_client.mm",
+    "internal/translate/cwv_translation_controller.mm",
+    "internal/translate/cwv_translation_controller_internal.h",
+    "internal/translate/cwv_translation_language.mm",
+    "internal/translate/cwv_translation_language_internal.h",
+    "internal/translate/cwv_translation_policy.mm",
+    "internal/translate/web_view_translate_accept_languages_factory.h",
+    "internal/translate/web_view_translate_accept_languages_factory.mm",
+    "internal/translate/web_view_translate_client.h",
+    "internal/translate/web_view_translate_client.mm",
+    "internal/translate/web_view_translate_ranker_factory.h",
+    "internal/translate/web_view_translate_ranker_factory.mm",
+    "internal/translate/web_view_translate_service.h",
+    "internal/translate/web_view_translate_service.mm",
+    "internal/utils/nsobject_description_utils.h",
+    "internal/utils/nsobject_description_utils.mm",
+    "internal/web_view_browser_state.h",
+    "internal/web_view_browser_state.mm",
+    "internal/web_view_download_manager.h",
+    "internal/web_view_download_manager.mm",
+    "internal/web_view_early_page_script_provider.h",
+    "internal/web_view_early_page_script_provider.mm",
+    "internal/web_view_global_state_util.h",
+    "internal/web_view_java_script_dialog_presenter.h",
+    "internal/web_view_java_script_dialog_presenter.mm",
+    "internal/web_view_url_request_context_getter.h",
+    "internal/web_view_url_request_context_getter.mm",
+    "internal/web_view_web_client.h",
+    "internal/web_view_web_client.mm",
+    "internal/web_view_web_main_delegate.h",
+    "internal/web_view_web_main_delegate.mm",
+    "internal/web_view_web_main_parts.h",
+    "internal/web_view_web_main_parts.mm",
+    "internal/web_view_web_state_policy_decider.h",
+    "internal/web_view_web_state_policy_decider.mm",
+    "internal/webdata_services/web_view_web_data_service_wrapper_factory.h",
+    "internal/webdata_services/web_view_web_data_service_wrapper_factory.mm",
   ]
-}
-if (ios_web_view_enable_autofill) {
-  ios_web_view_sources += [
-    "internal/autofill/cwv_autofill_client_ios_bridge.h",
-    "internal/autofill/cwv_autofill_controller.mm",
-    "internal/autofill/cwv_autofill_controller_internal.h",
-    "internal/autofill/cwv_autofill_data_manager.mm",
-    "internal/autofill/cwv_autofill_data_manager_internal.h",
-    "internal/autofill/cwv_autofill_form.mm",
-    "internal/autofill/cwv_autofill_form_internal.h",
-    "internal/autofill/cwv_autofill_profile.mm",
-    "internal/autofill/cwv_autofill_profile_internal.h",
-    "internal/autofill/cwv_autofill_suggestion.mm",
-    "internal/autofill/cwv_autofill_suggestion_internal.h",
-    "internal/autofill/cwv_credit_card.mm",
-    "internal/autofill/cwv_credit_card_internal.h",
-    "internal/autofill/cwv_credit_card_saver.mm",
-    "internal/autofill/cwv_credit_card_saver_internal.h",
-    "internal/autofill/cwv_credit_card_verifier.mm",
-    "internal/autofill/cwv_credit_card_verifier_internal.h",
-    "internal/passwords/cwv_password.mm",
-    "internal/passwords/cwv_password_internal.h",
-    "internal/passwords/cwv_password_controller.h",
-    "internal/passwords/cwv_password_controller.mm",
+  if (ios_web_view_enable_sync) {
+    sources += [
+      "internal/signin/cwv_identity.mm",
+      "internal/sync/cwv_sync_controller.mm",
+      "internal/sync/cwv_sync_controller_internal.h",
+    ]
+  }
+  if (ios_web_view_enable_autofill) {
+    sources += [
+      "internal/autofill/cwv_autofill_client_ios_bridge.h",
+      "internal/autofill/cwv_autofill_controller.mm",
+      "internal/autofill/cwv_autofill_controller_internal.h",
+      "internal/autofill/cwv_autofill_data_manager.mm",
+      "internal/autofill/cwv_autofill_data_manager_internal.h",
+      "internal/autofill/cwv_autofill_form.mm",
+      "internal/autofill/cwv_autofill_form_internal.h",
+      "internal/autofill/cwv_autofill_profile.mm",
+      "internal/autofill/cwv_autofill_profile_internal.h",
+      "internal/autofill/cwv_autofill_suggestion.mm",
+      "internal/autofill/cwv_autofill_suggestion_internal.h",
+      "internal/autofill/cwv_credit_card.mm",
+      "internal/autofill/cwv_credit_card_expiration_fixer.mm",
+      "internal/autofill/cwv_credit_card_expiration_fixer_internal.h",
+      "internal/autofill/cwv_credit_card_internal.h",
+      "internal/autofill/cwv_credit_card_name_fixer.mm",
+      "internal/autofill/cwv_credit_card_name_fixer_internal.h",
+      "internal/autofill/cwv_credit_card_saver.mm",
+      "internal/autofill/cwv_credit_card_saver_internal.h",
+      "internal/autofill/cwv_credit_card_verifier.mm",
+      "internal/autofill/cwv_credit_card_verifier_internal.h",
+      "internal/passwords/cwv_password.mm",
+      "internal/passwords/cwv_password_controller.h",
+      "internal/passwords/cwv_password_controller.mm",
+      "internal/passwords/cwv_password_internal.h",
+    ]
+  }
+
+  public_deps = [
+    ":web_view_all_frames",
+    ":web_view_buildflags",
+    ":web_view_main_frame",
+    ":web_view_resources",
+    "//base",
+    "//components/autofill/core/browser",
+    "//components/autofill/core/common",
+    "//components/autofill/ios/browser",
+    "//components/autofill/ios/form_util",
+    "//components/browser_sync",
+    "//components/content_settings/core/browser",
+    "//components/flags_ui",
+    "//components/flags_ui:switches",
+    "//components/gcm_driver",
+    "//components/history/core/common",
+    "//components/image_fetcher/ios",
+    "//components/infobars/core",
+    "//components/invalidation/impl",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+    "//components/language/core/browser",
+    "//components/language/core/common",
+    "//components/language/ios/browser",
+    "//components/leveldb_proto",
+    "//components/password_manager/core/browser",
+    "//components/password_manager/core/browser:affiliation",
+    "//components/password_manager/core/common",
+    "//components/password_manager/ios",
+    "//components/pref_registry",
+    "//components/prefs",
+    "//components/proxy_config",
+    "//components/signin/core/browser",
+    "//components/signin/ios/browser",
+    "//components/signin/ios/browser:active_state_manager",
+    "//components/signin/public/identity_manager",
+    "//components/signin/public/identity_manager/ios",
+    "//components/signin/public/webdata",
+    "//components/ssl_errors",
+    "//components/strings:components_strings_grit",
+    "//components/sync",
+    "//components/sync_device_info",
+    "//components/sync_sessions",
+    "//components/sync_user_events",
+    "//components/translate/core/browser",
+    "//components/translate/core/common",
+    "//components/translate/ios/browser",
+    "//components/url_formatter",
+    "//components/variations/net",
+    "//components/version_info",
+    "//components/version_info:version_string",
+    "//components/web_resource",
+    "//components/webdata_services",
+    "//google_apis",
+    "//ios/components/io_thread",
+    "//ios/net",
+    "//ios/web",
+    "//ios/web/common",
+    "//ios/web/common:user_agent",
+    "//ios/web/public",
+    "//ios/web/public/deprecated",
+    "//ios/web/public/init",
+    "//ios/web/public/js_messaging",
+    "//ios/web/public/security",
+    "//ios/web/public/web_view_only",
+    "//net",
+    "//net:extras",
+    "//services/metrics/public/cpp:metrics_cpp",
+    "//services/network:network_service",
+    "//ui/base",
+    "//url",
   ]
-}
 
-ios_web_view_deps = [
-  ":web_view_all_frames",
-  ":web_view_buildflags",
-  ":web_view_main_frame",
-  ":web_view_resources",
-  "//base",
-  "//components/autofill/core/browser",
-  "//components/autofill/core/common",
-  "//components/autofill/ios/browser",
-  "//components/autofill/ios/form_util",
-  "//components/browser_sync",
-  "//components/content_settings/core/browser",
-  "//components/flags_ui",
-  "//components/flags_ui:switches",
-  "//components/gcm_driver",
-  "//components/history/core/common",
-  "//components/image_fetcher/ios",
-  "//components/invalidation/impl",
-  "//components/infobars/core",
-  "//components/keyed_service/core",
-  "//components/keyed_service/ios",
-  "//components/language/core/browser",
-  "//components/language/core/common",
-  "//components/leveldb_proto",
-  "//services/network:network_service",
-  "//components/password_manager/core/browser",
-  "//components/password_manager/core/browser:affiliation",
-  "//components/password_manager/core/common",
-  "//components/password_manager/ios",
-  "//components/pref_registry",
-  "//components/prefs",
-  "//components/proxy_config",
-  "//components/signin/core/browser",
-  "//components/signin/public/webdata",
-  "//components/signin/ios/browser",
-  "//components/signin/ios/browser:active_state_manager",
-  "//components/signin/public/identity_manager",
-  "//components/signin/public/identity_manager/ios",
-  "//components/strings:components_strings_grit",
-  "//components/sync",
-  "//components/sync_device_info",
-  "//components/sync_user_events",
-  "//components/language/ios/browser",
-  "//components/sync_sessions",
-  "//components/translate/core/browser",
-  "//components/translate/core/common",
-  "//components/translate/ios/browser",
-  "//components/url_formatter",
-  "//components/variations/net",
-  "//components/version_info",
-  "//components/version_info:version_string",
-  "//components/web_resource",
-  "//components/webdata_services",
-  "//components/ssl_errors",
-  "//google_apis",
-  "//ios/components/io_thread",
-  "//ios/net",
-  "//ios/web",
-  "//ios/web/common",
-  "//ios/web/common:user_agent",
-  "//ios/web/public",
-  "//ios/web/public/init",
-  "//ios/web/public/deprecated",
-  "//ios/web/public/security",
-  "//ios/web/public/js_messaging",
-  "//ios/web/public/web_view_only",
-  "//net",
-  "//net:extras",
-  "//services/metrics/public/cpp:metrics_cpp",
-  "//ui/base",
-  "//url",
-]
+  configs += [
+    ":config",
+    "//build/config/compiler:enable_arc",
+  ]
+}
 
 # Generate the umbrella header to exclude headers for disabled features.
 # This is preferable to guarding header imports using flags defined in
@@ -339,9 +359,7 @@ action("web_view_umbrella_header") {
   script = "//build/config/ios/generate_umbrella_header.py"
 
   full_header_path = target_gen_dir + "/ChromeWebView.h"
-  outputs = [
-    full_header_path,
-  ]
+  outputs = [ full_header_path ]
 
   args = [
     "--output-path",
@@ -363,13 +381,16 @@ ios_framework_bundle("web_view") {
     public_headers += cronet_native_public_headers
   }
 
-  sources = ios_web_view_sources
+  sources = [ "internal/web_view_global_state_util.mm" ]
   if (ios_web_view_include_cronet) {
     sources += [ "//components/cronet/ios/Cronet.h" ]
   }
 
-  deps = ios_web_view_deps
-  deps += [ ":web_view_umbrella_header" ]
+  deps = [
+    ":web_view_sources",
+    ":web_view_umbrella_header",
+    "//ios/web/public/init",
+  ]
   if (ios_web_view_include_cronet) {
     deps += [ "//components/cronet/ios:cronet_sources" ]
   }
@@ -384,16 +405,9 @@ ios_framework_bundle("web_view") {
   }
 }
 
-ios_web_view_test_sources = [
-  "internal/translate/fake_web_view_translate_client.h",
-  "internal/translate/fake_web_view_translate_client.mm",
-]
-
 source_set("run_all_unittests") {
   testonly = true
-  sources = [
-    "test/run_all_unittests.cc",
-  ]
+  sources = [ "test/run_all_unittests.cc" ]
   deps = [
     "//base",
     "//base/test:test_support",
@@ -409,6 +423,8 @@ test("ios_web_view_unittests") {
     "internal/autofill/cwv_autofill_form_unittest.mm",
     "internal/autofill/cwv_autofill_profile_unittest.mm",
     "internal/autofill/cwv_autofill_suggestion_unittest.mm",
+    "internal/autofill/cwv_credit_card_expiration_fixer_unittest.mm",
+    "internal/autofill/cwv_credit_card_name_fixer_unittest.mm",
     "internal/autofill/cwv_credit_card_saver_unittest.mm",
     "internal/autofill/cwv_credit_card_unittest.mm",
     "internal/autofill/cwv_credit_card_verifier_unittest.mm",
@@ -421,19 +437,23 @@ test("ios_web_view_unittests") {
     "internal/cwv_scroll_view_unittest.mm",
     "internal/cwv_ssl_status_unittest.mm",
     "internal/cwv_web_view_configuration_unittest.mm",
+    "internal/passwords/cwv_password_controller_fake.h",
+    "internal/passwords/cwv_password_controller_fake.mm",
     "internal/passwords/cwv_password_unittest.mm",
     "internal/signin/cwv_identity_unittest.mm",
     "internal/sync/cwv_sync_controller_unittest.mm",
     "internal/translate/cwv_translation_controller_unittest.mm",
     "internal/translate/cwv_translation_language_unittest.mm",
     "internal/translate/cwv_translation_policy_unittest.mm",
+    "internal/translate/fake_web_view_translate_client.h",
+    "internal/translate/fake_web_view_translate_client.mm",
+    "internal/web_view_global_state_util_stub.mm",
     "internal/web_view_web_client_unittest.mm",
   ]
-  sources += ios_web_view_sources
-  sources += ios_web_view_test_sources
 
   deps = [
     ":run_all_unittests",
+    ":web_view_sources",
     "test:test_support",
     "//base/test:test_support",
     "//components/autofill/core/browser:test_support",
@@ -453,7 +473,6 @@ test("ios_web_view_unittests") {
     "//testing/gtest",
     "//third_party/ocmock",
   ]
-  deps += ios_web_view_deps
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
@@ -463,9 +482,7 @@ test("ios_web_view_unittests") {
 test("ios_web_view_inttests") {
   testonly = true
 
-  deps = [
-    "//ios/web_view/test:inttests",
-  ]
+  deps = [ "//ios/web_view/test:inttests" ]
 
   bundle_deps = [ ":web_view+bundle" ]
 
@@ -551,12 +568,8 @@ if (additional_toolchains == [] || current_toolchain == default_toolchain) {
     _license_path = "$_package_dir/LICENSE"
 
     script = "//tools/licenses.py"
-    inputs = [
-      "//buildtools/$host_os/gn",
-    ]
-    outputs = [
-      _license_path,
-    ]
+    inputs = [ "//buildtools/$host_os/gn" ]
+    outputs = [ _license_path ]
     args = [
       "license_file",
       rebase_path(_license_path, root_build_dir),
@@ -564,6 +577,8 @@ if (additional_toolchains == [] || current_toolchain == default_toolchain) {
       "//ios/web_view",
       "--gn-out-dir",
       ".",
+      "--target-os",
+      "ios",
     ]
   }
 
@@ -573,13 +588,9 @@ if (additional_toolchains == [] || current_toolchain == default_toolchain) {
       "//AUTHORS",
       "//chrome/VERSION",
     ]
-    outputs = [
-      "$_package_dir/{{source_file_part}}",
-    ]
+    outputs = [ "$_package_dir/{{source_file_part}}" ]
 
-    deps = [
-      ":web_view",
-    ]
+    deps = [ ":web_view" ]
   }
 
   if (enable_dsyms) {
@@ -592,22 +603,16 @@ if (additional_toolchains == [] || current_toolchain == default_toolchain) {
       # generate both the dSYM and binary image are listed in deps.
       _dsyms = [ "$root_out_dir/$ios_web_view_output_name.dSYM" ]
 
-      sources = [
-        "$root_out_dir/$ios_web_view_output_name.framework",
-      ]
+      sources = [ "$root_out_dir/$ios_web_view_output_name.framework" ]
 
       _output = "$_package_dir/$ios_web_view_output_name.dSYM.tar.bz2"
 
-      outputs = [
-        _output,
-      ]
+      outputs = [ _output ]
 
       args = [ rebase_path(_output, root_out_dir) ] +
              rebase_path(_dsyms, root_out_dir)
 
-      deps = [
-        ":web_view",
-      ]
+      deps = [ ":web_view" ]
     }
   } else {
     group("ios_web_view_dsym_archive") {
diff --git a/chromium/ios/web_view/repack.gni b/chromium/ios/web_view/repack.gni
index c2813453fbd..155b6d5271c 100644
--- a/chromium/ios/web_view/repack.gni
+++ b/chromium/ios/web_view/repack.gni
@@ -26,9 +26,7 @@ template("_ios_web_view_repack_one_scale") {
       # TODO(crbug.com/842244): Bundle less resources.
       "${root_gen_dir}/components/components_resources_${invoker.scale}_percent.pak",
     ]
-    deps = [
-      "//components/resources:components_scaled_resources",
-    ]
+    deps = [ "//components/resources:components_scaled_resources" ]
 
     output = "$target_gen_dir/web_view_${invoker.scale}_percent.pak"
     copy_data_to_bundle = true
diff --git a/chromium/ios/web_view/shell/BUILD.gn b/chromium/ios/web_view/shell/BUILD.gn
index d8c6c6a1e81..70bb0f1199e 100644
--- a/chromium/ios/web_view/shell/BUILD.gn
+++ b/chromium/ios/web_view/shell/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/ios/rules.gni")
+import("//ios/third_party/features.gni")
 
 declare_args() {
   # Authorization service implementation used in ios_web_view_shell. Uses a fake
@@ -22,39 +23,50 @@ declare_args() {
   # 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") {
   info_plist = "Info.plist"
 
-  deps = [
-    ":shell",
-  ]
+  deps = [ ":shell" ]
   bundle_deps = [
     "//ios/web_view:web_view+bundle",
     "//ios/web_view/shell/resources",
   ]
   entitlements_path = ios_web_view_shell_entitlements_path
 
+  if (ios_third_party_material_components_built_as_framework) {
+    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",
+      ]
+    }
+  }
+
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
 source_set("shell_auth_service_interface") {
-  sources = [
-    "shell_auth_service.h",
-  ]
+  sources = [ "shell_auth_service.h" ]
 
-  deps = [
-    "//ios/web_view:web_view+link",
-  ]
+  deps = [ "//ios/web_view:web_view+link" ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
 source_set("shell_auth_service_fake_impl") {
-  sources = [
-    "shell_auth_service_fake.m",
-  ]
+  sources = [ "shell_auth_service_fake.m" ]
 
   deps = [
     ":shell_auth_service_interface",
@@ -65,21 +77,15 @@ source_set("shell_auth_service_fake_impl") {
 }
 
 source_set("shell_risk_data_loader_interface") {
-  sources = [
-    "shell_risk_data_loader.h",
-  ]
+  sources = [ "shell_risk_data_loader.h" ]
 
-  deps = [
-    "//ios/web_view:web_view+link",
-  ]
+  deps = [ "//ios/web_view:web_view+link" ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
 source_set("shell_risk_data_loader_fake_impl") {
-  sources = [
-    "shell_risk_data_loader_fake.m",
-  ]
+  sources = [ "shell_risk_data_loader_fake.m" ]
 
   deps = [
     ":shell_risk_data_loader_interface",
diff --git a/chromium/ios/web_view/shell/test/BUILD.gn b/chromium/ios/web_view/shell/test/BUILD.gn
index 945fb76f672..63c4ddf4815 100644
--- a/chromium/ios/web_view/shell/test/BUILD.gn
+++ b/chromium/ios/web_view/shell/test/BUILD.gn
@@ -4,19 +4,17 @@
 
 import("//ios/build/config.gni")
 import("//ios/third_party/earl_grey/ios_eg_test.gni")
+import("//ios/third_party/features.gni")
 
 group("all_tests") {
   testonly = true
-  deps = [
-    ":ios_web_view_shell_egtests",
-  ]
+  deps = [ ":ios_web_view_shell_egtests" ]
 }
 
 ios_eg_test("ios_web_view_shell_egtests") {
   info_plist = "//ios/web_view/shell/Info.plist"
-  sources = [
-    "shell_egtest.mm",
-  ]
+  sources = [ "shell_egtest.mm" ]
+  include_provider_resources = false
 
   deps = [
     ":earl_grey_test_support",
@@ -27,6 +25,13 @@ ios_eg_test("ios_web_view_shell_egtests") {
     "//net:test_support",
   ]
 
+  if (ios_third_party_material_components_built_as_framework) {
+    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" ]
 
   assert_no_deps = ios_assert_no_deps
diff --git a/chromium/ios/web_view/test/BUILD.gn b/chromium/ios/web_view/test/BUILD.gn
index 1cc41808896..be963be4a49 100644
--- a/chromium/ios/web_view/test/BUILD.gn
+++ b/chromium/ios/web_view/test/BUILD.gn
@@ -13,6 +13,7 @@ source_set("inttests") {
     "scroll_view_kvo_inttest.mm",
     "ui_delegate_inttest.mm",
     "web_view_autofill_inttest.mm",
+    "web_view_back_forward_list_inttest.mm",
     "web_view_from_wk_web_view_configuration_inttest.mm",
     "web_view_inttest.mm",
     "web_view_inttest_base.h",
@@ -28,6 +29,7 @@ source_set("inttests") {
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//components/url_formatter",
+    "//ios/third_party/webkit",
     "//ios/web_view:web_view+link",
     "//net",
     "//net:test_support",