From 61d47f6bcdec8c71151144f07c7f8a0197eeca7a Mon Sep 17 00:00:00 2001 From: Ahrotahn <40727284+Ahrotahn@users.noreply.github.com> Date: Thu, 3 Feb 2022 12:38:47 -0600 Subject: [PATCH] Update to Chromium 98.0.4758.80 (#1817) * Update to Chromium 98.0.4758.74 * Update to Chromium 98.0.4758.80 --- chromium_version.txt | 2 +- domain_substitution.list | 446 ++++++++++----- flags.gn | 1 - patches/core/debian/disable/unrar.patch | 6 +- ...01-fix-building-without-safebrowsing.patch | 86 +-- .../0005-disable-default-extensions.patch | 4 +- .../0009-disable-google-ipv6-probes.patch | 2 +- ...refixes-to-possibly-evil-connections.patch | 31 +- ..._browsing-disable-incident-reporting.patch | 2 +- ...sable-reporting-of-safebrowsing-over.patch | 4 +- .../ungoogled-chromium/block-requests.patch | 4 +- .../block-trk-and-subdomains.patch | 42 +- .../disable-domain-reliability.patch | 24 +- .../ungoogled-chromium/disable-gaia.patch | 2 +- .../disable-google-host-detection.patch | 8 +- .../disable-mei-preload.patch | 4 +- .../disable-privacy-sandbox.patch | 2 +- .../ungoogled-chromium/disable-signin.patch | 2 +- .../disable-webstore-urls.patch | 8 +- .../core/ungoogled-chromium/doh-changes.patch | 2 +- .../fix-building-with-prunned-binaries.patch | 8 +- ...-building-without-enabling-reporting.patch | 87 +-- ...ix-building-without-one-click-signin.patch | 4 +- .../fix-building-without-safebrowsing.patch | 251 +++++---- .../remove-unused-preferences-fields.patch | 528 +++++++++++------- ...e-google-search-engine-with-nosearch.patch | 2 +- .../toggle-translation-via-switch.patch | 6 +- ...g-flags-client-rects-and-measuretext.patch | 34 +- ...ngerprinting-canvas-image-data-noise.patch | 20 +- .../flag-max-connections-per-host.patch | 15 +- .../debian/disable/google-api-warning.patch | 6 +- .../extra/debian/disable/welcome-page.patch | 2 +- .../0006-modify-default-prefs.patch | 41 +- .../0016-chromium-sandbox-pie.patch | 2 +- .../0018-disable-first-run-behaviour.patch | 2 +- .../0019-disable-battery-status-service.patch | 2 +- ...ble-profile-auto-import-on-first-run.patch | 2 +- ...e-default-key-length-for-newly-gener.patch | 2 +- .../prefs-only-keep-cookies-until-exit.patch | 6 +- .../updater-disable-auto-update.patch | 2 +- .../add-flag-for-close-confirmation.patch | 16 +- .../add-flag-for-custom-ntp.patch | 2 +- ...g-for-omnibox-autocomplete-filtering.patch | 4 +- .../add-flag-for-pdf-plugin-name.patch | 14 +- ...dd-flag-for-search-engine-collection.patch | 14 +- .../add-flag-for-tab-hover-cards.patch | 6 +- .../add-flag-for-tabsearch-button.patch | 2 +- .../add-flag-to-clear-data-on-exit.patch | 8 +- ...d-flag-to-close-window-with-last-tab.patch | 4 +- .../add-flag-to-disable-beforeunload.patch | 4 +- ...-to-disable-local-history-expiration.patch | 2 +- ...add-flag-to-force-punycode-hostnames.patch | 6 +- .../add-flag-to-hide-crashed-bubble.patch | 14 +- .../add-flag-to-hide-tab-close-buttons.patch | 4 +- .../add-flag-to-scroll-tabs.patch | 8 +- .../add-flag-to-show-avatar-button.patch | 4 +- .../add-ipv6-probing-option.patch | 16 +- .../add-suggestions-url-field.patch | 24 +- .../add-ungoogled-flag-headers.patch | 2 +- .../disable-download-quarantine.patch | 20 +- .../disable-formatting-in-omnibox.patch | 2 +- .../disable-remote-optimization-guide.patch | 2 +- .../disable-webgl-renderer-info.patch | 4 +- ...ble-default-prefetch-privacy-changes.patch | 2 +- .../enable-menu-on-reload-button.patch | 2 +- .../enable-page-saving-on-more-pages.patch | 11 +- .../enable-paste-and-go-new-tab-button.patch | 4 +- .../prepopulated-search-engines.patch | 2 +- .../remove-uneeded-ui.patch | 37 +- pruning.list | 485 +++++++++------- 70 files changed, 1344 insertions(+), 1085 deletions(-) diff --git a/chromium_version.txt b/chromium_version.txt index 1b973010..eb11c75b 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -97.0.4692.99 +98.0.4758.80 diff --git a/domain_substitution.list b/domain_substitution.list index 90165083..7d0af22f 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -23,7 +23,6 @@ android_webview/tools/cts_utils.py android_webview/tools/generate_flag_labels.py android_webview/tools/record_netlog.py android_webview/tools/remove_preinstalled_webview.py -android_webview/tools/system_webview_shell/test/data/blink-apis/webmidi/requestmidiaccess-expected.txt android_webview/tools/update_cts.py ash/accelerators/accelerator_notifications.cc ash/accessibility/accessibility_controller_impl.cc @@ -40,22 +39,36 @@ ash/assistant/util/deep_link_util.cc ash/assistant/util/deep_link_util_unittest.cc ash/capture_mode/capture_mode_unittests.cc ash/child_accounts/parent_access_controller_impl_unittest.cc +ash/components/arc/arc_util.h +ash/components/arc/session/arc_upgrade_params.h +ash/components/attestation/attestation_flow_adaptive_unittest.cc +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/geolocation/simple_geolocation_provider.cc -ash/components/quick_answers/translation_result_loader.cc -ash/components/quick_answers/translation_result_loader_unittest.cc +ash/components/phonehub/notification.h +ash/components/phonehub/url_constants.cc +ash/components/proximity_auth/proximity_auth_local_state_pref_manager_unittest.cc +ash/components/proximity_auth/proximity_auth_system_unittest.cc +ash/components/proximity_auth/proximity_monitor_impl_unittest.cc ash/components/timezone/timezone_request.cc +ash/components/trial_group/trial_group_checker.cc ash/constants/ash_switches.cc ash/fast_ink/laser/laser_pointer_view.cc +ash/login/ui/auth_icon_view.cc ash/login/ui/login_remove_account_dialog_unittest.cc ash/public/cpp/android_intent_helper_unittest.cc -ash/quick_answers/quick_answers_ui_controller.cc +ash/quick_pair/fast_pair_handshake/fast_pair_handshake.h +ash/quick_pair/message_stream/message_stream.h ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc ash/quick_pair/repository/fast_pair/device_metadata_fetcher_unittest.cc ash/quick_pair/repository/fast_pair/footprints_fetcher.cc 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 @@ -67,19 +80,16 @@ ash/shelf/launcher_nudge_controller_unittest.cc ash/shelf/shelf_controller_unittest.cc ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc ash/system/pcie_peripheral/pcie_peripheral_notification_controller_unittest.cc +ash/system/phonehub/animated_loading_card.h ash/system/phonehub/phone_hub_tray_unittest.cc ash/system/power/power_event_observer_unittest.cc -ash/system/unified/hps_notify_view_unittest.cc +ash/system/unified/hps_notify_controller_unittest.cc ash/system/unified/user_chooser_detailed_view_controller_unittest.cc -ash/system/update/update_notification_controller_unittest.cc ash/webui/camera_app_ui/camera_app_ui.cc -ash/webui/camera_app_ui/resources/js/externs/universal_analytics_api.js 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/metrics.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/util.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 @@ -87,16 +97,17 @@ 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 ash/webui/projector_app/test/projector_message_handler_unittest.cc ash/webui/projector_app/test/projector_oauth_token_fetcher_unittest.cc ash/webui/projector_app/test/projector_xhr_sender_unittest.cc -ash/webui/projector_app/untrusted_projector_ui_config.cc +ash/webui/projector_app/untrusted_projector_ui.cc ash/webui/scanning/resources/scanning_app.html ash/webui/scanning/resources/scanning_app.js -ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js +ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js ash/wm/screen_pinning_controller.h base/BUILD.gn base/PRESUBMIT.py @@ -160,6 +171,7 @@ base/metrics/user_metrics.h base/native_library_win.cc base/notreached.cc base/observer_list_unittest.cc +base/power_monitor/speed_limit_observer_win.cc base/process/launch.h base/process/launch_posix.cc base/process/memory.cc @@ -183,6 +195,7 @@ base/test/gtest_xml_unittest_result_printer_unittest.cc base/test/launcher/test_launcher.cc base/test/launcher/test_results_tracker_unittest.cc base/test/sequenced_task_runner_test_template.h +base/test/task_environment_unittest.cc base/test/test_file_util.h base/test/test_file_util_win.cc base/test/test_suite.cc @@ -316,7 +329,6 @@ chrome/PRESUBMIT.py chrome/android/BUILD.gn chrome/android/expectations/lint-baseline.xml chrome/android/expectations/lint-suppressions.xml -chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd chrome/android/features/cablev2_authenticator/native/cablev2_authenticator_android.cc chrome/android/java/res/layout/autofill_save_address_profile_prompt.xml chrome/android/java/res/values-sw600dp/values.xml @@ -382,6 +394,7 @@ chrome/browser/apps/app_discovery_service/app_discovery_service_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 +chrome/browser/apps/app_service/publishers/publisher_unittest.cc chrome/browser/apps/app_service/web_contents_app_id_utils.h chrome/browser/apps/app_service/webapk/webapk_install_task.cc chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc @@ -395,6 +408,7 @@ chrome/browser/ash/accessibility/accessibility_live_site_browsertest.cc chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc chrome/browser/ash/accessibility/dictation_browsertest.cc chrome/browser/ash/accessibility/select_to_speak_browsertest.cc +chrome/browser/ash/account_manager/account_apps_availability_unittest.cc chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller_unittest.cc chrome/browser/ash/android_sms/android_sms_urls.cc chrome/browser/ash/android_sms/android_sms_urls.h @@ -425,7 +439,6 @@ chrome/browser/ash/attestation/attestation_ca_client.cc chrome/browser/ash/attestation/attestation_ca_client_unittest.cc chrome/browser/ash/attestation/platform_verification_flow_unittest.cc chrome/browser/ash/attestation/tpm_challenge_key_subtle_unittest.cc -chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc chrome/browser/ash/bluetooth/debug_logs_manager_unittest.cc chrome/browser/ash/borealis/borealis_util.cc chrome/browser/ash/cert_provisioning/cert_provisioning_test_helpers.cc @@ -448,6 +461,7 @@ chrome/browser/ash/dbus/proxy_resolution_service_provider.h chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc chrome/browser/ash/drive/drivefs_test_support.cc +chrome/browser/ash/eche_app/eche_app_notification_controller.cc chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.cc chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.h chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_test_utils.h @@ -460,6 +474,7 @@ chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h chrome/browser/ash/first_run/drive_first_run_controller.cc chrome/browser/ash/hats/hats_dialog.cc chrome/browser/ash/input_method/assistive_suggester_client_filter.cc +chrome/browser/ash/input_method/ime_rules_config_unittest.cc chrome/browser/ash/kerberos/kerberos_credentials_manager_test.cc chrome/browser/ash/login/app_mode/kiosk_browsertest.cc chrome/browser/ash/login/app_mode/kiosk_launch_controller_browsertest.cc @@ -469,6 +484,7 @@ chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc chrome/browser/ash/login/easy_unlock/smartlock_state_handler_unittest.cc chrome/browser/ash/login/encryption_migration_browsertest.cc chrome/browser/ash/login/existing_user_controller_browsertest.cc +chrome/browser/ash/login/gaia_reauth_token_fetcher.cc chrome/browser/ash/login/hats_unlock_survey_trigger_unittest.cc chrome/browser/ash/login/help_app_launcher.h chrome/browser/ash/login/login_browsertest.cc @@ -555,6 +571,7 @@ 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 +chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc chrome/browser/ash/web_applications/help_app/help_app_discover_tab_notification_unittest.cc chrome/browser/ash/web_applications/help_app/help_app_notification_controller_unittest.cc chrome/browser/ash/web_applications/terminal_source.cc @@ -589,7 +606,6 @@ chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc chrome/browser/browsing_data/cookies_tree_model.cc chrome/browser/browsing_data/cookies_tree_model_unittest.cc chrome/browser/browsing_data/counters/bookmark_counter_unittest.cc -chrome/browser/browsing_data/counters/browsing_data_counter_utils_browsertest.cc chrome/browser/browsing_data/counters/history_counter_browsertest.cc chrome/browser/browsing_data/counters/passwords_counter_browsertest.cc chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc @@ -611,7 +627,6 @@ chrome/browser/chrome_content_browser_client_unittest.cc chrome/browser/chrome_main_browsertest.cc chrome/browser/chrome_navigation_browsertest.cc chrome/browser/chrome_web_platform_security_metrics_browsertest.cc -chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc chrome/browser/chromeos/extensions/file_manager/system_notification_manager_unittest.cc @@ -635,7 +650,6 @@ chrome/browser/content_settings/host_content_settings_map_unittest.cc chrome/browser/content_settings/sound_content_setting_observer_unittest.cc chrome/browser/continuous_search/internal/search_result_extractor_producer_unittest.cc chrome/browser/continuous_search/internal/search_url_helper_unittest.cc -chrome/browser/custom_handlers/protocol_handler_registry.cc chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc @@ -690,7 +704,6 @@ 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/content_settings/content_settings_unittest.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 @@ -820,11 +833,14 @@ chrome/browser/importer/firefox_profile_lock_win.cc chrome/browser/importer/ie_importer_browsertest_win.cc chrome/browser/importer/profile_writer_unittest.cc chrome/browser/installable/installable_manager_browsertest.cc +chrome/browser/lacros/account_manager/account_manager_util_unittest.cc chrome/browser/lacros/account_manager/account_profile_mapper_unittest.cc +chrome/browser/lacros/account_manager/get_account_information_helper_unittest.cc chrome/browser/lacros/app_mode/kiosk_session_service_browsertest.cc chrome/browser/lacros/browser_service_lacros.cc chrome/browser/lacros/browser_service_lacros_browsertest.cc chrome/browser/lacros/lacros_startup_infobar_delegate.cc +chrome/browser/lacros/lacros_url_handling_unittest.cc chrome/browser/lacros/net/network_settings_translation_unittest.cc chrome/browser/lifetime/switch_utils_unittest.cc chrome/browser/local_discovery/service_discovery_client_mac.mm @@ -841,6 +857,8 @@ chrome/browser/media/media_engagement_score_unittest.cc chrome/browser/media/media_engagement_service_unittest.cc chrome/browser/media/media_engagement_session_unittest.cc chrome/browser/media/protected_media_identifier_permission_context.cc +chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc +chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface_unittest.cc chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser_unittest.cc chrome/browser/media/router/discovery/discovery_network_list_win.cc chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc @@ -858,7 +876,6 @@ chrome/browser/media_galleries/fileapi/media_path_filter.cc chrome/browser/metrics/family_user_metrics_provider_browsertest.cc chrome/browser/metrics/power/battery_level_provider_win.cc chrome/browser/metrics/testing/sync_metrics_test_utils.cc -chrome/browser/metrics/thread_watcher_android.h chrome/browser/metrics/variations/variations_http_headers_browsertest.cc chrome/browser/nacl_host/nacl_infobar_delegate.cc chrome/browser/navigation_predictor/navigation_predictor_browsertest.cc @@ -934,6 +951,7 @@ chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_obse chrome/browser/page_load_metrics/observers/session_restore_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc chrome/browser/password_check/android/password_check_manager_unittest.cc +chrome/browser/password_manager/android/password_store_android_backend_unittest.cc chrome/browser/password_manager/chrome_password_manager_client_unittest.cc chrome/browser/password_manager/password_manager_browsertest.cc chrome/browser/password_manager/password_manager_signin_intercept_test_helper.cc @@ -941,6 +959,7 @@ chrome/browser/password_manager/password_manager_util_win.cc chrome/browser/payments/android_payment_app_factory_browsertest.cc chrome/browser/payments/journey_logger_browsertest.cc chrome/browser/payments/manifest_verifier_browsertest.cc +chrome/browser/payments/payment_handler_just_in_time_installation_browsertest.cc chrome/browser/payments/payment_request_app_store_billing_browsertest.cc chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc chrome/browser/pdf/pdf_extension_test.cc @@ -1030,7 +1049,7 @@ chrome/browser/resource_coordinator/tab_ranker/tab_features_test_helper.cc chrome/browser/resources/PRESUBMIT.py chrome/browser/resources/about_sys/about_sys.js chrome/browser/resources/chromeos/about_os_credits.html -chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/commands.js +chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/macros/list_commands_macro.js chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js chrome/browser/resources/chromeos/accessibility/chromevox/background/background_test.js chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js @@ -1075,10 +1094,10 @@ chrome/browser/resources/chromeos/edu_coexistence/edu_coexistence_ui.js chrome/browser/resources/chromeos/emoji_picker/icons.html chrome/browser/resources/chromeos/emulator/icons.html chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json -chrome/browser/resources/chromeos/login/arc_terms_of_service.js -chrome/browser/resources/chromeos/login/consolidated_consent.js chrome/browser/resources/chromeos/login/debug/debug.js chrome/browser/resources/chromeos/login/oobe.js +chrome/browser/resources/chromeos/login/screens/common/arc_terms_of_service.js +chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.js chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html chrome/browser/resources/chromeos/login/screens/login/encryption_migration.js chrome/browser/resources/chromeos/login/screens/login/offline_login.html @@ -1126,6 +1145,7 @@ chrome/browser/resources/new_tab_page/voice_search_overlay.js chrome/browser/resources/omnibox/omnibox.html chrome/browser/resources/omnibox/omnibox_output.js chrome/browser/resources/pdf/elements/icons.html +chrome/browser/resources/pdf/ink/drawing_canvas_externs.js chrome/browser/resources/plugin_metadata/plugins_chromeos.json chrome/browser/resources/plugin_metadata/plugins_linux.json chrome/browser/resources/plugin_metadata/plugins_mac.json @@ -1177,6 +1197,8 @@ chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher.cc chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config_unittest.cc chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc +chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer.cc +chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer_unittest.cc chrome/browser/search/background/ntp_background_service.cc chrome/browser/search/background/ntp_backgrounds.cc chrome/browser/search/search.h @@ -1186,7 +1208,6 @@ chrome/browser/search_engines/template_url_service_test_util.cc chrome/browser/search_engines/template_url_service_unittest.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/send_tab_to_self/send_tab_to_self_util_unittest.cc chrome/browser/serial/chrome_serial_browsertest.cc chrome/browser/serial/serial_chooser_context_unittest.cc chrome/browser/serial/serial_policy_allowed_ports_unittest.cc @@ -1196,6 +1217,7 @@ chrome/browser/sessions/session_restore_observer_unittest.cc chrome/browser/sessions/session_service.h chrome/browser/sessions/session_service_base.cc chrome/browser/sessions/session_service_unittest.cc +chrome/browser/sessions/tab_restore_service_unittest.cc chrome/browser/share/default_ranking_android.cc chrome/browser/share/share_submenu_model_unittest.cc chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc @@ -1281,7 +1303,6 @@ chrome/browser/themes/theme_syncable_service.cc chrome/browser/translate/translate_manager_browsertest.cc chrome/browser/translate/translate_manager_render_view_host_android_unittest.cc chrome/browser/translate/translate_manager_render_view_host_unittest.cc -chrome/browser/translate/translate_service_unittest.cc chrome/browser/ui/android/strings/android_chrome_strings.grd chrome/browser/ui/app_list/app_context_menu_unittest.cc chrome/browser/ui/app_list/app_list_syncable_service.cc @@ -1306,9 +1327,10 @@ chrome/browser/ui/ash/assistant/assistant_test_mixin.cc chrome/browser/ui/ash/calendar/calendar_keyed_service.cc chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc chrome/browser/ui/ash/chrome_shell_delegate.cc -chrome/browser/ui/ash/desks_client_browsertest.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_browser_client_impl.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/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 @@ -1331,6 +1353,8 @@ chrome/browser/ui/cocoa/applescript/window_applescript_test.mm chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm +chrome/browser/ui/cocoa/screentime/history_bridge_unittest.cc +chrome/browser/ui/cocoa/screentime/screentime_tab_helper_unittest.mm chrome/browser/ui/cocoa/share_menu_controller.mm chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm chrome/browser/ui/commander/open_url_command_source.cc @@ -1398,6 +1422,7 @@ chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/hats/hats_next_web_dialog.cc chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc +chrome/browser/ui/views/lens/lens_side_panel_view.cc chrome/browser/ui/views/location_bar/selected_keyword_view.h chrome/browser/ui/views/network_profile_bubble_view.cc chrome/browser/ui/views/omnibox/omnibox_result_view_unittest.cc @@ -1430,6 +1455,7 @@ chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc chrome/browser/ui/views/user_education/feature_promo_controller_views.cc chrome/browser/ui/views/web_apps/web_app_integration_test_driver.h chrome/browser/ui/web_applications/web_app_browsertest.cc +chrome/browser/ui/web_applications/web_app_link_capturing_browsertest.cc chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc chrome/browser/ui/webui/PRESUBMIT.py chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc @@ -1454,12 +1480,14 @@ chrome/browser/ui/webui/interstitials/interstitial_ui.cc chrome/browser/ui/webui/log_web_ui_url_unittest.cc 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/ntp/new_tab_ui.cc chrome/browser/ui/webui/ntp/ntp_resource_cache.cc chrome/browser/ui/webui/policy/policy_ui_browsertest.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc chrome/browser/ui/webui/profile_info_watcher.h +chrome/browser/ui/webui/read_later/read_later_page_handler_unittest.cc chrome/browser/ui/webui/settings/about_handler_unittest.cc chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc chrome/browser/ui/webui/settings/on_startup_handler_unittest.cc @@ -1767,11 +1795,16 @@ chrome/test/chromedriver/logging.h chrome/test/chromedriver/net/websocket.cc chrome/test/chromedriver/server/chromedriver_server.cc chrome/test/chromedriver/session_commands.cc +chrome/test/chromedriver/support/release/templates/template1.html +chrome/test/chromedriver/support/release/templates/template1.txt +chrome/test/chromedriver/support/release/templates/template2.html +chrome/test/chromedriver/support/release/templates/template2.txt chrome/test/chromedriver/test/run_java_tests.py 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/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 @@ -1818,8 +1851,8 @@ 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/ks_tickets_unittest.mm -chrome/updater/mac/setup/keystone_unittest.cc +chrome/updater/mac/setup/ks_tickets.mm +chrome/updater/mac/setup/ks_tickets_unittest.mm chrome/updater/test/service/win/ui.py chrome/updater/tools/PRESUBMIT.py chrome/updater/tools/certificate_tag.cc @@ -1841,7 +1874,6 @@ chrome/utility/importer/safari_importer_unittest.mm chromecast/app/resources/shell_devtools_discovery_page.html chromecast/base/chromecast_switches.cc chromecast/browser/renderer_prelauncher_test.cc -chromecast/browser/service/cast_service_simple.cc chromecast/browser/webui/cast_webui.cc chromecast/browser/webview/web_content_controller.cc chromecast/cast_core/grpc_resource_data_source.cc @@ -1859,19 +1891,14 @@ chromecast/net/net_switches.cc chromecast/public/bluetooth/gatt.h chromecast/public/output_restrictions.h chromeos/BUILD.gn -chromeos/attestation/attestation_flow_adaptive_unittest.cc -chromeos/attestation/attestation_flow_integrated_unittest.cc +chromeos/chromeos_strings.grd chromeos/components/cros_elements/button/button.js chromeos/components/local_search_service/content_extraction_utils_unittest.cc chromeos/components/multidevice/remote_device_test_util.cc chromeos/components/multidevice/stub_multidevice_util.cc -chromeos/components/phonehub/notification.h -chromeos/components/phonehub/url_constants.cc -chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager_unittest.cc -chromeos/components/proximity_auth/proximity_auth_system_unittest.cc -chromeos/components/proximity_auth/proximity_monitor_impl_unittest.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/trial_group/trial_group_checker.cc chromeos/cryptohome/userdataauth_util.cc chromeos/dbus/arc/arc_obb_mounter_client.h chromeos/dbus/biod/fake_biod_client_unittest.cc @@ -1917,8 +1944,6 @@ chromeos/services/device_sync/remote_device_loader_unittest.cc 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/ime/constants.cc -chromeos/services/ime/public/cpp/shared_lib/interfaces.h chromeos/services/libassistant/public/cpp/assistant_suggestion.h chromeos/test/data/network/proxy_config.json chromeos/test/data/network/shill_wifi_proxy.json @@ -1930,10 +1955,8 @@ 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/arc_util.h components/arc/intent_helper/arc_intent_helper_bridge_unittest.cc components/arc/intent_helper/link_handler_model_unittest.cc -components/arc/session/arc_upgrade_params.h components/assist_ranker/predictor_config_definitions.cc components/autofill/PRESUBMIT.py components/autofill/content/renderer/PRESUBMIT.py @@ -1946,13 +1969,13 @@ components/autofill/core/browser/autofill_download_manager.cc components/autofill/core/browser/autofill_download_manager_unittest.cc components/autofill/core/browser/autofill_experiments.cc components/autofill/core/browser/autofill_experiments_unittest.cc -components/autofill/core/browser/autofill_metrics_unittest.cc components/autofill/core/browser/browser_autofill_manager_unittest.cc components/autofill/core/browser/data_model/test_data_creator.cc components/autofill/core/browser/form_data_importer_unittest.cc components/autofill/core/browser/form_parsing/address_field.cc components/autofill/core/browser/form_processing/name_processing_util.cc components/autofill/core/browser/form_structure_unittest.cc +components/autofill/core/browser/metrics/autofill_metrics_unittest.cc components/autofill/core/browser/payments/autofill_offer_manager_unittest.cc components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc components/autofill/core/browser/payments/credit_card_fido_authenticator.cc @@ -1972,6 +1995,7 @@ components/autofill/core/browser/ui/contact_form_label_formatter_unittest.cc components/autofill/core/browser/ui/label_formatter_utils_unittest.cc components/autofill/core/browser/ui/mobile_label_formatter_unittest.cc components/autofill/core/browser/webdata/autofill_profile_sync_bridge.h +components/autofill_assistant/android/internal/java/strings/android_chrome_autofill_assistant_strings.grd components/autofill_assistant/browser/actions/collect_user_data_action_unittest.cc components/autofill_assistant/browser/actions/show_details_action_unittest.cc components/autofill_assistant/browser/actions/show_generic_ui_action_unittest.cc @@ -1990,8 +2014,8 @@ components/autofill_assistant/browser/devtools/error_reporter.h 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/protocol_utils.cc components/autofill_assistant/browser/script_parameters_unittest.cc +components/autofill_assistant/browser/service/cup.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 @@ -2032,7 +2056,6 @@ components/certificate_transparency/chrome_require_ct_delegate.h components/certificate_transparency/chrome_require_ct_delegate_unittest.cc components/certificate_transparency/data/log_list.json components/chrome_cleaner/public/constants/constants.h -components/client_hints/common/client_hints.cc components/cloud_devices/common/cloud_device_description.h components/cloud_devices/common/cloud_devices_urls.cc components/cloud_devices/common/cloud_devices_urls_unittest.cc @@ -2068,6 +2091,7 @@ components/cronet/native/cronet.idl components/cronet/native/perftest/perf_test.cc components/cronet/tools/cr_cronet.py components/cronet/tools/generate_javadoc.py +components/custom_handlers/protocol_handler_registry.cc components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h components/data_reduction_proxy/core/common/chrome_proxy_header.txt components/desks_storage/core/desk_sync_bridge_unittest.cc @@ -2155,9 +2179,17 @@ components/history/core/browser/web_history_service_unittest.cc components/history/core/common/thumbnail_score.h components/history/core/test/fake_web_history_service.cc components/history/metrics/domain_diversity_reporter_unittest.cc +components/history_clusters/core/clusterer_unittest.cc +components/history_clusters/core/content_annotations_cluster_processor_unittest.cc +components/history_clusters/core/content_visibility_cluster_finalizer_unittest.cc components/history_clusters/core/history_clusters_service_test_api.cc components/history_clusters/core/history_clusters_service_unittest.cc -components/history_clusters/core/remote_clustering_backend_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 +components/history_clusters/core/url_deduper_cluster_finalizer_unittest.cc components/history_strings.grdp components/image_fetcher/ios/webp_decoder.h components/infobars/content/content_infobar_manager.cc @@ -2224,7 +2256,6 @@ components/offline_pages/core/prefetch/prefetch_server_urls.cc components/offline_pages/core/prefetch/prefetch_server_urls_unittest.cc components/offline_pages/core/prefetch/server_forbidden_check_request_unittest.cc components/omnibox/PRESUBMIT.py -components/omnibox/browser/autocomplete_controller.cc components/omnibox/browser/autocomplete_controller.h components/omnibox/browser/autocomplete_input.cc components/omnibox/browser/autocomplete_match.h @@ -2268,13 +2299,56 @@ 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_synonyms.grd @@ -2285,13 +2359,16 @@ components/optimization_guide/content/browser/page_content_annotations_model_man components/optimization_guide/content/browser/page_content_annotations_model_manager_unittest.cc components/optimization_guide/core/hints_component_util_unittest.cc components/optimization_guide/core/hints_manager_unittest.cc -components/optimization_guide/core/model_executor_unittest.cc +components/optimization_guide/core/model_handler_unittest.cc components/optimization_guide/core/optimization_filter_unittest.cc 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/page_info/about_this_site_service_unittest.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 +components/page_info/core/about_this_site_service_unittest.cc components/page_info/page_info.cc components/page_info_strings.grdp components/page_load_metrics/browser/metrics_web_contents_observer.cc @@ -2437,6 +2514,8 @@ components/policy/core/browser/browser_policy_connector.cc components/policy/core/browser/browser_policy_connector.h components/policy/core/browser/browser_policy_connector_unittest.cc components/policy/core/browser/configuration_policy_pref_store_unittest.cc +components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher.cc +components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher_unittest.cc 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 @@ -2448,6 +2527,7 @@ 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/policy_loader_common.cc +components/policy/core/common/policy_loader_common_unittest.cc components/policy/core/common/policy_loader_lacros_unittest.cc components/policy/core/common/policy_map_unittest.cc components/policy/core/common/policy_service_impl_unittest.cc @@ -2591,7 +2671,9 @@ 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 components/services/app_service/public/cpp/app_capability_access_cache_unittest.cc +components/services/app_service/public/cpp/app_capability_access_cache_wrapper_unittest.cc components/services/app_service/public/cpp/app_registry_cache_mojom_unittest.cc +components/services/app_service/public/cpp/app_registry_cache_wrapper_unittest.cc components/services/app_service/public/cpp/app_update_mojom_unittest.cc components/services/app_service/public/cpp/app_update_unittest.cc components/services/app_service/public/cpp/capability_access_update_unittest.cc @@ -2611,8 +2693,8 @@ components/services/storage/partition_impl_unittest.cc components/services/storage/public/mojom/buckets/bucket_locator_mojom_traits_unittest.cc components/shared_highlighting/core/common/disabled_sites.cc components/shared_highlighting/core/common/disabled_sites_unittest.cc +components/shared_highlighting/core/common/fragment_directives_utils_unittest.cc components/shared_highlighting/core/common/shared_highlighting_metrics_unittest.cc -components/shared_highlighting/core/common/text_fragments_utils_unittest.cc components/signin/core/browser/account_reconcilor_unittest.cc components/signin/core/browser/chrome_connected_header_helper.cc components/signin/core/browser/resources/signin_internals.js @@ -2759,7 +2841,13 @@ content/browser/accessibility/hit_testing_browsertest.cc content/browser/android/content_url_loader_factory.cc content/browser/android/nfc_host_unittest.cc content/browser/attribution_reporting/PRESUBMIT.py +content/browser/back_forward_cache_basics_browsertest.cc +content/browser/back_forward_cache_features_browsertest.cc +content/browser/back_forward_cache_internal_browsertest.cc +content/browser/back_forward_cache_network_request_browsertest.cc +content/browser/back_forward_cache_no_store_browsertest.cc content/browser/background_fetch/background_fetch_cross_origin_filter_unittest.cc +content/browser/background_fetch/background_fetch_service_impl.cc content/browser/background_fetch/background_fetch_service_unittest.cc content/browser/blob_storage/blob_url_browsertest.cc content/browser/bluetooth/bluetooth_device_chooser_controller.cc @@ -2768,10 +2856,11 @@ content/browser/browsing_data/browsing_data_filter_builder_impl.cc content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc content/browser/browsing_data/same_site_data_remover_impl_browsertest.cc content/browser/browsing_data/same_site_data_remover_impl_unittest.cc +content/browser/buckets/bucket_manager_host_unittest.cc content/browser/cache_storage/cache_storage_context_unittest.cc -content/browser/child_process_security_policy_impl.h content/browser/child_process_security_policy_unittest.cc content/browser/client_hints/client_hints.cc +content/browser/content_security_policy_browsertest.cc content/browser/cookie_store/cookie_store_manager_unittest.cc content/browser/devtools/devtools_agent_host_impl_unittest.cc content/browser/devtools/devtools_http_handler.cc @@ -2796,6 +2885,7 @@ content/browser/loader/file_url_loader_factory_unittest.cc content/browser/loader/prefetch_browsertest.cc content/browser/media/media_devices_permission_checker_unittest.cc content/browser/media/session/media_session_impl_service_routing_unittest.cc +content/browser/mojo_binder_policy_applier.h content/browser/native_io/native_io_manager_unittest.cc content/browser/net/accept_header_browsertest.cc content/browser/net/trust_token_browsertest.cc @@ -2805,7 +2895,9 @@ content/browser/notifications/notification_database_unittest.cc content/browser/permissions/permission_controller_impl_unittest.cc content/browser/plugin_service_impl_browsertest.cc content/browser/portal/portal_navigation_throttle.cc +content/browser/process_lock.h content/browser/push_messaging/push_messaging_manager.cc +content/browser/renderer_host/clipboard_host_impl_unittest.cc content/browser/renderer_host/compositor_impl_android.cc content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc content/browser/renderer_host/dwrite_font_proxy_impl_win.cc @@ -2864,7 +2956,7 @@ content/browser/web_contents/web_contents_impl_browsertest.cc content/browser/web_contents/web_contents_impl_unittest.cc content/browser/web_contents/web_contents_view_aura_unittest.cc content/browser/web_contents/web_drag_dest_mac_unittest.mm -content/browser/web_package/script_web_bundle_browsertest.cc +content/browser/web_package/web_bundle_element_browsertest.cc content/browser/web_package/web_bundle_utils.h content/browser/webauth/authenticator_common.cc content/browser/webauth/authenticator_impl_unittest.cc @@ -2923,6 +3015,7 @@ content/shell/browser/shell_browser_main_parts.cc content/test/gpu/PRESUBMIT.py content/test/gpu/find_unknown_typ_tags.py content/test/gpu/flake_suppressor/expectations.py +content/test/gpu/flake_suppressor/queries.py content/test/gpu/flake_suppressor/results.py content/test/gpu/flake_suppressor/results_unittest.py content/test/gpu/gather_power_measurement_results.py @@ -2966,6 +3059,7 @@ device/bluetooth/bluetooth_device_winrt.cc device/bluetooth/bluetooth_remote_gatt_characteristic_android.h device/bluetooth/bluetooth_task_manager_win.cc device/bluetooth/dbus/bluetooth_device_client.h +device/bluetooth/floss/bluetooth_adapter_floss.cc device/bluetooth/floss/bluetooth_device_floss.h device/fido/aoa/android_accessory_discovery.cc device/fido/aoa/android_accessory_discovery.h @@ -2980,7 +3074,21 @@ device/gamepad/xinput_data_fetcher_win.cc device/vr/android/arcore/arcore_impl.cc docs/enterprise/extension_query.py docs/enterprise/extension_query_py2.py +docs/website/.eleventy.js +docs/website/PRESUBMIT.py +docs/website/infra/config/PRESUBMIT.py +docs/website/scripts/404s.txt +docs/website/scripts/common.py +docs/website/scripts/export.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 +docs/website/site/developers/design-documents/accessibility/tracker/CSUN_Accessibility_in_the_Cloud.txt +docs/website/site/developers/design-documents/accessibility/tracker/CSUN_Improving_Access_To_Web_Platforms_Content_and_Applications.txt +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_unittest.cc extensions/browser/api/declarative/declarative_rule.h extensions/browser/api/declarative_net_request/composite_matcher_unittest.cc extensions/browser/api/declarative_net_request/file_sequence_helper_unittest.cc @@ -2999,6 +3107,7 @@ extensions/browser/event_router_unittest.cc extensions/browser/extension_prefs_observer.h extensions/browser/image_sanitizer.cc extensions/browser/info_map.cc +extensions/browser/permissions_manager.h extensions/browser/suggest_permission_util.cc extensions/browser/updater/extension_downloader.cc extensions/browser/updater/extension_downloader_unittest.cc @@ -3186,6 +3295,7 @@ 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/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 @@ -3212,6 +3322,7 @@ ios/chrome/browser/ui/activity_services/activity_type_util.mm ios/chrome/browser/ui/authentication/re_signin_infobar_delegate_unittest.mm ios/chrome/browser/ui/authentication/signin/add_account_signin/add_account_signin_manager_unittest.mm ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/advanced_settings_signin_mediator_unittest.mm +ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator_unittest.mm ios/chrome/browser/ui/authentication/signin/signin_utils_unittest.mm ios/chrome/browser/ui/authentication/signin/trusted_vault_reauthentication/trusted_vault_reauthentication_coordinator_unittest.mm ios/chrome/browser/ui/authentication/signin/user_signin/user_signin_mediator_unittest.mm @@ -3231,6 +3342,7 @@ ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm ios/chrome/browser/ui/content_suggestions/ntp_home_mediator_unittest.mm ios/chrome/browser/ui/dialogs/nsurl_protection_space_util_unittest.mm +ios/chrome/browser/ui/infobars/test/test_infobar_password_delegate.mm ios/chrome/browser/ui/link_to_text/link_to_text_mediator_unittest.mm ios/chrome/browser/ui/location_bar/location_bar_coordinator_unittest.mm ios/chrome/browser/ui/ntp/discover_feed_constants.mm @@ -3264,7 +3376,6 @@ ios/chrome/browser/ui/settings/translate_table_view_controller.mm ios/chrome/browser/ui/start_surface/start_surface_scene_agent_unittest.mm ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_mediator_unittest.mm ios/chrome/browser/ui/table_view/cells/table_view_detail_icon_item_unittest.mm -ios/chrome/browser/ui/table_view/cells/table_view_link_header_footer_item_unittest.mm ios/chrome/browser/ui/table_view/cells/table_view_url_item_unittest.mm ios/chrome/browser/ui/toolbar/toolbar_mediator_unittest.mm ios/chrome/browser/ui/util/pasteboard_util_unittest.mm @@ -3339,6 +3450,7 @@ ios/web_view/internal/signin/cwv_identity_unittest.mm ios/web_view/internal/signin/web_view_device_accounts_provider_impl_unittest.mm ios/web_view/internal/sync/cwv_sync_controller_unittest.mm ios/web_view/internal/translate/cwv_translation_controller_unittest.mm +ios/web_view/public/cwv_autofill_data_manager.h ios/web_view/public/cwv_credential_provider_extension_utils.h ios/web_view/public/cwv_identity.h ios/web_view/public/cwv_translation_language.h @@ -3386,7 +3498,6 @@ media/capture/video/win/video_capture_device_utils_win.h media/capture/video/win/video_capture_device_win.cc media/cdm/win/media_foundation_cdm.cc media/ffmpeg/ffmpeg_regression_tests.cc -media/filters/dav1d_video_decoder.cc media/filters/decrypting_audio_decoder.h media/filters/decrypting_video_decoder.h media/filters/source_buffer_stream_unittest.cc @@ -3395,6 +3506,7 @@ 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/vaapi/test/av1_decoder.cc +media/gpu/vaapi/test/vp8_decoder.cc media/gpu/vaapi/test/vp9_decoder.cc media/gpu/vaapi/test_utils.h media/gpu/vaapi/vaapi_image_decoder_test_common.h @@ -3409,6 +3521,7 @@ media/gpu/windows/d3d11_vp9_accelerator.cc media/gpu/windows/dxva_video_decode_accelerator_win.cc media/gpu/windows/media_foundation_video_encode_accelerator_win.cc media/gpu/windows/supported_profile_helpers.cc +media/mojo/mojom/stable/native_pixmap_handle_mojom_traits.cc media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc media/mojo/services/media_foundation_service.cc media/mojo/services/media_metrics_provider_unittest.cc @@ -4084,6 +4197,7 @@ rlz/lib/lib_values.cc rlz/lib/rlz_lib_test.cc sandbox/features.gni sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc +sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc sandbox/linux/services/libc_interceptor.cc @@ -4152,7 +4266,7 @@ services/network/public/cpp/cors/origin_access_entry_unittest.cc services/network/public/cpp/cors/origin_access_list_unittest.cc services/network/public/cpp/is_potentially_trustworthy.cc services/network/public/cpp/network_switches.cc -services/network/sct_auditing/sct_auditing_cache.cc +services/network/sct_auditing/sct_auditing_reporter.cc services/network/trust_tokens/trust_token_client_data_canonicalization.h services/network/trust_tokens/trust_token_key_commitment_parser.h services/network/trust_tokens/trust_token_key_commitments.h @@ -4231,9 +4345,9 @@ testing/perf/luci_test_result.h testing/perf/perf_result_reporter.cc testing/scripts/PRESUBMIT.py testing/scripts/common.py -testing/scripts/run_finch_smoke_tests_android.py testing/scripts/run_performance_tests.py testing/scripts/run_variations_smoke_tests.py +testing/scripts/rust/test_filtering_unittests.py testing/scripts/wpt_common.py testing/test_env.py testing/trigger_scripts/PRESUBMIT.py @@ -4245,6 +4359,7 @@ testing/unexpected_passes_common/result_output_unittest.py testing/variations/PRESUBMIT.py testing/variations/fieldtrial_testing_config.json third_party/Python-Markdown/markdown/extensions/smarty.py +third_party/Python-Markdown/markdown/pep562.py third_party/abseil-cpp/absl/abseil.podspec.gen.py third_party/abseil-cpp/absl/base/config.h third_party/abseil-cpp/absl/base/internal/direct_mmap.h @@ -4381,10 +4496,12 @@ third_party/android_deps/libs/com_google_firebase_firebase_messaging/3pp/fetch.p third_party/android_deps/licenses/Android_SDK_License-December_9_2016.txt third_party/android_platform/development/scripts/PRESUBMIT.py third_party/android_platform/development/scripts/stack.py -third_party/android_rust_toolchain/toolchain/src/stdlibs/library/stdarch/crates/stdarch-verify/arm-intrinsics.html +third_party/android_rust_toolchain/toolchain/lib/rustlib/src/rust/library/stdarch/crates/stdarch-verify/arm-intrinsics.html +third_party/android_rust_toolchain/toolchain/manifest_7877451.xml third_party/android_support_test_runner/runner/src/main/Android.mk third_party/angle/PRESUBMIT.py third_party/angle/extensions/ANGLE_base_vertex_base_instance.txt +third_party/angle/extensions/ANGLE_base_vertex_base_instance_shader_builtin.txt third_party/angle/extensions/ANGLE_client_arrays.txt third_party/angle/extensions/ANGLE_external_objects_flags.txt third_party/angle/extensions/ANGLE_external_objects_fuchsia.txt @@ -4418,6 +4535,7 @@ third_party/angle/extensions/EGL_ANGLE_device_metal.txt third_party/angle/extensions/EGL_ANGLE_device_vulkan.txt third_party/angle/extensions/EGL_ANGLE_direct3d_display.txt third_party/angle/extensions/EGL_ANGLE_direct_composition.txt +third_party/angle/extensions/EGL_ANGLE_display_power_preference.txt third_party/angle/extensions/EGL_ANGLE_display_semaphore_share_group.txt third_party/angle/extensions/EGL_ANGLE_display_texture_share_group.txt third_party/angle/extensions/EGL_ANGLE_feature_control.txt @@ -4433,6 +4551,7 @@ third_party/angle/extensions/EGL_ANGLE_software_display.txt third_party/angle/extensions/EGL_ANGLE_stream_producer_d3d_texture.txt third_party/angle/extensions/EGL_ANGLE_swap_with_frame_token.txt third_party/angle/extensions/EGL_ANGLE_sync_control_rate.txt +third_party/angle/extensions/EGL_ANGLE_vulkan_image.txt third_party/angle/extensions/EGL_ANGLE_window_fixed_size.txt third_party/angle/extensions/EGL_CHROMIUM_create_context_bind_generates_resource.txt third_party/angle/extensions/EGL_CHROMIUM_sync_control.txt @@ -4508,6 +4627,7 @@ 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 @@ -4790,6 +4910,7 @@ third_party/blink/renderer/core/exported/web_plugin_container_impl.cc third_party/blink/renderer/core/exported/web_searchable_form_data.cc third_party/blink/renderer/core/fetch/response.h third_party/blink/renderer/core/fileapi/file_reader_loader_client.h +third_party/blink/renderer/core/fragment_directive/text_fragment_anchor_metrics_test.cc third_party/blink/renderer/core/frame/csp/content_security_policy.cc third_party/blink/renderer/core/frame/deprecation.cc third_party/blink/renderer/core/frame/dom_window.cc @@ -4932,10 +5053,9 @@ 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/scrolling/text_fragment_anchor_metrics_test.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/composited_layer_mapping.cc +third_party/blink/renderer/core/paint/compositing/compositing_reason_finder.cc 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 @@ -4951,7 +5071,6 @@ third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h third_party/blink/renderer/core/paint/paint_layer_stacking_node.cc third_party/blink/renderer/core/paint/paint_layer_stacking_node.h third_party/blink/renderer/core/paint/paint_timing_detector.h -third_party/blink/renderer/core/paint/text_paint_timing_detector.h third_party/blink/renderer/core/paint/theme_painter_default.h third_party/blink/renderer/core/script/detect_javascript_frameworks.cc third_party/blink/renderer/core/script/document_write_intervention.cc @@ -5142,6 +5261,7 @@ third_party/blink/renderer/platform/network/http_parsers_test.cc third_party/blink/renderer/platform/network/network_state_notifier.cc third_party/blink/renderer/platform/network/network_utils_test.cc third_party/blink/renderer/platform/network/parsed_content_header_field_parameters.h +third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_factory.cc third_party/blink/renderer/platform/png_fuzzer.cc third_party/blink/renderer/platform/scheduler/main_thread/main_thread_task_queue.h third_party/blink/renderer/platform/scheduler/main_thread/memory_purge_manager.h @@ -5604,12 +5724,14 @@ third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/ third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/descriptor.py third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/descriptor_database.py third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/descriptor_pool.py +third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/__init__.py third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/_parameterized.py third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/api_implementation.py third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/containers.py third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/decoder.py third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/encoder.py third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/enum_type_wrapper.py +third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/extension_dict.py third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/import_test_package/__init__.py third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/message_listener.py third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/python_message.py @@ -6876,6 +6998,7 @@ third_party/depot_tools/fetch_configs/skia_buildbot.py third_party/depot_tools/fetch_configs/syzygy.py third_party/depot_tools/fetch_configs/v8.py third_party/depot_tools/fetch_configs/webrtc.py +third_party/depot_tools/fetch_configs/website.py third_party/depot_tools/fix_encoding.py third_party/depot_tools/gclient.py third_party/depot_tools/gclient_scm.py @@ -7111,7 +7234,6 @@ third_party/devtools-frontend/src/front_end/core/i18n/locales/zh-HK.json third_party/devtools-frontend/src/front_end/core/i18n/locales/zh-TW.json third_party/devtools-frontend/src/front_end/core/i18n/locales/zh.json third_party/devtools-frontend/src/front_end/core/i18n/locales/zu.json -third_party/devtools-frontend/src/front_end/devtools_compatibility.js third_party/devtools-frontend/src/front_end/entrypoint_template.html third_party/devtools-frontend/src/front_end/integration_test_runner.html third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/package.json @@ -7177,8 +7299,6 @@ third_party/devtools-frontend/src/front_end/third_party/lighthouse/locales/zh-HK third_party/devtools-frontend/src/front_end/third_party/lighthouse/locales/zh-TW.json third_party/devtools-frontend/src/front_end/third_party/lighthouse/locales/zh.json third_party/devtools-frontend/src/front_end/third_party/lighthouse/report-assets/report-generator.js -third_party/devtools-frontend/src/front_end/third_party/lighthouse/report-assets/report.css -third_party/devtools-frontend/src/front_end/third_party/lighthouse/report-assets/report.js third_party/devtools-frontend/src/front_end/third_party/lighthouse/report/bundle.js third_party/devtools-frontend/src/front_end/third_party/lit-html/package/development/directives/async-append.js third_party/devtools-frontend/src/front_end/third_party/lit-html/package/development/directives/async-replace.js @@ -7217,7 +7337,6 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/es third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/install.js third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/package.json third_party/devtools-frontend/src/front_end/ui/legacy/themeColors.css -third_party/devtools-frontend/src/node_modules/@babel/code-frame/package.json third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/dist/source-map.debug.js third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/dist/source-map.js third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/lib/base64-vlq.js @@ -7229,12 +7348,20 @@ 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 @@ -7250,17 +7377,7 @@ third_party/devtools-frontend/src/node_modules/asap/browser-raw.js third_party/devtools-frontend/src/node_modules/astral-regex/package.json third_party/devtools-frontend/src/node_modules/axe-core/axe.js third_party/devtools-frontend/src/node_modules/axe-core/axe.min.js -third_party/devtools-frontend/src/node_modules/axe-core/lib/checks/keyboard/focusable-element-evaluate.js -third_party/devtools-frontend/src/node_modules/axe-core/lib/checks/media/no-autoplay-audio-evaluate.js -third_party/devtools-frontend/src/node_modules/axe-core/lib/checks/mobile/css-orientation-lock-evaluate.js -third_party/devtools-frontend/src/node_modules/axe-core/lib/commons/dom/get-rect-stack.js -third_party/devtools-frontend/src/node_modules/axe-core/lib/core/imports/index.js -third_party/devtools-frontend/src/node_modules/axe-core/lib/core/utils/node-sorter.js -third_party/devtools-frontend/src/node_modules/axe-core/lib/core/utils/parse-sameorigin-stylesheet.js -third_party/devtools-frontend/src/node_modules/axe-core/lib/core/utils/preload-media.js -third_party/devtools-frontend/src/node_modules/axe-core/lib/rules/no-autoplay-audio-matches.js third_party/devtools-frontend/src/node_modules/axobject-query/package.json -third_party/devtools-frontend/src/node_modules/bail/package.json third_party/devtools-frontend/src/node_modules/base64-arraybuffer/package.json third_party/devtools-frontend/src/node_modules/base64-js/package.json third_party/devtools-frontend/src/node_modules/binary-extensions/package.json @@ -7281,9 +7398,6 @@ third_party/devtools-frontend/src/node_modules/chai/lib/chai/interface/assert.js third_party/devtools-frontend/src/node_modules/chai/lib/chai/interface/should.js third_party/devtools-frontend/src/node_modules/chai/lib/chai/utils/isNaN.js third_party/devtools-frontend/src/node_modules/chai/package.json -third_party/devtools-frontend/src/node_modules/character-entities-legacy/package.json -third_party/devtools-frontend/src/node_modules/character-entities/package.json -third_party/devtools-frontend/src/node_modules/character-reference-invalid/package.json third_party/devtools-frontend/src/node_modules/clean-css/lib/options/compatibility.js third_party/devtools-frontend/src/node_modules/clone-regexp/package.json third_party/devtools-frontend/src/node_modules/clone/package.json @@ -7304,7 +7418,6 @@ third_party/devtools-frontend/src/node_modules/core-js-pure/modules/es.promise.j third_party/devtools-frontend/src/node_modules/core-js-pure/modules/es.symbol.js third_party/devtools-frontend/src/node_modules/core-js-pure/modules/web.url.js third_party/devtools-frontend/src/node_modules/cors/package.json -third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/package.json third_party/devtools-frontend/src/node_modules/cosmiconfig/package.json third_party/devtools-frontend/src/node_modules/css-select/node_modules/domutils/lib/stringify.js third_party/devtools-frontend/src/node_modules/css-tree/data/patch.json @@ -7354,20 +7467,20 @@ third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_ third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/package.json third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/src/browser.js +third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/find-up/package.json +third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/locate-path/package.json +third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/p-limit/package.json +third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/p-locate/package.json +third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/p-try/package.json +third_party/devtools-frontend/src/node_modules/eslint-module-utils/readPkgUp.js third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/package.json third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/lib/doctrine.js third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/lib/typed.js third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/lib/utility.js third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/package.json -third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/package.json -third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/package.json -third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/package.json -third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/package.json -third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/package.json -third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/package.json -third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/package.json -third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/package.json +third_party/devtools-frontend/src/node_modules/eslint-plugin-lit-a11y/node_modules/eslint-plugin-lit/node_modules/parse5/lib/tokenizer/index.js +third_party/devtools-frontend/src/node_modules/eslint-plugin-lit-a11y/node_modules/eslint-plugin-lit/node_modules/parse5/package.json third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/package.json third_party/devtools-frontend/src/node_modules/eslint-scope/lib/definition.js third_party/devtools-frontend/src/node_modules/eslint-scope/lib/index.js @@ -7382,7 +7495,21 @@ 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 +third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/pattern-visitor.js +third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/reference.js +third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/referencer.js +third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/scope-manager.js +third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/scope.js +third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/variable.js +third_party/devtools-frontend/src/node_modules/eslint/node_modules/estraverse/estraverse.js +third_party/devtools-frontend/src/node_modules/eslint/node_modules/estraverse/gulpfile.js +third_party/devtools-frontend/src/node_modules/eslint/node_modules/estraverse/package.json +third_party/devtools-frontend/src/node_modules/eslint/node_modules/glob-parent/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/has-flag/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/package.json @@ -7424,16 +7551,16 @@ third_party/devtools-frontend/src/node_modules/gensync/package.json third_party/devtools-frontend/src/node_modules/get-intrinsic/package.json third_party/devtools-frontend/src/node_modules/get-stdin/package.json third_party/devtools-frontend/src/node_modules/get-stream/package.json +third_party/devtools-frontend/src/node_modules/get-symbol-description/package.json third_party/devtools-frontend/src/node_modules/glob-parent/package.json third_party/devtools-frontend/src/node_modules/globals/package.json third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/package.json third_party/devtools-frontend/src/node_modules/globby/package.json -third_party/devtools-frontend/src/node_modules/gonzales-pe/lib/gonzales.js -third_party/devtools-frontend/src/node_modules/gonzales-pe/package.json third_party/devtools-frontend/src/node_modules/hard-rejection/package.json third_party/devtools-frontend/src/node_modules/has-bigints/package.json third_party/devtools-frontend/src/node_modules/has-flag/package.json third_party/devtools-frontend/src/node_modules/has-symbols/package.json +third_party/devtools-frontend/src/node_modules/has-tostringtag/package.json third_party/devtools-frontend/src/node_modules/has/package.json third_party/devtools-frontend/src/node_modules/html-minifier/node_modules/clean-css/lib/options/compatibility.js third_party/devtools-frontend/src/node_modules/html-minifier/package.json @@ -7449,25 +7576,24 @@ third_party/devtools-frontend/src/node_modules/imurmurhash/imurmurhash.js third_party/devtools-frontend/src/node_modules/imurmurhash/imurmurhash.min.js third_party/devtools-frontend/src/node_modules/imurmurhash/package.json third_party/devtools-frontend/src/node_modules/indent-string/package.json -third_party/devtools-frontend/src/node_modules/is-alphabetical/package.json -third_party/devtools-frontend/src/node_modules/is-alphanumerical/package.json +third_party/devtools-frontend/src/node_modules/internal-slot/package.json third_party/devtools-frontend/src/node_modules/is-bigint/package.json third_party/devtools-frontend/src/node_modules/is-binary-path/package.json third_party/devtools-frontend/src/node_modules/is-boolean-object/package.json third_party/devtools-frontend/src/node_modules/is-callable/package.json third_party/devtools-frontend/src/node_modules/is-core-module/package.json -third_party/devtools-frontend/src/node_modules/is-decimal/package.json third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/package.json -third_party/devtools-frontend/src/node_modules/is-hexadecimal/package.json third_party/devtools-frontend/src/node_modules/is-negative-zero/package.json third_party/devtools-frontend/src/node_modules/is-number-object/package.json third_party/devtools-frontend/src/node_modules/is-plain-obj/package.json third_party/devtools-frontend/src/node_modules/is-regex/package.json third_party/devtools-frontend/src/node_modules/is-regexp/package.json +third_party/devtools-frontend/src/node_modules/is-shared-array-buffer/package.json third_party/devtools-frontend/src/node_modules/is-string/package.json third_party/devtools-frontend/src/node_modules/is-symbol/package.json third_party/devtools-frontend/src/node_modules/is-typedarray/package.json third_party/devtools-frontend/src/node_modules/is-unicode-supported/package.json +third_party/devtools-frontend/src/node_modules/is-weakref/package.json third_party/devtools-frontend/src/node_modules/isbinaryfile/package.json third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/has-flag/package.json third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/package.json @@ -7492,7 +7618,6 @@ third_party/devtools-frontend/src/node_modules/karma/static/karma.js third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/package.json 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/load-json-file/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 @@ -7510,13 +7635,9 @@ third_party/devtools-frontend/src/node_modules/log-symbols/node_modules/has-flag third_party/devtools-frontend/src/node_modules/log-symbols/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/log-symbols/package.json third_party/devtools-frontend/src/node_modules/log4js/package.json -third_party/devtools-frontend/src/node_modules/longest-streak/package.json third_party/devtools-frontend/src/node_modules/make-dir/package.json third_party/devtools-frontend/src/node_modules/map-obj/package.json third_party/devtools-frontend/src/node_modules/mathml-tag-names/package.json -third_party/devtools-frontend/src/node_modules/mdast-util-from-markdown/package.json -third_party/devtools-frontend/src/node_modules/mdast-util-to-markdown/package.json -third_party/devtools-frontend/src/node_modules/mdast-util-to-string/package.json third_party/devtools-frontend/src/node_modules/mdn-data/css/at-rules.json third_party/devtools-frontend/src/node_modules/mdn-data/css/at-rules.schema.json third_party/devtools-frontend/src/node_modules/mdn-data/css/properties.json @@ -7529,7 +7650,6 @@ third_party/devtools-frontend/src/node_modules/mdn-data/package.json third_party/devtools-frontend/src/node_modules/meow/node_modules/normalize-package-data/package.json third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/package.json third_party/devtools-frontend/src/node_modules/meow/package.json -third_party/devtools-frontend/src/node_modules/micromark/package.json third_party/devtools-frontend/src/node_modules/minify-html-literals/node_modules/clean-css/lib/options/compatibility.js third_party/devtools-frontend/src/node_modules/minify-html-literals/package.json third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/package.json @@ -7542,7 +7662,6 @@ third_party/devtools-frontend/src/node_modules/mocha/mocha.js third_party/devtools-frontend/src/node_modules/mocha/node_modules/escape-string-regexp/package.json third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/package.json third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/package.json -third_party/devtools-frontend/src/node_modules/mocha/node_modules/js-yaml/package.json third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/package.json third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-limit/package.json third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/package.json @@ -7553,7 +7672,6 @@ third_party/devtools-frontend/src/node_modules/node-releases/package.json third_party/devtools-frontend/src/node_modules/normalize-package-data/package.json third_party/devtools-frontend/src/node_modules/normalize-path/index.js third_party/devtools-frontend/src/node_modules/normalize-selector/package.json -third_party/devtools-frontend/src/node_modules/num2fraction/package.json third_party/devtools-frontend/src/node_modules/object-assign/index.js third_party/devtools-frontend/src/node_modules/object-assign/package.json third_party/devtools-frontend/src/node_modules/object-keys/package.json @@ -7564,7 +7682,6 @@ third_party/devtools-frontend/src/node_modules/p-limit/package.json third_party/devtools-frontend/src/node_modules/p-locate/package.json third_party/devtools-frontend/src/node_modules/p-try/package.json third_party/devtools-frontend/src/node_modules/parent-module/package.json -third_party/devtools-frontend/src/node_modules/parse-entities/package.json third_party/devtools-frontend/src/node_modules/parse-json/package.json third_party/devtools-frontend/src/node_modules/parse-literals/package.json third_party/devtools-frontend/src/node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5/lib/tokenizer/index.js @@ -7577,24 +7694,13 @@ 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/pify/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/pkg-up/node_modules/find-up/package.json -third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/package.json -third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/package.json -third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/package.json -third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/package.json -third_party/devtools-frontend/src/node_modules/pkg-up/package.json -third_party/devtools-frontend/src/node_modules/postcss-less/package.json -third_party/devtools-frontend/src/node_modules/postcss-sass/package.json third_party/devtools-frontend/src/node_modules/postcss-selector-parser/package.json -third_party/devtools-frontend/src/node_modules/postcss-syntax/get-lang.js -third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/progress/package.json third_party/devtools-frontend/src/node_modules/pump/package.json third_party/devtools-frontend/src/node_modules/puppeteer/lib/cjs/puppeteer/common/ExecutionContext.js @@ -7654,17 +7760,12 @@ third_party/devtools-frontend/src/node_modules/ramda/src/reduceRight.js third_party/devtools-frontend/src/node_modules/randombytes/browser.js third_party/devtools-frontend/src/node_modules/raw-body/package.json third_party/devtools-frontend/src/node_modules/read-pkg-up/package.json -third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/package.json third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/package.json third_party/devtools-frontend/src/node_modules/read-pkg/package.json third_party/devtools-frontend/src/node_modules/readable-stream/errors-browser.js third_party/devtools-frontend/src/node_modules/readable-stream/errors.js third_party/devtools-frontend/src/node_modules/redent/package.json third_party/devtools-frontend/src/node_modules/regenerator-runtime/runtime.js -third_party/devtools-frontend/src/node_modules/remark-parse/package.json -third_party/devtools-frontend/src/node_modules/remark-stringify/package.json -third_party/devtools-frontend/src/node_modules/remark/package.json -third_party/devtools-frontend/src/node_modules/repeat-string/package.json third_party/devtools-frontend/src/node_modules/require-directory/package.json third_party/devtools-frontend/src/node_modules/require-from-string/package.json third_party/devtools-frontend/src/node_modules/requireindex/package.json @@ -7678,6 +7779,7 @@ third_party/devtools-frontend/src/node_modules/rollup/dist/shared/rollup.js third_party/devtools-frontend/src/node_modules/safer-buffer/package.json third_party/devtools-frontend/src/node_modules/shebang-command/package.json third_party/devtools-frontend/src/node_modules/shebang-regex/package.json +third_party/devtools-frontend/src/node_modules/side-channel/package.json third_party/devtools-frontend/src/node_modules/sinon/lib/sinon/proxy-invoke.js third_party/devtools-frontend/src/node_modules/sinon/lib/sinon/util/core/extend.js third_party/devtools-frontend/src/node_modules/sinon/node_modules/has-flag/package.json @@ -7693,6 +7795,12 @@ third_party/devtools-frontend/src/node_modules/slice-ansi/node_modules/is-fullwi 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 third_party/devtools-frontend/src/node_modules/source-map-support/source-map-support.js third_party/devtools-frontend/src/node_modules/source-map/dist/source-map.debug.js third_party/devtools-frontend/src/node_modules/source-map/dist/source-map.js @@ -7700,7 +7808,6 @@ third_party/devtools-frontend/src/node_modules/source-map/lib/base64-vlq.js third_party/devtools-frontend/src/node_modules/source-map/lib/source-map-consumer.js 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/sprintf-js/demo/angular.html 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/package.json @@ -7711,19 +7818,15 @@ 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/utils/isNonNegativeInteger.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/ansi-styles/package.json -third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/package.json -third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/package.json -third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/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/slash/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/stylelint/node_modules/supports-color/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 @@ -7782,15 +7885,27 @@ third_party/devtools-frontend/src/node_modules/toidentifier/package.json third_party/devtools-frontend/src/node_modules/treeify/package.json third_party/devtools-frontend/src/node_modules/treeify/treeify.js third_party/devtools-frontend/src/node_modules/trim-newlines/package.json -third_party/devtools-frontend/src/node_modules/trough/package.json third_party/devtools-frontend/src/node_modules/tsconfig-paths/node_modules/json5/package.json third_party/devtools-frontend/src/node_modules/type-fest/package.json +third_party/devtools-frontend/src/node_modules/typescript/lib/cs/diagnosticMessages.generated.json +third_party/devtools-frontend/src/node_modules/typescript/lib/de/diagnosticMessages.generated.json +third_party/devtools-frontend/src/node_modules/typescript/lib/es/diagnosticMessages.generated.json +third_party/devtools-frontend/src/node_modules/typescript/lib/fr/diagnosticMessages.generated.json +third_party/devtools-frontend/src/node_modules/typescript/lib/it/diagnosticMessages.generated.json +third_party/devtools-frontend/src/node_modules/typescript/lib/ja/diagnosticMessages.generated.json +third_party/devtools-frontend/src/node_modules/typescript/lib/ko/diagnosticMessages.generated.json +third_party/devtools-frontend/src/node_modules/typescript/lib/pl/diagnosticMessages.generated.json +third_party/devtools-frontend/src/node_modules/typescript/lib/pt-br/diagnosticMessages.generated.json +third_party/devtools-frontend/src/node_modules/typescript/lib/ru/diagnosticMessages.generated.json +third_party/devtools-frontend/src/node_modules/typescript/lib/tr/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/tsc.js third_party/devtools-frontend/src/node_modules/typescript/lib/tsserver.js third_party/devtools-frontend/src/node_modules/typescript/lib/tsserverlibrary.js third_party/devtools-frontend/src/node_modules/typescript/lib/typescript.js third_party/devtools-frontend/src/node_modules/typescript/lib/typescriptServices.js third_party/devtools-frontend/src/node_modules/typescript/lib/typingsInstaller.js +third_party/devtools-frontend/src/node_modules/typescript/lib/zh-cn/diagnosticMessages.generated.json +third_party/devtools-frontend/src/node_modules/typescript/lib/zh-tw/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/ua-parser-js/package.json third_party/devtools-frontend/src/node_modules/uglify-js/lib/ast.js third_party/devtools-frontend/src/node_modules/uglify-js/lib/compress.js @@ -7805,18 +7920,12 @@ third_party/devtools-frontend/src/node_modules/uglify-js/lib/utils.js third_party/devtools-frontend/src/node_modules/uglify-js/package.json third_party/devtools-frontend/src/node_modules/unbox-primitive/package.json third_party/devtools-frontend/src/node_modules/unbzip2-stream/lib/bzip2.js -third_party/devtools-frontend/src/node_modules/unified/package.json -third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/package.json -third_party/devtools-frontend/src/node_modules/unist-util-is/package.json -third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/package.json third_party/devtools-frontend/src/node_modules/uri-js/dist/es5/uri.all.js third_party/devtools-frontend/src/node_modules/uri-js/dist/esnext/uri.js third_party/devtools-frontend/src/node_modules/uri-js/package.json third_party/devtools-frontend/src/node_modules/utils-merge/package.json third_party/devtools-frontend/src/node_modules/v8-compile-cache/package.json third_party/devtools-frontend/src/node_modules/validate-npm-package-license/package.json -third_party/devtools-frontend/src/node_modules/vfile-message/package.json -third_party/devtools-frontend/src/node_modules/vfile/package.json third_party/devtools-frontend/src/node_modules/which-boxed-primitive/package.json third_party/devtools-frontend/src/node_modules/word-wrap/package.json third_party/devtools-frontend/src/node_modules/workerpool/dist/worker.js @@ -7836,7 +7945,6 @@ third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/p 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/node_modules/zwitch/package.json third_party/devtools-frontend/src/package.json third_party/devtools-frontend/src/scripts/build/compress_files.js third_party/devtools-frontend/src/scripts/check_external_links.js @@ -8840,6 +8948,7 @@ third_party/ffmpeg/libavfilter/vf_yadif.c third_party/ffmpeg/libavfilter/vmaf_motion.h third_party/ffmpeg/libavfilter/x86/avf_showcqt_init.c third_party/ffmpeg/libavfilter/x86/colorspacedsp_init.c +third_party/ffmpeg/libavfilter/x86/vf_lut3d_init.c third_party/ffmpeg/libavfilter/x86/vf_psnr_init.c third_party/ffmpeg/libavfilter/x86/vf_ssim_init.c third_party/ffmpeg/libavfilter/yadif_common.c @@ -8918,8 +9027,11 @@ third_party/ffmpeg/tests/checkasm/vp9dsp.c third_party/ffmpeg/tools/target_dec_fuzzer.c third_party/flatbuffers/src/android/app/src/main/cpp/CMakeLists.txt third_party/flatbuffers/src/android/app/src/main/cpp/flatbuffers/CMakeLists.txt +third_party/flatbuffers/src/benchmarks/cpp/flatbuffers/fb_bench.cpp +third_party/flatbuffers/src/benchmarks/cpp/raw/raw_bench.cpp third_party/flatbuffers/src/docs/footer.html third_party/flatbuffers/src/docs/header.html +third_party/flatbuffers/src/src/idl_gen_csharp.cpp third_party/fontconfig/src/src/fcfreetype.c third_party/fp16/src/third-party/eigen-half.h third_party/freetype-testing/src/fuzzing/src/utils/utils.cpp @@ -9203,9 +9315,6 @@ third_party/google-closure-library/doc/js/article.js third_party/google-closure-library/package.json third_party/google-closure-library/scripts/generate_deps_js.js third_party/google-closure-library/third_party/closure/goog/mochikit/async/deferred.js -third_party/google_appengine_cloudstorage/cloudstorage/cloudstorage_api.py -third_party/google_appengine_cloudstorage/cloudstorage/errors.py -third_party/google_appengine_cloudstorage/cloudstorage/storage_api.py third_party/google_input_tools/src/chrome/os/inputview/adapter.js third_party/google_input_tools/src/chrome/os/inputview/canvas.js third_party/google_input_tools/src/chrome/os/inputview/dom.js @@ -9294,8 +9403,10 @@ third_party/googletest/src/googletest/test/gtest_list_output_unittest_.cc third_party/googletest/src/googletest/test/gtest_skip_test.cc third_party/grpc/src/include/grpc/grpc.h third_party/grpc/src/include/grpc/grpc_security_constants.h +third_party/grpc/src/include/grpcpp/create_channel_binder.h third_party/grpc/src/include/grpcpp/impl/codegen/proto_buffer_reader.h third_party/grpc/src/include/grpcpp/impl/codegen/proto_buffer_writer.h +third_party/grpc/src/include/grpcpp/security/binder_security_policy.h third_party/grpc/src/package.xml third_party/grpc/src/setup.py third_party/grpc/src/src/boringssl/gen_build_yaml.py @@ -9414,6 +9525,7 @@ third_party/harfbuzz-ng/src/src/hb-ot-meta.h third_party/harfbuzz-ng/src/src/hb-ot-metrics.h third_party/harfbuzz-ng/src/src/hb-ot-name-language-static.hh third_party/harfbuzz-ng/src/src/hb-ot-name-table.hh +third_party/harfbuzz-ng/src/src/hb-ot-name.h third_party/harfbuzz-ng/src/src/hb-ot-os2-table.hh third_party/harfbuzz-ng/src/src/hb-ot-post-table-v2subset.hh third_party/harfbuzz-ng/src/src/hb-ot-post-table.hh @@ -9493,7 +9605,6 @@ third_party/icu/filters/common.json third_party/icu/filters/flutter.json third_party/icu/filters/ios.json third_party/icu/icu.gyp -third_party/icu/readme.html third_party/icu/source/common/bytestream.cpp third_party/icu/source/common/locmap.cpp third_party/icu/source/common/stringpiece.cpp @@ -9512,10 +9623,16 @@ third_party/icu/source/data/translit/xh_xh_FONIPA.txt third_party/icu/source/data/translit/zu_zu_FONIPA.txt third_party/icu/source/data/unidata/changes.txt third_party/icu/source/i18n/unicode/numberformatter.h +third_party/icu/source/test/intltest/numberformattesttuple.h +third_party/icu/source/test/intltest/strcase.cpp +third_party/icu/source/test/intltest/uobjtest.cpp +third_party/icu/source/test/perf/collationperf/collperf.cpp +third_party/icu/source/test/perf/collationperf/readme.html +third_party/icu/source/test/perf/ubrkperf/ubrkperfold.cpp +third_party/icu/source/test/testdata/numberformattestspecification.txt third_party/icu/source/tools/toolutil/pkg_genc.cpp third_party/inspector_protocol/crdtp/cbor.cc third_party/inspector_protocol/crdtp/json.cc -third_party/inspector_protocol/crdtp/serializer_traits_test.cc third_party/inspector_protocol/roll.py third_party/instrumented_libraries/focal/BUILD.gn third_party/instrumented_libraries/xenial/BUILD.gn @@ -9649,6 +9766,7 @@ third_party/liblouis/src/tools/brl_checks.c third_party/liblouis/src/tools/brl_checks.h third_party/liblouis/src/tools/gnulib/getprogname.c third_party/liblouis/src/tools/gnulib/msvc-inval.h +third_party/liblouis/wasm/liblouis_wasm.js third_party/libphonenumber/dist/cpp/src/phonenumbers/phonenumbermatcher.h third_party/libphonenumber/dist/cpp/test/phonenumbers/phonenumberutil_test.cc third_party/libphonenumber/dist/java/demo/war/WEB-INF/appengine-web.xml @@ -9667,7 +9785,7 @@ third_party/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc third_party/libprotobuf-mutator/src/examples/libfuzzer/libfuzzer_bin_example.cc third_party/libprotobuf-mutator/src/examples/libfuzzer/libfuzzer_example.cc third_party/libprotobuf-mutator/src/src/mutator_test.cc -third_party/liburlpattern/tokenize.cc +third_party/liburlpattern/utils.cc third_party/libusb/src/libusb/os/threads_windows.c third_party/libusb/src/libusb/os/threads_windows.h third_party/libusb/src/libusb/os/wince_usb.c @@ -9844,6 +9962,7 @@ third_party/llvm/clang/include/clang/Format/Format.h third_party/llvm/clang/include/clang/StaticAnalyzer/Frontend/CheckerRegistry.h third_party/llvm/clang/lib/AST/ASTContext.cpp third_party/llvm/clang/lib/Basic/Targets/AArch64.cpp +third_party/llvm/clang/lib/Basic/Targets/OSTargets.cpp third_party/llvm/clang/lib/CodeGen/CGBuiltin.cpp third_party/llvm/clang/lib/CodeGen/CodeGenModule.cpp third_party/llvm/clang/lib/Format/Format.cpp @@ -10095,8 +10214,6 @@ third_party/nearby/src/cpp/platform/api/ble_v2.h third_party/nearby/src/cpp/platform/api/bluetooth_adapter.h third_party/nearby/src/cpp/platform/api/bluetooth_classic.h third_party/nearby/src/cpp/platform/api/platform.h -third_party/nearby/src/cpp/platform/api/wifi_lan.h -third_party/nearby/src/cpp/platform/api/wifi_lan_v2.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 @@ -10112,6 +10229,8 @@ third_party/nearby/src/cpp/platform/impl/windows/bluetooth_classic_server_socket third_party/nearby/src/cpp/platform/impl/windows/bluetooth_classic_socket.cc third_party/nearby/src/cpp/platform/impl/windows/bluetooth_classic_socket.h third_party/nearby/src/cpp/platform/impl/windows/generated/winrt/Windows.Foundation.h +third_party/nearby/src/cpp/platform/impl/windows/platform.cc +third_party/nearby/src/cpp/platform/impl/windows/test_utils.cc third_party/nearby/src/cpp/platform/impl/windows/thread_pool.cc third_party/nearby/src/cpp/platform/public/bluetooth_adapter.h third_party/nearby/src/cpp/platform/public/bluetooth_classic.h @@ -10576,6 +10695,7 @@ 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/src/android_internal/health_hal.cc +third_party/perfetto/src/base/flat_hash_map_benchmark.cc third_party/perfetto/src/base/utils.cc third_party/perfetto/src/profiling/common/proc_utils.cc third_party/perfetto/src/profiling/memory/client.cc @@ -10589,7 +10709,8 @@ third_party/perfetto/src/trace_processor/forwarding_trace_parser.cc third_party/perfetto/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.h 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/metrics/chrome/rail_modes.sql +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 @@ -11475,6 +11596,7 @@ third_party/skia/infra/bots/recipes/upload_nano_results.py third_party/skia/infra/bots/run_recipe.py third_party/skia/infra/bots/tasks.json third_party/skia/infra/bots/utils.py +third_party/skia/modules/canvaskit/gpu.js third_party/skia/modules/canvaskit/htmlcanvas/canvas2dcontext.js third_party/skia/modules/canvaskit/htmlcanvas/font.js third_party/skia/modules/canvaskit/htmlcanvas/path2d.js @@ -11524,14 +11646,15 @@ third_party/skia/src/gpu/GrRenderTask.h third_party/skia/src/gpu/GrShaderCaps.h third_party/skia/src/gpu/d3d/GrD3DCaps.cpp third_party/skia/src/gpu/effects/GrDisableColorXP.cpp -third_party/skia/src/gpu/geometry/GrPathUtils.cpp third_party/skia/src/gpu/gl/GrGLCaps.cpp third_party/skia/src/gpu/gl/GrGLCaps.h third_party/skia/src/gpu/gl/GrGLGpu.cpp +third_party/skia/src/gpu/tessellate/Tessellation.cpp third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp third_party/skia/src/images/SkWebpEncoder.cpp third_party/skia/src/pathops/SkOpAngle.cpp third_party/skia/src/pathops/SkPathOpsOp.cpp +third_party/skia/src/pdf/SkPDFFont.cpp third_party/skia/src/ports/SkFontHost_FreeType.cpp third_party/skia/src/ports/SkFontHost_win.cpp third_party/skia/src/ports/SkFontMgr_mac_ct.cpp @@ -11628,13 +11751,12 @@ third_party/swiftshader/CONTRIBUTORS.txt third_party/swiftshader/extensions/EGL_ANGLE_iosurface_client_buffer.txt third_party/swiftshader/src/Device/BC_Decoder.cpp third_party/swiftshader/src/OpenGL/compiler/preprocessor/Tokenizer.cpp -third_party/swiftshader/src/OpenGL/libEGL/CMakeLists.txt -third_party/swiftshader/src/OpenGL/libGLESv2/CMakeLists.txt third_party/swiftshader/src/Shader/Shader.hpp third_party/swiftshader/src/System/Synchronization.hpp third_party/swiftshader/tests/ReactorUnitTests/ReactorUnitTests.cpp third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/spir-v.xml third_party/swiftshader/third_party/SPIRV-Tools/PRESUBMIT.py +third_party/swiftshader/third_party/SPIRV-Tools/tools/fuzz/fuzz.cpp third_party/swiftshader/third_party/SPIRV-Tools/tools/sva/package.json third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/BinaryFormat/COFF.h third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/BinaryFormat/ELF.h @@ -11820,6 +11942,7 @@ third_party/tflite/src/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_ third_party/tflite/src/tensorflow/compiler/xla/service/hlo_graph_dumper.cc third_party/tflite/src/tensorflow/compiler/xla/service/hlo_verifier.cc third_party/tflite/src/tensorflow/core/common_runtime/accumulate_n_optimizer.cc +third_party/tflite/src/tensorflow/core/distributed_runtime/error_payloads.h third_party/tflite/src/tensorflow/core/kernels/decode_proto_op.cc third_party/tflite/src/tensorflow/core/kernels/example_parsing_ops.cc third_party/tflite/src/tensorflow/core/kernels/image/decode_image_op.cc @@ -11865,6 +11988,7 @@ third_party/tflite/src/tensorflow/lite/tools/benchmark/experimental/firebase/and third_party/tflite/src/tensorflow/lite/tutorials/dataset.py third_party/tflite/src/tensorflow/python/eager/profiler.py third_party/tflite/src/tensorflow/python/framework/graph_to_function_def.py +third_party/tflite/src/tensorflow/python/framework/ops.py third_party/tflite/src/tensorflow/python/framework/test_util_test.py third_party/tflite/src/tensorflow/python/keras/layers/recurrent.py third_party/tflite/src/tensorflow/python/keras/optimizer_v2/ftrl.py @@ -11884,7 +12008,6 @@ 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/tlslite/tests/tlstest.py third_party/updater/chromium_mac_amd64/3pp/fetch.py third_party/updater/chromium_mac_arm64/3pp/fetch.py third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp @@ -11973,6 +12096,7 @@ third_party/vulkan-deps/vulkan-validation-layers/src/tests/layer_validation_test third_party/vulkan-deps/vulkan-validation-layers/src/tests/layer_validation_tests.h third_party/vulkan-deps/vulkan-validation-layers/src/tests/positive/command.cpp third_party/vulkan-deps/vulkan-validation-layers/src/tests/positive/descriptors.cpp +third_party/vulkan-deps/vulkan-validation-layers/src/tests/positive/dynamic_rendering.cpp third_party/vulkan-deps/vulkan-validation-layers/src/tests/positive/image_buffer.cpp third_party/vulkan-deps/vulkan-validation-layers/src/tests/positive/instance.cpp third_party/vulkan-deps/vulkan-validation-layers/src/tests/positive/other.cpp @@ -11993,8 +12117,6 @@ third_party/vulkan-deps/vulkan-validation-layers/src/tests/vklayertests_pipeline third_party/vulkan-deps/vulkan-validation-layers/src/tests/vklayertests_wsi.cpp third_party/vulkan-deps/vulkan-validation-layers/src/tests/vksyncvaltests.cpp third_party/vulkan-deps/vulkan-validation-layers/src/tests/vktestframework.cpp -third_party/vulkan_memory_allocator/docs/html/vk__mem__alloc_8h_source.html -third_party/vulkan_memory_allocator/include/vk_mem_alloc.h third_party/wayland-protocols/gtk/.gitlab-ci/pages/fonts.css third_party/wayland-protocols/gtk/.gitlab-ci/pages/index.html third_party/wayland-protocols/gtk/demos/gtk-demo/links.c @@ -12450,7 +12572,6 @@ third_party/webrtc/rtc_base/timestamp_aligner_unittest.cc 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_socket_server_unittest.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 @@ -12484,6 +12605,7 @@ third_party/webrtc/tools_webrtc/sanitizers/lsan_suppressions_webrtc.cc third_party/webrtc/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc third_party/webrtc/video/end_to_end_tests/retransmission_tests.cc third_party/webrtc/video/end_to_end_tests/rtp_rtcp_tests.cc +third_party/webrtc/video/frame_cadence_adapter.cc third_party/webrtc/video/full_stack_tests.cc third_party/webrtc/video/pc_full_stack_tests.cc third_party/webrtc/video/rtp_video_stream_receiver.h @@ -12548,6 +12670,9 @@ third_party/xdg-utils/scripts/desc/xdg-settings.xml third_party/zlib/deflate.c third_party/zlib/google/compression_utils_portable.cc third_party/zlib/google/zip_reader.h +tools/accessibility/codereview/download_issue.py +tools/accessibility/codereview/mph.py +tools/accessibility/inspect/ax_utils.cc tools/accessibility/nvda/README.txt tools/android/android_studio/ChromiumInspections.xml tools/android/avd/3pp/fetch.py @@ -12571,12 +12696,12 @@ tools/android/modularization/convenience/touch_resources.py tools/android/modularization/gn/json_gn_editor.py tools/android/native_lib_memory/PRESUBMIT.py tools/android/sdk_updater/update_sdk.py +tools/android/test_health/PRESUBMIT.py tools/android/tracing/systrace-extract-startup.py 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/html_report.py tools/binary_size/libsupersize/static/auth-consts.js tools/binary_size/libsupersize/static/index.html tools/binary_size/libsupersize/static/index.js @@ -12624,6 +12749,16 @@ tools/cygprofile/orderfile_generator_backend.py tools/disable_tests/PRESUBMIT.py tools/disable_tests/disable.py tools/disable_tests/resultdb.py +tools/disable_tests/tests/expectations-basic.json +tools/disable_tests/tests/expectations-virtual-conditional-to-unconditional.json +tools/disable_tests/tests/gtest-add-extra-condition.json +tools/disable_tests/tests/gtest-backslash-in-input.json +tools/disable_tests/tests/gtest-basic.json +tools/disable_tests/tests/gtest-conditional-to-unconditional.json +tools/disable_tests/tests/gtest-conditional.json +tools/disable_tests/tests/gtest-partial-test-name.json +tools/disable_tests/tests/gtest-redundant-conditions.json +tools/disable_tests/tests/parameterised-gtest.json tools/download_optimization_profile.py tools/dromaeo_benchmark_runner/dromaeo_benchmark_runner.py tools/emacs/trybot-mac.txt @@ -12700,7 +12835,7 @@ tools/json_to_struct/PRESUBMIT.py tools/licenses.py tools/linux/PRESUBMIT.py tools/mac/download_symbols.py -tools/mac/power/generate_scripts.py +tools/mac/power/scenarios.py tools/mb/mb.py tools/mb/mb_config.pyl tools/md_browser/base.css @@ -12750,11 +12885,12 @@ tools/metrics/histograms/metadata/content_creation/histograms.xml tools/metrics/histograms/metadata/cookie/histograms.xml tools/metrics/histograms/metadata/cras/histograms.xml tools/metrics/histograms/metadata/cros/histograms.xml +tools/metrics/histograms/metadata/cros_ml/histograms.xml tools/metrics/histograms/metadata/cross_device/histograms.xml tools/metrics/histograms/metadata/crostini/histograms.xml tools/metrics/histograms/metadata/cryptohome/histograms.xml tools/metrics/histograms/metadata/custom_tabs/histograms.xml -tools/metrics/histograms/metadata/data_reduction_proxy/histograms.xml +tools/metrics/histograms/metadata/data/histograms.xml tools/metrics/histograms/metadata/dev/histograms.xml tools/metrics/histograms/metadata/diagnostics/histograms.xml tools/metrics/histograms/metadata/direct/histograms.xml @@ -12782,6 +12918,7 @@ tools/metrics/histograms/metadata/installer/histograms.xml tools/metrics/histograms/metadata/interstitial/histograms.xml tools/metrics/histograms/metadata/invalidation/histograms.xml tools/metrics/histograms/metadata/ios/histograms.xml +tools/metrics/histograms/metadata/language/histograms.xml tools/metrics/histograms/metadata/leveldb_proto/histograms.xml tools/metrics/histograms/metadata/local/histograms.xml tools/metrics/histograms/metadata/login/histograms.xml @@ -12805,10 +12942,12 @@ tools/metrics/histograms/metadata/page/histograms.xml tools/metrics/histograms/metadata/password/histograms.xml tools/metrics/histograms/metadata/payment/histograms.xml tools/metrics/histograms/metadata/pcscan/histograms.xml +tools/metrics/histograms/metadata/pdf/histograms.xml tools/metrics/histograms/metadata/permissions/histograms.xml tools/metrics/histograms/metadata/phonehub/histograms.xml tools/metrics/histograms/metadata/platform/histograms.xml tools/metrics/histograms/metadata/plugin/histograms.xml +tools/metrics/histograms/metadata/plugin_vm/histograms.xml tools/metrics/histograms/metadata/power/histograms.xml tools/metrics/histograms/metadata/prefetch/histograms.xml tools/metrics/histograms/metadata/print/histograms.xml @@ -13210,7 +13349,6 @@ 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/cursor/win/win_cursor.cc ui/base/dragdrop/os_exchange_data_unittest.cc ui/base/dragdrop/os_exchange_data_win_unittest.cc ui/base/ime/PRESUBMIT.py @@ -13227,6 +13365,7 @@ ui/base/resource/resource_bundle.h ui/base/test/skia_gold_matching_algorithm.h ui/base/win/event_creation_utils.cc ui/base/win/lock_state.cc +ui/base/win/win_cursor.cc ui/chromeos/file_manager_strings.grdp ui/compositor/layer_owner.cc ui/display/display_transform.cc @@ -13391,6 +13530,7 @@ v8/src/snapshot/embedded/platform-embedded-file-writer-win.cc v8/src/third_party/siphash/halfsiphash.cc v8/src/third_party/siphash/halfsiphash.h v8/src/third_party/utf8-decoder/utf8-decoder.h +v8/src/torque/source-positions.h v8/src/tracing/trace-event.h v8/src/trap-handler/handler-inside-posix.cc v8/src/trap-handler/handler-inside-win.cc @@ -13446,6 +13586,7 @@ v8/tools/v8windbg/test/debug-callbacks.h v8/tools/v8windbg/test/v8windbg-test.cc v8/tools/visual_studio/README.txt v8/tools/zone-stats/index.html +weblayer/browser/android/javatests/AndroidManifest_bundle.xml weblayer/browser/android/javatests/skew/build_weblayer_instrumentation_test_cipd_pkg.py weblayer/browser/background_fetch/background_fetch_delegate_impl.cc weblayer/browser/favicon/favicon_backend_wrapper_unittest.cc @@ -13456,6 +13597,3 @@ weblayer/browser/weblayer_security_blocking_page_factory.cc weblayer/browser/weblayer_variations_http_browsertest.cc weblayer/public/prerender_controller.h weblayer/shell/app/shell_main_params.cc -weblayer/test/data/link_with_intent_to_package_in_new_tab.html -weblayer/test/data/link_with_intent_to_package_in_same_tab.html -weblayer/test/data/page_that_intents_to_package_on_load.html diff --git a/flags.gn b/flags.gn index 60d8508c..f2bf29cd 100644 --- a/flags.gn +++ b/flags.gn @@ -7,7 +7,6 @@ enable_js_type_check=false enable_mdns=false enable_mse_mpeg2ts_stream_parser=true enable_nacl=false -enable_nacl_nonsfi=false enable_one_click_signin=false enable_reading_list=false enable_remoting=false diff --git a/patches/core/debian/disable/unrar.patch b/patches/core/debian/disable/unrar.patch index 51aa2b88..c42b86b3 100644 --- a/patches/core/debian/disable/unrar.patch +++ b/patches/core/debian/disable/unrar.patch @@ -65,15 +65,15 @@ bug: http://bugs.debian.org/914487 --- a/chrome/services/file_util/safe_archive_analyzer.cc +++ b/chrome/services/file_util/safe_archive_analyzer.cc -@@ -7,7 +7,6 @@ - #include "base/macros.h" +@@ -6,7 +6,6 @@ + #include "build/build_config.h" #include "chrome/common/safe_browsing/archive_analyzer_results.h" -#include "chrome/common/safe_browsing/rar_analyzer.h" #include "chrome/common/safe_browsing/zip_analyzer.h" #if defined(OS_MAC) -@@ -47,8 +46,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile +@@ -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 5d89e3ee..74be757f 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 -@@ -2208,7 +2208,6 @@ static_library("browser") { +@@ -2204,7 +2204,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", -@@ -3740,8 +3739,6 @@ static_library("browser") { +@@ -3758,8 +3757,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -19,7 +19,7 @@ "download/download_dir_util.cc", --- a/chrome/browser/browser_process.h +++ b/chrome/browser/browser_process.h -@@ -55,10 +55,6 @@ class NetworkQualityTracker; +@@ -53,10 +53,6 @@ class NetworkQualityTracker; class SharedURLLoaderFactory; } @@ -30,7 +30,7 @@ namespace subresource_filter { class RulesetService; } -@@ -218,9 +214,6 @@ class BrowserProcess { +@@ -213,9 +209,6 @@ class BrowserProcess { // on this platform (or this is a unit test). virtual StatusTray* status_tray() = 0; @@ -42,7 +42,7 @@ virtual subresource_filter::RulesetService* --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -70,7 +70,6 @@ +@@ -69,7 +69,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" -@@ -396,8 +395,6 @@ void BrowserProcessImpl::StartTearDown() +@@ -395,8 +394,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(); -@@ -1031,14 +1028,6 @@ StatusTray* BrowserProcessImpl::status_t +@@ -1021,14 +1018,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_); -@@ -1302,26 +1291,6 @@ void BrowserProcessImpl::CreateBackgroun +@@ -1282,26 +1271,6 @@ void BrowserProcessImpl::CreateBackgroun #endif } @@ -103,7 +103,7 @@ created_subresource_filter_ruleset_service_ = true; --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -190,7 +190,6 @@ class BrowserProcessImpl : public Browse +@@ -189,7 +189,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr manager) override; #endif StatusTray* status_tray() override; @@ -111,7 +111,7 @@ subresource_filter::RulesetService* subresource_filter_ruleset_service() override; federated_learning::FlocSortingLshClustersService* -@@ -344,9 +343,6 @@ class BrowserProcessImpl : public Browse +@@ -339,9 +338,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr background_mode_manager_; #endif @@ -123,7 +123,7 @@ 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 -@@ -70,7 +70,6 @@ +@@ -66,7 +66,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_keep_alive_types.h" #include "chrome/browser/profiles/scoped_profile_keep_alive.h" @@ -131,7 +131,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/share/share_history.h" #include "chrome/browser/share/share_ranking.h" -@@ -643,10 +642,6 @@ void ChromeBrowsingDataRemoverDelegate:: +@@ -633,10 +632,6 @@ void ChromeBrowsingDataRemoverDelegate:: base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -144,7 +144,7 @@ delete_begin, delete_end, filter_builder, host_content_settings_map_, --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -929,34 +929,6 @@ void SetApplicationLocaleOnIOThread(cons +@@ -936,34 +936,6 @@ void SetApplicationLocaleOnIOThread(cons GetIOThreadApplicationLocale() = locale; } @@ -173,13 +173,13 @@ - } - - private: -- CertificateReportingService* service_; +- raw_ptr service_; -}; - #if BUILDFLAG(ENABLE_EXTENSIONS) AppLoadedInTabSource ClassifyAppLoadedInTabSource( -@@ -1438,7 +1410,6 @@ void ChromeContentBrowserClient::PostAft +@@ -1450,7 +1422,6 @@ void ChromeContentBrowserClient::PostAft InitNetworkContextsParentDirectory(); DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -187,7 +187,7 @@ } bool ChromeContentBrowserClient::IsBrowserStartupComplete() { -@@ -4229,7 +4200,7 @@ ChromeContentBrowserClient::CreateThrott +@@ -4252,7 +4223,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))); -@@ -4258,16 +4229,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -4281,16 +4252,6 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -238,7 +238,7 @@ } // namespace --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -436,13 +436,6 @@ ChromeDownloadManagerDelegate::~ChromeDo +@@ -435,13 +435,6 @@ ChromeDownloadManagerDelegate::~ChromeDo void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) { download_manager_ = dm; @@ -252,7 +252,7 @@ } #if defined(OS_ANDROID) -@@ -791,16 +784,6 @@ void ChromeDownloadManagerDelegate::Choo +@@ -790,16 +783,6 @@ void ChromeDownloadManagerDelegate::Choo void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( base::FilePath* filename) { @@ -459,7 +459,7 @@ --- a/chrome/browser/extensions/api/downloads/downloads_api.h +++ b/chrome/browser/extensions/api/downloads/downloads_api.h @@ -13,7 +13,6 @@ - #include "base/macros.h" + #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h" -#include "chrome/browser/download/download_danger_prompt.h" @@ -537,7 +537,7 @@ referrer_entries))); --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -683,18 +683,6 @@ void WebstorePrivateBeginInstallWithMani +@@ -682,18 +682,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -556,7 +556,7 @@ } void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone( -@@ -1159,52 +1147,9 @@ WebstorePrivateGetReferrerChainFunction: +@@ -1158,52 +1146,9 @@ WebstorePrivateGetReferrerChainFunction: ExtensionFunction::ResponseAction WebstorePrivateGetReferrerChainFunction::Run() { @@ -663,7 +663,7 @@ std::unique_ptr response_body) { --- a/chrome/browser/extensions/blocklist_state_fetcher.h +++ b/chrome/browser/extensions/blocklist_state_fetcher.h -@@ -37,8 +37,6 @@ class BlocklistStateFetcher { +@@ -36,8 +36,6 @@ class BlocklistStateFetcher { virtual void Request(const std::string& id, RequestCallback callback); @@ -672,7 +672,7 @@ protected: void OnURLLoaderComplete(network::SimpleURLLoader* url_loader, std::unique_ptr response_body); -@@ -57,7 +55,6 @@ class BlocklistStateFetcher { +@@ -56,7 +54,6 @@ class BlocklistStateFetcher { void SendRequest(const std::string& id); @@ -682,7 +682,7 @@ // SimpleURLLoader -> (owned loader, extension id). --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -824,9 +824,6 @@ void ChromeMetricsServiceClient::Registe +@@ -825,9 +825,6 @@ void ChromeMetricsServiceClient::Registe metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -706,7 +706,7 @@ // static --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -298,7 +298,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -307,7 +307,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(IS_CHROMEOS_LACROS) CertDbInitializerFactory::GetInstance(); #endif @@ -744,7 +744,7 @@ CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false), --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc -@@ -259,9 +259,6 @@ void RemoveBrowsingDataForProfile(const +@@ -253,9 +253,6 @@ void RemoveBrowsingDataForProfile(const // The BrowsingDataRemover relies on many objects that aren't created in unit // tests. Previously this code would depend on content::ResourceDispatcherHost // but that's gone, so do a similar hack for now. @@ -764,7 +764,7 @@ sources = [ "chrome_controller_client.cc", "chrome_controller_client.h", -@@ -88,6 +89,7 @@ static_library("safe_browsing") { +@@ -89,6 +90,7 @@ static_library("safe_browsing") { "//extensions/browser", ] } @@ -772,7 +772,7 @@ if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode -@@ -414,6 +416,7 @@ static_library("advanced_protection") { +@@ -440,6 +442,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", -@@ -431,6 +434,7 @@ source_set("metrics_collector") { +@@ -457,6 +460,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -790,7 +790,7 @@ source_set("test_support") { --- a/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc -@@ -210,89 +210,6 @@ bool SecurityStateTabHelper::UsedPolicyI +@@ -180,89 +180,6 @@ bool SecurityStateTabHelper::UsedPolicyI security_state::MaliciousContentStatus SecurityStateTabHelper::GetMaliciousContentStatus() const { @@ -882,7 +882,7 @@ --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -3957,7 +3957,6 @@ static_library("ui") { +@@ -4061,7 +4061,6 @@ static_library("ui") { "views/device_chooser_content_view.h", "views/devtools_process_observer.cc", "views/devtools_process_observer.h", @@ -892,7 +892,7 @@ "views/download/download_item_view.cc", --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -343,16 +343,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -353,22 +353,6 @@ void TabHelpers::AttachTabHelpers(WebCon // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); @@ -901,6 +901,12 @@ - safe_browsing::SafeBrowsingNavigationObserverManagerFactory:: - GetForBrowserContext(profile), - profile->GetPrefs(), g_browser_process->safe_browsing_service()); +- if (base::FeatureList::IsEnabled( +- safe_browsing::kTailoredSecurityIntegration)) { +- safe_browsing::TailoredSecurityUrlObserver::CreateForWebContents( +- web_contents, +- safe_browsing::TailoredSecurityServiceFactory::GetForProfile(profile)); +- } - safe_browsing::SafeBrowsingTabObserver::CreateForWebContents( - web_contents, - std::make_unique()); @@ -991,7 +997,7 @@ +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h @@ -12,7 +12,6 @@ - #include "base/macros.h" + #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/download/download_danger_prompt.h" #include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h" @@ -1018,7 +1024,7 @@ bool IsDeletingHistoryAllowed(); --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -281,116 +281,6 @@ CreateHttpsOnlyModePage(content::WebCont +@@ -268,116 +268,6 @@ CreateHttpsOnlyModePage(content::WebCont request_url)); } @@ -1135,16 +1141,16 @@ #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) std::unique_ptr CreateCaptivePortalBlockingPage( content::WebContents* web_contents) { -@@ -507,8 +397,6 @@ void InterstitialHTMLSource::StartDataRe +@@ -492,8 +382,6 @@ void InterstitialHTMLSource::StartDataRe + interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents); + } else if (path_without_query == "/blocked-interception") { interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents); - } else if (path_without_query == "/legacy-tls") { - interstitial_delegate = CreateLegacyTLSBlockingPage(web_contents); - } else if (path_without_query == "/safebrowsing") { - interstitial_delegate = CreateSafeBrowsingBlockingPage(web_contents); } else if (path_without_query == "/clock") { interstitial_delegate = CreateBadClockBlockingPage(web_contents); } else if (path_without_query == "/lookalike") { -@@ -525,16 +413,12 @@ void InterstitialHTMLSource::StartDataRe +@@ -510,16 +398,12 @@ void InterstitialHTMLSource::StartDataRe interstitial_delegate = CreateHttpsOnlyModePage(web_contents); } @@ -1166,7 +1172,7 @@ html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -98,7 +98,6 @@ +@@ -94,7 +94,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/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index f7e84a53..84155ec0 100644 --- a/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -22,7 +22,7 @@ } #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -503,18 +498,6 @@ void ComponentLoader::AddDefaultComponen +@@ -501,18 +496,6 @@ void ComponentLoader::AddDefaultComponen AddHangoutServicesExtension(); #endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) @@ -76,7 +76,7 @@ } // http://crbug.com/165634 -@@ -712,21 +698,6 @@ void WebstoreInstaller::UpdateDownloadPr +@@ -711,21 +697,6 @@ void WebstoreInstaller::UpdateDownloadPr void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!crx_installer_.get()); 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 ecdb88c1..ddc097a2 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 -@@ -139,10 +139,10 @@ const unsigned kMinimumTTLSeconds = kCac +@@ -144,10 +144,10 @@ const unsigned kMinimumTTLSeconds = kCac // cached. const int kIPv6ProbePeriodMs = 1000; 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 4a742b6c..c800809e 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 @@ -90,7 +90,7 @@ by default. if base_tag != '': --- a/chrome/browser/ash/customization/customization_document.cc +++ b/chrome/browser/ash/customization/customization_document.cc -@@ -200,7 +200,7 @@ std::string ReadFileInBackground(const b +@@ -198,7 +198,7 @@ std::string ReadFileInBackground(const b // Template URL where to fetch OEM services customization manifest from. const char ServicesCustomizationDocument::kManifestUrl[] = @@ -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 -@@ -87,7 +87,7 @@ namespace { +@@ -88,7 +88,7 @@ namespace { using api::file_manager_private::ProfileInfo; @@ -125,7 +125,7 @@ by default. // elements of |list| equals |hash|. --- a/chrome/browser/extensions/install_signer.cc +++ b/chrome/browser/extensions/install_signer.cc -@@ -67,7 +67,7 @@ const int kSignatureFormatVersion = 2; +@@ -66,7 +66,7 @@ const int kSignatureFormatVersion = 2; const size_t kSaltBytes = 32; const char kBackendUrl[] = @@ -203,7 +203,7 @@ by default. --- a/chrome/browser/safe_browsing/download_protection/download_feedback.cc +++ b/chrome/browser/safe_browsing/download_protection/download_feedback.cc -@@ -193,7 +193,7 @@ const int64_t DownloadFeedback::kMaxUplo +@@ -192,7 +192,7 @@ const int64_t DownloadFeedback::kMaxUplo // static const char DownloadFeedback::kSbFeedbackURL[] = @@ -236,7 +236,7 @@ by default. // yet. --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc -@@ -49,7 +49,7 @@ const char* kUpdateBrowserRedirectUrl = +@@ -50,7 +50,7 @@ const char* kUpdateBrowserRedirectUrl = #else // The URL to be used to re-install Chrome when auto-update failed for // too long. @@ -316,17 +316,6 @@ by default. bool NavigateToUrlWithEdge(const std::wstring& url) { std::wstring protocol_url = L"microsoft-edge:" + url; ---- a/chromecast/browser/service/cast_service_simple.cc -+++ b/chromecast/browser/service/cast_service_simple.cc -@@ -27,7 +27,7 @@ GURL GetStartupURL() { - const base::CommandLine::StringVector& args = command_line->GetArgs(); - - if (args.empty()) -- return GURL("http://www.google.com/"); -+ return GURL("trk:255:http://www.google.com/"); - - GURL url(args[0]); - if (url.is_valid() && url.has_scheme()) --- a/chromecast/crash/linux/minidump_uploader.cc +++ b/chromecast/crash/linux/minidump_uploader.cc @@ -41,7 +41,7 @@ namespace { @@ -384,7 +373,7 @@ by default. --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc -@@ -143,7 +143,7 @@ bool IsGoogleSearchSubdomainUrl(const GU +@@ -142,7 +142,7 @@ bool IsGoogleSearchSubdomainUrl(const GU // Global functions ----------------------------------------------------------- @@ -395,7 +384,7 @@ by default. url::Component query(0, static_cast(str.length())), key, value; --- a/components/history/core/browser/web_history_service.cc +++ b/components/history/core/browser/web_history_service.cc -@@ -42,13 +42,13 @@ namespace history { +@@ -43,13 +43,13 @@ namespace history { namespace { const char kHistoryOAuthScope[] = @@ -455,7 +444,7 @@ by default. + "trk:238:https://safesearch.googleapis.com/v1:classify"; std::string BuildResponse(bool is_porn) { - base::DictionaryValue dict; + base::Value dict(base::Value::Type::DICTIONARY); --- a/components/translate/core/browser/translate_url_fetcher.cc +++ b/components/translate/core/browser/translate_url_fetcher.cc @@ -99,6 +99,7 @@ bool TranslateURLFetcher::Request(const @@ -501,7 +490,7 @@ by default. --- a/content/browser/webauth/authenticator_common.cc +++ b/content/browser/webauth/authenticator_common.cc -@@ -88,9 +88,9 @@ enum class RequestExtension { +@@ -89,9 +89,9 @@ enum class RequestExtension { namespace { constexpr char kGstaticAppId[] = @@ -766,7 +755,7 @@ by default. 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 -@@ -36,7 +36,7 @@ class GaiaCookieMechanism : public jingl +@@ -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( 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 526d985d..1957c1b1 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future). IncidentReportingService::IncidentReportingService( --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -285,7 +285,7 @@ SafeBrowsingUIManager* SafeBrowsingServi +@@ -281,7 +281,7 @@ SafeBrowsingUIManager* SafeBrowsingServi } void SafeBrowsingService::RegisterAllDelayedAnalysis() { 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 f7c2da46..68718538 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 -@@ -209,6 +209,10 @@ void ClientSideDetectionService::StartCl +@@ -215,6 +215,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(); -@@ -288,6 +292,7 @@ void ClientSideDetectionService::StartCl +@@ -294,6 +298,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-requests.patch b/patches/core/ungoogled-chromium/block-requests.patch index 54d2907d..13eb9d73 100644 --- a/patches/core/ungoogled-chromium/block-requests.patch +++ b/patches/core/ungoogled-chromium/block-requests.patch @@ -65,9 +65,9 @@ if (state_ == REQUESTING) { --- a/components/update_client/update_checker.cc +++ b/components/update_client/update_checker.cc -@@ -112,6 +112,7 @@ void UpdateCheckerImpl::CheckForUpdates( +@@ -109,6 +109,7 @@ void UpdateCheckerImpl::CheckForUpdates( + const IdToComponentPtrMap& components, const base::flat_map& additional_attributes, - bool enabled_component_updates, UpdateCheckCallback update_check_callback) { + return; DCHECK(thread_checker_.CalledOnValidThread()); diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index 0f05cb45..a9004f9e 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetI +@@ -57,6 +57,7 @@ ChromeAutocompleteSchemeClassifier::GetI if (base::IsStringASCII(scheme) && (ProfileIOData::IsHandledProtocol(scheme) || base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) || @@ -23,19 +23,19 @@ url.SchemeIs(dom_distiller::kDomDistillerScheme)) --- a/chrome/browser/ui/singleton_tabs.cc +++ b/chrome/browser/ui/singleton_tabs.cc -@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* brows - - // Skip view-source tabs. This is needed because RewriteURLIfNecessary - // removes the "view-source:" scheme which leads to incorrect matching. -- if (tab_url.SchemeIs(content::kViewSourceScheme)) -+ if (tab_url.SchemeIs(content::kViewSourceScheme) || -+ tab_url.SchemeIs(url::kTraceScheme)) +@@ -102,7 +102,8 @@ int GetIndexOfExistingTab(Browser* brows + // RewriteURLIfNecessary removes the "view-source:" scheme which could lead + // to incorrect matching, so ensure that the target and the candidate are + // either both view-source:, or neither is. +- if (tab_url.SchemeIs(content::kViewSourceScheme) != target_is_view_source) { ++ if (tab_url.SchemeIs(content::kViewSourceScheme) != target_is_view_source || ++ tab_url.SchemeIs(url::kTraceScheme)) { continue; + } - GURL rewritten_tab_url = tab_url; --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc -@@ -533,7 +533,8 @@ void AutocompleteInput::ParseForEmphasiz +@@ -562,7 +562,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) || @@ -60,17 +60,17 @@ return GURL(parts.scheme.is_valid() ? text : FixupPath(text)); --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc -@@ -853,6 +853,7 @@ ChildProcessSecurityPolicyImpl::ChildPro +@@ -733,6 +733,7 @@ ChildProcessSecurityPolicyImpl::ChildPro + RegisterWebSafeScheme(url::kWssScheme); #endif // BUILDFLAG(ENABLE_WEBSOCKETS) - RegisterWebSafeScheme(url::kFtpScheme); RegisterWebSafeScheme(url::kDataScheme); + RegisterWebSafeScheme(url::kTraceScheme); - RegisterWebSafeScheme("feed"); // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed + // other origins, so we should not treat them as web safe. Remove callers of --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1012,6 +1012,8 @@ component("net") { +@@ -1010,6 +1010,8 @@ component("net") { "url_request/report_sender.h", "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", @@ -109,7 +109,7 @@ +} // namespace net --- /dev/null +++ b/net/url_request/trk_protocol_handler.h -@@ -0,0 +1,32 @@ +@@ -0,0 +1,30 @@ +// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -118,7 +118,6 @@ +#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ + +#include "base/compiler_specific.h" -+#include "base/macros.h" +#include "net/base/net_export.h" +#include "net/url_request/url_request_job_factory.h" + @@ -131,12 +130,11 @@ + : public URLRequestJobFactory::ProtocolHandler { + public: + TrkProtocolHandler(); ++ TrkProtocolHandler(const TrkProtocolHandler&) = delete; ++ TrkProtocolHandler& operator=(const TrkProtocolHandler&) = delete; + std::unique_ptr CreateJob( + URLRequest* request) const override; + bool IsSafeRedirectTarget(const GURL& location) const override; -+ -+ private: -+ DISALLOW_COPY_AND_ASSIGN(TrkProtocolHandler); +}; + +} // namespace net @@ -160,7 +158,7 @@ using base::Time; using std::string; -@@ -594,6 +596,12 @@ URLRequest::URLRequest(const GURL& url, +@@ -611,6 +613,12 @@ URLRequest::URLRequest(const GURL& url, // Sanity check out environment. DCHECK(base::ThreadTaskRunnerHandle::IsSet()); @@ -175,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 -@@ -46,6 +46,7 @@ +@@ -45,6 +45,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" @@ -183,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" -@@ -546,6 +547,9 @@ std::unique_ptr URLRe +@@ -545,6 +546,9 @@ std::unique_ptr URLRe } protocol_handlers_.clear(); diff --git a/patches/core/ungoogled-chromium/disable-domain-reliability.patch b/patches/core/ungoogled-chromium/disable-domain-reliability.patch index 017cba6b..d342db32 100644 --- a/patches/core/ungoogled-chromium/disable-domain-reliability.patch +++ b/patches/core/ungoogled-chromium/disable-domain-reliability.patch @@ -111,7 +111,7 @@ def quote_and_wrap_text(text, width=79, prefix=' "', suffix='"'): --- a/components/domain_reliability/google_configs.cc +++ b/components/domain_reliability/google_configs.cc -@@ -11,564 +11,6 @@ +@@ -11,548 +11,6 @@ namespace domain_reliability { @@ -402,9 +402,6 @@ - {"ampproject.net", true, false, false}, - {"ampproject.org", true, false, false}, - {"android.com", true, false, false}, -- {"anycast-edge.metric.gstatic.com", true, false, false}, -- {"anycast-stb.metric.gstatic.com", true, false, false}, -- {"anycast.metric.gstatic.com", true, false, false}, - {"cdn.ampproject.org", true, false, false}, - {"chromecast.com", true, false, false}, - {"chromeexperiments.com", true, false, false}, @@ -461,19 +458,6 @@ - {"picasa.com", true, false, false}, - {"recaptcha.net", true, false, false}, - {"stackdriver.com", true, false, false}, -- {"stbcast-stb.metric.gstatic.com", true, false, false}, -- {"stbcast.metric.gstatic.com", true, false, false}, -- {"stbcast2-stb.metric.gstatic.com", true, false, false}, -- {"stbcast2.metric.gstatic.com", true, false, false}, -- {"stbcast3-stb.metric.gstatic.com", true, false, false}, -- {"stbcast3.metric.gstatic.com", true, false, false}, -- {"stbcast4-stb.metric.gstatic.com", true, false, false}, -- {"stbcast4.metric.gstatic.com", true, false, false}, -- {"unicast-edge.metric.gstatic.com", true, false, false}, -- {"unicast-stb.metric.gstatic.com", true, false, false}, -- {"unicast.metric.gstatic.com", true, false, false}, -- {"unicast2-stb.metric.gstatic.com", true, false, false}, -- {"unicast2.metric.gstatic.com", true, false, false}, - {"waze.com", true, false, false}, - {"withgoogle.com", true, false, false}, - {"youtu.be", true, false, false}, @@ -676,7 +660,7 @@ std::unique_ptr MaybeGetGoogleConfig( const std::string& hostname) { bool is_www_subdomain = -@@ -578,23 +20,6 @@ std::unique_ptr config; std::unique_ptr superdomain_config; @@ -700,7 +684,7 @@ if (config) { DCHECK(config->origin.host() == hostname); return config; -@@ -613,11 +38,6 @@ std::vector> configs_out; @@ -714,7 +698,7 @@ --- a/components/domain_reliability/uploader.cc +++ b/components/domain_reliability/uploader.cc -@@ -79,7 +79,7 @@ class DomainReliabilityUploaderImpl : pu +@@ -80,7 +80,7 @@ class DomainReliabilityUploaderImpl : pu if (discard_uploads_) discarded_upload_count_++; diff --git a/patches/core/ungoogled-chromium/disable-gaia.patch b/patches/core/ungoogled-chromium/disable-gaia.patch index 22b8a2f6..5aa82904 100644 --- a/patches/core/ungoogled-chromium/disable-gaia.patch +++ b/patches/core/ungoogled-chromium/disable-gaia.patch @@ -3,7 +3,7 @@ --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc -@@ -293,66 +293,6 @@ void GaiaAuthFetcher::CreateAndStartGaia +@@ -292,66 +292,6 @@ void GaiaAuthFetcher::CreateAndStartGaia network::mojom::CredentialsMode credentials_mode, const net::NetworkTrafficAnnotationTag& traffic_annotation) { DCHECK(!fetch_pending_) << "Tried to fetch two things at once!"; diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index 9dda54bf..a53c4a45 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -130,7 +130,7 @@ #endif --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc -@@ -33,112 +33,6 @@ namespace google_util { +@@ -32,112 +32,6 @@ namespace google_util { namespace { @@ -243,7 +243,7 @@ } // namespace // Global functions ----------------------------------------------------------- -@@ -146,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU +@@ -145,12 +39,6 @@ bool IsGoogleSearchSubdomainUrl(const GU const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/"; bool HasGoogleSearchQueryParam(base::StringPiece str) { @@ -256,7 +256,7 @@ return false; } -@@ -162,161 +50,53 @@ std::string GetGoogleLocale(const std::s +@@ -161,161 +49,53 @@ std::string GetGoogleLocale(const std::s GURL AppendGoogleLocaleParam(const GURL& url, const std::string& application_locale) { @@ -430,7 +430,7 @@ --- a/components/page_load_metrics/browser/page_load_metrics_util.cc +++ b/components/page_load_metrics/browser/page_load_metrics_util.cc -@@ -196,9 +196,7 @@ bool DidObserveLoadingBehaviorInAnyFrame +@@ -199,9 +199,7 @@ bool DidObserveLoadingBehaviorInAnyFrame } bool IsGoogleSearchHostname(const GURL& url) { diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index 3e1593ca..bedcb220 100644 --- a/patches/core/ungoogled-chromium/disable-mei-preload.patch +++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch @@ -7,7 +7,7 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -356,7 +356,6 @@ if (!is_android && !is_mac) { +@@ -347,7 +347,6 @@ if (!is_android && !is_mac) { } data_deps += [ @@ -15,7 +15,7 @@ "//third_party/widevine/cdm", ] } -@@ -1157,7 +1156,6 @@ if (is_win) { +@@ -1150,7 +1149,6 @@ if (is_win) { ":keystone_registration_framework", ":swiftshader_library", ":widevine_cdm_library", diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch index 8f16f5b0..fe997e4a 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -20,7 +20,7 @@ void PrivacySandboxSettings::OnCookiesCleared() { --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -64,19 +64,6 @@ +@@ -80,19 +80,6 @@ sub-label="$i18n{permissionsPageDescription}" on-click="onPermissionsPageClick_" role-description="$i18n{subpageArrowRoleDescription}"> diff --git a/patches/core/ungoogled-chromium/disable-signin.patch b/patches/core/ungoogled-chromium/disable-signin.patch index 65710a30..3276ebde 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 -@@ -480,32 +480,6 @@ GURL GetOSSettingsUrl(const std::string& +@@ -486,32 +486,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-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index 2760390a..a0c85369 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 -@@ -655,10 +655,6 @@ std::vector ChromeContentBr +@@ -641,10 +641,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 -@@ -288,17 +288,7 @@ bool ChromeContentVerifierDelegate::IsFr +@@ -290,17 +290,7 @@ bool ChromeContentVerifierDelegate::IsFr // between which extensions are considered in-store. // See https://crbug.com/766806 for details. if (!InstallVerifier::IsFromStore(extension, context_)) { @@ -60,14 +60,14 @@ +++ b/chrome/browser/extensions/extension_migrator.h @@ -9,6 +9,7 @@ - #include "base/macros.h" + #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/external_loader.h" +#include "url/gurl.h" class Profile; @@ -40,6 +41,7 @@ class ExtensionMigrator : public Externa - Profile* profile_; + raw_ptr profile_; const std::string old_id_; const std::string new_id_; + GURL chrome_blank_; diff --git a/patches/core/ungoogled-chromium/doh-changes.patch b/patches/core/ungoogled-chromium/doh-changes.patch index 2eb5b87d..a7ede603 100644 --- a/patches/core/ungoogled-chromium/doh-changes.patch +++ b/patches/core/ungoogled-chromium/doh-changes.patch @@ -1,6 +1,6 @@ --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -333,12 +333,7 @@ const base::Feature kDesktopPWAsWebBundl +@@ -336,12 +336,7 @@ const base::FeatureParam kDisableHt // Enable DNS over HTTPS (DoH). const base::Feature kDnsOverHttps { "DnsOverHttps", 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 71f87621..b36fbc96 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -3,7 +3,7 @@ --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn -@@ -311,11 +311,7 @@ source_set("lib") { +@@ -314,11 +314,7 @@ source_set("lib") { } } @@ -15,7 +15,7 @@ executable("$chromedriver_output") { testonly = true -@@ -337,16 +333,6 @@ executable("$chromedriver_output") { +@@ -340,16 +336,6 @@ executable("$chromedriver_output") { } } @@ -34,9 +34,9 @@ deps = [ --- a/third_party/devtools-frontend/src/BUILD.gn +++ b/third_party/devtools-frontend/src/BUILD.gn -@@ -109,7 +109,6 @@ foreach(module_file, non_autostart_non_r +@@ -14,7 +14,6 @@ import("./third_party/blink/public/publi + devtools_frontend_resources_deps = [ - ":build_release_devtools", "front_end", - "test", ] 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 7663ec49..04abd35e 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch @@ -1,82 +1,3 @@ ---- a/content/browser/BUILD.gn -+++ b/content/browser/BUILD.gn -@@ -1218,6 +1218,10 @@ source_set("browser") { - "net/browser_online_state_observer.cc", - "net/browser_online_state_observer.h", - "net/cookie_store_factory.cc", -+ "net/cross_origin_embedder_policy_reporter.cc", -+ "net/cross_origin_embedder_policy_reporter.h", -+ "net/cross_origin_opener_policy_reporter.cc", -+ "net/cross_origin_opener_policy_reporter.h", - "net/network_errors_listing_ui.cc", - "net/network_errors_listing_ui.h", - "net/network_quality_observer_impl.cc", -@@ -2983,10 +2987,6 @@ source_set("browser") { - - if (enable_reporting) { - sources += [ -- "net/cross_origin_embedder_policy_reporter.cc", -- "net/cross_origin_embedder_policy_reporter.h", -- "net/cross_origin_opener_policy_reporter.cc", -- "net/cross_origin_opener_policy_reporter.h", - "net/reporting_service_proxy.cc", - "net/reporting_service_proxy.h", - ] ---- a/content/browser/devtools/protocol/network_handler.h -+++ b/content/browser/devtools/protocol/network_handler.h -@@ -309,8 +309,10 @@ class NetworkHandler : public DevToolsDo - Response response, - mojo::ScopedDataPipeConsumerHandle pipe, - const std::string& mime_type); -+#if BUILDFLAG(ENABLE_REPORTING) - std::unique_ptr BuildProtocolReport( - const net::ReportingReport& report); -+#endif - - // TODO(dgozman): Remove this. - const std::string host_id_; ---- a/content/public/common/content_switch_dependent_feature_overrides.cc -+++ b/content/public/common/content_switch_dependent_feature_overrides.cc -@@ -36,9 +36,11 @@ GetSwitchDependentFeatureOverrides(const - {switches::kEnableExperimentalWebPlatformFeatures, - std::cref(features::kDocumentPolicyNegotiation), - base::FeatureList::OVERRIDE_ENABLE_FEATURE}, -+#if BUILDFLAG(ENABLE_REPORTING) - {switches::kEnableExperimentalWebPlatformFeatures, - std::cref(net::features::kDocumentReporting), - base::FeatureList::OVERRIDE_ENABLE_FEATURE}, -+#endif - {switches::kEnableExperimentalWebPlatformFeatures, - std::cref(features::kExperimentalContentSecurityPolicyFeatures), - base::FeatureList::OVERRIDE_ENABLE_FEATURE}, ---- a/services/network/network_context.cc -+++ b/services/network/network_context.cc -@@ -1145,6 +1145,11 @@ void NetworkContext::QueueSignedExchange - const net::NetworkIsolationKey& network_isolation_key) { - NOTREACHED(); - } -+ -+void NetworkContext::AddReportingApiObserver( -+ mojo::PendingRemote observer) { -+ NOTREACHED(); -+} - #endif // BUILDFLAG(ENABLE_REPORTING) - - void NetworkContext::ClearDomainReliability( ---- a/services/network/network_context.h -+++ b/services/network/network_context.h -@@ -578,10 +578,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) - return cors_non_wildcard_request_headers_support_; - } - --#if BUILDFLAG(ENABLE_REPORTING) - void AddReportingApiObserver( - mojo::PendingRemote observer) - override; -+#if BUILDFLAG(ENABLE_REPORTING) - void OnReportAdded(const net::ReportingReport* service_report) override; - void OnReportUpdated(const net::ReportingReport* service_report) override; - void OnReportingObserverDisconnect(mojo::RemoteSetElementId mojo_id); --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -39,6 +39,7 @@ @@ -87,7 +8,7 @@ #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" -@@ -2325,9 +2326,11 @@ const base::UnguessableToken& LocalFrame +@@ -2289,9 +2290,11 @@ const base::UnguessableToken& LocalFrame return base::UnguessableToken::Null(); } @@ -109,7 +30,7 @@ #include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h" #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h" #include "third_party/blink/public/common/frame/frame_ad_evidence.h" -@@ -548,7 +549,9 @@ class CORE_EXPORT LocalFrame final : pub +@@ -543,7 +544,9 @@ class CORE_EXPORT LocalFrame final SmoothScrollSequencer& GetSmoothScrollSequencer(); @@ -191,7 +112,7 @@ #include "third_party/blink/public/mojom/frame/reporting_observer.mojom-blink.h" #include "third_party/blink/public/mojom/reporting/reporting.mojom-blink.h" #include "third_party/blink/renderer/core/core_export.h" -@@ -54,8 +55,10 @@ class CORE_EXPORT ReportingContext : pub +@@ -55,8 +56,10 @@ class CORE_EXPORT ReportingContext : pub // Counts the use of a report type via UseCounter. void CountReport(Report*); @@ -202,7 +123,7 @@ void NotifyInternal(Report* report); // Send |report| via the Reporting API to |endpoint|. -@@ -67,8 +70,10 @@ class CORE_EXPORT ReportingContext : pub +@@ -68,8 +71,10 @@ class CORE_EXPORT ReportingContext : pub // This is declared mutable so that the service endpoint can be cached by // const methods. 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 f72b10de..e2a646bd 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,7 +14,7 @@ } --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc -@@ -360,6 +360,7 @@ void InlineSigninHelper::OnClientOAuthSu +@@ -359,6 +359,7 @@ void InlineSigninHelper::OnClientOAuthSu const ClientOAuthResult& result, Profile* /*profile*/, Profile::CreateStatus /*status*/) { @@ -22,7 +22,7 @@ HandlerSigninReason reason = GetHandlerSigninReason(current_url_); if (reason == HandlerSigninReason::kFetchLstOnly) { // Constants are only available on Windows for the Google Credential -@@ -436,6 +437,7 @@ void InlineSigninHelper::OnClientOAuthSu +@@ -435,6 +436,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 306b7808..e251aa04 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 -@@ -1965,7 +1965,6 @@ static_library("browser") { +@@ -1957,7 +1957,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", -@@ -3760,9 +3759,6 @@ static_library("browser") { +@@ -3778,9 +3777,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", -@@ -4003,10 +3999,6 @@ static_library("browser") { +@@ -4023,10 +4019,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", -@@ -7108,9 +7100,14 @@ static_library("browser") { +@@ -7201,9 +7193,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 -@@ -4229,11 +4229,13 @@ ChromeContentBrowserClient::CreateThrott +@@ -4252,11 +4252,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. -@@ -5645,26 +5647,7 @@ ChromeContentBrowserClient::GetSafeBrows +@@ -5657,26 +5659,7 @@ ChromeContentBrowserClient::GetSafeBrows const std::vector& allowlist_domains) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -105,7 +105,7 @@ } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -5685,11 +5668,6 @@ ChromeContentBrowserClient::GetUrlLookup +@@ -5697,11 +5680,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 -@@ -139,45 +139,6 @@ void MaybeCreateSafeBrowsingForRenderer( +@@ -143,45 +143,6 @@ void MaybeCreateSafeBrowsingForRenderer( const std::vector& allowlist_domains)> get_checker_delegate, mojo::PendingReceiver receiver) { @@ -165,9 +165,9 @@ } // BadgeManager is not used for Android. ---- a/chrome/browser/component_updater/client_side_phishing_component_installer.cc -+++ b/chrome/browser/component_updater/client_side_phishing_component_installer.cc -@@ -36,20 +36,6 @@ const char kClientSidePhishingManifestNa +--- a/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc ++++ b/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc +@@ -30,20 +30,6 @@ namespace { void LoadFromDisk(const base::FilePath& pb_path, const base::FilePath& visual_tflite_model_path) { @@ -187,9 +187,9 @@ - ->PopulateFromDynamicUpdate(binary_pb, std::move(visual_tflite_model)); } - base::FilePath GetInstalledProtoPath(const base::FilePath& base) { -@@ -123,9 +109,6 @@ update_client::InstallerAttributes - ClientSidePhishingComponentInstallerPolicy::GetInstallerAttributes() const { + void PopulateModelFromFiles(const base::FilePath& install_dir) { +@@ -57,9 +43,6 @@ void PopulateModelFromFiles(const base:: + update_client::InstallerAttributes GetInstallerAttributes() { update_client::InstallerAttributes attributes; - // Pass the tag parameter to the installer as the "tag" attribute; it will @@ -200,7 +200,7 @@ --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -135,7 +135,6 @@ using content::DownloadManager; +@@ -134,7 +134,6 @@ using content::DownloadManager; using download::DownloadItem; using download::DownloadPathReservationTracker; using download::PathValidationResult; @@ -208,7 +208,7 @@ using safe_browsing::DownloadProtectionService; using ConnectionType = net::NetworkChangeNotifier::ConnectionType; -@@ -1527,8 +1526,6 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -1526,8 +1525,6 @@ void ChromeDownloadManagerDelegate::OnDo if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif @@ -217,7 +217,7 @@ } if (ShouldBlockFile(target_info->danger_type, item)) { MaybeReportDangerousDownloadBlocked( -@@ -1680,7 +1677,6 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1679,7 +1676,6 @@ void ChromeDownloadManagerDelegate::Mayb service->MaybeSendDangerousDownloadOpenedReport(download, show_download_in_folder); } @@ -225,7 +225,7 @@ if (!download->GetAutoOpened()) { download::DownloadContent download_content = download::DownloadContentFromMimeType(download->GetMimeType(), false); -@@ -1688,6 +1684,7 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1687,6 +1683,7 @@ void ChromeDownloadManagerDelegate::Mayb download->GetDangerType(), download_content, base::Time::Now(), download->GetEndTime(), show_download_in_folder); } @@ -233,7 +233,7 @@ } void ChromeDownloadManagerDelegate::CheckDownloadAllowed( -@@ -1764,30 +1761,6 @@ void ChromeDownloadManagerDelegate::Chec +@@ -1763,30 +1760,6 @@ void ChromeDownloadManagerDelegate::Chec std::move(callback).Run(true); return; } @@ -331,7 +331,7 @@ #include "components/policy/core/browser/url_util.h" --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -475,19 +475,6 @@ absl::optional ConnectorsSe +@@ -459,19 +459,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 -@@ -78,12 +78,6 @@ class ConnectorsService : public KeyedSe +@@ -79,12 +79,6 @@ class ConnectorsService : public KeyedSe // is no token to use. absl::optional GetDMTokenForRealTimeUrlCheck() const; @@ -368,7 +368,7 @@ // precedence. --- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc +++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc -@@ -32,9 +32,6 @@ void CommonSignalsDecorator::Decorate(Si +@@ -41,9 +41,6 @@ void CommonSignalsDecorator::Decorate(Si // Get signals from policy values. signals.set_built_in_dns_client_enabled( enterprise_signals::utils::GetBuiltInDnsClientEnabled(local_state_)); @@ -378,7 +378,7 @@ absl::optional third_party_blocking_enabled = enterprise_signals::utils::GetThirdPartyBlockingEnabled(local_state_); -@@ -49,15 +46,6 @@ void CommonSignalsDecorator::Decorate(Si +@@ -58,15 +55,6 @@ void CommonSignalsDecorator::Decorate(Si signals.set_chrome_cleanup_enabled(chrome_cleanup_enabled.value()); } @@ -391,12 +391,12 @@ - static_cast(password_protection_warning_trigger.value())); - } - - auto callback = - base::BindOnce(&CommonSignalsDecorator::OnHardwareInfoRetrieved, - weak_ptr_factory_.GetWeakPtr(), std::ref(signals), + if (cached_device_model_ && cached_device_manufacturer_) { + UpdateFromCache(signals); + LogSignalsCollectionLatency(kLatencyHistogramWithCacheVariant, start_time); --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc -@@ -169,7 +169,6 @@ void ContextInfoFetcher::Fetch(ContextIn +@@ -199,7 +199,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 = -@@ -227,11 +226,6 @@ std::vector ContextInfoFetc +@@ -257,11 +256,6 @@ std::vector ContextInfoFetc return connectors_service_->GetAnalysisServiceProviderNames(connector); } @@ -426,7 +426,7 @@ #include #include "base/callback_forward.h" -@@ -37,7 +38,6 @@ struct ContextInfo { +@@ -38,7 +39,6 @@ struct ContextInfo { std::vector on_file_downloaded_providers; std::vector on_bulk_data_entry_providers; std::vector on_security_event_providers; @@ -434,7 +434,7 @@ std::string browser_version; safe_browsing::SafeBrowsingState safe_browsing_protection_level; bool site_isolation_enabled; -@@ -88,7 +88,6 @@ class ContextInfoFetcher { +@@ -89,7 +89,6 @@ class ContextInfoFetcher { std::vector GetAnalysisConnectorProviders( enterprise_connectors::AnalysisConnector connector); @@ -502,7 +502,7 @@ } // namespace utils --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -646,8 +646,6 @@ static_library("extensions") { +@@ -642,8 +642,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 -@@ -326,6 +326,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -340,6 +340,7 @@ void SafeBrowsingPrivateEventRouter::OnD event_router_->BroadcastEvent(std::move(extension_event)); } @@ -541,7 +541,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -356,6 +357,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -370,6 +371,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -549,7 +549,7 @@ } void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown( -@@ -383,6 +385,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -397,6 +399,7 @@ void SafeBrowsingPrivateEventRouter::OnS event_router_->BroadcastEvent(std::move(extension_event)); } @@ -557,7 +557,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -406,6 +409,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -420,6 +423,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()), std::move(event)); @@ -565,7 +565,7 @@ } void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded( -@@ -433,6 +437,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -447,6 +451,7 @@ void SafeBrowsingPrivateEventRouter::OnS event_router_->BroadcastEvent(std::move(extension_event)); } @@ -573,7 +573,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -452,6 +457,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -466,6 +471,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()), std::move(event)); @@ -581,7 +581,7 @@ } void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorResult( -@@ -465,6 +471,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -479,6 +485,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( -@@ -476,6 +483,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -490,6 +497,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( -@@ -491,6 +499,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -505,6 +513,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() || -@@ -528,6 +537,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -542,6 +551,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -613,7 +613,7 @@ } void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent( -@@ -540,6 +550,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -554,6 +564,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() || -@@ -572,6 +583,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -586,6 +597,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()), std::move(event)); @@ -629,7 +629,7 @@ } void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed( -@@ -584,6 +596,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -598,6 +610,7 @@ void SafeBrowsingPrivateEventRouter::OnA safe_browsing::DeepScanAccessPoint access_point, const enterprise_connectors::ContentAnalysisResponse::Result& result, const int64_t content_size) { @@ -637,7 +637,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -616,6 +629,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -630,6 +643,7 @@ void SafeBrowsingPrivateEventRouter::OnA ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()), std::move(event)); @@ -645,7 +645,7 @@ } void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent( -@@ -628,6 +642,7 @@ void SafeBrowsingPrivateEventRouter::OnU +@@ -642,6 +656,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() || -@@ -654,6 +669,7 @@ void SafeBrowsingPrivateEventRouter::OnU +@@ -668,6 +683,7 @@ void SafeBrowsingPrivateEventRouter::OnU ReportRealtimeEvent(kKeyUnscannedFileEvent, std::move(settings.value()), std::move(event)); @@ -661,7 +661,7 @@ } void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent( -@@ -679,6 +695,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -693,6 +709,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() || -@@ -709,6 +726,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -723,6 +740,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -677,7 +677,7 @@ } void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed( -@@ -732,6 +750,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -746,6 +764,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() || -@@ -762,6 +781,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -776,6 +795,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -693,7 +693,7 @@ } void SafeBrowsingPrivateEventRouter::OnLoginEvent( -@@ -1087,7 +1107,11 @@ void SafeBrowsingPrivateEventRouter::Rep +@@ -1101,7 +1121,11 @@ void SafeBrowsingPrivateEventRouter::Rep } std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const { @@ -705,6 +705,24 @@ } #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 + content::BrowserContext* context, + const ExtensionId& extension_id, + const std::string& code) const { +- auto* telemetry_service = +- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile( +- Profile::FromBrowserContext(context)); +- if (!telemetry_service || !telemetry_service->enabled()) +- return; +- +- auto signal = std::make_unique( +- extension_id, code); +- telemetry_service->AddSignal(std::move(signal)); + } + + // static --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -52,7 +52,6 @@ @@ -731,7 +749,7 @@ registry_(ExtensionRegistry::Get(profile)), pending_extension_manager_(profile), install_directory_(install_directory), -@@ -851,100 +848,6 @@ bool ExtensionService::IsExtensionEnable +@@ -857,100 +854,6 @@ bool ExtensionService::IsExtensionEnable return extension_registrar_.IsExtensionEnabled(extension_id); } @@ -842,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" -@@ -267,40 +266,11 @@ class ExtensionService : public Extensio +@@ -271,40 +270,11 @@ class ExtensionService : public Extensio // nothing. void EnableExtension(const std::string& extension_id); @@ -883,14 +901,14 @@ // 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 -@@ -636,8 +606,6 @@ class ExtensionService : public Extensio +@@ -640,8 +610,6 @@ class ExtensionService : public Extensio SafeBrowsingVerdictHandler safe_browsing_verdict_handler_; - OmahaAttributesHandler omaha_attributes_handler_; - // Sets of enabled/disabled/terminated/blocklisted extensions. Not owned. - ExtensionRegistry* registry_ = nullptr; + raw_ptr registry_ = nullptr; --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc @@ -948,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" -@@ -301,83 +299,6 @@ BindResultCallbackToCurrentSequence( +@@ -304,83 +302,6 @@ BindResultCallbackToCurrentSequence( base::SequencedTaskRunnerHandle::Get(), std::move(callback)); } @@ -1032,7 +1050,7 @@ std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey : base::StrCat({kCustomLastPickedDirectoryKey, "-", id}); -@@ -1130,28 +1051,6 @@ void ChromeFileSystemAccessPermissionCon +@@ -1133,28 +1054,6 @@ void ChromeFileSystemAccessPermissionCon std::move(callback))); } @@ -1063,7 +1081,7 @@ const url::Origin& origin, --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h -@@ -85,10 +85,6 @@ class ChromeFileSystemAccessPermissionCo +@@ -86,10 +86,6 @@ class ChromeFileSystemAccessPermissionCo HandleType handle_type, content::GlobalRenderFrameHostId frame_id, base::OnceCallback callback) override; @@ -1076,7 +1094,7 @@ --- a/chrome/browser/media/webrtc/display_media_access_handler.cc +++ b/chrome/browser/media/webrtc/display_media_access_handler.cc -@@ -25,6 +25,7 @@ +@@ -24,6 +24,7 @@ #include "chrome/browser/safe_browsing/user_interaction_observer.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" @@ -1084,7 +1102,7 @@ #include "components/url_formatter/elide_url.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/desktop_capture.h" -@@ -111,6 +112,7 @@ void DisplayMediaAccessHandler::HandleRe +@@ -106,6 +107,7 @@ void DisplayMediaAccessHandler::HandleRe return; } @@ -1092,7 +1110,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. Show the warning -@@ -125,6 +127,7 @@ void DisplayMediaAccessHandler::HandleRe +@@ -120,6 +122,7 @@ void DisplayMediaAccessHandler::HandleRe observer->OnDesktopCaptureRequest(); return; } @@ -1100,17 +1118,33 @@ #if defined(OS_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 +@@ -88,13 +88,6 @@ NotificationDisplayServiceImpl::Notifica + profile_)); + #endif + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +- defined(OS_WIN) +- AddNotificationHandler( +- NotificationHandler::Type::TAILORED_SECURITY, +- std::make_unique()); +-#endif +- + #if BUILDFLAG(ENABLE_EXTENSIONS) + AddNotificationHandler( + NotificationHandler::Type::EXTENSION, --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -33,7 +33,6 @@ - #include "chrome/browser/password_manager/password_reuse_manager_factory.h" +@@ -35,7 +35,6 @@ + #include "chrome/browser/password_manager/password_scripts_fetcher_factory.h" #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/safe_browsing/chrome_password_protection_service.h" #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" -@@ -110,11 +109,11 @@ +@@ -112,11 +111,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" @@ -1123,7 +1157,7 @@ #if defined(OS_ANDROID) #include "chrome/browser/android/tab_android.h" -@@ -828,6 +827,7 @@ autofill::LanguageCode ChromePasswordMan +@@ -830,6 +829,7 @@ autofill::LanguageCode ChromePasswordMan return autofill::LanguageCode(); } @@ -1131,7 +1165,7 @@ safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { return safe_browsing::ChromePasswordProtectionService:: -@@ -838,13 +838,6 @@ ChromePasswordManagerClient::GetPassword +@@ -840,13 +840,6 @@ ChromePasswordManagerClient::GetPassword void ChromePasswordManagerClient::CheckSafeBrowsingReputation( const GURL& form_action, const GURL& frame_url) { @@ -1145,7 +1179,7 @@ } #endif // defined(ON_FOCUS_PING_ENABLED) -@@ -854,22 +847,10 @@ void ChromePasswordManagerClient::CheckP +@@ -856,22 +849,10 @@ void ChromePasswordManagerClient::CheckP const std::vector& matching_reused_credentials, bool password_field_exists) { @@ -1169,7 +1203,7 @@ } #if !defined(OS_ANDROID) -@@ -1383,9 +1364,11 @@ void ChromePasswordManagerClient::OnPast +@@ -1390,9 +1371,11 @@ void ChromePasswordManagerClient::OnPast } was_on_paste_called_ = true; @@ -1182,7 +1216,7 @@ void ChromePasswordManagerClient::RenderFrameCreated( content::RenderFrameHost* render_frame_host) { -@@ -1420,7 +1403,9 @@ void ChromePasswordManagerClient::OnInpu +@@ -1427,7 +1410,9 @@ void ChromePasswordManagerClient::OnInpu if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) { OnPaste(); } else { @@ -1192,7 +1226,7 @@ } #endif // defined(OS_ANDROID) } -@@ -1459,6 +1444,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1466,6 +1451,7 @@ bool ChromePasswordManagerClient::IsPass is_enabled = false; } @@ -1200,7 +1234,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 -@@ -1469,6 +1455,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1476,6 +1462,7 @@ bool ChromePasswordManagerClient::IsPass observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -1210,7 +1244,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 -@@ -207,13 +207,14 @@ class ChromePasswordManagerClient +@@ -204,13 +204,14 @@ class ChromePasswordManagerClient void AnnotateNavigationEntry(bool has_password_field) override; autofill::LanguageCode GetPageLanguage() const override; @@ -1226,7 +1260,7 @@ void CheckProtectedPasswordEntry( password_manager::metrics_util::PasswordType reused_password_type, -@@ -221,6 +222,7 @@ class ChromePasswordManagerClient +@@ -218,6 +219,7 @@ class ChromePasswordManagerClient const std::vector& matching_reused_credentials, bool password_field_exists) override; @@ -1326,7 +1360,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" -@@ -1294,7 +1293,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1283,7 +1282,6 @@ void RegisterProfilePrefs(user_prefs::Pr NewTabPageHandler::RegisterProfilePrefs(registry); NewTabPageUI::RegisterProfilePrefs(registry); NewTabUI::RegisterProfilePrefs(registry); @@ -1334,9 +1368,19 @@ ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry); PhotosService::RegisterProfilePrefs(registry); 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 + SystemExtensionsProviderFactory::GetInstance(); + #endif + TabRestoreServiceFactory::GetInstance(); +- safe_browsing::TailoredSecurityServiceFactory::GetInstance(); + TemplateURLFetcherFactory::GetInstance(); + TemplateURLServiceFactory::GetInstance(); + #if !defined(OS_ANDROID) --- a/chrome/browser/reputation/reputation_service.cc +++ b/chrome/browser/reputation/reputation_service.cc -@@ -120,9 +120,7 @@ void ReputationService::GetReputationSta +@@ -119,9 +119,7 @@ void ReputationService::GetReputationSta ReputationCheckCallback callback) { DCHECK(url.SchemeIsHTTPOrHTTPS()); @@ -1425,9 +1469,9 @@ } // namespace std::unique_ptr -@@ -192,10 +183,6 @@ ChromeSecurityBlockingPageFactory::Creat - } - } +@@ -174,10 +165,6 @@ ChromeSecurityBlockingPageFactory::Creat + Profile::FromBrowserContext(web_contents->GetBrowserContext())); + state->DidDisplayErrorPage(cert_error); - LogSafeBrowsingSecuritySensitiveAction( - safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( @@ -1436,18 +1480,7 @@ auto controller_client = std::make_unique( web_contents, ssl_info, cert_error, request_url, std::move(metrics_helper), CreateSettingsPageHelper()); -@@ -264,10 +251,6 @@ ChromeSecurityBlockingPageFactory::Creat - const GURL& request_url, - std::unique_ptr ssl_cert_reporter, - const net::SSLInfo& ssl_info) { -- LogSafeBrowsingSecuritySensitiveAction( -- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( -- Profile::FromBrowserContext(web_contents->GetBrowserContext()))); -- - auto page = std::make_unique( - web_contents, cert_error, request_url, std::move(ssl_cert_reporter), - /*can_show_enhanced_protection_message=*/true, ssl_info, -@@ -289,10 +272,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -247,10 +234,6 @@ ChromeSecurityBlockingPageFactory::Creat std::unique_ptr ssl_cert_reporter, const net::SSLInfo& ssl_info, const std::string& mitm_software_name) { @@ -1458,7 +1491,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, -@@ -314,10 +293,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -272,10 +255,6 @@ ChromeSecurityBlockingPageFactory::Creat const GURL& request_url, std::unique_ptr ssl_cert_reporter, const net::SSLInfo& ssl_info) { @@ -1512,7 +1545,7 @@ } // namespace --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -533,7 +533,6 @@ static_library("ui") { +@@ -544,7 +544,6 @@ static_library("ui") { "//components/renderer_context_menu", "//components/resources", "//components/safe_browsing/content/browser", @@ -1520,7 +1553,7 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser/db:database_manager", -@@ -4397,8 +4396,6 @@ static_library("ui") { +@@ -4499,8 +4498,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", @@ -1628,7 +1661,7 @@ } --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc -@@ -837,9 +837,7 @@ void DownloadItemView::UpdateLabels() { +@@ -838,9 +838,7 @@ void DownloadItemView::UpdateLabels() { deep_scanning_label_->SetVisible(mode_ == download::DownloadItemMode::kDeepScanning); if (deep_scanning_label_->GetVisible()) { @@ -1639,7 +1672,7 @@ ? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD : IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD; const std::u16string filename = ElidedFilename(*deep_scanning_label_); -@@ -886,11 +884,15 @@ void DownloadItemView::UpdateButtons() { +@@ -887,11 +885,15 @@ void DownloadItemView::UpdateButtons() { } const bool allow_open_during_deep_scan = @@ -1655,7 +1688,7 @@ open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) || prompt_to_scan || allow_open_during_deep_scan); -@@ -1427,7 +1429,9 @@ void DownloadItemView::ShowContextMenuIm +@@ -1428,7 +1430,9 @@ void DownloadItemView::ShowContextMenuIm } void DownloadItemView::OpenDownloadDuringAsyncScanning() { @@ -1692,7 +1725,7 @@ --- a/chrome/browser/webshare/share_service_impl.cc +++ b/chrome/browser/webshare/share_service_impl.cc -@@ -14,7 +14,9 @@ +@@ -15,7 +15,9 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_features.h" @@ -1702,7 +1735,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" -@@ -182,11 +184,13 @@ void ShareServiceImpl::Share(const std:: +@@ -195,11 +197,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); @@ -1716,7 +1749,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 -@@ -196,6 +200,7 @@ void ShareServiceImpl::Share(const std:: +@@ -209,6 +213,7 @@ void ShareServiceImpl::Share(const std:: } DCHECK(!safe_browsing_request_); @@ -1724,7 +1757,7 @@ if (should_check_url && g_browser_process->safe_browsing_service()) { safe_browsing_request_.emplace( g_browser_process->safe_browsing_service()->database_manager(), -@@ -205,6 +210,7 @@ void ShareServiceImpl::Share(const std:: +@@ -218,6 +223,7 @@ void ShareServiceImpl::Share(const std:: std::move(files), std::move(callback))); return; } @@ -1734,7 +1767,7 @@ std::move(callback), --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1205,7 +1205,6 @@ if (!is_android && !is_fuchsia) { +@@ -1212,7 +1212,6 @@ if (!is_android && !is_fuchsia) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1742,7 +1775,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", -@@ -5405,7 +5404,6 @@ test("unit_tests") { +@@ -5348,7 +5347,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1763,7 +1796,7 @@ } --- a/components/password_manager/core/browser/password_manager_client.h +++ b/components/password_manager/core/browser/password_manager_client.h -@@ -339,11 +339,14 @@ class PasswordManagerClient { +@@ -340,11 +340,14 @@ class PasswordManagerClient { // Returns the current best guess as to the page's display language. virtual autofill::LanguageCode GetPageLanguage() const; @@ -1779,7 +1812,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. -@@ -351,6 +354,7 @@ class PasswordManagerClient { +@@ -352,6 +355,7 @@ class PasswordManagerClient { const GURL& frame_url) = 0; #endif @@ -1787,7 +1820,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 -@@ -363,6 +367,7 @@ class PasswordManagerClient { +@@ -364,6 +368,7 @@ class PasswordManagerClient { const std::string& username, const std::vector& matching_reused_credentials, bool password_field_exists) = 0; @@ -1849,7 +1882,7 @@ public_deps = [ "//google_apis:google_apis" ] --- a/content/browser/file_system_access/safe_move_helper.cc +++ b/content/browser/file_system_access/safe_move_helper.cc -@@ -150,14 +150,8 @@ void SafeMoveHelper::Start(SafeMoveHelpe +@@ -151,14 +151,8 @@ void SafeMoveHelper::Start(SafeMoveHelpe return; } @@ -1864,7 +1897,7 @@ } void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) { -@@ -177,38 +171,6 @@ void SafeMoveHelper::ComputeHashForSourc +@@ -178,38 +172,6 @@ void SafeMoveHelper::ComputeHashForSourc std::move(wrapped_callback), source_url())); } @@ -1932,7 +1965,7 @@ // possible to request one. This is used to block file dialogs from being --- a/extensions/browser/updater/update_service.cc +++ b/extensions/browser/updater/update_service.cc -@@ -115,13 +115,6 @@ void UpdateService::OnEvent(Events event +@@ -122,13 +122,6 @@ void UpdateService::OnEvent(Events event break; } diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 977c1ce7..93d094e2 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -12,7 +12,7 @@ #include "components/url_formatter/url_fixer.h" #include "components/user_prefs/user_prefs.h" #include "components/visitedlink/browser/visitedlink_writer.h" -@@ -470,8 +469,6 @@ void AwBrowserContext::RebuildTable( +@@ -469,8 +468,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 -@@ -1636,69 +1636,9 @@ +@@ -1656,69 +1656,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. @@ -95,7 +95,7 @@ --- a/chrome/browser/android/signin/signin_manager_android.cc +++ b/chrome/browser/android/signin/signin_manager_android.cc -@@ -14,7 +14,6 @@ +@@ -15,7 +15,6 @@ #include "chrome/android/chrome_jni_headers/SigninManagerImpl_jni.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" @@ -103,7 +103,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "base/android/callback_android.h" -@@ -30,7 +29,6 @@ +@@ -31,7 +30,6 @@ #include "components/policy/core/browser/browser_policy_connector.h" #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/prefs/pref_service.h" @@ -111,7 +111,7 @@ #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "content/public/browser/browser_context.h" -@@ -95,8 +93,6 @@ class ProfileDataRemover : public conten +@@ -96,8 +94,6 @@ class ProfileDataRemover : public conten // All the Profile data has been wiped. Clear the last signed in username // as well, so that the next signin doesn't trigger the account // change dialog. @@ -120,7 +120,7 @@ } origin_runner_->PostTask(FROM_HERE, std::move(callback_)); -@@ -132,11 +128,6 @@ SigninManagerAndroid::SigninManagerAndro +@@ -133,11 +129,6 @@ SigninManagerAndroid::SigninManagerAndro DCHECK(user_cloud_policy_manager_); DCHECK(user_policy_signin_service_); @@ -132,7 +132,7 @@ force_browser_signin_.Init(prefs::kForceBrowserSignin, g_browser_process->local_state()); -@@ -160,7 +151,7 @@ void SigninManagerAndroid::Shutdown() { +@@ -161,7 +152,7 @@ void SigninManagerAndroid::Shutdown() { } bool SigninManagerAndroid::IsSigninAllowed() const { @@ -145,7 +145,7 @@ +++ b/chrome/browser/android/signin/signin_manager_android.h @@ -117,9 +117,6 @@ class SigninManagerAndroid : public Keye - Profile* const profile_ = nullptr; + const raw_ptr profile_ = nullptr; - // Handler for prefs::kSigninAllowed set in user's profile. - BooleanPrefMember signin_allowed_; @@ -175,7 +175,7 @@ --- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc +++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc @@ -37,7 +37,6 @@ - #include "components/arc/session/arc_session.h" + #include "chromeos/dbus/dbus_thread_manager.h" #include "components/crx_file/id_util.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" @@ -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 -@@ -226,7 +226,6 @@ +@@ -230,7 +230,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" @@ -298,7 +298,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" -@@ -406,8 +405,7 @@ std::string ConnectorsService::GetManage +@@ -389,8 +388,7 @@ std::string ConnectorsService::GetManage absl::optional scope = absl::nullopt; for (const char* scope_pref : @@ -307,8 +307,8 @@ + {ConnectorScopePref(AnalysisConnector::FILE_ATTACHED), ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED), ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY), - ConnectorScopePref(ReportingConnector::SECURITY_EVENT)}) { -@@ -458,20 +456,6 @@ std::string ConnectorsService::GetManage + ConnectorScopePref(AnalysisConnector::PRINT), +@@ -442,20 +440,6 @@ std::string ConnectorsService::GetManage absl::optional ConnectorsService::GetDMTokenForRealTimeUrlCheck() const { @@ -331,7 +331,7 @@ --- a/chrome/browser/enterprise/connectors/connectors_service.h +++ b/chrome/browser/enterprise/connectors/connectors_service.h -@@ -13,7 +13,6 @@ +@@ -14,7 +14,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 +341,7 @@ namespace base { --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc -@@ -183,11 +183,6 @@ void ContextInfoFetcher::Fetch(ContextIn +@@ -213,11 +213,6 @@ void ContextInfoFetcher::Fetch(ContextIn info.third_party_blocking_enabled = utils::GetThirdPartyBlockingEnabled(g_browser_process->local_state()); @@ -355,15 +355,15 @@ base::ThreadPool::CreateCOMSTATaskRunner({base::MayBlock()}) --- a/chrome/browser/enterprise/signals/context_info_fetcher.h +++ b/chrome/browser/enterprise/signals/context_info_fetcher.h -@@ -12,7 +12,6 @@ - #include "base/callback_forward.h" +@@ -13,7 +13,6 @@ + #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "chrome/browser/enterprise/signals/signals_common.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" namespace content { class BrowserContext; -@@ -39,11 +38,8 @@ struct ContextInfo { +@@ -40,11 +39,8 @@ struct ContextInfo { std::vector on_bulk_data_entry_providers; std::vector on_security_event_providers; std::string browser_version; @@ -450,7 +450,7 @@ } --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc -@@ -56,7 +56,6 @@ +@@ -57,7 +57,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_reconcilor.h" #include "components/signin/public/base/list_accounts_test_utils.h" @@ -460,7 +460,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" --- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc +++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc -@@ -30,7 +30,6 @@ +@@ -29,7 +29,6 @@ #include "chrome/common/channel_info.h" #include "chrome/common/extensions/api/identity.h" #include "components/prefs/pref_service.h" @@ -468,7 +468,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" -@@ -64,7 +63,7 @@ const char* const kExtensionsIdentityAPI +@@ -63,7 +62,7 @@ const char* const kExtensionsIdentityAPI "extensions_identity_api"; bool IsBrowserSigninAllowed(Profile* profile) { @@ -479,7 +479,7 @@ std::string GetOAuth2MintTokenFlowVersion() { --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc -@@ -35,7 +35,6 @@ +@@ -36,7 +36,6 @@ #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/proxy_config/proxy_config_pref_names.h" @@ -487,7 +487,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" #include "extensions/browser/extension_pref_value_map.h" -@@ -109,11 +108,6 @@ const PrefMappingEntry kPrefMapping[] = +@@ -110,11 +109,6 @@ const PrefMappingEntry kPrefMapping[] = APIPermissionID::kPrivacy}, {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy, APIPermissionID::kPrivacy}, @@ -499,7 +499,7 @@ {"searchSuggestEnabled", prefs::kSearchSuggestEnabled, APIPermissionID::kPrivacy, APIPermissionID::kPrivacy}, {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, -@@ -844,18 +838,6 @@ ExtensionFunction::ResponseAction SetPre +@@ -847,18 +841,6 @@ ExtensionFunction::ResponseAction SetPre base::Value(browser_pref_value->GetBool())); } @@ -518,7 +518,7 @@ preference_api->SetExtensionControlledPref( extension_id(), browser_pref, scope, base::Value::FromUniquePtrValue(std::move(browser_pref_value))); -@@ -908,18 +890,6 @@ ExtensionFunction::ResponseAction ClearP +@@ -911,18 +893,6 @@ ExtensionFunction::ResponseAction ClearP PreferenceAPI::Get(browser_context()) ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); @@ -539,7 +539,7 @@ --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc -@@ -28,7 +28,6 @@ +@@ -31,7 +31,6 @@ #include "components/keep_alive_registry/scoped_keep_alive.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" @@ -547,25 +547,25 @@ #include "components/translate/core/browser/translate_pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test.h" -@@ -73,7 +72,6 @@ class ExtensionPreferenceApiTest : publi - prefs->GetInteger(prefs::kNetworkPredictionOptions)); +@@ -86,7 +85,6 @@ class ExtensionPreferenceApiTest + prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); EXPECT_TRUE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); - EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); } -@@ -99,7 +97,6 @@ class ExtensionPreferenceApiTest : publi - prefs->GetInteger(prefs::kNetworkPredictionOptions)); +@@ -112,7 +110,6 @@ class ExtensionPreferenceApiTest + prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); EXPECT_FALSE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); - EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); } -@@ -163,7 +160,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionPreferen - prefs->SetInteger(prefs::kNetworkPredictionOptions, - chrome_browser_net::NETWORK_PREDICTION_NEVER); +@@ -185,7 +182,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen + prefetch::prefs::kNetworkPredictionOptions, + static_cast(prefetch::NetworkPredictionOptions::kDisabled)); prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false); - prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false); prefs->SetBoolean(prefs::kSearchSuggestEnabled, false); @@ -583,7 +583,7 @@ #include "extensions/browser/event_router.h" --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc -@@ -35,7 +35,6 @@ +@@ -36,7 +36,6 @@ #include "components/policy/core/common/cloud/mock_cloud_policy_client.h" #include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h" #include "components/safe_browsing/core/common/features.h" @@ -601,7 +601,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" -@@ -287,16 +286,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -289,16 +288,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::PREF_TYPE_BOOLEAN; // Security page @@ -620,7 +620,7 @@ --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc -@@ -647,9 +647,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore +@@ -646,9 +646,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, GetReferrerChainForNonSafeBrowsingUser) { PrefService* pref_service = browser()->profile()->GetPrefs(); @@ -708,7 +708,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/network_service_instance.h" -@@ -759,13 +758,6 @@ void ProfileNetworkContextService::Confi +@@ -774,13 +773,6 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; network_context_params->enable_expect_ct_reporting = true; @@ -779,14 +779,14 @@ @@ -77,7 +76,6 @@ class TrialComparisonCertVerifierControl void RefreshState(); - Profile* profile_; + raw_ptr profile_; - PrefChangeRegistrar pref_change_registrar_; mojo::ReceiverSet< cert_verifier::mojom::TrialComparisonCertVerifierReportClient> --- a/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc +++ b/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc -@@ -20,7 +20,6 @@ +@@ -21,7 +21,6 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" @@ -796,15 +796,15 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc +++ b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc -@@ -13,7 +13,6 @@ - #include "chrome/common/extensions/api/settings_private.h" +@@ -14,7 +14,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" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/signin/public/identity_manager/identity_manager.h" namespace { -@@ -43,8 +42,7 @@ bool IsUserSignedInAndSyncing(Profile* p +@@ -37,8 +36,7 @@ bool IsUserAllowedToUseLeakDetection(Pro // Returns whether the effective value of the Safe Browsing preferences for // |profile| is standard protection. bool IsSafeBrowsingStandard(Profile* profile) { @@ -814,7 +814,7 @@ } } // namespace -@@ -63,16 +61,6 @@ GeneratedPasswordLeakDetectionPref::Gene +@@ -57,16 +55,6 @@ GeneratedPasswordLeakDetectionPref::Gene base::BindRepeating( &GeneratedPasswordLeakDetectionPref::OnSourcePreferencesChanged, base::Unretained(this))); @@ -896,7 +896,7 @@ } --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -85,12 +85,9 @@ +@@ -88,12 +88,9 @@ #include "components/policy/core/common/schema.h" #include "components/policy/policy_constants.h" #include "components/proxy_config/proxy_policy_handler.h" @@ -909,7 +909,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/driver/sync_policy_handler.h" -@@ -211,15 +208,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -215,15 +212,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kQuicAllowed, prefs::kQuicAllowed, base::Value::Type::BOOLEAN }, @@ -925,7 +925,7 @@ { key::kUrlKeyedAnonymizedDataCollectionEnabled, unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, base::Value::Type::BOOLEAN }, -@@ -355,15 +343,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -359,15 +347,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGloballyScopeHTTPAuthCacheEnabled, prefs::kGloballyScopeHTTPAuthCacheEnabled, base::Value::Type::BOOLEAN }, @@ -941,7 +941,7 @@ { key::kSafeSitesFilterBehavior, policy_prefs::kSafeSitesFilterBehavior, base::Value::Type::INTEGER }, -@@ -472,18 +451,12 @@ const PolicyToPreferenceMapEntry kSimple +@@ -476,18 +455,12 @@ const PolicyToPreferenceMapEntry kSimple { key::kMaxConnectionsPerProxy, prefs::kMaxConnectionsPerProxy, base::Value::Type::INTEGER }, @@ -960,7 +960,7 @@ { key::kCECPQ2Enabled, prefs::kCECPQ2Enabled, base::Value::Type::BOOLEAN }, -@@ -683,9 +656,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -687,9 +660,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kIntranetRedirectBehavior, omnibox::kIntranetRedirectBehavior, base::Value::Type::INTEGER }, @@ -970,7 +970,7 @@ { key::kAccessibilityImageLabelsEnabled, prefs::kAccessibilityImageLabelsEnabled, base::Value::Type::BOOLEAN }, -@@ -1665,8 +1635,6 @@ std::unique_ptrAddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); @@ -979,7 +979,7 @@ handlers->AddHandler(std::make_unique( std::make_unique(key::kAuthServerWhitelist, prefs::kAuthServerAllowlist, -@@ -1690,9 +1658,6 @@ std::unique_ptrAddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); -@@ -1783,12 +1748,6 @@ std::unique_ptrAddHandler(std::make_unique( key::kClearBrowsingDataOnExitList, -@@ -1827,17 +1786,6 @@ std::unique_ptr( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); @@ -1022,7 +1022,7 @@ std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -135,7 +135,6 @@ +@@ -134,7 +134,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,7 +1030,7 @@ #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" -@@ -940,7 +939,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -921,7 +920,6 @@ void RegisterLocalState(PrefRegistrySimp ProfileNetworkContextService::RegisterLocalStatePrefs(registry); profiles::RegisterPrefs(registry); RegisterScreenshotPrefs(registry); @@ -1038,7 +1038,7 @@ secure_origin_allowlist::RegisterPrefs(registry); #if !defined(OS_ANDROID) SerialPolicyAllowedPorts::RegisterPrefs(registry); -@@ -1188,7 +1186,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1177,7 +1175,6 @@ void RegisterProfilePrefs(user_prefs::Pr PushMessagingAppIdentifier::RegisterProfilePrefs(registry); QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); @@ -1118,8 +1118,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test.h" @@ -220,9 +219,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe - prefs->SetInteger(prefs::kNetworkPredictionOptions, - chrome_browser_net::NETWORK_PREDICTION_NEVER); + prefetch::SetPreloadPagesState(prefs, + prefetch::PreloadPagesState::kNoPreloading); - EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); - prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false); @@ -1129,8 +1129,8 @@ @@ -236,7 +232,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe - EXPECT_EQ(chrome_browser_net::NETWORK_PREDICTION_NEVER, - prefs->GetInteger(prefs::kNetworkPredictionOptions)); + EXPECT_EQ(prefetch::PreloadPagesState::kNoPreloading, + prefetch::GetPreloadPagesState(*prefs)); - EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); EXPECT_FALSE( prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled)); @@ -1147,7 +1147,7 @@ #include "content/public/browser/notification_details.h" --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc -@@ -27,7 +27,6 @@ +@@ -28,7 +28,6 @@ #include "chrome/test/base/testing_profile_manager.h" #include "components/prefs/pref_service.h" #include "components/profile_metrics/state.h" @@ -1215,7 +1215,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -96,7 +96,6 @@ +@@ -93,7 +93,6 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -1223,7 +1223,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" -@@ -2104,8 +2103,7 @@ void ProfileManager::AddProfileToStorage +@@ -2148,8 +2147,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1233,7 +1233,7 @@ #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -2160,14 +2158,13 @@ void ProfileManager::AddProfileToStorage +@@ -2204,14 +2202,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsEphemeral(profile); init_params.is_signed_in_with_credential_provider = @@ -1251,7 +1251,7 @@ prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName); --- a/chrome/browser/profiles/profile_window.cc +++ b/chrome/browser/profiles/profile_window.cc -@@ -40,7 +40,6 @@ +@@ -39,7 +39,6 @@ #include "chrome/common/url_constants.h" #include "components/flags_ui/pref_service_flags_storage.h" #include "components/prefs/pref_service.h" @@ -1276,17 +1276,17 @@ -
$i18n{safeBrowsingDisableDialog}
-
$i18n{safeBrowsingDisableDialogDesc}
- + $i18n{cancel} - + - $i18n{safeBrowsingDisableDialogConfirm}
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -535,7 +535,7 @@ +@@ -551,7 +551,7 @@ @@ -1297,7 +1297,7 @@ --- a/chrome/browser/resources/settings/privacy_page/security_page.ts +++ b/chrome/browser/resources/settings/privacy_page/security_page.ts -@@ -176,15 +176,6 @@ export class SettingsSecurityPageElement +@@ -182,15 +182,6 @@ export class SettingsSecurityPageElement ready() { super.ready(); @@ -1441,7 +1441,7 @@ } /** -@@ -233,8 +224,7 @@ export class SettingsSecurityPageElement +@@ -239,8 +230,7 @@ export class SettingsSecurityPageElement } private getDisabledExtendedSafeBrowsing_(): boolean { @@ -1527,9 +1527,9 @@ #include "components/signin/public/identity_manager/identity_test_environment.h" --- a/chrome/browser/safe_browsing/android/services_delegate_android.h +++ b/chrome/browser/safe_browsing/android/services_delegate_android.h -@@ -7,7 +7,6 @@ +@@ -6,7 +6,6 @@ + #define CHROME_BROWSER_SAFE_BROWSING_ANDROID_SERVICES_DELEGATE_ANDROID_H_ - #include "base/macros.h" #include "chrome/browser/safe_browsing/services_delegate.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" @@ -1547,7 +1547,7 @@ #include "services/network/public/cpp/shared_url_loader_factory.h" --- a/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc +++ b/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc -@@ -27,7 +27,6 @@ +@@ -26,7 +26,6 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "components/prefs/pref_service.h" @@ -1567,7 +1567,7 @@ #include "net/http/http_status_code.h" --- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc -@@ -44,7 +44,6 @@ +@@ -43,7 +43,6 @@ #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/policy_constants.h" #include "components/prefs/pref_service.h" @@ -1690,7 +1690,7 @@ if (!profile_) --- a/chrome/browser/safe_browsing/chrome_password_protection_service.h +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h -@@ -212,13 +212,6 @@ class ChromePasswordProtectionService : +@@ -213,13 +213,6 @@ class ChromePasswordProtectionService : bool UserClickedThroughSBInterstitial( PasswordProtectionRequest* request) override; @@ -1716,7 +1716,7 @@ #include "components/signin/public/identity_manager/identity_test_environment.h" --- a/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc -@@ -28,9 +28,7 @@ +@@ -29,9 +29,7 @@ #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" #include "components/safe_browsing/content/browser/password_protection/password_protection_request_content.h" @@ -1758,7 +1758,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc -@@ -93,7 +93,6 @@ +@@ -94,7 +94,6 @@ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -1798,7 +1798,7 @@ } extensions::settings_private::SetPrefResult GeneratedSafeBrowsingPref::SetPref( -@@ -48,31 +32,14 @@ extensions::settings_private::SetPrefRes +@@ -48,37 +32,14 @@ extensions::settings_private::SetPrefRes return extensions::settings_private::SetPrefResult::PREF_TYPE_MISMATCH; // If SBER is forcefully disabled, Enhanced cannot be selected by the user. @@ -1828,11 +1828,17 @@ - selection != SafeBrowsingSetting::DISABLED); - profile_->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnhanced, - selection == SafeBrowsingSetting::ENHANCED); +- +- // Set ESB not set in sync with Account ESB through TailoredSecurity. +- if (selection == SafeBrowsingSetting::ENHANCED) { +- profile_->GetPrefs()->SetBoolean( +- prefs::kEnhancedProtectionEnabledViaTailoredSecurity, false); +- } - return extensions::settings_private::SetPrefResult::SUCCESS; } -@@ -83,10 +50,8 @@ GeneratedSafeBrowsingPref::GetPrefObject +@@ -89,10 +50,8 @@ GeneratedSafeBrowsingPref::GetPrefObject pref_object->key = kGeneratedSafeBrowsingPref; pref_object->type = extensions::api::settings_private::PREF_TYPE_NUMBER; @@ -1845,7 +1851,7 @@ if (safe_browsing_enhanced_enabled && safe_browsing_enabled) { pref_object->value = std::make_unique( -@@ -116,29 +81,18 @@ void GeneratedSafeBrowsingPref::ApplySaf +@@ -122,29 +81,18 @@ void GeneratedSafeBrowsingPref::ApplySaf // three different preferences. It is possible that these may be in // temporarily conflicting managed states. The enabled preference is always // taken as the canonical source of management. @@ -1881,7 +1887,7 @@ if (!enabled_enforced && !enabled_recommended && !reporting_enforced) { // No relevant policies are applied. -@@ -148,8 +102,6 @@ void GeneratedSafeBrowsingPref::ApplySaf +@@ -154,8 +102,6 @@ void GeneratedSafeBrowsingPref::ApplySaf if (enabled_enforced) { // Preference is fully controlled. pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED; @@ -1890,7 +1896,7 @@ return; } -@@ -174,8 +126,6 @@ void GeneratedSafeBrowsingPref::ApplySaf +@@ -180,8 +126,6 @@ void GeneratedSafeBrowsingPref::ApplySaf // Reporting has been forcefully disabled by policy. Enhanced protection is // thus also implicitly disabled by the same policy. pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED; @@ -1901,7 +1907,7 @@ std::make_unique>>(); --- a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc -@@ -22,7 +22,6 @@ +@@ -23,7 +23,6 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -1921,7 +1927,7 @@ #include "services/network/public/cpp/shared_url_loader_factory.h" --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc -@@ -36,7 +36,6 @@ +@@ -35,7 +35,6 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -1981,7 +1987,7 @@ #include "components/security_interstitials/content/security_interstitial_tab_helper.h" --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -121,7 +121,6 @@ base::FilePath SafeBrowsingService::GetB +@@ -119,7 +119,6 @@ base::FilePath SafeBrowsingService::GetB SafeBrowsingService::SafeBrowsingService() : services_delegate_(ServicesDelegate::Create(this)), @@ -1989,7 +1995,7 @@ shutdown_(false), enabled_(false), enabled_by_prefs_(false) {} -@@ -256,8 +255,6 @@ TriggerManager* SafeBrowsingService::tri +@@ -252,8 +251,6 @@ TriggerManager* SafeBrowsingService::tri PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService( Profile* profile) const { @@ -1998,7 +2004,7 @@ return nullptr; } -@@ -381,9 +378,6 @@ void SafeBrowsingService::OnProfileAdded +@@ -377,9 +374,6 @@ void SafeBrowsingService::OnProfileAdded std::unique_ptr registrar = std::make_unique(); registrar->Init(pref_service); @@ -2008,7 +2014,7 @@ // ClientSideDetectionService will need to be refresh the models // renderers have if extended-reporting changes. registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled, -@@ -412,14 +406,6 @@ void SafeBrowsingService::OnProfileAdded +@@ -408,14 +402,6 @@ void SafeBrowsingService::OnProfileAdded NoCachedPopulationReason::kChangeMbbPref)); user_population_prefs_[pref_service] = std::move(registrar); @@ -2023,7 +2029,7 @@ // Extended Reporting metrics are handled together elsewhere. RecordExtendedReportingMetrics(*pref_service); -@@ -461,18 +447,6 @@ void SafeBrowsingService::RefreshState() +@@ -458,18 +444,6 @@ void SafeBrowsingService::RefreshState() // Check if any profile requires the service to be active. enabled_by_prefs_ = false; @@ -2044,7 +2050,7 @@ Start(); --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h -@@ -28,7 +28,6 @@ +@@ -27,7 +27,6 @@ #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h" #include "components/safe_browsing/core/browser/db/util.h" @@ -2052,7 +2058,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "services/network/public/mojom/network_context.mojom-forward.h" -@@ -97,15 +96,6 @@ class SafeBrowsingService : public SafeB +@@ -95,15 +94,6 @@ class SafeBrowsingService : public SafeB // Called on the main thread to let us know that the io_thread is going away. void ShutDown(); @@ -2068,7 +2074,7 @@ // Get current enabled status. Must be called on IO thread. bool enabled() const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); -@@ -280,10 +270,6 @@ class SafeBrowsingService : public SafeB +@@ -275,10 +265,6 @@ class SafeBrowsingService : public SafeB // Provides phishing and malware statistics. Accessed on UI thread. std::unique_ptr ping_manager_; @@ -2106,7 +2112,7 @@ RecordApkDownloadTelemetryOutcome( --- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc +++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc -@@ -18,7 +18,6 @@ +@@ -19,7 +19,6 @@ #include "components/download/public/common/mock_download_item.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2126,7 +2132,7 @@ #include "content/public/browser/browser_thread.h" --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -19,7 +19,6 @@ +@@ -20,7 +20,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/signin_buildflags.h" @@ -2142,8 +2148,8 @@ UMA_HISTOGRAM_BOOLEAN("Signin.SigninAllowed", signin_allowed); #endif -@@ -196,16 +194,7 @@ AccountConsistencyModeManager::ComputeAc - // AccountManager is not available, when DICE has been disabled on Lacros. +@@ -193,16 +191,7 @@ AccountConsistencyModeManager::ComputeAc + return AccountConsistencyMethod::kMirror; #endif -#if BUILDFLAG(ENABLE_DICE_SUPPORT) @@ -2161,7 +2167,7 @@ } --- a/chrome/browser/signin/account_consistency_mode_manager_unittest.cc +++ b/chrome/browser/signin/account_consistency_mode_manager_unittest.cc -@@ -20,7 +20,6 @@ +@@ -19,7 +19,6 @@ #include "components/prefs/testing_pref_store.h" #include "components/signin/public/base/account_consistency_method.h" #include "components/signin/public/base/signin_buildflags.h" @@ -2324,7 +2330,7 @@ // Display the signin promo if the user is not signed in. --- a/chrome/browser/signin/signin_ui_util.cc +++ b/chrome/browser/signin/signin_ui_util.cc -@@ -35,7 +35,6 @@ +@@ -39,7 +39,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2334,7 +2340,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" --- a/chrome/browser/signin/signin_util.cc +++ b/chrome/browser/signin/signin_util.cc -@@ -31,7 +31,6 @@ +@@ -32,7 +32,6 @@ #include "components/google/core/common/google_util.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/signin_metrics.h" @@ -2342,7 +2348,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" -@@ -235,7 +234,7 @@ void EnsurePrimaryAccountAllowedForProfi +@@ -300,7 +299,7 @@ void EnsurePrimaryAccountAllowedForProfi CoreAccountInfo primary_account = identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync); @@ -2394,7 +2400,7 @@ } // namespace signin_util --- a/chrome/browser/signin/signin_util_win_browsertest.cc +++ b/chrome/browser/signin/signin_util_win_browsertest.cc -@@ -31,7 +31,6 @@ +@@ -30,7 +30,6 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/testing_browser_process.h" #include "components/prefs/pref_service.h" @@ -2404,7 +2410,7 @@ #include "components/signin/public/identity_manager/primary_account_mutator.h" --- a/chrome/browser/ssl/certificate_reporting_test_utils.cc +++ b/chrome/browser/ssl/certificate_reporting_test_utils.cc -@@ -15,7 +15,6 @@ +@@ -14,7 +14,6 @@ #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "components/prefs/pref_service.h" @@ -2434,7 +2440,7 @@ } --- a/chrome/browser/ssl/ssl_browsertest.cc +++ b/chrome/browser/ssl/ssl_browsertest.cc -@@ -93,7 +93,6 @@ +@@ -92,7 +92,6 @@ #include "components/policy/policy_constants.h" #include "components/prefs/testing_pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2493,7 +2499,7 @@ #include "components/sync/driver/sync_service.h" --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -57,7 +57,6 @@ +@@ -56,7 +56,6 @@ #include "components/prefs/pref_service.h" #include "components/sessions/core/tab_restore_service.h" #include "components/signin/public/base/signin_buildflags.h" @@ -2501,7 +2507,7 @@ #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" -@@ -202,10 +201,6 @@ BrowserCommandController::BrowserCommand +@@ -201,10 +200,6 @@ BrowserCommandController::BrowserCommand &BrowserCommandController::UpdateCommandsForFullscreenMode, base::Unretained(this))); #endif @@ -2512,7 +2518,7 @@ InitCommandState(); -@@ -1543,7 +1538,7 @@ void BrowserCommandController::UpdateSho +@@ -1542,7 +1537,7 @@ void BrowserCommandController::UpdateSho return; command_updater_.UpdateCommandEnabled( @@ -2533,7 +2539,7 @@ bool is_locked_fullscreen_ = false; --- a/chrome/browser/ui/browser_command_controller_unittest.cc +++ b/chrome/browser/ui/browser_command_controller_unittest.cc -@@ -27,7 +27,6 @@ +@@ -28,7 +28,6 @@ #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile_manager.h" @@ -2551,7 +2557,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif -@@ -484,13 +483,7 @@ void ShowBrowserSignin(Browser* browser, +@@ -490,13 +489,7 @@ void ShowBrowserSignin(Browser* browser, void ShowBrowserSigninOrSettings(Browser* browser, signin_metrics::AccessPoint access_point) { @@ -2614,7 +2620,7 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -54,7 +54,6 @@ +@@ -53,7 +53,6 @@ #include "chrome/grit/theme_resources.h" #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/public/base/consent_level.h" @@ -2622,7 +2628,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" -@@ -501,7 +500,6 @@ void ProfileMenuView::BuildAutofillButto +@@ -508,7 +507,6 @@ void ProfileMenuView::BuildAutofillButto void ProfileMenuView::BuildSyncInfo() { Profile* profile = browser()->profile(); @@ -2632,8 +2638,8 @@ signin::IdentityManager* identity_manager = --- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc -@@ -56,7 +56,6 @@ - #include "components/feature_engagement/test/test_tracker.h" +@@ -60,7 +60,6 @@ + #include "components/google/core/common/google_util.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" -#include "components/signin/public/base/signin_pref_names.h" @@ -2685,17 +2691,17 @@ --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h -@@ -60,7 +60,6 @@ class PasswordReuseModalWarningDialog +@@ -61,7 +61,6 @@ class PasswordReuseModalWarningDialog private: OnWarningDone done_callback_; -- ChromePasswordProtectionService* service_; +- raw_ptr service_; const GURL url_; const ReusedPasswordAccountType password_type_; --- a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc +++ b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc -@@ -44,7 +44,6 @@ +@@ -45,7 +45,6 @@ #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" @@ -2705,7 +2711,7 @@ #include "content/public/browser/render_process_host.h" --- a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc +++ b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc -@@ -16,7 +16,6 @@ +@@ -17,7 +17,6 @@ #include "chrome/common/webui_url_constants.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" @@ -2714,8 +2720,8 @@ #include "ui/base/window_open_disposition.h" @@ -61,13 +60,6 @@ void BrowserCommandHandler::CanExecuteCo - can_execute = - !chrome::enterprise_util::HasBrowserPoliciesApplied(profile_); + case Command::kOpenSafetyCheck: + can_execute = !chrome::enterprise_util::IsBrowserManaged(profile_); break; - case Command::kOpenSafeBrowsingEnhancedProtectionSettings: { - bool managed = safe_browsing::SafeBrowsingPolicyHandler:: @@ -2739,15 +2745,15 @@ #include "content/public/browser/render_process_host.h" --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc -@@ -38,7 +38,6 @@ +@@ -40,7 +40,6 @@ #include "components/history_clusters/core/history_clusters_prefs.h" - #include "components/history_clusters/core/memories_features.h" + #include "components/history_clusters/core/history_clusters_service.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" #include "content/public/browser/web_ui.h" -@@ -121,8 +120,6 @@ content::WebUIDataSource* CreateHistoryU +@@ -123,8 +122,6 @@ content::WebUIDataSource* CreateHistoryU source->AddBoolean("allowDeletingHistory", allow_deleting_history); source->AddBoolean("isGuestSession", profile->IsGuestSession()); @@ -2800,7 +2806,7 @@ #endif // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_ --- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc +++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc -@@ -17,7 +17,6 @@ +@@ -18,7 +18,6 @@ #include "components/safe_browsing/content/browser/password_protection/password_protection_service.h" #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -2818,7 +2824,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" -@@ -290,10 +289,6 @@ void PeopleHandler::RegisterMessages() { +@@ -292,10 +291,6 @@ void PeopleHandler::RegisterMessages() { void PeopleHandler::OnJavascriptAllowed() { PrefService* prefs = profile_->GetPrefs(); profile_pref_registrar_.Init(prefs); @@ -2831,7 +2837,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 -@@ -28,7 +28,6 @@ +@@ -27,7 +27,6 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "components/prefs/pref_service.h" @@ -2849,7 +2855,7 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/strings/grit/components_chromium_strings.h" #include "components/strings/grit/components_strings.h" -@@ -1402,44 +1401,6 @@ void AddPrivacyStrings(content::WebUIDat +@@ -1403,44 +1402,6 @@ void AddPrivacyStrings(content::WebUIDat {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, @@ -2894,7 +2900,7 @@ {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL}, {"syncAndGoogleServicesPrivacyDescription", IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT}, -@@ -2673,11 +2634,6 @@ void AddSiteSettingsStrings(content::Web +@@ -2662,11 +2623,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -2908,7 +2914,7 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -72,7 +72,6 @@ +@@ -73,7 +73,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2916,7 +2922,7 @@ #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -@@ -270,9 +269,7 @@ SettingsUI::SettingsUI(content::WebUI* w +@@ -269,9 +268,7 @@ SettingsUI::SettingsUI(content::WebUI* w ? "enable-branding-update" : ""); @@ -2937,7 +2943,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" -@@ -248,8 +247,7 @@ DiceTurnSyncOnHelper::DiceTurnSyncOnHelp +@@ -249,8 +248,7 @@ DiceTurnSyncOnHelper::DiceTurnSyncOnHelp // last authenticated account of the current profile, then Chrome will show a // confirmation dialog before starting sync. // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754). @@ -2949,7 +2955,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 -@@ -38,7 +38,6 @@ +@@ -40,7 +40,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/account_consistency_method.h" #include "components/signin/public/base/signin_metrics.h" @@ -2978,7 +2984,7 @@ default_email.clear(); --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc -@@ -70,7 +70,6 @@ +@@ -69,7 +69,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/core/browser/about_signin_internals.h" #include "components/signin/public/base/signin_metrics.h" @@ -3094,7 +3100,7 @@ "value": ["searchSuggestEnabled", {"type":"boolean"}], --- a/components/password_manager/core/browser/leak_detection_delegate.cc +++ b/components/password_manager/core/browser/leak_detection_delegate.cc -@@ -22,7 +22,6 @@ +@@ -23,7 +23,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" @@ -3102,7 +3108,7 @@ #include "services/network/public/cpp/shared_url_loader_factory.h" namespace password_manager { -@@ -169,28 +168,7 @@ void LeakDetectionDelegate::OnError(Leak +@@ -166,28 +165,7 @@ void LeakDetectionDelegate::OnError(Leak bool CanStartLeakCheck(const PrefService& prefs, const PasswordManagerClient* client) { @@ -3152,7 +3158,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" #include "url/origin.h" -@@ -205,9 +204,7 @@ PasswordReuseDetector::CheckNonGaiaEnter +@@ -216,9 +215,7 @@ PasswordReuseDetector::CheckNonGaiaEnter // Skips password reuse check if |domain| matches enterprise login URL or // enterprise change password URL. GURL page_url(domain); @@ -3173,7 +3179,7 @@ namespace password_manager { -@@ -318,20 +317,6 @@ void PasswordReuseManagerImpl::ScheduleP +@@ -320,20 +319,6 @@ void PasswordReuseManagerImpl::ScheduleP void PasswordReuseManagerImpl::ScheduleEnterprisePasswordURLUpdate() { DCHECK(main_task_runner_->RunsTasksInCurrentSequence()); @@ -3371,7 +3377,7 @@ --- a/components/safe_browsing/content/browser/ui_manager.cc +++ b/components/safe_browsing/content/browser/ui_manager.cc -@@ -17,7 +17,6 @@ +@@ -16,7 +16,6 @@ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" #include "components/safe_browsing/core/browser/ping_manager.h" #include "components/safe_browsing/core/common/features.h" @@ -3381,7 +3387,7 @@ #include "components/security_interstitials/core/unsafe_resource.h" --- a/components/safe_browsing/content/browser/ui_manager_unittest.cc +++ b/components/safe_browsing/content/browser/ui_manager_unittest.cc -@@ -14,7 +14,6 @@ +@@ -15,7 +15,6 @@ #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h" #include "components/safe_browsing/content/browser/ui_manager.h" #include "components/safe_browsing/core/browser/db/util.h" @@ -3399,7 +3405,7 @@ #include "services/network/public/mojom/cookie_manager.mojom.h" #if BUILDFLAG(FULL_SAFE_BROWSING) #include "components/enterprise/common/proto/connectors.pb.h" -@@ -2035,18 +2034,13 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -2038,18 +2037,13 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); DCHECK(!args->GetList().empty()); std::string callback_id = args->GetList()[0].GetString(); @@ -3489,7 +3495,7 @@ void V4LocalDatabaseManager::UpdateRequestCompleted( --- a/components/safe_browsing/core/browser/db/v4_local_database_manager.h +++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.h -@@ -37,8 +37,7 @@ class V4LocalDatabaseManager : public Sa +@@ -38,8 +38,7 @@ class V4LocalDatabaseManager : public Sa static scoped_refptr Create( const base::FilePath& base_path, scoped_refptr ui_task_runner, @@ -3499,7 +3505,7 @@ V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete; V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete; -@@ -107,7 +106,6 @@ class V4LocalDatabaseManager : public Sa +@@ -108,7 +107,6 @@ class V4LocalDatabaseManager : public Sa // Must be initialized by calling StartOnIOThread() before using. V4LocalDatabaseManager( const base::FilePath& base_path, @@ -3507,7 +3513,7 @@ scoped_refptr ui_task_runner, scoped_refptr io_task_runner, scoped_refptr task_runner_for_tests); -@@ -366,10 +364,6 @@ class V4LocalDatabaseManager : public Sa +@@ -367,10 +365,6 @@ class V4LocalDatabaseManager : public Sa // ready to process next update. DatabaseUpdatedCallback db_updated_callback_; @@ -3650,7 +3656,7 @@ --- a/components/safe_browsing/core/browser/db/v4_update_protocol_manager.h +++ b/components/safe_browsing/core/browser/db/v4_update_protocol_manager.h -@@ -24,7 +24,6 @@ +@@ -23,7 +23,6 @@ #include "components/safe_browsing/core/browser/db/util.h" #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" #include "components/safe_browsing/core/common/proto/webui.pb.h" @@ -3658,7 +3664,7 @@ #include "third_party/abseil-cpp/absl/types/optional.h" class GURL; -@@ -45,9 +44,6 @@ class V4UpdateProtocolManagerFactory; +@@ -44,9 +43,6 @@ class V4UpdateProtocolManagerFactory; using V4UpdateCallback = base::RepeatingCallback)>; @@ -3668,7 +3674,7 @@ class V4UpdateProtocolManager { public: V4UpdateProtocolManager(const V4UpdateProtocolManager&) = delete; -@@ -65,8 +61,7 @@ class V4UpdateProtocolManager { +@@ -64,8 +60,7 @@ class V4UpdateProtocolManager { static std::unique_ptr Create( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3678,7 +3684,7 @@ void OnURLLoaderComplete(std::unique_ptr response_body); -@@ -88,8 +83,7 @@ class V4UpdateProtocolManager { +@@ -87,8 +82,7 @@ class V4UpdateProtocolManager { V4UpdateProtocolManager( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3688,7 +3694,7 @@ private: FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest, -@@ -207,8 +201,6 @@ class V4UpdateProtocolManager { +@@ -206,8 +200,6 @@ class V4UpdateProtocolManager { // complete. base::OneShotTimer timeout_timer_; @@ -3697,7 +3703,7 @@ SEQUENCE_CHECKER(sequence_checker_); }; -@@ -226,8 +218,7 @@ class V4UpdateProtocolManagerFactory { +@@ -225,8 +217,7 @@ class V4UpdateProtocolManagerFactory { virtual std::unique_ptr CreateProtocolManager( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3801,7 +3807,7 @@ bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const { --- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -16,7 +16,6 @@ +@@ -15,7 +15,6 @@ #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/browser/referrer_chain_provider.h" #include "components/safe_browsing/core/browser/verdict_cache_manager.h" @@ -3825,7 +3831,7 @@ const int kMetricsLoggingIntervalDay = 1; -@@ -54,11 +52,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi +@@ -58,11 +56,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi PrefService* pref_service) : pref_service_(pref_service) { pref_change_registrar_.Init(pref_service_); @@ -3837,7 +3843,7 @@ } void SafeBrowsingMetricsCollector::Shutdown() { -@@ -66,16 +59,6 @@ void SafeBrowsingMetricsCollector::Shutd +@@ -70,16 +63,6 @@ void SafeBrowsingMetricsCollector::Shutd } void SafeBrowsingMetricsCollector::StartLogging() { @@ -3854,7 +3860,7 @@ } void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() { -@@ -83,9 +66,6 @@ void SafeBrowsingMetricsCollector::LogMe +@@ -87,9 +70,6 @@ void SafeBrowsingMetricsCollector::LogMe LogDailyEventMetrics(); RemoveOldEventsFromPref(); @@ -3864,7 +3870,7 @@ ScheduleNextLoggingAfterInterval(base::Days(kMetricsLoggingIntervalDay)); } -@@ -98,87 +78,16 @@ void SafeBrowsingMetricsCollector::Sched +@@ -102,87 +82,16 @@ void SafeBrowsingMetricsCollector::Sched } void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() { @@ -3952,7 +3958,7 @@ } absl::optional -@@ -194,15 +103,7 @@ absl::optional +@@ -198,15 +107,7 @@ absl::optional SafeBrowsingMetricsCollector::GetLatestEventTimestamp( EventTypeFilter event_type_filter) { // Events are not logged when Safe Browsing is disabled. @@ -3968,7 +3974,7 @@ } absl::optional -@@ -214,60 +115,14 @@ SafeBrowsingMetricsCollector::GetLatestS +@@ -218,55 +119,14 @@ SafeBrowsingMetricsCollector::GetLatestS void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref( UserState user_state, EventType event_type) { @@ -4008,12 +4014,7 @@ - if (!pref_service_->GetBoolean(prefs::kSafeBrowsingEnhanced)) { - AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection, - EventType::USER_STATE_DISABLED); -- int disabled_times_last_week = GetEventCountSince( -- UserState::kEnhancedProtection, EventType::USER_STATE_DISABLED, -- base::Time::Now() - base::Days(7)); -- if (disabled_times_last_week <= kEsbDisabledMetricsQuota) { -- LogEnhancedProtectionDisabledMetrics(); -- } +- LogEnhancedProtectionDisabledMetrics(); - } else { - AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection, - EventType::USER_STATE_ENABLED); @@ -4030,7 +4031,7 @@ } absl::optional -@@ -411,20 +266,7 @@ int SafeBrowsingMetricsCollector::GetEve +@@ -427,20 +287,7 @@ int SafeBrowsingMetricsCollector::GetEve } UserState SafeBrowsingMetricsCollector::GetUserState() { @@ -4313,8 +4314,8 @@ -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/settings_page_helper.h" #include "components/security_interstitials/core/metrics_helper.h" - #include "content/public/browser/web_contents.h" -@@ -98,11 +97,6 @@ SecurityInterstitialControllerClient::Ge + #include "content/public/browser/navigation_entry.h" +@@ -99,11 +98,6 @@ SecurityInterstitialControllerClient::Ge return prefs_; } @@ -4334,7 +4335,7 @@ protected: - // security_interstitials::ControllerClient overrides. - const std::string GetExtendedReportingPrefName() const override; - content::WebContents* web_contents_; + raw_ptr web_contents_; private: --- a/components/security_interstitials/content/security_interstitial_page.cc @@ -4401,7 +4402,7 @@ : MetricsHelper::SET_EXTENDED_REPORTING_DISABLED); --- a/components/security_interstitials/core/controller_client.h +++ b/components/security_interstitials/core/controller_client.h -@@ -122,9 +122,6 @@ class ControllerClient { +@@ -121,9 +121,6 @@ class ControllerClient { void SetBaseHelpCenterUrlForTesting(const GURL& test_url); @@ -4499,7 +4500,7 @@ #include "components/sync_preferences/testing_pref_service_syncable.h" --- a/components/signin/core/browser/account_reconcilor_unittest.cc +++ b/components/signin/core/browser/account_reconcilor_unittest.cc -@@ -30,7 +30,6 @@ +@@ -29,7 +29,6 @@ #include "components/signin/public/base/list_accounts_test_utils.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -4611,7 +4612,7 @@ } base::FilePath AccountTrackerService::GetImagePathFor( -@@ -519,24 +513,7 @@ void AccountTrackerService::OnAccountIma +@@ -519,27 +513,6 @@ void AccountTrackerService::OnAccountIma const CoreAccountId& account_id, const std::string& image_url_with_size, bool success) { @@ -4621,11 +4622,14 @@ - base::DictionaryValue* dict = nullptr; - ListPrefUpdate update(pref_service_, prefs::kAccountInfo); - for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) { -- if (update->GetDictionary(i, &dict)) { +- 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()) +- value == account_id.ToString()) { - break; +- } - } - } - @@ -4633,67 +4637,167 @@ - return; - } - dict->SetString(kLastDownloadedImageURLWithSizePath, image_url_with_size); -+ return; } void AccountTrackerService::RemoveAccountImageFromDisk( -@@ -548,11 +525,10 @@ void AccountTrackerService::RemoveAccoun +@@ -551,171 +524,16 @@ void AccountTrackerService::RemoveAccoun } void AccountTrackerService::LoadFromPrefs() { - const base::ListValue* list = pref_service_->GetList(prefs::kAccountInfo); - std::set to_remove; +- std::set to_remove; - for (size_t i = 0; i < list->GetList().size(); ++i) { -+ for (size_t i = 0; false; ++i) { - const base::DictionaryValue* dict = nullptr; -- if (list->GetDictionary(i, &dict)) { -+ if (false) { - std::string value; - if (dict->GetString(kAccountKeyPath, &value)) { - // Ignore incorrectly persisted non-canonical account ids. -@@ -588,14 +564,6 @@ void AccountTrackerService::LoadFromPref - account_info.is_child_account = is_child_status.value() - ? signin::Tribool::kTrue - : signin::Tribool::kFalse; +- 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)) { +- // Ignore incorrectly persisted non-canonical account ids. +- if (value.find('@') != std::string::npos && +- value != gaia::CanonicalizeEmail(value)) { +- to_remove.insert(CoreAccountId::FromString(value)); +- continue; +- } +- +- CoreAccountId account_id = CoreAccountId::FromString(value); +- 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; +- +- if (absl::optional is_child_status = +- dict.FindBoolKey(kDeprecatedChildStatusPath)) { +- account_info.is_child_account = is_child_status.value() +- ? signin::Tribool::kTrue +- : signin::Tribool::kFalse; - // Migrate to kAccountChildAttributePath. - ListPrefUpdate update(pref_service_, prefs::kAccountInfo); -- base::DictionaryValue* update_dict = nullptr; -- update->GetDictionary(i, &update_dict); -- DCHECK(update_dict); +- base::Value* update_dict = &update->GetList()[i]; +- DCHECK(update_dict->is_dict()); - SetAccountCapabilityPath(update_dict, kAccountChildAttributePath, - account_info.is_child_account); - update_dict->RemoveKey(kDeprecatedChildStatusPath); - } else { - account_info.is_child_account = - FindAccountCapabilityPath(*dict, kAccountChildAttributePath); -@@ -654,13 +622,11 @@ void AccountTrackerService::LoadFromPref +- } else { +- account_info.is_child_account = +- FindAccountCapabilityPath(dict, kAccountChildAttributePath); +- } +- +- absl::optional is_under_advanced_protection = +- dict.FindBoolKey(kAdvancedProtectionAccountStatusPath); +- if (is_under_advanced_protection.has_value()) { +- account_info.is_under_advanced_protection = +- is_under_advanced_protection.value(); +- } +- +- switch (FindAccountCapabilityPath( +- dict, kCanOfferExtendedChromeSyncPromosCapabilityPrefsPath)) { +- case signin::Tribool::kUnknown: +- break; +- case signin::Tribool::kTrue: +- account_info.capabilities.set_can_offer_extended_chrome_sync_promos( +- true); +- break; +- case signin::Tribool::kFalse: +- account_info.capabilities.set_can_offer_extended_chrome_sync_promos( +- false); +- break; +- } +- +- if (!account_info.gaia.empty()) +- NotifyAccountUpdated(account_info); +- } +- } +- } +- +- // Remove any obsolete prefs. +- for (auto account_id : to_remove) { +- AccountInfo account_info; +- account_info.account_id = account_id; +- RemoveFromPrefs(account_info); +- RemoveAccountImageFromDisk(account_id); +- } +- +- if (GetMigrationState() != MIGRATION_DONE) { +- const AccountIdMigrationState new_state = ComputeNewMigrationState(); +- SetMigrationState(new_state); +- +- if (new_state == MIGRATION_IN_PROGRESS) { +- MigrateToGaiaId(); +- } +- } +- +- DCHECK(GetMigrationState() != MIGRATION_DONE || AreAllAccountsMigrated()); +- UMA_HISTOGRAM_ENUMERATION("Signin.AccountTracker.GaiaIdMigrationState", +- GetMigrationState(), NUM_MIGRATION_STATES); +- +- UMA_HISTOGRAM_COUNTS_100("Signin.AccountTracker.CountOfLoadedAccounts", +- accounts_.size()); } void AccountTrackerService::SaveToPrefs(const AccountInfo& account_info) { - if (!pref_service_) - return; -+ return; - - base::DictionaryValue* dict = nullptr; +- +- base::DictionaryValue* dict = nullptr; - ListPrefUpdate update(pref_service_, prefs::kAccountInfo); - for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) { -- if (update->GetDictionary(i, &dict)) { -+ if (false) { -+ while (false) { - std::string value; - if (dict->GetString(kAccountKeyPath, &value) && - value == account_info.account_id.ToString()) -@@ -670,9 +636,6 @@ void AccountTrackerService::SaveToPrefs( - - if (!dict) { - dict = new base::DictionaryValue(); +- 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()) { +- 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->GetDictionary(update->GetList().size() - 1, &dict); - dict->SetString(kAccountKeyPath, account_info.account_id.ToString()); - } +- base::Value& dict_value = update->GetList().back(); +- DCHECK(dict_value.is_dict()); +- dict = static_cast(&dict_value); +- dict->SetString(kAccountKeyPath, account_info.account_id.ToString()); +- } +- +- dict->SetString(kAccountEmailPath, account_info.email); +- dict->SetString(kAccountGaiaPath, account_info.gaia); +- dict->SetString(kAccountHostedDomainPath, account_info.hosted_domain); +- dict->SetString(kAccountFullNamePath, account_info.full_name); +- dict->SetString(kAccountGivenNamePath, account_info.given_name); +- dict->SetString(kAccountLocalePath, account_info.locale); +- dict->SetString(kAccountPictureURLPath, account_info.picture_url); +- SetAccountCapabilityPath(dict, kAccountChildAttributePath, +- account_info.is_child_account); +- dict->SetBoolean(kAdvancedProtectionAccountStatusPath, +- account_info.is_under_advanced_protection); +- // |kLastDownloadedImageURLWithSizePath| should only be set after the GAIA +- // picture is successufly saved to disk. Otherwise, there is no guarantee that +- // |kLastDownloadedImageURLWithSizePath| matches the picture on disk. +- SetAccountCapabilityPath( +- dict, kCanOfferExtendedChromeSyncPromosCapabilityPrefsPath, +- account_info.capabilities.can_offer_extended_chrome_sync_promos()); + } -@@ -699,14 +662,7 @@ void AccountTrackerService::RemoveFromPr + void AccountTrackerService::RemoveFromPrefs(const AccountInfo& account_info) { if (!pref_service_) return; @@ -4778,7 +4882,7 @@ InitializeListedAccountsIds(); --- a/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc +++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc -@@ -25,7 +25,6 @@ +@@ -24,7 +24,6 @@ #include "components/prefs/testing_pref_service.h" #include "components/signin/internal/identity_manager/account_tracker_service.h" #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h" @@ -4973,7 +5077,7 @@ return false; --- a/components/signin/internal/identity_manager/primary_account_manager_unittest.cc +++ b/components/signin/internal/identity_manager/primary_account_manager_unittest.cc -@@ -24,7 +24,6 @@ +@@ -25,7 +25,6 @@ #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.h" #include "components/signin/internal/identity_manager/primary_account_policy_manager.h" #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" @@ -5072,7 +5176,7 @@ ProfileOAuth2TokenServiceDelegate* ProfileOAuth2TokenService::GetDelegate() { --- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc +++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc -@@ -25,7 +25,6 @@ +@@ -24,7 +24,6 @@ #include "components/account_manager_core/mock_account_manager_facade.h" #include "components/signin/internal/identity_manager/account_tracker_service.h" #include "components/signin/internal/identity_manager/profile_oauth2_token_service_observer.h" @@ -5230,7 +5334,7 @@ #include "components/sync_preferences/testing_pref_service_syncable.h" --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -84630,7 +84630,6 @@ Full version information for the fingerp +@@ -86155,7 +86155,6 @@ Full version information for the fingerp @@ -5238,7 +5342,7 @@ -@@ -84645,10 +84644,7 @@ Full version information for the fingerp +@@ -86170,10 +86169,7 @@ Full version information for the fingerp diff --git a/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch b/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch index 1b8bbdcd..25b55d25 100644 --- a/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch +++ b/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch @@ -8,7 +8,7 @@ - "keyword": "google.com", - "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico", - "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}", -- "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}", +- "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:clientCacheTimeToLive}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}", - "image_url": "{google:baseSearchByImageURL}upload", - "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}", - "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}", diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index bb4d7d54..597c80c1 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 -@@ -135,6 +135,7 @@ +@@ -136,6 +136,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" -@@ -1767,6 +1768,8 @@ void RenderViewContextMenu::AppendPageIt +@@ -1765,6 +1766,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 = -@@ -1788,6 +1791,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -1786,6 +1789,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 3bc2425a..050e201f 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 -@@ -2383,6 +2383,7 @@ static_library("browser") { +@@ -2379,6 +2379,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 -@@ -149,6 +149,7 @@ +@@ -148,6 +148,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 -@@ -221,6 +221,7 @@ source_set("browser") { +@@ -223,6 +223,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 -@@ -68,6 +68,7 @@ +@@ -69,6 +69,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" -@@ -3429,6 +3430,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3338,6 +3339,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" -@@ -473,6 +474,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -484,6 +485,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 -@@ -218,6 +218,8 @@ class WebRuntimeFeatures { +@@ -221,6 +221,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" -@@ -854,6 +855,14 @@ Range* Document::CreateRangeAdjustedToTr +@@ -870,6 +871,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(); -@@ -2138,6 +2147,15 @@ void Document::UpdateStyleAndLayoutTreeF +@@ -2173,6 +2182,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 -@@ -454,6 +454,10 @@ class CORE_EXPORT Document : public Cont +@@ -457,6 +457,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; -@@ -2070,6 +2074,9 @@ class CORE_EXPORT Document : public Cont +@@ -2086,6 +2090,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -179,7 +179,7 @@ HeapVector> current_script_stack_; --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2119,6 +2119,11 @@ DOMRectList* Element::getClientRects() { +@@ -2052,6 +2052,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom( quads, *element_layout_object); @@ -191,7 +191,7 @@ return MakeGarbageCollected(quads); } -@@ -2136,6 +2141,9 @@ FloatRect Element::GetBoundingClientRect +@@ -2069,6 +2074,9 @@ FloatRect Element::GetBoundingClientRect DCHECK(element_layout_object); GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -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 -@@ -912,9 +912,15 @@ TextMetrics* CanvasRenderingContext2D::m +@@ -921,9 +921,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 -@@ -1688,6 +1688,7 @@ component("platform") { +@@ -1684,6 +1684,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 -@@ -685,4 +685,12 @@ void WebRuntimeFeatures::EnableCLSScroll +@@ -697,4 +697,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 -@@ -1078,6 +1078,12 @@ +@@ -1102,6 +1102,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 f5b93b45..ffb418ea 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 -@@ -3432,6 +3432,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3341,6 +3341,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 -@@ -478,6 +478,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -489,6 +489,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 -@@ -220,6 +220,7 @@ class WebRuntimeFeatures { +@@ -223,6 +223,7 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool); BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool); BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool); @@ -72,8 +72,8 @@ approach to change color components. +#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h" #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/heap.h" -@@ -2332,6 +2333,9 @@ ImageData* BaseRenderingContext2D::getIm + #include "third_party/blink/renderer/platform/heap/garbage_collected.h" +@@ -2055,6 +2056,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 -@@ -1646,7 +1646,9 @@ component("platform") { +@@ -1641,7 +1641,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 -@@ -693,4 +693,8 @@ void WebRuntimeFeatures::EnableFingerpri +@@ -705,4 +705,8 @@ void WebRuntimeFeatures::EnableFingerpri RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable); } @@ -151,10 +151,10 @@ approach to change color components. #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkSurface.h" +#include "third_party/skia/include/private/SkColorData.h" + #include "ui/gfx/geometry/skia_conversions.h" #include "v8/include/v8.h" - namespace blink { -@@ -80,4 +84,154 @@ void StaticBitmapImage::DrawHelper(cc::P +@@ -79,4 +83,154 @@ void StaticBitmapImage::DrawHelper(cc::P WebCoreClampingModeToSkiaRectConstraint(draw_options.clamping_mode)); } @@ -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 -@@ -1084,6 +1084,9 @@ +@@ -1108,6 +1108,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 e76f50f8..6d25c393 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 -@@ -2138,6 +2138,7 @@ static_library("browser") { +@@ -2134,6 +2134,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -49,12 +49,11 @@ with limited CPU/memory resources and it is disabled by default. #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -19,11 +19,13 @@ +@@ -19,10 +19,12 @@ #include "base/debug/leak_annotations.h" #include "base/files/file_path.h" #include "base/location.h" +#include "base/logging.h" - #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h" @@ -63,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" -@@ -104,6 +106,7 @@ +@@ -103,6 +105,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" @@ -71,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" -@@ -136,6 +139,7 @@ +@@ -135,6 +138,7 @@ #include "media/media_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "net/log/net_log.h" @@ -79,7 +78,7 @@ 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" -@@ -346,6 +350,18 @@ void BrowserProcessImpl::Init() { +@@ -345,6 +349,18 @@ void BrowserProcessImpl::Init() { base::BindRepeating(&ApplyMetricsReportingPolicy)); #endif @@ -100,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 -@@ -1580,6 +1580,10 @@ const char kLogJsConsoleMessagesDescript +@@ -1583,6 +1583,10 @@ const char kLogJsConsoleMessagesDescript "Enable logging JS console messages in system logs, please note that they " "may contain PII."; @@ -113,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 -@@ -906,6 +906,9 @@ extern const char kLiteVideoForceOverrid +@@ -916,6 +916,9 @@ extern const char kLensCameraAssistedSea extern const char kLogJsConsoleMessagesName[]; extern const char kLogJsConsoleMessagesDescription[]; diff --git a/patches/extra/debian/disable/google-api-warning.patch b/patches/extra/debian/disable/google-api-warning.patch index d221a5ad..5ed977e0 100644 --- a/patches/extra/debian/disable/google-api-warning.patch +++ b/patches/extra/debian/disable/google-api-warning.patch @@ -1,9 +1,9 @@ description: disable the google api key warning when those aren't found author: Michael Gilbert ---- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc -+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -662,9 +662,6 @@ void StartupBrowserCreatorImpl::AddInfoB +--- a/chrome/browser/ui/startup/infobar_utils.cc ++++ b/chrome/browser/ui/startup/infobar_utils.cc +@@ -113,9 +113,6 @@ void AddInfoBarsIfNecessary(Browser* bro infobars::ContentInfoBarManager* infobar_manager = infobars::ContentInfoBarManager::FromWebContents(web_contents); diff --git a/patches/extra/debian/disable/welcome-page.patch b/patches/extra/debian/disable/welcome-page.patch index 66f1e3f8..517ef3cc 100644 --- a/patches/extra/debian/disable/welcome-page.patch +++ b/patches/extra/debian/disable/welcome-page.patch @@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1309,7 +1309,7 @@ void ProfileManager::InitProfileUserPref +@@ -1347,7 +1347,7 @@ void ProfileManager::InitProfileUserPref profile->GetPrefs()->SetString(prefs::kSupervisedUserId, supervised_user_id); } diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 6c991a2a..795aa61a 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 -@@ -1246,7 +1246,7 @@ void ChromeContentBrowserClient::Registe +@@ -1253,7 +1253,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -21,28 +21,6 @@ // Register user prefs for mapping SitePerProcess and IsolateOrigins in // user policy in addition to the same named ones in Local State (which are // used for mapping the command-line flags). ---- a/chrome/browser/net/prediction_options.cc -+++ b/chrome/browser/net/prediction_options.cc -@@ -31,7 +31,7 @@ NetworkPredictionStatus CanPrefetchAndPr - } - return NetworkPredictionStatus::DISABLED_DUE_TO_NETWORK; - default: -- DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options); -+ //DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options); - return NetworkPredictionStatus::DISABLED_ALWAYS; - } - } ---- a/chrome/browser/net/prediction_options.h -+++ b/chrome/browser/net/prediction_options.h -@@ -22,7 +22,7 @@ enum NetworkPredictionOptions { - NETWORK_PREDICTION_ALWAYS, - NETWORK_PREDICTION_WIFI_ONLY, - NETWORK_PREDICTION_NEVER, -- NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_WIFI_ONLY, -+ NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_NEVER, - }; - - enum class NetworkPredictionStatus { --- 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 @@ -54,9 +32,20 @@ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref(prefs::kQuicAllowed, true); registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled, +--- a/chrome/browser/prefetch/prefetch_prefs.h ++++ b/chrome/browser/prefetch/prefetch_prefs.h +@@ -22,7 +22,7 @@ enum class NetworkPredictionOptions { + kWifiOnlyDeprecated = 1, + kDisabled = 2, + kExtended = 3, +- kDefault = kWifiOnlyDeprecated, ++ kDefault = kDisabled, + }; + + // Enum representing possible values of the Preload Pages opt-in state. Since --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -276,7 +276,7 @@ const char Profile::kProfileKey[] = "__P +@@ -277,7 +277,7 @@ const char Profile::kProfileKey[] = "__P void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, @@ -105,7 +94,7 @@ registry->RegisterDictionaryPref(prefs::kAppWindowPlacement); --- a/chrome/service/cloud_print/connector_settings.cc +++ b/chrome/service/cloud_print/connector_settings.cc -@@ -59,7 +59,7 @@ void ConnectorSettings::InitFrom(Service +@@ -60,7 +60,7 @@ void ConnectorSettings::InitFrom(Service DCHECK(server_url_.is_valid()); connect_new_printers_ = prefs->GetBoolean( @@ -140,7 +129,7 @@ prefs::kAutofillProfileValidity, "", --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc -@@ -437,7 +437,7 @@ bool DoesBookmarkContainWords(const std: +@@ -438,7 +438,7 @@ bool DoesBookmarkContainWords(const std: void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kShowBookmarkBar, diff --git a/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch b/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch index 6a85393f..6ee4d730 100644 --- a/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch +++ b/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch @@ -1,6 +1,6 @@ --- a/sandbox/linux/BUILD.gn +++ b/sandbox/linux/BUILD.gn -@@ -327,6 +327,12 @@ if (is_linux || is_chromeos) { +@@ -296,6 +296,12 @@ if (is_linux || is_chromeos) { # These files have a suspicious comparison. # TODO fix this and re-enable this warning. "-Wno-sign-compare", 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 c30f24de..f1647d9a 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 -@@ -105,7 +105,7 @@ bool ValidateUrl(const GURL& url) { +@@ -107,7 +107,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/inox-patchset/0019-disable-battery-status-service.patch b/patches/extra/inox-patchset/0019-disable-battery-status-service.patch index 0ca8a9bd..e69d4da0 100644 --- a/patches/extra/inox-patchset/0019-disable-battery-status-service.patch +++ b/patches/extra/inox-patchset/0019-disable-battery-status-service.patch @@ -84,7 +84,7 @@ } --- a/services/device/battery/battery_status_service.h +++ b/services/device/battery/battery_status_service.h -@@ -60,15 +60,10 @@ class BatteryStatusService { +@@ -59,15 +59,10 @@ class BatteryStatusService { // Updates current battery status and sends new status to interested // render processes. Can be called on any thread via a callback. void NotifyConsumers(const mojom::BatteryStatus& status); 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 e0b87d60..a64d3a3e 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 @@ -9,7 +9,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1498,8 +1498,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1490,8 +1490,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { diff --git a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch b/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch index a93133f3..fe39bb45 100644 --- a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch +++ b/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch @@ -12,7 +12,7 @@ it as hidden as it was before? --- a/net/cert/x509_util.cc +++ b/net/cert/x509_util.cc -@@ -241,7 +241,7 @@ bool GetTLSServerEndPointChannelBinding( +@@ -243,7 +243,7 @@ bool GetTLSServerEndPointChannelBinding( } // RSA keys created by CreateKeyAndSelfSignedCert will be of this length. diff --git a/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch b/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch index 7429cad7..41e42b88 100644 --- a/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch +++ b/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch @@ -10,9 +10,9 @@ Out with all those tracking cookies! --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -126,7 +126,7 @@ void ContentSettingsRegistry::Init() { - // WARNING: The string names of the permissions passed in below are used to - // generate preference names and should never be changed! +@@ -131,7 +131,7 @@ void ContentSettingsRegistry::Init() { + // PrefProvider::DiscardOrMigrateObsoletePreferences() and + // DefaultProvider::DiscardOrMigrateObsoletePreferences() accordingly. - Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_ALLOW, + Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY, diff --git a/patches/extra/iridium-browser/updater-disable-auto-update.patch b/patches/extra/iridium-browser/updater-disable-auto-update.patch index 4d7d276f..b83fad27 100644 --- a/patches/extra/iridium-browser/updater-disable-auto-update.patch +++ b/patches/extra/iridium-browser/updater-disable-auto-update.patch @@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome. --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm -@@ -864,7 +864,7 @@ static base::mac::ScopedObjCClassSwizzle +@@ -865,7 +865,7 @@ static base::mac::ScopedObjCClassSwizzle CFStringRef checkInterval = CFSTR("checkInterval"); CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app); if (!plist) { 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 a142bdb9..27cc4e4a 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 -@@ -142,6 +142,8 @@ +@@ -140,6 +140,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" -@@ -467,6 +469,7 @@ Browser::Browser(const CreateParams& par +@@ -464,6 +466,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), -@@ -830,7 +833,7 @@ Browser::WarnBeforeClosingResult Browser +@@ -831,7 +834,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_) -@@ -860,6 +863,7 @@ bool Browser::TryToCloseWindow( +@@ -861,6 +864,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = NOT_PROMPTED; @@ -34,7 +34,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -2690,6 +2694,62 @@ bool Browser::CanCloseWithInProgressDown +@@ -2684,6 +2688,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; -@@ -2708,6 +2768,22 @@ void Browser::InProgressDownloadResponse +@@ -2702,6 +2762,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -130,7 +130,7 @@ #include "chrome/browser/ui/signin_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/unload_controller.h" -@@ -1009,12 +1010,17 @@ class Browser : public TabStripModelObse +@@ -1010,12 +1011,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -148,7 +148,7 @@ // Called when all warnings have completed when attempting to close the // browser directly (e.g. via hotkey, close button, terminate signal, etc.) // Used as a WarnBeforeClosingCallback by ShouldCloseWindow(). -@@ -1177,6 +1183,8 @@ class Browser : public TabStripModelObse +@@ -1178,6 +1184,8 @@ class Browser : public TabStripModelObse // when the browser is closed with in-progress downloads. CancelDownloadConfirmationState cancel_download_confirmation_state_; 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 2768f4d6..cb3347f5 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 -@@ -751,6 +751,9 @@ bool HandleNewTabPageLocationOverride( +@@ -758,6 +758,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 9dc7ed90..96ec98d3 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 @@ -42,7 +42,7 @@ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/metrics/histogram.h" -@@ -276,6 +278,15 @@ AutocompleteController::AutocompleteCont +@@ -270,6 +272,15 @@ AutocompleteController::AutocompleteCont search_service_worker_signal_sent_(false), template_url_service_(provider_client_->GetTemplateURLService()) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); @@ -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 -@@ -551,6 +551,9 @@ void HistoryURLProvider::Start(const Aut +@@ -552,6 +552,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 b59389df..21aeda27 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 -@@ -6014,7 +6014,7 @@ bool ChromeContentBrowserClient::ShouldA +@@ -6053,7 +6053,7 @@ bool ChromeContentBrowserClient::ShouldA const url::Origin& embedder_origin, const content::PepperPluginInfo& plugin_info) { #if BUILDFLAG(ENABLE_PDF) @@ -22,7 +22,7 @@ } --- a/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc +++ b/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc -@@ -66,7 +66,7 @@ class PDFIFrameNavigationThrottleTest : +@@ -67,7 +67,7 @@ class PDFIFrameNavigationThrottleTest : // Register a fake PDF Viewer plugin into our plugin service. content::WebPluginInfo info; info.name = @@ -251,7 +251,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -250,6 +250,7 @@ static_library("common") { +@@ -248,6 +248,7 @@ static_library("common") { "//components/no_state_prefetch/common", "//components/no_state_prefetch/common:mojo_bindings", "//components/page_load_metrics/common:common", @@ -272,7 +272,7 @@ content::WebPluginMimeType pdf_mime_type( --- a/chrome/common/chrome_content_client.h +++ b/chrome/common/chrome_content_client.h -@@ -42,8 +42,8 @@ class ChromeContentClient : public conte +@@ -41,8 +41,8 @@ class ChromeContentClient : public conte static const base::FilePath::CharType kNaClPluginFileName[]; #endif @@ -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 -@@ -1048,7 +1048,7 @@ WebPlugin* ChromeContentRendererClient:: +@@ -1038,7 +1038,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. -@@ -1080,7 +1080,7 @@ WebPlugin* ChromeContentRendererClient:: +@@ -1070,7 +1070,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()); -@@ -1093,7 +1093,7 @@ WebPlugin* ChromeContentRendererClient:: +@@ -1083,7 +1083,7 @@ WebPlugin* ChromeContentRendererClient:: PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type, url); if (info.name == 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 2bc1b1ff..a527ef87 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 @@ -52,7 +52,7 @@ --- a/chrome/renderer/chrome_render_frame_observer.h +++ b/chrome/renderer/chrome_render_frame_observer.h -@@ -139,6 +139,7 @@ class ChromeRenderFrameObserver : public +@@ -138,6 +138,7 @@ class ChromeRenderFrameObserver : public #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) safe_browsing::PhishingClassifierDelegate* phishing_classifier_ = nullptr; #endif @@ -70,7 +70,7 @@ #include "base/containers/contains.h" #include "base/debug/crash_logging.h" #include "base/format_macros.h" -@@ -197,6 +198,12 @@ bool IsCreatedByExtension(const Template +@@ -198,6 +199,12 @@ bool IsCreatedByExtension(const Template template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION; } @@ -83,7 +83,7 @@ } // namespace // TemplateURLService::LessWithPrefix ----------------------------------------- -@@ -282,6 +289,7 @@ TemplateURLService::TemplateURLService( +@@ -283,6 +290,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)), -@@ -363,8 +371,8 @@ bool TemplateURLService::CanAddAutogener +@@ -364,8 +372,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( -@@ -1500,6 +1508,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -1501,6 +1509,8 @@ SyncDataMap TemplateURLService::CreateGU void TemplateURLService::Init(const Initializer* initializers, int num_initializers) { @@ -111,7 +111,7 @@ if (client_) client_->SetOwner(this); -@@ -1636,6 +1646,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -1637,6 +1647,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -125,7 +125,7 @@ +++ b/components/search_engines/template_url_service.h @@ -706,6 +706,8 @@ class TemplateURLService : public WebDat // ---------- Browser state related members --------------------------------- - PrefService* prefs_ = nullptr; + raw_ptr prefs_ = nullptr; + bool should_autocollect_; // Whether search engines should be auto-collected + 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 67aeb585..0e989638 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 @@ -7,8 +7,8 @@ +#include "base/command_line.h" #include "base/debug/alias.h" #include "base/i18n/rtl.h" - #include "base/metrics/user_metrics.h" -@@ -636,6 +637,8 @@ void Tab::OnGestureEvent(ui::GestureEven + #include "base/memory/raw_ptr.h" +@@ -637,6 +638,8 @@ void Tab::OnGestureEvent(ui::GestureEven } std::u16string Tab::GetTooltipText(const gfx::Point& p) const { @@ -27,7 +27,7 @@ #include "base/compiler_specific.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" -@@ -1844,6 +1845,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -1846,6 +1847,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 740910df..5a075774 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 -@@ -1154,7 +1154,8 @@ void BrowserCommandController::InitComma +@@ -1153,7 +1153,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 e728056a..c9665fa9 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 @@ -1,6 +1,6 @@ --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc -@@ -24,6 +24,7 @@ +@@ -25,6 +25,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/sync/sync_service_factory.h" @@ -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" -@@ -151,6 +152,21 @@ class BrowsingDataRemoverObserver +@@ -152,6 +153,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()) { -@@ -292,8 +308,9 @@ void ChromeBrowsingDataLifetimeManager:: +@@ -293,8 +309,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(); -@@ -304,8 +321,8 @@ void ChromeBrowsingDataLifetimeManager:: +@@ -305,8 +322,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 ff635c25..4ec10e12 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 @@ -7,8 +7,8 @@ +#include "base/command_line.h" #include "base/containers/flat_map.h" #include "base/cxx17_backports.h" - #include "base/metrics/histogram_macros.h" -@@ -1779,6 +1780,10 @@ bool TabStripModel::CloseTabs(base::span + #include "base/memory/raw_ptr.h" +@@ -1765,6 +1766,10 @@ bool TabStripModel::CloseTabs(base::span if (items.empty()) return true; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch index da16ea52..c2678afc 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch @@ -19,9 +19,9 @@ #include "base/bind.h" +#include "base/command_line.h" #include "base/i18n/rtl.h" - #include "base/macros.h" #include "base/metrics/histogram_macros.h" -@@ -196,7 +197,8 @@ void AppModalDialogManager::RunBeforeUnl + #include "base/strings/utf_string_conversions.h" +@@ -195,7 +196,8 @@ void AppModalDialogManager::RunBeforeUnl ChromeJavaScriptDialogExtraData* extra_data = &javascript_dialog_extra_data_[web_contents]; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch index 079d7afd..5fc9d2bb 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch @@ -21,7 +21,7 @@ #include "base/callback_helpers.h" #include "base/compiler_specific.h" #include "base/containers/flat_set.h" -@@ -911,7 +912,8 @@ void HistoryBackend::InitImpl( +@@ -936,7 +937,8 @@ void HistoryBackend::InitImpl( db_->GetStartDate(&first_recorded_time_); // Start expiring old stuff. 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 0cc9c848..7084922f 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 @@ -13,15 +13,15 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/url_formatter/url_formatter.cc +++ b/components/url_formatter/url_formatter.cc -@@ -8,6 +8,7 @@ +@@ -9,6 +9,7 @@ #include #include +#include "base/command_line.h" #include "base/lazy_instance.h" + #include "base/memory/raw_ptr.h" #include "base/numerics/safe_conversions.h" - #include "base/strings/strcat.h" -@@ -264,6 +265,13 @@ IDNConversionResult IDNToUnicodeWithAdju +@@ -268,6 +269,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-hide-crashed-bubble.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch index b9b7d5d9..a7a43aa7 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch @@ -1,15 +1,15 @@ # Add flag --hide-crashed-bubble to hide the bubble box: # "Restore Pages? Chromium didn't shut down correctly." ---- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc -+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -638,7 +638,8 @@ void StartupBrowserCreatorImpl::AddInfoB - if (command_line_.HasSwitch(switches::kKioskMode)) +--- a/chrome/browser/ui/startup/infobar_utils.cc ++++ b/chrome/browser/ui/startup/infobar_utils.cc +@@ -80,7 +80,8 @@ void AddInfoBarsIfNecessary(Browser* bro return; -- if (HasPendingUncleanExit(browser->profile())) -+ if (HasPendingUncleanExit(browser->profile()) && -+ !command_line_.HasSwitch("hide-crashed-bubble")) + // Web apps should not display the session restore bubble (crbug.com/1264121) +- if (!is_web_app && HasPendingUncleanExit(browser->profile())) ++ if (!is_web_app && HasPendingUncleanExit(browser->profile()) && ++ !startup_command_line.HasSwitch("hide-crashed-bubble")) SessionCrashedBubble::ShowIfNotOffTheRecordProfile( browser, /*skip_tab_checking=*/false); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch index bfc54031..b5089f8e 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc -@@ -972,7 +972,11 @@ void Tab::UpdateIconVisibility() { +@@ -973,7 +973,11 @@ void Tab::UpdateIconVisibility() { if (IsActive()) { // Close button is shown on active tabs regardless of the size. showing_close_button_ = true; @@ -12,7 +12,7 @@ showing_alert_indicator_ = has_alert_icon && alert_icon_width <= available_width; -@@ -993,6 +997,8 @@ void Tab::UpdateIconVisibility() { +@@ -994,6 +998,8 @@ void Tab::UpdateIconVisibility() { available_width -= favicon_width; showing_close_button_ = large_enough_for_close_button; 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 6a0d0d6b..e90524e2 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch @@ -8,7 +8,7 @@ #include "base/metrics/user_metrics.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -@@ -109,6 +110,18 @@ DragOperation GetDropEffect(const ui::Dr +@@ -108,6 +109,18 @@ DragOperation GetDropEffect(const ui::Dr return DragOperation::kMove; } @@ -27,7 +27,7 @@ } // namespace BrowserRootView::DropInfo::DropInfo() = default; -@@ -120,7 +133,9 @@ BrowserRootView::DropInfo::~DropInfo() { +@@ -119,7 +132,9 @@ BrowserRootView::DropInfo::~DropInfo() { BrowserRootView::BrowserRootView(BrowserView* browser_view, views::Widget* widget) @@ -38,7 +38,7 @@ BrowserRootView::~BrowserRootView() { // It's possible to destroy the browser while a drop is active. In this case, -@@ -245,7 +260,7 @@ bool BrowserRootView::OnMouseWheel(const +@@ -243,7 +258,7 @@ bool BrowserRootView::OnMouseWheel(const // Scroll-event-changes-tab is incompatible with scrolling tabstrip, so // disable it if the latter feature is enabled. @@ -49,7 +49,7 @@ // tabstrip, or the empty space beside the tabstrip. --- a/chrome/browser/ui/views/frame/browser_root_view.h +++ b/chrome/browser/ui/views/frame/browser_root_view.h -@@ -143,6 +143,8 @@ class BrowserRootView : public views::in +@@ -144,6 +144,8 @@ class BrowserRootView : public views::in int scroll_remainder_x_ = 0; int scroll_remainder_y_ = 0; 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 587f7d5d..8b196578 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,12 +275,28 @@ void ToolbarView::Init() { +@@ -275,14 +275,30 @@ void ToolbarView::Init() { std::unique_ptr toolbar_account_icon_container; @@ -19,6 +19,8 @@ - show_avatar_toolbar_button = browser_->profile()->IsOffTheRecord() || - browser_->profile()->IsGuestSession(); + show_avatar_toolbar_button = in_incognito_or_guest_mode; + #elif BUILDFLAG(IS_CHROMEOS_LACROS) + show_avatar_toolbar_button = !profiles::IsPublicSession(); #endif + + if (flag_value == "always") diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index ae62eece..7da5cea9 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 kPartitionedCookies{ - const base::Feature kExtraCookieValidityChecks{ - "ExtraCookieValidityChecks", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -260,5 +260,7 @@ const base::Feature kFirstPartySetsV2Com + const base::Feature kRecordRadioWakeupTrigger{ + "RecordRadioWakeupTrigger", base::FEATURE_DISABLED_BY_DEFAULT}; +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 -@@ -392,6 +392,8 @@ NET_EXPORT extern const base::Feature kP - // feature flag, assuming no breakage occurs with it enabled. - NET_EXPORT extern const base::Feature kExtraCookieValidityChecks; +@@ -389,6 +389,8 @@ NET_EXPORT extern const base::Feature kF + // Android. + NET_EXPORT extern const base::Feature kRecordRadioWakeupTrigger; +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 -@@ -139,11 +139,6 @@ const unsigned kMinimumTTLSeconds = kCac +@@ -144,11 +144,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, -@@ -3698,7 +3693,7 @@ bool HostResolverManager::IsIPv6Reachabl +@@ -3727,7 +3722,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 4680b2c6..44559ab4 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 -@@ -20,6 +20,13 @@ +@@ -27,6 +27,13 @@ value="{{queryUrl_}}" on-focus="validate_" on-input="validate_" disabled$="[[model.urlLocked]]"> @@ -34,8 +34,8 @@ + suggestionsUrl_: String, dialogTitle_: String, actionButtonText_: String, - }; -@@ -64,6 +66,7 @@ export class SettingsSearchEngineDialogE + +@@ -70,6 +72,7 @@ export class SettingsSearchEngineDialogE private searchEngine_: string; private keyword_: string; private queryUrl_: string; @@ -43,7 +43,7 @@ private dialogTitle_: string; private actionButtonText_: string; private browserProxy_: SearchEnginesBrowserProxy = -@@ -93,6 +96,7 @@ export class SettingsSearchEngineDialogE +@@ -100,6 +103,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'); -@@ -128,8 +132,12 @@ export class SettingsSearchEngineDialogE +@@ -135,8 +139,12 @@ export class SettingsSearchEngineDialogE } } @@ -66,7 +66,7 @@ } private cancel_() { -@@ -138,7 +146,8 @@ export class SettingsSearchEngineDialogE +@@ -145,7 +153,8 @@ export class SettingsSearchEngineDialogE private onActionButtonTap_() { this.browserProxy_.searchEngineEditCompleted( @@ -76,7 +76,7 @@ this.$.dialog.close(); } -@@ -166,9 +175,11 @@ export class SettingsSearchEngineDialogE +@@ -173,9 +182,11 @@ export class SettingsSearchEngineDialogE private updateActionButtonState_() { const allValid = [ @@ -272,7 +272,7 @@ bool CanEdit(const TemplateURL* url) const; --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc -@@ -109,21 +109,25 @@ void TemplateURLTableModel::Remove(int i +@@ -108,21 +108,25 @@ void TemplateURLTableModel::Remove(int i void TemplateURLTableModel::Add(int index, const std::u16string& short_name, const std::u16string& keyword, @@ -303,7 +303,7 @@ DCHECK(index >= 0 && index <= RowCount()); DCHECK(!url.empty()); TemplateURL* template_url = GetTemplateURL(index); -@@ -132,7 +136,8 @@ void TemplateURLTableModel::ModifyTempla +@@ -131,7 +135,8 @@ void TemplateURLTableModel::ModifyTempla DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url || template_url->SupportsReplacement( template_url_service_->search_terms_data())); @@ -315,7 +315,7 @@ TemplateURL* TemplateURLTableModel::GetTemplateURL(int index) { --- a/chrome/browser/ui/search_engines/template_url_table_model.h +++ b/chrome/browser/ui/search_engines/template_url_table_model.h -@@ -54,13 +54,15 @@ class TemplateURLTableModel : public ui: +@@ -53,13 +53,15 @@ class TemplateURLTableModel : public ui: void Add(int index, const std::u16string& short_name, const std::u16string& keyword, @@ -425,7 +425,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -641,7 +641,8 @@ void TemplateURLService::IncrementUsageC +@@ -642,7 +642,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()); -@@ -656,6 +657,7 @@ void TemplateURLService::ResetTemplateUR +@@ -657,6 +658,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 feaa3e62..38ea569a 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 -@@ -2763,7 +2763,13 @@ const FeatureEntry::FeatureVariation kWi +@@ -2647,7 +2647,13 @@ const FeatureEntry::FeatureVariation kSn // 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-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index 37a6c44b..e8b6e348 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -2,7 +2,7 @@ --- a/components/download/internal/common/base_file.cc +++ b/components/download/internal/common/base_file.cc -@@ -23,7 +23,6 @@ +@@ -22,7 +22,6 @@ #include "components/download/public/common/download_interrupt_reasons_utils.h" #include "components/download/public/common/download_item.h" #include "components/download/public/common/download_stats.h" @@ -10,7 +10,7 @@ #include "crypto/secure_hash.h" #if defined(OS_WIN) -@@ -530,105 +529,6 @@ DownloadInterruptReason BaseFile::Publis +@@ -529,105 +528,6 @@ DownloadInterruptReason BaseFile::Publis } #endif // defined(OS_ANDROID) @@ -116,7 +116,7 @@ void BaseFile::AnnotateWithSourceInformation( const std::string& client_guid, -@@ -636,32 +536,8 @@ void BaseFile::AnnotateWithSourceInforma +@@ -635,32 +535,8 @@ void BaseFile::AnnotateWithSourceInforma const GURL& referrer_url, mojo::PendingRemote remote_quarantine, OnAnnotationDoneCallback on_annotation_done_callback) { @@ -153,7 +153,7 @@ } // namespace download --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -81,7 +81,6 @@ source_set("browser") { +@@ -83,7 +83,6 @@ source_set("browser") { "//components/permissions:permissions_common", "//components/power_scheduler", "//components/services/filesystem:lib", @@ -163,15 +163,15 @@ "//components/services/storage/dom_storage:local_storage_proto", --- a/content/browser/file_system_access/safe_move_helper.cc +++ b/content/browser/file_system_access/safe_move_helper.cc -@@ -12,7 +12,6 @@ - #include "base/task/thread_pool.h" +@@ -13,7 +13,6 @@ #include "base/threading/sequenced_task_runner_handle.h" #include "build/build_config.h" + #include "build/chromeos_buildflags.h" -#include "components/services/quarantine/quarantine.h" #include "content/browser/file_system_access/file_system_access_error.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_client.h" -@@ -193,20 +192,8 @@ void SafeMoveHelper::DidAfterWriteCheck( +@@ -194,20 +193,8 @@ void SafeMoveHelper::DidAfterWriteCheck( // not exist anymore. In case of error, the source file URL will point to a // valid filesystem location. base::OnceCallback result_callback; @@ -192,7 +192,7 @@ manager_->DoFileSystemOperation( FROM_HERE, &storage::FileSystemOperationRunner::Move, std::move(result_callback), source_url(), dest_url(), options_, -@@ -222,7 +209,6 @@ void SafeMoveHelper::DidFileSkipQuaranti +@@ -223,7 +210,6 @@ void SafeMoveHelper::DidFileSkipQuaranti void SafeMoveHelper::DidFileDoQuarantine( const storage::FileSystemURL& target_url, const GURL& referrer_url, @@ -200,7 +200,7 @@ base::File::Error result) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -253,37 +239,9 @@ void SafeMoveHelper::DidFileDoQuarantine +@@ -254,37 +240,9 @@ void SafeMoveHelper::DidFileDoQuarantine referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS() ? referrer_url : GURL(); @@ -274,7 +274,7 @@ --- a/content/browser/renderer_host/pepper/pepper_file_io_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h @@ -13,7 +13,6 @@ - #include "base/macros.h" + #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "components/services/quarantine/public/mojom/quarantine.mojom.h" diff --git a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch index 7c23e616..a7647a0a 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 -@@ -463,14 +463,14 @@ ComponentResult IDNToUnicodeOneComponent +@@ -467,14 +467,14 @@ ComponentResult IDNToUnicodeOneComponent } // namespace const FormatUrlType kFormatUrlOmitNothing = 0; diff --git a/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch b/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch index 233a5c04..9e495b0d 100644 --- a/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch +++ b/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch @@ -1,6 +1,6 @@ --- a/components/optimization_guide/core/optimization_guide_features.cc +++ b/components/optimization_guide/core/optimization_guide_features.cc -@@ -41,7 +41,7 @@ const base::Feature kOptimizationHintsFi +@@ -43,7 +43,7 @@ const base::Feature kOptimizationHintsFi // Enables fetching from a remote Optimization Guide Service. const base::Feature kRemoteOptimizationGuideFetching{ diff --git a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch index a48184be..7372bf32 100644 --- a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch @@ -3,7 +3,7 @@ --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3617,8 +3617,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3630,8 +3630,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -13,7 +13,7 @@ } SynthesizeGLError( GL_INVALID_ENUM, "getParameter", -@@ -3632,8 +3631,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3645,8 +3644,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_VENDOR)))); } diff --git a/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch b/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch index 77476efc..b03be733 100644 --- a/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch +++ b/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch @@ -2,7 +2,7 @@ --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -422,7 +422,7 @@ const base::Feature kComputePressure{"Co +@@ -432,7 +432,7 @@ const base::Feature kComputePressure{"Co // Prefetch request properties are updated to be privacy-preserving. See // crbug.com/988956. const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges", diff --git a/patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch b/patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch index 1a1b21c6..915b3be1 100644 --- a/patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch +++ b/patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/views/toolbar/reload_button.cc +++ b/chrome/browser/ui/views/toolbar/reload_button.cc -@@ -84,7 +84,7 @@ bool ReloadButton::GetMenuEnabled() cons +@@ -83,7 +83,7 @@ bool ReloadButton::GetMenuEnabled() cons } void ReloadButton::SetMenuEnabled(bool enable) { 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 0090102a..461da579 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 @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc -@@ -441,11 +441,6 @@ int GetContentRestrictions(const Browser +@@ -442,11 +442,6 @@ int GetContentRestrictions(const Browser CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(current_tab); content_restrictions = core_tab_helper->content_restrictions(); @@ -14,7 +14,7 @@ } return content_restrictions; } -@@ -1351,8 +1346,7 @@ bool CanSavePage(const Browser* browser) +@@ -1352,8 +1347,7 @@ bool CanSavePage(const Browser* browser) DownloadPrefs::DownloadRestriction::ALL_FILES) { return false; } @@ -37,7 +37,7 @@ OfflinePageModel::OfflinePageModel() = default; --- a/content/common/url_schemes.cc +++ b/content/common/url_schemes.cc -@@ -23,6 +23,9 @@ namespace { +@@ -23,13 +23,22 @@ namespace { bool g_registered_url_schemes = false; const char* const kDefaultSavableSchemes[] = { @@ -47,8 +47,7 @@ url::kHttpScheme, url::kHttpsScheme, url::kFileScheme, -@@ -30,7 +33,13 @@ const char* const kDefaultSavableSchemes - url::kFtpScheme, + url::kFileSystemScheme, kChromeDevToolsScheme, kChromeUIScheme, - url::kDataScheme @@ -64,7 +63,7 @@ // These lists are lazily initialized below and are leaked on shutdown to --- a/content/public/common/url_utils.cc +++ b/content/public/common/url_utils.cc -@@ -26,11 +26,7 @@ bool HasWebUIScheme(const GURL& url) { +@@ -27,11 +27,7 @@ bool HasWebUIScheme(const GURL& url) { } bool IsSavableURL(const GURL& url) { 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 e82ce2f3..e96b3067 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 @@ -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 -@@ -2339,8 +2339,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2341,8 +2341,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; -@@ -2348,7 +2346,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2350,7 +2348,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/prepopulated-search-engines.patch b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch index ad0bae8c..ef49d8bf 100644 --- a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch +++ b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch @@ -8,7 +8,7 @@ # --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -1325,6 +1325,9 @@ std::vector> t_urls; for (size_t i = 0; i < num_engines; ++i) t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(*engines[i])); diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index e4502469..1110e143 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -161,7 +161,7 @@ @@ -172,8 +172,8 @@ section="safetyCheck" nest-under-section="privacy" --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html -@@ -8,7 +8,7 @@ - border-top: none; +@@ -13,7 +13,7 @@ + padding-inline-start: 0; } - @@ -181,16 +181,18 @@ -- -- +-