From 2efea72ade23fc841ed5b2f39b04a881de8a993d Mon Sep 17 00:00:00 2001 From: Blaise Date: Wed, 23 Feb 2022 16:40:56 -0600 Subject: [PATCH] Update to Chromium 99.0.4844.45 --- chromium_version.txt | 2 +- domain_substitution.list | 376 +++++++++--------- patches/core/debian/disable/unrar.patch | 6 +- ...01-fix-building-without-safebrowsing.patch | 92 +++-- ...03-disable-autofill-download-manager.patch | 2 +- .../0005-disable-default-extensions.patch | 4 +- .../0009-disable-google-ipv6-probes.patch | 2 +- .../0015-disable-update-pings.patch | 2 +- .../core/inox-patchset/0021-disable-rlz.patch | 2 +- ...refixes-to-possibly-evil-connections.patch | 23 +- ..._browsing-disable-incident-reporting.patch | 2 +- ...sable-reporting-of-safebrowsing-over.patch | 4 +- .../block-trk-and-subdomains.patch | 28 +- .../disable-crash-reporter.patch | 2 +- .../ungoogled-chromium/disable-floc.patch | 35 +- .../disable-google-host-detection.patch | 10 +- .../disable-mei-preload.patch | 4 +- .../disable-privacy-sandbox.patch | 38 +- .../ungoogled-chromium/disable-signin.patch | 2 +- .../disable-untraceable-urls.patch | 2 +- .../disable-webstore-urls.patch | 4 +- .../core/ungoogled-chromium/doh-changes.patch | 12 +- .../fix-building-with-prunned-binaries.patch | 2 +- ...-building-without-enabling-reporting.patch | 6 +- ...ix-building-without-one-click-signin.patch | 8 +- .../fix-building-without-safebrowsing.patch | 275 +++++++------ .../remove-unused-preferences-fields.patch | 328 +++++++-------- .../toggle-translation-via-switch.patch | 6 +- ...g-flags-client-rects-and-measuretext.patch | 52 +-- ...ngerprinting-canvas-image-data-noise.patch | 16 +- .../flag-max-connections-per-host.patch | 14 +- .../extra/debian/disable/welcome-page.patch | 4 +- .../0006-modify-default-prefs.patch | 19 +- .../0008-restore-classic-ntp.patch | 2 +- .../0018-disable-first-run-behaviour.patch | 2 +- .../Remove-EV-certificates.patch | 22 +- ...ble-profile-auto-import-on-first-run.patch | 10 +- .../add-flag-for-close-confirmation.patch | 12 +- .../add-flag-for-custom-ntp.patch | 2 +- ...g-for-omnibox-autocomplete-filtering.patch | 2 +- .../add-flag-for-pdf-plugin-name.patch | 10 +- .../add-flag-for-qr-generator.patch | 2 +- ...dd-flag-for-search-engine-collection.patch | 12 +- .../add-flag-for-tab-hover-cards.patch | 2 +- .../add-flag-for-tabsearch-button.patch | 2 +- .../add-flag-to-clear-data-on-exit.patch | 6 +- ...d-flag-to-close-window-with-last-tab.patch | 2 +- ...g-to-configure-extension-downloading.patch | 2 +- .../add-flag-to-convert-popups-to-tabs.patch | 2 +- ...add-flag-to-force-punycode-hostnames.patch | 2 +- .../add-flag-to-scroll-tabs.patch | 2 +- .../add-flag-to-show-avatar-button.patch | 2 +- .../add-ipv6-probing-option.patch | 16 +- .../add-suggestions-url-field.patch | 20 +- .../add-ungoogled-flag-headers.patch | 2 +- .../disable-dial-repeating-discovery.patch | 14 +- .../disable-download-quarantine.patch | 18 +- .../disable-formatting-in-omnibox.patch | 2 +- .../enable-page-saving-on-more-pages.patch | 2 +- .../enable-paste-and-go-new-tab-button.patch | 6 +- ...e-disable-setuid-sandbox-as-bad-flag.patch | 4 +- .../remove-uneeded-ui.patch | 22 +- pruning.list | 56 ++- 63 files changed, 821 insertions(+), 823 deletions(-) diff --git a/chromium_version.txt b/chromium_version.txt index 26185f15..3ef38c89 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -98.0.4758.102 +99.0.4844.45 diff --git a/domain_substitution.list b/domain_substitution.list index bf0bb4ca..7da7df9b 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -25,7 +25,6 @@ android_webview/tools/record_netlog.py android_webview/tools/remove_preinstalled_webview.py android_webview/tools/update_cts.py ash/accelerators/accelerator_notifications.cc -ash/accessibility/accessibility_controller_impl.cc ash/ambient/ambient_controller_unittest.cc ash/app_list/PRESUBMIT.py ash/app_list/app_list_controller_impl_unittest.cc @@ -46,6 +45,7 @@ ash/components/attestation/attestation_flow_integrated_unittest.cc ash/components/device_activity/device_activity_client_unittest.cc ash/components/device_activity/device_activity_controller.cc ash/components/drivefs/drivefs_auth.cc +ash/components/fwupd/firmware_update_manager.cc ash/components/geolocation/simple_geolocation_provider.cc ash/components/phonehub/notification.h ash/components/phonehub/url_constants.cc @@ -68,13 +68,13 @@ ash/quick_pair/scanning/fast_pair/fast_pair_discoverable_scanner.h ash/quick_pair/scanning/fast_pair/fast_pair_not_discoverable_scanner.h ash/resources/PRESUBMIT.py ash/services/ime/constants.cc -ash/services/ime/public/cpp/shared_lib/interfaces.h ash/services/quick_pair/fast_pair_data_parser.cc ash/services/quick_pair/fast_pair_decryption.cc ash/services/quick_pair/public/cpp/account_key_filter.cc ash/services/quick_pair/public/cpp/account_key_filter.h ash/services/quick_pair/public/cpp/battery_notification.h ash/services/quick_pair/public/cpp/not_discoverable_advertisement.h +ash/session/fullscreen_controller_unittest.cc ash/shelf/contextual_nudge.cc ash/shelf/launcher_nudge_controller_unittest.cc ash/shelf/shelf_controller_unittest.cc @@ -85,19 +85,15 @@ ash/system/phonehub/phone_hub_tray_unittest.cc ash/system/power/power_event_observer_unittest.cc ash/system/unified/hps_notify_controller_unittest.cc ash/system/unified/user_chooser_detailed_view_controller_unittest.cc +ash/system/usb_peripheral/usb_peripheral_notification_controller.cc ash/webui/camera_app_ui/camera_app_ui.cc -ash/webui/camera_app_ui/resources/js/geometry.js ash/webui/camera_app_ui/resources/js/lib/analytics.js -ash/webui/camera_app_ui/resources/js/sound.js -ash/webui/camera_app_ui/resources/js/untrusted_ga_helper.js -ash/webui/camera_app_ui/resources/js/views/camera_intent.js ash/webui/camera_app_ui/resources/strings/camera_strings.grd ash/webui/diagnostics_ui/resources/network_card.js ash/webui/diagnostics_ui/resources/routine_section.js ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc ash/webui/media_app_ui/media_app_guest_ui.cc ash/webui/media_app_ui/resources/js/launch.js -ash/webui/personalization_app/resources/trusted/wallpaper/google_photos_zero_state_element.js ash/webui/personalization_app/untrusted_personalization_app_ui_config.cc ash/webui/projector_app/projector_xhr_sender.cc ash/webui/projector_app/test/mock_app_client.cc @@ -126,6 +122,7 @@ base/android/jni_generator/jni_generator.py base/android/library_loader/library_loader_hooks.h base/android/resource_exclusions.gni base/atomicops.h +base/barrier_callback.h base/base_paths_win.cc base/check.cc base/check_op.cc @@ -366,6 +363,7 @@ chrome/app/theme/PRESUBMIT.py chrome/app/welcome_strings.grdp chrome/browser/about_flags.cc chrome/browser/accessibility/live_caption_speech_recognition_host_browsertest.cc +chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc chrome/browser/android/contextualsearch/contextual_search_context.h chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc chrome/browser/android/customtabs/custom_tabs_browsertest.cc @@ -390,7 +388,9 @@ chrome/browser/android/signin/signin_manager_android_unittest.cc chrome/browser/android/signin/web_signin_bridge_unittest.cc chrome/browser/android/tab_android.cc chrome/browser/android/vr/PRESUBMIT.py +chrome/browser/android/webapk/webapk_installer.cc chrome/browser/apps/app_discovery_service/app_discovery_service_unittest.cc +chrome/browser/apps/app_discovery_service/recommended_arc_app_fetcher_unittest.cc chrome/browser/apps/app_service/app_icon/app_icon_loader.cc chrome/browser/apps/app_service/intent_util_unittest.cc chrome/browser/apps/app_service/metrics/app_service_metrics.h @@ -445,7 +445,6 @@ chrome/browser/ash/cert_provisioning/cert_provisioning_test_helpers.cc chrome/browser/ash/child_accounts/child_user_service.cc chrome/browser/ash/child_accounts/family_user_device_metrics_browsertest.cc chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc -chrome/browser/ash/child_accounts/secondary_account_consent_logger_unittest.cc chrome/browser/ash/child_accounts/time_limits/app_time_limit_utils_unittest.cc chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html chrome/browser/ash/child_accounts/website_approval_notifier_unittest.cc @@ -540,7 +539,7 @@ chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_browsertest.cc chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_unittest.cc chrome/browser/ash/policy/core/user_cloud_policy_store_ash_unittest.cc chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder_unittest.cc -chrome/browser/ash/policy/dlp/dlp_content_manager_browsertest.cc +chrome/browser/ash/policy/dlp/dlp_content_manager_ash_browsertest.cc chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc chrome/browser/ash/policy/enrollment/account_status_check_fetcher_unittest.cc chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc @@ -567,7 +566,6 @@ chrome/browser/ash/scheduler_configuration_manager.h chrome/browser/ash/settings/cros_settings_unittest.cc chrome/browser/ash/settings/device_settings_provider_unittest.cc chrome/browser/ash/smb_client/smb_service_helper.h -chrome/browser/ash/sync/ash_turn_sync_on_helper_unittest.cc chrome/browser/ash/system_token_cert_db_initializer.h chrome/browser/ash/tpm_firmware_update.h chrome/browser/ash/u2f_notification.cc @@ -600,7 +598,7 @@ chrome/browser/browser_switcher/browser_switcher_service.cc chrome/browser/browser_switcher/browser_switcher_service_browsertest.cc chrome/browser/browser_switcher/browser_switcher_sitelist_unittest.cc chrome/browser/browser_switcher/ieem_sitelist_parser.cc -chrome/browser/browser_switcher/ieem_sitelist_parser_browsertest.cc +chrome/browser/browser_switcher/ieem_sitelist_parser_unittest.cc chrome/browser/browsing_data/browsing_data_remover_browsertest.cc chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc chrome/browser/browsing_data/cookies_tree_model.cc @@ -625,13 +623,15 @@ chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client_browsertest.cc chrome/browser/chrome_content_browser_client_unittest.cc chrome/browser/chrome_main_browsertest.cc +chrome/browser/chrome_multiprofile_startup_browsertest.cc chrome/browser/chrome_navigation_browsertest.cc chrome/browser/chrome_web_platform_security_metrics_browsertest.cc chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc +chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc chrome/browser/chromeos/extensions/file_manager/system_notification_manager_unittest.cc chrome/browser/chromeos/extensions/permissions_updater_delegate_chromeos_unittest.cc -chrome/browser/chromeos/extensions/telemetry/api/base_telemetry_extension_api_guard_function_browsertest.cc +chrome/browser/chromeos/extensions/telemetry/api/api_guard_delegate_unittest.cc chrome/browser/chromeos/extensions/telemetry/api/base_telemetry_extension_browser_test.cc chrome/browser/chromeos/extensions/telemetry/chromeos_permission_messages_unittest.cc chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc @@ -664,6 +664,7 @@ chrome/browser/download/download_browsertest.cc chrome/browser/download/mixed_content_download_blocking.cc chrome/browser/download/save_page_browsertest.cc chrome/browser/endpoint_fetcher/endpoint_fetcher_unittest.cc +chrome/browser/engagement/important_sites_util_browsertest.cc chrome/browser/engagement/important_sites_util_unittest.cc chrome/browser/engagement/site_engagement_service_unittest.cc chrome/browser/enterprise/connectors/analysis/analysis_service_settings_unittest.cc @@ -703,7 +704,7 @@ chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc chrome/browser/extensions/api/content_settings/content_settings_apitest.cc -chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc +chrome/browser/extensions/api/context_menus/extension_context_menu_browsertest.cc chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h @@ -734,6 +735,7 @@ chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc chrome/browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +chrome/browser/extensions/api/messaging/messaging_apitest.cc chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc chrome/browser/extensions/api/passwords_private/passwords_private_utils_unittest.cc @@ -771,11 +773,9 @@ chrome/browser/extensions/crx_installer_browsertest.cc chrome/browser/extensions/extension_action_runner_unittest.cc chrome/browser/extensions/extension_browser_window_helper.cc chrome/browser/extensions/extension_browsertest.cc -chrome/browser/extensions/extension_context_menu_browsertest.cc chrome/browser/extensions/extension_context_menu_model_unittest.cc chrome/browser/extensions/extension_loading_browsertest.cc chrome/browser/extensions/extension_message_bubble_controller_unittest.cc -chrome/browser/extensions/extension_messages_apitest.cc chrome/browser/extensions/extension_override_apitest.cc chrome/browser/extensions/extension_prefs_unittest.cc chrome/browser/extensions/extension_service_sync_unittest.cc @@ -816,6 +816,7 @@ chrome/browser/feedback/system_logs/log_sources/crash_ids_source.cc chrome/browser/first_run/first_run_unittest.cc chrome/browser/flag-metadata.json chrome/browser/flag_descriptions.cc +chrome/browser/font_prewarmer_tab_helper_browsertest.cc chrome/browser/google/google_search_domain_mixing_metrics_emitter.h chrome/browser/google/google_search_domain_mixing_metrics_emitter_factory.h chrome/browser/google/google_search_domain_mixing_metrics_emitter_unittest.cc @@ -929,6 +930,7 @@ chrome/browser/notifications/win/notification_template_builder.cc chrome/browser/optimization_guide/chrome_hints_manager_unittest.cc chrome/browser/optimization_guide/hints_fetcher_browsertest.cc chrome/browser/optimization_guide/page_content_annotations_service_browsertest.cc +chrome/browser/page_load_metrics/integration_tests/largest_contentful_paint_browsertest.cc chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer_unittest.cc @@ -943,7 +945,6 @@ chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer_unit chrome/browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc chrome/browser/page_load_metrics/observers/prefetch_proxy_page_load_metrics_observer_unittest.cc -chrome/browser/page_load_metrics/observers/previews_ukm_observer_unittest.cc chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/scheme_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc @@ -969,9 +970,9 @@ chrome/browser/performance_hints/rewrite_handler.h chrome/browser/performance_hints/rewrite_handler_unittest.cc chrome/browser/permissions/chrome_permission_manager_unittest.cc chrome/browser/permissions/chrome_permission_request_manager_unittest.cc -chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc chrome/browser/permissions/permission_context_base_permissions_policy_unittest.cc chrome/browser/permissions/permissions_security_model_interactive_uitest.cc +chrome/browser/permissions/quiet_permission_prompt_model_android.cc chrome/browser/platform_keys/extension_key_permissions_service.cc chrome/browser/platform_keys/extension_platform_keys_service.cc chrome/browser/platform_util_win.cc @@ -980,8 +981,8 @@ chrome/browser/policy/cloud/cloud_policy_browsertest.cc chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc chrome/browser/policy/extension_force_install_mixin.cc chrome/browser/policy/extension_policy_browsertest.cc -chrome/browser/policy/policy_test_utils.cc -chrome/browser/policy/policy_test_utils.h +chrome/browser/policy/safe_search_policy_test.cc +chrome/browser/policy/safe_search_policy_test.h chrome/browser/policy/serial_allow_usb_devices_for_urls_policy_handler_unittest.cc chrome/browser/policy/test/force_google_safe_search_policy_browsertest.cc chrome/browser/policy/test/policy_statistics_collector_browsertest.cc @@ -1010,7 +1011,6 @@ chrome/browser/prefs/chrome_command_line_pref_store_proxy_unittest.cc chrome/browser/prefs/pref_functional_browsertest.cc chrome/browser/prefs/pref_metrics_service.cc chrome/browser/prefs/session_startup_pref_unittest.cc -chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc chrome/browser/printing/print_preview_dialog_controller_unittest.cc chrome/browser/privacy/secure_dns_bridge.cc chrome/browser/process_singleton_posix.cc @@ -1156,10 +1156,10 @@ chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_device_list_ chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.html chrome/browser/resources/settings/chromeos/device_page/stylus.js chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html +chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js chrome/browser/resources/settings/chromeos/os_about_page/channel_switcher_dialog.html chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.html chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/borealis_page/borealis_detail_view.html -chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/icons.html chrome/browser/resources/settings/chromeos/os_icons.html chrome/browser/resources/settings/chromeos/os_people_page/account_manager.js chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js @@ -1189,6 +1189,7 @@ chrome/browser/safe_browsing/download_protection/download_feedback.cc chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc chrome/browser/safe_browsing/download_protection/two_phase_uploader.h +chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.cc chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc @@ -1206,6 +1207,7 @@ chrome/browser/search_engines/template_url_parser_unittest.cc chrome/browser/search_engines/template_url_service_sync_unittest.cc chrome/browser/search_engines/template_url_service_test_util.cc chrome/browser/search_engines/template_url_service_unittest.cc +chrome/browser/segmentation_platform/segmentation_platform_config.cc chrome/browser/send_tab_to_self/desktop_notification_handler_unittest.cc chrome/browser/send_tab_to_self/send_tab_to_self_desktop_util_unittest.cc chrome/browser/serial/chrome_serial_browsertest.cc @@ -1252,9 +1254,6 @@ chrome/browser/ssl/typed_navigation_upgrade_throttle_browsertest.cc chrome/browser/startup_data.h chrome/browser/storage/durable_storage_permission_context_unittest.cc chrome/browser/subresource_filter/subresource_filter_browsertest.cc -chrome/browser/subresource_redirect/origin_robots_rules_unittest.cc -chrome/browser/subresource_redirect/subresource_redirect_util.cc -chrome/browser/subresource_redirect/subresource_redirect_util_unit_test.cc chrome/browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc chrome/browser/supervised_user/child_accounts/kids_management_api.cc chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc @@ -1309,8 +1308,6 @@ chrome/browser/ui/app_list/app_list_syncable_service.cc chrome/browser/ui/app_list/app_list_test_util.cc chrome/browser/ui/app_list/app_service/app_service_app_model_builder_unittest.cc chrome/browser/ui/app_list/arc/arc_usb_host_permission_browsertest.cc -chrome/browser/ui/app_list/search/arc/arc_app_reinstall_app_result.cc -chrome/browser/ui/app_list/search/arc/arc_app_reinstall_search_provider_unittest.cc chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.cc chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl_unittest.cc chrome/browser/ui/app_list/search/files/item_suggest_cache.h @@ -1329,8 +1326,7 @@ chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc chrome/browser/ui/ash/chrome_shell_delegate.cc chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc chrome/browser/ui/ash/in_session_auth_dialog_client.cc -chrome/browser/ui/ash/quick_answers/quick_answers_access_token_fetcher.cc -chrome/browser/ui/ash/quick_answers/quick_answers_ui_controller.cc +chrome/browser/ui/ash/projector/projector_utils_unittest.cc chrome/browser/ui/ash/session_controller_client_impl_unittest.cc chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc @@ -1385,6 +1381,8 @@ chrome/browser/ui/passwords/well_known_change_password_navigation_throttle.cc chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_browsertest.cc chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_unittest.cc chrome/browser/ui/pdf/adobe_reader_info_win.cc +chrome/browser/ui/quick_answers/quick_answers_access_token_fetcher.cc +chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc chrome/browser/ui/search/ntp_user_data_logger_unittest.cc chrome/browser/ui/search/search_tab_helper.h chrome/browser/ui/search/third_party_ntp_browsertest.cc @@ -1404,6 +1402,7 @@ chrome/browser/ui/toolbar/location_bar_model_unittest.cc chrome/browser/ui/toolbar/media_router_contextual_menu.cc chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc +chrome/browser/ui/views/autofill/autofill_popup_view_native_views_unittest.cc chrome/browser/ui/views/autofill/payments/local_card_migration_browsertest.cc chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_test_base.cc chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc @@ -1482,6 +1481,7 @@ chrome/browser/ui/webui/management/management_ui_handler_unittest.cc chrome/browser/ui/webui/media_router/cast_feedback_ui.cc chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc +chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc chrome/browser/ui/webui/ntp/new_tab_ui.cc chrome/browser/ui/webui/ntp/ntp_resource_cache.cc chrome/browser/ui/webui/policy/policy_ui_browsertest.cc @@ -1505,6 +1505,7 @@ chrome/browser/ui/webui/settings/site_settings_helper_unittest.cc chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc chrome/browser/ui/webui/signin/profile_picker_handler_unittest.cc chrome/browser/ui/webui/signin/signin_error_handler_unittest.cc +chrome/browser/ui/webui/signin/signin_helper_chromeos_browsertest.cc chrome/browser/ui/webui/signin/signin_reauth_ui.h chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc chrome/browser/ui/webui/theme_source_unittest.cc @@ -1547,6 +1548,7 @@ chrome/browser/web_applications/web_app_install_task.cc chrome/browser/web_applications/web_app_install_utils_unittest.cc chrome/browser/web_applications/web_app_installation_utils_unittest.cc chrome/browser/web_applications/web_app_mover_unittest.cc +chrome/browser/webauthn/cablev2_devices.h chrome/browser/webauthn/chrome_authenticator_request_delegate.cc chrome/browser/webshare/win/fake_random_access_stream.cc chrome/browser/webshare/win/share_operation.cc @@ -1618,7 +1620,6 @@ chrome/common/extensions/api/declarative_content.json chrome/common/extensions/api/dom.json chrome/common/extensions/api/enterprise_device_attributes.idl chrome/common/extensions/api/gcm.json -chrome/common/extensions/api/i18n.json chrome/common/extensions/api/identity.idl chrome/common/extensions/api/image_writer_private.idl chrome/common/extensions/api/instance_id.json @@ -1679,6 +1680,7 @@ chrome/credential_provider/test/gls_runner_test_base.cc chrome/docs/devtools-pillar.html chrome/docs/index.html chrome/docs/platform-pillar.html +chrome/install_static/google_chrome_install_modes.cc chrome/install_static/install_constants.h chrome/install_static/install_details.h chrome/install_static/install_modes_unittest.cc @@ -1766,19 +1768,10 @@ chrome/renderer/searchbox/searchbox.h chrome/renderer/searchbox/searchbox_extension.cc chrome/renderer/searchbox/searchbox_extension.h chrome/renderer/searchbox/searchbox_unittest.cc -chrome/renderer/subresource_redirect/subresource_redirect_util_unittest.cc chrome/renderer/translate/translate_agent_browsertest.cc -chrome/service/cloud_print/cloud_print_connector.cc -chrome/service/cloud_print/cloud_print_service_helpers_unittest.cc -chrome/service/cloud_print/connector_settings_unittest.cc -chrome/service/cloud_print/printer_job_handler_unittest.cc -chrome/service/service_process.cc -chrome/service/service_process.h chrome/services/file_util/public/cpp/sandboxed_document_analyzer_unittest.cc chrome/services/mac_notifications/mac_notification_service_ns.mm -chrome/services/speech/cloud_speech_recognition_client.cc chrome/services/util_win/av_products.cc -chrome/test/BUILD.gn chrome/test/base/android/android_browser_test.h chrome/test/base/chromeos/test_chrome_main.cc chrome/test/base/in_process_browser_test_browsertest.cc @@ -1804,7 +1797,8 @@ chrome/test/chromedriver/test/run_py_tests.py chrome/test/chromedriver/test/run_webdriver_tests.py chrome/test/chromedriver/window_commands.cc chrome/test/chromedriver/window_commands_unittest.cc -chrome/test/enterprise/e2e/connector/reporting_connector_splunk/reporting_connector_ui_test.py +chrome/test/enterprise/e2e/connector/common/realtime_reporting_ui_test.py +chrome/test/enterprise/e2e/connector/realtime_reporting_bce/reporting_server.py chrome/test/enterprise/e2e/policy/allow_deleting_browser_history/allow_deleting_browser_history.py chrome/test/enterprise/e2e/policy/allow_deleting_browser_history/allow_deleting_browser_history_webdriver_test.py chrome/test/enterprise/e2e/policy/apps_shortcut/apps_shortcut.py @@ -1830,7 +1824,6 @@ chrome/test/enterprise/e2e/policy/user_data_dir/user_data_dir.py chrome/test/enterprise/e2e/policy/webprotect_bulk_text_entry/webprotect_bulk_text_entry_webdriver.py chrome/test/enterprise/e2e/policy/webprotect_file_download/webprotect_file_download_webdriver.py chrome/test/enterprise/e2e/policy/youtube_restrict/youtube_restrict.py -chrome/test/media_router/media_router_integration_browsertest.cc chrome/test/mini_installer/PRESUBMIT.py chrome/test/mini_installer/create_zip.py chrome/test/mini_installer/installer_test.py @@ -1851,6 +1844,7 @@ chrome/updater/constants.h chrome/updater/crash_reporter.cc chrome/updater/external_constants_builder_unittest.cc chrome/updater/external_constants_override_unittest.cc +chrome/updater/mac/keystone/ksadmin_unittest.cc chrome/updater/mac/setup/ks_tickets.mm chrome/updater/mac/setup/ks_tickets_unittest.mm chrome/updater/test/service/win/ui.py @@ -1876,12 +1870,11 @@ chromecast/base/chromecast_switches.cc chromecast/browser/renderer_prelauncher_test.cc chromecast/browser/webui/cast_webui.cc chromecast/browser/webview/web_content_controller.cc -chromecast/cast_core/grpc_resource_data_source.cc -chromecast/cast_core/grpc_resource_data_source_unittest.cc -chromecast/cast_core/grpc_webui_controller.cc +chromecast/cast_core/runtime/browser/grpc_resource_data_source.cc +chromecast/cast_core/runtime/browser/grpc_resource_data_source_unittest.cc +chromecast/cast_core/runtime/browser/grpc_webui_controller.cc chromecast/chromecast.gni chromecast/common/activity_url_filter_unittest.cc -chromecast/common/extensions_api/i18n.json chromecast/common/extensions_api/tabs.json chromecast/common/extensions_api/windows.json chromecast/crash/linux/minidump_uploader.cc @@ -1899,6 +1892,8 @@ chromeos/components/multidevice/stub_multidevice_util.cc chromeos/components/quick_answers/translation_result_loader.cc chromeos/components/quick_answers/translation_result_loader_unittest.cc chromeos/components/string_matching/tokenized_string_unittest.cc +chromeos/components/test/data/onc/proxy_config.json +chromeos/components/test/data/onc/shill_wifi_proxy.json chromeos/cryptohome/userdataauth_util.cc chromeos/dbus/arc/arc_obb_mounter_client.h chromeos/dbus/biod/fake_biod_client_unittest.cc @@ -1945,18 +1940,15 @@ chromeos/services/device_sync/remote_device_provider_impl_unittest.cc chromeos/services/device_sync/remote_device_v2_loader_impl_unittest.cc chromeos/services/device_sync/switches.cc chromeos/services/libassistant/public/cpp/assistant_suggestion.h -chromeos/test/data/network/proxy_config.json -chromeos/test/data/network/shill_wifi_proxy.json chromeos/tpm/tpm_token_info_getter_unittest.cc cloud_print/virtual_driver/win/install/setup.cc cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd cloud_print/virtual_driver/win/port_monitor/port_monitor.cc components/account_manager_core/account_manager_facade_impl_unittest.cc -components/account_manager_core/chromeos/account_manager_unittest.cc components/android_system_error_page/error_page_populator.cc components/app_restore/full_restore_info_unittest.cc +components/arc/common/intent_helper/link_handler_model_unittest.cc components/arc/intent_helper/arc_intent_helper_bridge_unittest.cc -components/arc/intent_helper/link_handler_model_unittest.cc components/assist_ranker/predictor_config_definitions.cc components/autofill/PRESUBMIT.py components/autofill/content/renderer/PRESUBMIT.py @@ -1965,6 +1957,7 @@ components/autofill/content/renderer/html_based_username_detector_browsertest.cc components/autofill/content/renderer/page_passwords_analyser.cc components/autofill/content/renderer/password_form_conversion_utils.cc components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc +components/autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals.js components/autofill/core/browser/autofill_download_manager.cc components/autofill/core/browser/autofill_download_manager_unittest.cc components/autofill/core/browser/autofill_experiments.cc @@ -2015,7 +2008,7 @@ components/autofill_assistant/browser/devtools/message_dispatcher.h components/autofill_assistant/browser/devtools/value_conversions.h components/autofill_assistant/browser/field_formatter_unittest.cc components/autofill_assistant/browser/script_parameters_unittest.cc -components/autofill_assistant/browser/service/cup.h +components/autofill_assistant/browser/service/cup_impl.h components/autofill_assistant/browser/service/server_url_fetcher.cc components/autofill_assistant/browser/service/server_url_fetcher_unittest.cc components/autofill_assistant/browser/starter_unittest.cc @@ -2116,6 +2109,8 @@ components/drive/service/fake_drive_service.cc components/embedder_support/android/BUILD.gn components/error_page/common/localized_error.cc components/error_page_strings.grdp +components/exo/data_offer_unittest.cc +components/exo/seat_unittest.cc components/exo/ui_lock_controller.h components/favicon/content/content_favicon_driver_unittest.cc components/favicon/core/fallback_url_util_unittest.cc @@ -2132,6 +2127,7 @@ components/favicon/core/large_icon_service_impl.cc components/favicon/core/large_icon_service_impl_unittest.cc components/favicon_base/favicon_url_parser.h components/favicon_base/favicon_url_parser_unittest.cc +components/feed/core/v2/api_test/feed_api_stream_unittest.cc components/feed/core/v2/feed_network_impl.cc components/feed/core/v2/feed_network_impl_unittest.cc components/feed/core/v2/public/public_types_unittest.cc @@ -2185,7 +2181,6 @@ components/history_clusters/core/content_visibility_cluster_finalizer_unittest.c components/history_clusters/core/history_clusters_service_test_api.cc components/history_clusters/core/history_clusters_service_unittest.cc components/history_clusters/core/on_device_clustering_backend_unittest.cc -components/history_clusters/core/on_device_clustering_util_unittest.cc components/history_clusters/core/ranking_cluster_finalizer_unittest.cc components/history_clusters/core/similar_visit_deduper_cluster_finalizer_unittest.cc components/history_clusters/core/single_visit_cluster_finalizer_unittest.cc @@ -2299,58 +2294,58 @@ components/omnibox/browser/titled_url_match_utils_unittest.cc components/omnibox/browser/zero_suggest_provider.cc components/omnibox/browser/zero_suggest_verbatim_match_provider_unittest.cc components/omnibox/resources/omnibox_pedal_concepts.json -components/omnibox/resources/omnibox_pedal_concepts_am.json -components/omnibox/resources/omnibox_pedal_concepts_ar.json -components/omnibox/resources/omnibox_pedal_concepts_bg.json -components/omnibox/resources/omnibox_pedal_concepts_bn.json -components/omnibox/resources/omnibox_pedal_concepts_ca.json -components/omnibox/resources/omnibox_pedal_concepts_cs.json -components/omnibox/resources/omnibox_pedal_concepts_da.json -components/omnibox/resources/omnibox_pedal_concepts_de.json -components/omnibox/resources/omnibox_pedal_concepts_el.json -components/omnibox/resources/omnibox_pedal_concepts_en-GB.json -components/omnibox/resources/omnibox_pedal_concepts_en.json -components/omnibox/resources/omnibox_pedal_concepts_es-419.json -components/omnibox/resources/omnibox_pedal_concepts_es.json -components/omnibox/resources/omnibox_pedal_concepts_et.json -components/omnibox/resources/omnibox_pedal_concepts_fa.json -components/omnibox/resources/omnibox_pedal_concepts_fi.json -components/omnibox/resources/omnibox_pedal_concepts_fil.json -components/omnibox/resources/omnibox_pedal_concepts_fr.json -components/omnibox/resources/omnibox_pedal_concepts_gu.json -components/omnibox/resources/omnibox_pedal_concepts_he.json -components/omnibox/resources/omnibox_pedal_concepts_hi.json -components/omnibox/resources/omnibox_pedal_concepts_hr.json -components/omnibox/resources/omnibox_pedal_concepts_hu.json -components/omnibox/resources/omnibox_pedal_concepts_id.json -components/omnibox/resources/omnibox_pedal_concepts_it.json -components/omnibox/resources/omnibox_pedal_concepts_ja.json -components/omnibox/resources/omnibox_pedal_concepts_kn.json -components/omnibox/resources/omnibox_pedal_concepts_ko.json -components/omnibox/resources/omnibox_pedal_concepts_lt.json -components/omnibox/resources/omnibox_pedal_concepts_lv.json -components/omnibox/resources/omnibox_pedal_concepts_ml.json -components/omnibox/resources/omnibox_pedal_concepts_mr.json -components/omnibox/resources/omnibox_pedal_concepts_ms.json -components/omnibox/resources/omnibox_pedal_concepts_nl.json -components/omnibox/resources/omnibox_pedal_concepts_pl.json -components/omnibox/resources/omnibox_pedal_concepts_pt-BR.json -components/omnibox/resources/omnibox_pedal_concepts_pt-PT.json -components/omnibox/resources/omnibox_pedal_concepts_ro.json -components/omnibox/resources/omnibox_pedal_concepts_ru.json -components/omnibox/resources/omnibox_pedal_concepts_sk.json -components/omnibox/resources/omnibox_pedal_concepts_sl.json -components/omnibox/resources/omnibox_pedal_concepts_sr.json -components/omnibox/resources/omnibox_pedal_concepts_sv.json -components/omnibox/resources/omnibox_pedal_concepts_sw.json -components/omnibox/resources/omnibox_pedal_concepts_ta.json -components/omnibox/resources/omnibox_pedal_concepts_te.json -components/omnibox/resources/omnibox_pedal_concepts_th.json -components/omnibox/resources/omnibox_pedal_concepts_tr.json -components/omnibox/resources/omnibox_pedal_concepts_uk.json -components/omnibox/resources/omnibox_pedal_concepts_vi.json -components/omnibox/resources/omnibox_pedal_concepts_zh-CN.json -components/omnibox/resources/omnibox_pedal_concepts_zh-TW.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_am.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_ar.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_bg.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_bn.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_ca.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_cs.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_da.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_de.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_el.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_en-GB.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_es-419.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_es.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_et.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_fa.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_fi.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_fil.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_fr.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_gu.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_he.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_hi.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_hr.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_hu.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_id.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_it.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_ja.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_kn.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_ko.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_lt.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_lv.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_ml.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_mr.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_ms.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_nl.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_pl.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_pt-BR.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_pt-PT.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_ro.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_ru.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_sk.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_sl.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_sr.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_sv.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_sw.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_ta.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_te.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_th.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_tr.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_uk.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_vi.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_zh-CN.json +components/omnibox/resources/omnibox_pedal_concepts_desktop_zh-TW.json components/omnibox/resources/omnibox_pedal_synonyms.grd components/omnibox/resources/omnibox_pedal_synonyms.grd_unused components/omnibox_pedal_ui_strings.grdp @@ -2365,6 +2360,7 @@ components/optimization_guide/core/optimization_guide_constants.cc components/optimization_guide/core/optimization_guide_util.h components/optimization_guide/core/optimization_guide_util_unittest.cc components/optimization_guide/core/optimization_metadata_unittest.cc +components/optimization_guide/core/page_entities_model_executor_impl.cc components/optimization_guide/core/page_topics_model_executor_unittest.cc components/optimization_guide/core/page_visibility_model_executor_unittest.cc components/optimization_guide/core/tflite_model_executor_unittest.cc @@ -2506,8 +2502,8 @@ components/permissions/permission_manager_unittest.cc components/permissions/permission_request_manager.cc components/permissions/permission_request_manager_unittest.cc components/permissions/permission_uma_util.h +components/permissions/prediction_service/prediction_common.h components/permissions/prediction_service/prediction_service_base.h -components/permissions/prediction_service/prediction_service_common.h components/permissions/test/mock_permission_request.h components/permissions_strings.grdp components/policy/core/browser/browser_policy_connector.cc @@ -2520,12 +2516,10 @@ components/policy/core/browser/url_allowlist_policy_handler.h components/policy/core/browser/url_blocklist_manager.h components/policy/core/browser/url_blocklist_manager_unittest.cc components/policy/core/browser/url_blocklist_policy_handler.h -components/policy/core/browser/url_util.cc -components/policy/core/browser/url_util.h -components/policy/core/browser/url_util_unittest.cc components/policy/core/common/cloud/cloud_policy_client_unittest.cc components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc components/policy/core/common/cloud/user_info_fetcher_unittest.cc +components/policy/core/common/default_chrome_apps_migrator_unittest.cc components/policy/core/common/policy_loader_common.cc components/policy/core/common/policy_loader_common_unittest.cc components/policy/core/common/policy_loader_lacros_unittest.cc @@ -2666,7 +2660,9 @@ components/security_interstitials/core/safe_browsing_loud_error_ui.cc components/security_interstitials/core/urls.cc components/security_interstitials_strings.grdp components/security_state/core/security_state.h +components/segmentation_platform/internal/execution/model_execution_manager_factory.cc components/segmentation_platform/internal/execution/segmentation_model_executor_unittest.cc +components/segmentation_platform/internal/proto/PRESUBMIT.py components/send_tab_to_self/send_tab_to_self_bridge_unittest.cc components/send_tab_to_self/target_device_info_unittest.cc components/services/app_service/app_service_mojom_impl_unittest.cc @@ -2737,7 +2733,6 @@ components/subresource_filter/content/browser/content_subresource_filter_web_con components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.h components/subresource_filter/core/browser/subresource_filter_constants.h components/subresource_filter/core/common/PRESUBMIT.py -components/subresource_redirect/common/subresource_redirect_features.cc components/sync/PRESUBMIT.py components/sync/base/sync_util.cc components/sync/driver/resources/about.js @@ -2790,6 +2785,9 @@ components/url_formatter/url_formatter.h components/url_formatter/url_formatter_unittest.cc components/url_matcher/url_matcher.h components/url_matcher/url_matcher_unittest.cc +components/url_matcher/url_util.cc +components/url_matcher/url_util.h +components/url_matcher/url_util_unittest.cc components/url_pattern_index/PRESUBMIT.py components/url_pattern_index/url_pattern_index_unittest.cc components/url_pattern_index/url_pattern_unittest.cc @@ -2835,8 +2833,8 @@ content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm content/browser/accessibility/accessibility_action_browsertest.cc content/browser/accessibility/accessibility_auralinux_browsertest.cc content/browser/accessibility/browser_accessibility.h -content/browser/accessibility/browser_accessibility_com_win.h content/browser/accessibility/browser_accessibility_manager.cc +content/browser/accessibility/browser_accessibility_manager.h content/browser/accessibility/hit_testing_browsertest.cc content/browser/android/content_url_loader_factory.cc content/browser/android/nfc_host_unittest.cc @@ -2868,6 +2866,7 @@ content/browser/devtools/devtools_protocol_encoding_cbor_fuzzer.cc content/browser/devtools/protocol/devtools_protocol_browsertest.cc content/browser/download/mhtml_generation_browsertest.cc content/browser/download/save_package_unittest.cc +content/browser/fenced_frame/fenced_frame_unittest.cc content/browser/file_system/browser_file_system_helper_unittest.cc content/browser/font_access/font_enumeration_cache.cc content/browser/font_access/font_enumeration_cache_win.cc @@ -2968,7 +2967,6 @@ content/browser/zygote_host/zygote_host_impl_linux.cc content/child/runtime_features.cc content/common/zygote/zygote_communication_linux.h content/public/android/java/res/values/strings.xml -content/public/browser/back_forward_cache.h content/public/browser/browser_main_parts.h content/public/browser/browser_task_traits.h content/public/browser/browsing_data_filter_builder.h @@ -3026,6 +3024,7 @@ content/test/gpu/power_measurement_results/analyze_power_measurement_results.py content/test/gpu/suppress_flakes.py content/test/gpu/trim_culprit_cls.py content/test/gpu/unexpected_pass_finder.py +content/test/gpu/unexpected_passes/gpu_queries_unittest.py content/test/test_render_view_host.cc content/web_test/browser/fake_bluetooth_chooser.h content/web_test/browser/fake_bluetooth_chooser_factory.h @@ -3080,6 +3079,7 @@ docs/website/infra/config/PRESUBMIT.py docs/website/scripts/404s.txt docs/website/scripts/common.py docs/website/scripts/export.py +docs/website/scripts/fetch_node_modules.py docs/website/scripts/paths_to_skip.txt docs/website/site/Home/google-ssl.xml docs/website/site/administrators/err_ssl_weak_server_ephemeral_dh_key/redirect-dh.xml @@ -3088,6 +3088,7 @@ docs/website/site/developers/design-documents/accessibility/tracker/CSUN_Improvi docs/website/site/developers/how-tos/gpu-wrangling/check_gpu_bots-script/check_gpu_bots.py docs/website/site/sts/redirect.xml extensions/browser/PRESUBMIT.py +extensions/browser/api/content_settings/content_settings_store_unittest.cc extensions/browser/api/content_settings/content_settings_unittest.cc extensions/browser/api/declarative/declarative_rule.h extensions/browser/api/declarative_net_request/composite_matcher_unittest.cc @@ -3121,6 +3122,7 @@ extensions/common/api/app_window.idl extensions/common/api/bluetooth_low_energy.idl extensions/common/api/bluetooth_socket.idl extensions/common/api/extensions_manifest_types.json +extensions/common/api/i18n.json extensions/common/api/networking_onc.idl extensions/common/api/networking_private.idl extensions/common/api/printer_provider.idl @@ -3147,6 +3149,7 @@ extensions/common/extension_urls.h extensions/common/file_util_unittest.cc extensions/common/manifest_constants.cc extensions/common/manifest_handlers/content_capabilities_manifest_unittest.cc +extensions/common/manifest_handlers/content_scripts_handler.cc extensions/common/manifest_handlers/externally_connectable.cc extensions/common/manifest_handlers/externally_connectable_unittest.cc extensions/common/manifest_handlers/oauth2_manifest_unittest.cc @@ -3264,9 +3267,6 @@ infra/config/generated/builders/ci/Android WebView M (dbg)/properties.json infra/config/generated/builders/ci/Android WebView N (dbg)/properties.json infra/config/generated/builders/ci/Android WebView O (dbg)/properties.json infra/config/generated/builders/ci/Android WebView P (dbg)/properties.json -infra/config/generated/builders/ci/Cast Android (dbg)/properties.json -infra/config/generated/builders/ci/Cast Linux Debug/properties.json -infra/config/generated/builders/ci/Cast Linux/properties.json infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/properties.json infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/properties.json infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/properties.json @@ -3277,6 +3277,7 @@ infra/config/generated/builders/ci/GPU Win x64 Builder/properties.json infra/config/generated/builders/ci/Linux ASan LSan Builder/properties.json infra/config/generated/builders/ci/Linux ASan LSan Tests (1)/properties.json infra/config/generated/builders/ci/Linux ASan Tests (sandboxed)/properties.json +infra/config/generated/builders/ci/Linux Builder/properties.json infra/config/generated/builders/ci/Mac Builder (dbg)/properties.json infra/config/generated/builders/ci/Mac Builder/properties.json infra/config/generated/builders/ci/Marshmallow 64 bit Tester/properties.json @@ -3287,14 +3288,10 @@ infra/config/generated/builders/ci/Win Builder (dbg)/properties.json infra/config/generated/builders/ci/Win x64 Builder/properties.json infra/config/generated/builders/ci/Win10 Tests x64/properties.json infra/config/generated/builders/ci/Win7 Tests (dbg)(1)/properties.json -infra/config/generated/builders/ci/android-cronet-arm-dbg/properties.json infra/config/generated/builders/ci/android-cronet-arm-rel-kitkat-tests/properties.json infra/config/generated/builders/ci/android-cronet-arm-rel-lollipop-tests/properties.json -infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json -infra/config/generated/builders/ci/android-marshmallow-arm64-rel/properties.json infra/config/generated/builders/ci/android-marshmallow-x86-rel/properties.json infra/config/generated/builders/ci/android-official/properties.json -infra/config/generated/builders/ci/android-pie-arm64-dbg/properties.json infra/config/generated/builders/ci/android-pie-arm64-rel/properties.json infra/config/generated/builders/ci/chromeos-amd64-generic-dbg/properties.json infra/config/generated/builders/ci/chromeos-amd64-generic-lacros-dbg/properties.json @@ -3366,7 +3363,7 @@ infra/config/generated/builders/try/linux_layout_tests_layout_ng_disabled/proper infra/config/generated/builders/try/linux_optional_gpu_tests_rel/properties.json infra/config/generated/builders/try/linux_vr/properties.json infra/config/generated/builders/try/mac-official/properties.json -infra/config/generated/builders/try/mac-rel/properties.json +infra/config/generated/builders/try/mac-rel-compilator/properties.json infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/properties.json infra/config/generated/builders/try/mac_optional_gpu_tests_rel/properties.json infra/config/generated/builders/try/win-official/properties.json @@ -3406,11 +3403,13 @@ ios/chrome/browser/history/history_tab_helper_unittest.mm ios/chrome/browser/metrics/tab_usage_recorder_browser_agent_unittest.mm ios/chrome/browser/net/cookie_util_unittest.mm ios/chrome/browser/net/retryable_url_fetcher_unittest.mm +ios/chrome/browser/ntp/browser_policy_new_tab_page_rewriter_unittest.mm ios/chrome/browser/omaha/omaha_service.mm ios/chrome/browser/optimization_guide/optimization_guide_validation_tab_helper_unittest.mm ios/chrome/browser/passwords/password_controller_js_unittest.mm ios/chrome/browser/passwords/password_controller_unittest.mm ios/chrome/browser/passwords/test/mock_ios_chrome_save_passwords_infobar_delegate.mm +ios/chrome/browser/policy/new_tab_page_location_policy_handler_unittest.cc ios/chrome/browser/policy/policy_watcher_browser_agent_unittest.mm ios/chrome/browser/policy/reporting/profile_report_generator_ios_unittest.mm ios/chrome/browser/policy/restrict_accounts_policy_handler_unittest.cc @@ -3496,7 +3495,6 @@ ios/chrome/browser/ui/toolbar/toolbar_mediator_unittest.mm ios/chrome/browser/ui/util/pasteboard_util_unittest.mm ios/chrome/browser/ui/webui/interstitials/interstitial_ui_util.mm ios/chrome/browser/url_loading/image_search_param_generator_unittest.mm -ios/chrome/browser/web/chrome_web_client_unittest.mm ios/chrome/browser/web/font_size/font_size_tab_helper_unittest.mm ios/chrome/browser/web/print/resources/print.js ios/chrome/browser/web_state_list/web_state_list_order_controller_unittest.mm @@ -3509,6 +3507,7 @@ ios/chrome/credential_provider_extension/strings/ios_credential_provider_extensi ios/chrome/test/data/policy/policy_test_cases.json ios/chrome/test/earl_grey/chrome_earl_grey_ui.h ios/chrome/test/earl_grey/device_check_egtest.mm +ios/chrome/test/providers/omaha/test_omaha.cc ios/chrome/test/xcuitest/device_check_xctest.mm ios/components/credential_provider_extension/password_spec_fetcher.mm ios/net/cookies/cookie_cache_unittest.cc @@ -3517,7 +3516,6 @@ ios/net/cookies/cookie_store_ios_unittest.mm ios/net/cookies/system_cookie_store_unittest_template.h ios/net/crn_http_protocol_handler.mm ios/net/nsurlrequest_util_unittest.mm -ios/public/provider/chrome/browser/omaha/test_omaha.cc ios/public/provider/chrome/browser/signin/chrome_identity_service.h ios/public/provider/chrome/browser/signin/chrome_identity_service.mm ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm @@ -3572,9 +3570,6 @@ ios/web_view/public/cwv_translation_language.h ios/web_view/public/cwv_web_view.h ipc/ipc_channel.h ipc/ipc_message.cc -jingle/notifier/base/gaia_token_pre_xmpp_auth.cc -jingle/notifier/base/notifier_options_util.cc -jingle/notifier/communicator/single_login_attempt.cc media/PRESUBMIT.py media/audio/android/audio_track_output_stream.cc media/audio/android/opensles_util.cc @@ -3620,6 +3615,8 @@ media/filters/video_cadence_estimator.h media/fuchsia/common/vmo_buffer_writer_queue.cc media/gpu/android/android_video_encode_accelerator.h media/gpu/chromeos/libyuv_image_processor_backend.cc +media/gpu/gpu_video_encode_accelerator_helpers.cc +media/gpu/v4l2/test/vp9_decoder.cc media/gpu/vaapi/test/av1_decoder.cc media/gpu/vaapi/test/vp8_decoder.cc media/gpu/vaapi/test/vp9_decoder.cc @@ -3629,7 +3626,6 @@ media/gpu/vaapi/vaapi_jpeg_decoder_unittest.cc media/gpu/vaapi/vaapi_unittest.cc media/gpu/vaapi/vaapi_utils_unittest.cc media/gpu/vaapi/vaapi_webp_decoder_unittest.cc -media/gpu/vaapi/vp9_vaapi_video_encoder_delegate.cc media/gpu/windows/d3d11_av1_accelerator.cc media/gpu/windows/d3d11_video_decoder.cc media/gpu/windows/d3d11_vp9_accelerator.cc @@ -4187,6 +4183,7 @@ net/third_party/quiche/src/spdy/core/spdy_protocol.h net/tools/print_certificates.py net/tools/quic/quic_http_proxy_backend_test.cc net/tools/quic/quic_simple_client_bin.cc +net/tools/root_store_tool/root_store_tool.cc net/tools/testserver/testserver.py.vpython3 net/tools/transport_security_state_generator/transport_security_state_generator.cc net/url_request/url_fetcher.h @@ -4461,15 +4458,17 @@ testing/perf/perf_result_reporter.cc testing/scripts/PRESUBMIT.py testing/scripts/common.py testing/scripts/run_performance_tests.py -testing/scripts/run_variations_smoke_tests.py testing/scripts/rust/test_filtering_unittests.py +testing/scripts/variations_smoke_test_data/http_server/index.html testing/scripts/wpt_common.py +testing/test.gni testing/test_env.py testing/trigger_scripts/PRESUBMIT.py testing/trigger_scripts/base_test_triggerer.py testing/trigger_scripts/perf_device_trigger_unittest.py testing/unexpected_passes_common/data_types.py testing/unexpected_passes_common/data_types_unittest.py +testing/unexpected_passes_common/queries.py testing/unexpected_passes_common/result_output_unittest.py testing/variations/PRESUBMIT.py testing/variations/fieldtrial_testing_config.json @@ -4659,7 +4658,9 @@ third_party/angle/extensions/EGL_ANGLE_iosurface_client_buffer.txt third_party/angle/extensions/EGL_ANGLE_keyed_mutex.txt third_party/angle/extensions/EGL_ANGLE_metal_texture_client_buffer.txt third_party/angle/extensions/EGL_ANGLE_platform_angle_d3d_luid.txt +third_party/angle/extensions/EGL_ANGLE_platform_angle_device_id.txt third_party/angle/extensions/EGL_ANGLE_power_preference.txt +third_party/angle/extensions/EGL_ANGLE_prepare_swap_buffers.txt third_party/angle/extensions/EGL_ANGLE_program_cache_control.txt third_party/angle/extensions/EGL_ANGLE_robust_resource_initialization.txt third_party/angle/extensions/EGL_ANGLE_software_display.txt @@ -4729,12 +4730,12 @@ third_party/angle/src/libANGLE/renderer/vulkan/PersistentCommandPool.cpp third_party/angle/src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/SurfaceVk.h +third_party/angle/src/libANGLE/renderer/vulkan/VkImageImageSiblingVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp third_party/angle/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp third_party/angle/src/libANGLE/renderer/vulkan/linux/DmaBufImageSiblingVkLinux.cpp third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/ffx_a.h third_party/angle/src/libANGLE/renderer/vulkan/vk_cache_utils.h -third_party/angle/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp third_party/angle/src/libANGLE/renderer/vulkan/vk_format_utils.h third_party/angle/src/libANGLE/validationEGL.cpp third_party/angle/src/libANGLE/validationES.cpp @@ -4742,7 +4743,6 @@ third_party/angle/src/libGLESv2/global_state.cpp third_party/angle/src/libGLESv2/global_state.h third_party/angle/src/tests/egl_tests/EGLContextSharingTest.cpp third_party/angle/src/tests/egl_tests/EGLIOSurfaceClientBufferTest.cpp -third_party/angle/src/tests/egl_tests/EGLMultiContextTest.cpp third_party/angle/src/tests/gl_tests/BufferDataTest.cpp third_party/angle/src/tests/gl_tests/FramebufferTest.cpp third_party/angle/src/tests/gl_tests/GLSLTest.cpp @@ -5096,7 +5096,6 @@ third_party/blink/renderer/core/html/html_table_section_element.idl third_party/blink/renderer/core/html/media/autoplay_policy.cc third_party/blink/renderer/core/html/media/html_media_element.cc third_party/blink/renderer/core/html/portal/html_portal_element.cc -third_party/blink/renderer/core/html/subresource_redirect_test.cc third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/inspector/devtools_session.h third_party/blink/renderer/core/intersection_observer/intersection_observer_controller.h @@ -5132,7 +5131,6 @@ third_party/blink/renderer/core/layout/layout_table_section_test.cc third_party/blink/renderer/core/layout/layout_text.cc third_party/blink/renderer/core/layout/layout_text_combine.cc third_party/blink/renderer/core/layout/layout_theme_default.h -third_party/blink/renderer/core/layout/layout_view.cc third_party/blink/renderer/core/layout/layout_view.h third_party/blink/renderer/core/layout/map_coordinates_test.cc third_party/blink/renderer/core/layout/ng/inline/ng_inline_items_builder.h @@ -5168,6 +5166,7 @@ third_party/blink/renderer/core/page/print_context_test.cc third_party/blink/renderer/core/page/scrolling/element_fragment_anchor_test.cc third_party/blink/renderer/core/page/scrolling/scroll_state.idl third_party/blink/renderer/core/page/scrolling/scroll_state_init.idl +third_party/blink/renderer/core/page/validation_message_client_impl.cc third_party/blink/renderer/core/paint/box_border_painter.cc third_party/blink/renderer/core/paint/box_painter_base.h third_party/blink/renderer/core/paint/compositing/compositing_reason_finder.cc @@ -5175,12 +5174,10 @@ third_party/blink/renderer/core/paint/first_meaningful_paint_detector.cc third_party/blink/renderer/core/paint/first_meaningful_paint_detector.h third_party/blink/renderer/core/paint/image_paint_timing_detector.h third_party/blink/renderer/core/paint/ng/ng_box_fragment_painter_test.cc -third_party/blink/renderer/core/paint/paint_invalidator.h third_party/blink/renderer/core/paint/paint_layer.cc third_party/blink/renderer/core/paint/paint_layer.h third_party/blink/renderer/core/paint/paint_layer_clipper.cc third_party/blink/renderer/core/paint/paint_layer_clipper.h -third_party/blink/renderer/core/paint/paint_layer_painting_info.h third_party/blink/renderer/core/paint/paint_layer_scrollable_area.cc third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h third_party/blink/renderer/core/paint/paint_layer_stacking_node.cc @@ -5331,7 +5328,6 @@ third_party/blink/renderer/platform/fonts/web_font_decoder.cc third_party/blink/renderer/platform/fonts/web_font_typeface_factory.h third_party/blink/renderer/platform/fonts/win/font_cache_skia_win.cc third_party/blink/renderer/platform/fonts/win/font_fallback_win.cc -third_party/blink/renderer/platform/geometry/float_quad.cc third_party/blink/renderer/platform/graphics/bitmap_image.cc third_party/blink/renderer/platform/graphics/bitmap_image.h third_party/blink/renderer/platform/graphics/filters/distant_light_source.h @@ -5419,7 +5415,7 @@ third_party/blink/renderer/platform/wtf/vector_test.cc third_party/boringssl/roll_boringssl.py third_party/boringssl/src/CMakeLists.txt third_party/boringssl/src/crypto/asn1/asn1_test.cc -third_party/boringssl/src/crypto/cpu-arm-linux.c +third_party/boringssl/src/crypto/cpu_arm_linux.c third_party/boringssl/src/crypto/fipsmodule/CMakeLists.txt third_party/boringssl/src/crypto/fipsmodule/bn/mul.c third_party/boringssl/src/crypto/fipsmodule/rsa/rsa_impl.c @@ -6814,6 +6810,7 @@ third_party/dawn/examples/SampleUtils.cpp third_party/dawn/src/common/Compiler.h third_party/dawn/src/common/vulkan_platform.h third_party/dawn/src/dawn_native/CommandAllocator.cpp +third_party/dawn/src/dawn_native/CopyTextureForBrowserHelper.cpp third_party/dawn/src/dawn_native/CreatePipelineAsyncTask.cpp third_party/dawn/src/dawn_native/Features.cpp third_party/dawn/src/dawn_native/PipelineLayout.cpp @@ -6833,13 +6830,15 @@ third_party/dawn/src/dawn_native/opengl/TextureGL.cpp third_party/dawn/src/dawn_native/vulkan/RenderPassCache.h third_party/dawn/src/dawn_native/vulkan/VulkanInfo.cpp third_party/dawn/src/dawn_native/vulkan/VulkanInfo.h -third_party/dawn/src/tests/end2end/D3D12VideoViewsTests.cpp third_party/dawn/src/tests/end2end/DepthBiasTests.cpp third_party/dawn/src/tests/end2end/DepthStencilLoadOpTests.cpp third_party/dawn/src/tests/end2end/SwapChainValidationTests.cpp third_party/dawn/src/tests/end2end/TextureFormatTests.cpp third_party/dawn/src/tests/end2end/TextureViewTests.cpp third_party/dawn/src/tests/end2end/VertexStateTests.cpp +third_party/dawn/src/tests/end2end/VideoViewsTests.h +third_party/dawn/src/tests/end2end/VideoViewsTests_gbm.cpp +third_party/dawn/src/tests/end2end/VideoViewsTests_win.cpp third_party/dawn/src/tests/perf_tests/DawnPerfTestPlatform.h third_party/dawn/src/tests/perf_tests/ShaderRobustnessPerf.cpp third_party/dawn/src/tests/unittests/validation/ComputeValidationTests.cpp @@ -7260,6 +7259,7 @@ third_party/depot_tools/tests/git_cl_creds_check_report.txt third_party/depot_tools/tests/git_cl_test.py third_party/depot_tools/tests/git_migrate_default_branch_test.py third_party/depot_tools/tests/metrics_test.py +third_party/depot_tools/tests/ninjalog_uploader_test.py third_party/depot_tools/tests/presubmit_unittest.py third_party/depot_tools/tests/watchlists_unittest.py third_party/depot_tools/third_party/coverage/htmlfiles/pyfile.html @@ -7463,20 +7463,12 @@ third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/sou third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/lib/source-map-consumer.js third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/package.json third_party/devtools-frontend/src/node_modules/@babel/runtime/package.json -third_party/devtools-frontend/src/node_modules/@eslint/eslintrc/node_modules/debug/package.json -third_party/devtools-frontend/src/node_modules/@eslint/eslintrc/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/@eslint/eslintrc/node_modules/globals/package.json third_party/devtools-frontend/src/node_modules/@eslint/eslintrc/node_modules/type-fest/package.json third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/package.json third_party/devtools-frontend/src/node_modules/@sinonjs/commons/lib/class-name.js third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/lib/create-set.js third_party/devtools-frontend/src/node_modules/@sinonjs/text-encoding/package.json -third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/debug/package.json -third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/debug/src/browser.js -third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/node_modules/debug/package.json -third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/node_modules/debug/src/browser.js -third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/debug/package.json -third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/acorn/dist/acorn.js third_party/devtools-frontend/src/node_modules/acorn/package.json third_party/devtools-frontend/src/node_modules/ajv/dist/ajv.bundle.js @@ -7610,8 +7602,6 @@ third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/pa third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-styles/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/color-convert/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/color-name/package.json -third_party/devtools-frontend/src/node_modules/eslint/node_modules/debug/package.json -third_party/devtools-frontend/src/node_modules/eslint/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/eslint/node_modules/escape-string-regexp/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/definition.js third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/index.js @@ -7734,7 +7724,6 @@ third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debu third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/license-checker/package.json third_party/devtools-frontend/src/node_modules/locate-path/package.json -third_party/devtools-frontend/src/node_modules/lodash.clonedeep/package.json third_party/devtools-frontend/src/node_modules/lodash.get/package.json third_party/devtools-frontend/src/node_modules/lodash.merge/package.json third_party/devtools-frontend/src/node_modules/lodash.truncate/package.json @@ -7809,12 +7798,6 @@ third_party/devtools-frontend/src/node_modules/path-is-absolute/package.json third_party/devtools-frontend/src/node_modules/path-key/package.json third_party/devtools-frontend/src/node_modules/path-type/package.json third_party/devtools-frontend/src/node_modules/pend/package.json -third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/package.json -third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/package.json -third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/package.json -third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/package.json -third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/package.json -third_party/devtools-frontend/src/node_modules/pkg-dir/package.json third_party/devtools-frontend/src/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/progress/package.json third_party/devtools-frontend/src/node_modules/pump/package.json @@ -7900,19 +7883,13 @@ third_party/devtools-frontend/src/node_modules/sinon/lib/sinon/util/core/extend. third_party/devtools-frontend/src/node_modules/sinon/node_modules/has-flag/package.json third_party/devtools-frontend/src/node_modules/sinon/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/sinon/pkg/sinon-esm.js -third_party/devtools-frontend/src/node_modules/sinon/pkg/sinon-no-sourcemaps.js third_party/devtools-frontend/src/node_modules/sinon/pkg/sinon.js third_party/devtools-frontend/src/node_modules/slash/package.json third_party/devtools-frontend/src/node_modules/slice-ansi/node_modules/ansi-styles/package.json third_party/devtools-frontend/src/node_modules/slice-ansi/node_modules/color-convert/package.json third_party/devtools-frontend/src/node_modules/slice-ansi/node_modules/color-name/package.json -third_party/devtools-frontend/src/node_modules/slice-ansi/node_modules/is-fullwidth-code-point/package.json third_party/devtools-frontend/src/node_modules/slide/package.json -third_party/devtools-frontend/src/node_modules/socket.io/client-dist/socket.io.js third_party/devtools-frontend/src/node_modules/socket.io/package.json -third_party/devtools-frontend/src/node_modules/source-map-js/dist/source-map.debug.js -third_party/devtools-frontend/src/node_modules/source-map-js/dist/source-map.js -third_party/devtools-frontend/src/node_modules/source-map-js/dist/source-map.min.js third_party/devtools-frontend/src/node_modules/source-map-js/lib/base64-vlq.js third_party/devtools-frontend/src/node_modules/source-map-js/lib/source-map-consumer.js third_party/devtools-frontend/src/node_modules/source-map-js/package.json @@ -7925,6 +7902,8 @@ third_party/devtools-frontend/src/node_modules/source-map/package.json third_party/devtools-frontend/src/node_modules/spdx-correct/package.json third_party/devtools-frontend/src/node_modules/streamroller/node_modules/date-format/package.json third_party/devtools-frontend/src/node_modules/streamroller/package.json +third_party/devtools-frontend/src/node_modules/string-width/node_modules/ansi-regex/package.json +third_party/devtools-frontend/src/node_modules/string-width/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/string-width/package.json third_party/devtools-frontend/src/node_modules/string.prototype.trimend/package.json third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/package.json @@ -7933,23 +7912,17 @@ third_party/devtools-frontend/src/node_modules/strip-bom/package.json third_party/devtools-frontend/src/node_modules/strip-indent/package.json third_party/devtools-frontend/src/node_modules/strip-json-comments/package.json third_party/devtools-frontend/src/node_modules/stylelint/lib/reference/keywordSets.js +third_party/devtools-frontend/src/node_modules/stylelint/lib/rules/color-named/colordUtils.js third_party/devtools-frontend/src/node_modules/stylelint/lib/utils/isAutoprefixable.js third_party/devtools-frontend/src/node_modules/stylelint/lib/utils/isStandardSyntaxValue.js third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/debug/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/debug/src/browser.js -third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/package.json -third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/svg-tags/package.json third_party/devtools-frontend/src/node_modules/svgo/dist/svgo.browser.js -third_party/devtools-frontend/src/node_modules/svgo/node_modules/ansi-styles/package.json -third_party/devtools-frontend/src/node_modules/svgo/node_modules/color-convert/package.json -third_party/devtools-frontend/src/node_modules/svgo/node_modules/color-name/package.json -third_party/devtools-frontend/src/node_modules/svgo/node_modules/has-flag/package.json -third_party/devtools-frontend/src/node_modules/svgo/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/svgo/plugins/_collections.js third_party/devtools-frontend/src/node_modules/svgo/plugins/inlineStyles.js third_party/devtools-frontend/src/node_modules/svgo/plugins/mergeStyles.js @@ -7959,8 +7932,6 @@ third_party/devtools-frontend/src/node_modules/svgo/plugins/removeAttributesBySe third_party/devtools-frontend/src/node_modules/svgo/plugins/removeDesc.js third_party/devtools-frontend/src/node_modules/svgo/plugins/removeTitle.js third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/package.json -third_party/devtools-frontend/src/node_modules/table/node_modules/is-fullwidth-code-point/package.json -third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/package.json third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/tar-stream/package.json third_party/devtools-frontend/src/node_modules/terser/dist/bundle.min.js @@ -7982,12 +7953,6 @@ third_party/devtools-frontend/src/node_modules/terser/lib/scope.js third_party/devtools-frontend/src/node_modules/terser/lib/sourcemap.js third_party/devtools-frontend/src/node_modules/terser/lib/transform.js third_party/devtools-frontend/src/node_modules/terser/lib/utils/index.js -third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/node_modules/source-map/dist/source-map.debug.js -third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/node_modules/source-map/dist/source-map.js -third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/node_modules/source-map/lib/base64-vlq.js -third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/node_modules/source-map/lib/source-map-consumer.js -third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/node_modules/source-map/package.json -third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/source-map-support.js third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map/dist/source-map.js third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map/lib/base64-vlq.js third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map/lib/source-map-consumer.js @@ -8054,10 +8019,6 @@ third_party/devtools-frontend/src/node_modules/y18n/package.json third_party/devtools-frontend/src/node_modules/yaml/package.json third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/package.json third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/decamelize/package.json -third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/package.json -third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/package.json -third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/package.json -third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/yauzl/package.json third_party/devtools-frontend/src/node_modules/yocto-queue/package.json third_party/devtools-frontend/src/package.json @@ -8065,7 +8026,6 @@ third_party/devtools-frontend/src/scripts/build/compress_files.js third_party/devtools-frontend/src/scripts/check_external_links.js third_party/devtools-frontend/src/scripts/deps/download_emscripten.py third_party/devtools-frontend/src/scripts/deps/roll_to_chromium.py -third_party/devtools-frontend/src/scripts/devtools_run/package.json third_party/devtools-frontend/src/scripts/hosted_mode/server.js third_party/devtools-frontend/src/test/e2e/resources/console/primitives.html third_party/devtools-frontend/src/third_party/blink/public/devtools_protocol/browser_protocol.json @@ -8179,6 +8139,7 @@ third_party/eigen3/src/Eigen/src/Core/arch/NEON/Complex.h third_party/eigen3/src/Eigen/src/Core/arch/NEON/MathFunctions.h third_party/eigen3/src/Eigen/src/Core/arch/NEON/PacketMath.h third_party/eigen3/src/Eigen/src/Core/arch/NEON/TypeCasting.h +third_party/eigen3/src/Eigen/src/Core/arch/NEON/UnaryFunctors.h third_party/eigen3/src/Eigen/src/Core/arch/SSE/Complex.h third_party/eigen3/src/Eigen/src/Core/arch/SSE/MathFunctions.h third_party/eigen3/src/Eigen/src/Core/arch/SSE/PacketMath.h @@ -8290,7 +8251,6 @@ third_party/eigen3/src/Eigen/src/SparseCholesky/SimplicialCholesky_impl.h third_party/eigen3/src/Eigen/src/SparseCore/AmbiVector.h third_party/eigen3/src/Eigen/src/SparseCore/CompressedStorage.h third_party/eigen3/src/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h -third_party/eigen3/src/Eigen/src/SparseCore/MappedSparseMatrix.h third_party/eigen3/src/Eigen/src/SparseCore/SparseAssign.h third_party/eigen3/src/Eigen/src/SparseCore/SparseBlock.h third_party/eigen3/src/Eigen/src/SparseCore/SparseColEtree.h @@ -8344,6 +8304,7 @@ third_party/eigen3/src/Eigen/src/UmfPackSupport/UmfPackSupport.h third_party/eigen3/src/Eigen/src/misc/Image.h third_party/eigen3/src/Eigen/src/misc/Kernel.h third_party/eigen3/src/Eigen/src/misc/RealSvd2x2.h +third_party/eigen3/src/Eigen/src/misc/lapacke_helpers.h third_party/eigen3/src/Eigen/src/plugins/BlockMethods.h third_party/eigen3/src/Eigen/src/plugins/CommonCwiseBinaryOps.h third_party/eigen3/src/Eigen/src/plugins/CommonCwiseUnaryOps.h @@ -8655,9 +8616,11 @@ third_party/eigen3/src/unsupported/Eigen/src/EulerAngles/EulerAngles.h third_party/eigen3/src/unsupported/Eigen/src/EulerAngles/EulerSystem.h third_party/eigen3/src/unsupported/Eigen/src/FFT/ei_fftw_impl.h third_party/eigen3/src/unsupported/Eigen/src/FFT/ei_kissfft_impl.h +third_party/eigen3/src/unsupported/Eigen/src/IterativeSolvers/BiCGSTABL.h third_party/eigen3/src/unsupported/Eigen/src/IterativeSolvers/DGMRES.h third_party/eigen3/src/unsupported/Eigen/src/IterativeSolvers/GMRES.h third_party/eigen3/src/unsupported/Eigen/src/IterativeSolvers/IDRS.h +third_party/eigen3/src/unsupported/Eigen/src/IterativeSolvers/IDRSTABL.h third_party/eigen3/src/unsupported/Eigen/src/IterativeSolvers/IncompleteLU.h third_party/eigen3/src/unsupported/Eigen/src/IterativeSolvers/MINRES.h third_party/eigen3/src/unsupported/Eigen/src/IterativeSolvers/Scaling.h @@ -8710,6 +8673,7 @@ third_party/eigen3/src/unsupported/test/alignedvector3.cpp third_party/eigen3/src/unsupported/test/autodiff.cpp third_party/eigen3/src/unsupported/test/autodiff_scalar.cpp third_party/eigen3/src/unsupported/test/bessel_functions.cpp +third_party/eigen3/src/unsupported/test/bicgstabl.cpp third_party/eigen3/src/unsupported/test/cxx11_eventcount.cpp third_party/eigen3/src/unsupported/test/cxx11_meta.cpp third_party/eigen3/src/unsupported/test/cxx11_non_blocking_thread_pool.cpp @@ -8801,6 +8765,7 @@ third_party/eigen3/src/unsupported/test/dgmres.cpp third_party/eigen3/src/unsupported/test/forward_adolc.cpp third_party/eigen3/src/unsupported/test/gmres.cpp third_party/eigen3/src/unsupported/test/idrs.cpp +third_party/eigen3/src/unsupported/test/idrstabl.cpp third_party/eigen3/src/unsupported/test/kronecker_product.cpp third_party/eigen3/src/unsupported/test/levenberg_marquardt.cpp third_party/eigen3/src/unsupported/test/matrix_exponential.cpp @@ -9526,10 +9491,12 @@ third_party/grpc/src/package.xml third_party/grpc/src/setup.py third_party/grpc/src/src/boringssl/gen_build_yaml.py third_party/grpc/src/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc -third_party/grpc/src/src/core/ext/service_config/service_config.h third_party/grpc/src/src/core/ext/transport/binder/security_policy/security_policy.h third_party/grpc/src/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc third_party/grpc/src/src/core/ext/xds/xds_api.cc +third_party/grpc/src/src/core/ext/xds/xds_common_types.cc +third_party/grpc/src/src/core/ext/xds/xds_listener.cc +third_party/grpc/src/src/core/ext/xds/xds_route_config.cc third_party/grpc/src/src/core/lib/gpr/string.h third_party/grpc/src/src/core/lib/gprpp/status_helper.cc third_party/grpc/src/src/core/lib/iomgr/socket_windows.cc @@ -9541,6 +9508,7 @@ third_party/grpc/src/src/core/lib/security/credentials/google_default/google_def third_party/grpc/src/src/core/lib/security/credentials/jwt/json_token.h third_party/grpc/src/src/core/lib/security/credentials/jwt/jwt_verifier.h third_party/grpc/src/src/core/lib/security/security_connector/ssl_utils_config.cc +third_party/grpc/src/src/core/lib/service_config/service_config.h third_party/grpc/src/src/csharp/Grpc.Tools/build/_grpc/Grpc.CSharp.xml third_party/grpc/src/src/csharp/Grpc.Tools/build/_protobuf/Protobuf.CSharp.xml third_party/grpc/src/src/python/grpcio/grpc/__init__.py @@ -9821,6 +9789,7 @@ third_party/libaom/source/libaom/tools/inspect-cli.js third_party/libaom/source/libaom/tools/intersect-diffs.py third_party/libaom/source/libaom/tools/wrap-commit-msg.py third_party/libavif/src/src/codec_aom.c +third_party/libavif/src/src/reformat.c third_party/libavif/src/src/reformat_libyuv.c third_party/libdrm/src/android/gralloc_handle.h third_party/libdrm/src/etnaviv/etnaviv_bo.c @@ -10119,6 +10088,7 @@ third_party/llvm/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cpp third_party/llvm/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.h third_party/llvm/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp third_party/llvm/compiler-rt/lib/scudo/standalone/platform.h +third_party/llvm/compiler-rt/lib/tsan/rtl/tsan_rtl_access.cpp third_party/llvm/compiler-rt/test/asan/TestCases/Darwin/address-range-limit.mm third_party/llvm/compiler-rt/test/asan/TestCases/Darwin/cstring_literals_regtest.mm third_party/llvm/compiler-rt/test/asan/TestCases/Darwin/linked-only.cpp @@ -10175,8 +10145,6 @@ third_party/llvm/flang/runtime/file.cpp third_party/llvm/libclc/generic/lib/gen_convert.py third_party/llvm/libcxx/CREDITS.TXT third_party/llvm/libcxx/src/chrono.cpp -third_party/llvm/libcxx/utils/google-benchmark/setup.py -third_party/llvm/libcxx/utils/google-benchmark/src/cycleclock.h third_party/llvm/libcxxabi/CREDITS.TXT third_party/llvm/lld/CODE_OWNERS.TXT third_party/llvm/lld/COFF/Driver.cpp @@ -10258,7 +10226,6 @@ third_party/llvm/llvm/tools/msbuild/llvm-general.xml third_party/llvm/llvm/unittests/Support/ManagedStatic.cpp third_party/llvm/llvm/unittests/Support/Path.cpp third_party/llvm/llvm/unittests/Support/RegexTest.cpp -third_party/llvm/llvm/utils/benchmark/src/cycleclock.h third_party/llvm/llvm/utils/gn/TODO.txt third_party/llvm/llvm/utils/gn/build/symbol_exports.gni third_party/llvm/llvm/utils/gn/build/toolchain/BUILD.gn @@ -10286,6 +10253,8 @@ third_party/llvm/polly/www/index.html third_party/llvm/polly/www/projects.html third_party/llvm/pstl/CREDITS.txt third_party/llvm/pstl/test/std/numerics/numeric.ops/scan.pass.cpp +third_party/llvm/third-party/benchmark/setup.py +third_party/llvm/third-party/benchmark/src/cycleclock.h third_party/lottie/lottie_worker.js third_party/mako/doc/_static/doctools.js third_party/mako/doc/_static/jquery-3.5.1.js @@ -10332,6 +10301,7 @@ third_party/nearby/src/cpp/platform/api/platform.h third_party/nearby/src/cpp/platform/base/nsd_service_info.h third_party/nearby/src/cpp/platform/impl/g3/bluetooth_adapter.h third_party/nearby/src/cpp/platform/impl/g3/bluetooth_classic.h +third_party/nearby/src/cpp/platform/impl/ios/Source/GNCConnection.h third_party/nearby/src/cpp/platform/impl/windows/ble.h third_party/nearby/src/cpp/platform/impl/windows/bluetooth_adapter.cc third_party/nearby/src/cpp/platform/impl/windows/bluetooth_adapter.h @@ -10428,6 +10398,7 @@ third_party/node/node_modules/dom5/dom5.js third_party/node/node_modules/es-abstract/package.json third_party/node/node_modules/es-to-primitive/package.json third_party/node/node_modules/escape-string-regexp/package.json +third_party/node/node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp/package.json third_party/node/node_modules/eslint-scope/lib/definition.js third_party/node/node_modules/eslint-scope/lib/index.js third_party/node/node_modules/eslint-scope/lib/pattern-visitor.js @@ -10809,6 +10780,8 @@ third_party/perfetto/infra/perfetto.dev/src/markdown_render.js third_party/perfetto/infra/perfetto.dev/src/template_footer.html third_party/perfetto/infra/perfetto.dev/src/template_header.html third_party/perfetto/infra/ui.perfetto.dev/appengine/main.py +third_party/perfetto/python/perfetto/trace_processor/shell.py +third_party/perfetto/python/setup.py third_party/perfetto/src/android_internal/health_hal.cc third_party/perfetto/src/base/flat_hash_map_benchmark.cc third_party/perfetto/src/base/utils.cc @@ -10826,8 +10799,6 @@ third_party/perfetto/src/trace_processor/importers/fuchsia/fuchsia_trace_utils.h third_party/perfetto/src/trace_processor/importers/ninja/ninja_log_parser.cc third_party/perfetto/src/trace_processor/importers/proto/system_probes_parser.cc third_party/perfetto/src/trace_processor/metrics/sql/chrome/rail_modes.sql -third_party/perfetto/src/trace_processor/python/perfetto/trace_processor/shell.py -third_party/perfetto/src/trace_processor/python/setup.py third_party/perfetto/src/trace_processor/types/task_state.cc third_party/perfetto/src/trace_processor/types/task_state.h third_party/perfetto/src/traced/probes/android_log/android_log_data_source.cc @@ -11840,9 +11811,6 @@ third_party/skia/tools/skpbench/_hardware_android.py third_party/skia/tools/skpbench/_hardware_pixel.py third_party/skia/tools/skpbench/_hardware_pixel_c.py third_party/skia/tools/skpbench/sheet.py -third_party/skia/tools/skqp/download_model.py -third_party/skia/tools/skqp/gn_to_bp.py -third_party/skia/tools/skqp/make_apk_list.py third_party/smhasher/src/PMurHash.c third_party/snappy/linux/snappy-stubs-public.h third_party/snappy/mac/snappy-stubs-public.h @@ -12123,8 +12091,11 @@ third_party/tflite/src/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint third_party/tflite/src/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatMatProductAVX2.h third_party/tflite/src/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatMatProductNEON.h third_party/tflite/src/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatVecProduct.h +third_party/tflite_support/src/tensorflow_lite_support/c/task/processor/category.h third_party/updater/chromium_mac_amd64/3pp/fetch.py third_party/updater/chromium_mac_arm64/3pp/fetch.py +third_party/updater/chromium_win_x86/3pp/fetch.py +third_party/updater/chromium_win_x86_64/3pp/fetch.py third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp third_party/vulkan-deps/spirv-cross/src/spirv_hlsl.cpp third_party/vulkan-deps/spirv-headers/src/include/spirv/spir-v.xml @@ -12157,6 +12128,7 @@ third_party/vulkan-deps/vulkan-tools/src/scripts/mock_icd_generator.py third_party/vulkan-deps/vulkan-tools/src/scripts/vulkan_tools_helper_file_generator.py third_party/vulkan-deps/vulkan-tools/src/windows-runtime-installer/VulkanRT-License.txt third_party/vulkan-deps/vulkan-validation-layers/src/cmake/Copyright_cmake.txt +third_party/vulkan-deps/vulkan-validation-layers/src/layers/base_node.cpp third_party/vulkan-deps/vulkan-validation-layers/src/layers/base_node.h third_party/vulkan-deps/vulkan-validation-layers/src/layers/buffer_state.cpp third_party/vulkan-deps/vulkan-validation-layers/src/layers/buffer_state.h @@ -12688,8 +12660,6 @@ third_party/webrtc/rtc_base/trace_event.h third_party/webrtc/rtc_base/win/scoped_com_initializer.h third_party/webrtc/rtc_base/win/windows_version.cc third_party/webrtc/rtc_base/win32_unittest.cc -third_party/webrtc/rtc_tools/loopback_test/loopback_test.html -third_party/webrtc/rtc_tools/loopback_test/loopback_test.js third_party/webrtc/rtc_tools/testing/utils.py third_party/webrtc/rtc_tools/unpack_aecdump/unpack.cc third_party/webrtc/sdk/android/native_api/jni/class_loader.h @@ -12761,6 +12731,7 @@ third_party/woff2/src/buffer.h third_party/woff2/src/transform.cc third_party/woff2/src/woff2_common.h third_party/woff2/src/woff2_dec.cc +third_party/wpt_tools/roll_wpt_tooling.py third_party/wpt_tools/wpt/tools/lint/rules.py third_party/wpt_tools/wpt/tools/third_party/pywebsocket3/setup.py third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py @@ -12810,6 +12781,7 @@ tools/android/memtrack_helper/memtrack_helper.c tools/android/modularization/convenience/touch_resources.py tools/android/modularization/gn/json_gn_editor.py tools/android/native_lib_memory/PRESUBMIT.py +tools/android/python_utils/PRESUBMIT.py tools/android/sdk_updater/update_sdk.py tools/android/test_health/PRESUBMIT.py tools/android/tracing/systrace-extract-startup.py @@ -12817,12 +12789,12 @@ tools/binary_size/PRESUBMIT.py tools/binary_size/diagnose_bloat.py tools/binary_size/generate_milestone_reports.py tools/binary_size/libsupersize/console.py -tools/binary_size/libsupersize/static/auth-consts.js -tools/binary_size/libsupersize/static/index.html -tools/binary_size/libsupersize/static/index.js -tools/binary_size/libsupersize/static/tree-worker-wasm.js -tools/binary_size/libsupersize/static/viewer.html -tools/binary_size/libsupersize/upload_html_viewer.py +tools/binary_size/libsupersize/viewer/static/auth-consts.js +tools/binary_size/libsupersize/viewer/static/index.html +tools/binary_size/libsupersize/viewer/static/index.js +tools/binary_size/libsupersize/viewer/static/tree-worker-wasm.js +tools/binary_size/libsupersize/viewer/static/viewer.html +tools/binary_size/libsupersize/viewer/upload_html_viewer.py tools/binary_size/libsupersize/zip_util.py tools/binary_size/libsupersize/zip_util_test.py tools/binary_size/trybot_commit_size_checker.py @@ -12846,7 +12818,6 @@ tools/chrome_extensions/open_my_editor/ext/cs-content.js tools/chrome_extensions/open_my_editor/ext/manifest.json tools/clang/blink_gc_plugin/BlinkGCPlugin.cpp tools/clang/plugins/ChromeClassTester.cpp -tools/clang/plugins/tests/trivial_ctor.cpp tools/clang/rewrite_raw_ptr_fields/RewriteRawPtrFields.cpp tools/clang/rewrite_raw_ptr_fields/tests/gen-in-out-arg-test.cc tools/clang/rewrite_raw_ptr_fields/tests/gen-reinterpret-cast-test.cc @@ -12992,7 +12963,7 @@ tools/metrics/histograms/metadata/browser/histograms.xml tools/metrics/histograms/metadata/chrome/histograms.xml tools/metrics/histograms/metadata/chromeos/histograms.xml tools/metrics/histograms/metadata/chromeos_hps/histograms.xml -tools/metrics/histograms/metadata/cloud/histograms.xml +tools/metrics/histograms/metadata/chromeos_settings/histograms.xml tools/metrics/histograms/metadata/commerce/histograms.xml tools/metrics/histograms/metadata/compositing/histograms.xml tools/metrics/histograms/metadata/content/histograms.xml @@ -13067,6 +13038,7 @@ tools/metrics/histograms/metadata/power/histograms.xml tools/metrics/histograms/metadata/prefetch/histograms.xml tools/metrics/histograms/metadata/print/histograms.xml tools/metrics/histograms/metadata/printing/histograms.xml +tools/metrics/histograms/metadata/privacy_budget/histograms.xml tools/metrics/histograms/metadata/profile/histograms.xml tools/metrics/histograms/metadata/quickoffice/histograms.xml tools/metrics/histograms/metadata/quota/histograms.xml @@ -13201,6 +13173,8 @@ tools/perf/core/shard_maps/timing_data/android_nexus5x_webview_perf_timing.json tools/perf/core/shard_maps/timing_data/linux-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-10_12_laptop_low_end-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-10_13_laptop_high_end-perf_timing.json +tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf_timing.json +tools/perf/core/shard_maps/timing_data/mac-laptop_low_end-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json tools/perf/core/shard_maps/timing_data/win-10_amd-perf_timing.json @@ -13233,7 +13207,6 @@ tools/perf/page_sets/intl_ar_fa_he.py tools/perf/page_sets/intl_ja_zh.py tools/perf/page_sets/key_mobile_sites_smooth.py tools/perf/page_sets/key_silk_cases/font_wipe.html -tools/perf/page_sets/key_silk_cases/inbox_app.html tools/perf/page_sets/kraken_pages.py tools/perf/page_sets/loading_desktop.py tools/perf/page_sets/loading_mobile.py @@ -13375,6 +13348,8 @@ tools/perf/testdata/task_output_dir/3/v8.runtime_stats.top_25.reference/test_res tools/perf/testdata/task_output_dir/3/v8.runtime_stats.top_25/benchmark_log.txt tools/perf/testdata/task_output_dir/3/v8.runtime_stats.top_25/perf_results.json tools/perf/testdata/task_output_dir/3/v8.runtime_stats.top_25/test_results.json +tools/perfbot-analysis/builder.js +tools/perfbot-analysis/bulk-download.js tools/polymer/PRESUBMIT.py tools/python/google/gethash_timer.py tools/resources/find_unused_resources.py @@ -13394,6 +13369,8 @@ tools/tracing/rename_breakpad.py tools/traffic_annotation/sample_traffic_annotation.cc tools/traffic_annotation/scripts/annotation_tools.py tools/traffic_annotation/scripts/auditor/auditor.py +tools/traffic_annotation/scripts/auditor/auditor_test.py +tools/traffic_annotation/scripts/auditor/util.py tools/traffic_annotation/scripts/test_data/extractor_outputs/good_partial_annotation.txt tools/traffic_annotation/scripts/update_annotations_doc.py tools/traffic_annotation/scripts/update_annotations_sheet.py @@ -13464,6 +13441,8 @@ ui/base/cocoa/base_view.mm ui/base/cocoa/constrained_window/constrained_window_animation.mm ui/base/cocoa/tool_tip_base_view.mm ui/base/cocoa/underlay_opengl_hosting_window.mm +ui/base/data_transfer_policy/data_transfer_endpoint_serializer.h +ui/base/data_transfer_policy/data_transfer_endpoint_serializer_unittest.cc ui/base/dragdrop/os_exchange_data_unittest.cc ui/base/dragdrop/os_exchange_data_win_unittest.cc ui/base/ime/PRESUBMIT.py @@ -13564,6 +13543,7 @@ ui/views/view_unittest.cc ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc ui/views/win/hwnd_message_handler.cc ui/views/window/non_client_view.cc +ui/webui/resources/cr_components/app_management/icons.html ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard_icon.html ui/webui/resources/cr_elements/chromeos/cr_picture/png.js ui/webui/resources/cr_elements/icons.html @@ -13640,7 +13620,7 @@ v8/src/objects/ordered-hash-table.h v8/src/objects/string-inl.h v8/src/objects/value-serializer.cc v8/src/parsing/parser-base.h -v8/src/security/vm-cage.cc +v8/src/sandbox/sandbox.cc v8/src/snapshot/embedded/platform-embedded-file-writer-win.cc v8/src/third_party/siphash/halfsiphash.cc v8/src/third_party/siphash/halfsiphash.h diff --git a/patches/core/debian/disable/unrar.patch b/patches/core/debian/disable/unrar.patch index c42b86b3..66575594 100644 --- a/patches/core/debian/disable/unrar.patch +++ b/patches/core/debian/disable/unrar.patch @@ -4,13 +4,13 @@ bug: http://bugs.debian.org/914487 --- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc +++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc -@@ -95,7 +95,7 @@ void FileAnalyzer::Start(const base::Fil +@@ -96,7 +96,7 @@ void FileAnalyzer::Start(const base::Fil if (inspection_type == DownloadFileType::ZIP) { StartExtractZipFeatures(); } else if (inspection_type == DownloadFileType::RAR) { - StartExtractRarFeatures(); + LOG(WARNING) << "Safebrowser inspection of rar files is disabled in this build"; - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) } else if (inspection_type == DownloadFileType::DMG) { StartExtractDmgFeatures(); --- a/chrome/common/safe_browsing/BUILD.gn @@ -72,7 +72,7 @@ bug: http://bugs.debian.org/914487 -#include "chrome/common/safe_browsing/rar_analyzer.h" #include "chrome/common/safe_browsing/zip_analyzer.h" - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) @@ -46,8 +45,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile AnalyzeRarFileCallback callback) { DCHECK(rar_file.IsValid()); diff --git a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch index 6149df56..459a7eaa 100644 --- a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch +++ b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2204,7 +2204,6 @@ static_library("browser") { +@@ -2199,7 +2199,6 @@ static_library("browser") { "//components/reputation/core:proto", "//components/resources", "//components/safe_browsing/content/browser", @@ -8,7 +8,7 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", -@@ -3758,8 +3757,6 @@ static_library("browser") { +@@ -3737,8 +3736,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -42,7 +42,7 @@ virtual subresource_filter::RulesetService* --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -69,7 +69,6 @@ +@@ -70,7 +70,6 @@ #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h" @@ -50,7 +50,7 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/site_isolation/prefs_observer.h" #include "chrome/browser/ssl/secure_origin_prefs_observer.h" -@@ -395,8 +394,6 @@ void BrowserProcessImpl::StartTearDown() +@@ -394,8 +393,6 @@ void BrowserProcessImpl::StartTearDown() metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -59,7 +59,7 @@ network_time_tracker_.reset(); #if BUILDFLAG(ENABLE_PLUGINS) plugins_resource_service_.reset(); -@@ -1021,14 +1018,6 @@ StatusTray* BrowserProcessImpl::status_t +@@ -1020,14 +1017,6 @@ StatusTray* BrowserProcessImpl::status_t return status_tray_.get(); } @@ -74,7 +74,7 @@ subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1282,26 +1271,6 @@ void BrowserProcessImpl::CreateBackgroun +@@ -1280,26 +1269,6 @@ void BrowserProcessImpl::CreateBackgroun #endif } @@ -123,15 +123,15 @@ subresource_filter_ruleset_service_; --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -66,7 +66,6 @@ +@@ -65,7 +65,6 @@ + #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h" + #include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h" #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/profiles/profile_keep_alive_types.h" - #include "chrome/browser/profiles/scoped_profile_keep_alive.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/share/share_history.h" #include "chrome/browser/share/share_ranking.h" -@@ -633,10 +632,6 @@ void ChromeBrowsingDataRemoverDelegate:: +@@ -632,10 +631,6 @@ void ChromeBrowsingDataRemoverDelegate:: base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -140,11 +140,11 @@ - if (sb_service) - safe_browsing_context = sb_service->GetNetworkContext(profile_); - browsing_data::RemoveEmbedderCookieData( - delete_begin, delete_end, filter_builder, host_content_settings_map_, + if (!filter_builder->IsCrossSiteClearSiteData()) { + browsing_data::RemoveEmbedderCookieData( --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -936,34 +936,6 @@ void SetApplicationLocaleOnIOThread(cons +@@ -940,34 +940,6 @@ void SetApplicationLocaleOnIOThread(cons GetIOThreadApplicationLocale() = locale; } @@ -179,7 +179,7 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) AppLoadedInTabSource ClassifyAppLoadedInTabSource( -@@ -1450,7 +1422,6 @@ void ChromeContentBrowserClient::PostAft +@@ -1459,7 +1431,6 @@ void ChromeContentBrowserClient::PostAft InitNetworkContextsParentDirectory(); DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -187,7 +187,7 @@ } bool ChromeContentBrowserClient::IsBrowserStartupComplete() { -@@ -4252,7 +4223,7 @@ ChromeContentBrowserClient::CreateThrott +@@ -4244,7 +4215,7 @@ ChromeContentBrowserClient::CreateThrott content::WebContents* web_contents = handle->GetWebContents(); throttles.push_back(std::make_unique( handle, @@ -196,7 +196,7 @@ base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp), base::BindOnce( &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps))); -@@ -4281,16 +4252,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -4273,16 +4244,6 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -251,7 +251,7 @@ - } } - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) @@ -790,16 +783,6 @@ void ChromeDownloadManagerDelegate::Choo void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( @@ -271,7 +271,7 @@ void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -86,7 +86,7 @@ class DownloadItemModelData : public bas +@@ -87,7 +87,7 @@ class DownloadItemModelData : public bas // Danger level of the file determined based on the file type and whether // there was a user action associated with the download. @@ -280,7 +280,7 @@ // Whether the download is currently being revived. bool is_being_revived_; -@@ -123,7 +123,7 @@ DownloadItemModelData::DownloadItemModel +@@ -124,7 +124,7 @@ DownloadItemModelData::DownloadItemModel : should_show_in_shelf_(true), was_ui_notified_(false), should_prefer_opening_in_browser_(false), @@ -289,7 +289,7 @@ is_being_revived_(false) {} } // namespace -@@ -381,13 +381,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -382,13 +382,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -306,7 +306,7 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -599,9 +599,6 @@ bool DownloadItemModel::IsCommandEnabled +@@ -600,9 +600,6 @@ bool DownloadItemModel::IsCommandEnabled // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -347,7 +347,7 @@ extension.erase(0, 1); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -297,13 +297,6 @@ base::FilePath DownloadTargetDeterminer: +@@ -298,13 +298,6 @@ base::FilePath DownloadTargetDeterminer: download_->GetURL(), download_->GetContentDisposition(), referrer_charset, suggested_filename, sniffed_mime_type, default_filename); @@ -361,7 +361,7 @@ // If no mime type or explicitly specified a name, don't replace file // extension. if (sniffed_mime_type.empty() || !suggested_filename.empty()) -@@ -1113,29 +1106,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1114,29 +1107,7 @@ DownloadFileType::DangerLevel DownloadTa download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; @@ -682,14 +682,14 @@ // SimpleURLLoader -> (owned loader, extension id). --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -825,9 +825,6 @@ void ChromeMetricsServiceClient::Registe +@@ -835,9 +835,6 @@ void ChromeMetricsServiceClient::Registe metrics_service_->RegisterMetricsProvider( std::make_unique()); - metrics_service_->RegisterMetricsProvider( - std::make_unique()); - - #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) + #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) metrics_service_->RegisterMetricsProvider( std::make_unique()); --- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc @@ -706,17 +706,17 @@ // static --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -307,7 +307,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -311,7 +311,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(IS_CHROMEOS_LACROS) CertDbInitializerFactory::GetInstance(); #endif - CertificateReportingServiceFactory::GetInstance(); - #if !defined(OS_ANDROID) + #if !BUILDFLAG(IS_ANDROID) ChromeBrowsingDataLifetimeManagerFactory::GetInstance(); #endif --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -93,7 +93,6 @@ +@@ -95,7 +95,6 @@ #include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/push_messaging/push_messaging_service_factory.h" #include "chrome/browser/push_messaging/push_messaging_service_impl.h" @@ -772,7 +772,7 @@ if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode -@@ -440,6 +442,7 @@ static_library("advanced_protection") { +@@ -442,6 +444,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -780,7 +780,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -457,6 +460,7 @@ source_set("metrics_collector") { +@@ -459,6 +462,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -830,7 +830,7 @@ - MALICIOUS_CONTENT_STATUS_SIGNED_IN_SYNC_PASSWORD_REUSE; - } -#endif -- FALLTHROUGH; +- [[fallthrough]]; - case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_NON_SYNC_PASSWORD_REUSE: -#if BUILDFLAG(FULL_SAFE_BROWSING) - if (safe_browsing::ChromePasswordProtectionService:: @@ -840,7 +840,7 @@ - MALICIOUS_CONTENT_STATUS_SIGNED_IN_NON_SYNC_PASSWORD_REUSE; - } -#endif -- FALLTHROUGH; +- [[fallthrough]]; - case safe_browsing::SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE: -#if BUILDFLAG(FULL_SAFE_BROWSING) - if (safe_browsing::ChromePasswordProtectionService:: @@ -882,17 +882,17 @@ --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -4061,7 +4061,6 @@ static_library("ui") { - "views/device_chooser_content_view.h", - "views/devtools_process_observer.cc", +@@ -4083,7 +4083,6 @@ static_library("ui") { "views/devtools_process_observer.h", + "views/download/bubble/download_toolbar_button_view.cc", + "views/download/bubble/download_toolbar_button_view.h", - "views/download/download_danger_prompt_views.cc", "views/download/download_in_progress_dialog_view.cc", "views/download/download_in_progress_dialog_view.h", "views/download/download_item_view.cc", --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -353,22 +353,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -360,22 +360,6 @@ void TabHelpers::AttachTabHelpers(WebCon // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); @@ -1024,7 +1024,7 @@ bool IsDeletingHistoryAllowed(); --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -268,116 +268,6 @@ CreateHttpsOnlyModePage(content::WebCont +@@ -273,120 +273,6 @@ CreateHttpsOnlyModePage(content::WebCont request_url)); } @@ -1034,7 +1034,8 @@ - safe_browsing::SB_THREAT_TYPE_URL_MALWARE; - GURL request_url("http://example.com"); - std::string url_param; -- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "url", &url_param)) { +- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url", +- &url_param)) { - if (GURL(url_param).is_valid()) { - request_url = GURL(url_param); - } @@ -1043,7 +1044,8 @@ - // TODO(mattm): add flag to change main_frame_url or add dedicated flag to - // test subresource interstitials. - std::string type_param; -- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "type", &type_param)) { +- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "type", +- &type_param)) { - if (type_param == "malware") { - threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE; - } else if (type_param == "phishing") { @@ -1091,14 +1093,16 @@ - safe_browsing::SB_THREAT_TYPE_URL_MALWARE; - GURL request_url("http://example.com"); - std::string url_param; -- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "url", &url_param)) { +- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url", +- &url_param)) { - if (GURL(url_param).is_valid()) - request_url = GURL(url_param); - } - GURL main_frame_url(request_url); - std::string type_param; - bool is_giant_webview = false; -- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "type", &type_param)) { +- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "type", +- &type_param)) { - if (type_param == "malware") { - threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE; - } else if (type_param == "phishing") { @@ -1141,7 +1145,7 @@ #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) std::unique_ptr CreateCaptivePortalBlockingPage( content::WebContents* web_contents) { -@@ -492,8 +382,6 @@ void InterstitialHTMLSource::StartDataRe +@@ -501,8 +387,6 @@ void InterstitialHTMLSource::StartDataRe interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents); } else if (path_without_query == "/blocked-interception") { interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents); @@ -1150,7 +1154,7 @@ } else if (path_without_query == "/clock") { interstitial_delegate = CreateBadClockBlockingPage(web_contents); } else if (path_without_query == "/lookalike") { -@@ -510,16 +398,12 @@ void InterstitialHTMLSource::StartDataRe +@@ -519,16 +403,12 @@ void InterstitialHTMLSource::StartDataRe interstitial_delegate = CreateHttpsOnlyModePage(web_contents); } @@ -1172,7 +1176,7 @@ html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -94,7 +94,6 @@ +@@ -92,7 +92,6 @@ #include "components/page_load_metrics/renderer/metrics_render_frame_observer.h" #include "components/paint_preview/buildflags/buildflags.h" #include "components/safe_browsing/buildflags.h" diff --git a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch index e2ae5e95..c5189d67 100644 --- a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch +++ b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch @@ -29,7 +29,7 @@ - // On iOS we have a single, shared URLLoaderFactory provided by BrowserState. - // As it is shared, it is not trusted and we cannot assign trusted_params - // to the network request. --#if !defined(OS_IOS) +-#if !BUILDFLAG(IS_IOS) - // Do not call IsolationInfo() for REQUEST_UPLOADs because Password Manager - // uploads when RenderFrameHostImpl::DidCommitNavigation() is called, in which - // case IsolationInfo() may crash because there is no committing diff --git a/patches/core/inox-patchset/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index 84155ec0..ee896920 100644 --- a/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -6,7 +6,7 @@ const char* const kAllowed[] = { - extension_misc::kInAppPaymentsSupportAppId, extension_misc::kPdfExtensionId, - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_CHROMEOS) extension_misc::kAssessmentAssistantExtensionId, --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -51,7 +51,7 @@ - AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get()); -#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_CHROMEOS) { --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc diff --git a/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch b/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch index ddc097a2..e1ee3127 100644 --- a/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch +++ b/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch @@ -1,6 +1,6 @@ --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -144,10 +144,10 @@ const unsigned kMinimumTTLSeconds = kCac +@@ -147,10 +147,10 @@ const unsigned kMinimumTTLSeconds = kCac // cached. const int kIPv6ProbePeriodMs = 1000; diff --git a/patches/core/inox-patchset/0015-disable-update-pings.patch b/patches/core/inox-patchset/0015-disable-update-pings.patch index 4a241042..f4995323 100644 --- a/patches/core/inox-patchset/0015-disable-update-pings.patch +++ b/patches/core/inox-patchset/0015-disable-update-pings.patch @@ -1,6 +1,6 @@ --- a/chrome/updater/configurator.cc +++ b/chrome/updater/configurator.cc -@@ -82,7 +82,7 @@ int Configurator::UpdateDelay() const { +@@ -89,7 +89,7 @@ int Configurator::UpdateDelay() const { } std::vector Configurator::UpdateUrl() const { diff --git a/patches/core/inox-patchset/0021-disable-rlz.patch b/patches/core/inox-patchset/0021-disable-rlz.patch index 1ed581ab..8a787a58 100644 --- a/patches/core/inox-patchset/0021-disable-rlz.patch +++ b/patches/core/inox-patchset/0021-disable-rlz.patch @@ -2,7 +2,7 @@ --- a/BUILD.gn +++ b/BUILD.gn -@@ -485,14 +485,6 @@ group("gn_all") { +@@ -486,14 +486,6 @@ group("gn_all") { deps += [ "//chromeos:chromeos_unittests" ] } diff --git a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index c800809e..cec143bd 100644 --- a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch +++ b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch @@ -101,7 +101,7 @@ by default. // creates and uses to publish OEM default apps to the extensions system. --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -@@ -88,7 +88,7 @@ namespace { +@@ -89,7 +89,7 @@ namespace { using api::file_manager_private::ProfileInfo; @@ -225,7 +225,7 @@ by default. base::ToLowerASCII(bdict_file)); --- a/chrome/browser/supervised_user/supervised_user_service.cc +++ b/chrome/browser/supervised_user/supervised_user_service.cc -@@ -87,7 +87,7 @@ namespace { +@@ -86,7 +86,7 @@ namespace { // The URL from which to download a host denylist if no local one exists yet. const char kDenylistURL[] = @@ -247,7 +247,7 @@ by default. bool g_upgrade_bubble_is_showing = false; --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -@@ -67,17 +67,17 @@ namespace { +@@ -70,17 +70,17 @@ namespace { // The URL for the the Learn More page shown on incognito new tab. const char kLearnMoreIncognitoUrl[] = #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -362,7 +362,7 @@ by default. // Mime type to create a directory. --- a/components/feedback/feedback_uploader.cc +++ b/components/feedback/feedback_uploader.cc -@@ -27,7 +27,7 @@ constexpr base::FilePath::CharType kFeed +@@ -39,7 +39,7 @@ constexpr base::FilePath::CharType kFeed FILE_PATH_LITERAL("Feedback Reports"); constexpr char kFeedbackPostUrl[] = @@ -490,7 +490,7 @@ by default. --- a/content/browser/webauth/authenticator_common.cc +++ b/content/browser/webauth/authenticator_common.cc -@@ -89,9 +89,9 @@ enum class RequestExtension { +@@ -91,9 +91,9 @@ enum class RequestExtension { namespace { constexpr char kGstaticAppId[] = @@ -511,7 +511,7 @@ by default. - return GURL("https://www.google.com/"); + return GURL("trk:183:https://www.google.com/"); - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) GURL url(base::WideToUTF16(args[0])); --- a/extensions/common/extension_urls.cc +++ b/extensions/common/extension_urls.cc @@ -753,17 +753,6 @@ by default. const int kMaxSecurePort = 65535; std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) { ---- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc -+++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc -@@ -35,7 +35,7 @@ class GaiaCookieMechanism : public jingl - // These attributes are necessary for working with non-gmail gaia - // accounts. - const std::string NS_GOOGLE_AUTH_PROTOCOL( -- "http://www.google.com/talk/protocol/auth"); -+ "trk:179:http://www.google.com/talk/protocol/auth"); - const jingle_xmpp::QName QN_GOOGLE_ALLOW_GENERATED_JID_XMPP_LOGIN( - NS_GOOGLE_AUTH_PROTOCOL, "allow-generated-jid"); - const jingle_xmpp::QName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT( --- a/remoting/base/breakpad_mac.mm +++ b/remoting/base/breakpad_mac.mm @@ -50,7 +50,7 @@ void InitializeCrashReporting() { diff --git a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch index 1957c1b1..209d3d65 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -16,7 +16,7 @@ the URL so we get notified if this happens again in the future). --- a/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc +++ b/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc -@@ -35,8 +35,7 @@ ChromeSafeBrowsingBlockingPageFactory::C +@@ -36,8 +36,7 @@ ChromeSafeBrowsingBlockingPageFactory::C Profile::FromBrowserContext(web_contents->GetBrowserContext()); // Create appropriate display options for this blocking page. PrefService* prefs = profile->GetPrefs(); diff --git a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch index 68718538..3864e258 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch @@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware). --- a/components/safe_browsing/content/browser/client_side_detection_service.cc +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc -@@ -215,6 +215,10 @@ void ClientSideDetectionService::StartCl +@@ -217,6 +217,10 @@ void ClientSideDetectionService::StartCl return; } @@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware). // Fill in metadata about which model we used. *request->mutable_population() = delegate_->GetUserPopulation(); -@@ -294,6 +298,7 @@ void ClientSideDetectionService::StartCl +@@ -296,6 +300,7 @@ void ClientSideDetectionService::StartCl base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent, base::Unretained(WebUIInfoSingleton::GetInstance()), std::move(request), access_token)); diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index a9004f9e..b7de4286 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -35,7 +35,7 @@ --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc -@@ -562,7 +562,8 @@ void AutocompleteInput::ParseForEmphasiz +@@ -561,7 +561,8 @@ void AutocompleteInput::ParseForEmphasiz // For the view-source and blob schemes, we should emphasize the host of the // URL qualified by the view-source or blob prefix. if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) || @@ -70,7 +70,7 @@ // other origins, so we should not treat them as web safe. Remove callers of --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1010,6 +1010,8 @@ component("net") { +@@ -1011,6 +1011,8 @@ component("net") { "url_request/report_sender.h", "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", @@ -158,7 +158,7 @@ using base::Time; using std::string; -@@ -611,6 +613,12 @@ URLRequest::URLRequest(const GURL& url, +@@ -610,6 +612,12 @@ URLRequest::URLRequest(const GURL& url, // Sanity check out environment. DCHECK(base::ThreadTaskRunnerHandle::IsSet()); @@ -173,7 +173,7 @@ return NetLogURLRequestConstructorParams(url, priority_, --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc -@@ -45,6 +45,7 @@ +@@ -46,6 +46,7 @@ #include "net/quic/quic_stream_factory.h" #include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/static_http_user_agent_settings.h" @@ -181,7 +181,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_job_factory.h" -@@ -545,6 +546,9 @@ std::unique_ptr URLRe +@@ -554,6 +555,9 @@ std::unique_ptr URLRe } protocol_handlers_.clear(); @@ -193,24 +193,26 @@ return std::move(context); --- a/url/url_constants.cc +++ b/url/url_constants.cc -@@ -28,6 +28,7 @@ const char kMailToScheme[] = "mailto"; - // See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport - const char kQuicTransportScheme[] = "quic-transport"; +@@ -46,6 +46,8 @@ const char kQuicTransportScheme[] = "qui + const char16_t kQuicTransportScheme16[] = u"quic-transport"; const char kTelScheme[] = "tel"; + const char16_t kTelScheme16[] = u"tel"; +const char kTraceScheme[] = "trk"; ++const char16_t kTraceScheme16[] = u"trk"; const char kUrnScheme[] = "urn"; + const char16_t kUrnScheme16[] = u"urn"; const char kUuidInPackageScheme[] = "uuid-in-package"; - const char kWsScheme[] = "ws"; --- a/url/url_constants.h +++ b/url/url_constants.h -@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char - COMPONENT_EXPORT(URL) extern const char kMailToScheme[]; - COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[]; +@@ -50,6 +50,8 @@ COMPONENT_EXPORT(URL) extern const char + COMPONENT_EXPORT(URL) extern const char16_t kQuicTransportScheme16[]; COMPONENT_EXPORT(URL) extern const char kTelScheme[]; + COMPONENT_EXPORT(URL) extern const char16_t kTelScheme16[]; +COMPONENT_EXPORT(URL) extern const char kTraceScheme[]; ++COMPONENT_EXPORT(URL) extern const char16_t kTraceScheme16[]; COMPONENT_EXPORT(URL) extern const char kUrnScheme[]; + COMPONENT_EXPORT(URL) extern const char16_t kUrnScheme16[]; COMPONENT_EXPORT(URL) extern const char kUuidInPackageScheme[]; - COMPONENT_EXPORT(URL) extern const char kWsScheme[]; --- a/url/url_util.cc +++ b/url/url_util.cc @@ -63,7 +63,7 @@ struct SchemeRegistry { diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index a191c638..e23a7784 100644 --- a/patches/core/ungoogled-chromium/disable-crash-reporter.patch +++ b/patches/core/ungoogled-chromium/disable-crash-reporter.patch @@ -2,7 +2,7 @@ --- a/components/crash/core/app/crashpad_linux.cc +++ b/components/crash/core/app/crashpad_linux.cc -@@ -59,8 +59,7 @@ void SetFirstChanceExceptionHandler(bool +@@ -60,8 +60,7 @@ void SetFirstChanceExceptionHandler(bool } bool IsCrashpadEnabled() { diff --git a/patches/core/ungoogled-chromium/disable-floc.patch b/patches/core/ungoogled-chromium/disable-floc.patch index a43271e1..29f4ea81 100644 --- a/patches/core/ungoogled-chromium/disable-floc.patch +++ b/patches/core/ungoogled-chromium/disable-floc.patch @@ -44,35 +44,26 @@ } } // namespace federated_learning ---- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc -+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc -@@ -132,8 +132,7 @@ bool ShouldDisablePrivacySandbox( - - // Returns whether FLoC is allowable by the current state of |pref_service|. - bool IsFlocAllowedByPrefs(PrefService* pref_service) { -- return pref_service->GetBoolean(prefs::kPrivacySandboxFlocEnabled) && -- pref_service->GetBoolean(prefs::kPrivacySandboxApisEnabled); -+ return false; - } - - // Returns the number of days in |time|, rounded to the closest day by hour if -@@ -207,7 +206,7 @@ PrivacySandboxSettings::PrivacySandboxSe - PrivacySandboxSettings::~PrivacySandboxSettings() = default; - - bool PrivacySandboxSettings::IsFlocAllowed() const { -- return IsFlocAllowedByPrefs(pref_service_); -+ return false; - } - - bool PrivacySandboxSettings::IsFlocAllowedForContext( --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc +++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc -@@ -42,7 +42,7 @@ void RegisterProfilePrefs(PrefRegistrySi +@@ -45,7 +45,7 @@ void RegisterProfilePrefs(PrefRegistrySi registry->RegisterTimePref(prefs::kPrivacySandboxFlocDataAccessibleSince, base::Time()); registry->RegisterBooleanPref( - prefs::kPrivacySandboxFlocEnabled, true, + prefs::kPrivacySandboxFlocEnabled, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); + registry->RegisterDictionaryPref(prefs::kPrivacySandboxFledgeJoinBlocked); + } +--- a/components/privacy_sandbox/privacy_sandbox_settings.cc ++++ b/components/privacy_sandbox/privacy_sandbox_settings.cc +@@ -91,8 +91,7 @@ PrivacySandboxSettings::PrivacySandboxSe + PrivacySandboxSettings::~PrivacySandboxSettings() = default; + + bool PrivacySandboxSettings::IsFlocAllowed() const { +- return pref_service_->GetBoolean(prefs::kPrivacySandboxFlocEnabled) && +- pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabled); ++ return false; } + bool PrivacySandboxSettings::IsFlocAllowedForContext( diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index a53c4a45..4cdef429 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -12,7 +12,7 @@ - namespace { - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) @@ -65,52 +61,6 @@ void GoogleURLLoaderThrottle::DetachFrom void GoogleURLLoaderThrottle::WillStartRequest( network::ResourceRequest* request, @@ -43,7 +43,7 @@ - dynamic_params_.allowed_domains_for_apps); - } - --#if defined(OS_ANDROID) +-#if BUILDFLAG(IS_ANDROID) - if (!client_data_header_.empty() && - google_util::IsGoogleAssociatedDomainUrl(request->url)) { - request->cors_exempt_headers.SetHeader(kCCTClientDataHeader, @@ -95,7 +95,7 @@ - dynamic_params_.allowed_domains_for_apps); - } - --#if defined(OS_ANDROID) +-#if BUILDFLAG(IS_ANDROID) - if (!client_data_header_.empty() && - !google_util::IsGoogleAssociatedDomainUrl(redirect_info->new_url)) { - to_be_removed_headers->push_back(kCCTClientDataHeader); @@ -485,7 +485,7 @@ bool IsGoogleHostname(const GURL& url) { --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -527,11 +527,7 @@ std::u16string TemplateURLRef::SearchTer +@@ -530,11 +530,7 @@ std::u16string TemplateURLRef::SearchTer bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); @@ -578,7 +578,7 @@ } // namespace variations --- a/net/base/url_util.cc +++ b/net/base/url_util.cc -@@ -442,27 +442,6 @@ bool HasGoogleHost(const GURL& url) { +@@ -455,27 +455,6 @@ bool HasGoogleHost(const GURL& url) { } bool IsGoogleHost(base::StringPiece host) { diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index bedcb220..a6e62396 100644 --- a/patches/core/ungoogled-chromium/disable-mei-preload.patch +++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch @@ -15,8 +15,8 @@ "//third_party/widevine/cdm", ] } -@@ -1150,7 +1149,6 @@ if (is_win) { - ":keystone_registration_framework", +@@ -1169,7 +1168,6 @@ if (is_win) { + ":optimization_guide_library", ":swiftshader_library", ":widevine_cdm_library", - "//chrome/browser/resources/media/mei_preload:component_bundle", diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch index fe997e4a..32002397 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -1,23 +1,3 @@ ---- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc -+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc -@@ -369,7 +369,7 @@ std::vector PrivacySandboxSettings - } - - bool PrivacySandboxSettings::IsPrivacySandboxAllowed() { -- return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabled); -+ return false; - } - - bool PrivacySandboxSettings::IsPrivacySandboxEnabled() { -@@ -381,8 +381,6 @@ bool PrivacySandboxSettings::IsPrivacySa - } - - void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) { -- pref_service_->SetBoolean(prefs::kPrivacySandboxManuallyControlled, true); -- pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabled, enabled); - } - - void PrivacySandboxSettings::OnCookiesCleared() { --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -80,19 +80,6 @@ @@ -42,7 +22,7 @@ --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc +++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc -@@ -31,7 +31,7 @@ namespace privacy_sandbox { +@@ -34,7 +34,7 @@ namespace privacy_sandbox { void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref( @@ -51,3 +31,19 @@ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref( prefs::kPrivacySandboxManuallyControlled, false, +--- a/components/privacy_sandbox/privacy_sandbox_settings.cc ++++ b/components/privacy_sandbox/privacy_sandbox_settings.cc +@@ -261,12 +261,10 @@ std::vector PrivacySandboxSettings + } + + bool PrivacySandboxSettings::IsPrivacySandboxAllowed() { +- return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabled); ++ return false; + } + + void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) { +- pref_service_->SetBoolean(prefs::kPrivacySandboxManuallyControlled, true); +- pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabled, enabled); + } + + void PrivacySandboxSettings::OnCookiesCleared() { diff --git a/patches/core/ungoogled-chromium/disable-signin.patch b/patches/core/ungoogled-chromium/disable-signin.patch index 3276ebde..ecbf235b 100644 --- a/patches/core/ungoogled-chromium/disable-signin.patch +++ b/patches/core/ungoogled-chromium/disable-signin.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -486,32 +486,6 @@ GURL GetOSSettingsUrl(const std::string& +@@ -498,32 +498,6 @@ GURL GetOSSettingsUrl(const std::string& void ShowBrowserSignin(Browser* browser, signin_metrics::AccessPoint access_point, signin::ConsentLevel consent_level) { diff --git a/patches/core/ungoogled-chromium/disable-untraceable-urls.patch b/patches/core/ungoogled-chromium/disable-untraceable-urls.patch index 83d969aa..5edf394d 100644 --- a/patches/core/ungoogled-chromium/disable-untraceable-urls.patch +++ b/patches/core/ungoogled-chromium/disable-untraceable-urls.patch @@ -11,7 +11,7 @@ - GURL GetPluginsServerURL() { std::string filename; - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) @@ -70,7 +67,7 @@ GURL GetPluginsServerURL() { #error Unknown platform #endif diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index a0c85369..c9675109 100644 --- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch +++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc +++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc -@@ -641,10 +641,6 @@ std::vector ChromeContentBr +@@ -556,10 +556,6 @@ std::vector ChromeContentBr GetOriginsRequiringDedicatedProcess() { std::vector list; @@ -15,7 +15,7 @@ --- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc +++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc -@@ -290,17 +290,7 @@ bool ChromeContentVerifierDelegate::IsFr +@@ -289,17 +289,7 @@ bool ChromeContentVerifierDelegate::IsFr // between which extensions are considered in-store. // See https://crbug.com/766806 for details. if (!InstallVerifier::IsFromStore(extension, context_)) { diff --git a/patches/core/ungoogled-chromium/doh-changes.patch b/patches/core/ungoogled-chromium/doh-changes.patch index a7ede603..47ebc508 100644 --- a/patches/core/ungoogled-chromium/doh-changes.patch +++ b/patches/core/ungoogled-chromium/doh-changes.patch @@ -1,11 +1,11 @@ --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -336,12 +336,7 @@ const base::FeatureParam kDisableHt +@@ -338,12 +338,7 @@ const base::FeatureParam kDisableHt // Enable DNS over HTTPS (DoH). const base::Feature kDnsOverHttps { "DnsOverHttps", --#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_ANDROID) || defined(OS_LINUX) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) - base::FEATURE_ENABLED_BY_DEFAULT -#else base::FEATURE_DISABLED_BY_DEFAULT @@ -15,7 +15,7 @@ // Provides a mechanism to remove providers from the dropdown list in the --- a/net/dns/public/doh_provider_entry.cc +++ b/net/dns/public/doh_provider_entry.cc -@@ -117,24 +117,6 @@ const DohProviderEntry::List& DohProvide +@@ -118,24 +118,6 @@ const DohProviderEntry::List& DohProvide /*privacy_policy=*/"https://dns.sb/privacy/", /*display_globally=*/false, /*display_countries=*/{"EE", "DE"}, LoggingLevel::kNormal), @@ -46,8 +46,8 @@ // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode. const base::Feature kDnsOverHttpsUpgrade { "DnsOverHttpsUpgrade", --#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_ANDROID) || \ -- defined(OS_WIN) +-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) - base::FEATURE_ENABLED_BY_DEFAULT -#else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch index b36fbc96..6975f200 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -34,7 +34,7 @@ deps = [ --- a/third_party/devtools-frontend/src/BUILD.gn +++ b/third_party/devtools-frontend/src/BUILD.gn -@@ -14,7 +14,6 @@ import("./third_party/blink/public/publi +@@ -13,7 +13,6 @@ import("./third_party/blink/public/publi devtools_frontend_resources_deps = [ "front_end", diff --git a/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch b/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch index 04abd35e..96799b79 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch @@ -1,14 +1,14 @@ --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -39,6 +39,7 @@ - #include "base/values.h" +@@ -40,6 +40,7 @@ + #include "build/build_config.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "mojo/public/cpp/system/message_pipe.h" +#include "net/net_buildflags.h" #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h" #include "services/network/public/cpp/features.h" #include "services/network/public/mojom/content_security_policy.mojom-blink.h" -@@ -2289,9 +2290,11 @@ const base::UnguessableToken& LocalFrame +@@ -2283,9 +2284,11 @@ const base::UnguessableToken& LocalFrame return base::UnguessableToken::Null(); } diff --git a/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch b/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch index e2a646bd..32371914 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch @@ -14,15 +14,15 @@ } --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc -@@ -359,6 +359,7 @@ void InlineSigninHelper::OnClientOAuthSu +@@ -356,6 +356,7 @@ void InlineSigninHelper::OnClientOAuthSu + void InlineSigninHelper::OnClientOAuthSuccessAndBrowserOpened( const ClientOAuthResult& result, - Profile* /*profile*/, - Profile::CreateStatus /*status*/) { + Profile* /*profile*/) { +#if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) HandlerSigninReason reason = GetHandlerSigninReason(current_url_); if (reason == HandlerSigninReason::kFetchLstOnly) { // Constants are only available on Windows for the Google Credential -@@ -435,6 +436,7 @@ void InlineSigninHelper::OnClientOAuthSu +@@ -432,6 +433,7 @@ void InlineSigninHelper::OnClientOAuthSu } base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index e251aa04..ed6b8bd3 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1957,7 +1957,6 @@ static_library("browser") { +@@ -1949,7 +1949,6 @@ static_library("browser") { "//chrome/browser/net:probe_message_proto", "//chrome/browser/new_tab_page/modules/drive:mojo_bindings", "//chrome/browser/new_tab_page/modules/photos:mojo_bindings", @@ -10,7 +10,7 @@ "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings", "//chrome/browser/notifications", "//chrome/browser/notifications/scheduler:factory", -@@ -3778,9 +3777,6 @@ static_library("browser") { +@@ -3757,9 +3756,6 @@ static_library("browser") { "download/offline_item_model_manager_factory.h", "enterprise/connectors/analysis/analysis_service_settings.cc", "enterprise/connectors/analysis/analysis_service_settings.h", @@ -20,7 +20,7 @@ "enterprise/connectors/analysis/content_analysis_dialog.cc", "enterprise/connectors/analysis/content_analysis_dialog.h", "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc", -@@ -4023,10 +4019,6 @@ static_library("browser") { +@@ -4004,10 +4000,6 @@ static_library("browser") { "new_tab_page/modules/photos/photos_service.h", "new_tab_page/modules/photos/photos_service_factory.cc", "new_tab_page/modules/photos/photos_service_factory.h", @@ -31,7 +31,7 @@ "new_tab_page/modules/task_module/task_module_handler.cc", "new_tab_page/modules/task_module/task_module_handler.h", "new_tab_page/modules/task_module/task_module_service.cc", -@@ -7201,9 +7193,14 @@ static_library("browser") { +@@ -7238,9 +7230,14 @@ static_library("browser") { "//components/safe_browsing/content/browser:safe_browsing_blocking_page", "//components/safe_browsing/content/browser/download:download_stats", "//components/safe_browsing/content/common:file_type_policies", @@ -63,7 +63,7 @@ auto delegate = std::make_unique(profile); --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -4252,11 +4252,13 @@ ChromeContentBrowserClient::CreateThrott +@@ -4244,11 +4244,13 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -77,7 +77,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -@@ -5657,26 +5659,7 @@ ChromeContentBrowserClient::GetSafeBrows +@@ -5680,26 +5682,7 @@ ChromeContentBrowserClient::GetSafeBrows const std::vector& allowlist_domains) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -105,7 +105,7 @@ } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -5697,11 +5680,6 @@ ChromeContentBrowserClient::GetUrlLookup +@@ -5720,11 +5703,6 @@ ChromeContentBrowserClient::GetUrlLookup GetForProfile(profile); } #endif @@ -119,7 +119,7 @@ --- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc +++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc -@@ -143,45 +143,6 @@ void MaybeCreateSafeBrowsingForRenderer( +@@ -144,45 +144,6 @@ void MaybeCreateSafeBrowsingForRenderer( const std::vector& allowlist_domains)> get_checker_delegate, mojo::PendingReceiver receiver) { @@ -266,15 +266,15 @@ } --- a/chrome/browser/download/download_stats.cc +++ b/chrome/browser/download/download_stats.cc -@@ -8,6 +8,7 @@ - #include "base/metrics/user_metrics.h" +@@ -9,6 +9,7 @@ #include "base/notreached.h" + #include "build/build_config.h" #include "components/profile_metrics/browser_profile_type.h" +#include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/browser/download/download_stats.h" void RecordDownloadCount(ChromeDownloadCountTypes type) { -@@ -27,8 +28,10 @@ void RecordDangerousDownloadWarningShown +@@ -28,8 +29,10 @@ void RecordDangerousDownloadWarningShown bool has_user_gesture) { base::UmaHistogramEnumeration("Download.ShowedDownloadWarning", danger_type, download::DOWNLOAD_DANGER_TYPE_MAX); @@ -287,7 +287,7 @@ void RecordOpenedDangerousConfirmDialog( --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -872,11 +872,13 @@ void DownloadTargetDeterminer::CheckVisi +@@ -873,11 +873,13 @@ void DownloadTargetDeterminer::CheckVisi bool visited_referrer_before) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); @@ -301,7 +301,7 @@ danger_level_ = GetDangerLevel( visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER); if (danger_level_ != DownloadFileType::NOT_DANGEROUS && -@@ -1111,6 +1113,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1112,6 +1114,7 @@ DownloadFileType::DangerLevel DownloadTa absl::optional DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { @@ -309,7 +309,7 @@ safe_browsing::SafeBrowsingMetricsCollector* metrics_collector = safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( GetProfile()); -@@ -1119,6 +1122,9 @@ DownloadTargetDeterminer::GetLastDownloa +@@ -1120,6 +1123,9 @@ DownloadTargetDeterminer::GetLastDownloa safe_browsing::SafeBrowsingMetricsCollector:: EventType::DANGEROUS_DOWNLOAD_BYPASS) : absl::nullopt; @@ -321,17 +321,17 @@ void DownloadTargetDeterminer::OnDownloadDestroyed( --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc -@@ -32,7 +32,6 @@ +@@ -33,7 +33,6 @@ #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_factory.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h" -#include "chrome/browser/safe_browsing/download_protection/check_client_download_request.h" #include "chrome/grit/generated_resources.h" #include "components/enterprise/common/proto/connectors.pb.h" - #include "components/policy/core/browser/url_util.h" + #include "components/policy/core/common/chrome_schema.h" --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -459,19 +459,6 @@ absl::optional ConnectorsSe +@@ -460,19 +460,6 @@ absl::optional ConnectorsSe return absl::nullopt; } @@ -353,7 +353,7 @@ } --- a/chrome/browser/enterprise/connectors/connectors_service.h +++ b/chrome/browser/enterprise/connectors/connectors_service.h -@@ -79,12 +79,6 @@ class ConnectorsService : public KeyedSe +@@ -80,12 +80,6 @@ class ConnectorsService : public KeyedSe // is no token to use. absl::optional GetDMTokenForRealTimeUrlCheck() const; @@ -396,7 +396,7 @@ LogSignalsCollectionLatency(kLatencyHistogramWithCacheVariant, start_time); --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc -@@ -199,7 +199,6 @@ void ContextInfoFetcher::Fetch(ContextIn +@@ -204,7 +204,6 @@ void ContextInfoFetcher::Fetch(ContextIn GetAnalysisConnectorProviders(enterprise_connectors::FILE_DOWNLOADED); info.on_bulk_data_entry_providers = GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY); @@ -404,7 +404,7 @@ info.on_security_event_providers = GetOnSecurityEventProviders(); info.browser_version = version_info::GetVersionNumber(); info.site_isolation_enabled = -@@ -257,11 +256,6 @@ std::vector ContextInfoFetc +@@ -262,11 +261,6 @@ std::vector ContextInfoFetc return connectors_service_->GetAnalysisServiceProviderNames(connector); } @@ -468,7 +468,7 @@ - absl::optional GetThirdPartyBlockingEnabled(PrefService* local_state) { DCHECK(local_state); - #if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) + #if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -65,15 +47,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ return local_state->GetBoolean(prefs::kBuiltInDnsClientEnabled); } @@ -484,7 +484,7 @@ - absl::optional GetChromeCleanupEnabled(PrefService* local_state) { DCHECK(local_state); - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) --- a/chrome/browser/enterprise/signals/signals_utils.h +++ b/chrome/browser/enterprise/signals/signals_utils.h @@ -21,12 +21,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ @@ -502,7 +502,7 @@ } // namespace utils --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -642,8 +642,6 @@ static_library("extensions") { +@@ -633,8 +633,6 @@ static_library("extensions") { "menu_manager_factory.h", "navigation_observer.cc", "navigation_observer.h", @@ -533,7 +533,7 @@ --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc -@@ -340,6 +340,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -342,6 +342,7 @@ void SafeBrowsingPrivateEventRouter::OnD event_router_->BroadcastEvent(std::move(extension_event)); } @@ -541,7 +541,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -370,6 +371,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -372,6 +373,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -549,7 +549,7 @@ } void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown( -@@ -397,6 +399,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -399,6 +401,7 @@ void SafeBrowsingPrivateEventRouter::OnS event_router_->BroadcastEvent(std::move(extension_event)); } @@ -557,7 +557,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -420,6 +423,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -422,6 +425,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()), std::move(event)); @@ -565,7 +565,7 @@ } void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded( -@@ -447,6 +451,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -449,6 +453,7 @@ void SafeBrowsingPrivateEventRouter::OnS event_router_->BroadcastEvent(std::move(extension_event)); } @@ -573,7 +573,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -466,6 +471,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -468,6 +473,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()), std::move(event)); @@ -581,7 +581,7 @@ } void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorResult( -@@ -479,6 +485,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -481,6 +487,7 @@ void SafeBrowsingPrivateEventRouter::OnA const enterprise_connectors::ContentAnalysisResponse::Result& result, const int64_t content_size, safe_browsing::EventResult event_result) { @@ -589,7 +589,7 @@ if (result.tag() == "malware") { DCHECK_EQ(1, result.triggered_rules().size()); OnDangerousDeepScanningResult( -@@ -490,6 +497,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -492,6 +499,7 @@ void SafeBrowsingPrivateEventRouter::OnA OnSensitiveDataEvent(url, file_name, download_digest_sha256, mime_type, trigger, scan_id, result, content_size, event_result); } @@ -597,7 +597,7 @@ } void SafeBrowsingPrivateEventRouter::OnDangerousDeepScanningResult( -@@ -505,6 +513,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -507,6 +515,7 @@ void SafeBrowsingPrivateEventRouter::OnD const std::string& malware_category, const std::string& evidence_locker_filepath, const std::string& scan_id) { @@ -605,7 +605,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -542,6 +551,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -544,6 +553,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -613,7 +613,7 @@ } void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent( -@@ -554,6 +564,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -556,6 +566,7 @@ void SafeBrowsingPrivateEventRouter::OnS const enterprise_connectors::ContentAnalysisResponse::Result& result, const int64_t content_size, safe_browsing::EventResult event_result) { @@ -621,7 +621,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -586,6 +597,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -588,6 +599,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()), std::move(event)); @@ -629,15 +629,15 @@ } void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed( -@@ -598,6 +610,7 @@ void SafeBrowsingPrivateEventRouter::OnA - safe_browsing::DeepScanAccessPoint access_point, +@@ -601,6 +613,7 @@ void SafeBrowsingPrivateEventRouter::OnA const enterprise_connectors::ContentAnalysisResponse::Result& result, - const int64_t content_size) { + const int64_t content_size, + absl::optional user_justification) { +#if defined(FULL_SAFE_BROWSING) absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -630,6 +643,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -636,6 +649,7 @@ void SafeBrowsingPrivateEventRouter::OnA ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()), std::move(event)); @@ -645,7 +645,7 @@ } void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent( -@@ -642,6 +656,7 @@ void SafeBrowsingPrivateEventRouter::OnU +@@ -648,6 +662,7 @@ void SafeBrowsingPrivateEventRouter::OnU const std::string& reason, const int64_t content_size, safe_browsing::EventResult event_result) { @@ -653,7 +653,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -668,6 +683,7 @@ void SafeBrowsingPrivateEventRouter::OnU +@@ -674,6 +689,7 @@ void SafeBrowsingPrivateEventRouter::OnU ReportRealtimeEvent(kKeyUnscannedFileEvent, std::move(settings.value()), std::move(event)); @@ -661,7 +661,7 @@ } void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent( -@@ -693,6 +709,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -699,6 +715,7 @@ void SafeBrowsingPrivateEventRouter::OnD const std::string& scan_id, const int64_t content_size, safe_browsing::EventResult event_result) { @@ -669,7 +669,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -723,6 +740,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -729,6 +746,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -677,7 +677,7 @@ } void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed( -@@ -746,6 +764,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -752,6 +770,7 @@ void SafeBrowsingPrivateEventRouter::OnD const std::string& mime_type, const std::string& scan_id, const int64_t content_size) { @@ -685,7 +685,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -776,6 +795,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -782,6 +801,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -693,7 +693,7 @@ } void SafeBrowsingPrivateEventRouter::OnLoginEvent( -@@ -1101,7 +1121,11 @@ void SafeBrowsingPrivateEventRouter::Rep +@@ -1107,7 +1127,11 @@ void SafeBrowsingPrivateEventRouter::Rep } std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const { @@ -707,7 +707,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc -@@ -600,15 +600,6 @@ void ChromeExtensionsBrowserClient::Noti +@@ -606,15 +606,6 @@ void ChromeExtensionsBrowserClient::Noti content::BrowserContext* context, const ExtensionId& extension_id, const std::string& code) const { @@ -725,7 +725,7 @@ // static --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -52,7 +52,6 @@ +@@ -51,7 +51,6 @@ #include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h" #include "chrome/browser/extensions/install_verifier.h" #include "chrome/browser/extensions/installed_loader.h" @@ -733,7 +733,7 @@ #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/browser/extensions/shared_module_service.h" -@@ -206,7 +205,6 @@ void ExtensionService::BlocklistExtensio +@@ -202,7 +201,6 @@ void ExtensionService::BlocklistExtensio blocklist_prefs::SetSafeBrowsingExtensionBlocklistState( extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE, extension_prefs_); @@ -741,7 +741,7 @@ } bool ExtensionService::OnExternalExtensionUpdateUrlFound( -@@ -369,7 +367,6 @@ ExtensionService::ExtensionService(Profi +@@ -365,7 +363,6 @@ ExtensionService::ExtensionService(Profi safe_browsing_verdict_handler_(extension_prefs, ExtensionRegistry::Get(profile), this), @@ -749,7 +749,7 @@ registry_(ExtensionRegistry::Get(profile)), pending_extension_manager_(profile), install_directory_(install_directory), -@@ -857,100 +854,6 @@ bool ExtensionService::IsExtensionEnable +@@ -861,100 +858,6 @@ bool ExtensionService::IsExtensionEnable return extension_registrar_.IsExtensionEnabled(extension_id); } @@ -860,7 +860,7 @@ #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/safe_browsing_verdict_handler.h" #include "chrome/browser/profiles/profile_manager.h" -@@ -271,40 +270,11 @@ class ExtensionService : public Extensio +@@ -275,40 +274,11 @@ class ExtensionService : public Extensio // nothing. void EnableExtension(const std::string& extension_id); @@ -901,7 +901,7 @@ // Disables the extension. If the extension is already disabled, just adds // the |disable_reasons| (a bitmask of disable_reason::DisableReason - there // can be multiple DisableReasons e.g. when an extension comes in disabled -@@ -640,8 +610,6 @@ class ExtensionService : public Extensio +@@ -648,8 +618,6 @@ class ExtensionService : public Extensio SafeBrowsingVerdictHandler safe_browsing_verdict_handler_; @@ -912,7 +912,7 @@ --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc -@@ -465,8 +465,6 @@ void ExtensionSystemImpl::InstallUpdate( +@@ -464,8 +464,6 @@ void ExtensionSystemImpl::InstallUpdate( void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes( const std::string& extension_id, const base::Value& attributes) { @@ -966,7 +966,7 @@ #include "chrome/browser/ui/file_system_access_dialogs.h" #include "chrome/common/chrome_paths.h" #include "components/content_settings/core/browser/host_content_settings_map.h" -@@ -304,83 +302,6 @@ BindResultCallbackToCurrentSequence( +@@ -305,83 +303,6 @@ BindResultCallbackToCurrentSequence( base::SequencedTaskRunnerHandle::Get(), std::move(callback)); } @@ -1050,7 +1050,7 @@ std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey : base::StrCat({kCustomLastPickedDirectoryKey, "-", id}); -@@ -1133,28 +1054,6 @@ void ChromeFileSystemAccessPermissionCon +@@ -1134,28 +1055,6 @@ void ChromeFileSystemAccessPermissionCon std::move(callback))); } @@ -1094,7 +1094,7 @@ --- a/chrome/browser/media/webrtc/display_media_access_handler.cc +++ b/chrome/browser/media/webrtc/display_media_access_handler.cc -@@ -24,6 +24,7 @@ +@@ -23,6 +23,7 @@ #include "chrome/browser/safe_browsing/user_interaction_observer.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" @@ -1110,13 +1110,13 @@ // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Show the warning -@@ -120,6 +122,7 @@ void DisplayMediaAccessHandler::HandleRe +@@ -121,6 +123,7 @@ void DisplayMediaAccessHandler::HandleRe observer->OnDesktopCaptureRequest(); return; } + #endif // BUILDFLAG(FULL_SAFE_BROWSING) - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) // Do not allow picker UI to be shown on a page that isn't in the foreground --- a/chrome/browser/notifications/notification_display_service_impl.cc +++ b/chrome/browser/notifications/notification_display_service_impl.cc @@ -1124,8 +1124,8 @@ profile_)); #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) - AddNotificationHandler( - NotificationHandler::Type::TAILORED_SECURITY, - std::make_unique()); @@ -1144,7 +1144,7 @@ #include "chrome/browser/safe_browsing/user_interaction_observer.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/sync/sync_service_factory.h" -@@ -112,11 +111,11 @@ +@@ -114,11 +113,11 @@ #if BUILDFLAG(FULL_SAFE_BROWSING) #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h" #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" @@ -1155,9 +1155,9 @@ #include "ui/events/keycodes/keyboard_codes.h" -#endif - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/android/tab_android.h" -@@ -830,6 +829,7 @@ autofill::LanguageCode ChromePasswordMan +@@ -837,6 +836,7 @@ autofill::LanguageCode ChromePasswordMan return autofill::LanguageCode(); } @@ -1165,32 +1165,9 @@ safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { return safe_browsing::ChromePasswordProtectionService:: -@@ -840,13 +840,6 @@ ChromePasswordManagerClient::GetPassword - void ChromePasswordManagerClient::CheckSafeBrowsingReputation( - const GURL& form_action, - const GURL& frame_url) { -- safe_browsing::PasswordProtectionService* pps = -- GetPasswordProtectionService(); -- if (pps) { -- pps->MaybeStartPasswordFieldOnFocusRequest( -- web_contents(), web_contents()->GetLastCommittedURL(), form_action, -- frame_url, pps->GetAccountInfo().hosted_domain); -- } - } - #endif // defined(ON_FOCUS_PING_ENABLED) - -@@ -856,22 +849,10 @@ void ChromePasswordManagerClient::CheckP - const std::vector& - matching_reused_credentials, - bool password_field_exists) { -- safe_browsing::PasswordProtectionService* pps = -- GetPasswordProtectionService(); -- if (!pps) -- return; -- -- pps->MaybeStartProtectedPasswordEntryRequest( -- web_contents(), web_contents()->GetLastCommittedURL(), username, -- password_type, matching_reused_credentials, password_field_exists); +@@ -872,13 +872,9 @@ void ChromePasswordManagerClient::CheckP + web_contents(), web_contents()->GetLastCommittedURL(), username, + password_type, matching_reused_credentials, password_field_exists); } +#endif // BUILDFLAG(FULL_SAFE_BROWSING) @@ -1202,8 +1179,8 @@ - } } - #if !defined(OS_ANDROID) -@@ -1390,9 +1371,11 @@ void ChromePasswordManagerClient::OnPast + #if !BUILDFLAG(IS_ANDROID) +@@ -1387,9 +1383,11 @@ void ChromePasswordManagerClient::OnPast } was_on_paste_called_ = true; @@ -1212,11 +1189,11 @@ +#endif // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED) } -#endif -+#endif // !defined(OS_ANDROID) ++#endif // !BUILDFLAG(IS_ANDROID) void ChromePasswordManagerClient::RenderFrameCreated( content::RenderFrameHost* render_frame_host) { -@@ -1427,7 +1410,9 @@ void ChromePasswordManagerClient::OnInpu +@@ -1424,7 +1422,9 @@ void ChromePasswordManagerClient::OnInpu if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) { OnPaste(); } else { @@ -1224,9 +1201,9 @@ password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text); +#endif // defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED) } - #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) } -@@ -1466,6 +1451,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1463,6 +1463,7 @@ bool ChromePasswordManagerClient::IsPass is_enabled = false; } @@ -1234,7 +1211,7 @@ // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Disable password -@@ -1476,6 +1462,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1473,6 +1474,7 @@ bool ChromePasswordManagerClient::IsPass observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -1244,7 +1221,7 @@ password_manager::BrowserSavePasswordProgressLogger logger( --- a/chrome/browser/password_manager/chrome_password_manager_client.h +++ b/chrome/browser/password_manager/chrome_password_manager_client.h -@@ -204,13 +204,14 @@ class ChromePasswordManagerClient +@@ -206,13 +206,14 @@ class ChromePasswordManagerClient void AnnotateNavigationEntry(bool has_password_field) override; autofill::LanguageCode GetPageLanguage() const override; @@ -1260,7 +1237,7 @@ void CheckProtectedPasswordEntry( password_manager::metrics_util::PasswordType reused_password_type, -@@ -218,6 +219,7 @@ class ChromePasswordManagerClient +@@ -220,6 +221,7 @@ class ChromePasswordManagerClient const std::vector& matching_reused_credentials, bool password_field_exists) override; @@ -1338,21 +1315,57 @@ void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived( --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -212,10 +212,8 @@ bool PredictionBasedPermissionUiSelector +@@ -306,47 +306,5 @@ bool PredictionBasedPermissionUiSelector + + PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse( permissions::RequestType request_type) { - // We need to also check `kQuietNotificationPrompts` here since there is no - // generic safeguard anywhere else in the stack. -- if (!base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) || -- !safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) { -+ if (!base::FeatureList::IsEnabled(features::kQuietNotificationPrompts)) - return false; +- if (!safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) { + return PredictionSource::USE_NONE; - } - double hold_back_chance = 0.0; - bool is_permissions_predictions_enabled = false; - switch (request_type) { +- +- bool is_server_side_prediction_enabled = false; +- bool is_ondevice_prediction_enabled = false; +- +- bool is_tflite_available = false; +-#if BUILDFLAG(BUILD_WITH_TFLITE_LIB) +- is_tflite_available = true; +-#endif // BUILDFLAG(BUILD_WITH_TFLITE_LIB) +- +- // Notification supports both flavours of the quiet prompt +- if (request_type == permissions::RequestType::kNotifications && +- (base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) || +- base::FeatureList::IsEnabled( +- permissions::features::kPermissionQuietChip))) { +- is_server_side_prediction_enabled = +- base::FeatureList::IsEnabled(features::kPermissionPredictions); +- +- is_ondevice_prediction_enabled = +- is_tflite_available && +- base::FeatureList::IsEnabled( +- permissions::features::kPermissionOnDeviceNotificationPredictions); +- } +- +- // Geolocation supports only the quiet chip ui +- if (request_type == permissions::RequestType::kGeolocation && +- base::FeatureList::IsEnabled( +- permissions::features::kPermissionQuietChip)) { +- is_server_side_prediction_enabled = base::FeatureList::IsEnabled( +- features::kPermissionGeolocationPredictions); +- } +- +- if (is_server_side_prediction_enabled && is_ondevice_prediction_enabled) { +- return PredictionSource::USE_ANY; +- } else if (is_server_side_prediction_enabled) { +- return PredictionSource::USE_SERVER_SIDE; +- } else if (is_ondevice_prediction_enabled) { +- return PredictionSource::USE_ONDEVICE; +- } else { +- return PredictionSource::USE_NONE; +- } + } --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -241,7 +241,6 @@ +@@ -244,7 +244,6 @@ #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h" #include "chrome/browser/new_tab_page/modules/drive/drive_service.h" #include "chrome/browser/new_tab_page/modules/photos/photos_service.h" @@ -1360,7 +1373,7 @@ #include "chrome/browser/new_tab_page/modules/task_module/task_module_service.h" #include "chrome/browser/new_tab_page/promos/promo_service.h" #include "chrome/browser/search/background/ntp_custom_background_service.h" -@@ -1283,7 +1282,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1348,7 +1347,6 @@ void RegisterProfilePrefs(user_prefs::Pr NewTabPageHandler::RegisterProfilePrefs(registry); NewTabPageUI::RegisterProfilePrefs(registry); NewTabUI::RegisterProfilePrefs(registry); @@ -1370,14 +1383,14 @@ PinnedTabCodec::RegisterProfilePrefs(registry); --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -506,7 +506,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -517,7 +517,6 @@ void ChromeBrowserMainExtraPartsProfiles SystemExtensionsProviderFactory::GetInstance(); #endif TabRestoreServiceFactory::GetInstance(); - safe_browsing::TailoredSecurityServiceFactory::GetInstance(); TemplateURLFetcherFactory::GetInstance(); TemplateURLServiceFactory::GetInstance(); - #if !defined(OS_ANDROID) + #if !BUILDFLAG(IS_ANDROID) --- a/chrome/browser/reputation/reputation_service.cc +++ b/chrome/browser/reputation/reputation_service.cc @@ -119,9 +119,7 @@ void ReputationService::GetReputationSta @@ -1393,7 +1406,7 @@ if (service->EngagedSitesNeedUpdating()) { --- a/chrome/browser/resources/settings/privacy_page/privacy_review/privacy_review_page.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_review/privacy_review_page.ts -@@ -16,7 +16,6 @@ import './privacy_review_completion_frag +@@ -17,7 +17,6 @@ import './privacy_review_completion_frag import './privacy_review_cookies_fragment.js'; import './privacy_review_history_sync_fragment.js'; import './privacy_review_msbb_fragment.js'; @@ -1453,7 +1466,7 @@ } // namespace safe_browsing --- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc +++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc -@@ -142,15 +142,6 @@ CreateSettingsPageHelper() { +@@ -143,15 +143,6 @@ CreateSettingsPageHelper() { CreateChromeSettingsPageHelper(); } @@ -1469,7 +1482,7 @@ } // namespace std::unique_ptr -@@ -174,10 +165,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -175,10 +166,6 @@ ChromeSecurityBlockingPageFactory::Creat Profile::FromBrowserContext(web_contents->GetBrowserContext())); state->DidDisplayErrorPage(cert_error); @@ -1480,7 +1493,7 @@ auto controller_client = std::make_unique( web_contents, ssl_info, cert_error, request_url, std::move(metrics_helper), CreateSettingsPageHelper()); -@@ -247,10 +234,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -248,10 +235,6 @@ ChromeSecurityBlockingPageFactory::Creat std::unique_ptr ssl_cert_reporter, const net::SSLInfo& ssl_info, const std::string& mitm_software_name) { @@ -1491,7 +1504,7 @@ auto page = std::make_unique( web_contents, cert_error, request_url, std::move(ssl_cert_reporter), /*can_show_enhanced_protection_message=*/true, ssl_info, -@@ -272,10 +255,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -273,10 +256,6 @@ ChromeSecurityBlockingPageFactory::Creat const GURL& request_url, std::unique_ptr ssl_cert_reporter, const net::SSLInfo& ssl_info) { @@ -1545,7 +1558,7 @@ } // namespace --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -544,7 +544,6 @@ static_library("ui") { +@@ -546,7 +546,6 @@ static_library("ui") { "//components/renderer_context_menu", "//components/resources", "//components/safe_browsing/content/browser", @@ -1553,7 +1566,7 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser/db:database_manager", -@@ -4499,8 +4498,6 @@ static_library("ui") { +@@ -4523,8 +4522,6 @@ static_library("ui") { "views/safe_browsing/password_reuse_modal_warning_dialog.h", "views/safe_browsing/prompt_for_scanning_modal_dialog.cc", "views/safe_browsing/prompt_for_scanning_modal_dialog.h", @@ -1688,7 +1701,7 @@ open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) || prompt_to_scan || allow_open_during_deep_scan); -@@ -1428,7 +1430,9 @@ void DownloadItemView::ShowContextMenuIm +@@ -1433,7 +1435,9 @@ void DownloadItemView::ShowContextMenuIm } void DownloadItemView::OpenDownloadDuringAsyncScanning() { @@ -1710,7 +1723,7 @@ --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -805,12 +805,6 @@ base::Value ManagementUIHandler::GetThre +@@ -819,12 +819,6 @@ base::Value ManagementUIHandler::GetThre &info); } @@ -1725,7 +1738,7 @@ --- a/chrome/browser/webshare/share_service_impl.cc +++ b/chrome/browser/webshare/share_service_impl.cc -@@ -15,7 +15,9 @@ +@@ -16,7 +16,9 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_features.h" @@ -1735,7 +1748,7 @@ #include "components/safe_browsing/core/browser/db/database_manager.h" #include "content/public/browser/web_contents.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" -@@ -195,11 +197,13 @@ void ShareServiceImpl::Share(const std:: +@@ -196,11 +198,13 @@ void ShareServiceImpl::Share(const std:: // Check if at least one file is marked by the download protection service // to send a ping to check this file type. const base::FilePath path = base::FilePath::FromUTF8Unsafe(file->name); @@ -1749,7 +1762,7 @@ // In the case where the original blob handle was to a native file (of // unknown size), the serialized data does not contain an accurate file -@@ -209,6 +213,7 @@ void ShareServiceImpl::Share(const std:: +@@ -210,6 +214,7 @@ void ShareServiceImpl::Share(const std:: } DCHECK(!safe_browsing_request_); @@ -1757,7 +1770,7 @@ if (should_check_url && g_browser_process->safe_browsing_service()) { safe_browsing_request_.emplace( g_browser_process->safe_browsing_service()->database_manager(), -@@ -218,6 +223,7 @@ void ShareServiceImpl::Share(const std:: +@@ -219,6 +224,7 @@ void ShareServiceImpl::Share(const std:: std::move(files), std::move(callback))); return; } @@ -1767,7 +1780,7 @@ std::move(callback), --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1212,7 +1212,6 @@ if (!is_android && !is_fuchsia) { +@@ -1251,7 +1251,6 @@ if (!is_android && !is_fuchsia) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1775,7 +1788,7 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:test_support", -@@ -5348,7 +5347,6 @@ test("unit_tests") { +@@ -5376,7 +5375,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1796,7 +1809,7 @@ } --- a/components/password_manager/core/browser/password_manager_client.h +++ b/components/password_manager/core/browser/password_manager_client.h -@@ -340,11 +340,14 @@ class PasswordManagerClient { +@@ -344,11 +344,14 @@ class PasswordManagerClient { // Returns the current best guess as to the page's display language. virtual autofill::LanguageCode GetPageLanguage() const; @@ -1812,7 +1825,7 @@ // Checks the safe browsing reputation of the webpage when the // user focuses on a username/password field. This is used for reporting // only, and won't trigger a warning. -@@ -352,6 +355,7 @@ class PasswordManagerClient { +@@ -356,6 +359,7 @@ class PasswordManagerClient { const GURL& frame_url) = 0; #endif @@ -1820,7 +1833,7 @@ // Checks the safe browsing reputation of the webpage where password reuse // happens. This is called by the PasswordReuseDetectionManager when a // protected password is typed on the wrong domain. This may trigger a -@@ -364,6 +368,7 @@ class PasswordManagerClient { +@@ -368,6 +372,7 @@ class PasswordManagerClient { const std::string& username, const std::vector& matching_reused_credentials, bool password_field_exists) = 0; diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 93d094e2..4ae68b37 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -11,8 +11,8 @@ -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/url_formatter/url_fixer.h" #include "components/user_prefs/user_prefs.h" - #include "components/visitedlink/browser/visitedlink_writer.h" -@@ -469,8 +468,6 @@ void AwBrowserContext::RebuildTable( + #include "components/variations/variations_client.h" +@@ -519,8 +518,6 @@ void AwBrowserContext::RebuildTable( } void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) { @@ -23,7 +23,7 @@ // TODO(amalova): Make sure NetworkContextParams is configured correctly when --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -1656,69 +1656,9 @@ +@@ -1668,69 +1668,9 @@ Preloads pages that Chrome thinks you might visit. To do this, Chrome may use cookies, if you allow cookies, and may encrypt and send pages through Google to hide your identity from sites. @@ -64,7 +64,7 @@ - Standard protection - - -- Standard protection against websites, downloads, and extensions that are known to be dangerous. +- Standard protection against websites, downloads, and extensions that are known to be dangerous - - - Show standard protection details @@ -192,7 +192,7 @@ #include "components/user_manager/known_user.h" #include "components/user_manager/user_manager.h" #include "content/public/test/browser_test.h" -@@ -249,15 +248,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE +@@ -248,15 +247,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword, kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId); @@ -208,7 +208,7 @@ // Can't use SetKnownUserDeviceId here, because it forbids changing a device // ID. user_manager::known_user::SetStringPref( -@@ -282,13 +272,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE +@@ -281,13 +271,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword, kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId); @@ -224,7 +224,7 @@ user_manager::known_user::SetStringPref( --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -230,7 +230,6 @@ +@@ -231,7 +231,6 @@ #include "components/safe_browsing/core/browser/realtime/url_lookup_service.h" #include "components/safe_browsing/core/browser/url_checker_delegate.h" #include "components/safe_browsing/core/common/features.h" @@ -244,7 +244,7 @@ #include "components/services/quarantine/test_support.h" --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -783,6 +783,7 @@ void DownloadItemModel::ExecuteCommand(D +@@ -786,6 +786,7 @@ void DownloadItemModel::ExecuteCommand(D DownloadUIModel::ExecuteCommand(download_commands, command); break; case DownloadCommands::DEEP_SCAN: @@ -252,7 +252,7 @@ safe_browsing::SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); if (!sb_service) -@@ -808,6 +809,7 @@ void DownloadItemModel::ExecuteCommand(D +@@ -811,6 +812,7 @@ void DownloadItemModel::ExecuteCommand(D safe_browsing::DeepScanningRequest::DeepScanTrigger:: TRIGGER_APP_PROMPT, safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings)); @@ -272,17 +272,15 @@ #include "crypto/secure_hash.h" --- a/chrome/browser/enterprise/connectors/connectors_manager.cc +++ b/chrome/browser/enterprise/connectors/connectors_manager.cc -@@ -6,6 +6,7 @@ +@@ -6,12 +6,12 @@ #include +#include "base/bind.h" #include "base/feature_list.h" - #include "base/no_destructor.h" #include "base/values.h" -@@ -13,7 +14,6 @@ + #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/connectors_prefs.h" - #include "components/policy/core/browser/url_util.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/url_matcher/url_matcher.h" @@ -290,7 +288,7 @@ --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -36,7 +36,6 @@ +@@ -37,7 +37,6 @@ #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h" #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/policy/core/common/policy_types.h" @@ -298,7 +296,7 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/user_prefs/user_prefs.h" -@@ -389,8 +388,7 @@ std::string ConnectorsService::GetManage +@@ -390,8 +389,7 @@ std::string ConnectorsService::GetManage absl::optional scope = absl::nullopt; for (const char* scope_pref : @@ -308,7 +306,7 @@ ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED), ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY), ConnectorScopePref(AnalysisConnector::PRINT), -@@ -442,20 +440,6 @@ std::string ConnectorsService::GetManage +@@ -443,20 +441,6 @@ std::string ConnectorsService::GetManage absl::optional ConnectorsService::GetDMTokenForRealTimeUrlCheck() const { @@ -331,7 +329,7 @@ --- a/chrome/browser/enterprise/connectors/connectors_service.h +++ b/chrome/browser/enterprise/connectors/connectors_service.h -@@ -14,7 +14,6 @@ +@@ -15,7 +15,6 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/keyed_service.h" #include "components/policy/core/common/policy_types.h" @@ -341,7 +339,7 @@ namespace base { --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc -@@ -213,11 +213,6 @@ void ContextInfoFetcher::Fetch(ContextIn +@@ -218,11 +218,6 @@ void ContextInfoFetcher::Fetch(ContextIn info.third_party_blocking_enabled = utils::GetThirdPartyBlockingEnabled(g_browser_process->local_state()); @@ -351,7 +349,7 @@ - info.password_protection_warning_trigger = - utils::GetPasswordProtectionWarningTrigger(profile->GetPrefs()); - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) base::ThreadPool::CreateCOMSTATaskRunner({base::MayBlock()}) --- a/chrome/browser/enterprise/signals/context_info_fetcher.h +++ b/chrome/browser/enterprise/signals/context_info_fetcher.h @@ -383,7 +381,7 @@ #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) #include "components/component_updater/pref_names.h" --- a/chrome/browser/enterprise/signals/signals_utils.h +++ b/chrome/browser/enterprise/signals/signals_utils.h @@ -479,14 +477,14 @@ std::string GetOAuth2MintTokenFlowVersion() { --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc -@@ -36,7 +36,6 @@ +@@ -35,7 +35,6 @@ #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/proxy_config/proxy_config_pref_names.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/spellcheck/browser/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" - #include "extensions/browser/extension_pref_value_map.h" + #include "extensions/browser/api/content_settings/content_settings_service.h" @@ -110,11 +109,6 @@ const PrefMappingEntry kPrefMapping[] = APIPermissionID::kPrivacy}, {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy, @@ -499,7 +497,7 @@ {"searchSuggestEnabled", prefs::kSearchSuggestEnabled, APIPermissionID::kPrivacy, APIPermissionID::kPrivacy}, {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, -@@ -847,18 +841,6 @@ ExtensionFunction::ResponseAction SetPre +@@ -845,18 +839,6 @@ ExtensionFunction::ResponseAction SetPre base::Value(browser_pref_value->GetBool())); } @@ -518,7 +516,7 @@ preference_api->SetExtensionControlledPref( extension_id(), browser_pref, scope, base::Value::FromUniquePtrValue(std::move(browser_pref_value))); -@@ -911,18 +893,6 @@ ExtensionFunction::ResponseAction ClearP +@@ -909,18 +891,6 @@ ExtensionFunction::ResponseAction ClearP PreferenceAPI::Get(browser_context()) ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); @@ -593,7 +591,7 @@ #include "extensions/browser/test_event_router.h" --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -43,7 +43,6 @@ +@@ -42,7 +42,6 @@ #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/proxy_config/proxy_config_pref_names.h" @@ -601,7 +599,7 @@ #include "components/search_engines/default_search_manager.h" #include "components/spellcheck/browser/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" -@@ -289,16 +288,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -288,16 +287,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::PREF_TYPE_BOOLEAN; // Security page @@ -700,7 +698,7 @@ int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) { --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -43,7 +43,6 @@ +@@ -44,7 +44,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -708,7 +706,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/network_service_instance.h" -@@ -774,13 +773,6 @@ void ProfileNetworkContextService::Confi +@@ -799,13 +798,6 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; network_context_params->enable_expect_ct_reporting = true; @@ -843,14 +841,14 @@ constexpr char kExcludedKey[] = "exempted"; --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -23,7 +23,6 @@ +@@ -26,7 +26,6 @@ #include "components/permissions/prediction_service/prediction_service.h" #include "components/permissions/prediction_service/prediction_service_messages.pb.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - namespace { - + #if BUILDFLAG(BUILD_WITH_TFLITE_LIB) + #include "chrome/browser/permissions/prediction_model_handler_factory.h" --- a/chrome/browser/policy/browser_signin_policy_handler.cc +++ b/chrome/browser/policy/browser_signin_policy_handler.cc @@ -15,7 +15,6 @@ @@ -863,11 +861,11 @@ BrowserSigninPolicyHandler::BrowserSigninPolicyHandler(Schema chrome_schema) @@ -48,28 +47,18 @@ void BrowserSigninPolicyHandler::ApplyPo #endif - FALLTHROUGH; + [[fallthrough]]; case BrowserSigninMode::kEnabled: -+#if !defined(OS_ANDROID) ++#if !BUILDFLAG(IS_ANDROID) prefs->SetValue( --#if defined(OS_ANDROID) +-#if BUILDFLAG(IS_ANDROID) - // The new kSigninAllowedOnNextStartup pref is only used on Desktop. - // Keep the old kSigninAllowed pref for Android until the policy is - // fully deprecated in M71 and can be removed. @@ -879,9 +877,9 @@ +#endif break; case BrowserSigninMode::kDisabled: -+#if !defined(OS_ANDROID) ++#if !BUILDFLAG(IS_ANDROID) prefs->SetValue( --#if defined(OS_ANDROID) +-#if BUILDFLAG(IS_ANDROID) - // The new kSigninAllowedOnNextStartup pref is only used on Desktop. - // Keep the old kSigninAllowed pref for Android until the policy is - // fully deprecated in M71 and can be removed. @@ -896,7 +894,7 @@ } --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -88,12 +88,9 @@ +@@ -89,12 +89,9 @@ #include "components/policy/core/common/schema.h" #include "components/policy/policy_constants.h" #include "components/proxy_config/proxy_policy_handler.h" @@ -909,7 +907,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/driver/sync_policy_handler.h" -@@ -215,15 +212,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -217,15 +214,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kQuicAllowed, prefs::kQuicAllowed, base::Value::Type::BOOLEAN }, @@ -925,7 +923,7 @@ { key::kUrlKeyedAnonymizedDataCollectionEnabled, unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, base::Value::Type::BOOLEAN }, -@@ -359,15 +347,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -361,15 +349,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGloballyScopeHTTPAuthCacheEnabled, prefs::kGloballyScopeHTTPAuthCacheEnabled, base::Value::Type::BOOLEAN }, @@ -941,7 +939,7 @@ { key::kSafeSitesFilterBehavior, policy_prefs::kSafeSitesFilterBehavior, base::Value::Type::INTEGER }, -@@ -476,18 +455,12 @@ const PolicyToPreferenceMapEntry kSimple +@@ -478,18 +457,12 @@ const PolicyToPreferenceMapEntry kSimple { key::kMaxConnectionsPerProxy, prefs::kMaxConnectionsPerProxy, base::Value::Type::INTEGER }, @@ -960,7 +958,7 @@ { key::kCECPQ2Enabled, prefs::kCECPQ2Enabled, base::Value::Type::BOOLEAN }, -@@ -687,9 +660,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -686,9 +659,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kIntranetRedirectBehavior, omnibox::kIntranetRedirectBehavior, base::Value::Type::INTEGER }, @@ -970,7 +968,7 @@ { key::kAccessibilityImageLabelsEnabled, prefs::kAccessibilityImageLabelsEnabled, base::Value::Type::BOOLEAN }, -@@ -1682,8 +1652,6 @@ std::unique_ptrAddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); @@ -979,7 +977,7 @@ handlers->AddHandler(std::make_unique( std::make_unique(key::kAuthServerWhitelist, prefs::kAuthServerAllowlist, -@@ -1707,9 +1675,6 @@ std::unique_ptrAddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); -@@ -1805,12 +1770,6 @@ std::unique_ptrAddHandler(std::make_unique( key::kClearBrowsingDataOnExitList, -@@ -1860,17 +1819,6 @@ std::unique_ptr( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); - signin_legacy_policies.push_back(std::make_unique( - key::kSigninAllowed, --#if defined(OS_ANDROID) +-#if BUILDFLAG(IS_ANDROID) - // The new kSigninAllowedOnNextStartup pref is only used on Desktop. - // Keep the old kSigninAllowed pref for Android until the policy is - // fully deprecated in M71 and can be removed. - prefs::kSigninAllowed, --#else // defined(OS_ANDROID) +-#else // BUILDFLAG(IS_ANDROID) - prefs::kSigninAllowedOnNextStartup, --#endif // defined(OS_ANDROID) +-#endif // BUILDFLAG(IS_ANDROID) - base::Value::Type::BOOLEAN)); handlers->AddHandler(std::make_unique( std::move(signin_legacy_policies), std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -134,7 +134,6 @@ +@@ -135,7 +135,6 @@ #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/proxy_config/pref_proxy_config_tracker_impl.h" @@ -1030,15 +1028,15 @@ #include "components/search_engines/template_url_prepopulate_data.h" #include "components/security_interstitials/content/insecure_form_blocking_page.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" -@@ -921,7 +920,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -984,7 +983,6 @@ void RegisterLocalState(PrefRegistrySimp ProfileNetworkContextService::RegisterLocalStatePrefs(registry); profiles::RegisterPrefs(registry); RegisterScreenshotPrefs(registry); - safe_browsing::RegisterLocalStatePrefs(registry); secure_origin_allowlist::RegisterPrefs(registry); - #if !defined(OS_ANDROID) + #if !BUILDFLAG(IS_ANDROID) SerialPolicyAllowedPorts::RegisterPrefs(registry); -@@ -1177,7 +1175,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1241,7 +1239,6 @@ void RegisterProfilePrefs(user_prefs::Pr PushMessagingAppIdentifier::RegisterProfilePrefs(registry); QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); @@ -1063,14 +1061,14 @@ - {safe_browsing::switches::kSbEnableEnhancedProtection, - prefs::kSafeBrowsingEnhanced, true}, #if BUILDFLAG(IS_CHROMEOS_ASH) - {chromeos::switches::kEnableTouchpadThreeFingerClick, + {ash::switches::kEnableTouchpadThreeFingerClick, prefs::kEnableTouchpadThreeFingerClick, true}, --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc -@@ -48,10 +48,8 @@ - #include "components/prefs/pref_service.h" +@@ -49,10 +49,8 @@ #include "components/prefs/pref_store.h" #include "components/prefs/pref_value_store.h" + #include "components/prefs/standalone_browser_pref_store.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/search_engines_pref_names.h" @@ -1078,7 +1076,7 @@ #include "components/sync/base/model_type.h" #include "components/sync/base/pref_names.h" #include "components/sync_preferences/pref_model_associator.h" -@@ -121,8 +119,6 @@ const prefs::TrackedPreferenceMetadata k +@@ -122,8 +120,6 @@ const prefs::TrackedPreferenceMetadata k {5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT, PrefTrackingStrategy::SPLIT, ValueType::IMPERSONAL}, #endif @@ -1086,17 +1084,17 @@ - PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL}, {7, prefs::kSearchProviderOverrides, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, - #if !defined(OS_ANDROID) -@@ -146,8 +142,6 @@ const prefs::TrackedPreferenceMetadata k + #if !BUILDFLAG(IS_ANDROID) +@@ -147,8 +143,6 @@ const prefs::TrackedPreferenceMetadata k PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, // kSyncRemainingRollbackTries is deprecated and will be removed a few // releases after M50. - {18, prefs::kSafeBrowsingIncidentsSent, EnforcementLevel::ENFORCE_ON_LOAD, - PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) {19, prefs::kSwReporterPromptVersion, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, -@@ -156,10 +150,6 @@ const prefs::TrackedPreferenceMetadata k +@@ -157,10 +151,6 @@ const prefs::TrackedPreferenceMetadata k {22, prefs::kSwReporterPromptSeed, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, #endif @@ -1104,7 +1102,7 @@ - PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL}, - {24, prefs::kGoogleServicesLastAccountId, EnforcementLevel::ENFORCE_ON_LOAD, - PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL}, - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) {25, prefs::kSettingsResetPromptPromptWave, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, --- a/chrome/browser/prefs/pref_functional_browsertest.cc @@ -1186,7 +1184,7 @@ void ProfileAttributesEntry::LockForceSigninProfile(bool is_lock) { --- a/chrome/browser/profiles/profile_attributes_storage.cc +++ b/chrome/browser/profiles/profile_attributes_storage.cc -@@ -36,7 +36,6 @@ +@@ -37,7 +37,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/profile_metrics/state.h" #include "components/signin/public/base/persistent_repeating_timer.h" @@ -1194,7 +1192,7 @@ #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "third_party/icu/source/i18n/unicode/coll.h" -@@ -374,8 +373,6 @@ void ProfileAttributesStorage::AddProfil +@@ -375,8 +374,6 @@ void ProfileAttributesStorage::AddProfil if (params.account_id.HasAccountIdKey()) info.SetStringKey(ProfileAttributesEntry::kAccountIdKey, params.account_id.GetAccountIdKey()); @@ -1205,7 +1203,7 @@ ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted); --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -150,7 +150,6 @@ +@@ -151,7 +151,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/profile_metrics/browser_profile_type.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" @@ -1223,7 +1221,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/sync/base/stop_source.h" -@@ -2148,8 +2147,7 @@ void ProfileManager::AddProfileToStorage +@@ -2185,8 +2184,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1231,9 +1229,9 @@ - prefs::kSignedInWithCredentialProvider)); + entry->SetSignedInWithCredentialProvider(false); - #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) + #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -2204,14 +2202,13 @@ void ProfileManager::AddProfileToStorage +@@ -2241,14 +2239,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsEphemeral(profile); init_params.is_signed_in_with_credential_provider = @@ -1251,7 +1249,7 @@ prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName); --- a/chrome/browser/profiles/profile_window.cc +++ b/chrome/browser/profiles/profile_window.cc -@@ -39,7 +39,6 @@ +@@ -41,7 +41,6 @@ #include "chrome/common/url_constants.h" #include "components/flags_ui/pref_service_flags_storage.h" #include "components/prefs/pref_service.h" @@ -1286,7 +1284,7 @@ --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -551,7 +551,7 @@ +@@ -558,7 +558,7 @@ @@ -1297,7 +1295,7 @@ GetBoolean(prefs::kSigninAllowedOnNextStartup); @@ -2148,7 +2146,7 @@ UMA_HISTOGRAM_BOOLEAN("Signin.SigninAllowed", signin_allowed); #endif -@@ -193,16 +191,7 @@ AccountConsistencyModeManager::ComputeAc +@@ -192,16 +190,7 @@ AccountConsistencyModeManager::ComputeAc return AccountConsistencyMethod::kMirror; #endif @@ -2340,7 +2338,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" --- a/chrome/browser/signin/signin_util.cc +++ b/chrome/browser/signin/signin_util.cc -@@ -32,7 +32,6 @@ +@@ -33,7 +33,6 @@ #include "components/google/core/common/google_util.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/signin_metrics.h" @@ -2348,7 +2346,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/identity_utils.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -300,7 +299,7 @@ void EnsurePrimaryAccountAllowedForProfi +@@ -301,7 +300,7 @@ void EnsurePrimaryAccountAllowedForProfi CoreAccountInfo primary_account = identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync); @@ -2367,8 +2365,8 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -136,9 +135,6 @@ void ImportCredentialsFromProvider(Profi - account_id, nullptr)); +@@ -134,9 +133,6 @@ void ImportCredentialsFromProvider(Profi + account_id, nullptr, profile)); } } - @@ -2377,7 +2375,7 @@ } // Extracts the |cred_provider_gaia_id| and |cred_provider_email| for the user -@@ -313,20 +309,7 @@ bool ReauthWithCredentialProviderIfPossi +@@ -311,20 +307,7 @@ bool ReauthWithCredentialProviderIfPossi // - The profile is marked as having been signed in with a system credential. // - The profile is already signed in. // - The profile is in an auth error state. @@ -2428,7 +2426,7 @@ #include "content/public/browser/network_service_instance.h" #include "content/public/browser/storage_partition.h" #include "net/traffic_annotation/network_traffic_annotation.h" -@@ -119,8 +118,5 @@ void SCTReportingService::SetReportingEn +@@ -116,8 +115,5 @@ void SCTReportingService::SetReportingEn } void SCTReportingService::OnPreferenceChanged() { @@ -2440,7 +2438,7 @@ } --- a/chrome/browser/ssl/ssl_browsertest.cc +++ b/chrome/browser/ssl/ssl_browsertest.cc -@@ -92,7 +92,6 @@ +@@ -93,7 +93,6 @@ #include "components/policy/policy_constants.h" #include "components/prefs/testing_pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2529,7 +2527,7 @@ void BrowserCommandController::UpdateReloadStopState(bool is_loading, --- a/chrome/browser/ui/browser_command_controller.h +++ b/chrome/browser/ui/browser_command_controller.h -@@ -208,7 +208,6 @@ class BrowserCommandController : public +@@ -209,7 +209,6 @@ class BrowserCommandController : public PrefChangeRegistrar profile_pref_registrar_; PrefChangeRegistrar local_pref_registrar_; @@ -2549,15 +2547,15 @@ #include "ui/events/keycodes/keyboard_codes.h" --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -61,7 +61,6 @@ +@@ -63,7 +63,6 @@ - #if !defined(OS_ANDROID) + #if !BUILDFLAG(IS_ANDROID) #include "chrome/browser/signin/identity_manager_factory.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/identity_manager.h" #endif -@@ -490,13 +489,7 @@ void ShowBrowserSignin(Browser* browser, +@@ -502,13 +501,7 @@ void ShowBrowserSignin(Browser* browser, void ShowBrowserSigninOrSettings(Browser* browser, signin_metrics::AccessPoint access_point) { @@ -2628,7 +2626,7 @@ #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/strings/grit/components_strings.h" #include "components/vector_icons/vector_icons.h" -@@ -508,7 +507,6 @@ void ProfileMenuView::BuildAutofillButto +@@ -507,7 +506,6 @@ void ProfileMenuView::BuildAutofillButto void ProfileMenuView::BuildSyncInfo() { Profile* profile = browser()->profile(); @@ -2824,7 +2822,7 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -292,10 +291,6 @@ void PeopleHandler::RegisterMessages() { +@@ -300,10 +299,6 @@ void PeopleHandler::RegisterMessages() { void PeopleHandler::OnJavascriptAllowed() { PrefService* prefs = profile_->GetPrefs(); profile_pref_registrar_.Init(prefs); @@ -2837,7 +2835,7 @@ IdentityManagerFactory::GetInstance()->GetForProfile(profile_)); --- a/chrome/browser/ui/webui/settings/safety_check_handler.cc +++ b/chrome/browser/ui/webui/settings/safety_check_handler.cc -@@ -27,7 +27,6 @@ +@@ -28,7 +28,6 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "components/prefs/pref_service.h" @@ -2855,7 +2853,7 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/strings/grit/components_chromium_strings.h" #include "components/strings/grit/components_strings.h" -@@ -1403,44 +1402,6 @@ void AddPrivacyStrings(content::WebUIDat +@@ -1415,44 +1414,6 @@ void AddPrivacyStrings(content::WebUIDat {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, @@ -2900,7 +2898,7 @@ {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL}, {"syncAndGoogleServicesPrivacyDescription", IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT}, -@@ -2662,11 +2623,6 @@ void AddSiteSettingsStrings(content::Web +@@ -2686,11 +2647,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -2914,7 +2912,7 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -73,7 +73,6 @@ +@@ -71,7 +71,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2922,7 +2920,7 @@ #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -@@ -269,9 +268,7 @@ SettingsUI::SettingsUI(content::WebUI* w +@@ -271,9 +270,7 @@ SettingsUI::SettingsUI(content::WebUI* w ? "enable-branding-update" : ""); @@ -2955,7 +2953,7 @@ base::BindOnce(&DiceTurnSyncOnHelper::OnMergeAccountConfirmation, --- a/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc +++ b/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc -@@ -40,7 +40,6 @@ +@@ -41,7 +41,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/account_consistency_method.h" #include "components/signin/public/base/signin_metrics.h" @@ -2973,7 +2971,7 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -@@ -127,8 +126,6 @@ void InlineLoginHandler::ContinueHandleI +@@ -138,8 +137,6 @@ void InlineLoginHandler::ContinueHandleI std::string default_email; if (reason == signin_metrics::Reason::kSigninPrimaryAccount || reason == signin_metrics::Reason::kForcedSigninPrimaryAccount) { @@ -3077,7 +3075,7 @@ prefs::kSearchSuggestEnabled, embedder_support::kAlternateErrorPagesEnabled, - prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingScoutReportingEnabled, spellcheck::prefs::kSpellCheckUseSpellingService, - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) prefs::kContextualSearchEnabled --- a/chrome/common/extensions/api/privacy.json +++ b/chrome/common/extensions/api/privacy.json @@ -3202,7 +3200,7 @@ void PasswordReuseManagerImpl::OnGetPasswordStoreResults( --- a/components/password_manager/core/browser/password_store.cc +++ b/components/password_manager/core/browser/password_store.cc -@@ -39,7 +39,6 @@ +@@ -40,7 +40,6 @@ #include "components/password_manager/core/common/password_manager_features.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" @@ -3331,7 +3329,7 @@ if (!local_state_prefs_) return; - -- const base::DictionaryValue* event_dict = local_state_prefs_->GetDictionary( +- const base::Value* event_dict = local_state_prefs_->GetDictionary( - prefs::kSafeBrowsingTriggerEventTimestamps); - for (auto trigger_pair : event_dict->DictItems()) { - // Check that the first item in the pair is convertible to a trigger type @@ -3405,26 +3403,26 @@ #include "services/network/public/mojom/cookie_manager.mojom.h" #if BUILDFLAG(FULL_SAFE_BROWSING) #include "components/enterprise/common/proto/connectors.pb.h" -@@ -2038,18 +2037,13 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -2043,18 +2042,13 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); - DCHECK(!args->GetList().empty()); - std::string callback_id = args->GetList()[0].GetString(); + DCHECK(!args.empty()); + std::string callback_id = args[0].GetString(); - ResolveJavascriptCallback(base::Value(callback_id), - safe_browsing::GetSafeBrowsingPreferencesList( - user_prefs::UserPrefs::Get(browser_context_))); + ResolveJavascriptCallback(base::Value(callback_id), base::ListValue()); } - void SafeBrowsingUIHandler::GetPolicies(const base::ListValue* args) { + void SafeBrowsingUIHandler::GetPolicies(const base::Value::ConstListView args) { AllowJavascript(); - DCHECK(!args->GetList().empty()); - std::string callback_id = args->GetList()[0].GetString(); + DCHECK(!args.empty()); + std::string callback_id = args[0].GetString(); - ResolveJavascriptCallback(base::Value(callback_id), - safe_browsing::GetSafeBrowsingPoliciesList( - user_prefs::UserPrefs::Get(browser_context_))); } - void SafeBrowsingUIHandler::GetCookie(const base::ListValue* args) { + void SafeBrowsingUIHandler::GetCookie(const base::Value::ConstListView args) { --- a/components/safe_browsing/core/browser/db/hit_report.h +++ b/components/safe_browsing/core/browser/db/hit_report.h @@ -8,7 +8,6 @@ @@ -3777,7 +3775,7 @@ // static --- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc -@@ -19,7 +19,6 @@ +@@ -20,7 +20,6 @@ #include "components/safe_browsing/core/browser/referrer_chain_provider.h" #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h" #include "components/safe_browsing/core/common/features.h" @@ -3785,7 +3783,7 @@ #include "components/unified_consent/pref_names.h" #include "net/base/ip_address.h" #include "net/base/load_flags.h" -@@ -59,10 +58,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo +@@ -63,10 +62,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo variations_(variations_service) { pref_change_registrar_.Init(pref_service_); pref_change_registrar_.Add( @@ -3805,12 +3803,25 @@ } bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const { +@@ -150,11 +145,7 @@ bool RealTimeUrlLookupService::CanCheckS + } + + bool RealTimeUrlLookupService::CanSendRTSampleRequest() const { +- return IsExtendedReportingEnabled(*pref_service_) && +- base::FeatureList::IsEnabled( +- safe_browsing::kSendSampledPingsForProtegoAllowlistDomains) && +- (bypass_protego_probability_for_tests_ || +- base::RandDouble() <= kProbabilityForSendingSampledRequests); ++ return false; + } + + void RealTimeUrlLookupService::Shutdown() { --- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -15,7 +15,6 @@ - #include "components/prefs/pref_service.h" +@@ -17,7 +17,6 @@ #include "components/safe_browsing/core/browser/referrer_chain_provider.h" #include "components/safe_browsing/core/browser/verdict_cache_manager.h" + #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "components/safe_browsing/core/common/utils.h" @@ -3928,7 +3939,7 @@ void SafeBrowsingMetricsCollector::RemoveOldEventsFromPref() { - DictionaryPrefUpdate update(pref_service_, - prefs::kSafeBrowsingEventTimestamps); -- base::DictionaryValue* mutable_state_dict = update.Get(); +- base::Value* mutable_state_dict = update.Get(); - bool is_pref_valid = mutable_state_dict->is_dict(); - base::UmaHistogramBoolean("SafeBrowsing.MetricsCollector.IsPrefValid", - is_pref_valid); @@ -3980,7 +3991,7 @@ EventType event_type) { - DictionaryPrefUpdate update(pref_service_, - prefs::kSafeBrowsingEventTimestamps); -- base::DictionaryValue* mutable_state_dict = update.Get(); +- base::Value* mutable_state_dict = update.Get(); - - base::Value* event_dict = - mutable_state_dict->FindDictKey(UserStateToPrefKey(user_state)); @@ -4023,7 +4034,7 @@ const base::Value* SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary( UserState user_state) { -- const base::DictionaryValue* state_dict = +- const base::Value* state_dict = - pref_service_->GetDictionary(prefs::kSafeBrowsingEventTimestamps); - - return state_dict->FindDictKey(UserStateToPrefKey(user_state)); @@ -4586,7 +4597,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_capabilities.h" #include "components/signin/public/identity_manager/tribool.h" -@@ -152,9 +151,6 @@ AccountTrackerService::~AccountTrackerSe +@@ -160,9 +159,6 @@ AccountTrackerService::~AccountTrackerSe // static void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) { @@ -4596,7 +4607,7 @@ } void AccountTrackerService::Initialize(PrefService* pref_service, -@@ -455,14 +451,12 @@ AccountTrackerService::ComputeNewMigrati +@@ -463,14 +459,12 @@ AccountTrackerService::ComputeNewMigrati void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) { DCHECK(state != MIGRATION_DONE || AreAllAccountsMigrated()); @@ -4612,7 +4623,7 @@ } base::FilePath AccountTrackerService::GetImagePathFor( -@@ -519,27 +513,6 @@ void AccountTrackerService::OnAccountIma +@@ -527,26 +521,6 @@ void AccountTrackerService::OnAccountIma const CoreAccountId& account_id, const std::string& image_url_with_size, bool success) { @@ -4625,9 +4636,8 @@ - base::Value& dict_value = update->GetList()[i]; - if (dict_value.is_dict()) { - dict = static_cast(&dict_value); -- std::string value; -- if (dict->GetString(kAccountKeyPath, &value) && -- value == account_id.ToString()) { +- const std::string* account_key = dict->FindStringKey(kAccountKeyPath); +- if (account_key && *account_key == account_id.ToString()) { - break; - } - } @@ -4640,46 +4650,39 @@ } void AccountTrackerService::RemoveAccountImageFromDisk( -@@ -551,171 +524,16 @@ void AccountTrackerService::RemoveAccoun +@@ -558,161 +532,16 @@ void AccountTrackerService::RemoveAccoun } void AccountTrackerService::LoadFromPrefs() { -- const base::ListValue* list = pref_service_->GetList(prefs::kAccountInfo); +- const base::Value* list = pref_service_->GetList(prefs::kAccountInfo); - std::set to_remove; - for (size_t i = 0; i < list->GetList().size(); ++i) { - const base::Value& dict_value = list->GetList()[i]; - if (dict_value.is_dict()) { - const base::DictionaryValue& dict = - base::Value::AsDictionaryValue(dict_value); -- std::string value; -- if (dict.GetString(kAccountKeyPath, &value)) { +- if (const std::string* account_key = +- dict.FindStringKey(kAccountKeyPath)) { - // Ignore incorrectly persisted non-canonical account ids. -- if (value.find('@') != std::string::npos && -- value != gaia::CanonicalizeEmail(value)) { -- to_remove.insert(CoreAccountId::FromString(value)); +- if (account_key->find('@') != std::string::npos && +- *account_key != gaia::CanonicalizeEmail(*account_key)) { +- to_remove.insert(CoreAccountId::FromString(*account_key)); - continue; - } - -- CoreAccountId account_id = CoreAccountId::FromString(value); +- CoreAccountId account_id = CoreAccountId::FromString(*account_key); - StartTrackingAccount(account_id); - AccountInfo& account_info = accounts_[account_id]; - -- if (dict.GetString(kAccountGaiaPath, &value)) -- account_info.gaia = value; -- if (dict.GetString(kAccountEmailPath, &value)) -- account_info.email = value; -- if (dict.GetString(kAccountHostedDomainPath, &value)) -- account_info.hosted_domain = value; -- if (dict.GetString(kAccountFullNamePath, &value)) -- account_info.full_name = value; -- if (dict.GetString(kAccountGivenNamePath, &value)) -- account_info.given_name = value; -- if (dict.GetString(kAccountLocalePath, &value)) -- account_info.locale = value; -- if (dict.GetString(kAccountPictureURLPath, &value)) -- account_info.picture_url = value; -- if (dict.GetString(kLastDownloadedImageURLWithSizePath, &value)) -- account_info.last_downloaded_image_url_with_size = value; +- GetString(dict, kAccountGaiaPath, account_info.gaia); +- GetString(dict, kAccountEmailPath, account_info.email); +- GetString(dict, kAccountHostedDomainPath, account_info.hosted_domain); +- GetString(dict, kAccountFullNamePath, account_info.full_name); +- GetString(dict, kAccountGivenNamePath, account_info.given_name); +- GetString(dict, kAccountLocalePath, account_info.locale); +- GetString(dict, kAccountPictureURLPath, account_info.picture_url); +- GetString(dict, kLastDownloadedImageURLWithSizePath, +- account_info.last_downloaded_image_url_with_size); - - if (absl::optional is_child_status = - dict.FindBoolKey(kDeprecatedChildStatusPath)) { @@ -4760,18 +4763,15 @@ - base::Value& dict_value = update->GetList()[i]; - if (dict_value.is_dict()) { - dict = static_cast(&dict_value); -- std::string value; -- if (dict->GetString(kAccountKeyPath, &value) && -- value == account_info.account_id.ToString()) { +- const std::string* account_key = dict->FindStringKey(kAccountKeyPath); +- if (account_key && *account_key == account_info.account_id.ToString()) { - break; - } - } - } - - if (!dict) { -- dict = new base::DictionaryValue(); -- update->Append(base::WrapUnique(dict)); -- // |dict| is invalidated at this point, so it needs to be reset. +- update->Append(base::Value(base::Value::Type::DICTIONARY)); - base::Value& dict_value = update->GetList().back(); - DCHECK(dict_value.is_dict()); - dict = static_cast(&dict_value); @@ -4814,7 +4814,7 @@ CoreAccountId AccountTrackerService::PickAccountIdForAccount( --- a/components/signin/internal/identity_manager/account_tracker_service.h +++ b/components/signin/internal/identity_manager/account_tracker_service.h -@@ -236,6 +236,8 @@ class AccountTrackerService { +@@ -235,6 +235,8 @@ class AccountTrackerService { AccountInfoCallback on_account_updated_callback_; AccountInfoCallback on_account_removed_callback_; @@ -5032,7 +5032,7 @@ CoreAccountId account_id = CoreAccountId::FromString(pref_account_id); CoreAccountInfo account_info = account_tracker_service_->GetAccountInfo(account_id); -@@ -166,8 +132,7 @@ void PrimaryAccountManager::SetSyncPrima +@@ -182,8 +148,7 @@ void PrimaryAccountManager::SetSyncPrima #if DCHECK_IS_ON() { @@ -5042,7 +5042,7 @@ bool consented_to_sync = client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync); -@@ -183,10 +148,6 @@ void PrimaryAccountManager::SetSyncPrima +@@ -199,10 +164,6 @@ void PrimaryAccountManager::SetSyncPrima // Go ahead and update the last signed in account info here as well. Once a // user is signed in the corresponding preferences should match. Doing it here // as opposed to on signin allows us to catch the upgrade scenario. @@ -5053,7 +5053,7 @@ // Commit primary sync account info immediately so that it does not get lost // if Chrome crashes before the next commit interval. -@@ -200,20 +161,11 @@ void PrimaryAccountManager::SetPrimaryAc +@@ -216,20 +177,11 @@ void PrimaryAccountManager::SetPrimaryAc PrefService* prefs = client_->GetPrefs(); const std::string& account_id = primary_account_info_.account_id.ToString(); @@ -5334,7 +5334,7 @@ #include "components/sync_preferences/testing_pref_service_syncable.h" --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -86155,7 +86155,6 @@ Full version information for the fingerp +@@ -87952,7 +87952,6 @@ Full version information for the fingerp @@ -5342,7 +5342,7 @@ -@@ -86170,10 +86169,7 @@ Full version information for the fingerp +@@ -87967,10 +87966,7 @@ Full version information for the fingerp diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index 597c80c1..78a81d5e 100644 --- a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch +++ b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch @@ -1,7 +1,7 @@ # Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -136,6 +136,7 @@ +@@ -137,6 +137,7 @@ #include "components/spellcheck/common/spellcheck_common.h" #include "components/spellcheck/spellcheck_buildflags.h" #include "components/strings/grit/components_strings.h" @@ -9,7 +9,7 @@ #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" -@@ -1765,6 +1766,8 @@ void RenderViewContextMenu::AppendPageIt +@@ -1721,6 +1722,8 @@ void RenderViewContextMenu::AppendPageIt menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); } @@ -18,7 +18,7 @@ ChromeTranslateClient* chrome_translate_client = ChromeTranslateClient::FromWebContents(embedder_web_contents_); const bool canTranslate = -@@ -1786,6 +1789,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -1742,6 +1745,7 @@ void RenderViewContextMenu::AppendPageIt IDC_CONTENT_CONTEXT_TRANSLATE, l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language)); } diff --git a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch index 050e201f..773dc914 100644 --- a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch +++ b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch @@ -9,7 +9,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2379,6 +2379,7 @@ static_library("browser") { +@@ -2373,6 +2373,7 @@ static_library("browser") { "//third_party/libyuv", "//third_party/metrics_proto", "//third_party/re2", @@ -19,7 +19,7 @@ "//third_party/widevine/cdm:headers", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -148,6 +148,7 @@ +@@ -149,6 +149,7 @@ #include "components/translate/core/browser/translate_ranker_impl.h" #include "components/translate/core/common/translate_util.h" #include "components/ui_devtools/switches.h" @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -223,6 +223,7 @@ source_set("browser") { +@@ -224,6 +224,7 @@ source_set("browser") { "//third_party/libyuv", "//third_party/re2", "//third_party/sqlite", @@ -54,7 +54,7 @@ "//third_party/zlib", --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -69,6 +69,7 @@ +@@ -74,6 +74,7 @@ #include "components/services/storage/public/mojom/cache_storage_control.mojom.h" #include "components/services/storage/public/mojom/indexed_db_control.mojom.h" #include "components/tracing/common/tracing_switches.h" @@ -62,7 +62,7 @@ #include "components/viz/common/switches.h" #include "components/viz/host/gpu_client.h" #include "content/browser/bad_message.h" -@@ -3338,6 +3339,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3352,6 +3353,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLDraftExtensions, switches::kEnableWebGLImageChromium, switches::kFileUrlPathAlias, @@ -91,7 +91,7 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -484,6 +485,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -486,6 +487,10 @@ void SetRuntimeFeaturesFromCommandLine(c {wrf::EnableWebGPU, switches::kEnableUnsafeWebGPU, true}, {wrf::ForceOverlayFullscreenVideo, switches::kForceOverlayFullscreenVideo, true}, @@ -104,7 +104,7 @@ if (command_line.HasSwitch(mapping.switch_name)) --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -221,6 +221,8 @@ class WebRuntimeFeatures { +@@ -219,6 +219,8 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool); BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool); BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool); @@ -123,7 +123,7 @@ #include "base/time/time.h" #include "cc/input/overscroll_behavior.h" #include "cc/input/scroll_snap_data.h" -@@ -870,6 +871,14 @@ Range* Document::CreateRangeAdjustedToTr +@@ -876,6 +877,14 @@ Range* Document::CreateRangeAdjustedToTr Position::BeforeNode(*shadow_host)); } @@ -138,7 +138,7 @@ SelectorQueryCache& Document::GetSelectorQueryCache() { if (!selector_query_cache_) selector_query_cache_ = std::make_unique(); -@@ -2173,6 +2182,15 @@ void Document::UpdateStyleAndLayoutTreeF +@@ -2179,6 +2188,15 @@ void Document::UpdateStyleAndLayoutTreeF #if DCHECK_IS_ON() AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */); #endif @@ -156,7 +156,7 @@ void Document::InvalidateStyleAndLayoutForFontUpdates() { --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -457,6 +457,10 @@ class CORE_EXPORT Document : public Cont +@@ -480,6 +480,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -167,7 +167,7 @@ AtomicString visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -2086,6 +2090,9 @@ class CORE_EXPORT Document : public Cont +@@ -2132,6 +2136,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -179,22 +179,22 @@ HeapVector> current_script_stack_; --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2052,6 +2052,11 @@ DOMRectList* Element::getClientRects() { +@@ -2074,6 +2074,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); - GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom( - quads, *element_layout_object); + GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads, + *element_layout_object); + if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) { -+ for (FloatQuad& quad : quads) { ++ for (gfx::QuadF& quad : quads) { + quad.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY()); + } + } return MakeGarbageCollected(quads); } -@@ -2069,6 +2074,9 @@ FloatRect Element::GetBoundingClientRect +@@ -2091,6 +2096,9 @@ gfx::RectF Element::GetBoundingClientRec DCHECK(element_layout_object); - GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result, - *element_layout_object); + GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, + *element_layout_object); + if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) { + result.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY()); + } @@ -204,11 +204,11 @@ --- a/third_party/blink/renderer/core/dom/range.cc +++ b/third_party/blink/renderer/core/dom/range.cc @@ -1598,11 +1598,21 @@ DOMRectList* Range::getClientRects() con - Vector quads; + Vector quads; GetBorderAndTextQuads(quads); + if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) { -+ for (FloatQuad& quad : quads) { ++ for (gfx::QuadF& quad : quads) { + quad.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY()); + } + } @@ -217,12 +217,12 @@ } DOMRect* Range::getBoundingClientRect() const { -- return DOMRect::FromFloatRect(BoundingRect()); +- return DOMRect::FromRectF(BoundingRect()); + auto rect = BoundingRect(); + if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) { + rect.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY()); + } -+ return DOMRect::FromFloatRect(rect); ++ return DOMRect::FromRectF(rect); } // TODO(editing-dev): We should make @@ -266,7 +266,7 @@ const TextDirection&, --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -921,9 +921,15 @@ TextMetrics* CanvasRenderingContext2D::m +@@ -920,9 +920,15 @@ TextMetrics* CanvasRenderingContext2D::m TextDirection direction = ToTextDirection(GetState().GetDirection(), canvas()); @@ -285,7 +285,7 @@ void CanvasRenderingContext2D::fillFormattedText( --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1684,6 +1684,7 @@ component("platform") { +@@ -1663,6 +1663,7 @@ component("platform") { "//components/paint_preview/common", "//components/power_scheduler", "//components/search_engines:search_engine_utils", @@ -295,7 +295,7 @@ "//crypto", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -697,4 +697,12 @@ void WebRuntimeFeatures::EnableCLSScroll +@@ -691,4 +691,12 @@ void WebRuntimeFeatures::EnableCLSScroll RuntimeEnabledFeatures::SetCLSScrollAnchoringEnabled(enable); } @@ -310,7 +310,7 @@ } // namespace blink --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1102,6 +1102,12 @@ +@@ -1103,6 +1103,12 @@ origin_trial_feature_name: "Fledge", }, { diff --git a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch index ffb418ea..851574aa 100644 --- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch +++ b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch @@ -34,7 +34,7 @@ approach to change color components. #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3341,6 +3341,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3355,6 +3355,7 @@ void RenderProcessHostImpl::PropagateBro switches::kFileUrlPathAlias, switches::kFingerprintingClientRectsNoise, switches::kFingerprintingCanvasMeasureTextNoise, @@ -44,7 +44,7 @@ approach to change color components. switches::kForceGpuMemAvailableMb, --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -489,6 +489,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -491,6 +491,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -55,7 +55,7 @@ approach to change color components. if (command_line.HasSwitch(mapping.switch_name)) --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -223,6 +223,7 @@ class WebRuntimeFeatures { +@@ -221,6 +221,7 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool); BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool); BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool); @@ -65,7 +65,7 @@ approach to change color components. BLINK_PLATFORM_EXPORT static void EnableSubresourceWebBundles(bool); --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -30,6 +30,7 @@ +@@ -29,6 +29,7 @@ #include "third_party/blink/renderer/platform/graphics/bitmap_image.h" #include "third_party/blink/renderer/platform/graphics/graphics_context.h" #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" @@ -73,7 +73,7 @@ approach to change color components. #include "third_party/blink/renderer/platform/graphics/stroke_data.h" #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" -@@ -2055,6 +2056,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -2050,6 +2051,9 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -85,7 +85,7 @@ approach to change color components. return image_data; --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1641,7 +1641,9 @@ component("platform") { +@@ -1621,7 +1621,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -98,7 +98,7 @@ approach to change color components. "//third_party/blink/renderer/platform/blob", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -705,4 +705,8 @@ void WebRuntimeFeatures::EnableFingerpri +@@ -699,4 +699,8 @@ void WebRuntimeFeatures::EnableFingerpri RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable); } @@ -322,7 +322,7 @@ approach to change color components. // Methods overridden by all sub-classes --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1108,6 +1108,9 @@ +@@ -1109,6 +1109,9 @@ name: "FingerprintingCanvasMeasureTextNoise", }, { diff --git a/patches/extra/bromite/flag-max-connections-per-host.patch b/patches/extra/bromite/flag-max-connections-per-host.patch index 6d25c393..e2ae90a4 100644 --- a/patches/extra/bromite/flag-max-connections-per-host.patch +++ b/patches/extra/bromite/flag-max-connections-per-host.patch @@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2134,6 +2134,7 @@ static_library("browser") { +@@ -2128,6 +2128,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -62,7 +62,7 @@ with limited CPU/memory resources and it is disabled by default. #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" -@@ -103,6 +105,7 @@ +@@ -104,6 +106,7 @@ #include "components/metrics/metrics_service.h" #include "components/metrics_services_manager/metrics_services_manager.h" #include "components/metrics_services_manager/metrics_services_manager_client.h" @@ -70,7 +70,7 @@ with limited CPU/memory resources and it is disabled by default. #include "components/network_time/network_time_tracker.h" #include "components/permissions/permissions_client.h" #include "components/policy/core/common/policy_service.h" -@@ -135,6 +138,7 @@ +@@ -136,6 +139,7 @@ #include "media/media_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "net/log/net_log.h" @@ -78,9 +78,9 @@ with limited CPU/memory resources and it is disabled by default. #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/features.h" -@@ -345,6 +349,18 @@ void BrowserProcessImpl::Init() { +@@ -344,6 +348,18 @@ void BrowserProcessImpl::Init() { + pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled, base::BindRepeating(&ApplyMetricsReportingPolicy)); - #endif + int max_connections_per_host = 0; + auto switch_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( @@ -99,7 +99,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1583,6 +1583,10 @@ const char kLogJsConsoleMessagesDescript +@@ -1559,6 +1559,10 @@ const char kLogJsConsoleMessagesDescript "Enable logging JS console messages in system logs, please note that they " "may contain PII."; @@ -112,7 +112,7 @@ with limited CPU/memory resources and it is disabled by default. const char kMediaRouterCastAllowAllIPsDescription[] = --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -916,6 +916,9 @@ extern const char kLensCameraAssistedSea +@@ -896,6 +896,9 @@ extern const char kLensCameraAssistedSea extern const char kLogJsConsoleMessagesName[]; extern const char kLogJsConsoleMessagesDescription[]; diff --git a/patches/extra/debian/disable/welcome-page.patch b/patches/extra/debian/disable/welcome-page.patch index 517ef3cc..0e128519 100644 --- a/patches/extra/debian/disable/welcome-page.patch +++ b/patches/extra/debian/disable/welcome-page.patch @@ -4,11 +4,11 @@ bug-debian: http://bugs.debian.org/857767 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1347,7 +1347,7 @@ void ProfileManager::InitProfileUserPref +@@ -1370,7 +1370,7 @@ void ProfileManager::InitProfileUserPref profile->GetPrefs()->SetString(prefs::kSupervisedUserId, supervised_user_id); } --#if !defined(OS_ANDROID) +-#if !BUILDFLAG(IS_ANDROID) +#if 0 // TODO(pmonette): Fix IsNewProfile() to handle the case where the profile is // new even if the "Preferences" file already existed. (For example: The diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 795aa61a..d934a03b 100644 --- a/patches/extra/inox-patchset/0006-modify-default-prefs.patch +++ b/patches/extra/inox-patchset/0006-modify-default-prefs.patch @@ -12,7 +12,7 @@ void BackgroundModeManager::RegisterProfile(Profile* profile) { --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1253,7 +1253,7 @@ void ChromeContentBrowserClient::Registe +@@ -1260,7 +1260,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -23,7 +23,7 @@ // used for mapping the command-line flags). --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -324,7 +324,7 @@ void ProfileNetworkContextService::Updat +@@ -332,7 +332,7 @@ void ProfileNetworkContextService::Updat void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -52,7 +52,7 @@ - true, + false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) registry->RegisterStringPref( --- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html +++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html @@ -67,7 +67,7 @@ --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -111,7 +111,7 @@ AccountConsistencyModeManager::~AccountC +@@ -110,7 +110,7 @@ AccountConsistencyModeManager::~AccountC // static void AccountConsistencyModeManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { @@ -92,17 +92,6 @@ registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup); registry->RegisterDictionaryPref(prefs::kAppWindowPlacement); ---- a/chrome/service/cloud_print/connector_settings.cc -+++ b/chrome/service/cloud_print/connector_settings.cc -@@ -60,7 +60,7 @@ void ConnectorSettings::InitFrom(Service - DCHECK(server_url_.is_valid()); - - connect_new_printers_ = prefs->GetBoolean( -- prefs::kCloudPrintConnectNewPrinters, true); -+ prefs::kCloudPrintConnectNewPrinters, false); - - xmpp_ping_enabled_ = prefs->GetBoolean( - prefs::kCloudPrintXmppPingEnabled, false); --- a/components/autofill/core/common/autofill_prefs.cc +++ b/components/autofill/core/common/autofill_prefs.cc @@ -131,10 +131,10 @@ const char kAutocompleteLastVersionReten diff --git a/patches/extra/inox-patchset/0008-restore-classic-ntp.patch b/patches/extra/inox-patchset/0008-restore-classic-ntp.patch index 24a150a1..288c6f52 100644 --- a/patches/extra/inox-patchset/0008-restore-classic-ntp.patch +++ b/patches/extra/inox-patchset/0008-restore-classic-ntp.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc -@@ -182,26 +182,7 @@ struct NewTabURLDetails { +@@ -184,26 +184,7 @@ struct NewTabURLDetails { : chrome::kChromeUINewTabPageThirdPartyURL); #endif diff --git a/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch b/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch index f1647d9a..dd035023 100644 --- a/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch +++ b/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/startup/startup_tab_provider.cc +++ b/chrome/browser/ui/startup/startup_tab_provider.cc -@@ -107,7 +107,7 @@ bool ValidateUrl(const GURL& url) { +@@ -108,7 +108,7 @@ bool ValidateUrl(const GURL& url) { StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const { // Chrome OS has its own welcome flow provided by OOBE. diff --git a/patches/extra/iridium-browser/Remove-EV-certificates.patch b/patches/extra/iridium-browser/Remove-EV-certificates.patch index 6a232bed..5f6dedb0 100644 --- a/patches/extra/iridium-browser/Remove-EV-certificates.patch +++ b/patches/extra/iridium-browser/Remove-EV-certificates.patch @@ -7,16 +7,15 @@ The team chose to let EV certificates appear just like normal certificates. The web of trust is considered a failure in itself, so do not give users a false sense of extra security with EV certs. Instead, let them appear just like regular ones. ---- - net/cert/ev_root_ca_metadata.cc | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) --- a/net/cert/ev_root_ca_metadata.cc +++ b/net/cert/ev_root_ca_metadata.cc -@@ -41,6 +41,16 @@ struct EVMetadata { +@@ -41,7 +41,17 @@ struct EVMetadata { + const base::StringPiece policy_oids[kMaxOIDsPerCA]; + }; - // These certificates may be found in net/data/ssl/ev_roots. - static const EVMetadata kEvRootCaMetadata[] = { +-#include "net/data/ssl/ev_roots/chrome-ev-root-store-inc.cc" ++static const EVMetadata kEvRootCaMetadata[] = { + // need some dummy thing to make compiler happy, because + // arraysize() is implemented as a convoluted template rather than + // the traditional sizeof(x)/sizeof(*x) @@ -25,18 +24,7 @@ Instead, let them appear just like regular ones. + { + "0", + } -+ }, -+#if 0 - // AC Camerfirma S.A. Chambers of Commerce Root - 2008 - // https://www.camerfirma.com - { -@@ -590,7 +600,9 @@ static const EVMetadata kEvRootCaMetadat - 0xd2, 0x09, 0xb7, 0x37, 0xcb, 0xe2, 0xc1, 0x8c, 0xfb, 0x2c, 0x10, - 0xc0, 0xff, 0x0b, 0xcf, 0x0d, 0x32, 0x86, 0xfc, 0x1a, 0xa2}}, - {"2.16.840.1.114404.1.1.2.4.1", ""}, -- }}; + } -+#endif +}; #endif // defined(PLATFORM_USES_CHROMIUM_EV_METADATA) diff --git a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch index a64d3a3e..505ba836 100644 --- a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch +++ b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch @@ -3,18 +3,14 @@ From: Joachim Bauch Date: Thu, 25 Jun 2015 15:51:59 +0200 Subject: [PATCH 56/66] browser: disable profile auto-import on first run ---- - chrome/browser/chrome_browser_main.cc | 2 -- - 1 file changed, 2 deletions(-) - --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1490,8 +1490,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1559,8 +1559,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { -- first_run::AutoImport(profile_, master_prefs_->import_bookmarks_path); +- first_run::AutoImport(profile, master_prefs_->import_bookmarks_path); - // Note: This can pop-up the first run consent dialog on Linux & Mac. - first_run::DoPostImportTasks(profile_, + first_run::DoPostImportTasks(profile, master_prefs_->make_chrome_default_for_user); diff --git a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch index 27cc4e4a..ff489b1c 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -140,6 +140,8 @@ +@@ -139,6 +139,8 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_utils.h" #include "chrome/browser/ui/ui_features.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/browser/ui/web_applications/web_app_launch_utils.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" -@@ -464,6 +466,7 @@ Browser::Browser(const CreateParams& par +@@ -462,6 +464,7 @@ Browser::Browser(const CreateParams& par omit_from_session_restore_(params.omit_from_session_restore), should_trigger_session_restore_(params.should_trigger_session_restore), cancel_download_confirmation_state_(NOT_PROMPTED), @@ -17,7 +17,7 @@ override_bounds_(params.initial_bounds), initial_show_state_(params.initial_show_state), initial_workspace_(params.initial_workspace), -@@ -831,7 +834,7 @@ Browser::WarnBeforeClosingResult Browser +@@ -829,7 +832,7 @@ Browser::WarnBeforeClosingResult Browser // If the browser can close right away (there are no pending downloads we need // to prompt about) then there's no need to warn. In the future, we might need // to check other conditions as well. @@ -26,7 +26,7 @@ return WarnBeforeClosingResult::kOkToClose; DCHECK(!warn_before_closing_callback_) -@@ -861,6 +864,7 @@ bool Browser::TryToCloseWindow( +@@ -859,6 +862,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = NOT_PROMPTED; @@ -34,7 +34,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -2684,6 +2688,62 @@ bool Browser::CanCloseWithInProgressDown +@@ -2682,6 +2686,62 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -97,7 +97,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -2702,6 +2762,22 @@ void Browser::InProgressDownloadResponse +@@ -2700,6 +2760,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); diff --git a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch b/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch index cb3347f5..03dcf8b9 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -758,6 +758,9 @@ bool HandleNewTabPageLocationOverride( +@@ -762,6 +762,9 @@ bool HandleNewTabPageLocationOverride( Profile* profile = Profile::FromBrowserContext(browser_context); std::string ntp_location = profile->GetPrefs()->GetString(prefs::kNewTabPageLocationOverride); diff --git a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch index 96ec98d3..e7027c40 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch @@ -60,7 +60,7 @@ if (provider_types & AutocompleteProvider::TYPE_BUILTIN) --- a/components/omnibox/browser/history_url_provider.cc +++ b/components/omnibox/browser/history_url_provider.cc -@@ -552,6 +552,9 @@ void HistoryURLProvider::Start(const Aut +@@ -472,6 +472,9 @@ void HistoryURLProvider::Start(const Aut if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY) matches_.push_back(what_you_typed_match); diff --git a/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch b/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch index 21aeda27..582139b1 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -6053,7 +6053,7 @@ bool ChromeContentBrowserClient::ShouldA +@@ -6079,7 +6079,7 @@ bool ChromeContentBrowserClient::ShouldA const url::Origin& embedder_origin, const content::PepperPluginInfo& plugin_info) { #if BUILDFLAG(ENABLE_PDF) @@ -251,7 +251,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -248,6 +248,7 @@ static_library("common") { +@@ -247,6 +247,7 @@ static_library("common") { "//components/no_state_prefetch/common", "//components/no_state_prefetch/common:mojo_bindings", "//components/page_load_metrics/common:common", @@ -360,7 +360,7 @@ FILE_PATH_LITERAL("internal-pdf-viewer"); --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -1038,7 +1038,7 @@ WebPlugin* ChromeContentRendererClient:: +@@ -1041,7 +1041,7 @@ WebPlugin* ChromeContentRendererClient:: } } } else if (info.name == @@ -369,7 +369,7 @@ // Report PDF load metrics. Since the PDF plugin is comprised of an // extension that loads a second plugin, avoid double counting by // ignoring the creation of the second plugin. -@@ -1070,7 +1070,7 @@ WebPlugin* ChromeContentRendererClient:: +@@ -1073,7 +1073,7 @@ WebPlugin* ChromeContentRendererClient:: #if BUILDFLAG(ENABLE_PDF) if (info.name == @@ -378,7 +378,7 @@ return pdf::CreateInternalPlugin( info, std::move(params), render_frame, std::make_unique()); -@@ -1083,7 +1083,7 @@ WebPlugin* ChromeContentRendererClient:: +@@ -1086,7 +1086,7 @@ WebPlugin* ChromeContentRendererClient:: PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type, url); if (info.name == diff --git a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch index a17fc4d9..88f16389 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch @@ -27,7 +27,7 @@ return true; --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -297,7 +297,8 @@ void LocationBarView::Init() { +@@ -292,7 +292,8 @@ void LocationBarView::Init() { // the left most icon. params.types_enabled.push_back(PageActionIconType::kSendTabToSelf); params.types_enabled.push_back(PageActionIconType::kClickToCall); diff --git a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch index a527ef87..13197f80 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch @@ -25,7 +25,7 @@ if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection)) SetClientSidePhishingDetection(); #endif -@@ -201,14 +202,16 @@ void ChromeRenderFrameObserver::DidFinis +@@ -200,14 +201,16 @@ void ChromeRenderFrameObserver::DidFinis if (frame->Parent()) return; @@ -70,7 +70,7 @@ #include "base/containers/contains.h" #include "base/debug/crash_logging.h" #include "base/format_macros.h" -@@ -198,6 +199,12 @@ bool IsCreatedByExtension(const Template +@@ -199,6 +200,12 @@ bool IsCreatedByExtension(const Template template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION; } @@ -83,7 +83,7 @@ } // namespace // TemplateURLService::LessWithPrefix ----------------------------------------- -@@ -283,6 +290,7 @@ TemplateURLService::TemplateURLService( +@@ -284,6 +291,7 @@ TemplateURLService::TemplateURLService( std::unique_ptr client, const base::RepeatingClosure& dsp_change_callback) : prefs_(prefs), @@ -91,7 +91,7 @@ search_terms_data_(std::move(search_terms_data)), web_data_service_(web_data_service), client_(std::move(client)), -@@ -364,8 +372,8 @@ bool TemplateURLService::CanAddAutogener +@@ -365,8 +373,8 @@ bool TemplateURLService::CanAddAutogener // that may interfere with search queries). An easy heuristic for this is // whether the user has a TemplateURL that has been manually modified (e.g., // renamed) connected to the same host. @@ -102,7 +102,7 @@ } bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy( -@@ -1501,6 +1509,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -1502,6 +1510,8 @@ SyncDataMap TemplateURLService::CreateGU void TemplateURLService::Init(const Initializer* initializers, int num_initializers) { @@ -111,7 +111,7 @@ if (client_) client_->SetOwner(this); -@@ -1637,6 +1647,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -1638,6 +1648,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch index 0e989638..a3554c54 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch @@ -27,7 +27,7 @@ #include "base/compiler_specific.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" -@@ -1846,6 +1847,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -1842,6 +1843,8 @@ void TabStrip::OnMouseEventInTab(views:: } void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch index 5a075774..08bac18c 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -1153,7 +1153,8 @@ void BrowserCommandController::InitComma +@@ -1152,7 +1152,8 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, normal_window); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch index c9665fa9..27b55438 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch @@ -8,7 +8,7 @@ #include "components/browsing_data/core/pref_names.h" #include "components/keep_alive_registry/keep_alive_types.h" #include "components/keep_alive_registry/scoped_keep_alive.h" -@@ -152,6 +153,21 @@ class BrowsingDataRemoverObserver +@@ -153,6 +154,21 @@ class BrowsingDataRemoverObserver #endif }; @@ -30,7 +30,7 @@ uint64_t GetOriginTypeMask(const base::Value& data_types) { uint64_t result = 0; for (const auto& data_type : data_types.GetList()) { -@@ -293,8 +309,9 @@ void ChromeBrowsingDataLifetimeManager:: +@@ -295,8 +311,9 @@ void ChromeBrowsingDataLifetimeManager:: bool keep_browser_alive) { auto* data_types = profile_->GetPrefs()->GetList( browsing_data::prefs::kClearBrowsingDataOnExitList); @@ -42,7 +42,7 @@ profile_->GetPrefs()->SetBoolean( browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true); auto* remover = profile_->GetBrowsingDataRemover(); -@@ -305,8 +322,8 @@ void ChromeBrowsingDataLifetimeManager:: +@@ -307,8 +324,8 @@ void ChromeBrowsingDataLifetimeManager:: DCHECK(keep_browser_alive); #endif remover->RemoveAndReply(base::Time(), base::Time::Max(), diff --git a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch index 4ec10e12..4edf3ec3 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -8,7 +8,7 @@ #include "base/containers/flat_map.h" #include "base/cxx17_backports.h" #include "base/memory/raw_ptr.h" -@@ -1765,6 +1766,10 @@ bool TabStripModel::CloseTabs(base::span +@@ -1766,6 +1767,10 @@ bool TabStripModel::CloseTabs(base::span if (items.empty()) return true; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index d24cc0a2..5c47c84d 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch @@ -50,7 +50,7 @@ bool IsExtensionDownload(const download::DownloadItem& download_item); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1059,10 +1059,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1060,10 +1060,12 @@ DownloadConfirmationReason DownloadTarge return DownloadConfirmationReason::SAVE_AS; #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch index ce1bb0b0..76c16888 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc -@@ -73,6 +73,8 @@ WindowOpenDisposition RenderViewImpl::Na +@@ -74,6 +74,8 @@ WindowOpenDisposition RenderViewImpl::Na case blink::kWebNavigationPolicyNewWindow: return WindowOpenDisposition::NEW_WINDOW; case blink::kWebNavigationPolicyNewPopup: diff --git a/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch b/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch index 7084922f..840f91ac 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch @@ -21,7 +21,7 @@ #include "base/lazy_instance.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_conversions.h" -@@ -268,6 +269,13 @@ IDNConversionResult IDNToUnicodeWithAdju +@@ -270,6 +271,13 @@ IDNConversionResult IDNToUnicodeWithAdju host16.reserve(host.length()); host16.insert(host16.end(), host.begin(), host.end()); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch index e90524e2..f00b7694 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch @@ -38,7 +38,7 @@ BrowserRootView::~BrowserRootView() { // It's possible to destroy the browser while a drop is active. In this case, -@@ -243,7 +258,7 @@ bool BrowserRootView::OnMouseWheel(const +@@ -247,7 +262,7 @@ bool BrowserRootView::OnMouseWheel(const // Scroll-event-changes-tab is incompatible with scrolling tabstrip, so // disable it if the latter feature is enabled. diff --git a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch index 8b196578..bcdb1c61 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -275,14 +275,30 @@ void ToolbarView::Init() { +@@ -280,14 +280,30 @@ void ToolbarView::Init() { std::unique_ptr toolbar_account_icon_container; diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index 7da5cea9..a8a4e90b 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -13,9 +13,9 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -260,5 +260,7 @@ const base::Feature kFirstPartySetsV2Com - const base::Feature kRecordRadioWakeupTrigger{ - "RecordRadioWakeupTrigger", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -266,5 +266,7 @@ const base::Feature kSwitchWebSocketThro + const base::FeatureParam kRollingAverageWindow{ + &kSwitchWebSocketThroughputWindow, "RollingAverageWindow", 100}; +const base::Feature kSetIpv6ProbeFalse{"SetIpv6ProbeFalse", base::FEATURE_DISABLED_BY_DEFAULT}; + @@ -23,9 +23,9 @@ } // namespace net --- a/net/base/features.h +++ b/net/base/features.h -@@ -389,6 +389,8 @@ NET_EXPORT extern const base::Feature kF - // Android. - NET_EXPORT extern const base::Feature kRecordRadioWakeupTrigger; +@@ -393,6 +393,8 @@ NET_EXPORT extern const base::FeaturePar + NET_EXPORT extern const base::Feature kSwitchWebSocketThroughputWindow; + NET_EXPORT extern const base::FeatureParam kRollingAverageWindow; +NET_EXPORT extern const base::Feature kSetIpv6ProbeFalse; + @@ -34,7 +34,7 @@ --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -144,11 +144,6 @@ const unsigned kMinimumTTLSeconds = kCac +@@ -147,11 +147,6 @@ const unsigned kMinimumTTLSeconds = kCac // cached. const int kIPv6ProbePeriodMs = 1000; @@ -46,7 +46,7 @@ enum DnsResolveStatus { RESOLVE_STATUS_DNS_SUCCESS = 0, RESOLVE_STATUS_PROC_SUCCESS, -@@ -3727,7 +3722,7 @@ bool HostResolverManager::IsIPv6Reachabl +@@ -3919,7 +3914,7 @@ bool HostResolverManager::IsIPv6Reachabl (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { SetLastIPv6ProbeResult( diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index 44559ab4..aeedbc1c 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html +++ b/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html -@@ -27,6 +27,13 @@ +@@ -20,6 +20,13 @@ value="{{queryUrl_}}" on-focus="validate_" on-input="validate_" disabled$="[[model.urlLocked]]"> @@ -33,17 +33,17 @@ queryUrl_: String, + suggestionsUrl_: String, dialogTitle_: String, + keywordFieldLabel_: String, actionButtonText_: String, - -@@ -70,6 +72,7 @@ export class SettingsSearchEngineDialogE +@@ -71,6 +73,7 @@ export class SettingsSearchEngineDialogE private searchEngine_: string; private keyword_: string; private queryUrl_: string; + private suggestionsUrl_: string; private dialogTitle_: string; + private keywordFieldLabel_: string; private actionButtonText_: string; - private browserProxy_: SearchEnginesBrowserProxy = -@@ -100,6 +103,7 @@ export class SettingsSearchEngineDialogE +@@ -102,6 +105,7 @@ export class SettingsSearchEngineDialogE this.searchEngine_ = this.model.name; this.keyword_ = this.model.keyword; this.queryUrl_ = this.model.url; @@ -51,7 +51,7 @@ } else { this.dialogTitle_ = loadTimeData.getString('searchEnginesAddSearchEngine'); -@@ -135,8 +139,12 @@ export class SettingsSearchEngineDialogE +@@ -141,8 +145,12 @@ export class SettingsSearchEngineDialogE } } @@ -66,7 +66,7 @@ } private cancel_() { -@@ -145,7 +153,8 @@ export class SettingsSearchEngineDialogE +@@ -151,7 +159,8 @@ export class SettingsSearchEngineDialogE private onActionButtonTap_() { this.browserProxy_.searchEngineEditCompleted( @@ -76,7 +76,7 @@ this.$.dialog.close(); } -@@ -173,9 +182,11 @@ export class SettingsSearchEngineDialogE +@@ -179,9 +188,11 @@ export class SettingsSearchEngineDialogE private updateActionButtonState_() { const allValid = [ @@ -425,7 +425,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -642,7 +642,8 @@ void TemplateURLService::IncrementUsageC +@@ -643,7 +643,8 @@ void TemplateURLService::IncrementUsageC void TemplateURLService::ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -435,7 +435,7 @@ DCHECK(!IsCreatedByExtension(url)); DCHECK(!keyword.empty()); DCHECK(!search_url.empty()); -@@ -657,6 +658,7 @@ void TemplateURLService::ResetTemplateUR +@@ -658,6 +659,7 @@ void TemplateURLService::ResetTemplateUR data.safe_for_autoreplace = false; data.last_modified = clock_->Now(); data.is_active = TemplateURLData::ActiveStatus::kTrue; diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index 38ea569a..ff9c3b7d 100644 --- a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch +++ b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -2647,7 +2647,13 @@ const FeatureEntry::FeatureVariation kSn +@@ -2678,7 +2678,13 @@ const FeatureEntry::FeatureVariation kUs // calculate and verify checksum. // // When adding a new choice, add it to the end of the list. diff --git a/patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch b/patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch index f6e507ec..058119f7 100644 --- a/patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch +++ b/patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch @@ -3,23 +3,23 @@ --- a/chrome/browser/media/router/discovery/dial/dial_registry.cc +++ b/chrome/browser/media/router/discovery/dial/dial_registry.cc -@@ -190,10 +190,6 @@ void DialRegistry::StartPeriodicDiscover +@@ -150,10 +150,6 @@ void DialRegistry::StartPeriodicDiscover + return; dial_ = CreateDialService(); - dial_->AddObserver(this); - DoDiscovery(); - repeating_timer_ = std::make_unique(); - repeating_timer_->Start(FROM_HERE, refresh_interval_delta_, this, - &DialRegistry::DoDiscovery); - } - - void DialRegistry::DoDiscovery() { -@@ -207,8 +203,6 @@ void DialRegistry::StopPeriodicDiscovery + // Always send the current device list with the next discovery request. This + // may not be necessary, but is done to match previous behavior. + ++registry_generation_; +@@ -170,8 +166,6 @@ void DialRegistry::StopPeriodicDiscovery if (!dial_) return; - repeating_timer_->Stop(); - repeating_timer_.reset(); - dial_->RemoveObserver(this); ClearDialService(); } + diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index e8b6e348..fbfd593e 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -9,10 +9,10 @@ -#include "components/services/quarantine/quarantine.h" #include "crypto/secure_hash.h" - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) @@ -529,105 +528,6 @@ DownloadInterruptReason BaseFile::Publis } - #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) -namespace { - @@ -102,14 +102,14 @@ - -void BaseFile::OnQuarantineServiceError(const GURL& source_url, - const GURL& referrer_url) { --#if defined(OS_WIN) +-#if BUILDFLAG(IS_WIN) - if (base::FeatureList::IsEnabled(quarantine::kOutOfProcessQuarantine)) { - OnFileQuarantined(/*connection_error=*/true, - quarantine::SetInternetZoneIdentifierDirectly( - full_path_, source_url, referrer_url)); - return; - } --#endif // defined(OS_WIN) +-#endif // BUILDFLAG(IS_WIN) - - CHECK(false) << "In-process quarantine service should not have failed."; -} @@ -122,7 +122,7 @@ OnAnnotationDoneCallback on_annotation_done_callback) { - GURL authority_url = GetEffectiveAuthorityURL(source_url, referrer_url); - if (!remote_quarantine) { --#if defined(OS_WIN) +-#if BUILDFLAG(IS_WIN) - quarantine::mojom::QuarantineFileResult result = - quarantine::SetInternetZoneIdentifierDirectly(full_path_, authority_url, - referrer_url); @@ -153,7 +153,7 @@ } // namespace download --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -83,7 +83,6 @@ source_set("browser") { +@@ -82,7 +82,6 @@ source_set("browser") { "//components/permissions:permissions_common", "//components/power_scheduler", "//components/services/filesystem:lib", @@ -218,7 +218,7 @@ - std::move(quarantine_remote)), - quarantine::mojom::QuarantineFileResult::ANNOTATION_FAILED)); - } else { --#if defined(OS_WIN) +-#if BUILDFLAG(IS_WIN) - base::ThreadPool::PostTaskAndReplyWithResult( - FROM_HERE, {base::MayBlock()}, - base::BindOnce(&quarantine::SetInternetZoneIdentifierDirectly, @@ -257,7 +257,7 @@ ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if 0 // Quarantining a file before its contents are available is only supported on // Windows and Linux. @@ -266,7 +266,7 @@ #endif } --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if 0 void PepperFileIOHost::OnLocalFileQuarantined( ppapi::host::ReplyMessageContext reply_context, diff --git a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch index a7647a0a..35e5fd55 100644 --- a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch +++ b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch @@ -2,7 +2,7 @@ --- a/components/url_formatter/url_formatter.cc +++ b/components/url_formatter/url_formatter.cc -@@ -467,14 +467,14 @@ ComponentResult IDNToUnicodeOneComponent +@@ -492,14 +492,14 @@ bool HasTwoViewSourceSchemes(base::Strin } // namespace const FormatUrlType kFormatUrlOmitNothing = 0; diff --git a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch index 461da579..fb6bdfdc 100644 --- a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch +++ b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch @@ -14,7 +14,7 @@ } return content_restrictions; } -@@ -1352,8 +1347,7 @@ bool CanSavePage(const Browser* browser) +@@ -1351,8 +1346,7 @@ bool CanSavePage(const Browser* browser) DownloadPrefs::DownloadRestriction::ALL_FILES) { return false; } diff --git a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch index e96b3067..672d67a1 100644 --- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch +++ b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch @@ -4,7 +4,7 @@ SetAnimateOnStateChange(true); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) SetTriggerableEventFlags(GetTriggerableEventFlags() | ui::EF_MIDDLE_MOUSE_BUTTON); -#endif @@ -13,7 +13,7 @@ AddChildView(std::make_unique()); --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -2341,8 +2341,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2334,8 +2334,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { @@ -22,7 +22,7 @@ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); CHECK(clipboard); std::u16string clipboard_text; -@@ -2350,7 +2348,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2343,7 +2341,6 @@ void TabStrip::NewTabButtonPressed(const /* data_dst = */ nullptr, &clipboard_text); if (!clipboard_text.empty()) controller_->CreateNewTabWithLocation(clipboard_text); diff --git a/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch b/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch index c158e9e0..4ff54f29 100644 --- a/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch +++ b/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch @@ -2,11 +2,11 @@ --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -61,7 +61,6 @@ static const char* kBadFlags[] = { +@@ -59,7 +59,6 @@ static const char* kBadFlags[] = { // These flags disable sandbox-related security. sandbox::policy::switches::kDisableGpuSandbox, sandbox::policy::switches::kDisableSeccompFilterSandbox, - sandbox::policy::switches::kDisableSetuidSandbox, sandbox::policy::switches::kNoSandbox, - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) sandbox::policy::switches::kAllowThirdPartyModules, diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 1110e143..f27d1a41 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -36,7 +36,7 @@ shownAppsCount_, shownExtensionsCount_, apps, extensions)]]"> --- a/chrome/browser/resources/extensions/sidebar.html +++ b/chrome/browser/resources/extensions/sidebar.html -@@ -69,12 +69,3 @@ +@@ -76,12 +76,3 @@ @@ -124,20 +124,20 @@ +
+
$i18n{themes}
[[themeSublabel_]]
+
- + + prefs="{{prefs}}"> + + -