diff --git a/chromium_version.txt b/chromium_version.txt index e40312c1..b5abce32 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -140.0.7339.213 +141.0.7390.54 diff --git a/domain_substitution.list b/domain_substitution.list index 0b9cea3c..c5bec92b 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -1,3 +1,4 @@ +.gemini/commands/PRESUBMIT.py BUILD.gn PRESUBMIT.py PRESUBMIT_test.py @@ -313,6 +314,7 @@ base/logging.h base/mac/close_nocancel.cc base/memory/aligned_memory.cc base/memory/discardable_shared_memory.cc +base/memory/platform_shared_memory_mapper_android.cc base/memory/raw_ptr_asan_service.cc base/memory/scoped_refptr.h base/memory/weak_ptr.h @@ -456,14 +458,15 @@ build/config/arm.gni build/config/chrome_build.gni build/config/chromeos/args.gni build/config/chromeos/rules.gni +build/config/clang/clang.gni build/config/compiler/BUILD.gn build/config/compiler/compiler.gni build/config/fuchsia/BUILD.gn build/config/linux/pkg_config.gni build/config/locales.gni build/config/ozone.gni -build/config/rust.gni build/config/sanitizers/sanitizers.gni +build/config/siso/configure_siso.py build/config/win/BUILD.gn build/config/win/control_flow_guard.gni build/fuchsia/PRESUBMIT.py @@ -505,6 +508,9 @@ cc/input/browser_controls_offset_manager.cc cc/input/scroll_state.h cc/input/scrollbar_controller.h cc/metrics/average_lag_tracker.h +cc/metrics/event_metrics.h +cc/metrics/scroll_jank_dropped_frame_tracker.cc +cc/metrics/scroll_jank_dropped_frame_tracker.h cc/paint/paint_image.h cc/paint/tone_map_util.cc cc/raster/one_copy_raster_buffer_provider.cc @@ -668,6 +674,7 @@ chrome/browser/ash/attestation/soft_bind_attestation_flow_impl_unittest.cc chrome/browser/ash/attestation/tpm_challenge_key_subtle_unittest.cc chrome/browser/ash/bluetooth/bluetooth_log_controller_unittest.cc chrome/browser/ash/bluetooth/debug_logs_manager_unittest.cc +chrome/browser/ash/boca/on_task/locked_quiz_session_manager_browsertest.cc chrome/browser/ash/boca/on_task/on_task_locked_session_navigation_throttle_interactive_ui_test.cc chrome/browser/ash/boca/on_task/on_task_locked_session_window_tracker_browsertest.cc chrome/browser/ash/boca/spotlight/spotlight_crd_manager_impl_browsertest.cc @@ -908,7 +915,6 @@ chrome/browser/chromeos/arc/arc_external_protocol_dialog_unittest.cc chrome/browser/chromeos/enterprise/cloud_storage/one_drive_pref_observer_browsertest.cc chrome/browser/chromeos/extensions/desk_api/desk_api_extension_manager.cc chrome/browser/chromeos/extensions/desk_api/desk_api_extension_manager.h -chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.cc chrome/browser/chromeos/extensions/odfs_config_private/odfs_config_private_api_unittest.cc chrome/browser/chromeos/extensions/telemetry/api/common/api_guard_delegate_unittest.cc chrome/browser/chromeos/network/network_portal_signin_window_ash_browsertest.cc @@ -943,6 +949,7 @@ chrome/browser/data_sharing/desktop/data_sharing_service_browsertest.cc chrome/browser/device_identity/device_oauth2_token_service_unittest.cc chrome/browser/device_notifications/device_connection_tracker_unittest.cc chrome/browser/devtools/aida_client.h +chrome/browser/devtools/aida_service_handler.cc chrome/browser/devtools/device/adb/adb_client_socket_browsertest.cc chrome/browser/devtools/device/adb/mock_adb_server.cc chrome/browser/devtools/device/usb/android_rsa.cc @@ -950,6 +957,7 @@ chrome/browser/devtools/devtools_browsertest.cc chrome/browser/devtools/devtools_ui_bindings.cc chrome/browser/devtools/devtools_ui_bindings_unittest.cc chrome/browser/devtools/features.cc +chrome/browser/devtools/gdp_service_handler.cc chrome/browser/devtools/process_sharing_infobar_delegate.cc chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc chrome/browser/devtools/protocol/devtools_pwa_browsertest.cc @@ -986,7 +994,7 @@ chrome/browser/enterprise/connectors/reporting/reporting_event_router_unittest.c chrome/browser/enterprise/connectors/test/active_user_test_mixin.cc chrome/browser/enterprise/connectors/test/deep_scanning_test_utils.cc chrome/browser/enterprise/data_controls/chrome_rules_service_unittest.cc -chrome/browser/enterprise/data_controls/reporting_service_unittest.cc +chrome/browser/enterprise/data_controls/reporting_unittest.cc chrome/browser/enterprise/data_protection/clipboard_browsertest.cc chrome/browser/enterprise/data_protection/data_protection_clipboard_utils_browsertest.cc chrome/browser/enterprise/data_protection/data_protection_navigation_observer_unittest.cc @@ -1160,6 +1168,8 @@ chrome/browser/glic/host/glic_cookie_synchronizer_unittest.cc chrome/browser/glic/host/glic_page_handler.cc chrome/browser/glic/host/glic_ui.cc chrome/browser/glic/host/guest_util_unittest.cc +chrome/browser/glic/media/glic_media_integration.cc +chrome/browser/glic/media/glic_media_integration_unittest.cc chrome/browser/glic/media/glic_media_link_helper.cc chrome/browser/glic/media/glic_media_link_helper_unittest.cc chrome/browser/google/google_update_win.cc @@ -1254,7 +1264,6 @@ chrome/browser/nearby_sharing/text_attachment_unittest.cc chrome/browser/net/cert_verify_proc_browsertest.cc chrome/browser/net/dns_probe_runner.cc chrome/browser/net/dns_probe_runner.h -chrome/browser/net/errorpage_browsertest.cc chrome/browser/net/profile_network_context_service.cc chrome/browser/net/proxy_browsertest.cc chrome/browser/net/qwac_web_contents_observer.cc @@ -1278,6 +1287,7 @@ chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevan chrome/browser/new_tab_page/modules/v2/tab_groups/tab_groups_page_handler.cc chrome/browser/new_tab_page/modules/v2/tab_groups/tab_groups_page_handler_unittest.cc chrome/browser/new_tab_page/new_tab_page_util_browsertest.cc +chrome/browser/new_tab_page/ntp_promo/ntp_promo_interactive_uitest.cc chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc chrome/browser/new_tab_page/promos/promo_service_unittest.cc chrome/browser/no_best_effort_tasks_browsertest.cc @@ -1310,6 +1320,7 @@ chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.c chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/gws_abandoned_page_load_metrics_observer_browsertest.cc chrome/browser/page_load_metrics/observers/gws_hp_page_load_metrics_observer_browsertest.cc +chrome/browser/page_load_metrics/observers/gws_page_load_metrics_observer_browsertest.cc chrome/browser/page_load_metrics/observers/gws_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer_unittest.cc @@ -1323,7 +1334,6 @@ chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer_u chrome/browser/page_load_metrics/observers/scheme_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc chrome/browser/partnerbookmarks/partner_bookmarks_reader.cc -chrome/browser/password_manager/android/account_storage_notice/BUILD.gn chrome/browser/password_manager/android/all_passwords_bottom_sheet_controller_unittest.cc chrome/browser/password_manager/android/chromesync_status_code.h chrome/browser/password_manager/android/credential_leak_controller_android_unittest.cc @@ -1353,7 +1363,6 @@ chrome/browser/permissions/permission_element_origin_trial_browsertest.cc chrome/browser/permissions/permissions_security_model_interactive_uitest.cc chrome/browser/permissions/prediction_service/prediction_service_browsertest.cc chrome/browser/permissions/quiet_permission_prompt_model_android.cc -chrome/browser/platform_util_win.cc chrome/browser/policy/cloud/cloud_policy_browsertest.cc chrome/browser/policy/cloud/cloud_policy_invalidator.h chrome/browser/policy/cloud/device_management_service_browsertest.cc @@ -1430,7 +1439,6 @@ chrome/browser/profiles/profile_manager_unittest.cc chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc chrome/browser/profiles/profile_shortcut_manager_win.cc chrome/browser/profiles/profiles_state_unittest.cc -chrome/browser/push_messaging/push_messaging_constants.cc chrome/browser/push_messaging/push_messaging_notification_manager.h chrome/browser/push_messaging/push_messaging_notification_manager_unittest.cc chrome/browser/push_messaging/push_messaging_service_impl.cc @@ -1524,8 +1532,6 @@ chrome/browser/resources/chromeos/app_install/app_install_dialog.html chrome/browser/resources/chromeos/arc_support/background.js chrome/browser/resources/chromeos/arc_support/bubble.js chrome/browser/resources/chromeos/arc_support/playstore.js -chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js -chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js chrome/browser/resources/chromeos/borealis_installer/borealis_installer_icons.html chrome/browser/resources/chromeos/borealis_installer/error_dialog.ts chrome/browser/resources/chromeos/echo/manifest.json @@ -1556,7 +1562,6 @@ chrome/browser/resources/extensions/mv2_deprecation_panel.ts chrome/browser/resources/feedback/js/feedback_util.ts chrome/browser/resources/gaia_auth_host/PRESUBMIT.py chrome/browser/resources/gaia_auth_host/authenticator.js -chrome/browser/resources/gaia_auth_host/password_change_authenticator.js chrome/browser/resources/gaia_auth_host/saml_handler.js chrome/browser/resources/gaia_auth_host/saml_password_attributes.js chrome/browser/resources/glic/url_pattern.d.ts @@ -1579,7 +1584,7 @@ chrome/browser/resources/new_tab_page/app.ts chrome/browser/resources/new_tab_page/doodle_share_dialog.ts chrome/browser/resources/new_tab_page/lens_form.html chrome/browser/resources/new_tab_page/lens_form.ts -chrome/browser/resources/new_tab_page/modules/v2/calendar/google_calendar_module.html +chrome/browser/resources/new_tab_page/modules/calendar/google_calendar_module.html chrome/browser/resources/new_tab_page/transparency.ts chrome/browser/resources/new_tab_page/voice_search_overlay.ts chrome/browser/resources/omnibox/omnibox.html @@ -1587,7 +1592,6 @@ chrome/browser/resources/omnibox/omnibox.ts chrome/browser/resources/omnibox/omnibox_output.ts chrome/browser/resources/omnibox/omnibox_util.ts chrome/browser/resources/on_device_internals/event_log.ts -chrome/browser/resources/pdf/ink/drawing_canvas.d.ts chrome/browser/resources/print_preview/data/destination_store.ts chrome/browser/resources/print_preview/ui/icons.html chrome/browser/resources/privacy_sandbox/internals/private_state_tokens/list_container.html.ts @@ -1603,8 +1607,8 @@ chrome/browser/resources/settings/appearance_page/appearance_page.ts chrome/browser/resources/settings/icons.html chrome/browser/resources/settings/languages_page/edit_dictionary_page.ts chrome/browser/resources/settings/settings_shared.css +chrome/browser/resources/side_panel/read_anything/read_aloud/voice_language_conversions.ts chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts -chrome/browser/resources/side_panel/read_anything/voice_language_util.ts chrome/browser/resources/suggest_internals/request.ts chrome/browser/resources/usb_internals/descriptor_panel.ts chrome/browser/resources/webstore_app/manifest.json @@ -1632,6 +1636,7 @@ chrome/browser/safe_browsing/download_protection/download_protection_delegate_an chrome/browser/safe_browsing/download_protection/download_protection_delegate_desktop.cc chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service_browsertest.cc +chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service_unittest.cc chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.cc chrome/browser/safe_browsing/extension_telemetry/potential_password_theft_signal_processor_unittest.cc chrome/browser/safe_browsing/extension_telemetry/remote_host_contacted_signal_processor_unittest.cc @@ -1645,6 +1650,7 @@ chrome/browser/safe_browsing/notification_telemetry/notification_telemetry_servi chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc chrome/browser/safe_browsing/tailored_security/chrome_tailored_security_service_unittest.cc chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer_unittest.cc +chrome/browser/save_to_drive/drive_uploader.cc chrome/browser/search/background/ntp_custom_background_service.cc chrome/browser/search/ntp_features_unittest.cc chrome/browser/search/search.h @@ -1679,6 +1685,8 @@ chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_ chrome/browser/signin/bound_session_credentials/bound_session_cookie_observer_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_cookie_refresh_service_impl_browsertest.cc chrome/browser/signin/bound_session_credentials/bound_session_cookie_refresh_service_impl_unittest.cc +chrome/browser/signin/bound_session_credentials/bound_session_oauth_multilogin_delegate_impl.cc +chrome/browser/signin/bound_session_credentials/bound_session_oauth_multilogin_delegate_impl_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_params_storage_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_params_util_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_debug_report_fetcher_unittest.cc @@ -1776,6 +1784,7 @@ chrome/browser/sync/test/integration/two_client_custom_passphrase_sync_test.cc chrome/browser/sync/test/integration/two_client_history_sync_test.cc chrome/browser/sync/test/integration/two_client_power_bookmarks_sync_test.cc chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc +chrome/browser/sync/test/integration/two_client_send_tab_to_self_sync_test.cc chrome/browser/sync/test/integration/two_client_shared_tab_group_data_sync_test.cc chrome/browser/sync/test/integration/two_client_user_events_sync_test.cc chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc @@ -1789,6 +1798,7 @@ chrome/browser/task_manager/sampling/shared_sampler_win_defines.h chrome/browser/themes/theme_syncable_service.cc chrome/browser/translate/translate_manager_browsertest.cc chrome/browser/trusted_vault/trusted_vault_encryption_keys_tab_helper_browsertest.cc +chrome/browser/ui/accelerator_table.cc chrome/browser/ui/android/extensions/extension_action_popup_contents.cc chrome/browser/ui/android/strings/android_chrome_strings.grd chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc @@ -1904,6 +1914,7 @@ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc chrome/browser/ui/omnibox/omnibox_view_browsertest.cc chrome/browser/ui/page_info/chrome_page_info_ui_delegate.cc chrome/browser/ui/passwords/bubble_controllers/move_to_account_store_bubble_controller_unittest.cc +chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller_unittest.cc chrome/browser/ui/passwords/display_account_info_unittest.cc chrome/browser/ui/passwords/manage_passwords_state_unittest.cc chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc @@ -1946,7 +1957,6 @@ chrome/browser/ui/tabs/pinned_tab_service_browsertest.cc chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_page_action_controller_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/instant_message_queue_processor_unittest.cc -chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/tab_group_sync_delegate_browsertest.cc chrome/browser/ui/tabs/tab_list_interface_observer.h chrome/browser/ui/tabs/tab_strip_api/tab_strip_service_impl_browsertest.cc @@ -1956,7 +1966,6 @@ chrome/browser/ui/toolbar/app_menu_model_interactive_uitest.cc chrome/browser/ui/toolbar/cast/cast_toolbar_button_util.cc chrome/browser/ui/toolbar/location_bar_model_unittest.cc chrome/browser/ui/url_identity_unittest.cc -chrome/browser/ui/views/accelerator_table.cc chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc chrome/browser/ui/views/autofill/payments/filled_card_information_bubble_views_interactive_uitest.cc chrome/browser/ui/views/autofill/payments/iban_bubble_view_uitest.cc @@ -1990,6 +1999,7 @@ chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc chrome/browser/ui/views/file_system_access/file_system_access_usage_bubble_view_browsertest.cc chrome/browser/ui/views/frame/browser_root_view_browsertest.cc chrome/browser/ui/views/frame/browser_view.h +chrome/browser/ui/views/frame/browser_view_browsertest.cc chrome/browser/ui/views/frame/multi_contents_drop_target_view_unittest.cc chrome/browser/ui/views/frame/multi_contents_view_browsertest.cc chrome/browser/ui/views/frame/multi_contents_view_drop_target_controller_unittest.cc @@ -2119,9 +2129,10 @@ chrome/browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_untrusted_ui.cc chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_handler_browsertest.cc chrome/browser/ui/webui/privacy_sandbox/private_state_tokens/private_state_tokens_handler.cc -chrome/browser/ui/webui/profile_info_watcher.h chrome/browser/ui/webui/sanitized_image_source.cc chrome/browser/ui/webui/sanitized_image_source_unittest.cc +chrome/browser/ui/webui/searchbox/searchbox_handler.cc +chrome/browser/ui/webui/searchbox/searchbox_handler_unittest.cc chrome/browser/ui/webui/settings/about_handler_unittest.cc chrome/browser/ui/webui/settings/on_startup_handler_unittest.cc chrome/browser/ui/webui/settings/people_handler_unittest.cc @@ -2148,6 +2159,7 @@ chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher. chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher_unittest.cc chrome/browser/ui/webui/signin/batch_upload_ui.cc chrome/browser/ui/webui/signin/signin_error_handler_browsertest.cc +chrome/browser/ui/webui/signin/signin_utils_desktop_unittest.cc chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc chrome/browser/ui/webui/signin/sync_confirmation_ui.cc chrome/browser/ui/webui/signin/turn_sync_on_helper_browsertest.cc @@ -2179,7 +2191,6 @@ chrome/browser/web_applications/commands/fetch_manifest_and_install_command.cc chrome/browser/web_applications/commands/install_app_from_verified_manifest_command.cc chrome/browser/web_applications/commands/install_app_from_verified_manifest_command_browsertest.cc chrome/browser/web_applications/isolated_web_apps/browser_navigator_iwa_browsertest.cc -chrome/browser/web_applications/isolated_web_apps/isolated_web_app_source_unittest.cc chrome/browser/web_applications/isolated_web_apps/policy/isolated_web_app_cache_browsertest.cc chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.cc chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.h @@ -2257,11 +2268,10 @@ chrome/common/extensions/api/identity.idl chrome/common/extensions/api/instance_id.json chrome/common/extensions/api/printing.idl chrome/common/extensions/api/privacy.json -chrome/common/extensions/api/reading_list.idl chrome/common/extensions/api/scripting.idl chrome/common/extensions/api/tabs.json chrome/common/extensions/api/tts.json -chrome/common/extensions/api/web_authentication_proxy.idl +chrome/common/extensions/api/url_handlers/url_handlers_parser.h chrome/common/extensions/api/webrtc_audio_private.idl chrome/common/extensions/api/webview_tag.json chrome/common/extensions/api/windows.json @@ -2391,7 +2401,6 @@ chrome/renderer/accessibility/read_anything/read_anything_app_controller_browser chrome/renderer/accessibility/read_anything/read_anything_app_model.cc chrome/renderer/accessibility/read_anything/read_anything_app_model_browsertest.cc chrome/renderer/accessibility/read_anything/read_anything_node_utils.cc -chrome/renderer/accessibility/read_anything/read_anything_node_utils_unittest.cc chrome/renderer/app_categorizer_unittest.cc chrome/renderer/ash_merge_session_loader_throttle_unittest.cc chrome/renderer/autofill/autofill_renderer_browsertest.cc @@ -2492,6 +2501,7 @@ chrome/test/fuzzing/atspi_in_process_fuzzer.cc chrome/test/fuzzing/in_process_fuzzer.cc chrome/test/interaction/interactive_browser_test_interactive_uitest.cc chrome/test/media_router/media_router_gmc_ui_for_test.cc +chrome/test/media_router/performance/performance_test.py chrome/test/mini_installer/PRESUBMIT.py chrome/test/mini_installer/create_zip.py chrome/test/mini_installer/installer_test.py @@ -2592,7 +2602,6 @@ chromeos/ash/components/enhanced_network_tts/enhanced_network_tts_constants.h chromeos/ash/components/enhanced_network_tts/enhanced_network_tts_impl.cc chromeos/ash/components/enhanced_network_tts/enhanced_network_tts_test_utils.h chromeos/ash/components/enhanced_network_tts/enhanced_network_tts_utils.cc -chromeos/ash/components/file_manager/indexing/file_index_service_registry_unittest.cc chromeos/ash/components/fwupd/firmware_update_manager.cc chromeos/ash/components/fwupd/firmware_update_manager_unittest.cc chromeos/ash/components/geolocation/simple_geolocation_provider.h @@ -2704,6 +2713,7 @@ components/autofill/core/browser/autofill_and_password_manager_internals/autofil components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager_unittest.cc components/autofill/core/browser/crowdsourcing/determine_possible_field_types_unittest.cc +components/autofill/core/browser/data_manager/addresses/account_name_email_store_unittest.cc components/autofill/core/browser/data_manager/addresses/address_data_cleaner_unittest.cc components/autofill/core/browser/data_manager/addresses/address_data_manager_unittest.cc components/autofill/core/browser/data_manager/payments/payments_data_manager_unittest.cc @@ -2730,7 +2740,6 @@ components/autofill/core/browser/payments/credit_card_risk_based_authenticator_u components/autofill/core/browser/payments/credit_card_save_manager_unittest.cc components/autofill/core/browser/payments/full_card_request_unittest.cc components/autofill/core/browser/payments/multiple_request_payments_network_interface_base.cc -components/autofill/core/browser/payments/payments_access_token_fetcher.cc components/autofill/core/browser/payments/payments_access_token_fetcher_unittest.cc components/autofill/core/browser/payments/payments_network_interface_base.cc components/autofill/core/browser/payments/payments_network_interface_test_base.cc @@ -2742,11 +2751,13 @@ components/autofill/core/browser/permissions/autofill_ai/autofill_ai_permission_ components/autofill/core/browser/strike_databases/autofill_ai/autofill_ai_save_strike_database_by_host_unittest.cc components/autofill/core/browser/suggestions/addresses/address_suggestion_generator_unittest.cc components/autofill/core/browser/test_utils/autofill_test_utils.cc +components/autofill/core/browser/test_utils/test_profiles.cc components/autofill/core/browser/ui/autofill_external_delegate_unittest.cc components/autofill/core/browser/ui/autofill_image_fetcher.cc components/autofill/core/browser/ui/payments/bnpl_tos_controller_impl.cc components/autofill/core/browser/ui/payments/bnpl_tos_controller_impl_unittest.cc components/autofill/core/browser/webdata/addresses/autofill_profile_sync_bridge.h +components/autofill/core/browser/webdata/autofill_ai/entity_sync_util.cc components/autofill/core/browser/webdata/payments/autofill_wallet_sync_bridge.h components/autofill/core/browser/webdata/payments/autofill_wallet_sync_bridge_unittest.cc components/autofill/core/browser/webdata/payments/autofill_wallet_usage_data_sync_bridge_unittest.cc @@ -2789,6 +2800,7 @@ components/browsing_topics/annotator_impl_unittest.cc components/captive_portal/content/captive_portal_service.h components/captive_portal/content/captive_portal_tab_helper.h components/captive_portal/core/captive_portal_detector.cc +components/captive_portal/core/features.h components/cdm/common/playready_cdm_common.h components/certificate_transparency/chrome_require_ct_delegate.h components/certificate_transparency/chrome_require_ct_delegate_unittest.cc @@ -2836,6 +2848,7 @@ components/crash/core/app/crash_reporter_client.cc components/crash/core/browser/resources/crashes.ts components/crash/core/common/crash_key.h components/cronet/PRESUBMIT.py +components/cronet/android/cronet_bidirectional_stream_adapter.h components/cronet/android/test/javaperftests/AndroidManifest.xml components/cronet/android/test/javatests/AndroidManifest.xml components/cronet/gn2bp/gen_android_bp.py @@ -2887,12 +2900,14 @@ components/drive/service/fake_drive_service.cc components/embedder_support/android/BUILD.gn components/endpoint_fetcher/endpoint_fetcher_unittest.cc components/enterprise/connectors/core/content_area_user_provider.cc +components/enterprise/connectors/core/content_area_user_provider.h components/enterprise/connectors/core/reporting_utils_unittest.cc components/enterprise/connectors/core/service_provider_config.cc components/enterprise/connectors/core/service_provider_config_unittest.cc components/enterprise/data_controls/core/browser/conditions/attributes_condition_unittest.cc components/enterprise/data_controls/core/browser/data_controls_policy_handler_unittest.cc components/enterprise/data_controls/core/browser/rule_unittest.cc +components/enterprise/data_controls/core/browser/rules_service_base_unittest.cc components/enterprise/obfuscation/core/utils.h components/enterprise/signin/enterprise_identity_service_unittest.cc components/error_page/common/localized_error.cc @@ -2945,6 +2960,7 @@ components/google/core/common/google_util_unittest.cc components/guest_view/browser/guest_view_base.h components/gwp_asan/client/extreme_lightweight_detector_malloc_shims.cc components/gwp_asan/client/extreme_lightweight_detector_quarantine.h +components/history/core/browser/BUILD.gn components/history/core/browser/browsing_history_service.cc components/history/core/browser/expire_history_backend_unittest.cc components/history/core/browser/history_backend.cc @@ -3046,6 +3062,8 @@ components/metrics/metrics_state_manager.h components/metrics/metrics_state_manager_unittest.cc components/metrics/net/net_metrics_log_uploader.cc components/metrics/persistent_histograms.cc +components/metrics/private_metrics/data_upload_config_downloader.cc +components/metrics/private_metrics/data_upload_config_downloader_unittest.cc components/metrics/reporting_service.cc components/metrics/server_urls.cc components/metrics/server_urls.grd @@ -3053,11 +3071,12 @@ components/mirroring/service/mirror_settings.h components/mirroring/service/remoting_sender.h components/mirroring/service/rtp_stream.h components/net_log/resources/net_export.html -components/network_session_configurator/common/network_switch_list.h components/network_time/network_time_test_utils.cc components/network_time/network_time_tracker.cc components/no_state_prefetch/browser/no_state_prefetch_manager.cc components/no_state_prefetch/browser/no_state_prefetch_utils_unittest.cc +components/ntp_tiles/enterprise/ntp_shortcuts_policy_handler.cc +components/ntp_tiles/enterprise/ntp_shortcuts_policy_handler_unittest.cc components/ntp_tiles/most_visited_sites_unittest.cc components/ntp_tiles/popular_sites_impl.cc components/ntp_tiles/popular_sites_impl_unittest.cc @@ -3272,7 +3291,6 @@ components/password_manager/core/browser/sharing/fake_recipients_fetcher.cc components/password_manager/core/browser/sharing/incoming_password_sharing_invitation_sync_bridge_unittest.cc components/password_manager/core/browser/sharing/password_sharing_recipients_downloader.cc components/password_manager/core/browser/store_metrics_reporter_unittest.cc -components/password_manager/core/browser/sync/password_data_type_controller_unittest.cc components/password_manager/core/browser/sync/password_sync_bridge.h components/password_manager/core/browser/sync_credentials_filter_unittest.cc components/password_manager/core/browser/sync_username_test_base.cc @@ -3330,13 +3348,14 @@ components/permissions/permission_request_manager_unittest.cc components/permissions/permission_uma_util.h components/permissions/permission_uma_util_unittest.cc components/permissions/prediction_service/permissions_aiv3_handler_unittest.cc +components/permissions/prediction_service/permissions_aiv4_handler_unittest.cc components/permissions/prediction_service/prediction_common.h components/permissions/prediction_service/prediction_model_handler.cc components/permissions/prediction_service/prediction_service_base.h components/permissions/test/mock_permission_request.h components/permissions_strings.grdp components/persistent_cache/backend_params_manager.h -components/plus_addresses/metrics/plus_address_submission_logger_unittest.cc +components/plus_addresses/core/browser/metrics/plus_address_submission_logger_unittest.cc components/plus_addresses/plus_address_http_client_impl.cc components/plus_addresses/plus_address_http_client_impl_unittest.cc components/plus_addresses/resources/strings/plus_addresses_strings.grd @@ -3495,10 +3514,10 @@ components/printing/test/print_render_frame_helper_browsertest.cc components/privacy_sandbox/privacy_sandbox_settings_impl.cc components/privacy_sandbox/privacy_sandbox_settings_impl_unittest.cc components/privacy_sandbox_chrome_strings.grdp -components/privacy_sandbox_strings.grd components/protocol_handler_strings.grdp components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc components/proxy_config/proxy_policy_handler_unittest.cc +components/push_messaging/push_messaging_constants.cc components/quirks/quirks_client.cc components/reading_list/core/offline_url_utils_unittest.cc components/reporting/PRESUBMIT.py @@ -3562,6 +3581,7 @@ components/rlz/rlz_tracker.h components/safe_browsing/android/real_time_url_checks_allowlist_resource_file_unittest.cc components/safe_browsing/android/real_time_url_checks_allowlist_unittest.cc components/safe_browsing/content/browser/client_side_detection_service.cc +components/safe_browsing/content/browser/notification_content_detection/notifications_global_cache_list_unittest.cc components/safe_browsing/content/browser/password_protection/password_protection_service_unittest.cc components/safe_browsing/content/browser/triggers/ad_sampler_trigger_unittest.cc components/safe_browsing/content/browser/triggers/suspicious_site_trigger.cc @@ -3605,6 +3625,7 @@ components/saved_tab_groups/internal/saved_tab_group_sync_bridge_unittest.cc components/saved_tab_groups/internal/shared_tab_group_account_data_sync_bridge_unittest.cc components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge_unittest.cc components/saved_tab_groups/internal/tab_group_sync_bridge_mediator_unittest.cc +components/saved_tab_groups/internal/tab_group_sync_personal_collaboration_data_handler_unittest.cc components/saved_tab_groups/internal/tab_group_sync_service_impl_unittest.cc components/saved_tab_groups/public/saved_tab_group_unittest.cc components/saved_tab_groups/public/utils_unittest.cc @@ -3767,6 +3788,7 @@ components/sync/model/data_type_sync_bridge.h components/sync/model/syncable_service.h components/sync/protocol/proto_value_conversions_unittest.cc components/sync/service/local_data_description.h +components/sync/service/sync_auth_manager_unittest.cc components/sync/service/sync_prefs.cc components/sync/service/sync_service.h components/sync/service/sync_service_impl_startup_unittest.cc @@ -3801,7 +3823,6 @@ components/trusted_vault/recovery_key_store_connection_impl.cc components/trusted_vault/recovery_key_store_connection_unittest.cc components/trusted_vault/standalone_trusted_vault_server_constants.h components/trusted_vault/test/recovery_key_store_certificate_test_util.h -components/trusted_vault/trusted_vault_access_token_fetcher_frontend.cc components/trusted_vault/trusted_vault_access_token_fetcher_frontend_unittest.cc components/trusted_vault/trusted_vault_histograms.h components/ui_devtools/agent_util.cc @@ -3885,6 +3906,8 @@ components/webapps/browser/android/webapk/webapk_icons_hasher_unittest.cc components/webapps/browser/android/webapk/webapk_single_icon_hasher_unittest.cc components/webapps/browser/banners/app_banner_settings_helper_unittest.cc components/webapps/browser/installable/installable_evaluator_unittest.cc +components/webapps/isolated_web_apps/types/source_unittest.cc +components/webauthn/content/browser/internal_authenticator_impl_unittest.cc components/webauthn/core/browser/passkey_change_quota_tracker_unittest.cc components/webui/flags/flags_test_helpers.cc components/webui/flags/resources/app.html.ts @@ -3905,7 +3928,6 @@ content/browser/accessibility/hit_testing_browsertest.cc content/browser/android/battery_metrics.h content/browser/android/nfc_host_unittest.cc content/browser/attribution_reporting/attribution_os_level_manager_android.cc -content/browser/attribution_reporting/attribution_suitable_context_unittest.cc content/browser/back_forward_cache_basics_browsertest.cc content/browser/back_forward_cache_features_browsertest.cc content/browser/back_forward_cache_internal_browsertest.cc @@ -3959,7 +3981,7 @@ content/browser/indexed_db/indexed_db_context_impl.h content/browser/indexed_db/indexed_db_context_unittest.cc content/browser/indexed_db/indexed_db_reporting.cc content/browser/indexed_db/instance/leveldb/backing_store.cc -content/browser/indexed_db/instance/leveldb/backing_store_unittest.cc +content/browser/indexed_db/instance/leveldb/leveldb_backing_store_unittest.cc content/browser/installedapp/fetch_related_win_apps_task.cc content/browser/installedapp/native_win_app_fetcher_impl.cc content/browser/interest_group/ad_auction_headers_util_unittest.cc @@ -3990,7 +4012,7 @@ content/browser/permissions/embedded_permission_control_checker_unittest.cc content/browser/permissions/permission_controller_impl_unittest.cc content/browser/permissions/permission_overrides_unittest.cc content/browser/permissions/permission_service_context_unittest.cc -content/browser/preloading/preconnect_manager_impl_unittest.cc +content/browser/preloading/preconnect/preconnect_manager_impl_unittest.cc content/browser/preloading/prefetch/contamination_delay_browsertest.cc content/browser/preloading/prefetch/prefetch_container.cc content/browser/preloading/prefetch/prefetch_container.h @@ -4004,6 +4026,8 @@ content/browser/preloading/prefetch/prefetch_scheduler.h content/browser/preloading/prefetch/prefetch_service.cc content/browser/preloading/prefetch/prefetch_status.h content/browser/preloading/prefetch/prefetch_streaming_url_loader_common_types.h +content/browser/preloading/preload_serving_metrics.h +content/browser/preloading/preload_serving_metrics_holder.h content/browser/preloading/preloading_decider.cc content/browser/preloading/preloading_decider_unittest.cc content/browser/preloading/prerender/prerender_browsertest.cc @@ -4095,11 +4119,12 @@ content/browser/web_contents/web_drag_dest_mac_unittest.mm content/browser/webauth/authenticator_common_impl.cc content/browser/webauth/authenticator_impl_unittest.cc content/browser/webauth/authenticator_mojom_traits_unittest.cc +content/browser/webauth/authenticator_test_base.h content/browser/webauth/client_data_json.cc content/browser/webauth/webauth_request_security_checker.cc content/browser/webauth/webauth_request_security_checker.h +content/browser/webid/delegation/jwt_signer_unittest.cc content/browser/webid/idp_network_request_manager_unittest.cc -content/browser/webid/jwt_signer_unittest.cc content/browser/zygote_host/zygote_host_impl_linux.cc content/child/runtime_features.cc content/common/features.cc @@ -4114,6 +4139,7 @@ content/public/browser/browsing_data_remover.h content/public/browser/content_browser_client.h content/public/browser/cookie_insight_list_data.h content/public/browser/devtools_manager_delegate.h +content/public/browser/navigation_controller.h content/public/browser/navigation_handle.h content/public/browser/navigation_handle_timing.h content/public/browser/payment_app_provider.h @@ -4265,7 +4291,6 @@ crypto/hmac.h crypto/hmac_unittest.cc crypto/kdf.h crypto/nss_util.cc -crypto/rsa_private_key_unittest.cc crypto/secure_hash.h crypto/secure_util.h crypto/unexportable_key.h @@ -4298,6 +4323,7 @@ device/vr/android/arcore/arcore_impl.cc device/vr/android/cardboard/cardboard_device.cc docs/enterprise/extension_query.py docs/enterprise/extension_query_py2.py +docs/imported/refresh_docs.py docs/website/.eleventy.js docs/website/PRESUBMIT.py docs/website/infra/config/PRESUBMIT.py @@ -4411,6 +4437,7 @@ extensions/test/extension_background_page_waiter.h fuchsia_web/webengine/browser/frame_impl_browsertest.cc fuchsia_web/webengine/browser/web_engine_content_browser_client_unittest.cc fuchsia_web/webengine/test/data/play_video.html +fuchsia_web/webengine/web_engine_integration_test.cc gin/thread_isolation.cc gin/v8_initializer.cc google_apis/calendar/calendar_api_requests.cc @@ -4625,7 +4652,6 @@ media/gpu/vaapi/test/av1_decoder.cc media/gpu/vaapi/test/vp8_decoder.cc media/gpu/vaapi/test/vp9_decoder.cc media/gpu/vaapi/vaapi_image_decoder_test_common.h -media/gpu/vaapi/vaapi_jpeg_decoder_unittest.cc media/gpu/vaapi/vaapi_unittest.cc media/gpu/vaapi/vaapi_webp_decoder_unittest.cc media/gpu/windows/d3d11_video_decoder_wrapper.cc @@ -4720,10 +4746,10 @@ net/cookies/parsed_cookie.h net/data/filter_unittests/google.txt net/data/fuzzer_data/http_security_headers/http_security_header_047.txt net/data/parse_certificate_unittest/v3_certificate_template.txt -net/device_bound_sessions/registration_fetcher.cc net/device_bound_sessions/registration_fetcher_param.cc net/device_bound_sessions/session_unittest.cc net/device_bound_sessions/unexportable_key_service_factory.cc +net/device_bound_sessions/url_fetcher.cc net/disk_cache/blockfile/file_ios.cc net/disk_cache/disk_cache.h net/disk_cache/simple/simple_backend_impl.h @@ -4844,7 +4870,6 @@ net/socket/socks5_client_socket_unittest.cc net/socket/socks_connect_job_unittest.cc net/socket/ssl_client_socket_impl.cc net/socket/ssl_client_socket_unittest.cc -net/socket/ssl_server_socket_impl.cc net/socket/tcp_socket_io_completion_port_win.cc net/socket/tcp_socket_win.cc net/socket/transport_client_socket_pool_unittest.cc @@ -5100,6 +5125,7 @@ services/webnn/dml/graph_builder_dml.h services/webnn/dml/graph_impl_dml.cc services/webnn/dml/tensor_desc.cc services/webnn/dml/utils.cc +services/webnn/ort/platform_functions_ort.cc services/webnn/tflite/graph_builder_tflite.cc services/webnn/webnn_graph_impl_backend_test.cc skia/config/SkUserConfig.h @@ -5215,13 +5241,12 @@ third_party/afl/src/llvm_mode/afl-llvm-rt.o.c third_party/afl/src/qemu_mode/patches/afl-qemu-cpu-inl.h third_party/afl/src/test-instr.c third_party/afl/src/types.h -third_party/android_build_tools/aapt2/3pp/fetch.py +third_party/android_build_tools/aapt2/3pp/3pp.py third_party/android_deps/libs/com_android_support_support_annotations/3pp/fetch.py third_party/android_deps/libs/com_android_tools_common/3pp/fetch.py third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api/3pp/fetch.py third_party/android_deps/libs/com_android_tools_sdk_common/3pp/fetch.py third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework/3pp/fetch.py -third_party/android_deps/libs/com_google_ar_impress/3pp/fetch.py third_party/android_deps/licenses/Android_SDK_License-December_9_2016.txt third_party/android_toolchain/3pp/fetch.py third_party/angle/BUILD.gn @@ -5328,7 +5353,6 @@ third_party/angle/src/compiler/translator/hlsl/OutputHLSL.cpp third_party/angle/src/compiler/translator/hlsl/TextureFunctionHLSL.cpp third_party/angle/src/compiler/translator/hlsl/blocklayoutHLSL.h third_party/angle/src/compiler/translator/spirv/OutputSPIRV.cpp -third_party/angle/src/compiler/translator/wgsl/OutputUniformBlocks.cpp third_party/angle/src/compiler/translator/wgsl/RewritePipelineVariables.cpp third_party/angle/src/libANGLE/Display.cpp third_party/angle/src/libANGLE/GLES1Renderer.cpp @@ -5405,6 +5429,7 @@ third_party/angle/third_party/libjpeg.gni third_party/angle/third_party/rapidjson/src/bin/data/readme.txt third_party/angle/third_party/rapidjson/src/include/rapidjson/document.h third_party/angle/third_party/rapidjson/src/test/unittest/valuetest.cpp +third_party/angle/unsafe_buffers_paths.txt third_party/angle/util/android/AndroidWindow.cpp third_party/angle/util/capture/frame_capture_test_utils.cpp third_party/angle/util/windows/third_party/StackWalker/src/StackWalker.cpp @@ -5656,7 +5681,6 @@ third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/inspector/devtools_session.h third_party/blink/renderer/core/intersection_observer/intersection_observer_controller.h third_party/blink/renderer/core/layout/adjust_for_absolute_zoom.h -third_party/blink/renderer/core/layout/block_node.cc third_party/blink/renderer/core/layout/geometry/logical_offset.h third_party/blink/renderer/core/layout/geometry/logical_rect.h third_party/blink/renderer/core/layout/geometry/logical_size.h @@ -5682,9 +5706,9 @@ third_party/blink/renderer/core/layout/layout_image_resource.cc third_party/blink/renderer/core/layout/layout_image_resource.h third_party/blink/renderer/core/layout/layout_image_resource_style_image.cc third_party/blink/renderer/core/layout/layout_image_resource_style_image.h -third_party/blink/renderer/core/layout/layout_multi_column_flow_thread.h third_party/blink/renderer/core/layout/layout_object.h third_party/blink/renderer/core/layout/layout_text.cc +third_party/blink/renderer/core/layout/layout_theme_android.cc third_party/blink/renderer/core/layout/layout_theme_default.h third_party/blink/renderer/core/layout/layout_view.cc third_party/blink/renderer/core/layout/layout_view.h @@ -5732,6 +5756,7 @@ 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_property_tree_builder.cc +third_party/blink/renderer/core/paint/text_decoration_info.cc third_party/blink/renderer/core/paint/theme_painter_default.cc third_party/blink/renderer/core/paint/theme_painter_default.h third_party/blink/renderer/core/paint/timing/first_meaningful_paint_detector.cc @@ -5803,6 +5828,7 @@ third_party/blink/renderer/core/trustedtypes/generate_eventhandler_names.py third_party/blink/renderer/core/view_transition/view_transition_content_element.h third_party/blink/renderer/core/web_test/web_test_web_frame_widget_impl.h third_party/blink/renderer/core/workers/shared_worker_content_settings_proxy.cc +third_party/blink/renderer/core/xml/DocumentXMLTreeViewer.js third_party/blink/renderer/core/xml/xpath_expression.idl third_party/blink/renderer/core/xml/xpath_ns_resolver.idl third_party/blink/renderer/core/xml/xslt_processor.cc @@ -5874,7 +5900,6 @@ third_party/blink/renderer/platform/fonts/bitmap_glyphs_block_list.cc third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc third_party/blink/renderer/platform/fonts/font_description.cc third_party/blink/renderer/platform/fonts/mac/font_cache_mac.mm -third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc third_party/blink/renderer/platform/fonts/opentype/open_type_baseline_metrics.h third_party/blink/renderer/platform/fonts/opentype/open_type_caps_support_mpl.cc third_party/blink/renderer/platform/fonts/opentype/open_type_math_stretch_data.h @@ -7319,8 +7344,9 @@ third_party/cros_system_api/dbus/shill/dbus-constants.h third_party/crossbench-web-tests/cuj/crossbench/sql_packages/cujs/simultaneous_load/tab_load_durations.sql third_party/crossbench/chrome-extension-replay/devtools-recorder/crossbench.html third_party/crossbench/config/benchmark/loadline2/google_docs_instrumentation.js -third_party/crossbench/config/benchmark/loadline2/google_search_phone_instrumentation.js -third_party/crossbench/config/benchmark/loadline2/google_search_tablet_instrumentation.js +third_party/crossbench/config/benchmark/loadline2/google_search_instrumentation.js +third_party/crossbench/config/benchmark/loadline2/webpagereplay_script_injections_phone.json +third_party/crossbench/config/benchmark/loadline2/webpagereplay_script_injections_tablet.json third_party/crossbench/config/benchmark/loadline2/youtube_instrumentation.js third_party/crossbench/crossbench/action_runner/action/enums.py third_party/crossbench/crossbench/action_runner/action/position.py @@ -7341,6 +7367,7 @@ third_party/crossbench/crossbench/browsers/firefox/downloader.py third_party/crossbench/crossbench/browsers/firefox/webdriver.py third_party/crossbench/crossbench/cli/cli.py third_party/crossbench/crossbench/cli/config/extension.py +third_party/crossbench/crossbench/cli/config/network.py third_party/crossbench/crossbench/cli/exception_formatter.py third_party/crossbench/crossbench/plt/android_adb.py third_party/crossbench/crossbench/probes/chrome_histograms.py @@ -7377,8 +7404,10 @@ third_party/dawn/.vscode/tasks.json third_party/dawn/CMakeLists.txt third_party/dawn/generator/dawn_json_generator.py third_party/dawn/infra/specs/PRESUBMIT.py +third_party/dawn/src/dawn/common/Constants.h third_party/dawn/src/dawn/common/SystemUtils.cpp third_party/dawn/src/dawn/dawn.json +third_party/dawn/src/dawn/native/BindGroup.cpp third_party/dawn/src/dawn/native/CommandAllocator.cpp third_party/dawn/src/dawn/native/CopyTextureForBrowserHelper.cpp third_party/dawn/src/dawn/native/Features.cpp @@ -7413,6 +7442,7 @@ third_party/dawn/src/dawn/native/opengl/CommandBufferGL.cpp third_party/dawn/src/dawn/native/opengl/ContextEGL.cpp third_party/dawn/src/dawn/native/opengl/TextureGL.cpp third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp +third_party/dawn/src/dawn/native/vulkan/PhysicalDeviceVk.cpp third_party/dawn/src/dawn/native/vulkan/RenderPassCache.h third_party/dawn/src/dawn/native/vulkan/VulkanInfo.cpp third_party/dawn/src/dawn/native/vulkan/VulkanInfo.h @@ -7422,6 +7452,7 @@ third_party/dawn/src/dawn/partition_alloc/partition_alloc/pointers/raw_ref.h third_party/dawn/src/dawn/platform/metrics/HistogramMacros.h third_party/dawn/src/dawn/tests/PartitionAllocSupport.cpp third_party/dawn/src/dawn/tests/end2end/BindingArrayTests.cpp +third_party/dawn/src/dawn/tests/end2end/BufferHostMappedPointerTests_win.cpp third_party/dawn/src/dawn/tests/end2end/CompressedTextureFormatTests.cpp third_party/dawn/src/dawn/tests/end2end/DepthBiasTests.cpp third_party/dawn/src/dawn/tests/end2end/TextureViewTests.cpp @@ -7432,6 +7463,7 @@ third_party/dawn/src/dawn/tests/end2end/VideoViewsTests_win.cpp third_party/dawn/src/dawn/tests/perf_tests/DawnPerfTestPlatform.h third_party/dawn/src/dawn/tests/unittests/validation/ComputeValidationTests.cpp third_party/dawn/src/dawn/tests/unittests/validation/CopyCommandsValidationTests.cpp +third_party/dawn/src/dawn/tests/unittests/validation/DynamicBindingArrayValidationTests.cpp third_party/dawn/src/dawn/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp third_party/dawn/src/dawn/tests/white_box/SharedTextureMemoryTests_dmabuf.cpp third_party/dawn/src/dawn/tests/white_box/VulkanImageWrappingTests_DmaBuf.cpp @@ -7439,9 +7471,6 @@ third_party/dawn/src/dawn/utils/WindowsDebugLogger.cpp third_party/dawn/src/tint/lang/glsl/writer/writer.cc third_party/dawn/src/tint/lang/hlsl/type/rasterizer_ordered_texture_2d.h third_party/dawn/src/tint/lang/hlsl/writer/printer/printer.cc -third_party/dawn/src/tint/lang/spirv/reader/ast_parser/ast_parser.cc -third_party/dawn/src/tint/lang/spirv/reader/ast_parser/function.cc -third_party/dawn/src/tint/lang/spirv/reader/ast_parser/function_cfg_test.cc third_party/dawn/src/tint/lang/wgsl/reader/parser/lexer_test.cc third_party/dawn/src/tint/lang/wgsl/resolver/eval_builtin_test.cc third_party/dawn/third_party/dxc/include/dxc/Support/Unicode.h @@ -7667,6 +7696,7 @@ third_party/depot_tools/infra_lib/telemetry/clearcut_span_exporter.py third_party/depot_tools/infra_lib/telemetry/proto/clientanalytics_pb2.py third_party/depot_tools/infra_lib/telemetry/proto/trace_span_pb2.py third_party/depot_tools/lockfile.py +third_party/depot_tools/luci_auth_fido2_plugin.py third_party/depot_tools/man/README.txt third_party/depot_tools/man/html/depot_tools.html third_party/depot_tools/man/html/depot_tools_gerrit_auth.html @@ -7690,8 +7720,12 @@ third_party/depot_tools/man/html/git-thaw.html third_party/depot_tools/man/html/git-upstream-diff.html third_party/depot_tools/man/src/depot_tools_gerrit_auth.txt third_party/depot_tools/man/src/depot_tools_tutorial.txt +third_party/depot_tools/mcp/PRESUBMIT.py third_party/depot_tools/mcp/buildbucket.py third_party/depot_tools/mcp/buildbucket_test.py +third_party/depot_tools/mcp/common.py +third_party/depot_tools/mcp/git_cl.py +third_party/depot_tools/mcp/resultdb.py third_party/depot_tools/metadata/dependency_metadata.py third_party/depot_tools/metadata/fields/custom/license.py third_party/depot_tools/metadata/fields/custom/license_allowlist.py @@ -7821,6 +7855,7 @@ third_party/depot_tools/tests/git_auth_test.py third_party/depot_tools/tests/git_cache_test.py third_party/depot_tools/tests/git_cl_creds_check_report.txt third_party/depot_tools/tests/git_cl_test.py +third_party/depot_tools/tests/luci_auth_fido2_plugin_test.py third_party/depot_tools/tests/metrics_test.py third_party/depot_tools/tests/presubmit_canned_checks_test.py third_party/depot_tools/tests/presubmit_support_test.py @@ -7948,8 +7983,10 @@ third_party/devtools-frontend/src/front_end/models/ai_assistance/ExtensionScope. third_party/devtools-frontend/src/front_end/models/ai_assistance/agents/FileAgent.ts third_party/devtools-frontend/src/front_end/models/ai_assistance/agents/PerformanceAgent.test.ts third_party/devtools-frontend/src/front_end/models/ai_assistance/agents/PerformanceAgent.ts +third_party/devtools-frontend/src/front_end/models/ai_assistance/data_formatters/PerformanceInsightFormatter.snapshot.txt third_party/devtools-frontend/src/front_end/models/ai_assistance/data_formatters/PerformanceInsightFormatter.test.ts third_party/devtools-frontend/src/front_end/models/ai_assistance/data_formatters/PerformanceInsightFormatter.ts +third_party/devtools-frontend/src/front_end/models/ai_assistance/data_formatters/PerformanceTraceFormatter.snapshot.txt third_party/devtools-frontend/src/front_end/models/bindings/ResourceUtils.ts third_party/devtools-frontend/src/front_end/models/crux-manager/CrUXManager.test.ts third_party/devtools-frontend/src/front_end/models/crux-manager/CrUXManager.ts @@ -8020,8 +8057,7 @@ third_party/devtools-frontend/src/front_end/panels/application/AppManifestView.t third_party/devtools-frontend/src/front_end/panels/application/ApplicationPanelSidebar.ts third_party/devtools-frontend/src/front_end/panels/application/BackgroundServiceView.ts third_party/devtools-frontend/src/front_end/panels/application/InterestGroupTreeElement.ts -third_party/devtools-frontend/src/front_end/panels/application/ReportingApiReportsView.test.ts -third_party/devtools-frontend/src/front_end/panels/application/ReportingApiReportsView.ts +third_party/devtools-frontend/src/front_end/panels/application/ReportingApiView.test.ts third_party/devtools-frontend/src/front_end/panels/application/ReportingApiView.ts third_party/devtools-frontend/src/front_end/panels/application/ServiceWorkerCacheTreeElement.ts third_party/devtools-frontend/src/front_end/panels/application/StorageBucketsTreeElement.ts @@ -8078,11 +8114,13 @@ third_party/devtools-frontend/src/front_end/panels/recorder/RecorderController.t third_party/devtools-frontend/src/front_end/panels/recorder/components/CreateRecordingView.ts third_party/devtools-frontend/src/front_end/panels/security/CookieControlsView.ts third_party/devtools-frontend/src/front_end/panels/security/CookieReportView.ts +third_party/devtools-frontend/src/front_end/panels/security/IPProtectionView.ts third_party/devtools-frontend/src/front_end/panels/settings/AISettingsTab.ts third_party/devtools-frontend/src/front_end/panels/settings/FrameworkIgnoreListSettingsTab.ts third_party/devtools-frontend/src/front_end/panels/settings/KeybindsSettingsTab.ts third_party/devtools-frontend/src/front_end/panels/settings/SettingsScreen.ts third_party/devtools-frontend/src/front_end/panels/settings/components/SyncSection.test.ts +third_party/devtools-frontend/src/front_end/panels/settings/components/SyncSection.ts third_party/devtools-frontend/src/front_end/panels/sources/BreakpointEditDialog.ts third_party/devtools-frontend/src/front_end/panels/sources/BreakpointsView.test.ts third_party/devtools-frontend/src/front_end/panels/sources/BreakpointsViewUtils.test.ts @@ -8410,7 +8448,6 @@ third_party/devtools-frontend/src/node_modules/@sinonjs/commons/types/prototypes third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/lib/create-set.js third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/lib/deep-equal.js third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/types/create-set.d.ts -third_party/devtools-frontend/src/node_modules/@stylistic/eslint-plugin/dist/utils.js third_party/devtools-frontend/src/node_modules/@tootallnate/quickjs-emscripten/dist/context.d.ts third_party/devtools-frontend/src/node_modules/@tootallnate/quickjs-emscripten/dist/context.js third_party/devtools-frontend/src/node_modules/@tootallnate/quickjs-emscripten/dist/index.d.ts @@ -8464,13 +8501,11 @@ 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/async-function/package.json third_party/devtools-frontend/src/node_modules/available-typed-arrays/package.json -third_party/devtools-frontend/src/node_modules/base64-js/package.json third_party/devtools-frontend/src/node_modules/basic-ftp/package.json third_party/devtools-frontend/src/node_modules/binary-extensions/package.json third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/package.json third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/buffer-crc32/package.json -third_party/devtools-frontend/src/node_modules/buffer/index.js third_party/devtools-frontend/src/node_modules/bytes/package.json third_party/devtools-frontend/src/node_modules/call-bind-apply-helpers/package.json third_party/devtools-frontend/src/node_modules/call-bind/package.json @@ -8814,16 +8849,13 @@ third_party/devtools-frontend/src/node_modules/possible-typed-array-names/packag third_party/devtools-frontend/src/node_modules/postcss-colormin/package.json third_party/devtools-frontend/src/node_modules/postcss-colormin/src/index.js third_party/devtools-frontend/src/node_modules/postcss-convert-values/package.json -third_party/devtools-frontend/src/node_modules/postcss-discard-comments/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/postcss-discard-comments/package.json third_party/devtools-frontend/src/node_modules/postcss-discard-duplicates/package.json third_party/devtools-frontend/src/node_modules/postcss-discard-empty/package.json third_party/devtools-frontend/src/node_modules/postcss-discard-overridden/package.json third_party/devtools-frontend/src/node_modules/postcss-merge-longhand/package.json -third_party/devtools-frontend/src/node_modules/postcss-merge-rules/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/postcss-merge-rules/package.json third_party/devtools-frontend/src/node_modules/postcss-minify-gradients/package.json -third_party/devtools-frontend/src/node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/postcss-minify-selectors/package.json third_party/devtools-frontend/src/node_modules/postcss-normalize-display-values/package.json third_party/devtools-frontend/src/node_modules/postcss-normalize-positions/package.json @@ -8839,8 +8871,43 @@ third_party/devtools-frontend/src/node_modules/postcss-reduce-initial/package.js third_party/devtools-frontend/src/node_modules/postcss-reduce-transforms/package.json third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/package.json third_party/devtools-frontend/src/node_modules/postcss-selector-parser/package.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/css-tree/data/patch.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/css-tree/lib/lexer/generic.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/css-tree/package.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/mdn-data/css/at-rules.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/mdn-data/css/at-rules.schema.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/mdn-data/css/functions.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/mdn-data/css/functions.schema.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/mdn-data/css/properties.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/mdn-data/css/properties.schema.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/mdn-data/css/selectors.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/mdn-data/css/selectors.schema.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/mdn-data/css/types.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/mdn-data/css/types.schema.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/mdn-data/package.json +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/dist/svgo.browser.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/plugins/_collections.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/plugins/convertOneStopGradients.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/plugins/inlineStyles.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/plugins/mergeStyles.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/plugins/minifyStyles.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/plugins/prefixIds.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/plugins/removeAttributesBySelector.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/plugins/removeDesc.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/plugins/removeTitle.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/plugins/removeXlink.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/plugins/reusePaths.js +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/types/plugins/_collections.d.ts +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/types/plugins/convertOneStopGradients.d.ts +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/types/plugins/inlineStyles.d.ts +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/types/plugins/mergeStyles.d.ts +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/types/plugins/minifyStyles.d.ts +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/types/plugins/prefixIds.d.ts +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/types/plugins/removeAttributesBySelector.d.ts +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/types/plugins/removeDesc.d.ts +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/types/plugins/removeTitle.d.ts +third_party/devtools-frontend/src/node_modules/postcss-svgo/node_modules/svgo/types/plugins/removeXlink.d.ts third_party/devtools-frontend/src/node_modules/postcss-svgo/package.json -third_party/devtools-frontend/src/node_modules/postcss-unique-selectors/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/postcss-unique-selectors/package.json third_party/devtools-frontend/src/node_modules/postcss/lib/comment.d.ts third_party/devtools-frontend/src/node_modules/postcss/lib/declaration.d.ts @@ -9022,7 +9089,6 @@ third_party/devtools-frontend/src/node_modules/strip-ansi-cjs/package.json third_party/devtools-frontend/src/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/strip-bom/package.json third_party/devtools-frontend/src/node_modules/strip-json-comments/package.json -third_party/devtools-frontend/src/node_modules/stylehacks/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/stylehacks/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/@csstools/selector-specificity/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/css-tree/data/patch.json @@ -9041,8 +9107,6 @@ third_party/devtools-frontend/src/node_modules/stylelint/node_modules/mdn-data/c third_party/devtools-frontend/src/node_modules/stylelint/node_modules/mdn-data/css/types.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/mdn-data/css/types.schema.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/mdn-data/package.json -third_party/devtools-frontend/src/node_modules/stylelint/node_modules/postcss/lib/comment.d.ts -third_party/devtools-frontend/src/node_modules/stylelint/node_modules/postcss/lib/declaration.d.ts third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/package.json third_party/devtools-frontend/src/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/supports-hyperlinks/node_modules/has-flag/package.json @@ -9092,6 +9156,10 @@ 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/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/type-fest/source/basic.d.ts +third_party/devtools-frontend/src/node_modules/type-fest/source/entries.d.ts +third_party/devtools-frontend/src/node_modules/type-fest/source/entry.d.ts third_party/devtools-frontend/src/node_modules/typed-array-buffer/package.json third_party/devtools-frontend/src/node_modules/typed-array-byte-length/package.json third_party/devtools-frontend/src/node_modules/typed-array-byte-offset/package.json @@ -9208,6 +9276,7 @@ third_party/devtools-frontend/src/node_modules/zod/src/v4/core/regexes.ts third_party/devtools-frontend/src/node_modules/zod/v4/core/regexes.d.ts third_party/devtools-frontend/src/node_modules/zod/v4/core/regexes.js third_party/devtools-frontend/src/package.json +third_party/devtools-frontend/src/scripts/ai_assistance/suite/helpers/gemini.ts third_party/devtools-frontend/src/scripts/build/compress_files.js third_party/devtools-frontend/src/scripts/check_external_links.js third_party/devtools-frontend/src/scripts/deps/download_emscripten.py @@ -9227,6 +9296,7 @@ third_party/devtools-frontend/src/test/e2e_non_hosted/console/console-truncate-l third_party/devtools-frontend/src/test/e2e_non_hosted/lighthouse/devtools-settings_test.ts third_party/devtools-frontend/src/test/e2e_non_hosted/lighthouse/snapshot_test.ts third_party/devtools-frontend/src/test/e2e_non_hosted/lighthouse/timespan_test.ts +third_party/devtools-frontend/src/test/e2e_non_hosted/shared/frontend-helper.ts third_party/devtools-frontend/src/test/perf/report/report.ts third_party/devtools-frontend/src/third_party/blink/public/devtools_protocol/browser_protocol.json third_party/devtools-frontend/src/third_party/pyjson5/src/benchmarks/chromium.linux.json @@ -10036,6 +10106,17 @@ third_party/expat/src/expat/xmlwf/xmlwf.c third_party/farmhash/src/dev/builder.cc third_party/farmhash/src/dev/farmhash.h third_party/farmhash/src/src/farmhash.h +third_party/federated_compute/src/fcp/artifact_building/tensor_utils.py +third_party/federated_compute/src/fcp/base/monitoring.h +third_party/federated_compute/src/fcp/client/attestation/log_attestation_records.cc +third_party/federated_compute/src/fcp/client/fl_runner_test.cc +third_party/federated_compute/src/fcp/client/http/http_client.h +third_party/federated_compute/src/fcp/client/http/protocol_request_helper.cc +third_party/federated_compute/src/fcp/confidentialcompute/composing_tee_executor_test.cc +third_party/federated_compute/src/fcp/confidentialcompute/tee_executor_value_test.cc +third_party/federated_compute/src/fcp/demo/http_actions.py +third_party/federated_compute/src/fcp/tensorflow/example_selector_fuser_test.py +third_party/federated_compute/src/fcp/tracing/tools/tracing_traits_generator.cc third_party/ffmpeg/chromium/config/Chrome/android/arm-neon/config.h third_party/ffmpeg/chromium/config/Chrome/android/arm64/config.h third_party/ffmpeg/chromium/config/Chrome/android/ia32/config.h @@ -11109,9 +11190,12 @@ third_party/harfbuzz-ng/src/src/hb-ot-var-hvar-table.hh third_party/harfbuzz-ng/src/src/hb-ot-var-mvar-table.hh third_party/harfbuzz-ng/src/src/hb-ot-var.cc third_party/harfbuzz-ng/src/src/hb-ot-vorg-table.hh +third_party/harfbuzz-ng/src/src/hb-paint-bounded.cc +third_party/harfbuzz-ng/src/src/hb-paint-bounded.hh third_party/harfbuzz-ng/src/src/hb-paint-extents.cc third_party/harfbuzz-ng/src/src/hb-paint-extents.hh third_party/harfbuzz-ng/src/src/hb-paint.h +third_party/harfbuzz-ng/src/src/hb-script-list.h third_party/harfbuzz-ng/src/src/hb-style.h third_party/harfbuzz-ng/src/src/hb-subset-cff-common.hh third_party/harfbuzz-ng/src/src/hb-unicode.hh @@ -11667,7 +11751,6 @@ third_party/nearby/src/presence/fpp/fpp_manager.cc third_party/nearby/src/sharing/android/example/app/src/main/res/xml/backup_rules.xml third_party/nearby/src/sharing/android/example/app/src/main/res/xml/data_extraction_rules.xml third_party/nearby/src/sharing/contacts/nearby_share_contact_manager_impl_test.cc -third_party/nearby/src/sharing/contacts/nearby_share_contacts_sorter_test.cc third_party/nearby/src/sharing/local_device_data/nearby_share_local_device_data_manager_impl_test.cc third_party/nearby/src/sharing/nearby_sharing_service.h third_party/nearby/src/sharing/text_attachment_test.cc @@ -11873,6 +11956,8 @@ third_party/node/node_modules/uri-js/dist/esnext/uri.js third_party/node/node_modules/uri-js/package.json third_party/node/node_modules/yocto-queue/package.json third_party/node/package.json +third_party/oak/src/cc/utils/cose/cwt.h +third_party/oak/src/java/src/main/java/com/google/oak/client/android/res/values/strings.xml third_party/openh264/src/build/platform-android-r18b.mk third_party/openh264/src/build/platform-android.mk third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Properties/AppManifest.xml @@ -12491,7 +12576,6 @@ third_party/perfetto/infra/ci/frontend/main.py third_party/perfetto/infra/ci/frontend/stackdriver_metrics.py third_party/perfetto/infra/ci/frontend/static/index.html third_party/perfetto/infra/ci/frontend/static/script.js -third_party/perfetto/infra/ci/sandbox/artifacts_uploader.py third_party/perfetto/infra/git_mirror_bot/Makefile third_party/perfetto/infra/git_mirror_bot/mirror_aosp_to_ghub_repo.py third_party/perfetto/infra/luci/recipe_modules/macos_sdk/__init__.py @@ -12581,11 +12665,12 @@ third_party/perfetto/ui/src/base/gcs_uploader.ts third_party/perfetto/ui/src/chrome_extension/index.ts third_party/perfetto/ui/src/core/analytics_impl.ts third_party/perfetto/ui/src/core/cookie_consent.ts -third_party/perfetto/ui/src/core_plugins/example_traces/index.ts +third_party/perfetto/ui/src/core_plugins/dev.perfetto.ExampleTraces/index.ts third_party/perfetto/ui/src/frontend/css_constants.ts third_party/perfetto/ui/src/frontend/error_dialog.ts third_party/perfetto/ui/src/frontend/home_page.ts third_party/perfetto/ui/src/frontend/index.ts +third_party/perfetto/ui/src/frontend/is_internal_user_script_loader.ts third_party/perfetto/ui/src/frontend/legacy_trace_viewer.ts third_party/perfetto/ui/src/frontend/permalink.ts third_party/perfetto/ui/src/frontend/post_message_handler.ts @@ -12620,13 +12705,13 @@ third_party/polymer/v3_0/package.json third_party/private_membership/BUILD.gn third_party/protobuf-javascript/src/binary/arith.js third_party/protobuf-javascript/src/binary/arith_test.js -third_party/protobuf-javascript/src/binary/constants.js third_party/protobuf-javascript/src/binary/decoder.js third_party/protobuf-javascript/src/binary/decoder_test.js third_party/protobuf-javascript/src/binary/encoder.js third_party/protobuf-javascript/src/binary/proto_test.js third_party/protobuf-javascript/src/binary/reader.js third_party/protobuf-javascript/src/binary/reader_test.js +third_party/protobuf-javascript/src/binary/test_utils.js third_party/protobuf-javascript/src/binary/utils.js third_party/protobuf-javascript/src/binary/utils_test.js third_party/protobuf-javascript/src/binary/writer.js @@ -12645,6 +12730,7 @@ third_party/protobuf-javascript/src/experimental/runtime/int64.js third_party/protobuf-javascript/src/experimental/runtime/kernel/storage.js third_party/protobuf-javascript/src/generator/js_generator.cc third_party/protobuf-javascript/src/generator/well_known_types_embed.cc +third_party/protobuf-javascript/src/internal_public.js third_party/protobuf-javascript/src/map.js third_party/protobuf-javascript/src/message.js third_party/protobuf/.bcr/metadata.template.json @@ -12667,6 +12753,9 @@ third_party/protobuf/conformance/conformance_test_runner.cc third_party/protobuf/conformance/failure_list_trie_node.cc third_party/protobuf/conformance/failure_list_trie_node.h third_party/protobuf/conformance/failure_list_trie_node_test.cc +third_party/protobuf/conformance/fork_pipe_runner.cc +third_party/protobuf/conformance/fork_pipe_runner.h +third_party/protobuf/conformance/test_runner.h third_party/protobuf/conformance/text_format_conformance_suite.cc third_party/protobuf/conformance/text_format_conformance_suite.h third_party/protobuf/conformance/update_failure_list.py @@ -12674,8 +12763,14 @@ third_party/protobuf/docs/upb/render.py third_party/protobuf/editions/generated_files_test.cc third_party/protobuf/editions/generated_reflection_test.cc third_party/protobuf/hpb/arena.h +third_party/protobuf/hpb/backend/cpp/cpp.h +third_party/protobuf/hpb/backend/types.h +third_party/protobuf/hpb/backend/upb/extension.cc +third_party/protobuf/hpb/backend/upb/extension.h third_party/protobuf/hpb/backend/upb/interop.h third_party/protobuf/hpb/backend/upb/interop_test.cc +third_party/protobuf/hpb/backend/upb/repeated_field_iterator.h +third_party/protobuf/hpb/backend/upb/repeated_field_iterator_test.cc third_party/protobuf/hpb/backend/upb/upb.h third_party/protobuf/hpb/extension.cc third_party/protobuf/hpb/extension.h @@ -12686,10 +12781,9 @@ third_party/protobuf/hpb/internal/message_lock.h third_party/protobuf/hpb/internal/message_lock_test.cc third_party/protobuf/hpb/internal/template_help.h third_party/protobuf/hpb/internal/template_help_test.cc +third_party/protobuf/hpb/multibackend.h third_party/protobuf/hpb/ptr.h third_party/protobuf/hpb/repeated_field.h -third_party/protobuf/hpb/repeated_field_iterator.h -third_party/protobuf/hpb/repeated_field_iterator_test.cc third_party/protobuf/hpb/requires.h third_party/protobuf/hpb/status.cc third_party/protobuf/hpb/status.h @@ -12706,12 +12800,15 @@ third_party/protobuf/hpb_generator/gen_repeated_fields.cc third_party/protobuf/hpb_generator/gen_repeated_fields.h third_party/protobuf/hpb_generator/gen_utils.cc third_party/protobuf/hpb_generator/gen_utils.h +third_party/protobuf/hpb_generator/generator.cc +third_party/protobuf/hpb_generator/generator.h third_party/protobuf/hpb_generator/keywords.cc third_party/protobuf/hpb_generator/keywords.h third_party/protobuf/hpb_generator/names.cc third_party/protobuf/hpb_generator/names.h third_party/protobuf/hpb_generator/protoc-gen-hpb.cc third_party/protobuf/hpb_generator/tests/extension_test.cc +third_party/protobuf/hpb_generator/tests/multibackend_test.cc third_party/protobuf/hpb_generator/tests/repeated_test.cc third_party/protobuf/hpb_generator/tests/test_generated.cc third_party/protobuf/hpb_generator/tests/test_hpb_bzl_alias.cc @@ -12939,13 +13036,12 @@ third_party/protobuf/ruby/ext/google/protobuf_c/shared_convert.c third_party/protobuf/ruby/ext/google/protobuf_c/shared_convert.h third_party/protobuf/ruby/ext/google/protobuf_c/shared_message.c third_party/protobuf/ruby/ext/google/protobuf_c/shared_message.h -third_party/protobuf/ruby/ext/google/protobuf_c/wrap_memcpy.c third_party/protobuf/ruby/pom.xml third_party/protobuf/rust/cpp_kernel/serialized_data.h third_party/protobuf/rust/cpp_kernel/strings.h third_party/protobuf/rust/test/cpp/interop/test_utils.cc third_party/protobuf/rust/test/rust_proto_library_unit_test/empty.cc -third_party/protobuf/rust/upb/upb_api.c +third_party/protobuf/rust/upb/sys/upb_api.c third_party/protobuf/src/google/protobuf/any.cc third_party/protobuf/src/google/protobuf/any.h third_party/protobuf/src/google/protobuf/any_lite.cc @@ -13232,6 +13328,7 @@ third_party/protobuf/src/google/protobuf/compiler/rust/enum.cc third_party/protobuf/src/google/protobuf/compiler/rust/enum.h third_party/protobuf/src/google/protobuf/compiler/rust/generator.cc third_party/protobuf/src/google/protobuf/compiler/rust/generator.h +third_party/protobuf/src/google/protobuf/compiler/rust/main.cc third_party/protobuf/src/google/protobuf/compiler/rust/message.cc third_party/protobuf/src/google/protobuf/compiler/rust/message.h third_party/protobuf/src/google/protobuf/compiler/rust/naming.cc @@ -13457,6 +13554,7 @@ third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc third_party/protobuf/src/google/protobuf/util/field_mask_util.cc third_party/protobuf/src/google/protobuf/util/field_mask_util.h third_party/protobuf/src/google/protobuf/util/field_mask_util_test.cc +third_party/protobuf/src/google/protobuf/util/internal_timeval.h third_party/protobuf/src/google/protobuf/util/json_util.h third_party/protobuf/src/google/protobuf/util/message_differencer.cc third_party/protobuf/src/google/protobuf/util/message_differencer.h @@ -13477,6 +13575,7 @@ third_party/protobuf/src/google/protobuf/wire_format.h third_party/protobuf/src/google/protobuf/wire_format_lite.cc third_party/protobuf/src/google/protobuf/wire_format_lite.h third_party/protobuf/src/google/protobuf/wire_format_unittest.cc +third_party/protobuf/src/google/protobuf/wire_format_unittest.h third_party/protobuf/upb/base/descriptor_constants.h third_party/protobuf/upb/base/internal/endian.h third_party/protobuf/upb/base/internal/log2.h @@ -13532,6 +13631,7 @@ third_party/protobuf/upb/mem/arena_test.cc third_party/protobuf/upb/mem/internal/arena.h third_party/protobuf/upb/message/accessors.c third_party/protobuf/upb/message/accessors.h +third_party/protobuf/upb/message/accessors.hpp third_party/protobuf/upb/message/accessors_split64.h third_party/protobuf/upb/message/accessors_test.cc third_party/protobuf/upb/message/array.c @@ -13610,6 +13710,7 @@ third_party/protobuf/upb/mini_table/message.c third_party/protobuf/upb/mini_table/message.h third_party/protobuf/upb/mini_table/sub.h third_party/protobuf/upb/port/atomic.h +third_party/protobuf/upb/port/sanitizers.h third_party/protobuf/upb/port/vsnprintf_compat.h third_party/protobuf/upb/reflection/common.h third_party/protobuf/upb/reflection/def.h @@ -13693,18 +13794,38 @@ third_party/protobuf/upb/wire/byte_size.h third_party/protobuf/upb/wire/byte_size_test.cc third_party/protobuf/upb/wire/decode.c third_party/protobuf/upb/wire/decode.h +third_party/protobuf/upb/wire/decode_benchmark.cc +third_party/protobuf/upb/wire/decode_fast/cardinality.h +third_party/protobuf/upb/wire/decode_fast/combinations.h +third_party/protobuf/upb/wire/decode_fast/data.h +third_party/protobuf/upb/wire/decode_fast/dispatch.c +third_party/protobuf/upb/wire/decode_fast/dispatch.h +third_party/protobuf/upb/wire/decode_fast/field_fixed.c +third_party/protobuf/upb/wire/decode_fast/field_message.c +third_party/protobuf/upb/wire/decode_fast/field_parsers.h +third_party/protobuf/upb/wire/decode_fast/field_string.c +third_party/protobuf/upb/wire/decode_fast/field_varint.c +third_party/protobuf/upb/wire/decode_fast/function_array.c +third_party/protobuf/upb/wire/decode_fast/function_array.h +third_party/protobuf/upb/wire/decode_fast/select.c +third_party/protobuf/upb/wire/decode_fast/select.h +third_party/protobuf/upb/wire/decode_test.cc third_party/protobuf/upb/wire/encode.c third_party/protobuf/upb/wire/encode.h third_party/protobuf/upb/wire/eps_copy_input_stream.c third_party/protobuf/upb/wire/eps_copy_input_stream.h third_party/protobuf/upb/wire/eps_copy_input_stream_test.cc third_party/protobuf/upb/wire/internal/constants.h -third_party/protobuf/upb/wire/internal/decode_fast.c -third_party/protobuf/upb/wire/internal/decode_fast.h +third_party/protobuf/upb/wire/internal/decoder.c third_party/protobuf/upb/wire/internal/decoder.h third_party/protobuf/upb/wire/internal/reader.h third_party/protobuf/upb/wire/reader.c third_party/protobuf/upb/wire/reader.h +third_party/protobuf/upb/wire/test_util/field_types.h +third_party/protobuf/upb/wire/test_util/make_mini_table.cc +third_party/protobuf/upb/wire/test_util/make_mini_table.h +third_party/protobuf/upb/wire/test_util/wire_message.cc +third_party/protobuf/upb/wire/test_util/wire_message.h third_party/protobuf/upb/wire/types.h third_party/protobuf/upb_generator/c/generator.cc third_party/protobuf/upb_generator/c/names.cc @@ -13719,8 +13840,6 @@ third_party/protobuf/upb_generator/common/names.cc third_party/protobuf/upb_generator/common/names.h third_party/protobuf/upb_generator/file_layout.cc third_party/protobuf/upb_generator/file_layout.h -third_party/protobuf/upb_generator/minitable/fasttable.cc -third_party/protobuf/upb_generator/minitable/fasttable.h third_party/protobuf/upb_generator/minitable/generator.cc third_party/protobuf/upb_generator/minitable/generator.h third_party/protobuf/upb_generator/minitable/main.cc @@ -13799,6 +13918,7 @@ third_party/pyjson5/src/setup.py third_party/pywebsocket3/src/setup.py third_party/pywebsocket3/src/test/test_handshake_hybi.py third_party/r8/3pp/3pp.py +third_party/re2/src/.bcr/metadata.template.json third_party/re2/src/CMakeLists.txt third_party/re2/src/python/setup.py third_party/re2/src/re2/testing/re2_test.cc @@ -14845,6 +14965,7 @@ third_party/webrtc/test/android/native_test_util.cc third_party/webrtc/test/test_flags.cc third_party/webrtc/test/test_main_lib.cc third_party/webrtc/test/testsupport/perf_test.h +third_party/webrtc/tools_webrtc/apply_clang_tidy.py third_party/webrtc/tools_webrtc/autoroller/roll_deps.py third_party/webrtc/tools_webrtc/autoroller/unittests/roll_deps_test.py third_party/webrtc/tools_webrtc/iwyu/apply_include_cleaner.py @@ -14949,6 +15070,7 @@ third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/android_webview.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/base.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/chrome.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/firefox.py +third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorchrome.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executormarionette.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/test-wait.js @@ -15075,6 +15197,8 @@ tools/clang/spanify/list-required-pragma.py tools/clang/spanify/remove-unneeded-pragmas.py tools/clang/spanify/tests/cycle-expected.cc tools/clang/spanify/tests/cycle-original.cc +tools/clang/spanify/tests/informational-only-array-alias-not-rewritten-expected.cc +tools/clang/spanify/tests/informational-only-array-alias-not-rewritten-original.cc tools/clang/translation_unit/test_translation_unit.py tools/code_coverage/coverage.py tools/code_coverage/js_source_maps/create_js_source_maps/PRESUBMIT.py @@ -15086,12 +15210,8 @@ tools/crates/gnrt/lib/test_metadata.json tools/crates/gnrt/lib/test_metadata2.json tools/crates/gnrt/lib/test_metadata3.json tools/crates/gnrt/lib/test_metadata4.json -tools/crbug/crbug.js -tools/crbug/pinpoint.js -tools/crbug/user-activity.js tools/cygprofile/PRESUBMIT.py tools/cygprofile/android_profile_tool.py -tools/cygprofile/generate_orderfile_full.py tools/determinism/compare_build_artifacts.py tools/disable_tests/PRESUBMIT.py tools/disable_tests/disable.py @@ -15151,6 +15271,7 @@ tools/include_tracer.py tools/infra/PRESUBMIT.py tools/infra/clobber_cache_utils.py tools/infra/find_bad_builds.py +tools/jj/upload.py tools/json_data_generator/PRESUBMIT.py tools/json_schema_compiler/PRESUBMIT.py tools/json_schema_compiler/js_externs_generator.py @@ -15158,6 +15279,7 @@ tools/json_schema_compiler/js_externs_generator_test.py tools/json_schema_compiler/js_interface_generator_test.py tools/json_schema_compiler/js_util.py tools/json_schema_compiler/preview.py +tools/json_schema_compiler/test/content_settings.json tools/json_schema_compiler/test/tabs.json tools/json_schema_compiler/test/windows.json tools/json_to_struct/PRESUBMIT.py @@ -15219,7 +15341,6 @@ tools/metrics/histograms/metadata/ash_user_education/histograms.xml tools/metrics/histograms/metadata/assistant/histograms.xml tools/metrics/histograms/metadata/attribution_reporting/enums.xml tools/metrics/histograms/metadata/attribution_reporting/histograms.xml -tools/metrics/histograms/metadata/auto/histograms.xml tools/metrics/histograms/metadata/autofill/enums.xml tools/metrics/histograms/metadata/autofill/histograms.xml tools/metrics/histograms/metadata/background/histograms.xml @@ -15366,6 +15487,7 @@ tools/metrics/histograms/metadata/notifications/histograms.xml tools/metrics/histograms/metadata/offline/histograms.xml tools/metrics/histograms/metadata/omnibox/enums.xml tools/metrics/histograms/metadata/omnibox/histograms.xml +tools/metrics/histograms/metadata/on_device_model/histograms.xml tools/metrics/histograms/metadata/oobe/enums.xml tools/metrics/histograms/metadata/oobe/histograms.xml tools/metrics/histograms/metadata/optimization/enums.xml diff --git a/patches/core/bromite/disable-fetching-field-trials.patch b/patches/core/bromite/disable-fetching-field-trials.patch index 57010ece..73a8b6cd 100644 --- a/patches/core/bromite/disable-fetching-field-trials.patch +++ b/patches/core/bromite/disable-fetching-field-trials.patch @@ -51,7 +51,7 @@ Subject: Disable fetching of all field trials /** --- a/components/variations/service/variations_service.cc +++ b/components/variations/service/variations_service.cc -@@ -223,22 +223,7 @@ bool GetInstanceManipulations(const net: +@@ -224,22 +224,7 @@ bool GetInstanceManipulations(const net: // Variations seed fetching is only enabled in official Chrome builds, if a URL // is specified on the command line, and for testing. bool IsFetchingEnabled() { 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 b4b097dd..aef1cffb 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 -@@ -3794,8 +3794,6 @@ static_library("browser") { +@@ -3802,8 +3802,6 @@ static_library("browser") { "download/download_auto_open_policy_handler.cc", "download/download_auto_open_policy_handler.h", "download/download_commands.cc", @@ -48,7 +48,7 @@ } // namespace --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -128,7 +128,7 @@ class DownloadItemModelData : public bas +@@ -129,7 +129,7 @@ class DownloadItemModelData : public bas // Danger level of the file determined based on the file type and whether // there was a user action associated with the download. @@ -57,7 +57,7 @@ // Whether the download is currently being revived. bool is_being_revived_ = false; -@@ -463,13 +463,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -464,13 +464,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -180,7 +180,7 @@ class DownloadsShowFunction : public ExtensionFunction { --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -703,18 +703,6 @@ void WebstorePrivateBeginInstallWithMani +@@ -701,18 +701,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -245,7 +245,7 @@ sources = [ "chrome_controller_client.cc", "chrome_controller_client.h", -@@ -77,6 +78,7 @@ static_library("safe_browsing") { +@@ -80,6 +81,7 @@ static_library("safe_browsing") { "//services/metrics/public/cpp:ukm_builders", "//services/preferences/public/cpp", ] @@ -253,7 +253,7 @@ if (enable_extensions) { deps += [ "//chrome/browser/ui/web_applications" ] -@@ -601,6 +603,7 @@ static_library("advanced_protection") { +@@ -612,6 +614,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -261,7 +261,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -620,6 +623,7 @@ source_set("metrics_collector") { +@@ -631,6 +634,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -314,7 +314,7 @@ #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h" --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -110,7 +110,6 @@ +@@ -114,7 +114,6 @@ #include "components/pdf/common/pdf_util.h" #include "components/permissions/features.h" #include "components/safe_browsing/buildflags.h" diff --git a/patches/core/inox-patchset/0015-disable-update-pings.patch b/patches/core/inox-patchset/0015-disable-update-pings.patch index 10010b82..8cbdbb3b 100644 --- a/patches/core/inox-patchset/0015-disable-update-pings.patch +++ b/patches/core/inox-patchset/0015-disable-update-pings.patch @@ -1,6 +1,6 @@ --- a/chrome/updater/configurator.cc +++ b/chrome/updater/configurator.cc -@@ -147,7 +147,7 @@ base::TimeDelta Configurator::UpdateDela +@@ -133,7 +133,7 @@ base::TimeDelta Configurator::UpdateDela std::vector Configurator::UpdateUrl() const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); 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 b1bd2335..3605b0a1 100644 --- a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch +++ b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch @@ -101,7 +101,7 @@ by default. "-----BEGIN PUBLIC KEY-----" --- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -110,7 +110,7 @@ void OnURLLoadUploadProgress(uint64_t cu +@@ -111,7 +111,7 @@ void OnURLLoadUploadProgress(uint64_t cu } // namespace const char WebRtcEventLogUploaderImpl::kUploadURL[] = @@ -167,7 +167,7 @@ by default. base::ToLowerASCII(bdict_file)); --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ namespace { // The URL to be used to re-install Chrome when auto-update failed for too long. @@ -178,7 +178,7 @@ by default. --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -@@ -76,17 +76,17 @@ namespace { +@@ -66,17 +66,17 @@ namespace { // The URL for the the Learn More page shown on incognito new tab. const char kLearnMoreIncognitoUrl[] = #if BUILDFLAG(IS_CHROMEOS) @@ -202,7 +202,7 @@ by default. std::string ReplaceTemplateExpressions( --- a/chrome/common/extensions/chrome_extensions_client.cc +++ b/chrome/common/extensions/chrome_extensions_client.cc -@@ -45,9 +45,9 @@ namespace { +@@ -46,9 +46,9 @@ namespace { // TODO(battre): Delete the HTTP URL once the blocklist is downloaded via HTTPS. const char kExtensionBlocklistUrlPrefix[] = @@ -274,13 +274,9 @@ 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[] = "https://www.googleapis.com/auth/chromesync"; -+const char kHistoryOAuthScope[] = "trk:138:https://www.googleapis.com/auth/chromesync"; - const char kHistoryQueryHistoryUrl[] = - "https://history.google.com/history/api/lookup?client=chrome"; + "trk:139:https://history.google.com/history/api/lookup?client=chrome"; @@ -289,8 +285,12 @@ by default. - "https://history.google.com/history/api/delete?client=chrome"; + "trk:140:https://history.google.com/history/api/delete?client=chrome"; - const char kHistoryAudioHistoryUrl[] = - "https://history.google.com/history/api/lookup?client=audio"; + const char kQueryWebAndAppActivityUrl[] = +- "https://history.google.com/history/api/lookup?client=web_app"; ++ "trk:138:https://history.google.com/history/api/lookup?client=web_app"; + + const char kQueryOtherFormsOfBrowsingHistoryUrlSuffix[] = "/historystatus"; + --- a/components/safe_browsing/content/browser/client_side_detection_service.cc +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc @@ -68,7 +68,7 @@ const int ClientSideDetectionService::kN @@ -326,9 +326,9 @@ by default. base::Value::Dict dict; --- a/components/translate/core/browser/translate_url_fetcher.cc +++ b/components/translate/core/browser/translate_url_fetcher.cc -@@ -98,6 +98,7 @@ bool TranslateURLFetcher::Request(const - if (!extra_request_header_.empty()) - resource_request->headers.AddHeaderFromString(extra_request_header_); +@@ -97,6 +97,7 @@ bool TranslateURLFetcher::Request(const + resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit; + resource_request->headers.MergeFrom(extra_request_header_); + fprintf(stderr, "translator: fetching something from %s\n", url_.spec().c_str()); simple_loader_ = @@ -343,8 +343,8 @@ by default. -const char kSecurityOrigin[] = "https://translate.googleapis.com/"; +const char kSecurityOrigin[] = "trk:220:https://translate.googleapis.com/"; - // The feature is explicitly disabled on Webview and Weblayer. - // TODO(crbug.com/40819484): Enable the feature on Webview. + // The feature is explicitly disabled on WebView. + // TODO(crbug.com/40819484): Enable the feature on WebView. --- a/components/variations/variations_url_constants.cc +++ b/components/variations/variations_url_constants.cc @@ -8,7 +8,7 @@ namespace variations { 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 b8824662..c2d00855 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -16,7 +16,7 @@ the URL so we get notified if this happens again in the future). --- a/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc +++ b/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc -@@ -63,8 +63,7 @@ ChromeSafeBrowsingBlockingPageFactory::C +@@ -64,8 +64,7 @@ ChromeSafeBrowsingBlockingPageFactory::C Profile::FromBrowserContext(web_contents->GetBrowserContext()); // Create appropriate display options for this blocking page. PrefService* prefs = profile->GetPrefs(); diff --git a/patches/core/ungoogled-chromium/block-requests.patch b/patches/core/ungoogled-chromium/block-requests.patch index d6474e7d..98bdbba9 100644 --- a/patches/core/ungoogled-chromium/block-requests.patch +++ b/patches/core/ungoogled-chromium/block-requests.patch @@ -8,7 +8,7 @@ # Dev tools attempts to download css data --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc -@@ -307,6 +307,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad +@@ -302,6 +302,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default; void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) { diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index e07fd49a..20a3cc41 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -47,7 +47,7 @@ std::u16string real_url(text.substr(after_scheme_and_colon)); --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -602,6 +602,10 @@ GURL FixupURLInternal(const std::string& +@@ -598,6 +598,10 @@ GURL FixupURLInternal(const std::string& } } @@ -70,7 +70,7 @@ // other origins, so we should not treat them as web safe. Remove callers of --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1113,6 +1113,8 @@ component("net") { +@@ -1123,6 +1123,8 @@ component("net") { "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", "url_request/storage_access_status_cache.h", diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index 9d4206c0..af62d212 100644 --- a/patches/core/ungoogled-chromium/disable-crash-reporter.patch +++ b/patches/core/ungoogled-chromium/disable-crash-reporter.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -2711,24 +2711,6 @@ void ChromeContentBrowserClient::AppendE +@@ -2844,24 +2844,6 @@ void ChromeContentBrowserClient::AppendE command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } diff --git a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch index 6961231a..12075772 100644 --- a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch +++ b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch @@ -24,7 +24,7 @@ .english :lang(zh) {display: none} --- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js +++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js -@@ -153,7 +153,7 @@ function maybeSetWebFont() { +@@ -211,7 +211,7 @@ function maybeSetWebFont() { } const e = document.createElement('link'); diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index bdb3c9dc..22b476ac 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -570,7 +570,7 @@ bool IsProbablyGoogleSearchUrl(const GURL& url) { --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -608,10 +608,7 @@ std::u16string TemplateURLRef::SearchTer +@@ -609,10 +609,7 @@ std::u16string TemplateURLRef::SearchTer bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); @@ -595,7 +595,7 @@ namespace { // The result of checking whether a request to a URL should have variations -@@ -112,16 +108,6 @@ URLValidationResult GetUrlValidationResu +@@ -116,16 +112,6 @@ URLValidationResult GetUrlValidationResu return URLValidationResult::kShouldAppend; } @@ -612,7 +612,7 @@ // Returns true if the request is sent from a Google web property, i.e. from a // first-party context. // -@@ -248,28 +234,7 @@ class VariationsHeaderHelper { +@@ -252,30 +238,7 @@ class VariationsHeaderHelper { VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete; bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) { @@ -626,11 +626,13 @@ - // 2. Only transmit for non-Incognito profiles. - // 3. For the X-Client-Data header, only include non-empty variation IDs. - if ((incognito == InIncognito::kYes) || -- !ShouldAppendVariationsHeader(url, "Append")) +- !ShouldAppendVariationsHeader(url, "Append")) { - return false; +- } - -- if (variations_header_.empty()) +- if (variations_header_.empty()) { - return false; +- } - - // Set the variations header to cors_exempt_headers rather than headers to - // be exempted from CORS checks, and to avoid exposing the header to service @@ -642,16 +644,17 @@ } private: -@@ -334,8 +299,6 @@ void RemoveVariationsHeaderIfNeeded( +@@ -341,9 +304,6 @@ void RemoveVariationsHeaderIfNeeded( const net::RedirectInfo& redirect_info, const network::mojom::URLResponseHead& response_head, std::vector* to_be_removed_headers) { -- if (!ShouldAppendVariationsHeader(redirect_info.new_url, "Remove")) +- if (!ShouldAppendVariationsHeader(redirect_info.new_url, "Remove")) { - to_be_removed_headers->push_back(kClientDataHeader); +- } } std::unique_ptr -@@ -371,29 +334,22 @@ CreateSimpleURLLoaderWithVariationsHeade +@@ -379,29 +339,22 @@ CreateSimpleURLLoaderWithVariationsHeade } bool HasVariationsHeader(const network::ResourceRequest& request) { @@ -686,7 +689,7 @@ } // namespace variations --- a/content/browser/preloading/prefetch/prefetch_container.cc +++ b/content/browser/preloading/prefetch/prefetch_container.cc -@@ -949,7 +949,7 @@ void PrefetchContainer::AddRedirectHop(c +@@ -777,7 +777,7 @@ void PrefetchContainer::AddRedirectHop(c // some which are added by throttles). These aren't yet supported for // prefetch, including browsing topics and client hints. net::HttpRequestHeaders updated_headers; diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index 0b4259d1..cbb03b5a 100644 --- a/patches/core/ungoogled-chromium/disable-mei-preload.patch +++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch @@ -25,7 +25,7 @@ --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn -@@ -104,11 +104,6 @@ group("resources") { +@@ -106,11 +106,6 @@ group("resources") { ] } diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch index 0d3431b0..66f682cc 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -75,7 +75,7 @@ PrivacySandboxSettingsImpl::Status --- a/content/browser/attribution_reporting/attribution_suitable_context.cc +++ b/content/browser/attribution_reporting/attribution_suitable_context.cc -@@ -45,85 +45,13 @@ bool UkmSourceIdAllowed(RenderFrameHostI +@@ -44,82 +44,13 @@ bool UkmSourceIdAllowed(RenderFrameHostI // static std::optional AttributionSuitableContext::Create( NavigationHandle* navigation_handle) { @@ -152,9 +152,6 @@ - attribution_host->GetMostRecentNavigationInputEvent(), - AttributionOsLevelManager::GetAttributionReportingOsRegistrars( - web_contents), -- !url_matcher::util::GetGoogleAmpViewerEmbeddedURL( -- initiator_root_frame->GetLastCommittedURL()) -- .is_empty(), - UkmSourceIdAllowed(initiator_root_frame) - ? attribution_host->GetPageUkmSourceId() - : ukm::kInvalidSourceId, @@ -164,7 +161,7 @@ // static --- a/content/browser/interest_group/ad_auction_service_impl.cc +++ b/content/browser/interest_group/ad_auction_service_impl.cc -@@ -192,11 +192,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD +@@ -193,11 +193,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD void AdAuctionServiceImpl::CreateMojoService( RenderFrameHost* render_frame_host, mojo::PendingReceiver receiver) { @@ -240,7 +237,7 @@ void StoragePartitionImpl::ResetSessionStorageConnections() { --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4196,12 +4196,6 @@ void WebContentsImpl::Init(const WebCont +@@ -4192,12 +4192,6 @@ void WebContentsImpl::Init(const WebCont DateTimeChooser::CreateDateTimeChooser(this); #endif diff --git a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch index 23902a9d..61453ae0 100644 --- a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch +++ b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch @@ -116,7 +116,7 @@ --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -135,7 +135,7 @@ void RegisterBrowserUserPrefs(user_prefs +@@ -139,7 +139,7 @@ void RegisterBrowserUserPrefs(user_prefs registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string()); registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false); registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls); diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index 78475a1f..eb62d031 100644 --- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch +++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch @@ -78,15 +78,11 @@ } // namespace extensions --- a/extensions/browser/updater/extension_downloader.cc +++ b/extensions/browser/updater/extension_downloader.cc -@@ -92,28 +92,19 @@ const char kNotFromWebstoreInstallSource +@@ -92,25 +92,16 @@ const char kNotFromWebstoreInstallSource const char kDefaultInstallSource[] = ""; const char kReinstallInstallSource[] = "reinstall"; -const char kGoogleDotCom[] = "google.com"; - const char kTokenServiceConsumerId[] = "extension_downloader"; - const char kWebstoreOAuth2Scope[] = -- "https://www.googleapis.com/auth/chromewebstore.readonly"; -+ "trk:10:https://www.googleapis.com/auth/chromewebstore.readonly"; ExtensionDownloader::TestObserver* g_test_observer = nullptr; ExtensionDownloaderTestDelegate* g_test_delegate = nullptr; @@ -109,7 +105,7 @@ bool ShouldRetryRequest(const network::SimpleURLLoader* loader) { DCHECK(loader); -@@ -169,7 +160,7 @@ std::optional SanitizeUpdateURL(co +@@ -166,7 +157,7 @@ std::optional SanitizeUpdateURL(co const GURL& update_url) { if (update_url.is_empty()) { // Fill in default update URL. @@ -118,7 +114,7 @@ } // Skip extensions with non-empty invalid update URLs. -@@ -187,11 +178,6 @@ std::optional SanitizeUpdateURL(co +@@ -184,11 +175,6 @@ std::optional SanitizeUpdateURL(co return std::nullopt; } @@ -130,7 +126,7 @@ return update_url; } -@@ -369,10 +355,6 @@ void ExtensionDownloader::DoStartAllPend +@@ -366,10 +352,6 @@ void ExtensionDownloader::DoStartAllPend AddToFetches(fetches_preparing, std::move(task)); pending_tasks_.clear(); @@ -141,7 +137,7 @@ } void ExtensionDownloader::SetIdentityManager( -@@ -833,20 +815,6 @@ void ExtensionDownloader::HandleManifest +@@ -830,20 +812,6 @@ void ExtensionDownloader::HandleManifest update.second->info); } @@ -162,7 +158,7 @@ ExtensionIdSet extension_ids_with_errors; for (const auto& failure : failures) extension_ids_with_errors.insert(failure.first.id); -@@ -1428,11 +1396,7 @@ bool ExtensionDownloader::IterateFetchCr +@@ -1423,11 +1391,7 @@ bool ExtensionDownloader::IterateFetchCr // fetch. switch (fetch->credentials) { case ExtensionFetch::CREDENTIALS_NONE: diff --git a/patches/core/ungoogled-chromium/extensions-manifestv2.patch b/patches/core/ungoogled-chromium/extensions-manifestv2.patch index a8584f98..00c4819c 100644 --- a/patches/core/ungoogled-chromium/extensions-manifestv2.patch +++ b/patches/core/ungoogled-chromium/extensions-manifestv2.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -@@ -864,19 +864,6 @@ void ExtensionInfoGenerator::FillExtensi +@@ -867,19 +867,6 @@ void ExtensionInfoGenerator::FillExtensi toolbar_actions_model->IsActionPinned(extension.id()); } @@ -22,7 +22,7 @@ // `CanUploadAsAccountExtension` should already check for the feature flag --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -355,31 +355,7 @@ bool ExtensionManagement::IsAllowedManif +@@ -348,31 +348,7 @@ bool ExtensionManagement::IsAllowedManif int manifest_version, const std::string& extension_id, Manifest::Type manifest_type) { @@ -54,7 +54,7 @@ } bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) { -@@ -400,26 +376,8 @@ bool ExtensionManagement::IsExemptFromMV +@@ -393,26 +369,8 @@ bool ExtensionManagement::IsExemptFromMV return false; } @@ -83,7 +83,7 @@ bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy( --- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc +++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc -@@ -145,22 +145,6 @@ bool ManifestV2ExperimentManagerFactory: +@@ -145,17 +145,6 @@ bool ManifestV2ExperimentManagerFactory: // Determines the current stage of the MV2 deprecation experiments. MV2ExperimentStage CalculateCurrentExperimentStage() { @@ -98,15 +98,10 @@ - return MV2ExperimentStage::kDisableWithReEnable; - } - -- if (base::FeatureList::IsEnabled( -- extensions_features::kExtensionManifestV2DeprecationWarning)) { -- return MV2ExperimentStage::kWarning; -- } -- - return MV2ExperimentStage::kNone; + return MV2ExperimentStage::kWarning; } -@@ -200,19 +184,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF +@@ -189,18 +178,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF // Returns true if legacy extensions should be disabled, looking at both // experiment stage and global state. bool ShouldDisableLegacyExtensions(MV2ExperimentStage stage) { @@ -116,7 +111,6 @@ - } - - switch (stage) { -- case MV2ExperimentStage::kNone: - case MV2ExperimentStage::kWarning: return false; - case MV2ExperimentStage::kDisableWithReEnable: @@ -128,7 +122,7 @@ // Returns true if the given `stage` is one in which extension enablement should --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -482,7 +482,7 @@ content::WebUIDataSource* CreateAndAddEx +@@ -484,7 +484,7 @@ content::WebUIDataSource* CreateAndAddEx extensions_features::kExtensionsMenuAccessControlWithPermittedSites)); source->AddBoolean( "safetyHubThreeDotDetails", @@ -139,7 +133,7 @@ auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile); --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc -@@ -103,13 +103,6 @@ bool IsManifestSupported(int manifest_ve +@@ -101,13 +101,6 @@ bool IsManifestSupported(int manifest_ve // Supported versions are always safe. if (manifest_version >= kMinimumSupportedManifestVersion && manifest_version <= kMaximumSupportedManifestVersion) { 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 57f3e7ec..41fa19b9 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -30,7 +30,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -797,10 +797,6 @@ static_library("browser") { +@@ -793,10 +793,6 @@ static_library("browser") { "navigation_predictor/navigation_predictor_metrics_document_data.h", "navigation_predictor/navigation_predictor_preconnect_client.cc", "navigation_predictor/navigation_predictor_preconnect_client.h", @@ -41,7 +41,7 @@ "navigation_predictor/search_engine_preconnector_keyed_service_factory.cc", "navigation_predictor/search_engine_preconnector_keyed_service_factory.h", "net/cert_verifier_service_time_updater.cc", -@@ -3678,10 +3674,6 @@ static_library("browser") { +@@ -3686,10 +3682,6 @@ static_library("browser") { } else { #!is_android sources += [ @@ -52,7 +52,7 @@ "accessibility/caption_bubble_context_browser.h", "accessibility/embedded_a11y_extension_loader.cc", "accessibility/embedded_a11y_extension_loader.h", -@@ -4341,8 +4333,6 @@ static_library("browser") { +@@ -4345,8 +4337,6 @@ static_library("browser") { "//chrome/app:command_ids", "//chrome/app/theme:chrome_unscaled_resources_grit", "//chrome/app/vector_icons", @@ -61,7 +61,7 @@ "//chrome/browser/actor", "//chrome/browser/actor:impl", "//chrome/browser/actor/ui", -@@ -4369,10 +4359,6 @@ static_library("browser") { +@@ -4373,10 +4363,6 @@ static_library("browser") { "//chrome/browser/performance_manager/user_tuning", "//chrome/browser/policy:path_parser", "//chrome/browser/resource_coordinator", @@ -72,7 +72,7 @@ "//chrome/browser/search/background", "//chrome/browser/sharing_hub", "//chrome/browser/smart_card", -@@ -4416,7 +4402,6 @@ static_library("browser") { +@@ -4421,7 +4407,6 @@ static_library("browser") { "//chrome/browser/ui/webui/access_code_cast", "//chrome/browser/ui/webui/actor_internals", "//chrome/browser/ui/webui/app_service_internals", @@ -80,7 +80,7 @@ "//chrome/browser/ui/webui/color_pipeline_internals", "//chrome/browser/ui/webui/infobar_internals", "//chrome/browser/ui/webui/infobar_internals:impl", -@@ -4536,9 +4521,6 @@ static_library("browser") { +@@ -4551,9 +4536,6 @@ static_library("browser") { "//components/webauthn/core/browser", "//components/webauthn/core/browser:passkey_model", "//services/device/public/cpp/hid", @@ -90,7 +90,7 @@ "//third_party/crashpad/crashpad/client:common", "//third_party/zxcvbn-cpp", "//ui/views", -@@ -4644,8 +4626,6 @@ static_library("browser") { +@@ -4714,8 +4696,6 @@ static_library("browser") { sources += [ "accessibility/soda_installer_impl.cc", "accessibility/soda_installer_impl.h", @@ -99,7 +99,7 @@ "device_identity/device_oauth2_token_store_desktop.cc", "device_identity/device_oauth2_token_store_desktop.h", "device_notifications/device_status_icon_renderer.cc", -@@ -4701,8 +4681,6 @@ static_library("browser") { +@@ -4771,8 +4751,6 @@ static_library("browser") { "profiles/profile_activity_metrics_recorder.h", "profiles/profile_list_desktop.cc", "profiles/profile_list_desktop.h", @@ -108,7 +108,7 @@ "signin/force_signin_verifier.cc", "signin/force_signin_verifier.h", "signin/signin_manager.cc", -@@ -5511,7 +5489,6 @@ static_library("browser") { +@@ -5568,7 +5546,6 @@ static_library("browser") { "//chrome/browser/policy:system_features_disable_list", "//chrome/browser/push_notification", "//chrome/browser/resources:app_icon_resources", @@ -116,7 +116,7 @@ "//chrome/browser/sharesheet", "//chrome/browser/support_tool/ash", "//chrome/browser/ui/ash/accelerator", -@@ -5775,7 +5752,6 @@ static_library("browser") { +@@ -5831,7 +5808,6 @@ static_library("browser") { "//remoting/host/chromeos:browser_interop", "//remoting/host/chromeos:features", "//services/device/public/cpp/geolocation", @@ -140,7 +140,7 @@ } --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -247,12 +247,10 @@ +@@ -243,12 +243,10 @@ #if BUILDFLAG(IS_CHROMEOS) #include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h" #include "chrome/browser/hid/hid_pinned_notification.h" @@ -153,7 +153,7 @@ #include "chrome/browser/usb/usb_status_icon.h" #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif -@@ -1384,9 +1382,6 @@ void BrowserProcessImpl::PreMainMessageL +@@ -1381,9 +1379,6 @@ void BrowserProcessImpl::PreMainMessageL soda_installer_impl_ = std::make_unique(); #endif // BUILDFLAG(IS_CHROMEOS) @@ -237,7 +237,7 @@ #if BUILDFLAG(IS_WIN) --- a/chrome/browser/chrome_browser_interface_binders_webui.cc +++ b/chrome/browser/chrome_browser_interface_binders_webui.cc -@@ -803,8 +803,6 @@ void PopulateChromeWebUIFrameBinders( +@@ -810,8 +810,6 @@ void PopulateChromeWebUIFrameBinders( ::mojom::app_service_internals::AppServiceInternalsPageHandler, AppServiceInternalsUI>(map); @@ -372,7 +372,7 @@ void NavigationPredictor::SetModelScoreCallbackForTesting( --- a/chrome/browser/pdf/pdf_extension_util.cc +++ b/chrome/browser/pdf/pdf_extension_util.cc -@@ -110,7 +110,6 @@ void AddPdfViewerStrings(base::Value::Di +@@ -111,7 +111,6 @@ void AddPdfViewerStrings(base::Value::Di {"rotationStateLabel90", IDS_PDF_ROTATION_STATE_LABEL_90}, {"rotationStateLabel180", IDS_PDF_ROTATION_STATE_LABEL_180}, {"rotationStateLabel270", IDS_PDF_ROTATION_STATE_LABEL_270}, @@ -395,7 +395,7 @@ "prediction_service/prediction_service_request.cc", --- a/chrome/browser/permissions/chrome_permissions_client.cc +++ b/chrome/browser/permissions/chrome_permissions_client.cc -@@ -475,8 +475,6 @@ ChromePermissionsClient::CreatePermissio +@@ -474,8 +474,6 @@ ChromePermissionsClient::CreatePermissio #endif selectors.emplace_back(std::make_unique( Profile::FromBrowserContext(browser_context))); @@ -406,21 +406,28 @@ --- a/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc +++ b/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc -@@ -17,11 +17,6 @@ PassageEmbedderDelegate::PassageEmbedder +@@ -17,18 +17,6 @@ PassageEmbedderDelegate::PassageEmbedder : profile_(profile) {} Embedder* PassageEmbedderDelegate::get_passage_embedder() { - if (auto* prediction_model_handler_provider = - PredictionModelHandlerProviderFactory::GetForBrowserContext( - profile_)) { +- bool is_ready = prediction_model_handler_provider->IsPassageEmbedderReady(); +- PermissionUmaUtil::RecordPassageEmbedderMetadataValid(is_ready); +- if (!is_ready) { +- VLOG(1) << "[PermissionsAIv4] " +- "PassageEmbedderDelegate::get_passage_embedder is not ready."; +- return nullptr; +- } - return prediction_model_handler_provider->GetPassageEmbedder(); - } + PermissionUmaUtil::RecordPassageEmbedderMetadataValid(false); return nullptr; } - --- a/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc -@@ -836,7 +836,7 @@ void PredictionBasedPermissionUiSelector +@@ -857,7 +857,7 @@ void PredictionBasedPermissionUiSelector ModelExecutionData model_data) { VLOG(1) << "[PermissionsAI] ExecuteOnDeviceAivXModel"; PredictionModelHandlerProvider* prediction_model_handler_provider = @@ -441,7 +448,7 @@ "//chrome/browser/search_engines", --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1830,9 +1830,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1907,9 +1907,6 @@ void RegisterLocalState(PrefRegistrySimp DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry); #endif @@ -453,7 +460,7 @@ PlatformAuthPolicyObserver::RegisterPrefs(registry); --- a/chrome/browser/profiles/BUILD.gn +++ b/chrome/browser/profiles/BUILD.gn -@@ -320,7 +320,6 @@ source_set("profiles_extra_parts_impl") +@@ -324,7 +324,6 @@ source_set("profiles_extra_parts_impl") ] } else { deps += [ @@ -461,7 +468,7 @@ "//chrome/browser/apps/app_service", "//chrome/browser/autofill", "//chrome/browser/contextual_cueing", -@@ -328,7 +327,6 @@ source_set("profiles_extra_parts_impl") +@@ -332,7 +331,6 @@ source_set("profiles_extra_parts_impl") "//chrome/browser/feedback", "//chrome/browser/hid", "//chrome/browser/media/router/discovery/access_code:access_code_sink_service", @@ -479,7 +486,7 @@ #include "chrome/browser/navigation_predictor/search_engine_preconnector.h" #include "chrome/browser/navigation_predictor/search_engine_preconnector_keyed_service_factory.h" #include "chrome/browser/net/dns_probe_service_factory.h" -@@ -339,7 +338,6 @@ +@@ -342,7 +341,6 @@ #include "chrome/browser/prefs/persistent_renderer_prefs_manager_factory.h" #include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h" #include "chrome/browser/profile_resetter/reset_report_uploader_factory.h" @@ -487,7 +494,7 @@ #include "chrome/browser/search/background/ntp_background_service_factory.h" #include "chrome/browser/search/background/ntp_custom_background_service_factory.h" #include "chrome/browser/search/instant_service_factory.h" -@@ -1057,7 +1055,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1056,7 +1054,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) net::ServerCertificateDatabaseServiceFactory::GetInstance(); #endif @@ -495,7 +502,7 @@ #if BUILDFLAG(ENABLE_DICE_SUPPORT) ProfileManagementDisclaimerServiceFactory::GetInstance(); #endif -@@ -1112,9 +1109,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1105,9 +1102,6 @@ void ChromeBrowserMainExtraPartsProfiles OneTimePermissionsTrackerFactory::GetInstance(); #endif OpenerHeuristicServiceFactory::GetInstance(); @@ -505,7 +512,7 @@ OptimizationGuideKeyedServiceFactory::GetInstance(); OriginKeyedPermissionActionServiceFactory::GetInstance(); OriginTrialsFactory::GetInstance(); -@@ -1186,13 +1180,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1187,13 +1181,6 @@ void ChromeBrowserMainExtraPartsProfiles policy::UserPolicySigninServiceFactory::GetInstance(); #endif PolicyBlocklistFactory::GetInstance(); @@ -519,9 +526,9 @@ PredictionServiceFactory::GetInstance(); predictors::AutocompleteActionPredictorFactory::GetInstance(); predictors::LoadingPredictorFactory::GetInstance(); -@@ -1278,10 +1265,6 @@ void ChromeBrowserMainExtraPartsProfiles - #else +@@ -1275,10 +1262,6 @@ void ChromeBrowserMainExtraPartsProfiles SafetyHubMenuNotificationServiceFactory::GetInstance(); + #if !BUILDFLAG(IS_ANDROID) SafetyHubHatsServiceFactory::GetInstance(); - if (features::IsMainNodeAnnotationsEnabled()) { - screen_ai::AXMainNodeAnnotatorControllerFactory::GetInstance(); @@ -530,7 +537,7 @@ #endif #if BUILDFLAG(IS_CHROMEOS) if (ash::features::IsScannerEnabled()) { -@@ -1401,7 +1384,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1399,7 +1382,6 @@ void ChromeBrowserMainExtraPartsProfiles TrackingProtectionSettingsFactory::GetInstance(); translate::TranslateRankerFactory::GetInstance(); #if !BUILDFLAG(IS_ANDROID) @@ -540,7 +547,7 @@ #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc -@@ -225,11 +225,6 @@ void OffTheRecordProfileImpl::Init() { +@@ -224,11 +224,6 @@ void OffTheRecordProfileImpl::Init() { // AccessibilityLabelsService has a default prefs behavior in incognito. AccessibilityLabelsService::InitOffTheRecordPrefs(this); @@ -554,7 +561,7 @@ // System Profile. --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -855,11 +855,6 @@ void ProfileImpl::DoFinalInit(CreateMode +@@ -845,11 +845,6 @@ void ProfileImpl::DoFinalInit(CreateMode // The password settings service needs to start listening to settings // changes from Google Mobile Services, as early as possible. PasswordManagerSettingsServiceFactory::GetForProfile(this); @@ -576,7 +583,7 @@ #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/delete_profile_helper.h" #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h" -@@ -1493,9 +1492,6 @@ void ProfileManager::DoFinalInitForServi +@@ -1486,9 +1485,6 @@ void ProfileManager::DoFinalInitForServi // Ensure NavigationPredictorKeyedService is started. NavigationPredictorKeyedServiceFactory::GetForProfile(profile); @@ -588,7 +595,7 @@ #if BUILDFLAG(IS_ANDROID) --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn -@@ -107,7 +107,6 @@ group("resources") { +@@ -109,7 +109,6 @@ group("resources") { if (is_mac) { public_deps += [ "//chrome/browser/resources/media/mei_preload:component", @@ -598,7 +605,7 @@ --- a/chrome/browser/resources/pdf/pdf_viewer.html +++ b/chrome/browser/resources/pdf/pdf_viewer.html -@@ -113,10 +113,6 @@ import {AnnotationMode} from './constant +@@ -105,10 +105,6 @@ import {AnnotationMode} from './constant ` : ''} @@ -611,7 +618,7 @@ ${this.showErrorDialog ? html` --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1524,8 +1524,6 @@ static_library("ui") { +@@ -1430,8 +1430,6 @@ static_library("ui") { "//chrome/browser/regional_capabilities", "//chrome/browser/safe_browsing", "//chrome/browser/safe_browsing:advanced_protection", @@ -620,7 +627,7 @@ "//chrome/browser/smart_card", "//chrome/browser/tab_group_sync:utils", "//chrome/browser/themes", -@@ -2278,7 +2276,6 @@ static_library("ui") { +@@ -2191,7 +2189,6 @@ static_library("ui") { "//chrome/browser/policy:onc", "//chrome/browser/policy:system_features_disable_list", "//chrome/browser/push_notification", @@ -628,8 +635,8 @@ "//chrome/browser/ui/ash/accessibility", "//chrome/browser/ui/ash/app_access", "//chrome/browser/ui/ash/arc", -@@ -4787,7 +4784,6 @@ static_library("ui") { - "//chrome/browser/ui/views/user_education", +@@ -4638,7 +4635,6 @@ static_library("ui") { + # c/b/ui/passwords/passwords_model_delegate.h, passwords_client_ui_delegate.h. "//chrome/browser/ui/webauthn:impl", "//chrome/browser/ui/webui/app_service_internals", - "//chrome/browser/ui/webui/autofill_ml_internals", @@ -690,7 +697,7 @@ std::vector tab_subscriptions_; --- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc +++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -764,39 +764,6 @@ void MaybeRegisterChromeFeaturePromos( +@@ -746,39 +746,6 @@ void MaybeRegisterChromeFeaturePromos( .SetBubbleIcon(kLightbulbOutlineIcon) .SetBubbleTitleText(IDS_PASSWORD_MANAGER_IPH_CREATE_SHORTCUT_TITLE))); @@ -742,7 +749,7 @@ "//chrome/browser/ui/webui/new_tab_footer", --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -295,7 +295,6 @@ void RegisterChromeWebUIConfigs() { +@@ -297,7 +297,6 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); @@ -855,7 +862,7 @@ #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/ui/browser.h" -@@ -376,14 +374,6 @@ ReadAnythingUntrustedPageHandler::ReadAn +@@ -325,14 +323,6 @@ ReadAnythingUntrustedPageHandler::ReadAn prefs_lang = language::ExtractBaseLanguage(prefs_lang); SetDefaultLanguageCode(prefs_lang); @@ -870,9 +877,20 @@ // Enable accessibility for the top level render frame and all descendants. // This causes AXTreeSerializer to reset and send accessibility events of +--- a/chrome/common/features.gni ++++ b/chrome/common/features.gni +@@ -46,7 +46,7 @@ declare_args() { + enable_chrome_notifications = is_mac || is_win || is_linux || is_fuchsia + + # Enables inclusion of glic in the build. +- enable_glic = is_mac || is_win || is_linux ++ enable_glic = false + + # Hangout services is an extension that adds extra features to Hangouts. + # It is enableable separately to facilitate testing. --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -334,18 +334,6 @@ static_library("renderer") { +@@ -340,18 +340,6 @@ static_library("renderer") { ] } else { sources += [ @@ -891,7 +909,7 @@ "media/chrome_speech_recognition_client.cc", "media/chrome_speech_recognition_client.h", "searchbox/searchbox.cc", -@@ -360,7 +348,6 @@ static_library("renderer") { +@@ -367,7 +355,6 @@ static_library("renderer") { "//components/crx_file", "//components/trusted_vault", "//services/screen_ai/buildflags", @@ -901,7 +919,7 @@ ] --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc -@@ -71,7 +71,6 @@ +@@ -72,7 +72,6 @@ #include "url/gurl.h" #if !BUILDFLAG(IS_ANDROID) @@ -909,15 +927,14 @@ #include "chrome/renderer/actor/journal.h" #include "chrome/renderer/actor/tool_executor.h" #include "chrome/renderer/searchbox/searchbox_extension.h" -@@ -324,21 +323,6 @@ void ChromeRenderFrameObserver::DidCommi +@@ -325,20 +324,6 @@ void ChromeRenderFrameObserver::DidCommi } void ChromeRenderFrameObserver::DidClearWindowObject() { -#if !BUILDFLAG(IS_ANDROID) -- const base::CommandLine& command_line = -- *base::CommandLine::ForCurrentProcess(); -- if (command_line.HasSwitch(switches::kInstantProcess)) +- if (process_state::IsInstantProcess()) { - SearchBoxExtension::Install(render_frame()->GetWebFrame()); +- } - - // Install ReadAnythingAppController on render frames with the Read Anything - // url, which is chrome-untrusted. ReadAnythingAppController installs v8 @@ -933,7 +950,7 @@ void ChromeRenderFrameObserver::DidMeaningfulLayout( --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -2375,9 +2375,6 @@ if (!is_android) { +@@ -2405,9 +2405,6 @@ if (!is_android) { "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/safe_browsing:advanced_protection", "//chrome/browser/safe_browsing:verdict_cache_manager_factory", @@ -943,7 +960,7 @@ "//chrome/browser/search", "//chrome/browser/search_engines", "//chrome/browser/segmentation_platform:test_utils", -@@ -2809,8 +2806,6 @@ if (!is_android) { +@@ -2847,8 +2844,6 @@ if (!is_android) { "//services/preferences/public/cpp", "//services/preferences/public/cpp/tracked", "//services/preferences/tracked:features", @@ -952,7 +969,7 @@ "//services/service_manager/public/cpp", "//services/strings", "//services/test/echo/public/mojom", -@@ -8444,7 +8439,6 @@ test("unit_tests") { +@@ -8504,7 +8499,6 @@ test("unit_tests") { # # TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above? deps += [ @@ -960,7 +977,7 @@ "//chrome:packed_resources_integrity_header", "//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps/app_service", -@@ -8477,7 +8471,6 @@ test("unit_tests") { +@@ -8537,7 +8531,6 @@ test("unit_tests") { "//chrome/browser/profile_resetter:fake_profile_resetter", "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/resources/new_tab_page_instant:resources_grit", @@ -1033,7 +1050,7 @@ #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE) --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -613,7 +613,6 @@ test("components_unittests") { +@@ -617,7 +617,6 @@ test("components_unittests") { "//components/media_router/common/providers/cast/channel:unit_tests", "//components/page_info:unit_tests", "//components/permissions:unit_tests", @@ -1051,6 +1068,35 @@ #include "components/autofill/core/browser/proto/server.pb.h" #include "components/autofill/core/common/autofill_constants.h" #include "components/autofill/core/common/autofill_features.h" +--- a/components/autofill/core/browser/foundations/autofill_manager.cc ++++ b/components/autofill/core/browser/foundations/autofill_manager.cc +@@ -909,26 +909,6 @@ void AutofillManager::LogCurrentFieldTyp + void AutofillManager::SubscribeToMlModelChanges( + FieldClassificationModelHandler& handler, + optimization_guide::proto::OptimizationTarget optimization_target) { +- switch (optimization_target) { +- case optimization_guide::proto::OptimizationTarget:: +- OPTIMIZATION_TARGET_AUTOFILL_FIELD_CLASSIFICATION: +- if (!autofill_model_change_subscription_) { +- autofill_model_change_subscription_ = +- handler.RegisterModelChangeCallback(base::BindRepeating( +- &AutofillManager::ReparseKnownForms, base::Unretained(this))); +- } +- break; +- case optimization_guide::proto::OptimizationTarget:: +- OPTIMIZATION_TARGET_PASSWORD_MANAGER_FORM_CLASSIFICATION: +- if (!password_manager_model_change_subscription_) { +- password_manager_model_change_subscription_ = +- handler.RegisterModelChangeCallback(base::BindRepeating( +- &AutofillManager::ReparseKnownForms, base::Unretained(this))); +- } +- break; +- default: +- NOTREACHED(); +- } + } + + } // namespace autofill --- a/components/omnibox/browser/autocomplete_classifier.cc +++ b/components/omnibox/browser/autocomplete_classifier.cc @@ -131,8 +131,6 @@ void AutocompleteClassifier::Classify( @@ -1094,7 +1140,7 @@ fuzzer_test("update_client_protocol_serializer_fuzzer") { --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -836,10 +836,6 @@ if (is_apple) { +@@ -835,10 +835,6 @@ if (is_apple) { deps = [ "//third_party/icu:icudata" ] } @@ -1105,6 +1151,64 @@ if (v8_use_external_startup_data) { public_deps += [ "//v8" ] if (use_v8_context_snapshot) { +--- a/services/on_device_model/ml/BUILD.gn ++++ b/services/on_device_model/ml/BUILD.gn +@@ -66,7 +66,6 @@ if (use_blink || (is_ios && build_with_i + "//components/optimization_guide/core:features", + "//components/translate/core/language_detection", + "//services/on_device_model:backend_interfaces", +- "//services/on_device_model/safety:safety_util", + "//third_party/abseil-cpp:absl", + "//third_party/angle:includes", + "//third_party/dawn/src/dawn:proc", +@@ -79,9 +78,6 @@ if (use_blink || (is_ios && build_with_i + if (use_blink) { + deps += [ "//gpu/config" ] + } +- if (!is_fuchsia) { +- deps += [ "//services/on_device_model/safety:bert_safety_model" ] +- } + if (is_win || is_mac || is_linux) { + deps += [ "//third_party/xnnpack" ] + } +--- a/services/on_device_model/ml/ts_model.cc ++++ b/services/on_device_model/ml/ts_model.cc +@@ -25,9 +25,6 @@ + #include "services/on_device_model/public/mojom/on_device_model_service.mojom.h" + #include "services/on_device_model/safety/safety_util.h" + +-#if !BUILDFLAG(IS_FUCHSIA) +-#include "services/on_device_model/safety/bert_safety_model.h" +-#endif + + namespace ml { + +@@ -166,13 +163,7 @@ mojom::SafetyInfoPtr TsModel::ClassifyTe + + mojom::LanguageDetectionResultPtr TsModel::DetectLanguage( + std::string_view text) { +- if (!language_detector_) { + return nullptr; +- } +- language_detection::Prediction prediction = on_device_model::PredictLanguage( +- language_detector_->tflite_model(), text); +- return mojom::LanguageDetectionResult::New(prediction.language, +- prediction.score); + } + + TsHolder::TsHolder(raw_ref chrome_ml) : chrome_ml_(chrome_ml) {} +@@ -196,11 +187,6 @@ void TsHolder::Reset(mojom::TextSafetyMo + if (impl) { + model_.Add(std::move(impl), std::move(model)); + } +- } else { +- auto impl = on_device_model::BertSafetyModel::Create(std::move(params)); +- if (impl) { +- model_.Add(std::move(impl), std::move(model)); +- } + } + #else + CHECK(params->safety_assets->which() == --- a/services/on_device_model/on_device_model.gni +++ b/services/on_device_model/on_device_model.gni @@ -15,7 +15,6 @@ declare_args() { @@ -1116,6 +1220,51 @@ + enable_ml_internal = false use_chromeos_model_service = is_chrome_branded && is_cbx } +--- a/services/on_device_model/safety/BUILD.gn ++++ b/services/on_device_model/safety/BUILD.gn +@@ -4,42 +4,6 @@ + + import("//components/optimization_guide/features.gni") + +-if (!is_fuchsia) { +- source_set("bert_safety_op_resolver") { +- sources = [ +- "bert_safety_op_resolver.cc", +- "bert_safety_op_resolver.h", +- ] +- +- deps = [ +- "//components/optimization_guide/core/inference:op_resolver", +- "//third_party/tensorflow-text:shimed_bert_model_ops", +- "//third_party/tflite", +- ] +- } +- +- source_set("bert_safety_model") { +- sources = [ +- "bert_safety_model.cc", +- "bert_safety_model.h", +- ] +- +- deps = [ +- ":bert_safety_op_resolver", +- ":safety_util", +- "//base", +- "//components/translate/core/language_detection", +- ] +- +- public_deps = [ +- "//mojo/public/cpp/bindings", +- "//services/on_device_model/public/mojom", +- "//third_party/tflite", +- "//third_party/tflite_support", +- "//third_party/tflite_support:tflite_support_proto", +- ] +- } +-} + + source_set("safety_util") { + sources = [ --- a/services/passage_embeddings/passage_embeddings_service.cc +++ b/services/passage_embeddings/passage_embeddings_service.cc @@ -23,7 +23,6 @@ PassageEmbeddingsService::~PassageEmbedd @@ -1158,7 +1307,7 @@ } --- a/third_party/devtools-frontend/src/front_end/BUILD.gn +++ b/third_party/devtools-frontend/src/front_end/BUILD.gn -@@ -209,7 +209,6 @@ group("unittests") { +@@ -210,7 +210,6 @@ group("unittests") { "panels/timeline:unittests", "panels/timeline/components:unittests", "panels/timeline/components/insights:unittests", diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index eb1c48a3..d0881424 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 -@@ -635,8 +635,6 @@ static_library("browser") { +@@ -631,8 +631,6 @@ static_library("browser") { "idle/idle_detection_permission_context.h", "interstitials/chrome_settings_page_helper.cc", "interstitials/chrome_settings_page_helper.h", @@ -11,7 +11,7 @@ "invalidation/profile_invalidation_provider_factory.cc", "invalidation/profile_invalidation_provider_factory.h", "k_anonymity_service/k_anonymity_service_client.cc", -@@ -2403,7 +2401,6 @@ static_library("browser") { +@@ -2384,7 +2382,6 @@ static_library("browser") { "//components/resources", "//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser:safe_browsing_service", @@ -19,7 +19,7 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/content/common/proto:download_file_types_proto", -@@ -3992,10 +3989,6 @@ static_library("browser") { +@@ -4004,10 +4001,6 @@ static_library("browser") { "new_tab_page/modules/modules_switches.h", "new_tab_page/modules/new_tab_page_modules.cc", "new_tab_page/modules/new_tab_page_modules.h", @@ -30,7 +30,7 @@ "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.cc", "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h", "new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc", -@@ -8662,7 +8655,6 @@ static_library("browser_generated_files" +@@ -8716,7 +8709,6 @@ static_library("browser_generated_files" "//chrome/browser/new_tab_page/chrome_colors:generate_chrome_colors_info", "//chrome/browser/new_tab_page/chrome_colors:generate_colors_info", "//chrome/browser/new_tab_page/modules/file_suggestion:mojo_bindings", @@ -38,7 +38,7 @@ "//chrome/browser/new_tab_page/modules/v2/authentication:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings", -@@ -9153,8 +9145,6 @@ static_library("test_support") { +@@ -9211,8 +9203,6 @@ static_library("test_support") { "//components/reporting/util:status", "//components/reporting/util:status_macros", "//components/reporting/util:task_runner_context", @@ -57,7 +57,7 @@ #include "content/public/browser/download_item_utils.h" #include "content/public/browser/download_manager.h" -@@ -275,14 +274,6 @@ void DownloadBubbleUIController::Process +@@ -278,14 +277,6 @@ void DownloadBubbleUIController::Process switch (command) { case DownloadCommands::KEEP: case DownloadCommands::DISCARD: { @@ -74,7 +74,7 @@ // Launch a HaTS survey. Note this needs to come before the command is --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -178,7 +178,6 @@ using content::DownloadManager; +@@ -179,7 +179,6 @@ using content::DownloadManager; using download::DownloadItem; using download::DownloadPathReservationTracker; using download::PathValidationResult; @@ -82,7 +82,7 @@ using ConnectionType = net::NetworkChangeNotifier::ConnectionType; #if BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION) -@@ -1895,7 +1894,6 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -1899,7 +1898,6 @@ void ChromeDownloadManagerDelegate::OnDo DownloadItemModel model(item); model.DetermineAndSetShouldPreferOpeningInBrowser( target_info.target_path, target_info.is_filetype_handled_safely); @@ -90,7 +90,7 @@ } if (ShouldBlockFile(item, target_info.danger_type)) { MaybeReportDangerousDownloadBlocked( -@@ -1976,49 +1974,20 @@ bool ChromeDownloadManagerDelegate::IsOp +@@ -1980,49 +1978,20 @@ bool ChromeDownloadManagerDelegate::IsOp bool ChromeDownloadManagerDelegate::ShouldBlockFile( download::DownloadItem* item, download::DownloadDangerType danger_type) const { @@ -489,9 +489,23 @@ signals.Set(device_signals::names::kChromeRemoteDesktopAppBlocked, context_info.chrome_remote_desktop_app_blocked); signals.Set(device_signals::names::kBuiltInDnsClientEnabled, +--- a/chrome/browser/enterprise/connectors/referrer_cache_utils.cc ++++ b/chrome/browser/enterprise/connectors/referrer_cache_utils.cc +@@ -44,11 +44,6 @@ safe_browsing::ReferrerChain GetSafeBrow + const GURL& url, + content::WebContents& web_contents) { + safe_browsing::ReferrerChain referrers; +- safe_browsing::SafeBrowsingNavigationObserverManagerFactory:: +- GetForBrowserContext(web_contents.GetBrowserContext()) +- ->IdentifyReferrerChainByEventURL( +- url, sessions::SessionTabHelper::IdForTab(&web_contents), +- kReferrerUserGestureLimit, &referrers); + return referrers; + } + --- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc +++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc -@@ -188,20 +188,7 @@ void RealtimeReportingClient::SetProfile +@@ -277,20 +277,7 @@ void RealtimeReportingClient::SetProfile } std::string RealtimeReportingClient::GetProfileUserName() { @@ -535,110 +549,6 @@ return nullptr; } ---- a/chrome/browser/enterprise/data_controls/reporting_service.cc -+++ b/chrome/browser/enterprise/data_controls/reporting_service.cc -@@ -185,10 +185,6 @@ void ReportingService::ReportPaste( - const content::ClipboardEndpoint& destination, - const content::ClipboardMetadata& metadata, - const Verdict& verdict) { -- ReportCopyOrPaste( -- source, destination, metadata, verdict, -- enterprise_connectors::kWebContentUploadDataTransferEventTrigger, -- GetEventResult(verdict.level())); - } - - void ReportingService::ReportPasteWarningBypassed( -@@ -196,29 +192,17 @@ void ReportingService::ReportPasteWarnin - const content::ClipboardEndpoint& destination, - const content::ClipboardMetadata& metadata, - const Verdict& verdict) { -- ReportCopyOrPaste( -- source, destination, metadata, verdict, -- enterprise_connectors::kWebContentUploadDataTransferEventTrigger, -- enterprise_connectors::EventResult::BYPASSED); - } - - void ReportingService::ReportCopy(const content::ClipboardEndpoint& source, - const content::ClipboardMetadata& metadata, - const Verdict& verdict) { -- ReportCopyOrPaste( -- source, /*destination=*/std::nullopt, metadata, verdict, -- enterprise_connectors::kClipboardCopyDataTransferEventTrigger, -- GetEventResult(verdict.level())); - } - - void ReportingService::ReportCopyWarningBypassed( - const content::ClipboardEndpoint& source, - const content::ClipboardMetadata& metadata, - const Verdict& verdict) { -- ReportCopyOrPaste( -- source, /*destination=*/std::nullopt, metadata, verdict, -- enterprise_connectors::kClipboardCopyDataTransferEventTrigger, -- enterprise_connectors::EventResult::BYPASSED); - } - - void ReportingService::ReportCopyOrPaste( -@@ -228,52 +212,6 @@ void ReportingService::ReportCopyOrPaste - const Verdict& verdict, - const std::string& trigger, - enterprise_connectors::EventResult event_result) { -- auto* router = -- enterprise_connectors::ReportingEventRouterFactory::GetForBrowserContext( -- &profile_.get()); -- -- if (!router || verdict.triggered_rules().empty()) { -- return; -- } -- -- GURL url; -- std::string destination_string; -- std::string source_string; -- content::WebContents* web_contents = nullptr; -- if (trigger == -- enterprise_connectors::kWebContentUploadDataTransferEventTrigger) { -- DCHECK(destination.has_value()); -- -- url = GetURL(*destination); -- destination_string = url.spec(); -- source_string = GetClipboardSourceString(source, *destination, -- kDataControlsRulesScopePref); -- web_contents = destination->web_contents(); -- } else { -- DCHECK_EQ(trigger, -- enterprise_connectors::kClipboardCopyDataTransferEventTrigger); -- DCHECK(!destination.has_value()); -- -- url = GetURL(source); -- source_string = GetURL(source).spec(); -- web_contents = source.web_contents(); -- } -- -- router->OnDataControlsSensitiveDataEvent( -- /*url=*/url, -- /*tab_url=*/url, -- /*source=*/source_string, -- /*destination=*/destination_string, -- /*mime_type=*/GetMimeType(metadata.format_type), -- /*trigger=*/trigger, -- /*source_active_user_email=*/ -- enterprise_data_protection::GetActiveContentAreaUser(source), -- /*content_area_account_email=*/ -- enterprise_connectors::ContentAreaUserProvider::GetUser( -- &profile_.get(), web_contents, url), -- /*triggered_rules=*/verdict.triggered_rules(), -- /*event_result=*/event_result, -- /*content_size=*/metadata.size.value_or(-1)); - } - - // -------------------------------------- -@@ -303,7 +241,6 @@ ReportingServiceFactory::ReportingServic - .WithSystem(ProfileSelection::kNone) - .WithAshInternals(ProfileSelection::kNone) - .Build()) { -- DependsOn(enterprise_connectors::ReportingEventRouterFactory::GetInstance()); - } - - ReportingServiceFactory::~ReportingServiceFactory() = default; --- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc +++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc @@ -202,9 +202,7 @@ void LogVerdictSource( @@ -700,7 +610,7 @@ signal_response.profile_id = profile_id_service_->GetProfileId(); --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -406,8 +406,6 @@ source_set("extensions") { +@@ -411,8 +411,6 @@ source_set("extensions") { "mv2_deprecation_impact_checker.cc", "mv2_deprecation_impact_checker.h", "mv2_experiment_stage.h", @@ -730,7 +640,7 @@ info.enterprise_profile_id = signals.enterprise_profile_id; --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -377,8 +377,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -381,8 +381,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; (*s_allowlist)[::kGeneratedHttpsFirstModePref] = settings_api::PrefType::kNumber; @@ -776,7 +686,7 @@ } // namespace extensions --- a/chrome/browser/extensions/chrome_extensions_browser_client_non_android.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client_non_android.cc -@@ -34,8 +34,6 @@ void ChromeExtensionsBrowserClient::Init +@@ -31,8 +31,6 @@ void ChromeExtensionsBrowserClient::Init // Must occur after g_browser_process is initialized. user_script_listener_ = std::make_unique(); @@ -1049,9 +959,23 @@ } void PlatformNotificationServiceImpl::LogPersistentNotificationShownMetrics( +--- a/chrome/browser/page_load_metrics/observers/serp_page_load_metrics_observer.cc ++++ b/chrome/browser/page_load_metrics/observers/serp_page_load_metrics_observer.cc +@@ -80,11 +80,6 @@ void SerpPageLoadMetricsObserver::OnFirs + return; + } + +- safe_browsing::ExtensionTelemetryService* telemetry_service = +- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(profile); +- if (telemetry_service) { +- telemetry_service->OnDseSerpLoaded(); +- } + } + + page_load_metrics::PageLoadMetricsObserver::ObservePolicy --- a/chrome/browser/permissions/permission_revocation_request.cc +++ b/chrome/browser/permissions/permission_revocation_request.cc -@@ -172,32 +172,6 @@ void PermissionRevocationRequest::OnSite +@@ -209,32 +209,6 @@ void PermissionRevocationRequest::OnSite base::TimeTicks::Now() - crowd_deny_request_start_time_.value(); } @@ -1136,7 +1060,7 @@ void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived( --- a/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_service/prediction_based_permission_ui_selector.cc -@@ -687,83 +687,6 @@ bool PredictionBasedPermissionUiSelector +@@ -708,83 +708,6 @@ bool PredictionBasedPermissionUiSelector PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse( permissions::RequestType request_type) { @@ -1222,7 +1146,7 @@ return PredictionSource::kNoCpssModel; --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -2511,8 +2511,6 @@ std::unique_ptrAddHandler( std::make_unique( chrome_schema)); @@ -1241,7 +1165,7 @@ #include "chrome/browser/new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h" #include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h" #include "chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.h" -@@ -2083,7 +2082,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -2160,7 +2159,6 @@ void RegisterProfilePrefs(user_prefs::Pr NewTabFooterUI::RegisterProfilePrefs(registry); NewTabPageHandler::RegisterProfilePrefs(registry); NewTabPageUI::RegisterProfilePrefs(registry); @@ -1251,7 +1175,7 @@ promos_utils::RegisterProfilePrefs(registry); --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -880,9 +880,7 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -878,9 +878,7 @@ void ChromeBrowserMainExtraPartsProfiles enterprise_connectors::TelomereEventRouterFactory::GetInstance(); } #endif @@ -1261,9 +1185,38 @@ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ BUILDFLAG(IS_WIN) enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); +--- a/chrome/browser/push_messaging/push_messaging_service_factory.cc ++++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc +@@ -19,7 +19,6 @@ + #include "chrome/browser/push_messaging/push_messaging_service_impl.h" + #include "chrome/browser/safe_browsing/safe_browsing_service.h" + #include "components/gcm_driver/instance_id/instance_id_profile_service.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + + // static + PushMessagingServiceImpl* PushMessagingServiceFactory::GetForProfile( +@@ -73,17 +72,7 @@ PushMessagingServiceFactory::BuildServic + content::BrowserContext* context) const { + Profile* profile = Profile::FromBrowserContext(context); + CHECK(!profile->IsOffTheRecord()); +- // Reporting service worker network requests should only be done for ESB +- // users. The check below is the first ESB check. A second ESB check is +- // performed before anything about the service worker is sent off device to +- // Safe Browsing. If at the time of the second check the user is found to no +- // longer be an ESB user, no Safe Browsing report will be sent. +- bool includeSafeBrowsingDatabase = +- g_browser_process && g_browser_process->safe_browsing_service() && +- safe_browsing::IsEnhancedProtectionEnabled(*profile->GetPrefs()); + return std::make_unique( + profile, +- includeSafeBrowsingDatabase +- ? g_browser_process->safe_browsing_service()->database_manager() +- : nullptr); ++ nullptr); + } --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn -@@ -80,9 +80,6 @@ static_library("safe_browsing") { +@@ -83,9 +83,6 @@ static_library("safe_browsing") { ] } @@ -1273,7 +1226,7 @@ # Note: is_android is not equivalent to safe_browsing_mode == 2. # Sources and dependencies added to this block must not depend on anything -@@ -102,13 +99,6 @@ static_library("safe_browsing") { +@@ -105,13 +102,6 @@ static_library("safe_browsing") { allow_circular_includes_from += [ "//chrome/browser/ash/file_manager" ] } @@ -1493,15 +1446,15 @@ // certificate. So, when users click proceed on an interstitial, move the tab --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -4345,8 +4345,6 @@ static_library("ui") { +@@ -4185,8 +4185,6 @@ static_library("ui") { "views/safe_browsing/password_reuse_modal_warning_dialog.h", "views/safe_browsing/tailored_security_desktop_dialog_manager.cc", "views/safe_browsing/tailored_security_desktop_dialog_manager.h", - "views/safe_browsing/tailored_security_unconsented_modal.cc", - "views/safe_browsing/tailored_security_unconsented_modal.h", + "views/screen_sharing_util.cc", + "views/screen_sharing_util.h", "views/select_audio_output/select_audio_output_dialog.cc", - "views/select_audio_output/select_audio_output_dialog.h", - "views/select_audio_output/select_audio_output_views.cc", --- a/chrome/browser/ui/file_system_access/BUILD.gn +++ b/chrome/browser/ui/file_system_access/BUILD.gn @@ -23,7 +23,6 @@ source_set("file_system_access") { @@ -1512,17 +1465,32 @@ "file_system_access_dialogs.cc", "file_system_access_permission_dialog.cc", "file_system_access_restricted_directory_dialog.cc", +--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc ++++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc +@@ -795,12 +795,6 @@ void ChromeOmniboxClient::OnAutocomplete + extensions::MaybeShowExtensionControlledSearchNotification( + location_bar_->GetWebContents(), match_type); + +- if (AutocompleteMatch::IsSearchType(match_type)) { +- if (auto* telemetry_service = +- safe_browsing::ExtensionTelemetryService::Get(profile_)) { +- telemetry_service->OnOmniboxSearch(match); +- } +- } + #endif + } + --- a/chrome/browser/ui/safety_hub/revoked_permissions_service.cc +++ b/chrome/browser/ui/safety_hub/revoked_permissions_service.cc -@@ -46,7 +46,6 @@ +@@ -40,7 +40,6 @@ #include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" - #include "revoked_permissions_service.h" -@@ -210,31 +209,6 @@ RevokedPermissionsService::RevokedPermis + #include "content/public/browser/page.h" +@@ -157,31 +156,6 @@ RevokedPermissionsService::RevokedPermis base::Unretained(this))); #endif // BUILDFLAG(IS_ANDROID) @@ -1554,15 +1522,13 @@ unused_site_permissions_manager_ = std::make_unique(browser_context, prefs); -@@ -1005,7 +979,7 @@ bool RevokedPermissionsService::IsUnused +@@ -562,5 +536,5 @@ bool RevokedPermissionsService::IsUnused } bool RevokedPermissionsService::IsAbusiveNotificationAutoRevocationEnabled() { - return safe_browsing::IsSafeBrowsingEnabled(*pref_change_registrar_->prefs()); + return false; } - - const std::set --- a/chrome/browser/ui/tab_contents/BUILD.gn +++ b/chrome/browser/ui/tab_contents/BUILD.gn @@ -51,7 +51,6 @@ source_set("impl") { @@ -1576,7 +1542,7 @@ --- a/chrome/browser/ui/toasts/toast_service.cc +++ b/chrome/browser/ui/toasts/toast_service.cc @@ -35,7 +35,6 @@ - #include "components/plus_addresses/features.h" + #include "components/plus_addresses/core/common/features.h" #include "components/plus_addresses/grit/plus_addresses_strings.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" @@ -1687,9 +1653,26 @@ } void RecordDownloadsPageValidatedHistogram(download::DownloadItem* item) { +--- a/chrome/browser/ui/webui/searchbox/searchbox_omnibox_client.cc ++++ b/chrome/browser/ui/webui/searchbox/searchbox_omnibox_client.cc +@@ -156,14 +156,6 @@ void SearchboxOmniboxClient::OnAutocompl + transition, false), + /*navigation_handle_callback=*/{}); + +-#if BUILDFLAG(ENABLE_EXTENSIONS) +- if (AutocompleteMatch::IsSearchType(match.type)) { +- if (auto* telemetry_service = +- safe_browsing::ExtensionTelemetryService::Get(profile_)) { +- telemetry_service->OnOmniboxSearch(match); +- } +- } +-#endif + } + + base::WeakPtr SearchboxOmniboxClient::AsWeakPtr() { --- a/chrome/browser/ui/webui/settings/hats_handler.cc +++ b/chrome/browser/ui/webui/settings/hats_handler.cc -@@ -64,60 +64,6 @@ void HatsHandler::RegisterMessages() { +@@ -64,56 +64,6 @@ void HatsHandler::RegisterMessages() { */ void HatsHandler::HandleSecurityPageHatsRequest(const base::Value::List& args) { AllowJavascript(); @@ -1743,14 +1726,10 @@ - /*failure_callback*/ base::DoNothing(), - /*product_specific_bits_data=*/{}, - /*product_specific_string_data=*/product_specific_string_data); -- -- // Log histogram that indicates that a survey is requested from the security -- // page. -- base::UmaHistogramBoolean("Feedback.SecurityPage.SurveyRequested", true); } /** -@@ -184,17 +130,7 @@ SurveyStringData HatsHandler::GetSecurit +@@ -180,17 +130,7 @@ SurveyStringData HatsHandler::GetSecurit } } @@ -1812,7 +1791,7 @@ std::move(callback), --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -124,7 +124,6 @@ base::span Chr +@@ -127,7 +127,6 @@ base::span Chr kChromeUISuggestInternalsHost, #endif kChromeUINTPTilesInternalsHost, @@ -1822,7 +1801,7 @@ kChromeUITabSearchHost, --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -2670,7 +2670,6 @@ if (!is_android) { +@@ -2707,7 +2707,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1830,7 +1809,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", -@@ -7114,7 +7113,6 @@ test("unit_tests") { +@@ -7175,7 +7174,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2051,29 +2030,6 @@ } } // namespace password_manager ---- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui_util.cc -+++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui_util.cc -@@ -299,20 +299,7 @@ std::string SerializeHitReport(const Hit - } - hit_report_dict.Set("threat_source", std::move(threat_source)); - std::string extended_reporting_level; -- switch (hit_report.extended_reporting_level) { -- case ExtendedReportingLevel::SBER_LEVEL_OFF: - extended_reporting_level = "SBER_LEVEL_OFF"; -- break; -- case ExtendedReportingLevel::SBER_LEVEL_LEGACY: -- extended_reporting_level = "SBER_LEVEL_LEGACY"; -- break; -- case ExtendedReportingLevel::SBER_LEVEL_SCOUT: -- extended_reporting_level = "SBER_LEVEL_SCOUT"; -- break; -- case ExtendedReportingLevel::SBER_LEVEL_ENHANCED_PROTECTION: -- extended_reporting_level = "SBER_LEVEL_ENHANCED_PROTECTION"; -- break; -- } - hit_report_dict.Set("extended_reporting_level", - std::move(extended_reporting_level)); - hit_report_dict.Set("is_enhanced_protection", --- a/components/safe_browsing/content/common/safe_browsing.mojom +++ b/components/safe_browsing/content/common/safe_browsing.mojom @@ -170,7 +170,6 @@ interface PhishingDetector { @@ -2248,7 +2204,7 @@ #include "components/safe_browsing/core/common/proto/csd.pb.h" --- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc +++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc -@@ -407,7 +407,6 @@ void TailoredSecurityService::MaybeNotif +@@ -405,7 +405,6 @@ void TailoredSecurityService::MaybeNotif RecordEnabledNotificationResult( TailoredSecurityNotificationResult::kHistoryNotSynced); } @@ -2256,7 +2212,7 @@ return; } -@@ -417,7 +416,6 @@ void TailoredSecurityService::MaybeNotif +@@ -415,7 +414,6 @@ void TailoredSecurityService::MaybeNotif RecordEnabledNotificationResult( TailoredSecurityNotificationResult::kSafeBrowsingControlledByPolicy); } @@ -2264,7 +2220,7 @@ return; } -@@ -521,25 +519,10 @@ void TailoredSecurityService::Shutdown() +@@ -519,25 +517,10 @@ void TailoredSecurityService::Shutdown() } void TailoredSecurityService::TailoredSecurityTimestampUpdateCallback() { @@ -2329,6 +2285,29 @@ } // sync_observer_ can be null in some embedders that don't support sync. if (sync_observer_) { +--- a/components/safe_browsing/core/browser/web_ui/safe_browsing_ui_util.cc ++++ b/components/safe_browsing/core/browser/web_ui/safe_browsing_ui_util.cc +@@ -300,20 +300,7 @@ std::string SerializeHitReport(const Hit + } + hit_report_dict.Set("threat_source", std::move(threat_source)); + std::string extended_reporting_level; +- switch (hit_report.extended_reporting_level) { +- case ExtendedReportingLevel::SBER_LEVEL_OFF: + extended_reporting_level = "SBER_LEVEL_OFF"; +- break; +- case ExtendedReportingLevel::SBER_LEVEL_LEGACY: +- extended_reporting_level = "SBER_LEVEL_LEGACY"; +- break; +- case ExtendedReportingLevel::SBER_LEVEL_SCOUT: +- extended_reporting_level = "SBER_LEVEL_SCOUT"; +- break; +- case ExtendedReportingLevel::SBER_LEVEL_ENHANCED_PROTECTION: +- extended_reporting_level = "SBER_LEVEL_ENHANCED_PROTECTION"; +- break; +- } + hit_report_dict.Set("extended_reporting_level", + std::move(extended_reporting_level)); + hit_report_dict.Set("is_enhanced_protection", --- a/components/security_interstitials/content/ssl_blocking_page_base.cc +++ b/components/security_interstitials/content/ssl_blocking_page_base.cc @@ -4,7 +4,6 @@ @@ -2375,7 +2354,7 @@ void SSLBlockingPageBase::PopulateEnhancedProtectionMessage( --- a/components/sync_preferences/common_syncable_prefs_database.cc +++ b/components/sync_preferences/common_syncable_prefs_database.cc -@@ -316,9 +316,6 @@ constexpr auto kCommonSyncablePrefsAllow +@@ -328,9 +328,6 @@ constexpr auto kCommonSyncablePrefsAllow {plus_addresses::prefs::kLastPlusAddressFillingTime, {syncable_prefs_ids::kLastPlusAddressFillingTime, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, @@ -2387,7 +2366,7 @@ {syncable_prefs_ids::kFacilitatedPaymentsPix, syncer::PREFERENCES, --- a/content/browser/file_system_access/file_system_access_safe_move_helper.cc +++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc -@@ -167,15 +167,8 @@ void FileSystemAccessSafeMoveHelper::Sta +@@ -169,15 +169,8 @@ void FileSystemAccessSafeMoveHelper::Sta return; } @@ -2403,7 +2382,7 @@ } void FileSystemAccessSafeMoveHelper::ComputeHashForSourceFile( -@@ -214,45 +207,6 @@ bool FileSystemAccessSafeMoveHelper::Req +@@ -216,45 +209,6 @@ bool FileSystemAccessSafeMoveHelper::Req return dest_url().type() != storage::kFileSystemTypeTemporary; } @@ -2539,7 +2518,7 @@ } --- a/extensions/browser/extension_registrar.cc +++ b/extensions/browser/extension_registrar.cc -@@ -783,103 +783,27 @@ void ExtensionRegistrar::UnblockAllExten +@@ -782,103 +782,27 @@ void ExtensionRegistrar::UnblockAllExten void ExtensionRegistrar::OnBlocklistStateRemoved( const std::string& extension_id) { @@ -2645,7 +2624,7 @@ void ExtensionRegistrar::OnUnpackedExtensionReloadFailed( --- a/extensions/browser/updater/update_service.cc +++ b/extensions/browser/updater/update_service.cc -@@ -133,13 +133,6 @@ void UpdateService::OnCrxStateChange(Upd +@@ -132,13 +132,6 @@ void UpdateService::OnCrxStateChange(Upd break; } diff --git a/patches/core/ungoogled-chromium/remove-f1-shortcut.patch b/patches/core/ungoogled-chromium/remove-f1-shortcut.patch index 98d5f261..48b775f2 100644 --- a/patches/core/ungoogled-chromium/remove-f1-shortcut.patch +++ b/patches/core/ungoogled-chromium/remove-f1-shortcut.patch @@ -1,5 +1,5 @@ ---- a/chrome/browser/ui/views/accelerator_table.cc -+++ b/chrome/browser/ui/views/accelerator_table.cc +--- a/chrome/browser/ui/accelerator_table.cc ++++ b/chrome/browser/ui/accelerator_table.cc @@ -132,7 +132,6 @@ const AcceleratorMapping kAcceleratorMap {ui::VKEY_OEM_PLUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_PLUS}, {ui::VKEY_ADD, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_PLUS}, diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 288314e0..52e092d3 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -95,7 +95,7 @@ } --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -280,7 +280,6 @@ +@@ -290,7 +290,6 @@ #include "components/safe_browsing/core/browser/url_checker_delegate.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" @@ -105,7 +105,7 @@ #include "components/services/on_device_translation/buildflags/buildflags.h" --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc -@@ -108,7 +108,6 @@ +@@ -103,7 +103,6 @@ #include "components/safe_browsing/content/common/file_type_policies_test_util.h" #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -115,7 +115,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/download/download_ui_model.cc +++ b/chrome/browser/download/download_ui_model.cc -@@ -31,7 +31,6 @@ +@@ -33,7 +33,6 @@ #include "components/enterprise/common/proto/connectors.pb.h" #include "components/google/core/common/google_util.h" #include "components/safe_browsing/buildflags.h" @@ -135,7 +135,7 @@ #include "chrome/browser/browser_process.h" --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc -@@ -58,7 +58,6 @@ +@@ -57,7 +57,6 @@ #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/core/browser/realtime/url_lookup_service_base.h" #include "components/safe_browsing/core/common/features.h" @@ -247,7 +247,7 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -140,55 +139,6 @@ void ManagedProfileCreationController::O +@@ -139,55 +138,6 @@ void ManagedProfileCreationController::O } void ManagedProfileCreationController::FetchProfileSeparationPolicies() { @@ -313,7 +313,7 @@ #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" -@@ -436,8 +435,7 @@ void OidcAuthenticationSigninInterceptor +@@ -437,8 +436,7 @@ void OidcAuthenticationSigninInterceptor // TODO(b/355270189): The interaction between OIDC profiles and BrowserSignin // policy should be finalized, this check only prevents Chrome from crashing. @@ -437,7 +437,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/account_info.h" -@@ -73,7 +72,7 @@ const char* const kExtensionsIdentityAPI +@@ -74,7 +73,7 @@ const char* const kExtensionsIdentityAPI "extensions_identity_api"; bool IsBrowserSigninAllowed(Profile* profile) { @@ -557,8 +557,8 @@ -#include "components/signin/public/base/signin_pref_names.h" #include "components/spellcheck/browser/pref_names.h" #include "components/supervised_user/core/common/pref_names.h" - #include "components/translate/core/browser/translate_pref_names.h" -@@ -339,8 +337,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil + #include "components/themes/pref_names.h" +@@ -343,8 +341,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kNumber; // Privacy page @@ -567,7 +567,7 @@ (*s_allowlist)[::prefs::kDnsOverHttpsMode] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kDnsOverHttpsTemplates] = settings_api::PrefType::kString; -@@ -363,16 +359,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -367,16 +363,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; // Security page @@ -586,7 +586,7 @@ (*s_allowlist)[::kGeneratedHttpsFirstModePref] = --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc -@@ -726,9 +726,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore +@@ -725,9 +725,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, GetReferrerChainForNonSafeBrowsingUser) { PrefService* pref_service = profile()->GetPrefs(); @@ -661,7 +661,7 @@ #include "content/public/browser/render_process_host.h" --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc -@@ -35,7 +35,6 @@ +@@ -34,7 +34,6 @@ #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/webui_url_constants.h" @@ -714,7 +714,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/first_party_sets_handler.h" -@@ -1439,15 +1438,8 @@ void ProfileNetworkContextService::Confi +@@ -1442,15 +1441,8 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; @@ -795,10 +795,10 @@ identity_manager_observer_.Observe(identity_manager); --- a/chrome/browser/permissions/permission_revocation_request.cc +++ b/chrome/browser/permissions/permission_revocation_request.cc -@@ -18,7 +18,6 @@ - #include "components/permissions/permissions_client.h" - #include "components/prefs/pref_service.h" +@@ -22,7 +22,6 @@ #include "components/safe_browsing/core/browser/db/database_manager.h" + #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" + #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) @@ -883,7 +883,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/service/sync_policy_handler.h" -@@ -290,9 +287,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -291,9 +288,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kForcePermissionPolicyUnloadDefaultEnabled, policy_prefs::kForcePermissionPolicyUnloadDefaultEnabled, base::Value::Type::BOOLEAN}, @@ -893,7 +893,7 @@ { key::kDomainReliabilityAllowed, domain_reliability::prefs::kDomainReliabilityAllowedByPolicy, base::Value::Type::BOOLEAN }, -@@ -326,15 +320,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -327,15 +321,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kOopPrintDriversAllowedByPolicy, base::Value::Type::BOOLEAN }, #endif @@ -909,7 +909,7 @@ { key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled, base::Value::Type::BOOLEAN }, -@@ -473,9 +458,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -477,9 +462,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdsSettingForIntrusiveAdsSites, prefs::kManagedDefaultAdsSetting, base::Value::Type::INTEGER }, @@ -919,7 +919,7 @@ { key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, base::Value::Type::BOOLEAN }, -@@ -721,15 +703,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -722,15 +704,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kPasswordDismissCompromisedAlertEnabled, password_manager::prefs::kPasswordDismissCompromisedAlertEnabled, base::Value::Type::BOOLEAN }, @@ -935,7 +935,7 @@ #if BUILDFLAG(ENABLE_PDF) { key::kPdfLocalFileAccessAllowedForDomains, prefs::kPdfLocalFileAccessAllowedForDomains, -@@ -895,9 +868,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -896,9 +869,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdditionalDnsQueryTypesEnabled, prefs::kAdditionalDnsQueryTypesEnabled, base::Value::Type::BOOLEAN }, @@ -945,7 +945,7 @@ { key::kForceGoogleSafeSearch, policy_prefs::kForceGoogleSafeSearch, base::Value::Type::BOOLEAN }, -@@ -961,9 +931,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -962,9 +932,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, @@ -955,7 +955,7 @@ { key::kPasswordManagerBlocklist, policy_prefs::kPasswordManagerBlocklist, base::Value::Type::LIST }, -@@ -1933,9 +1900,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1937,9 +1904,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, @@ -965,7 +965,7 @@ { key::kLiveCaptionEnabled, prefs::kLiveCaptionEnabled, base::Value::Type::BOOLEAN }, -@@ -2003,9 +1967,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2007,9 +1971,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kImportDialogAutofillFormData, base::Value::Type::BOOLEAN }, @@ -975,7 +975,7 @@ { key::kHardwareAccelerationModeEnabled, prefs::kHardwareAccelerationModeEnabled, base::Value::Type::BOOLEAN }, -@@ -2282,9 +2243,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2286,9 +2247,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGoogleSearchSidePanelEnabled, prefs::kGoogleSearchSidePanelEnabled, base::Value::Type::BOOLEAN }, @@ -985,7 +985,7 @@ #endif // BUILDFLAG(IS_ANDROID) { key::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, policy_prefs::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, -@@ -2824,29 +2782,6 @@ std::unique_ptrAddHandler(std::make_unique( key::kProfileReauthPrompt, enterprise_signin::prefs::kProfileReauthPrompt, static_cast(enterprise_signin::ProfileReauthPrompt::kDoNotPrompt), -@@ -2907,11 +2842,6 @@ std::unique_ptr> signin_legacy_policies; @@ -1027,7 +1027,7 @@ handlers->AddHandler(std::make_unique( std::make_unique( -@@ -2924,19 +2854,6 @@ std::unique_ptrSetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1277,7 +1277,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -1950,14 +1948,13 @@ void ProfileManager::AddProfileToStorage +@@ -1943,14 +1941,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsForceEphemeralProfilesEnabled(profile); init_params.is_signed_in_with_credential_provider = @@ -1295,7 +1295,7 @@ prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName); --- a/chrome/browser/profiles/profile_window.cc +++ b/chrome/browser/profiles/profile_window.cc -@@ -38,7 +38,6 @@ +@@ -40,7 +40,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "components/prefs/pref_service.h" @@ -1315,7 +1315,7 @@ namespace profiles { --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -665,7 +665,7 @@ +@@ -463,7 +463,7 @@ @@ -1326,7 +1326,7 @@ --- a/chrome/browser/resources/settings/privacy_page/security_page.ts +++ b/chrome/browser/resources/settings/privacy_page/security_page.ts -@@ -270,17 +270,6 @@ export class SettingsSecurityPageElement +@@ -261,17 +261,6 @@ export class SettingsSecurityPageElement super.ready(); CrSettingsPrefs.initialized.then(() => { @@ -1496,7 +1496,7 @@ // The HTTPS-First Mode generated pref should never be set to // ENABLED_BALANCED if the feature flag is not enabled. if (!loadTimeData.getBoolean('enableHttpsFirstModeNewSettings')) { -@@ -290,10 +279,6 @@ export class SettingsSecurityPageElement +@@ -281,10 +270,6 @@ export class SettingsSecurityPageElement } }); @@ -1507,7 +1507,7 @@ // Initialize the last focus time on page load. this.lastFocusTime_ = HatsBrowserProxyImpl.getInstance().now(); -@@ -431,8 +416,7 @@ export class SettingsSecurityPageElement +@@ -422,8 +407,7 @@ export class SettingsSecurityPageElement } private getDisabledExtendedSafeBrowsing_(): boolean { @@ -1517,7 +1517,7 @@ } private getSafeBrowsingStandardSubLabel_(): string { -@@ -444,19 +428,6 @@ export class SettingsSecurityPageElement +@@ -435,19 +419,6 @@ export class SettingsSecurityPageElement private getPasswordsLeakToggleSubLabel_(): string { let subLabel = this.i18n('passwordsLeakDetectionGeneralDescription'); @@ -1539,7 +1539,7 @@ --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts -@@ -56,7 +56,7 @@ function getCategoryItemMap(): Map @@ -1586,7 +1586,7 @@ } void AdvancedProtectionStatusManagerDesktop:: -@@ -263,10 +251,6 @@ void AdvancedProtectionStatusManagerDesk +@@ -261,10 +249,6 @@ void AdvancedProtectionStatusManagerDesk } void AdvancedProtectionStatusManagerDesktop::UpdateLastRefreshTime() { @@ -2226,15 +2226,15 @@ #include "testing/gtest/include/gtest/gtest.h" --- a/chrome/browser/signin/accounts_policy_manager.cc +++ b/chrome/browser/signin/accounts_policy_manager.cc -@@ -21,7 +21,6 @@ - #include "chrome/grit/generated_resources.h" +@@ -31,7 +31,6 @@ + #include "components/policy/core/common/features.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/account_info.h" + #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" - #include "components/signin/public/identity_manager/identity_utils.h" -@@ -197,26 +196,12 @@ void AccountsPolicyManager::Initialize() +@@ -190,25 +189,11 @@ void AccountsPolicyManager::Initialize() EnsurePrimaryAccountAllowedForProfile( profile_, signin_metrics::ProfileSignout::kSigninNotAllowedOnProfileInit); @@ -2250,7 +2250,6 @@ - &AccountsPolicyManager::OnGoogleServicesUsernamePatternChanged, - weak_pointer_factory_.GetWeakPtr())); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) auto* identity_manager = IdentityManagerFactory::GetForProfile(profile_); identity_manager_observation_.Observe(identity_manager); profile_pref_change_registrar_.Init(profile_->GetPrefs()); @@ -2261,15 +2260,15 @@ if (identity_manager->AreRefreshTokensLoaded()) { OnRefreshTokensLoaded(); } -@@ -228,7 +213,6 @@ void AccountsPolicyManager::Shutdown() { +@@ -217,7 +202,6 @@ void AccountsPolicyManager::Initialize() + void AccountsPolicyManager::Shutdown() { profile_pref_change_registrar_.RemoveAll(); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) local_state_pref_registrar_.RemoveAll(); - signin_allowed_.Destroy(); } void AccountsPolicyManager::OnGoogleServicesUsernamePatternChanged() { -@@ -255,11 +239,6 @@ void AccountsPolicyManager::EnsurePrimar +@@ -241,11 +225,6 @@ void AccountsPolicyManager::EnsurePrimar CoreAccountInfo primary_account = identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync); @@ -2280,10 +2279,10 @@ - } if (ChromeSigninClientFactory::GetForProfile(profile) - ->IsClearPrimaryAccountAllowed(identity_manager->HasPrimaryAccount( + ->IsClearPrimaryAccountAllowed()) { --- a/chrome/browser/signin/accounts_policy_manager.h +++ b/chrome/browser/signin/accounts_policy_manager.h -@@ -73,9 +73,6 @@ class AccountsPolicyManager : public Key +@@ -67,9 +67,6 @@ class AccountsPolicyManager : public Key raw_ptr profile_; @@ -2296,8 +2295,8 @@ --- a/chrome/browser/signin/android/signin_manager_android.cc +++ b/chrome/browser/signin/android/signin_manager_android.cc @@ -33,7 +33,6 @@ - #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/policy/core/common/policy_switches.h" + #include "components/prefs/android/pref_service_android.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" @@ -2411,7 +2410,7 @@ #include "content/public/browser/storage_partition.h" --- a/chrome/browser/signin/dice_web_signin_interceptor.cc +++ b/chrome/browser/signin/dice_web_signin_interceptor.cc -@@ -73,7 +73,6 @@ +@@ -74,7 +74,6 @@ #include "components/search_engines/template_url_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2419,7 +2418,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/identity_manager/account_capabilities.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -462,16 +461,8 @@ void DiceWebSigninInterceptor::RegisterP +@@ -463,16 +462,8 @@ void DiceWebSigninInterceptor::RegisterP registry->RegisterBooleanPref(prefs::kSigninInterceptionEnabled, true); registry->RegisterStringPref(prefs::kManagedAccountsSigninRestriction, std::string()); @@ -2436,7 +2435,7 @@ } std::optional -@@ -1504,16 +1495,6 @@ void DiceWebSigninInterceptor:: +@@ -1532,16 +1523,6 @@ void DiceWebSigninInterceptor:: g_browser_process->browser_policy_connector(), g_browser_process->system_network_context_manager() ->GetSharedURLLoaderFactory()); @@ -2522,7 +2521,7 @@ IsValidUnconsentedPrimaryAccount(current_primary_account); --- a/chrome/browser/signin/signin_promo_util.cc +++ b/chrome/browser/signin/signin_promo_util.cc -@@ -12,7 +12,6 @@ +@@ -13,7 +13,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2530,7 +2529,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -170,84 +169,14 @@ namespace signin { +@@ -171,84 +170,14 @@ namespace signin { #if !BUILDFLAG(IS_ANDROID) bool ShouldShowSyncPromo(Profile& profile) { @@ -2615,7 +2614,7 @@ } bool ShouldShowExtensionSignInPromo(Profile& profile, -@@ -295,43 +224,7 @@ bool ShouldShowAddressSignInPromo(Profil +@@ -296,43 +225,7 @@ bool ShouldShowAddressSignInPromo(Profil } bool ShouldShowBookmarkSignInPromo(Profile& profile) { @@ -2794,15 +2793,15 @@ --- a/chrome/browser/signin/signin_util_win.cc +++ b/chrome/browser/signin/signin_util_win.cc -@@ -36,7 +36,6 @@ - #include "components/prefs/pref_service.h" +@@ -38,7 +38,6 @@ #include "components/signin/core/browser/about_signin_internals.h" + #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" #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" -@@ -149,9 +148,6 @@ void ImportCredentialsFromProvider(Profi +@@ -159,9 +158,6 @@ void ImportCredentialsFromProvider(Profi account_id, profile)); } } @@ -2812,22 +2811,21 @@ } // Extracts the |cred_provider_gaia_id| and |cred_provider_email| for the user -@@ -328,19 +324,7 @@ bool ReauthWithCredentialProviderIfPossi +@@ -337,18 +333,7 @@ bool ReauthWithCredentialProviderIfPossi // - The profile is marked as having been signed in with a system credential. // - The profile is already signed in. // - The profile is in an auth error state. - auto* identity_manager = IdentityManagerFactory::GetForProfile(profile); - if (!(profile->GetPrefs()->GetBoolean( - prefs::kSignedInWithCredentialProvider) && -- identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync) && +- identity_manager->HasPrimaryAccount(GetConsentLevel()) && - identity_manager->HasAccountWithRefreshTokenInPersistentErrorState( -- identity_manager->GetPrimaryAccountId( -- signin::ConsentLevel::kSync)))) { +- identity_manager->GetPrimaryAccountId(GetConsentLevel())))) { return false; - } - - const GaiaId gaia_id = -- identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync).gaia; +- identity_manager->GetPrimaryAccountInfo(GetConsentLevel()).gaia; - return TrySigninWithCredentialProvider(profile, gaia_id, false); } @@ -2873,7 +2871,7 @@ --- a/chrome/browser/ssl/ssl_browsertest.cc +++ b/chrome/browser/ssl/ssl_browsertest.cc -@@ -99,7 +99,6 @@ +@@ -94,7 +94,6 @@ #include "components/policy/policy_constants.h" #include "components/prefs/testing_pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2893,7 +2891,7 @@ #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" --- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc -@@ -48,7 +48,6 @@ +@@ -47,7 +47,6 @@ #include "components/autofill/core/common/autofill_features.h" #include "components/autofill/core/common/autofill_payments_features.h" #include "components/signin/public/base/signin_buildflags.h" @@ -2903,7 +2901,7 @@ #include "components/sync/service/sync_service.h" --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -94,7 +94,6 @@ +@@ -93,7 +93,6 @@ #include "components/sessions/core/tab_restore_service.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -2923,7 +2921,7 @@ #include "ui/events/keycodes/dom/dom_code.h" --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -81,7 +81,6 @@ +@@ -82,7 +82,6 @@ #if !BUILDFLAG(IS_ANDROID) #include "base/metrics/histogram_functions.h" #include "chrome/browser/signin/identity_manager_factory.h" @@ -3025,10 +3023,10 @@ #include "chrome/common/chrome_features.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safety_check/features.h" #if BUILDFLAG(IS_ANDROID) - #include "chrome/browser/ui/safety_hub/password_status_check_result_android.h" -@@ -134,14 +133,6 @@ SafetyHubMenuNotificationService::Safety +@@ -139,14 +138,6 @@ SafetyHubMenuNotificationService::Safety } #endif // !BUILDFLAG(IS_ANDROID) @@ -3115,7 +3113,7 @@ } --- a/chrome/browser/ui/signin/dice_migration_service.cc +++ b/chrome/browser/ui/signin/dice_migration_service.cc -@@ -24,7 +24,6 @@ +@@ -27,7 +27,6 @@ #include "chrome/grit/theme_resources.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" @@ -3123,7 +3121,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/account_managed_status_finder_outcome.h" -@@ -118,36 +117,7 @@ void SetBannerImage(ui::DialogModel::Bui +@@ -130,36 +129,7 @@ void SetBannerImage(ui::DialogModel::Bui } bool MaybeMigrateUser(Profile* profile) { @@ -3160,7 +3158,7 @@ } bool MaybeShowToast(Browser* browser) { -@@ -288,23 +258,7 @@ void DiceMigrationService::RevertDiceMig +@@ -313,23 +283,7 @@ void DiceMigrationService::RevertDiceMig } const bool restored_from_backup = [prefs]() -> bool { @@ -3273,8 +3271,8 @@ -#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 "components/user_education/common/feature_promo/feature_promo_controller.h" -@@ -596,54 +595,7 @@ int ProfileSubMenuModel::GetAndIncrement + #include "components/sync/base/features.h" +@@ -597,63 +596,7 @@ int ProfileSubMenuModel::GetAndIncrement } bool ProfileSubMenuModel::BuildSyncSection() { @@ -3321,9 +3319,18 @@ - IDS_PROFILE_ROW_SYNC_IS_ON, - vector_icons::kSyncChromeRefreshIcon); - } else { -- AddItemWithStringIdAndVectorIcon(this, IDC_TURN_ON_SYNC, -- IDS_PROFILE_ROW_TURN_ON_SYNC, -- vector_icons::kSyncOffChromeRefreshIcon); +- if (base::FeatureList::IsEnabled( +- syncer::kReplaceSyncPromosWithSignInPromos)) { +- if (!identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSignin)) { +- AddItemWithStringIdAndVectorIcon(this, IDC_SHOW_SIGNIN, +- IDS_PROFILE_MENU_SIGNIN_PROMO_BUTTON, +- vector_icons::kAccountCircleIcon); +- } +- } else { +- AddItemWithStringIdAndVectorIcon(this, IDC_TURN_ON_SYNC, +- IDS_PROFILE_ROW_TURN_ON_SYNC, +- vector_icons::kSyncOffChromeRefreshIcon); +- } - } - return true; } @@ -3341,7 +3348,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" --- a/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc +++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc -@@ -18,7 +18,6 @@ +@@ -19,7 +19,6 @@ #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h" #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" #include "components/security_state/content/security_state_tab_helper.h" @@ -3405,7 +3412,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -711,22 +710,6 @@ ProfileMenuView::GetIdentitySectionParam +@@ -683,22 +682,6 @@ ProfileMenuView::GetIdentitySectionParam signin_metrics::AccessPoint::kAvatarBubbleSignIn; switch (signin_util::GetSignedInState(identity_manager)) { case signin_util::SignedInState::kSignedOut: @@ -3428,7 +3435,7 @@ break; case signin_util::SignedInState::kWebOnlySignedIn: { access_point = -@@ -908,9 +891,7 @@ void ProfileMenuView::MaybeBuildChromeAc +@@ -887,9 +870,7 @@ void ProfileMenuView::MaybeBuildChromeAc // Show the settings button when signed in to Chrome or to the web, or if // signin is disallowed. const bool should_show_settings_button = @@ -3504,16 +3511,6 @@ 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 -@@ -48,7 +48,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" --#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/identity_manager/identity_test_utils.h" - #include "content/public/browser/render_frame_host.h" - #include "content/public/browser/render_process_host.h" --- a/chrome/browser/ui/views/toolbar/app_menu.cc +++ b/chrome/browser/ui/views/toolbar/app_menu.cc @@ -61,7 +61,6 @@ @@ -3595,15 +3592,15 @@ // AppMenuView is a view that can contain label buttons. --- a/chrome/browser/ui/views/user_education/browser_ntp_promos.cc +++ b/chrome/browser/ui/views/user_education/browser_ntp_promos.cc -@@ -15,7 +15,6 @@ +@@ -22,7 +22,6 @@ #include "chrome/browser/user_education/ntp_promo_identifiers.h" #include "chrome/grit/generated_resources.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/sync/base/features.h" #include "components/user_education/common/ntp_promo/ntp_promo_registry.h" -@@ -31,28 +30,7 @@ namespace { + #include "components/user_education/common/ntp_promo/ntp_promo_specification.h" +@@ -38,28 +37,7 @@ namespace { NtpPromoSpecification::Eligibility CheckSignInPromoEligibility( Profile* profile) { @@ -3642,7 +3639,7 @@ #include "components/safe_browsing/core/common/safebrowsing_referral_methods.h" #include "components/saved_tab_groups/public/features.h" #include "components/user_education/common/tutorial/tutorial_identifier.h" -@@ -98,13 +97,6 @@ void BrowserCommandHandler::CanExecuteCo +@@ -99,13 +98,6 @@ void BrowserCommandHandler::CanExecuteCo case Command::kOpenSafetyCheck: can_execute = !enterprise_util::IsBrowserManaged(profile_); break; @@ -3658,23 +3655,23 @@ break; --- a/chrome/browser/ui/webui/cr_components/history/history_util.cc +++ b/chrome/browser/ui/webui/cr_components/history/history_util.cc -@@ -19,7 +19,6 @@ +@@ -20,7 +20,6 @@ #include "components/history/core/common/pref_names.h" #include "components/history_clusters/core/history_clusters_prefs.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/base/signin_switches.h" - #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" -@@ -89,7 +88,7 @@ content::WebUIDataSource* HistoryUtil::P + #include "content/public/browser/web_ui_data_source.h" + #include "ui/base/l10n/l10n_util.h" +@@ -81,7 +80,7 @@ content::WebUIDataSource* HistoryUtil::P source->AddBoolean("isGuestSession", profile->IsGuestSession()); source->AddBoolean("isSignInAllowed", - prefs->GetBoolean(prefs::kSigninAllowed)); + false); - source->AddBoolean(kIsUserSignedInKey, IsUserSignedIn(profile)); - + source->AddBoolean( + "enableBrowsingHistoryActorIntegrationM1", --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc @@ -53,7 +53,6 @@ @@ -3687,7 +3684,7 @@ #include "content/public/browser/download_item_utils.h" --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc -@@ -54,7 +54,6 @@ +@@ -57,7 +57,6 @@ #include "components/page_image_service/image_service.h" #include "components/page_image_service/image_service_handler.h" #include "components/prefs/pref_service.h" @@ -3697,7 +3694,7 @@ #include "components/strings/grit/components_strings.h" --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -55,7 +55,6 @@ +@@ -57,7 +57,6 @@ #include "components/policy/core/common/management/management_service.h" #include "components/policy/core/common/policy_pref_names.h" #include "components/prefs/pref_service.h" @@ -3745,38 +3742,6 @@ Profile::FromWebUI(web_ui()) ->GetProfilePolicyConnector() ->RevertUseLocalTestPolicyProvider(); ---- a/chrome/browser/ui/webui/profile_info_watcher.cc -+++ b/chrome/browser/ui/webui/profile_info_watcher.cc -@@ -12,7 +12,6 @@ - #include "chrome/browser/signin/identity_manager_factory.h" - #include "chrome/common/pref_names.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" - - ProfileInfoWatcher::ProfileInfoWatcher(Profile* profile, -@@ -26,11 +25,6 @@ ProfileInfoWatcher::ProfileInfoWatcher(P - if (profile_manager) { - profile_manager->GetProfileAttributesStorage().AddObserver(this); - } -- -- signin_allowed_pref_.Init( -- prefs::kSigninAllowed, profile_->GetPrefs(), -- base::BindRepeating(&ProfileInfoWatcher::RunCallback, -- base::Unretained(this))); - } - - ProfileInfoWatcher::~ProfileInfoWatcher() { ---- a/chrome/browser/ui/webui/profile_info_watcher.h -+++ b/chrome/browser/ui/webui/profile_info_watcher.h -@@ -49,7 +49,6 @@ class ProfileInfoWatcher : public Profil - // Called when the authenticated username changes. - base::RepeatingClosure callback_; - -- BooleanPrefMember signin_allowed_pref_; - }; - - #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 @@ -24,7 +24,6 @@ @@ -3797,7 +3762,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -414,10 +413,6 @@ void PeopleHandler::OnJavascriptAllowed( +@@ -413,10 +412,6 @@ void PeopleHandler::OnJavascriptAllowed( PrefService* prefs = profile_->GetPrefs(); profile_pref_registrar_ = std::make_unique(); profile_pref_registrar_->Init(prefs); @@ -3828,7 +3793,7 @@ #include "components/saved_tab_groups/public/features.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/strings/grit/components_branded_strings.h" -@@ -3567,11 +3566,6 @@ void AddSiteSettingsStrings(content::Web +@@ -3515,11 +3514,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -3967,18 +3932,18 @@ "profileBlockedAddPersonSuggestion", --- a/chrome/browser/ui/webui/signin/signin_utils_desktop.cc +++ b/chrome/browser/ui/webui/signin/signin_utils_desktop.cc -@@ -17,7 +17,6 @@ +@@ -18,7 +18,6 @@ #include "chrome/browser/ui/webui/signin/signin_ui_error.h" #include "chrome/common/chrome_switches.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/signin/public/identity_manager/identity_utils.h" - #include "google_apis/gaia/gaia_auth_util.h" -@@ -26,100 +25,10 @@ - SigninUIError CanOfferSignin(Profile* profile, + #include "components/sync/base/features.h" +@@ -29,111 +28,10 @@ SigninUIError CanOfferSignin(Profile* pr const GaiaId& gaia_id, - const std::string& email) { + const std::string& email, + bool allow_account_from_other_profile) { - if (!profile) { return SigninUIError::Other(email); - } @@ -4007,16 +3972,27 @@ - // re-auth scenario. Make sure the email just signed in corresponds to - // the one sign in manager expects. - std::string current_email = -- identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync) +- identity_manager +- ->GetPrimaryAccountInfo( +- base::FeatureList::IsEnabled( +- syncer::kReplaceSyncPromosWithSignInPromos) +- ? signin::ConsentLevel::kSignin +- : signin::ConsentLevel::kSync) - .email; +- // TODO(crbug.com/440302112): Consider checking for the gaia_id equality +- // instead of the email for reauth flow detection. - const bool same_email = gaia::AreEmailsSame(current_email, email); - if (!current_email.empty() && !same_email) { - return SigninUIError::WrongReauthAccount(email, current_email); - } - +- allow_account_from_other_profile = +- allow_account_from_other_profile || +- base::CommandLine::ForCurrentProcess()->HasSwitch( +- switches::kBypassAccountAlreadyUsedByAnotherProfileCheck); - // If some profile, not just the current one, is already connected to this -- // account, don't show the infobar. -- if (g_browser_process && !same_email) { +- // account, don't offer sign in. +- if (g_browser_process && !same_email && !allow_account_from_other_profile) { - ProfileManager* profile_manager = g_browser_process->profile_manager(); - if (profile_manager) { - std::vector entries = @@ -4042,13 +4018,13 @@ - if (entry->IsOmitted() || entry->GetPath() == profile->GetPath()) { - continue; - } -- if (!entry->IsAuthenticated() && !entry->CanBeManaged()) { -- continue; -- } -- -- if (base::CommandLine::ForCurrentProcess()->HasSwitch( -- switches::kBypassAccountAlreadyUsedByAnotherProfileCheck)) { -- continue; +- // If the feature is disabled, the below check on GaiaId equality is +- // equivalent to checking if the user is signed in. +- if (!base::FeatureList::IsEnabled( +- syncer::kReplaceSyncPromosWithSignInPromos)) { +- if (!entry->IsAuthenticated() && !entry->CanBeManaged()) { +- continue; +- } - } - if (gaia_id == entry->GetGAIAId()) { - return SigninUIError::AccountAlreadyUsedByAnotherProfile( @@ -4089,7 +4065,7 @@ #include "url/gurl.h" --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc -@@ -47,7 +47,6 @@ +@@ -48,7 +48,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_reconcilor.h" #include "components/signin/public/base/signin_metrics.h" @@ -4097,7 +4073,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/accounts_mutator.h" -@@ -275,8 +274,7 @@ void TurnSyncOnHelper::TurnSyncOnInterna +@@ -276,8 +275,7 @@ void TurnSyncOnHelper::TurnSyncOnInterna // 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). @@ -4256,7 +4232,7 @@ "value": ["searchSuggestEnabled", {"type":"boolean"}], --- a/components/autofill/core/browser/data_manager/addresses/address_data_manager.cc +++ b/components/autofill/core/browser/data_manager/addresses/address_data_manager.cc -@@ -33,7 +33,6 @@ +@@ -34,7 +34,6 @@ #include "components/autofill/core/common/autofill_prefs.h" #include "components/autofill/core/common/dense_set.h" #include "components/prefs/pref_service.h" @@ -4264,7 +4240,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/data_type.h" #include "components/sync/base/features.h" -@@ -294,13 +293,7 @@ void AddressDataManager::RemoveLocalProf +@@ -318,13 +317,7 @@ void AddressDataManager::RemoveLocalProf } bool AddressDataManager::IsEligibleForAddressAccountStorage() const { @@ -4278,7 +4254,7 @@ } void AddressDataManager::MigrateProfileToAccount( -@@ -584,35 +577,7 @@ bool AddressDataManager::IsAutofillUserS +@@ -608,35 +601,7 @@ bool AddressDataManager::IsAutofillUserS } bool AddressDataManager::IsAutofillSyncToggleAvailable() const { @@ -4324,7 +4300,7 @@ #include "components/strings/grit/components_strings.h" #include "components/sync/base/features.h" #include "components/sync/base/user_selectable_type.h" -@@ -173,12 +172,6 @@ bool IsCreditCardUploadEnabled( +@@ -175,12 +174,6 @@ bool IsCreditCardUploadEnabled( // TODO(crbug.com/40066949): Simplify once IsSyncFeatureActive() is deleted // from the codebase. bool addresses_in_transport_mode = true; @@ -4337,7 +4313,7 @@ bool syncing_or_addresses_in_transport_mode = sync_service->IsSyncFeatureActive() || addresses_in_transport_mode; if (syncing_or_addresses_in_transport_mode && -@@ -292,10 +285,6 @@ bool IsUserOptedInWalletSyncTransport(co +@@ -294,10 +287,6 @@ bool IsUserOptedInWalletSyncTransport(co // On mobile, no specific opt-in is required. return true; #else @@ -4649,7 +4625,7 @@ void LeakDetectionCheckImpl::OnAccessTokenRequestCompleted( --- a/components/password_manager/core/browser/leak_detection_delegate.cc +++ b/components/password_manager/core/browser/leak_detection_delegate.cc -@@ -26,7 +26,6 @@ +@@ -25,7 +25,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" @@ -4659,7 +4635,7 @@ namespace password_manager { --- a/components/password_manager/core/browser/password_reuse_detector_impl.cc +++ b/components/password_manager/core/browser/password_reuse_detector_impl.cc -@@ -20,7 +20,6 @@ +@@ -19,7 +19,6 @@ #include "components/password_manager/core/browser/password_store/password_store_consumer.h" #include "components/password_manager/core/browser/password_store/psl_matching_helper.h" #include "components/safe_browsing/core/common/features.h" @@ -4667,7 +4643,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "url/gurl.h" -@@ -216,9 +215,7 @@ PasswordReuseDetectorImpl::CheckNonGaiaE +@@ -211,9 +210,7 @@ PasswordReuseDetectorImpl::CheckNonGaiaE // Skips password reuse check if |domain| matches enterprise login URL or // enterprise change password URL. GURL page_url(domain); @@ -4745,7 +4721,7 @@ bool HasChosenToSyncPasswords(const syncer::SyncService* sync_service) { --- a/components/password_manager/core/browser/store_metrics_reporter.cc +++ b/components/password_manager/core/browser/store_metrics_reporter.cc -@@ -30,7 +30,6 @@ +@@ -31,7 +31,6 @@ #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -4753,7 +4729,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" -@@ -755,7 +754,7 @@ StoreMetricsReporter::StoreMetricsReport +@@ -756,7 +755,7 @@ StoreMetricsReporter::StoreMetricsReport is_account_storage_enabled_ = features_util::IsAccountStorageEnabled(sync_service); @@ -4861,7 +4837,7 @@ #include "components/safe_browsing/core/common/utils.h" #include "components/sessions/content/session_tab_helper.h" #include "content/public/browser/browser_context.h" -@@ -379,7 +378,7 @@ GURL SafeBrowsingNavigationObserverManag +@@ -376,7 +375,7 @@ GURL SafeBrowsingNavigationObserverManag bool SafeBrowsingNavigationObserverManager::IsEnabledAndReady( PrefService* prefs, bool has_safe_browsing_service) { @@ -5252,7 +5228,7 @@ // policy. --- a/components/safe_browsing/core/browser/ping_manager.cc +++ b/components/safe_browsing/core/browser/ping_manager.cc -@@ -474,7 +474,7 @@ GURL PingManager::SafeBrowsingHitUrl( +@@ -475,7 +475,7 @@ GURL PingManager::SafeBrowsingHitUrl( hit_report->threat_type == SB_THREAT_TYPE_URL_BINARY_MALWARE || hit_report->threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING); std::string url = @@ -5648,7 +5624,7 @@ #include "components/safe_browsing/core/common/utils.h" #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -241,15 +240,6 @@ TailoredSecurityService::TailoredSecurit +@@ -239,15 +238,6 @@ TailoredSecurityService::TailoredSecurit : identity_manager_(identity_manager), sync_service_(sync_service), prefs_(prefs) { @@ -5664,7 +5640,7 @@ } TailoredSecurityService::~TailoredSecurityService() { -@@ -419,26 +409,6 @@ void TailoredSecurityService::MaybeNotif +@@ -417,26 +407,6 @@ void TailoredSecurityService::MaybeNotif return; } @@ -5992,7 +5968,7 @@ #include "components/safe_browsing/core/common/safebrowsing_referral_methods.h" #include "components/security_interstitials/content/security_interstitial_page.h" #include "components/security_interstitials/content/security_interstitial_tab_helper.h" -@@ -164,11 +163,6 @@ PrefService* SecurityInterstitialControl +@@ -165,11 +164,6 @@ PrefService* SecurityInterstitialControl return prefs_; } @@ -6076,9 +6052,9 @@ : MetricsHelper::SET_EXTENDED_REPORTING_DISABLED); --- a/components/security_interstitials/core/controller_client.h +++ b/components/security_interstitials/core/controller_client.h -@@ -130,9 +130,6 @@ class ControllerClient { - - void SetBaseHelpCenterUrlForTesting(const GURL& test_url); +@@ -141,9 +141,6 @@ class ControllerClient { + virtual void OpenReportingPrivacyInNewTab() {} + virtual void OpenWhitepaperInNewTab() {} - protected: - virtual const std::string GetExtendedReportingPrefName() const = 0; @@ -6661,7 +6637,7 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc +++ b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc -@@ -32,7 +32,6 @@ +@@ -27,7 +27,6 @@ #include "components/signin/public/base/hybrid_encryption_key.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" @@ -7085,7 +7061,7 @@ #include "components/signin/public/base/test_signin_client.h" --- a/components/signin/internal/identity_manager/primary_account_mutator_impl.cc +++ b/components/signin/internal/identity_manager/primary_account_mutator_impl.cc -@@ -16,7 +16,6 @@ +@@ -17,7 +17,6 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" @@ -7093,7 +7069,7 @@ #include "components/signin/public/base/signin_switches.h" #include "google_apis/gaia/core_account_id.h" -@@ -56,7 +55,7 @@ PrimaryAccountMutatorImpl::SetPrimaryAcc +@@ -57,7 +56,7 @@ PrimaryAccountMutatorImpl::SetPrimaryAcc DCHECK(!account_info.gaia.empty()); #if !BUILDFLAG(IS_CHROMEOS) @@ -7254,7 +7230,7 @@ #if BUILDFLAG(IS_WIN) #include "base/win/windows_version.h" -@@ -153,11 +152,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti +@@ -131,11 +130,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti ); bool IsBoundSessionCredentialsEnabled(const PrefService* profile_prefs) { @@ -7266,8 +7242,8 @@ return base::FeatureList::IsEnabled(kEnableBoundSessionCredentials); } -@@ -191,11 +185,6 @@ BASE_FEATURE(kEnableChromeRefreshTokenBi - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -174,11 +168,6 @@ BASE_FEATURE(kEnableChromeRefreshTokenBi + ); bool IsChromeRefreshTokenBindingEnabled(const PrefService* profile_prefs) { - // Enterprise policy takes precedence over the feature value. @@ -7368,10 +7344,11 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/account_pref_utils.h" #include "components/sync/base/features.h" -@@ -129,16 +127,6 @@ SyncPrefs::SyncPrefs(PrefService* pref_s +@@ -129,18 +127,6 @@ SyncPrefs::SyncPrefs(PrefService* pref_s base::BindRepeating(&SyncPrefs::OnSelectedTypesPrefChanged, base::Unretained(this))); +-#if BUILDFLAG(ENABLE_DICE_SUPPORT) - if (base::FeatureList::IsEnabled(switches::kOfferMigrationToDiceUsers) || - base::FeatureList::IsEnabled(switches::kRollbackDiceMigration)) { - // The explicit browser signin pref is used for determining whether some @@ -7382,10 +7359,11 @@ - base::BindRepeating(&SyncPrefs::OnSelectedTypesPrefChanged, - base::Unretained(this))); - } +-#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) } SyncPrefs::~SyncPrefs() { -@@ -243,7 +231,7 @@ bool SyncPrefs::IsExplicitBrowserSignin( +@@ -245,7 +231,7 @@ bool SyncPrefs::IsExplicitBrowserSignin( #else // On desktop `prefs::kExplicitBrowserSignin` determines whether the sign-in // is explicit or implicit. @@ -7394,7 +7372,7 @@ #endif } -@@ -1043,30 +1031,6 @@ void SyncPrefs::MaybeMigrateAutofillToPe +@@ -1060,30 +1046,6 @@ void SyncPrefs::MaybeMigrateAutofillToPe return; } pref_service->SetBoolean(kAutofillPerAccountPrefMigrationDone, true); @@ -7425,7 +7403,7 @@ } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) -@@ -1107,21 +1071,15 @@ bool SyncPrefs::IsTypeSelectedByDefaultI +@@ -1124,21 +1086,15 @@ bool SyncPrefs::IsTypeSelectedByDefaultI // Before kReplaceSyncPromosWithSignInPromos, Bookmarks and Reading List // require a specific explicit sign in (relevant for desktop only). return base::FeatureList::IsEnabled(kReplaceSyncPromosWithSignInPromos) || @@ -7453,7 +7431,7 @@ +++ b/components/sync_preferences/common_syncable_prefs_database.cc @@ -24,7 +24,6 @@ #include "components/payments/core/payment_prefs.h" - #include "components/plus_addresses/plus_address_prefs.h" + #include "components/plus_addresses/core/common/plus_address_prefs.h" #include "components/privacy_sandbox/tracking_protection_prefs.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/saved_tab_groups/public/pref_names.h" @@ -7469,7 +7447,7 @@ // kSyncedDefaultSearchProviderGUID = 49, (deprecated) kPrefForceTriggerTranslateCount = 50, // kPrefNeverPromptSitesDeprecated = 51, (deprecated) -@@ -230,16 +227,9 @@ constexpr auto kCommonSyncablePrefsAllow +@@ -242,16 +239,9 @@ constexpr auto kCommonSyncablePrefsAllow {payments::kCanMakePaymentEnabled, {syncable_prefs_ids::kCanMakePaymentEnabled, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, @@ -7486,10 +7464,10 @@ {tab_groups::prefs::kAutoPinNewTabGroups, {syncable_prefs_ids::kAutoPinNewTabGroups, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, ---- a/content/browser/webid/federated_auth_request_impl.cc -+++ b/content/browser/webid/federated_auth_request_impl.cc -@@ -193,31 +193,6 @@ FederatedAuthRequestImpl::~FederatedAuth - void FederatedAuthRequestImpl::Create( +--- a/content/browser/webid/request_service.cc ++++ b/content/browser/webid/request_service.cc +@@ -192,31 +192,6 @@ RequestService::~RequestService() { + void RequestService::Create( RenderFrameHost* host, mojo::PendingReceiver receiver) { - CHECK(host); @@ -7511,12 +7489,12 @@ - return; - } - -- // FederatedAuthRequestImpl owns itself. It will self-destruct when a mojo +- // RequestService owns itself. It will self-destruct when a mojo - // interface error occurs, the RenderFrameHost is deleted, or the - // RenderFrameHost navigates to a new document. -- new FederatedAuthRequestImpl( -- *host, api_permission_context, auto_reauthn_permission_context, -- permission_context, identity_registry, std::move(receiver)); +- new RequestService(*host, api_permission_context, +- auto_reauthn_permission_context, permission_context, +- identity_registry, std::move(receiver)); } - FederatedAuthRequestImpl& FederatedAuthRequestImpl::CreateForTesting( + RequestService& RequestService::CreateForTesting( diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index fc6a2bef..160a9936 100644 --- a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch +++ b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch @@ -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" -@@ -2183,6 +2184,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -2192,6 +2193,7 @@ void RenderViewContextMenu::AppendPageIt } if (CanTranslate(/*menu_logging=*/true)) { @@ -88,7 +88,7 @@ translate_event->set_ranker_version(GetModelVersion()); --- a/components/translate/core/browser/translate_script.cc +++ b/components/translate/core/browser/translate_script.cc -@@ -138,8 +138,13 @@ void TranslateScript::OnScriptFetchCompl +@@ -146,8 +146,13 @@ void TranslateScript::OnScriptFetchCompl server_params.c_str()); GURL security_origin = translate::GetTranslateSecurityOrigin(); 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 b43047b1..8a561490 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 -@@ -2617,6 +2617,7 @@ static_library("browser") { +@@ -2599,6 +2599,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 -@@ -184,6 +184,7 @@ +@@ -188,6 +188,7 @@ #include "components/translate/core/common/translate_util.h" #include "components/trusted_vault/features.h" #include "components/ui_devtools/switches.h" @@ -54,7 +54,7 @@ "//tools/v8_context_snapshot:buildflags", --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -81,6 +81,7 @@ +@@ -83,6 +83,7 @@ #include "components/services/storage/public/cpp/quota_error_or.h" #include "components/services/storage/public/mojom/cache_storage_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 "components/viz/host/host_frame_sink_manager.h" -@@ -3498,6 +3499,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3541,6 +3542,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLImageChromium, switches::kEnableWebGPUDeveloperFeatures, 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" -@@ -481,6 +482,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -484,6 +485,10 @@ void SetRuntimeFeaturesFromCommandLine(c true}, {wrf::EnableWebAudioBypassOutputBufferingOptOut, blink::switches::kWebAudioBypassOutputBufferingOptOut, true}, @@ -124,7 +124,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" -@@ -1085,6 +1086,11 @@ Document::Document(const DocumentInit& i +@@ -1084,6 +1085,11 @@ Document::Document(const DocumentInit& i TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this), TRACE_EVENT_FLAG_FLOW_OUT); DCHECK(agent_); @@ -136,7 +136,7 @@ if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) && features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) { script_runner_delayer_->Activate(); -@@ -1215,6 +1221,14 @@ const Position Document::PositionAdjuste +@@ -1221,6 +1227,14 @@ const Position Document::PositionAdjuste return Position::BeforeNode(*shadow_host); } @@ -164,19 +164,19 @@ V8VisibilityState visibilityState() const; String visibilityStateAsString() const; bool IsPageVisible() const; -@@ -2770,6 +2774,9 @@ class CORE_EXPORT Document : public Cont +@@ -2783,6 +2787,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; + double noise_factor_x_ = 1; + double noise_factor_y_ = 1; + - Member script_runner_; - Member script_runner_delayer_; - + // The script runner is used to run scripts of the following scheduling types: + // - ScriptSchedulingType::kAsync + // - ScriptSchedulingType::kInOrder --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -3092,6 +3092,11 @@ DOMRectList* Element::getClientRects() { +@@ -3133,6 +3133,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads, *element_layout_object); @@ -188,7 +188,7 @@ return MakeGarbageCollected(quads); } -@@ -3119,6 +3124,9 @@ gfx::RectF Element::GetBoundingClientRec +@@ -3160,6 +3165,9 @@ gfx::RectF Element::GetBoundingClientRec DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -276,7 +276,7 @@ namespace blink { class MemoryManagedPaintCanvas; -@@ -1248,13 +1251,26 @@ TextMetrics* BaseRenderingContext2D::mea +@@ -1245,13 +1248,26 @@ TextMetrics* BaseRenderingContext2D::mea TextDirection direction = ToTextDirection(state.GetDirection(), host, computed_style); @@ -308,7 +308,7 @@ String BaseRenderingContext2D::lang() const { --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1797,6 +1797,7 @@ component("platform") { +@@ -1813,6 +1813,7 @@ component("platform") { "//components/paint_preview/common", "//components/search_engines:search_engine_utils", "//components/translate/core/language_detection", @@ -343,7 +343,7 @@ #include "third_party/skia/include/core/SkImage.h" --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2273,6 +2273,12 @@ +@@ -2319,6 +2319,12 @@ status: "stable", }, { 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 3c9500ff..f7856ee7 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 -@@ -3501,6 +3501,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3544,6 +3544,7 @@ void RenderProcessHostImpl::PropagateBro switches::kFileUrlPathAlias, switches::kFingerprintingClientRectsNoise, switches::kFingerprintingCanvasMeasureTextNoise, @@ -44,7 +44,7 @@ approach to change color components. switches::kForceHighContrast, --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -486,6 +486,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -489,6 +489,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -65,7 +65,7 @@ approach to change color components. }; --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -557,6 +557,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -555,6 +555,9 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -77,7 +77,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 -@@ -1741,7 +1741,9 @@ component("platform") { +@@ -1756,7 +1756,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -281,7 +281,7 @@ approach to change color components. } // namespace blink --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h -@@ -38,6 +38,8 @@ class PLATFORM_EXPORT StaticBitmapImage +@@ -39,6 +39,8 @@ class PLATFORM_EXPORT StaticBitmapImage StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {} @@ -314,7 +314,7 @@ approach to change color components. SkJpegEncoder::Options options; --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2279,6 +2279,9 @@ +@@ -2325,6 +2325,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 707ce793..4842d1cd 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 -@@ -2295,6 +2295,7 @@ static_library("browser") { +@@ -2276,6 +2276,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -49,7 +49,7 @@ 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 -@@ -26,6 +26,7 @@ +@@ -22,6 +22,7 @@ #include "base/functional/callback.h" #include "base/functional/callback_helpers.h" #include "base/location.h" @@ -57,7 +57,7 @@ with limited CPU/memory resources and it is disabled by default. #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" -@@ -33,6 +34,7 @@ +@@ -29,6 +30,7 @@ #include "base/notreached.h" #include "base/path_service.h" #include "base/run_loop.h" @@ -65,7 +65,7 @@ with limited CPU/memory resources and it is disabled by default. #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" -@@ -119,6 +121,7 @@ +@@ -115,6 +117,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" @@ -73,7 +73,7 @@ with limited CPU/memory resources and it is disabled by default. #include "components/network_time/network_time_tracker.h" #include "components/os_crypt/async/browser/os_crypt_async.h" #include "components/permissions/permissions_client.h" -@@ -153,6 +156,7 @@ +@@ -149,6 +152,7 @@ #include "extensions/common/constants.h" #include "media/media_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" @@ -81,7 +81,7 @@ with limited CPU/memory resources and it is disabled by default. #include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/network_switches.h" -@@ -421,6 +425,18 @@ void BrowserProcessImpl::Init() { +@@ -417,6 +421,18 @@ void BrowserProcessImpl::Init() { pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled, base::BindRepeating(&ApplyMetricsReportingPolicy)); @@ -102,9 +102,9 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2661,6 +2661,10 @@ const char kMantisFeatureKeyDescription[ - "Feature key to use the Mantis feature on ChromeOS."; - #endif // BUILDFLAG(IS_CHROMEOS) +@@ -2654,6 +2654,10 @@ const char kLogJsConsoleMessagesDescript + "Enable logging JS console messages in system logs, please note that they " + "may contain PII."; +const char kMaxConnectionsPerHostName[] = "Maximum connections per host"; +const char kMaxConnectionsPerHostDescription[] = @@ -115,9 +115,9 @@ 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 -@@ -1551,6 +1551,9 @@ extern const char kMantisFeatureKeyName[ - extern const char kMantisFeatureKeyDescription[]; - #endif // IS_CHROMEOS +@@ -1555,6 +1555,9 @@ extern const char kLockTopControlsOnLarg + extern const char kLogJsConsoleMessagesName[]; + extern const char kLogJsConsoleMessagesDescription[]; +extern const char kMaxConnectionsPerHostName[]; +extern const char kMaxConnectionsPerHostDescription[]; diff --git a/patches/extra/debian/disable/google-api-warning.patch b/patches/extra/debian/disable/google-api-warning.patch index cc7ed73c..b1b108d0 100644 --- a/patches/extra/debian/disable/google-api-warning.patch +++ b/patches/extra/debian/disable/google-api-warning.patch @@ -3,7 +3,7 @@ author: Michael Gilbert --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc -@@ -175,10 +175,6 @@ void AddInfoBarsIfNecessary(Browser* bro +@@ -178,10 +178,6 @@ void AddInfoBarsIfNecessary(Browser* bro infobars::ContentInfoBarManager* infobar_manager = infobars::ContentInfoBarManager::FromWebContents(web_contents); diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 6c847917..8f878404 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 -@@ -1418,7 +1418,7 @@ void ChromeContentBrowserClient::Registe +@@ -1462,7 +1462,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -23,7 +23,7 @@ // used for mapping the command-line flags). --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -620,7 +620,7 @@ void ProfileNetworkContextService::Confi +@@ -621,7 +621,7 @@ void ProfileNetworkContextService::Confi void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled, @@ -56,7 +56,7 @@ --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -117,7 +117,7 @@ void RegisterBrowserUserPrefs(user_prefs +@@ -121,7 +121,7 @@ void RegisterBrowserUserPrefs(user_prefs registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); registry->RegisterBooleanPref( @@ -109,7 +109,7 @@ --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -504,7 +504,7 @@ void HandleFailedLoginDetectionForPasswo +@@ -512,7 +512,7 @@ void HandleFailedLoginDetectionForPasswo void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -118,7 +118,7 @@ user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); #if BUILDFLAG(IS_IOS) // Deprecated pref in profile prefs. -@@ -512,7 +512,7 @@ void PasswordManager::RegisterProfilePre +@@ -520,7 +520,7 @@ void PasswordManager::RegisterProfilePre false); #endif // BUILDFLAG(IS_IOS) registry->RegisterBooleanPref( 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 114a1e4b..6325933d 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 @@ -5,7 +5,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 -@@ -1588,11 +1588,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1581,27 +1581,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { @@ -13,6 +13,22 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run - // "BrowserSignin" policy is set to "Force". If so, skip the auto import. - if (profile) { - first_run::AutoImport(profile, master_prefs_->import_bookmarks_path); +- +- if (base::FeatureList::IsEnabled(features::kBookmarksImportOnFirstRun) && +- !master_prefs_->import_bookmarks_dict.empty()) { +- first_run::StartBookmarksImportFromDict( +- profile, std::move(master_prefs_->import_bookmarks_dict)); +- } +- +-#if BUILDFLAG(ENABLE_EXTENSIONS) +- if (base::FeatureList::IsEnabled(features::kInitialExternalExtensions)) { +- // Store the initial extension IDs into the profile's prefs so that +- // InitialExternalExtensionLoader can later pick them up. +- profile->GetPrefs()->SetList( +- extensions::pref_names::kInitialInstallList, +- std::move(master_prefs_->initial_extensions)); +- } +-#endif // BUILDFLAG(ENABLE_EXTENSIONS) - } // Note: This can pop-up the first run consent dialog on Linux & Mac. diff --git a/patches/extra/iridium-browser/updater-disable-auto-update.patch b/patches/extra/iridium-browser/updater-disable-auto-update.patch index 7e764cb3..26dc4c28 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 -@@ -1076,7 +1076,7 @@ class AppControllerNativeThemeObserver : +@@ -1074,7 +1074,7 @@ class AppControllerNativeThemeObserver : CFStringRef checkInterval = CFSTR("checkInterval"); CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app); if (!plist) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch b/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch index afb13b10..99794664 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch @@ -8,7 +8,7 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/browser_features.h" #include "chrome/browser/defaults.h" -@@ -132,6 +133,10 @@ void BookmarkBarController::OnSplitTabCh +@@ -139,6 +140,10 @@ void BookmarkBarController::OnSplitTabCh } bool BookmarkBarController::ShouldShowBookmarkBar() const { 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 4816ae42..d7cd6cbd 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -1,14 +1,14 @@ --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -138,6 +138,7 @@ +@@ -139,6 +139,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/contents_web_view.h" #include "chrome/browser/ui/views/frame/multi_contents_view.h" +#include "chrome/browser/ui/views/message_box_dialog.h" #include "chrome/browser/ui/views/status_bubble_views.h" #include "chrome/browser/ui/web_applications/app_browser_controller.h" - #include "chrome/browser/ui/web_applications/web_app_launch_utils.h" -@@ -620,6 +621,7 @@ Browser::Browser(const CreateParams& par + #include "chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h" +@@ -611,6 +612,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), @@ -16,7 +16,7 @@ override_bounds_(params.initial_bounds), initial_show_state_(params.initial_show_state), initial_workspace_(params.initial_workspace), -@@ -994,20 +996,22 @@ Browser::WarnBeforeClosingResult Browser +@@ -993,20 +995,22 @@ Browser::WarnBeforeClosingResult Browser return WarnBeforeClosingResult::kOkToClose; } @@ -52,7 +52,7 @@ } DCHECK(!warn_before_closing_callback_) -@@ -1045,6 +1049,7 @@ bool Browser::TryToCloseWindow( +@@ -1044,6 +1048,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = NOT_PROMPTED; @@ -60,7 +60,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -3496,6 +3501,58 @@ bool Browser::CanCloseWithInProgressDown +@@ -3494,6 +3499,58 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -119,7 +119,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -3521,6 +3578,22 @@ void Browser::InProgressDownloadResponse +@@ -3519,6 +3576,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -152,7 +152,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/unload_controller.h" -@@ -1147,12 +1148,17 @@ class Browser : public TabStripModelObse +@@ -1150,12 +1151,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -170,7 +170,7 @@ // Called when the user has decided whether to proceed or not with the browser // closure, in case the cookie migration notice was shown. |proceed_closing| // is true if the browser can be closed. -@@ -1333,6 +1339,8 @@ class Browser : public TabStripModelObse +@@ -1341,6 +1347,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 b008980e..4eb0f2a0 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 -@@ -821,11 +821,15 @@ bool HandleNewTabPageLocationOverride( +@@ -839,11 +839,15 @@ bool HandleNewTabPageLocationOverride( // Don't change the URL when incognito mode. if (profile->IsOffTheRecord()) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch index b173cc2e..62727835 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch @@ -58,15 +58,15 @@ Node* inner_node = event.InnerNode(); --- a/third_party/blink/renderer/core/input/mouse_event_manager.cc +++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc -@@ -5,6 +5,7 @@ - #include "third_party/blink/renderer/core/input/mouse_event_manager.h" +@@ -6,6 +6,7 @@ + #include "base/metrics/histogram_functions.h" #include "build/build_config.h" +#include "third_party/blink/public/common/features.h" #include "third_party/blink/public/platform/web_input_event_result.h" #include "third_party/blink/renderer/bindings/core/v8/v8_drag_event_init.h" #include "third_party/blink/renderer/bindings/core/v8/v8_pointer_event_init.h" -@@ -623,8 +624,14 @@ WebInputEventResult MouseEventManager::H +@@ -622,8 +623,14 @@ WebInputEventResult MouseEventManager::H bool single_click = event.Event().click_count <= 1; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch index 76dd3e8b..bed8db06 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -74,6 +74,7 @@ class FrameGrabHandle : public views::Vi +@@ -84,6 +84,7 @@ class FrameGrabHandle : public views::Vi // Reserve some space for the frame to be grabbed by, even if the tabstrip // is full. // TODO(tbergquist): Define this relative to the NTB insets again. diff --git a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch index 91945906..f77fc129 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc -@@ -707,5 +707,7 @@ bool BrowserFrame::RegenerateFrameOnThem +@@ -723,5 +723,7 @@ bool BrowserFrame::RegenerateFrameOnThem } bool BrowserFrame::IsIncognitoBrowser() const { @@ -10,7 +10,7 @@ } --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -@@ -60,6 +60,7 @@ +@@ -50,6 +50,7 @@ #include "ui/base/webui/jstemplate_builder.h" #include "ui/base/webui/web_ui_util.h" #include "ui/color/color_provider.h" @@ -18,7 +18,7 @@ #include "ui/gfx/color_utils.h" #include "ui/native_theme/native_theme.h" -@@ -467,7 +468,9 @@ void NTPResourceCache::CreateNewTabIncog +@@ -389,7 +390,9 @@ void NTPResourceCache::CreateNewTabIncog profile_->GetPrefs()->GetString(prefs::kCurrentThemeID); // Colors. 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 9503a7e2..c7b89ab9 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 @@ -79,7 +79,7 @@ #include "base/feature_list.h" #include "base/functional/bind.h" #include "base/functional/callback.h" -@@ -632,6 +633,9 @@ void SearchProvider::Run(bool query_is_p +@@ -637,6 +638,9 @@ void SearchProvider::Run(bool query_is_p } void SearchProvider::DoHistoryQuery(bool minimal_changes) { @@ -91,16 +91,16 @@ if (minimal_changes) --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -15,6 +15,8 @@ +@@ -10,6 +10,8 @@ #include #include "base/check_op.h" +#include "base/containers/contains.h" +#include "base/command_line.h" + #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" - #include "base/i18n/char_iterator.h" -@@ -648,6 +650,8 @@ GURL FixupURLInternal(const std::string& +@@ -644,6 +646,8 @@ GURL FixupURLInternal(const std::string& FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url); if (chrome_url && !parts.host.is_valid()) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch index 87ca77b6..076fe1a5 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch @@ -30,17 +30,20 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/sharing_message/features.cc +++ b/components/sharing_message/features.cc -@@ -7,3 +7,5 @@ +@@ -6,6 +6,8 @@ + #include "build/build_config.h" - BASE_FEATURE(kClickToCall, "ClickToCall", base::FEATURE_DISABLED_BY_DEFAULT); -+ +BASE_FEATURE(kDisableQRGenerator, "DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT); ++ + BASE_FEATURE(kClickToCall, "ClickToCall", base::FEATURE_DISABLED_BY_DEFAULT); + + BASE_FEATURE(kMobilePromoOnDesktop, --- a/components/sharing_message/features.h +++ b/components/sharing_message/features.h -@@ -10,4 +10,5 @@ - - BASE_DECLARE_FEATURE(kClickToCall); +@@ -18,4 +18,5 @@ extern const char kMobilePromoOnDesktopP + // Parameter of `kMobilePromoOnDesktop` for showing the iOS push notification. + extern const char kMobilePromoOnDesktopNotificationParam[]; +BASE_DECLARE_FEATURE(kDisableQRGenerator); #endif // COMPONENTS_SHARING_MESSAGE_FEATURES_H_ 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 039d0104..c9255f00 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 @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -544,7 +544,9 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -560,7 +560,9 @@ void TabHelpers::AttachTabHelpers(WebCon profile, web_contents); #endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE) SafetyTipWebContentsObserver::CreateForWebContents(web_contents); @@ -25,7 +25,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc -@@ -259,14 +259,16 @@ void ChromeRenderFrameObserver::DidFinis +@@ -260,14 +260,16 @@ void ChromeRenderFrameObserver::DidFinis if (frame->Parent() || frame->IsInFencedFrameTree()) return; @@ -92,7 +92,7 @@ } bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy( -@@ -2493,6 +2501,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -2489,6 +2497,8 @@ SyncDataMap TemplateURLService::CreateGU } void TemplateURLService::Init() { @@ -101,7 +101,7 @@ if (client_) { client_->SetOwner(this); } -@@ -2658,6 +2668,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -2654,6 +2664,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -113,7 +113,7 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -905,6 +905,8 @@ class TemplateURLService final : public +@@ -909,6 +909,8 @@ class TemplateURLService final : public raw_ref prepopulate_data_resolver_; 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 4afd5c1c..0ec86b91 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 @@ -8,7 +8,7 @@ #include "base/debug/alias.h" #include "base/functional/bind.h" #include "base/i18n/rtl.h" -@@ -761,6 +762,13 @@ void Tab::HideHover(TabStyle::HideHoverS +@@ -762,6 +763,13 @@ void Tab::HideHover(TabStyle::HideHoverS DeprecatedLayoutImmediately(); } @@ -42,7 +42,7 @@ #include "base/check.h" #include "base/compiler_specific.h" #include "base/containers/adapters.h" -@@ -2003,6 +2004,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -1998,6 +1999,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 c8a91c15..f6bddb95 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 -@@ -1585,7 +1585,8 @@ void BrowserCommandController::InitComma +@@ -1609,7 +1609,8 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, normal_window); @@ -12,7 +12,15 @@ command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE, --- a/chrome/browser/ui/ui_features.cc +++ b/chrome/browser/ui/ui_features.cc -@@ -594,6 +594,10 @@ static std::string GetCountryCode() { +@@ -4,6 +4,7 @@ + + #include "chrome/browser/ui/ui_features.h" + ++#include "base/command_line.h" + #include "base/feature_list.h" + #include "base/metrics/field_trial_params.h" + #include "base/time/time.h" +@@ -707,6 +708,10 @@ static std::string GetCountryCode() { } bool HasTabSearchToolbarButton() { @@ -25,7 +33,7 @@ base::FeatureList::IsEnabled( --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -5159,6 +5159,7 @@ void BrowserView::AddedToWidget() { +@@ -5182,6 +5182,7 @@ void BrowserView::AddedToWidget() { toolbar_->Init(); @@ -43,7 +51,7 @@ #include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h" -@@ -127,6 +128,7 @@ TabStripRegionView::TabStripRegionView(s +@@ -209,6 +210,7 @@ TabStripRegionView::TabStripRegionView(s std::unique_ptr tab_strip_action_container; std::unique_ptr product_specifications_button; if (browser && 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 b785f4e6..652dac1a 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch @@ -8,7 +8,7 @@ } // namespace features --- a/chrome/browser/browser_features.h +++ b/chrome/browser/browser_features.h -@@ -121,6 +121,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT +@@ -125,6 +125,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT // module, e.g. // //chrome/browser//features.h // 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 f693a740..83ccb6bf 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -8,7 +8,7 @@ #include "base/containers/adapters.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" -@@ -1145,6 +1146,10 @@ void TabStripModel::CloseAllTabsInGroup( +@@ -1171,6 +1172,10 @@ void TabStripModel::CloseAllTabsInGroup( void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) { CHECK(ContainsIndex(index)); @@ -19,7 +19,7 @@ CloseTabs({GetWebContentsAt(index)}, close_types); } -@@ -2928,9 +2933,13 @@ TabStripModel::GetGroupsDestroyedFromRem +@@ -3020,9 +3025,13 @@ TabStripModel::GetGroupsDestroyedFromRem void TabStripModel::ExecuteCloseTabsByIndices( base::RepeatingCallback()> get_indices_to_close, uint32_t close_types) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index e0be8e64..53de59a4 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch @@ -69,7 +69,7 @@ // Don't prompt for file types that are marked for opening automatically. --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -319,6 +319,13 @@ bool ExtensionManagement::IsInstallation +@@ -312,6 +312,13 @@ bool ExtensionManagement::IsInstallation bool ExtensionManagement::IsOffstoreInstallAllowed( const GURL& url, const GURL& referrer_url) const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch index d9326a94..a433f839 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -1198,6 +1198,8 @@ WindowOpenDisposition NavigationPolicyTo +@@ -1200,6 +1200,8 @@ WindowOpenDisposition NavigationPolicyTo case blink::kWebNavigationPolicyNewWindow: return WindowOpenDisposition::NEW_WINDOW; case blink::kWebNavigationPolicyNewPopup: 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 c415a1e8..4eba7ecb 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/compiler_specific.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" -@@ -1327,7 +1328,8 @@ void HistoryBackend::InitImpl( +@@ -1341,7 +1342,8 @@ void HistoryBackend::InitImpl( db_->GetStartDate(&first_recorded_time_); // Start expiring old stuff. @@ -31,7 +31,7 @@ } void HistoryBackend::OnMemoryPressure( -@@ -1549,6 +1551,8 @@ void HistoryBackend::AddPagesWithDetails +@@ -1570,6 +1572,8 @@ void HistoryBackend::AddPagesWithDetails } bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch index 2339886e..7a9637fc 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch @@ -11,7 +11,15 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/net/socket/ssl_client_socket_impl.cc +++ b/net/socket/ssl_client_socket_impl.cc -@@ -200,7 +200,8 @@ class SSLClientSocketImpl::SSLContext { +@@ -14,6 +14,7 @@ + #include + #include + ++#include "base/command_line.h" + #include "base/containers/span.h" + #include "base/containers/to_vector.h" + #include "base/feature_list.h" +@@ -200,7 +201,8 @@ class SSLClientSocketImpl::SSLContext { SSL_CTX_sess_set_new_cb(ssl_ctx_.get(), NewSessionCallback); SSL_CTX_set_timeout(ssl_ctx_.get(), 1 * 60 * 60 /* one hour */); 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 79a6ca37..e05305ef 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 @@ -3,7 +3,7 @@ --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc -@@ -140,7 +140,8 @@ void AddInfoBarsIfNecessary(Browser* bro +@@ -143,7 +143,8 @@ void AddInfoBarsIfNecessary(Browser* bro } // Web apps should not display the session restore bubble (crbug.com/1264121) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch index ff2f717b..5a6c790a 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch @@ -16,7 +16,7 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/feature_engagement/public/event_constants.h" -@@ -544,6 +546,17 @@ void ExtensionsToolbarContainer::AnchorA +@@ -548,6 +550,17 @@ void ExtensionsToolbarContainer::AnchorA widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView( anchor_view && anchor_view->GetVisible() ? anchor_view : GetExtensionsButton()); @@ -34,7 +34,7 @@ widget->Show(); } -@@ -958,6 +971,9 @@ void ExtensionsToolbarContainer::UpdateC +@@ -964,6 +977,9 @@ void ExtensionsToolbarContainer::UpdateC } bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch index 01c587f5..08054af3 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -2130,6 +2130,10 @@ void BrowserView::ExitFullscreen() { +@@ -2116,6 +2116,10 @@ void BrowserView::ExitFullscreen() { void BrowserView::UpdateExclusiveAccessBubble( const ExclusiveAccessBubbleParams& params, ExclusiveAccessBubbleHideCallback first_hide_callback) { @@ -13,7 +13,7 @@ platform_util::IsBrowserLockedFullscreen(browser_.get()); --- a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc +++ b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc -@@ -73,6 +73,10 @@ bool IsExitUiEnabled() { +@@ -74,6 +74,10 @@ bool IsExitUiEnabled() { // menu and controls reveal when the cursor is moved to the top. return false; #else 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 14b3ccd6..9130d375 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 -@@ -1170,7 +1170,11 @@ void Tab::UpdateIconVisibility() { +@@ -1177,7 +1177,11 @@ void Tab::UpdateIconVisibility() { // Close button is shown on active tabs regardless of the size. showing_close_button_ = true; #endif // BUILDFLAG(IS_CHROMEOS) @@ -12,7 +12,7 @@ showing_alert_indicator_ = has_alert_icon && alert_icon_width <= available_width; -@@ -1199,6 +1203,8 @@ void Tab::UpdateIconVisibility() { +@@ -1206,6 +1210,8 @@ void Tab::UpdateIconVisibility() { !controller_->IsLockedForOnTask() && #endif large_enough_for_close_button; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch index 2e192ea4..a6ba4cc8 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/browser/client_hints/client_hints.cc +++ b/content/browser/client_hints/client_hints.cc -@@ -821,6 +821,8 @@ void UpdateNavigationRequestClientUaHead +@@ -823,6 +823,8 @@ void UpdateNavigationRequestClientUaHead net::HttpRequestHeaders* headers, const std::optional& request_url) { DCHECK(frame_tree_node); @@ -20,13 +20,13 @@ if (!ShouldAddClientHints(origin, frame_tree_node, delegate, request_url)) { return; } -@@ -842,6 +844,8 @@ void AddRequestClientHintsHeaders( +@@ -854,6 +856,8 @@ void AddRequestClientHintsHeaders( FrameTreeNode* frame_tree_node, const network::ParsedPermissionsPolicy& container_policy, - const std::optional& request_url) { + FrameTreeNode* ftn_for_devtools_override) { + if (base::FeatureList::IsEnabled(blink::features::kRemoveClientHints)) + return; - ClientHintsExtendedData data(origin, frame_tree_node, delegate, request_url); + ClientHintsExtendedData data(origin, frame_tree_node, delegate); UpdateIFramePermissionsPolicyWithDelegationSupportForClientHints( data, container_policy); --- a/third_party/blink/common/features.cc 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 81358612..5f9dafdc 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/containers/adapters.h" #include "base/feature_list.h" #include "base/functional/bind.h" -@@ -175,6 +176,18 @@ DragOperation GetDropEffect(const ui::Dr +@@ -176,6 +177,18 @@ DragOperation GetDropEffect(const ui::Dr return DragOperation::kMove; } @@ -27,7 +27,7 @@ } // namespace BrowserRootView::DropInfo::DropInfo() = default; -@@ -187,7 +200,9 @@ BrowserRootView::DropInfo::~DropInfo() { +@@ -188,7 +201,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, -@@ -327,7 +342,7 @@ bool BrowserRootView::OnMouseWheel(const +@@ -328,7 +343,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 -@@ -159,6 +159,8 @@ class BrowserRootView : public views::in +@@ -160,6 +160,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 e587a429..30a07807 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 -@@ -460,6 +460,17 @@ void ToolbarView::Init() { +@@ -466,6 +466,17 @@ void ToolbarView::Init() { browser_->profile()->IsGuestSession() || browser_->profile()->IsRegularProfile(); #endif diff --git a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch index 0e441831..b0112187 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch @@ -86,7 +86,7 @@ // Feature declarations and associated constants (feature params, et cetera) --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -4113,6 +4113,8 @@ ScriptValue WebGLRenderingContextBase::g +@@ -4121,6 +4121,8 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -95,7 +95,7 @@ return WebGLAny(script_state, String(ContextGL()->GetString(GL_RENDERER))); } -@@ -4128,6 +4130,8 @@ ScriptValue WebGLRenderingContextBase::g +@@ -4136,6 +4138,8 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_VENDOR)))); } diff --git a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch index 957ac3b5..7d9ba388 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4930,10 +4930,12 @@ constexpr char kWebiumFlag[] = "webium"; +@@ -4922,10 +4922,12 @@ const FeatureEntry::FeatureVariation kNt #include "chrome/browser/ungoogled_flag_choices.h" #include "chrome/browser/bromite_flag_choices.h" #include "chrome/browser/ungoogled_platform_flag_choices.h" diff --git a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch index 04539e1b..d00dcfd2 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch @@ -19,7 +19,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -172,6 +172,7 @@ +@@ -173,6 +173,7 @@ #include "services/network/public/cpp/permissions_policy/fenced_frame_permissions_policies.h" #include "services/network/public/cpp/permissions_policy/permissions_policy_declaration.h" #include "services/network/public/cpp/permissions_policy/permissions_policy_features.h" @@ -27,7 +27,7 @@ #include "services/network/public/cpp/resource_request_body.h" #include "services/network/public/cpp/supports_loading_mode/supports_loading_mode_parser.h" #include "services/network/public/cpp/url_loader_completion_status.h" -@@ -393,10 +394,10 @@ void AddAdditionalRequestHeaders( +@@ -392,10 +393,10 @@ void AddAdditionalRequestHeaders( net::HttpRequestHeaders::kUserAgent, ComputeUserAgentValue(*headers, user_agent_override, browser_context)); @@ -44,7 +44,7 @@ if (NeedsHTTPOrigin(headers, method)) { --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -133,6 +133,7 @@ +@@ -135,6 +135,7 @@ #include "services/network/public/cpp/content_decoding_interceptor.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/not_implemented_url_loader_factory.h" @@ -52,7 +52,7 @@ #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" #include "services/network/public/mojom/fetch_api.mojom.h" #include "services/network/public/mojom/restricted_cookie_manager.mojom.h" -@@ -4522,10 +4523,13 @@ void RenderFrameImpl::FinalizeRequestInt +@@ -4523,10 +4524,13 @@ void RenderFrameImpl::FinalizeRequestInt request.SetHasUserGesture(frame_->HasTransientUserActivation()); diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index 5fbfcb69..86e84620 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -13,15 +13,15 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -19,6 +19,8 @@ +@@ -20,6 +20,8 @@ namespace net::features { +BASE_FEATURE(kSetIpv6ProbeFalse, "SetIpv6ProbeFalse", base::FEATURE_DISABLED_BY_DEFAULT); + - BASE_FEATURE(kAlpsForHttp2, "AlpsForHttp2", base::FEATURE_ENABLED_BY_DEFAULT); + BASE_FEATURE(AlpsForHttp2, base::FEATURE_ENABLED_BY_DEFAULT); - BASE_FEATURE(kAvoidH2Reprioritization, + BASE_FEATURE(AvoidH2Reprioritization, base::FEATURE_DISABLED_BY_DEFAULT); --- a/net/base/features.h +++ b/net/base/features.h @@ -21,6 +21,8 @@ @@ -35,7 +35,7 @@ // https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html. --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -152,11 +152,6 @@ const size_t kMaxHostLength = 4096; +@@ -151,11 +151,6 @@ const size_t kMaxHostLength = 4096; // cached. const int kIPv6ProbePeriodMs = 1000; @@ -47,7 +47,7 @@ // True if |hostname| ends with either ".local" or ".local.". bool ResemblesMulticastDNSName(std::string_view hostname) { return hostname.ends_with(".local") || hostname.ends_with(".local."); -@@ -1497,33 +1492,10 @@ int HostResolverManager::StartIPv6Reacha +@@ -1496,33 +1491,10 @@ int HostResolverManager::StartIPv6Reacha return OK; } diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index 12f3f510..954d35c7 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -196,7 +196,7 @@ // already owned by the TemplateURLService. --- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc -@@ -28,23 +28,27 @@ KeywordEditorController::KeywordEditorCo +@@ -27,23 +27,27 @@ KeywordEditorController::KeywordEditorCo KeywordEditorController::~KeywordEditorController() = default; @@ -232,7 +232,7 @@ DCHECK(!url.empty()); const std::optional index = table_model_->IndexOfTemplateURL(template_url); -@@ -56,11 +60,13 @@ void KeywordEditorController::ModifyTemp +@@ -55,11 +59,13 @@ void KeywordEditorController::ModifyTemp // Don't do anything if the entry didn't change. if ((template_url->short_name() == title) && @@ -271,7 +271,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 -@@ -212,21 +212,25 @@ void TemplateURLTableModel::Remove(size_ +@@ -211,21 +211,25 @@ void TemplateURLTableModel::Remove(size_ void TemplateURLTableModel::Add(size_t index, const std::u16string& short_name, const std::u16string& keyword, @@ -302,7 +302,7 @@ DCHECK(index <= RowCount()); DCHECK(!url.empty()); TemplateURL* template_url = GetTemplateURL(index); -@@ -235,7 +239,8 @@ void TemplateURLTableModel::ModifyTempla +@@ -234,7 +238,8 @@ void TemplateURLTableModel::ModifyTempla DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url || template_url->SupportsReplacement( template_url_service_->search_terms_data())); @@ -448,7 +448,7 @@ syncer::kSeparateLocalAndAccountSearchEngines) --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -341,7 +341,8 @@ class TemplateURLService final : public +@@ -345,7 +345,8 @@ class TemplateURLService final : public void ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index 52f81184..35921513 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 -@@ -4926,7 +4926,13 @@ constexpr char kWebiumFlag[] = "webium"; +@@ -4918,7 +4918,13 @@ const FeatureEntry::FeatureVariation kNt // calculate and verify checksum. // // When adding a new choice, add it to the end of the list. diff --git a/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch b/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch index 84ef249b..21b14845 100644 --- a/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch +++ b/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -129,7 +129,7 @@ void RegisterBrowserUserPrefs(user_prefs +@@ -133,7 +133,7 @@ void RegisterBrowserUserPrefs(user_prefs false); #endif registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy, diff --git a/patches/extra/ungoogled-chromium/disable-ai-search-shortcuts.patch b/patches/extra/ungoogled-chromium/disable-ai-search-shortcuts.patch index 2801302e..71ffd10a 100644 --- a/patches/extra/ungoogled-chromium/disable-ai-search-shortcuts.patch +++ b/patches/extra/ungoogled-chromium/disable-ai-search-shortcuts.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc -@@ -117,23 +117,10 @@ void TemplateURLTableModel::Reload() { +@@ -117,22 +117,10 @@ void TemplateURLTableModel::Reload() { extension_entries; // Keywords that can be made the default first. for (TemplateURL* template_url : urls) { @@ -19,8 +19,7 @@ - // Skip @aimode if feature disabled. - if (template_url->starter_pack_id() == - template_url_starter_pack_data::kAiMode && -- (!omnibox_feature_configs::Toolbelt::Get().enabled || -- !ai_mode_enabled_)) { +- !ai_mode_enabled_) { + // Disable all Google AI starter pack options + if (template_url->starter_pack_id() == template_url_starter_pack_data::kGemini || + template_url->starter_pack_id() == template_url_starter_pack_data::kAiMode || @@ -30,7 +29,7 @@ --- a/components/omnibox/browser/featured_search_provider.cc +++ b/components/omnibox/browser/featured_search_provider.cc -@@ -290,21 +290,10 @@ void FeaturedSearchProvider::AddFeatured +@@ -290,20 +290,10 @@ void FeaturedSearchProvider::AddFeatured for (TemplateURL* turl : turls) { if (turl->starter_pack_id() > 0 && turl->is_active() == TemplateURLData::ActiveStatus::kTrue) { @@ -46,9 +45,8 @@ - } - // Skip @aimode if feature disabled. - if (turl->starter_pack_id() == template_url_starter_pack_data::kAiMode && -- (!omnibox_feature_configs::Toolbelt::Get().enabled || -- !client_->GetAimEligibilityService() || -- !client_->GetAimEligibilityService()->IsAimEligible())) { +- !OmniboxFieldTrial::IsAimStarterPackEnabled( +- client_->GetAimEligibilityService())) { + // Disable all Google AI starter pack options + if (turl->starter_pack_id() == template_url_starter_pack_data::kGemini || + turl->starter_pack_id() == template_url_starter_pack_data::kAiMode || diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index 2b397fd0..1f4e4be8 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -2,15 +2,15 @@ --- a/components/download/internal/common/base_file.cc +++ b/components/download/internal/common/base_file.cc -@@ -29,7 +29,6 @@ +@@ -26,7 +26,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" -#include "components/services/quarantine/quarantine.h" + #include "crypto/hash.h" #include "crypto/secure_hash.h" - #if BUILDFLAG(IS_ANDROID) -@@ -563,94 +562,10 @@ DownloadInterruptReason BaseFile::Publis +@@ -538,94 +537,10 @@ DownloadInterruptReason BaseFile::Publis } #endif // BUILDFLAG(IS_ANDROID) @@ -105,7 +105,7 @@ } void BaseFile::AnnotateWithSourceInformation( -@@ -660,32 +575,8 @@ void BaseFile::AnnotateWithSourceInforma +@@ -635,32 +550,8 @@ void BaseFile::AnnotateWithSourceInforma const std::optional& request_initiator, mojo::PendingRemote remote_quarantine, OnAnnotationDoneCallback on_annotation_done_callback) { @@ -142,7 +142,7 @@ } // namespace download --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -138,7 +138,6 @@ source_set("browser") { +@@ -139,7 +139,6 @@ source_set("browser") { "//components/performance_manager/scenario_api", "//components/power_monitor", "//components/services/filesystem:lib", @@ -152,7 +152,7 @@ "//components/services/storage/dom_storage:local_storage_proto", --- a/content/browser/file_system_access/file_system_access_safe_move_helper.cc +++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc -@@ -13,7 +13,6 @@ +@@ -14,7 +14,6 @@ #include "base/task/thread_pool.h" #include "base/thread_annotations.h" #include "build/build_config.h" @@ -160,7 +160,7 @@ #include "content/browser/file_system_access/features.h" #include "content/browser/file_system_access/file_system_access_error.h" #include "content/public/browser/content_browser_client.h" -@@ -229,22 +228,9 @@ void FileSystemAccessSafeMoveHelper::Did +@@ -231,22 +230,9 @@ void FileSystemAccessSafeMoveHelper::Did // not exist anymore. In case of error, the source file URL will point to a // valid filesystem location. base::OnceCallback result_callback; @@ -183,7 +183,7 @@ manager_->DoFileSystemOperation( FROM_HERE, &storage::FileSystemOperationRunner::Move, std::move(result_callback), source_url(), dest_url(), options_, -@@ -261,7 +247,6 @@ void FileSystemAccessSafeMoveHelper::Did +@@ -263,7 +249,6 @@ void FileSystemAccessSafeMoveHelper::Did void FileSystemAccessSafeMoveHelper::DidFileDoQuarantine( const storage::FileSystemURL& target_url, const GURL& referrer_url, @@ -191,7 +191,7 @@ base::File::Error result) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -292,40 +277,9 @@ void FileSystemAccessSafeMoveHelper::Did +@@ -294,40 +279,9 @@ void FileSystemAccessSafeMoveHelper::Did referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS() ? referrer_url : GURL(); diff --git a/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch b/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch index e4ec265d..cd9e9292 100644 --- a/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch +++ b/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/browser_features.cc +++ b/chrome/browser/browser_features.cc -@@ -54,7 +54,7 @@ BASE_FEATURE(kBookmarkTriggerForPreconne +@@ -60,7 +60,7 @@ BASE_FEATURE(kBookmarkTriggerForPrefetch // switch. BASE_FEATURE(kCertificateTransparencyAskBeforeEnabling, "CertificateTransparencyAskBeforeEnabling", 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 fc58074f..a4a00b63 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 -@@ -611,11 +611,6 @@ int GetContentRestrictions(const Browser +@@ -629,11 +629,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; } -@@ -1938,8 +1933,7 @@ bool CanSavePage(const Browser* browser) +@@ -1992,8 +1987,7 @@ bool CanSavePage(const Browser* browser) policy::DownloadRestriction::ALL_FILES) { return false; } @@ -23,7 +23,7 @@ + return true; } - void Print(Browser* browser) { + void Print(BrowserWindowInterface* bwi) { --- a/components/offline_pages/core/offline_page_model.cc +++ b/components/offline_pages/core/offline_page_model.cc @@ -21,7 +21,7 @@ OfflinePageModel::SavePageParams::~SaveP 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 401aa9d0..c3aa935a 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 @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -222,12 +222,10 @@ TabStripRegionView::TabStripRegionView(s +@@ -304,12 +304,10 @@ TabStripRegionView::TabStripRegionView(s new_tab_button_->GetViewAccessibility().SetName( l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB)); @@ -15,7 +15,7 @@ reserved_grab_handle_space_ = --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -2273,8 +2273,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2269,8 +2269,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { @@ -24,7 +24,7 @@ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); CHECK(clipboard) << "Clipboard instance is not available, cannot proceed with " -@@ -2285,7 +2283,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2281,7 +2279,6 @@ void TabStrip::NewTabButtonPressed(const if (!clipboard_text.empty()) { controller_->CreateNewTabWithLocation(clipboard_text); } diff --git a/patches/extra/ungoogled-chromium/fix-distilled-icons.patch b/patches/extra/ungoogled-chromium/fix-distilled-icons.patch index 3cd56cb4..8cd42a91 100644 --- a/patches/extra/ungoogled-chromium/fix-distilled-icons.patch +++ b/patches/extra/ungoogled-chromium/fix-distilled-icons.patch @@ -1,6 +1,6 @@ ---- a/components/dom_distiller/core/css/distilledpage.css -+++ b/components/dom_distiller/core/css/distilledpage.css -@@ -28,6 +28,11 @@ +--- a/components/dom_distiller/core/css/distilledpage_common.css ++++ b/components/dom_distiller/core/css/distilledpage_common.css +@@ -26,6 +26,11 @@ box-sizing: border-box; } diff --git a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch index 90fb4623..a50d1258 100644 --- a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch +++ b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch @@ -2,7 +2,7 @@ # --- a/components/omnibox/common/omnibox_features.cc +++ b/components/omnibox/common/omnibox_features.cc -@@ -288,7 +288,7 @@ BASE_FEATURE(kOmniboxSiteSearch, "Omnibo +@@ -291,7 +291,7 @@ BASE_FEATURE(kOmniboxSiteSearch, "Omnibo // Enables additional site search providers for the Site search Starter Pack. BASE_FEATURE(kStarterPackExpansion, "StarterPackExpansion", diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 78c1a1cc..36d703d8 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -34,7 +34,7 @@ --- a/chrome/app/settings_chromium_strings.grdp +++ b/chrome/app/settings_chromium_strings.grdp -@@ -385,13 +385,13 @@ Chromium understands forms better and ca +@@ -401,13 +401,13 @@ Chromium understands forms better and ca @@ -53,7 +53,7 @@ --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -1058,7 +1058,7 @@ +@@ -1067,7 +1067,7 @@ Active site @@ -62,7 +62,7 @@ Power -@@ -1082,7 +1082,7 @@ +@@ -1091,7 +1091,7 @@ Inactive tabs appearance @@ -71,7 +71,7 @@ Tab hover preview card appearance -@@ -1094,7 +1094,7 @@ +@@ -1103,7 +1103,7 @@ Performance issue alerts @@ -295,7 +295,7 @@ // --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -52,15 +52,6 @@ +@@ -39,15 +39,6 @@ label="$i18n{clearBrowsingData}" sub-label="$i18n{clearBrowsingDataDescription}" on-click="onClearBrowsingDataClick_"> @@ -321,7 +321,7 @@ import './privacy_page.js'; import {PrefsMixin} from '/shared/settings/prefs/prefs_mixin.js'; -@@ -104,13 +103,6 @@ export class SettingsPrivacyPageIndexEle +@@ -158,13 +157,6 @@ export class SettingsPrivacyPageIndexEle private getDefaultViews_(): string[] { const defaultViews = ['old']; @@ -335,7 +335,7 @@ return defaultViews; } -@@ -231,7 +223,6 @@ export class SettingsPrivacyPageIndexEle +@@ -335,7 +327,6 @@ export class SettingsPrivacyPageIndexEle this.showPrivacyGuidePromo_ = false; return; } @@ -407,7 +407,7 @@ void RecentTabsSubMenuModel::BuildLocalEntries() { --- a/chrome/browser/ui/toolbar/app_menu_model.cc +++ b/chrome/browser/ui/toolbar/app_menu_model.cc -@@ -959,16 +959,6 @@ void ExtensionsMenuModel::Build(Browser* +@@ -960,16 +960,6 @@ void ExtensionsMenuModel::Build(Browser* SetElementIdentifierAt( GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(), kManageExtensionsMenuItem); @@ -461,7 +461,7 @@ void CookieControlsContentView::SetCookiesRowVisible(bool visible) { --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc -@@ -160,9 +160,6 @@ SadTabView::SadTabView(content::WebConte +@@ -159,9 +159,6 @@ SadTabView::SadTabView(content::WebConte // There is currently no good way to handle kEnd alignment for a single // element. actions_container->SetLayoutManagerUseConstrainedSpace(false); @@ -471,7 +471,7 @@ action_button_ = actions_container->AddChildView(std::make_unique( base::BindRepeating(&SadTabView::PerformAction, -@@ -263,22 +260,6 @@ void SadTabView::AttachToWebView() { +@@ -262,22 +259,6 @@ void SadTabView::AttachToWebView() { } } @@ -496,7 +496,7 @@ // Specify the maximum message and title width explicitly. --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -986,40 +986,20 @@ void AddPerformanceStrings(content::WebU +@@ -972,40 +972,20 @@ void AddPerformanceStrings(content::WebU IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_SUBTITLE}, {"performanceInterventionEnabledLabel", IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_LABEL}, @@ -546,7 +546,7 @@ html_source->AddString( "tabDiscardTimerFiveMinutes", -@@ -1065,11 +1045,6 @@ void AddPerformanceStrings(content::WebU +@@ -1051,11 +1031,6 @@ void AddPerformanceStrings(content::WebU base::NumberToString16( performance_manager::user_tuning::BatterySaverModeManager:: kLowBatteryThresholdPercent))); @@ -558,7 +558,7 @@ html_source->AddString("discardRingTreatmentLearnMoreUrl", chrome::kDiscardRingTreatmentLearnMoreUrl); -@@ -3585,7 +3560,7 @@ void AddSiteSettingsStrings(content::Web +@@ -3533,7 +3508,7 @@ void AddSiteSettingsStrings(content::Web base::FeatureList::IsEnabled(blink::features::kWebPrinting)); html_source->AddBoolean("enableFederatedIdentityApiContentSetting", @@ -569,7 +569,7 @@ html_source->AddBoolean( --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -598,27 +598,20 @@ SettingsUI::SettingsUI(content::WebUI* w +@@ -576,27 +576,20 @@ SettingsUI::SettingsUI(content::WebUI* w ->UserIsActivePasswordChangeUser()}, }; @@ -603,12 +603,12 @@ html_source->AddBoolean( --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -905,7 +905,7 @@ BASE_FEATURE(kOnDeviceWebSpeech, - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -773,7 +773,7 @@ BASE_FEATURE(OnDeviceWebSpeech, + ); // Enables the Live Caption feature on supported devices. --BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_ENABLED_BY_DEFAULT); -+BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_DISABLED_BY_DEFAULT); +-BASE_FEATURE(LiveCaption, base::FEATURE_ENABLED_BY_DEFAULT); ++BASE_FEATURE(LiveCaption, base::FEATURE_DISABLED_BY_DEFAULT); // Logs a DumpWithoutCrashing() call each time the Speech On-Device API (SODA) // fails to load. Used to diagnose issues when rolling out new versions of the diff --git a/patches/upstream-fixes/glue_core_pools.patch b/patches/upstream-fixes/glue_core_pools.patch index 602e738e..5d10d496 100644 --- a/patches/upstream-fixes/glue_core_pools.patch +++ b/patches/upstream-fixes/glue_core_pools.patch @@ -3,7 +3,7 @@ # This removes the remaining references needed to build --- a/base/allocator/partition_allocator/partition_alloc.gni +++ b/base/allocator/partition_allocator/partition_alloc.gni -@@ -244,9 +244,6 @@ declare_args() { +@@ -234,9 +234,6 @@ declare_args() { force_enable_raw_ptr_exclusion = false } diff --git a/patches/upstream-fixes/missing-dependencies.patch b/patches/upstream-fixes/missing-dependencies.patch index 4a85cb15..8afc90ce 100644 --- a/patches/upstream-fixes/missing-dependencies.patch +++ b/patches/upstream-fixes/missing-dependencies.patch @@ -1,3 +1,13 @@ +--- a/chrome/browser/chrome_content_browser_client.cc ++++ b/chrome/browser/chrome_content_browser_client.cc +@@ -324,6 +324,7 @@ + #include "content/public/browser/internal_webui_config.h" + #include "content/public/browser/isolated_web_apps_policy.h" + #include "content/public/browser/legacy_tech_cookie_issue_details.h" ++#include "content/public/browser/navigation_entry.h" + #include "content/public/browser/navigation_handle.h" + #include "content/public/browser/network_service_instance.h" + #include "content/public/browser/overlay_window.h" --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc @@ -21,6 +21,7 @@ @@ -10,7 +20,7 @@ --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1025,6 +1025,7 @@ source_set("extensions") { +@@ -1030,6 +1030,7 @@ source_set("extensions") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser/web_ui", @@ -20,7 +30,7 @@ "//components/services/app_service", --- a/chrome/browser/ui/safety_hub/revoked_permissions_service.cc +++ b/chrome/browser/ui/safety_hub/revoked_permissions_service.cc -@@ -20,6 +20,7 @@ +@@ -18,6 +18,7 @@ #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/engagement/site_engagement_service_factory.h" @@ -30,14 +40,14 @@ #include "chrome/browser/ui/safety_hub/safety_hub_service.h" --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -525,6 +525,7 @@ static_library("url_constants") { +@@ -526,6 +526,7 @@ static_library("url_constants") { "//components/optimization_guide/optimization_guide_internals/webui:url_constants", "//components/password_manager/content/common", "//components/safe_browsing/core/common", + "//components/supervised_user/core/common:buildflags", "//device/vr/buildflags", ] - } + --- a/components/component_updater/installer_policies/BUILD.gn +++ b/components/component_updater/installer_policies/BUILD.gn @@ -53,6 +53,7 @@ static_library("installer_policies_no_co @@ -50,7 +60,7 @@ # Disallow depending on content. --- a/components/plus_addresses/BUILD.gn +++ b/components/plus_addresses/BUILD.gn -@@ -127,6 +127,7 @@ source_set("plus_addresses") { +@@ -58,6 +58,7 @@ source_set("plus_addresses") { "//net", "//services/data_decoder/public/cpp", "//services/network/public/cpp", @@ -60,9 +70,9 @@ public_deps = [ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -119,6 +119,7 @@ source_set("browser") { - "//components/filename_generation", +@@ -120,6 +120,7 @@ source_set("browser") { "//components/fingerprinting_protection_filter/interventions/common:features", + "//components/history/core/browser:features", "//components/input", + "//components/lens:buildflags", "//components/language/core/common", diff --git a/pruning.list b/pruning.list index 2d1b72ec..256bba64 100644 --- a/pruning.list +++ b/pruning.list @@ -1516,7 +1516,6 @@ sql/test/data/recovery_387868 testing/libfuzzer/fuzzers/flatbuffers_corpus/monsterdata_test.mon testing/libfuzzer/fuzzers/woff2_corpus/6df91fe5cbca947ae7b7b43d4cd4a861213fae9f testing/libfuzzer/fuzzers/woff2_corpus/fd14c502730b85e8b9c078ecd5b309d1e6c0a6d1 -testing/scripts/variations_smoke_test_data/webview_test_seed third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/Africa/Abidjan third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/Africa/Accra third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/Africa/Addis_Ababa @@ -2139,7 +2138,6 @@ third_party/afl/src/testcases/multimedia/h264/small_movie.mp4 third_party/afl/src/testcases/others/pcap/small_capture.pcap third_party/android_build_tools/gradle_wrapper/gradle/wrapper/gradle-wrapper.jar third_party/android_build_tools/lint/custom_lint.jar -third_party/android_sdk/xr_extensions/com.android.extensions.xr.jar third_party/angle/samples/multi_texture/basemap.tga third_party/angle/samples/multi_texture/lightmap.tga third_party/angle/samples/particle_system/smoke.tga @@ -8026,6 +8024,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/basi third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/basic.json.gz third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/byte-efficiency.json.gz third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/changing-priority.json.gz +third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/chrome-ext-sourcemap-script-content.json.gz third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-cluster-max-duration.json.gz third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-cluster-max-timeout.json.gz third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-cluster-navigation.json.gz @@ -8182,6 +8181,9 @@ third_party/devtools-frontend/src/third_party/image_diff/mac/libbase.dylib third_party/devtools-frontend/src/third_party/image_diff/mac/libc++.dylib third_party/devtools-frontend/src/third_party/image_diff/mac/libchrome_zlib.dylib third_party/devtools-frontend/src/third_party/image_diff/win32/image_diff.exe +third_party/federated_compute/src/fcp/client/engine/data/join_model.flatbuffer +third_party/federated_compute/src/fcp/client/engine/data/length_model.flatbuffer +third_party/federated_compute/src/fcp/client/rust/testdata/endorsement.json.sig third_party/ffmpeg/tests/reference.pnm third_party/flatbuffers/src/android/gradle/wrapper/gradle-wrapper.jar third_party/flatbuffers/src/dart/test/monsterdata_test.mon @@ -10764,6 +10766,24 @@ third_party/nasm/travis/test/xcrypt.bin.t third_party/nasm/travis/test/xpaste.bin.t third_party/nasm/travis/test/zerobyte.bin.t third_party/node/node_modules/node_modules.tar.gz +third_party/oak/src/.xtask_bash_completion.zwc +third_party/oak/src/oak_attestation_explain/testdata/rk_evidence.binarypb +third_party/oak/src/oak_attestation_verification/testdata/cb_endorsement.binarypb +third_party/oak/src/oak_attestation_verification/testdata/cb_evidence.binarypb +third_party/oak/src/oak_attestation_verification/testdata/cb_reference_values.binarypb +third_party/oak/src/oak_attestation_verification/testdata/endorsement.json.sig +third_party/oak/src/oak_attestation_verification/testdata/fake_evidence.binarypb +third_party/oak/src/oak_attestation_verification/testdata/fake_expected_values.binarypb +third_party/oak/src/oak_attestation_verification/testdata/genoa_oc_evidence.binarypb +third_party/oak/src/oak_attestation_verification/testdata/genoa_oc_reference_values.binarypb +third_party/oak/src/oak_attestation_verification/testdata/oc_evidence.binarypb +third_party/oak/src/oak_attestation_verification/testdata/oc_vcek_milan.der +third_party/oak/src/oak_attestation_verification/testdata/rk_evidence.binarypb +third_party/oak/src/oak_attestation_verification/testdata/rk_evidence_20240312.binarypb +third_party/oak/src/oak_attestation_verification/testdata/rk_vcek_milan.der +third_party/oak/src/oak_attestation_verification/testdata/vcek_genoa.der +third_party/oak/src/oak_containers/orchestrator/testdata/test_dice +third_party/oak/src/oak_functions_launcher/mock_lookup_data third_party/openh264/src/autotest/performanceTest/ios/fruitstrap third_party/openh264/src/autotest/performanceTest/ios/iFileTransfer third_party/openh264/src/res/Adobe_PDF_sample_a_1024x768_50Frms.264 @@ -11860,7 +11880,9 @@ third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_case third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-5416197367070720 third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-5801855065915392 third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-6353004288081920 +third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_enumerate_fuzzer-6470575830925312 third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_enumerate_fuzzer-6583684169269248 +third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_enumerate_fuzzer-6740380288876544 third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-json_load_fuzzer-4512865114259456 third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-json_load_fuzzer-6182254813249536 third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-json_load_fuzzer-6265355951996928 @@ -12389,6 +12411,7 @@ third_party/zlib/google/test/data/symlink_absolute_path.zip third_party/zlib/google/test/data/symlink_duplicate_link.zip third_party/zlib/google/test/data/symlink_evil_relative_path.zip third_party/zlib/google/test/data/symlink_follow_own_link.zip +third_party/zlib/google/test/data/symlink_follow_own_link_dir.zip third_party/zlib/google/test/data/symlink_too_large.zip third_party/zlib/google/test/data/symlinks.zip third_party/zlib/google/test/data/test.zip diff --git a/utils/depot_tools.patch b/utils/depot_tools.patch index f8840be5..a0a33950 100644 --- a/utils/depot_tools.patch +++ b/utils/depot_tools.patch @@ -6,6 +6,7 @@ # replace 'src' in checkout paths with the output directory # add flag to specify an allowed sysroot # ensure shallow fetches +# allow using newer httplib2 with pysocks # utilize a newer version of gsutil to support later versions of python --- a/gclient.bat +++ b/gclient.bat @@ -57,7 +58,7 @@ gcs_deps.append( GcsDependency(parent=self, name=name, -@@ -931,6 +939,8 @@ class Dependency(gclient_utils.WorkItem, +@@ -930,6 +938,8 @@ class Dependency(gclient_utils.WorkItem, self._gn_args_from = local_scope.get('gclient_gn_args_from') self._gn_args_file = local_scope.get('gclient_gn_args_file') @@ -66,7 +67,7 @@ self._gn_args = local_scope.get('gclient_gn_args', []) # It doesn't make sense to set all of these, since setting gn_args_from # to another DEPS will make gclient ignore any other local gn_args* -@@ -3983,6 +3993,7 @@ def CMDsync(parser, args): +@@ -3987,6 +3997,7 @@ def CMDsync(parser, args): default=[], help='Specify to skip processing of a certain type of ' 'dep.') @@ -113,9 +114,23 @@ self._Run(fetch_cmd, options, show_header=options.verbose, retry=True) def _SetFetchConfig(self, options): +--- a/gerrit_util.py ++++ b/gerrit_util.py +@@ -35,7 +35,10 @@ from typing import NamedTuple, List, Opt + from typing import Tuple, TypedDict, cast + + import httplib2 +-import httplib2.socks ++try: ++ import httplib2.socks ++except ModuleNotFoundError: ++ import socks + + import auth + import gclient_utils --- a/gsutil.py +++ b/gsutil.py -@@ -25,7 +25,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR, +@@ -26,7 +26,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR, IS_WINDOWS = os.name == 'nt'