diff --git a/chromium_version.txt b/chromium_version.txt index 0768e2d3..fa6cc6b8 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -95.0.4638.69 +96.0.4664.45 diff --git a/domain_substitution.list b/domain_substitution.list index c27edd95..5215d2fe 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -31,6 +31,7 @@ ash/ambient/ambient_controller_unittest.cc ash/app_list/PRESUBMIT.py ash/app_list/app_list_controller_impl_unittest.cc ash/ash_strings.grd +ash/assistant/PRESUBMIT.py ash/assistant/assistant_setup_controller.cc ash/assistant/ui/main_stage/assistant_onboarding_view_unittest.cc ash/assistant/ui/main_stage/suggestion_chip_view_unittest.cc @@ -44,14 +45,20 @@ ash/constants/ash_switches.cc ash/fast_ink/laser/laser_pointer_view.cc ash/login/ui/login_remove_account_dialog_unittest.cc ash/public/cpp/android_intent_helper_unittest.cc -ash/quick_answers/quick_answers_controller_impl.cc ash/quick_answers/quick_answers_ui_controller.cc ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc ash/quick_pair/repository/fast_pair/device_metadata_fetcher_unittest.cc +ash/quick_pair/repository/fast_pair/footprints_fetcher.cc ash/quick_pair/scanning/fast_pair/fast_pair_discoverable_scanner.h +ash/quick_pair/scanning/fast_pair/fast_pair_not_discoverable_scanner.h ash/resources/PRESUBMIT.py ash/services/quick_pair/fast_pair_decryption.cc +ash/services/quick_pair/public/cpp/account_key_filter.cc +ash/services/quick_pair/public/cpp/account_key_filter.h +ash/services/quick_pair/public/cpp/battery_notification.h +ash/services/quick_pair/public/cpp/not_discoverable_advertisement.h ash/shelf/contextual_nudge.cc +ash/shelf/launcher_nudge_controller_unittest.cc ash/shelf/shelf_controller_unittest.cc ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc ash/system/pcie_peripheral/pcie_peripheral_notification_controller_unittest.cc @@ -59,14 +66,12 @@ ash/system/phonehub/phone_hub_tray_unittest.cc ash/system/power/power_event_observer_unittest.cc ash/system/unified/user_chooser_detailed_view_controller_unittest.cc ash/webui/diagnostics_ui/resources/network_card.js -ash/webui/diagnostics_ui/resources/network_troubleshooting.js ash/webui/diagnostics_ui/resources/routine_section.js ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc ash/webui/media_app_ui/media_app_guest_ui.cc ash/webui/media_app_ui/resources/js/launch.js ash/webui/scanning/resources/scanning_app.html ash/webui/scanning/resources/scanning_app.js -ash/webui/shimless_rma/backend/shimless_rma_service.cc ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js ash/wm/screen_pinning_controller.h base/BUILD.gn @@ -137,6 +142,7 @@ base/process/memory.cc base/process/memory.h base/process/process_metrics.h base/process/process_metrics_unittest.cc +base/profiler/chrome_unwind_info_android.h base/profiler/metadata_recorder.h base/rand_util_posix.cc base/rand_util_win.cc @@ -192,6 +198,7 @@ base/win/win_util.cc base/win/win_util.h base/win/wincrypt_shim.h base/win/windows_version.h +base/win/windows_version_unittest.cc base/win/wmi.cc base/win/wmi.h build/android/PRESUBMIT.py @@ -312,12 +319,12 @@ chrome/app/media_router_strings.grdp chrome/app/nearby_share_strings.grdp chrome/app/os_settings_strings.grdp chrome/app/profiles_strings.grdp -chrome/app/protocol_handler_intent_picker_strings.grdp chrome/app/resources/locale_settings.grd chrome/app/settings_chromium_strings.grdp chrome/app/settings_google_chrome_strings.grdp chrome/app/settings_strings.grdp chrome/app/shared_settings_strings.grdp +chrome/app/supervised_user_error_page_strings.grdp chrome/app/theme/PRESUBMIT.py chrome/app/welcome_strings.grdp chrome/browser/about_flags.cc @@ -338,7 +345,6 @@ chrome/browser/android/explore_sites/ntp_json_fetcher_unittest.cc chrome/browser/android/explore_sites/record_site_click_task_unittest.cc chrome/browser/android/explore_sites/url_util.cc chrome/browser/android/explore_sites/url_util_experimental.cc -chrome/browser/android/feed/v2/feed_reliability_logging_bridge.cc chrome/browser/android/history/history_deletion_bridge_unittest.cc chrome/browser/android/history_report/delta_file_commons_unittest.cc chrome/browser/android/search_permissions/search_permissions_service.h @@ -347,8 +353,9 @@ chrome/browser/android/signin/signin_manager_android_unittest.cc chrome/browser/android/signin/web_signin_bridge_unittest.cc chrome/browser/android/tab_android.cc chrome/browser/android/vr/PRESUBMIT.py -chrome/browser/apps/app_service/app_icon_factory.cc -chrome/browser/apps/app_service/app_service_metrics.cc +chrome/browser/apps/app_service/app_icon_loader.cc +chrome/browser/apps/app_service/app_service_metrics.h +chrome/browser/apps/app_service/intent_util_unittest.cc chrome/browser/apps/app_service/web_contents_app_id_utils.h chrome/browser/apps/app_service/webapk/webapk_install_task.cc chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc @@ -362,7 +369,11 @@ chrome/browser/ash/accessibility/accessibility_live_site_browsertest.cc chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc chrome/browser/ash/accessibility/select_to_speak_browsertest.cc chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller_unittest.cc +chrome/browser/ash/android_sms/android_sms_urls.cc +chrome/browser/ash/android_sms/android_sms_urls.h chrome/browser/ash/app_mode/fake_cws.cc +chrome/browser/ash/app_restore/arc_ghost_window_view_unittest.cc +chrome/browser/ash/app_restore/full_restore_service_unittest.cc chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc chrome/browser/ash/apps/apk_web_app_installer_unittest.cc chrome/browser/ash/arc/arc_util_unittest.cc @@ -373,6 +384,7 @@ chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.h chrome/browser/ash/arc/enterprise/arc_data_snapshotd_delegate_unittest.cc chrome/browser/ash/arc/file_system_watcher/file_system_scanner.h +chrome/browser/ash/arc/instance_throttle/arc_kiosk_mode_throttle_observer_unittest.cc chrome/browser/ash/arc/intent_helper/arc_external_protocol_dialog_unittest.cc chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc chrome/browser/ash/arc/policy/arc_policy_util.h @@ -394,8 +406,11 @@ chrome/browser/ash/child_accounts/child_user_service.cc chrome/browser/ash/child_accounts/family_user_device_metrics_browsertest.cc chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc chrome/browser/ash/child_accounts/secondary_account_consent_logger_unittest.cc +chrome/browser/ash/child_accounts/time_limits/app_time_limit_utils_unittest.cc chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html +chrome/browser/ash/chrome_content_browser_client_ash_part_unittest.cc chrome/browser/ash/crosapi/browser_util_unittest.cc +chrome/browser/ash/crosapi/network_settings_translation_unittest.cc chrome/browser/ash/crostini/crostini_installer.h chrome/browser/ash/crostini/crostini_simple_types.h chrome/browser/ash/crostini/crostini_util.cc @@ -414,10 +429,8 @@ chrome/browser/ash/file_manager/file_tasks.h chrome/browser/ash/file_manager/path_util_unittest.cc chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h chrome/browser/ash/first_run/drive_first_run_controller.cc -chrome/browser/ash/full_restore/arc_ghost_window_view_unittest.cc -chrome/browser/ash/full_restore/full_restore_service_unittest.cc chrome/browser/ash/hats/hats_dialog.cc -chrome/browser/ash/input_method/assistive_suggester.cc +chrome/browser/ash/input_method/assistive_suggester_client_filter.cc chrome/browser/ash/kerberos/kerberos_credentials_manager_test.cc chrome/browser/ash/login/app_mode/kiosk_browsertest.cc chrome/browser/ash/login/app_mode/kiosk_launch_controller_browsertest.cc @@ -455,6 +468,18 @@ chrome/browser/ash/login/test/login_manager_mixin.cc chrome/browser/ash/login/test/login_manager_mixin.h chrome/browser/ash/login/ui/captive_portal_view.cc chrome/browser/ash/login/users/multi_profile_user_controller_unittest.cc +chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc +chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc +chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc +chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.cc +chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc +chrome/browser/ash/net/network_diagnostics/http_request_manager.h +chrome/browser/ash/net/network_diagnostics/http_request_manager_unittest.cc +chrome/browser/ash/net/network_diagnostics/network_diagnostics_unittest.cc +chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.cc +chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h +chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.cc +chrome/browser/ash/net/network_portal_detector_impl_browsertest.cc chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc chrome/browser/ash/plugin_vm/plugin_vm_installer_unittest.cc chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc @@ -470,6 +495,7 @@ chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_unittest.cc chrome/browser/ash/policy/core/user_cloud_policy_store_ash_unittest.cc chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder_unittest.cc chrome/browser/ash/policy/dlp/data_transfer_dlp_controller_browsertest.cc +chrome/browser/ash/policy/dlp/dlp_clipboard_bubble_constants.h chrome/browser/ash/policy/dlp/dlp_content_manager_browsertest.cc chrome/browser/ash/policy/dlp/dlp_content_tab_helper_unittest.cc chrome/browser/ash/policy/dlp/dlp_rules_manager_impl_unittest.cc @@ -481,6 +507,7 @@ chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.c chrome/browser/ash/policy/reporting/extension_install_event_logger_unittest.cc chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc +chrome/browser/ash/policy/status_collector/legacy_device_status_collector_browsertest.cc chrome/browser/ash/policy/status_collector/status_collector.h chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc chrome/browser/ash/policy/uploading/status_uploader_unittest.cc @@ -490,15 +517,21 @@ chrome/browser/ash/power/auto_screen_brightness/modeller_impl_unittest.cc chrome/browser/ash/power/ml/smart_dim/ml_agent_unittest.cc chrome/browser/ash/printing/specifics_translation_unittest.cc chrome/browser/ash/printing/synced_printers_manager_unittest.cc +chrome/browser/ash/proxy_config_service_impl_unittest.cc chrome/browser/ash/release_notes/release_notes_notification_unittest.cc chrome/browser/ash/release_notes/release_notes_storage_unittest.cc chrome/browser/ash/scanning/chrome_scanning_app_delegate_unittest.cc +chrome/browser/ash/scheduler_configuration_manager.h chrome/browser/ash/settings/cros_settings_unittest.cc chrome/browser/ash/settings/device_settings_provider_unittest.cc chrome/browser/ash/smb_client/smb_service_helper.h -chrome/browser/ash/sync/turn_sync_on_helper_unittest.cc +chrome/browser/ash/sync/ash_turn_sync_on_helper_unittest.cc +chrome/browser/ash/system_token_cert_db_initializer.h +chrome/browser/ash/tpm_firmware_update.h +chrome/browser/ash/u2f_notification.cc chrome/browser/ash/web_applications/help_app/help_app_discover_tab_notification_unittest.cc chrome/browser/ash/web_applications/help_app/help_app_notification_controller_unittest.cc +chrome/browser/ash/web_applications/terminal_source.cc chrome/browser/autocomplete/autocomplete_browsertest.cc chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier_unittest.cc @@ -552,34 +585,17 @@ chrome/browser/chrome_content_browser_client_unittest.cc chrome/browser/chrome_main_browsertest.cc chrome/browser/chrome_navigation_browsertest.cc chrome/browser/chrome_web_platform_security_metrics_browsertest.cc -chrome/browser/chromeos/android_sms/android_sms_urls.cc -chrome/browser/chromeos/android_sms/android_sms_urls.h -chrome/browser/chromeos/chrome_content_browser_client_chromeos_part_unittest.cc chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +chrome/browser/chromeos/extensions/file_manager/system_notification_manager_unittest.cc chrome/browser/chromeos/extensions/permissions_updater_delegate_chromeos_unittest.cc -chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc +chrome/browser/chromeos/extensions/telemetry/api/base_telemetry_extension_api_guard_function_browsertest.cc chrome/browser/chromeos/extensions/telemetry/api/base_telemetry_extension_browser_test.cc +chrome/browser/chromeos/extensions/telemetry/chromeos_permission_messages_unittest.cc chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc -chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.cc -chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc -chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.cc -chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine.cc -chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc -chrome/browser/chromeos/net/network_diagnostics/http_request_manager.h -chrome/browser/chromeos/net/network_diagnostics/http_request_manager_unittest.cc -chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_unittest.cc -chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc -chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h -chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.cc -chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc chrome/browser/chromeos/platform_keys/key_permissions/key_permissions_manager_impl.cc -chrome/browser/chromeos/proxy_config_service_impl_unittest.cc -chrome/browser/chromeos/scheduler_configuration_manager.h -chrome/browser/chromeos/system_token_cert_db_initializer.h -chrome/browser/chromeos/tpm_firmware_update.h -chrome/browser/chromeos/u2f_notification.cc +chrome/browser/client_hints/client_hints_browsertest.cc chrome/browser/complex_tasks/task_tab_helper_unittest.cc chrome/browser/component_updater/recovery_component_installer.cc chrome/browser/content_settings/content_settings_default_provider_unittest.cc @@ -619,6 +635,7 @@ chrome/browser/enterprise/connectors/device_trust/device_trust_browsertest.cc chrome/browser/enterprise/connectors/file_system/box_api_call_flow.cc chrome/browser/enterprise/connectors/file_system/box_api_call_flow_unittest.cc chrome/browser/enterprise/connectors/file_system/box_uploader.cc +chrome/browser/enterprise/connectors/file_system/browsertest_helper.cc chrome/browser/enterprise/connectors/file_system/rename_handler_unittest.cc chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc chrome/browser/enterprise/connectors/reporting/reporting_service_settings_unittest.cc @@ -626,8 +643,8 @@ chrome/browser/enterprise/connectors/service_provider_config_unittest.cc chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc chrome/browser/enterprise/reporting/extension_request/extension_request_notification_unittest.cc chrome/browser/enterprise/reporting/extension_request/extension_request_observer_unittest.cc -chrome/browser/enterprise/signals/context_info_fetcher.cc chrome/browser/enterprise/signals/device_info_fetcher_win.cc +chrome/browser/enterprise/signals/signals_utils.cc chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc chrome/browser/error_reporting/chrome_js_error_report_processor_unittest.cc chrome/browser/extensions/active_tab_apitest.cc @@ -683,6 +700,7 @@ chrome/browser/extensions/api/platform_keys/platform_keys_api.cc chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc chrome/browser/extensions/api/printing/printing_api_utils.h chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc +chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_unittest.cc chrome/browser/extensions/api/runtime/runtime_apitest.cc chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc chrome/browser/extensions/api/scripting/scripting_apitest.cc @@ -749,6 +767,7 @@ chrome/browser/extensions/updater/extension_updater_unittest.cc chrome/browser/extensions/user_script_listener_unittest.cc chrome/browser/federated_learning/floc_remote_permission_service.cc chrome/browser/federated_learning/floc_remote_permission_service_unittest.cc +chrome/browser/feed/android/feed_reliability_logging_bridge.cc chrome/browser/feedback/show_feedback_page.cc chrome/browser/feedback/system_logs/log_sources/crash_ids_source.cc chrome/browser/first_run/first_run_unittest.cc @@ -771,9 +790,12 @@ chrome/browser/importer/firefox_profile_lock_win.cc chrome/browser/importer/ie_importer_browsertest_win.cc chrome/browser/importer/profile_writer_unittest.cc chrome/browser/installable/installable_manager_browsertest.cc +chrome/browser/lacros/account_manager/account_profile_mapper_unittest.cc +chrome/browser/lacros/app_mode/kiosk_session_service_browsertest.cc chrome/browser/lacros/browser_service_lacros.cc chrome/browser/lacros/browser_service_lacros_browsertest.cc chrome/browser/lacros/lacros_startup_infobar_delegate.cc +chrome/browser/lacros/net/network_settings_translation_unittest.cc chrome/browser/lifetime/switch_utils_unittest.cc chrome/browser/local_discovery/service_discovery_client_mac.mm chrome/browser/login_detection/password_store_sites_browsertest.cc @@ -887,7 +909,6 @@ chrome/browser/password_manager/password_manager_browsertest.cc chrome/browser/password_manager/password_manager_signin_intercept_test_helper.cc chrome/browser/password_manager/password_manager_util_win.cc chrome/browser/payments/android_payment_app_factory_browsertest.cc -chrome/browser/payments/hybrid_request_skip_ui_browsertest.cc chrome/browser/payments/journey_logger_browsertest.cc chrome/browser/payments/manifest_verifier_browsertest.cc chrome/browser/payments/payment_request_app_store_billing_browsertest.cc @@ -905,7 +926,6 @@ chrome/browser/permissions/permissions_security_model_interactive_uitest.cc chrome/browser/platform_keys/extension_key_permissions_service.cc chrome/browser/platform_keys/extension_platform_keys_service.cc chrome/browser/platform_util_win.cc -chrome/browser/plugins/flash_temporary_permission_tracker_unittest.cc chrome/browser/plugins/plugins_resource_service.cc chrome/browser/policy/cloud/cloud_policy_browsertest.cc chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc @@ -1008,6 +1028,7 @@ chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_ chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_unittest.js chrome/browser/resources/chromeos/accessibility/select_to_speak_manifest.json.jinja2 chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp +chrome/browser/resources/chromeos/accessibility/switch_access/item_scan_manager_test.js chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js chrome/browser/resources/chromeos/accessibility/switch_access/switch_access_predicate_test.js chrome/browser/resources/chromeos/accessibility/switch_access_manifest.json.jinja2 @@ -1025,9 +1046,10 @@ chrome/browser/resources/chromeos/emoji_picker/icons.html chrome/browser/resources/chromeos/emulator/icons.html chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json chrome/browser/resources/chromeos/login/arc_terms_of_service.js +chrome/browser/resources/chromeos/login/consolidated_consent.js chrome/browser/resources/chromeos/login/debug/debug.js -chrome/browser/resources/chromeos/login/marketing_opt_in.html chrome/browser/resources/chromeos/login/oobe.js +chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html chrome/browser/resources/chromeos/login/screens/login/encryption_migration.js chrome/browser/resources/chromeos/login/screens/login/offline_login.html chrome/browser/resources/chromeos/login/screens/login/offline_login.js @@ -1067,6 +1089,7 @@ chrome/browser/resources/network_speech_synthesis/tts_extension.js chrome/browser/resources/new_tab_page/doodle_share_dialog.js chrome/browser/resources/new_tab_page/modules/drive/module.js chrome/browser/resources/new_tab_page/modules/drive_v2/module.js +chrome/browser/resources/new_tab_page/modules/photos/module.html chrome/browser/resources/new_tab_page/voice_search_overlay.js chrome/browser/resources/omnibox/omnibox.html chrome/browser/resources/omnibox/omnibox_output.js @@ -1075,10 +1098,7 @@ chrome/browser/resources/plugin_metadata/plugins_chromeos.json chrome/browser/resources/plugin_metadata/plugins_linux.json chrome/browser/resources/plugin_metadata/plugins_mac.json chrome/browser/resources/plugin_metadata/plugins_win.json -chrome/browser/resources/print_preview/cloud_print_interface.js -chrome/browser/resources/print_preview/data/destination_store.js chrome/browser/resources/print_preview/ui/icons.html -chrome/browser/resources/settings/a11y_page/a11y_page.js chrome/browser/resources/settings/about_page/about_page.html chrome/browser/resources/settings/chromeos/PRESUBMIT.py chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_device_list_item.js @@ -1095,7 +1115,6 @@ chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js chrome/browser/resources/settings/chromeos/os_people_page/os_sync_controls.js chrome/browser/resources/settings/chromeos/os_people_page/users_add_user_dialog.js chrome/browser/resources/settings/icons.html -chrome/browser/resources/settings/languages_page/edit_dictionary_page.js chrome/browser/resources/settings/settings_shared_css.html chrome/browser/resources/usb_internals/descriptor_panel.js chrome/browser/resources/webstore_app/manifest.json @@ -1147,6 +1166,7 @@ chrome/browser/sessions/session_service.h chrome/browser/sessions/session_service_base.cc chrome/browser/sessions/session_service_unittest.cc chrome/browser/share/default_ranking_android.cc +chrome/browser/share/share_submenu_model_unittest.cc chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc chrome/browser/sharing/vapid_key_manager.h @@ -1182,7 +1202,6 @@ chrome/browser/subresource_filter/subresource_filter_browsertest.cc chrome/browser/subresource_redirect/origin_robots_rules_unittest.cc chrome/browser/subresource_redirect/subresource_redirect_util.cc chrome/browser/subresource_redirect/subresource_redirect_util_unit_test.cc -chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc chrome/browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc chrome/browser/supervised_user/child_accounts/kids_management_api.cc chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc @@ -1228,7 +1247,6 @@ chrome/browser/tab/web_contents_state.cc chrome/browser/tab_contents/navigation_metrics_recorder_browsertest.cc chrome/browser/task_manager/sampling/shared_sampler_win_defines.h chrome/browser/themes/theme_syncable_service.cc -chrome/browser/tracing/crash_service_uploader.cc chrome/browser/translate/translate_manager_browsertest.cc chrome/browser/translate/translate_manager_render_view_host_android_unittest.cc chrome/browser/translate/translate_manager_render_view_host_unittest.cc @@ -1282,8 +1300,6 @@ chrome/browser/ui/cocoa/applescript/window_applescript_test.mm chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm -chrome/browser/ui/cocoa/screentime/history_bridge_unittest.cc -chrome/browser/ui/cocoa/screentime/screentime_tab_helper_unittest.mm chrome/browser/ui/cocoa/share_menu_controller.mm chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm chrome/browser/ui/commander/open_url_command_source.cc @@ -1317,6 +1333,8 @@ chrome/browser/ui/pdf/adobe_reader_info_win.cc chrome/browser/ui/search/ntp_user_data_logger_unittest.cc chrome/browser/ui/search/search_tab_helper.h chrome/browser/ui/search/third_party_ntp_browsertest.cc +chrome/browser/ui/side_search/side_search_side_contents_helper_unittest.cc +chrome/browser/ui/side_search/side_search_tab_contents_helper_unittest.cc chrome/browser/ui/signin_reauth_view_controller_browsertest.cc chrome/browser/ui/signin_view_controller.cc chrome/browser/ui/signin_view_controller_interactive_uitest.cc @@ -1376,6 +1394,7 @@ chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc chrome/browser/ui/views/session_crashed_bubble_view.cc chrome/browser/ui/views/sharing/click_to_call_browsertest.cc chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc +chrome/browser/ui/views/side_search/side_search_browser_controller_browsertest.cc chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc @@ -1390,9 +1409,11 @@ chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.cc chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui_browsertest.cc chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc chrome/browser/ui/webui/chromeos/edu_coexistence/edu_coexistence_login_handler_chromeos.cc +chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.h chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc +chrome/browser/ui/webui/chromeos/parent_access/parent_access_ui.cc chrome/browser/ui/webui/chromeos/sync/os_sync_handler_unittest.cc chrome/browser/ui/webui/components/components_handler.cc chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc @@ -1524,6 +1545,8 @@ chrome/chrome_elf/third_party_dlls/main.h chrome/common/apps/platform_apps/api/PRESUBMIT.py chrome/common/chrome_features.cc chrome/common/chrome_switches.cc +chrome/common/chromeos/extensions/chromeos_system_extension_info.cc +chrome/common/chromeos/extensions/chromeos_system_extension_info_unittest.cc chrome/common/cloud_print/cloud_print_constants.cc chrome/common/cloud_print/cloud_print_helpers_unittest.cc chrome/common/conflicts/module_watcher_win.cc @@ -1767,6 +1790,7 @@ chrome/updater/constants.h chrome/updater/crash_reporter.cc chrome/updater/external_constants_builder_unittest.cc chrome/updater/external_constants_override_unittest.cc +chrome/updater/mac/setup/keystone_unittest.cc chrome/updater/test/service/win/ui.py chrome/updater/tools/PRESUBMIT.py chrome/updater/tools/certificate_tag.cc @@ -1833,13 +1857,13 @@ chromeos/components/proximity_auth/proximity_auth_system_unittest.cc chromeos/components/proximity_auth/proximity_monitor_impl_unittest.cc chromeos/components/string_matching/tokenized_string_unittest.cc chromeos/components/trial_group/trial_group_checker.cc -chromeos/crosapi/mojom/app_service_types_traits_unittest.cc chromeos/cryptohome/userdataauth_util.cc chromeos/dbus/arc/arc_obb_mounter_client.h chromeos/dbus/biod/fake_biod_client_unittest.cc chromeos/dbus/debug_daemon/debug_daemon_client.h chromeos/dbus/dlcservice/dlcservice_client.h chromeos/dbus/permission_broker/permission_broker_client.h +chromeos/dbus/rmad/fake_rmad_client.cc chromeos/geolocation/simple_geolocation_provider.cc chromeos/hugepage_text/hugepage_text.cc chromeos/hugepage_text/hugepage_text.h @@ -1889,10 +1913,10 @@ chromeos/tpm/tpm_token_info_getter_unittest.cc cloud_print/virtual_driver/win/install/setup.cc cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd cloud_print/virtual_driver/win/port_monitor/port_monitor.cc -components/about_ui/resources/about_credits.js components/account_manager_core/account_manager_facade_impl_unittest.cc components/account_manager_core/chromeos/account_manager_unittest.cc components/android_system_error_page/error_page_populator.cc +components/app_restore/full_restore_info_unittest.cc components/arc/arc_util.h components/arc/intent_helper/arc_intent_helper_bridge_unittest.cc components/arc/intent_helper/link_handler_model_unittest.cc @@ -2002,6 +2026,7 @@ components/components_google_chrome_strings.grd components/content_creation/notes/core/server/notes_repository.cc components/content_creation/notes/core/server/notes_server_base.cc components/content_creation/notes/core/templates/template_constants.cc +components/content_creation/reactions/core/reaction_list_factory.cc components/content_settings/browser/page_specific_content_settings_unittest.cc components/content_settings/core/browser/content_settings_provider_unittest.cc components/content_settings/core/common/content_settings_pattern.cc @@ -2022,7 +2047,6 @@ components/cronet/PRESUBMIT.py components/cronet/android/test/javaperftests/AndroidManifest.xml components/cronet/android/test/javatests/AndroidManifest.xml components/cronet/ios/Cronet.h -components/cronet/ios/cronet_consumer/cronet_consumer_app_delegate.mm components/cronet/ios/test/cronet_performance_test.mm components/cronet/native/cronet.idl components/cronet/native/perftest/perf_test.cc @@ -2078,7 +2102,6 @@ components/feedback/feedback_uploader.cc components/feedback/feedback_uploader_dispatch_unittest.cc components/flags_ui/flags_test_helpers.cc components/flags_ui/resources/flags.html -components/full_restore/full_restore_info_unittest.cc components/gcm_driver/gcm_account_mapper.cc components/gcm_driver/gcm_account_mapper_unittest.cc components/gcm_driver/gcm_client_impl.cc @@ -2127,11 +2150,13 @@ components/javascript_dialogs/tab_modal_dialog_manager.cc components/javascript_dialogs_strings.grdp components/keyed_service/core/keyed_service_base_factory.cc components/keyed_service/core/simple_keyed_service_factory.h +components/lens/lens_entrypoints_unittest.cc components/lens/lens_features.cc components/login_dialog_strings.grdp components/lookalikes/core/lookalike_url_util.cc components/lookalikes/core/lookalike_url_util.h components/lookalikes/core/lookalike_url_util_unittest.cc +components/management_strings.grdp components/media_router/browser/android/flinging_controller_bridge.cc components/media_router/browser/media_router_dialog_controller_unittest.cc components/media_router/browser/media_router_metrics_unittest.cc @@ -2305,7 +2330,6 @@ components/password_manager/core/browser/leak_detection_delegate_helper_unittest components/password_manager/core/browser/leak_detection_dialog_utils.cc components/password_manager/core/browser/login_database_unittest.cc components/password_manager/core/browser/login_database_win.cc -components/password_manager/core/browser/multi_store_form_fetcher_unittest.cc components/password_manager/core/browser/old_google_credentials_cleaner.cc components/password_manager/core/browser/old_google_credentials_cleaner.h components/password_manager/core/browser/old_google_credentials_cleaner_unittest.cc @@ -2374,7 +2398,6 @@ components/payments_strings.grdp components/pdf/renderer/pdf_accessibility_tree_browsertest.cc components/performance_manager/graph/frame_node_impl.cc components/performance_manager/public/graph/frame_node.h -components/performance_manager/public/graph/policies/tab_loading_frame_navigation_policy.h components/performance_manager/public/graph/process_node.h components/performance_manager/public/graph/worker_node.h components/permissions/android/permissions_android_strings.grd @@ -2496,12 +2519,12 @@ components/rlz/rlz_tracker.h components/safe_browsing/content/browser/base_ui_manager.cc components/safe_browsing/content/browser/client_side_detection_service.cc components/safe_browsing/content/browser/client_side_model_loader.cc -components/safe_browsing/content/browser/client_side_model_loader_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 components/safe_browsing/content/browser/triggers/trigger_util.cc components/safe_browsing/content/renderer/phishing_classifier/features.h +components/safe_browsing/content/resources/PRESUBMIT.py components/safe_browsing/core/browser/db/v4_get_hash_protocol_manager.cc components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc components/safe_browsing/core/browser/db/v4_protocol_manager_util.h @@ -2565,6 +2588,7 @@ components/services/paint_preview_compositor/paint_preview_compositor_impl_unitt components/services/quarantine/quarantine_mac.mm components/services/quarantine/quarantine_win.cc components/services/storage/partition_impl_unittest.cc +components/services/storage/public/mojom/buckets/bucket_locator_mojom_traits_unittest.cc components/shared_highlighting/core/common/disabled_sites.cc components/shared_highlighting/core/common/disabled_sites_unittest.cc components/shared_highlighting/core/common/shared_highlighting_metrics_unittest.cc @@ -2678,6 +2702,7 @@ components/variations/pref_names.cc components/variations/proto/PRESUBMIT.py components/variations/proto/devtools/client_variations_uncompiled.js components/variations/service/safe_seed_manager.cc +components/variations/service/safe_seed_manager.h components/variations/variations_murmur_hash.h components/variations/variations_url_constants.cc components/visitedlink/test/visitedlink_perftest.cc @@ -2686,6 +2711,7 @@ components/viz/common/features.h components/viz/common/quads/render_pass_io_unittest.cc components/viz/common/switches.cc components/viz/service/display/output_surface.h +components/viz/service/display/overlay_processor_using_strategy.cc components/viz/test/data/render_pass_data/readme.txt components/webapps/browser/android/java/res/values/dimens.xml components/webapps/browser/android/shortcut_info.cc @@ -2716,9 +2742,9 @@ content/browser/android/content_url_loader_factory.cc content/browser/android/nfc_host_unittest.cc content/browser/appcache/appcache_request_handler.cc content/browser/appcache/appcache_update_job.cc -content/browser/appcache/appcache_update_job_unittest.cc content/browser/appcache/appcache_update_url_fetcher.cc content/browser/appcache/appcache_url_loader.cc +content/browser/attribution_reporting/PRESUBMIT.py content/browser/background_fetch/background_fetch_cross_origin_filter_unittest.cc content/browser/background_fetch/background_fetch_service_unittest.cc content/browser/blob_storage/blob_url_browsertest.cc @@ -2732,7 +2758,6 @@ content/browser/cache_storage/cache_storage_context_unittest.cc content/browser/child_process_security_policy_impl.h content/browser/child_process_security_policy_unittest.cc content/browser/client_hints/client_hints.cc -content/browser/conversions/PRESUBMIT.py content/browser/cookie_store/cookie_store_manager_unittest.cc content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_manager_unittest.cc @@ -2750,6 +2775,7 @@ content/browser/hid/hid_service_unittest.cc content/browser/idle/idle_manager_unittest.cc content/browser/indexed_db/indexed_db_backing_store.cc content/browser/indexed_db/indexed_db_backing_store_unittest.cc +content/browser/indexed_db/indexed_db_context_unittest.cc content/browser/indexed_db/indexed_db_reporting.cc content/browser/installedapp/installed_app_provider_impl_win.cc content/browser/loader/file_url_loader_factory_unittest.cc @@ -2760,7 +2786,6 @@ content/browser/native_io/native_io_manager_unittest.cc content/browser/net/accept_header_browsertest.cc content/browser/net/trust_token_browsertest.cc content/browser/net/trust_token_origin_trial_browsertest.cc -content/browser/network_service_instance_impl.cc content/browser/notification_service_impl.cc content/browser/notifications/notification_database_unittest.cc content/browser/permissions/permission_controller_impl_unittest.cc @@ -2802,7 +2827,6 @@ content/browser/sandbox_ipc_linux.h content/browser/screen_orientation/screen_orientation_provider_unittest.cc content/browser/serial/serial_unittest.cc content/browser/service_worker/embedded_worker_instance.cc -content/browser/service_worker/service_worker_metrics.cc content/browser/service_worker/service_worker_version_browsertest.cc content/browser/session_history_browsertest.cc content/browser/site_instance_impl.h @@ -3024,6 +3048,7 @@ extensions/renderer/runtime_hooks_delegate_unittest.cc extensions/renderer/script_context.cc extensions/shell/browser/shell_prefs.cc extensions/strings/extensions_strings.grd +extensions/test/extension_background_page_waiter.h fuchsia/engine/browser/frame_impl_browsertest.cc fuchsia/engine/test/data/play_video.html gin/v8_initializer.cc @@ -3091,7 +3116,7 @@ gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc gpu/command_buffer/service/shader_translator_unittest.cc gpu/command_buffer/service/shared_image_backing_factory_iosurface.mm gpu/command_buffer/service/shared_image_representation_d3d.h -gpu/command_buffer/service/shared_image_video.cc +gpu/command_buffer/service/shared_image_video_image_reader.cc gpu/command_buffer/service/surface_texture_gl_owner.cc gpu/config/PRESUBMIT.py gpu/config/gpu_control_list_format.txt @@ -3130,6 +3155,8 @@ ios/chrome/browser/autofill/manual_fill/passwords_fetcher_unittest.mm ios/chrome/browser/browser_state/chrome_browser_state_impl.h ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm ios/chrome/browser/chrome_url_constants.cc +ios/chrome/browser/commerce/price_alert_util_unittest.mm +ios/chrome/browser/commerce/shopping_persisted_data_tab_helper_unittest.mm ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_helper.h ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_helper.mm ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_helper_unittest.mm @@ -3140,6 +3167,7 @@ ios/chrome/browser/metrics/tab_usage_recorder_browser_agent_unittest.mm ios/chrome/browser/net/cookie_util_unittest.mm ios/chrome/browser/net/retryable_url_fetcher_unittest.mm ios/chrome/browser/omaha/omaha_service.mm +ios/chrome/browser/optimization_guide/optimization_guide_validation_tab_helper_unittest.mm ios/chrome/browser/passwords/password_controller_js_unittest.mm ios/chrome/browser/passwords/password_controller_unittest.mm ios/chrome/browser/policy/policy_watcher_browser_agent_unittest.mm @@ -3182,8 +3210,6 @@ ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_ui.h ios/chrome/browser/ui/bookmarks/bookmarks_egtest.mm ios/chrome/browser/ui/browser_container/browser_container_coordinator_unittest.mm ios/chrome/browser/ui/browser_view/browser_view_controller_helper_unittest.mm -ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_item_unittest.mm -ios/chrome/browser/ui/content_suggestions/content_suggestions_egtest.mm ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm ios/chrome/browser/ui/content_suggestions/ntp_home_mediator_unittest.mm @@ -3234,12 +3260,12 @@ ios/chrome/browser/web_state_list/web_usage_enabler/web_usage_enabler_browser_ag ios/chrome/common/ns_regular_expression_unittest.mm ios/chrome/common/string_util_unittest.mm ios/chrome/common/x_callback_url_unittest.cc -ios/chrome/credential_provider_extension/password_spec_fetcher.mm ios/chrome/credential_provider_extension/strings/ios_credential_provider_extension_strings.grd ios/chrome/test/data/policy/policy_test_cases.json ios/chrome/test/earl_grey/chrome_earl_grey_ui.h ios/chrome/test/earl_grey/device_check_egtest.mm ios/chrome/test/xcuitest/device_check_xctest.mm +ios/components/credential_provider_extension/password_spec_fetcher.mm ios/net/cookies/cookie_cache_unittest.cc ios/net/cookies/cookie_store_ios_test_util.mm ios/net/cookies/cookie_store_ios_unittest.mm @@ -3346,7 +3372,6 @@ media/filters/video_cadence_estimator.h media/fuchsia/common/vmo_buffer_writer_queue.cc media/gpu/android/android_video_encode_accelerator.h media/gpu/chromeos/libyuv_image_processor_backend.cc -media/gpu/test/video_encoder/video_encoder_test_environment.cc media/gpu/vaapi/test/av1_decoder.cc media/gpu/vaapi/test/vp9_decoder.cc media/gpu/vaapi/test_utils.h @@ -3684,7 +3709,6 @@ native_client_sdk/src/tests/nacl_io_test/socket_test.cc native_client_sdk/src/tools/fix_manifest.py native_client_sdk/src/web/manifest.html net/BUILD.gn -net/android/cellular_signal_strength.cc net/android/http_auth_negotiate_android.h net/android/unittest_support/AndroidManifest.xml net/base/address_tracker_linux.cc @@ -3702,6 +3726,7 @@ net/base/network_change_notifier_mac.mm net/base/network_change_notifier_win.cc net/base/network_interfaces_linux.cc net/base/network_interfaces_win.cc +net/base/proxy_string_util.h net/base/registry_controlled_domains/registry_controlled_domain.cc net/base/registry_controlled_domains/registry_controlled_domain.h net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc @@ -3761,7 +3786,6 @@ net/dns/dns_udp_tracker.h net/dns/dns_util.h net/dns/dns_util_unittest.cc net/dns/host_cache_unittest.cc -net/dns/host_resolver_manager.cc net/dns/host_resolver_manager_unittest.cc net/dns/host_resolver_mdns_task.cc net/dns/https_record_rdata_unittest.cc @@ -3842,8 +3866,6 @@ net/proxy_resolution/proxy_resolver_mac.h net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc net/proxy_resolution/win/proxy_config_service_win_unittest.cc net/proxy_resolution/win/proxy_resolver_winhttp.cc -net/proxy_resolution/win/windows_system_proxy_resolver.cc -net/proxy_resolution/win/winhttp_api_wrapper.h net/quic/bidirectional_stream_quic_impl_unittest.cc net/quic/crypto/proof_verifier_chromium.cc net/quic/properties_based_quic_server_info_test.cc @@ -3890,7 +3912,6 @@ net/third_party/nss/ssl/cmpcert.h net/third_party/quiche/src/http2/core/priority_write_scheduler.h net/third_party/quiche/src/quic/core/crypto/quic_crypto_client_config.h net/third_party/quiche/src/quic/core/crypto/quic_crypto_client_config_test.cc -net/third_party/quiche/src/quic/core/crypto/tls_connection.h net/third_party/quiche/src/quic/core/crypto/tls_server_connection.h net/third_party/quiche/src/quic/core/http/quic_client_promised_info_test.cc net/third_party/quiche/src/quic/core/http/quic_client_push_promise_index_test.cc @@ -3913,6 +3934,7 @@ net/third_party/quiche/src/spdy/core/spdy_protocol.h net/tools/print_certificates.py net/tools/quic/quic_http_proxy_backend_test.cc net/tools/quic/quic_simple_client_bin.cc +net/tools/testserver/testserver.py.vpython3 net/tools/transport_security_state_generator/transport_security_state_generator.cc net/url_request/url_fetcher.h net/url_request/url_request_context_builder_unittest.cc @@ -3999,8 +4021,8 @@ remoting/host/it2me/it2me_native_messaging_host_unittest.cc remoting/host/linux/linux_me2me_host.py remoting/host/linux/remoting_user_session.cc remoting/host/policy_watcher_unittest.cc -remoting/host/remote_open_url_client_unittest.cc -remoting/host/remote_open_url_message_handler_unittest.cc +remoting/host/remote_open_url/remote_open_url_client_unittest.cc +remoting/host/remote_open_url/remote_open_url_message_handler_unittest.cc remoting/host/remoting_me2me_host.cc remoting/host/sas_injector_win.cc remoting/host/setup/com.google.chrome.remote_desktop-firefox.json.jinja2 @@ -4087,6 +4109,8 @@ services/media_session/media_controller_unittest.cc services/network/cookie_manager_unittest.cc services/network/cors/preflight_controller_unittest.cc services/network/cors/preflight_result_unittest.cc +services/network/first_party_sets/first_party_sets.cc +services/network/first_party_sets/first_party_sets.h services/network/host_resolver_unittest.cc services/network/http_cache_data_counter_unittest.cc services/network/http_cache_data_remover_unittest.cc @@ -4110,7 +4134,6 @@ services/network/trust_tokens/trust_token_key_commitment_parser.h services/network/trust_tokens/trust_token_key_commitments.h services/network/udp_socket_unittest.cc services/network/url_loader.cc -services/network/websocket_interceptor_unittest.cc services/network/websocket_throttler.h services/preferences/tracked/device_id_unittest.cc services/proxy_resolver/host_resolver_mojo.cc @@ -4119,6 +4142,8 @@ services/proxy_resolver/proxy_resolver_v8_tracing.cc services/proxy_resolver/proxy_resolver_v8_tracing.h services/proxy_resolver/proxy_resolver_v8_unittest.cc services/proxy_resolver/test/data/proxy_resolver_v8_unittest/pac_library_unittest.js +services/proxy_resolver_win/windows_system_proxy_resolver_impl.cc +services/proxy_resolver_win/winhttp_api_wrapper.h services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc services/resource_coordinator/public/cpp/memory_instrumentation/client_process_impl.h services/resource_coordinator/public/cpp/memory_instrumentation/tracing_observer_traced_value.cc @@ -4147,8 +4172,6 @@ storage/browser/file_system/sandbox_file_system_backend_unittest.cc storage/browser/quota/quota_database_unittest.cc storage/common/database/database_identifier_unittest.cc storage/common/file_system/file_system_util_unittest.cc -styleguide/c++/c++11.html -styleguide/c++/chromium-cpp/main.py testing/PRESUBMIT.py testing/android/native_test/java/AndroidManifest.xml.jinja2 testing/buildbot/PRESUBMIT.py @@ -4184,7 +4207,6 @@ testing/perf/luci_test_result.h testing/perf/perf_result_reporter.cc testing/scripts/PRESUBMIT.py testing/scripts/common.py -testing/scripts/run_chromedriver_tests.py testing/scripts/run_finch_smoke_tests_android.py testing/scripts/run_performance_tests.py testing/scripts/run_variations_smoke_tests.py @@ -4335,7 +4357,7 @@ third_party/android_deps/libs/com_google_firebase_firebase_messaging/3pp/fetch.p third_party/android_deps/licenses/Android_SDK_License-December_9_2016.txt third_party/android_platform/development/scripts/PRESUBMIT.py third_party/android_platform/development/scripts/stack.py -third_party/android_rust_toolchain/toolchain/1.54.0/src/stdlibs/library/stdarch/crates/stdarch-verify/arm-intrinsics.html +third_party/android_rust_toolchain/toolchain/src/stdlibs/library/stdarch/crates/stdarch-verify/arm-intrinsics.html third_party/android_support_test_runner/runner/src/main/Android.mk third_party/angle/PRESUBMIT.py third_party/angle/extensions/ANGLE_base_vertex_base_instance.txt @@ -4373,7 +4395,6 @@ third_party/angle/extensions/EGL_ANGLE_direct_composition.txt third_party/angle/extensions/EGL_ANGLE_display_semaphore_share_group.txt third_party/angle/extensions/EGL_ANGLE_display_texture_share_group.txt third_party/angle/extensions/EGL_ANGLE_feature_control.txt -third_party/angle/extensions/EGL_ANGLE_flexible_surface_compatibility.txt third_party/angle/extensions/EGL_ANGLE_ggp_stream_descriptor.txt third_party/angle/extensions/EGL_ANGLE_iosurface_client_buffer.txt third_party/angle/extensions/EGL_ANGLE_keyed_mutex.txt @@ -4395,6 +4416,7 @@ third_party/angle/include/GLSLANG/ShaderVars.h third_party/angle/include/platform/FeaturesVk.h third_party/angle/infra/specs/PRESUBMIT.py third_party/angle/infra/specs/gn_isolate_map.pyl +third_party/angle/samples/torus_lighting/TorusBufferStorage.cpp third_party/angle/samples/torus_lighting/TorusLightingES1.cpp third_party/angle/samples/torus_lighting/TorusLightingES2.cpp third_party/angle/samples/torus_lighting/torus.h @@ -4405,9 +4427,11 @@ third_party/angle/scripts/process_angle_perf_results.py third_party/angle/scripts/roll_chromium_deps.py third_party/angle/scripts/run_gtest_angle_test.py third_party/angle/scripts/trigger.py +third_party/angle/scripts/update_extension_data.py third_party/angle/src/android_system_settings/res/xml/main.xml third_party/angle/src/common/aligned_memory.cpp third_party/angle/src/common/android_util.cpp +third_party/angle/src/common/linux/dma_buf_utils.cpp third_party/angle/src/common/mathutil.h third_party/angle/src/common/system_utils_posix.cpp third_party/angle/src/common/third_party/smhasher/src/PMurHash.cpp @@ -4421,6 +4445,7 @@ third_party/angle/src/libANGLE/GLES1Renderer.cpp third_party/angle/src/libANGLE/Observer.cpp third_party/angle/src/libANGLE/Observer.h third_party/angle/src/libANGLE/Surface.h +third_party/angle/src/libANGLE/gen_extensions.py third_party/angle/src/libANGLE/renderer/SurfaceImpl.h third_party/angle/src/libANGLE/renderer/d3d/DynamicHLSL.cpp third_party/angle/src/libANGLE/renderer/d3d/IndexDataManager.cpp @@ -4434,7 +4459,6 @@ third_party/angle/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp third_party/angle/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp third_party/angle/src/libANGLE/renderer/gen_dxgi_support_tables.py -third_party/angle/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.cpp third_party/angle/src/libANGLE/renderer/renderer_utils.cpp third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.cpp third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.h @@ -4447,6 +4471,7 @@ third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/SurfaceVk.h third_party/angle/src/libANGLE/renderer/vulkan/UtilsVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp +third_party/angle/src/libANGLE/renderer/vulkan/linux/DmaBufImageSiblingVkLinux.cpp third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/ffx_a.h third_party/angle/src/libANGLE/renderer/vulkan/vk_cache_utils.h third_party/angle/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp @@ -4455,6 +4480,7 @@ third_party/angle/src/libANGLE/validationEGL.cpp third_party/angle/src/libANGLE/validationES.cpp third_party/angle/src/libGLESv2/global_state.cpp third_party/angle/src/libGLESv2/global_state.h +third_party/angle/src/tests/egl_tests/EGLContextSharingTest.cpp third_party/angle/src/tests/egl_tests/EGLIOSurfaceClientBufferTest.cpp third_party/angle/src/tests/gl_tests/BufferDataTest.cpp third_party/angle/src/tests/gl_tests/FramebufferTest.cpp @@ -4712,7 +4738,6 @@ third_party/blink/renderer/core/editing/finder/find_buffer.h third_party/blink/renderer/core/editing/spellcheck/cold_mode_spell_check_requester.h third_party/blink/renderer/core/editing/spellcheck/hot_mode_spell_check_requester.h third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.h -third_party/blink/renderer/core/events/application_cache_error_event.idl third_party/blink/renderer/core/events/before_unload_event.cc third_party/blink/renderer/core/events/before_unload_event.h third_party/blink/renderer/core/events/clipboard_event.cc @@ -4873,6 +4898,7 @@ third_party/blink/renderer/core/loader/resource/script_resource.h third_party/blink/renderer/core/loader/resource/xsl_style_sheet_resource.cc third_party/blink/renderer/core/loader/resource/xsl_style_sheet_resource.h third_party/blink/renderer/core/loader/subresource_filter.cc +third_party/blink/renderer/core/page/frame_tree.h third_party/blink/renderer/core/page/print_context_test.cc third_party/blink/renderer/core/page/scrolling/element_fragment_anchor_test.cc third_party/blink/renderer/core/page/scrolling/scroll_state.idl @@ -4953,7 +4979,6 @@ third_party/blink/renderer/core/timing/window_performance.cc 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/xpath_expression.idl -third_party/blink/renderer/core/xml/xpath_functions.cc third_party/blink/renderer/core/xml/xpath_ns_resolver.idl third_party/blink/renderer/core/xml/xslt_processor.cc third_party/blink/renderer/core/xml/xslt_processor.idl @@ -4990,9 +5015,6 @@ third_party/blink/renderer/modules/payments/on_payment_response_test.cc third_party/blink/renderer/modules/payments/payment_request.cc third_party/blink/renderer/modules/payments/payment_request_optional_total_test.cc third_party/blink/renderer/modules/payments/payment_response_test.cc -third_party/blink/renderer/modules/payments/skip_to_gpay_utils.cc -third_party/blink/renderer/modules/payments/skip_to_gpay_utils.h -third_party/blink/renderer/modules/payments/skip_to_gpay_utils_test.cc third_party/blink/renderer/modules/peerconnection/adapters/ice_transport_adapter_impl.cc third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.h @@ -5009,7 +5031,6 @@ third_party/blink/renderer/modules/webgl/webgl_unowned_texture.h third_party/blink/renderer/modules/webgpu/gpu.cc third_party/blink/renderer/modules/webgpu/gpu.h third_party/blink/renderer/modules/webgpu/gpu_render_pipeline.cc -third_party/blink/renderer/modules/webgpu/gpu_swap_chain.cc third_party/blink/renderer/modules/webmidi/navigator_web_midi.cc third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc third_party/blink/renderer/modules/websockets/websocket_stream.h @@ -5163,7 +5184,6 @@ third_party/boringssl/src/tool/fd.cc third_party/boringssl/src/tool/internal.h third_party/boringssl/src/util/bot/go/env.py third_party/boringssl/src/util/bot/update_clang.py -third_party/breakpad/BUILD.gn third_party/breakpad/breakpad/default.xml third_party/breakpad/breakpad/src/build/common.gypi third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc @@ -5993,8 +6013,15 @@ third_party/catapult/third_party/html5lib-1.1/html5lib/tests/test_parser2.py third_party/catapult/third_party/html5lib-python/html5lib/serializer/htmlserializer.py third_party/catapult/third_party/html5lib-python/html5lib/tests/test_parser2.py third_party/catapult/third_party/html5lib-python/utils/spider.py -third_party/catapult/third_party/httplib2/httplib2/__init__.py -third_party/catapult/third_party/httplib2/httplib2/test/other_cacerts.txt +third_party/catapult/third_party/httplib2/Makefile +third_party/catapult/third_party/httplib2/index.html +third_party/catapult/third_party/httplib2/python2/httplib2/__init__.py +third_party/catapult/third_party/httplib2/python2/httplib2test.py +third_party/catapult/third_party/httplib2/python2/httplib2test_appengine.py +third_party/catapult/third_party/httplib2/python2/ssl_protocol_test.py +third_party/catapult/third_party/httplib2/python3/httplib2/__init__.py +third_party/catapult/third_party/httplib2/python3/httplib2/test/other_cacerts.txt +third_party/catapult/third_party/httplib2/python3/httplib2test.py third_party/catapult/third_party/jquery/jquery-2.1.4.js third_party/catapult/third_party/mapreduce/mapreduce/handlers.py third_party/catapult/third_party/mapreduce/mapreduce/mapreduce_pipeline.py @@ -6419,7 +6446,9 @@ third_party/closure_compiler/externs/resources_private.js third_party/closure_compiler/externs/runtime.js third_party/closure_compiler/externs/safe_browsing_private.js third_party/closure_compiler/externs/settings_private.js +third_party/closure_compiler/externs/speech_recognition_private.js third_party/closure_compiler/externs/system_display.js +third_party/closure_compiler/externs/system_private.js third_party/closure_compiler/externs/tab_groups.js third_party/closure_compiler/externs/tabs.js third_party/closure_compiler/externs/terminal_private.js @@ -6516,7 +6545,7 @@ third_party/dawn/src/common/Compiler.h third_party/dawn/src/common/vulkan_platform.h third_party/dawn/src/dawn_native/CommandAllocator.cpp third_party/dawn/src/dawn_native/CreatePipelineAsyncTask.cpp -third_party/dawn/src/dawn_native/Extensions.cpp +third_party/dawn/src/dawn_native/Features.cpp third_party/dawn/src/dawn_native/PipelineLayout.cpp third_party/dawn/src/dawn_native/Sampler.h third_party/dawn/src/dawn_native/SubresourceStorage.h @@ -6533,6 +6562,7 @@ third_party/dawn/src/dawn_native/opengl/TextureGL.cpp third_party/dawn/src/dawn_native/vulkan/RenderPassCache.h third_party/dawn/src/dawn_native/vulkan/VulkanInfo.cpp third_party/dawn/src/dawn_native/vulkan/VulkanInfo.h +third_party/dawn/src/dawn_node/binding/GPUSupportedLimits.cpp third_party/dawn/src/tests/end2end/D3D12VideoViewsTests.cpp third_party/dawn/src/tests/end2end/DepthBiasTests.cpp third_party/dawn/src/tests/end2end/SwapChainValidationTests.cpp @@ -6877,6 +6907,7 @@ third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json +third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/revision_specifying_ref.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json @@ -6962,7 +6993,6 @@ third_party/depot_tools/tests/metrics_test.py third_party/depot_tools/tests/presubmit_unittest.py third_party/depot_tools/tests/watchlists_unittest.py third_party/depot_tools/third_party/coverage/htmlfiles/pyfile.html -third_party/depot_tools/third_party/httplib2/__init__.py third_party/depot_tools/watchlists.py third_party/depot_tools/win32imports.py third_party/depot_tools/win_toolchain/get_toolchain_if_necessary.py @@ -7161,22 +7191,16 @@ third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-m third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/lib/base64-vlq.js third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/lib/source-map-consumer.js third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/package.json -third_party/devtools-frontend/src/node_modules/@babel/core/package.json -third_party/devtools-frontend/src/node_modules/@babel/generator/package.json -third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/package.json -third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/package.json -third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/package.json -third_party/devtools-frontend/src/node_modules/@babel/helpers/package.json -third_party/devtools-frontend/src/node_modules/@babel/parser/package.json +third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/dist/source-map.debug.js +third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/dist/source-map.js +third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/lib/base64-vlq.js +third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/lib/source-map-consumer.js +third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/package.json third_party/devtools-frontend/src/node_modules/@babel/runtime/package.json -third_party/devtools-frontend/src/node_modules/@babel/template/package.json -third_party/devtools-frontend/src/node_modules/@babel/traverse/package.json -third_party/devtools-frontend/src/node_modules/@babel/types/package.json third_party/devtools-frontend/src/node_modules/@eslint/eslintrc/node_modules/globals/package.json third_party/devtools-frontend/src/node_modules/@eslint/eslintrc/node_modules/type-fest/package.json third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/package.json third_party/devtools-frontend/src/node_modules/@sinonjs/commons/lib/class-name.js -third_party/devtools-frontend/src/node_modules/@sinonjs/fake-timers/fake-timers.js third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/lib/create-set.js third_party/devtools-frontend/src/node_modules/@sinonjs/text-encoding/package.json third_party/devtools-frontend/src/node_modules/acorn/dist/acorn.js @@ -7363,7 +7387,6 @@ third_party/devtools-frontend/src/node_modules/find-up/package.json third_party/devtools-frontend/src/node_modules/flat/package.json third_party/devtools-frontend/src/node_modules/follow-redirects/package.json third_party/devtools-frontend/src/node_modules/fs-extra/package.json -third_party/devtools-frontend/src/node_modules/fsevents/package.json third_party/devtools-frontend/src/node_modules/function-bind/package.json third_party/devtools-frontend/src/node_modules/gensync/package.json third_party/devtools-frontend/src/node_modules/get-intrinsic/package.json @@ -7482,6 +7505,7 @@ third_party/devtools-frontend/src/node_modules/minimist-options/package.json third_party/devtools-frontend/src/node_modules/mocha/lib/browser/growl.js third_party/devtools-frontend/src/node_modules/mocha/lib/runnable.js third_party/devtools-frontend/src/node_modules/mocha/lib/utils.js +third_party/devtools-frontend/src/node_modules/mocha/mocha-es2018.js third_party/devtools-frontend/src/node_modules/mocha/mocha.js third_party/devtools-frontend/src/node_modules/mocha/node_modules/escape-string-regexp/package.json third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/package.json @@ -7624,11 +7648,6 @@ third_party/devtools-frontend/src/node_modules/shebang-command/package.json third_party/devtools-frontend/src/node_modules/shebang-regex/package.json third_party/devtools-frontend/src/node_modules/sinon/lib/sinon/proxy-invoke.js third_party/devtools-frontend/src/node_modules/sinon/lib/sinon/util/core/extend.js -third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/dist/diff.js -third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/dist/diff.min.js -third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/lib/convert/dmp.js -third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/lib/index.es6.js -third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/package.json third_party/devtools-frontend/src/node_modules/sinon/node_modules/has-flag/package.json third_party/devtools-frontend/src/node_modules/sinon/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/sinon/pkg/sinon-esm.js @@ -7696,7 +7715,15 @@ third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/pac third_party/devtools-frontend/src/node_modules/tar-stream/package.json third_party/devtools-frontend/src/node_modules/terser/dist/bundle.min.js third_party/devtools-frontend/src/node_modules/terser/lib/ast.js +third_party/devtools-frontend/src/node_modules/terser/lib/compress/common.js +third_party/devtools-frontend/src/node_modules/terser/lib/compress/compressor-flags.js +third_party/devtools-frontend/src/node_modules/terser/lib/compress/drop-side-effect-free.js +third_party/devtools-frontend/src/node_modules/terser/lib/compress/evaluate.js third_party/devtools-frontend/src/node_modules/terser/lib/compress/index.js +third_party/devtools-frontend/src/node_modules/terser/lib/compress/inference.js +third_party/devtools-frontend/src/node_modules/terser/lib/compress/native-objects.js +third_party/devtools-frontend/src/node_modules/terser/lib/compress/reduce-vars.js +third_party/devtools-frontend/src/node_modules/terser/lib/compress/tighten-body.js third_party/devtools-frontend/src/node_modules/terser/lib/mozilla-ast.js third_party/devtools-frontend/src/node_modules/terser/lib/output.js third_party/devtools-frontend/src/node_modules/terser/lib/parse.js @@ -7705,6 +7732,12 @@ third_party/devtools-frontend/src/node_modules/terser/lib/scope.js third_party/devtools-frontend/src/node_modules/terser/lib/sourcemap.js third_party/devtools-frontend/src/node_modules/terser/lib/transform.js third_party/devtools-frontend/src/node_modules/terser/lib/utils/index.js +third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/node_modules/source-map/dist/source-map.debug.js +third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/node_modules/source-map/dist/source-map.js +third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/node_modules/source-map/lib/base64-vlq.js +third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/node_modules/source-map/lib/source-map-consumer.js +third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/node_modules/source-map/package.json +third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map-support/source-map-support.js third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map/dist/source-map.js third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map/lib/base64-vlq.js third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map/lib/source-map-consumer.js @@ -7720,6 +7753,7 @@ third_party/devtools-frontend/src/node_modules/trim-newlines/package.json third_party/devtools-frontend/src/node_modules/trough/package.json third_party/devtools-frontend/src/node_modules/tsconfig-paths/node_modules/json5/package.json third_party/devtools-frontend/src/node_modules/type-fest/package.json +third_party/devtools-frontend/src/node_modules/typescript/lib/tsc.js third_party/devtools-frontend/src/node_modules/typescript/lib/tsserver.js third_party/devtools-frontend/src/node_modules/typescript/lib/tsserverlibrary.js third_party/devtools-frontend/src/node_modules/typescript/lib/typescript.js @@ -8720,6 +8754,7 @@ third_party/ffmpeg/libavdevice/fbdev_common.h third_party/ffmpeg/libavdevice/fbdev_dec.c third_party/ffmpeg/libavdevice/gdigrab.c third_party/ffmpeg/libavdevice/pulse_audio_enc.c +third_party/ffmpeg/libavfilter/af_adecorrelate.c third_party/ffmpeg/libavfilter/af_amix.c third_party/ffmpeg/libavfilter/af_firequalizer.c third_party/ffmpeg/libavfilter/af_sofalizer.c @@ -8764,7 +8799,6 @@ third_party/ffmpeg/libavfilter/vf_vif.c third_party/ffmpeg/libavfilter/vf_vmafmotion.c third_party/ffmpeg/libavfilter/vf_xbr.c third_party/ffmpeg/libavfilter/vf_yadif.c -third_party/ffmpeg/libavfilter/vif.h third_party/ffmpeg/libavfilter/vmaf_motion.h third_party/ffmpeg/libavfilter/x86/avf_showcqt_init.c third_party/ffmpeg/libavfilter/x86/colorspacedsp_init.c @@ -9218,7 +9252,6 @@ third_party/google_input_tools/third_party/closure_library/closure/goog/uri/util third_party/google_input_tools/third_party/closure_library/closure/goog/useragent/useragent.js third_party/google_input_tools/third_party/closure_library/third_party/closure/goog/mochikit/async/deferred.js third_party/googletest/src/docs/_layouts/default.html -third_party/googletest/src/googlemock/scripts/fuse_gmock_files.py third_party/googletest/src/googlemock/src/gmock_main.cc third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h @@ -9364,7 +9397,7 @@ 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-style.cc +third_party/harfbuzz-ng/src/src/hb-style.h third_party/harfbuzz-ng/src/src/hb-unicode.hh third_party/harfbuzz-ng/src/src/hb.hh third_party/harfbuzz-ng/src/test/api/hb-test.h @@ -9447,7 +9480,7 @@ third_party/inspector_protocol/crdtp/cbor.cc third_party/inspector_protocol/crdtp/json.cc third_party/inspector_protocol/crdtp/serializer_traits_test.cc third_party/inspector_protocol/roll.py -third_party/instrumented_libraries/scripts/unpack_binaries.py +third_party/instrumented_libraries/BUILD.gn third_party/isimpledom/ISimpleDOMDocument.idl third_party/isimpledom/ISimpleDOMNode.idl third_party/isimpledom/ISimpleDOMText.idl @@ -9556,6 +9589,7 @@ third_party/libdrm/src/xf86drmMode.h third_party/libgav1/src/src/dsp/arm/distance_weighted_blend_neon.cc third_party/libgav1/src/src/dsp/x86/distance_weighted_blend_sse4.cc third_party/libgav1/src/src/utils/compiler_attributes.h +third_party/libgav1/src/src/utils/cpu_test.cc third_party/libgifcodec/SkGifImageReader.cpp third_party/libgifcodec/SkGifImageReader.h third_party/libipp/BUILD.gn @@ -9926,7 +9960,7 @@ third_party/llvm/llvm/lib/DebugInfo/CodeView/Formatters.cpp third_party/llvm/llvm/lib/MC/MCWin64EH.cpp third_party/llvm/llvm/lib/Object/COFFModuleDefinition.cpp third_party/llvm/llvm/lib/Object/ELF.cpp -third_party/llvm/llvm/lib/Passes/PassBuilder.cpp +third_party/llvm/llvm/lib/Passes/PassBuilderPipelines.cpp third_party/llvm/llvm/lib/Support/SHA1.cpp third_party/llvm/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp third_party/llvm/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -10041,48 +10075,16 @@ third_party/nearby/src/cpp/platform/impl/windows/wifi_lan.h third_party/nearby/src/cpp/platform/public/bluetooth_adapter.h third_party/nearby/src/cpp/platform/public/bluetooth_classic.h third_party/nearby/src/cpp/platform/public/thread_check_nocompile.cc -third_party/node/node_modules/@babel/code-frame/package.json -third_party/node/node_modules/@babel/generator/node_modules/source-map/dist/source-map.js -third_party/node/node_modules/@babel/generator/node_modules/source-map/lib/base64-vlq.js -third_party/node/node_modules/@babel/generator/node_modules/source-map/lib/source-map-consumer.js -third_party/node/node_modules/@babel/generator/node_modules/source-map/package.json -third_party/node/node_modules/@babel/generator/package.json -third_party/node/node_modules/@babel/highlight/node_modules/ansi-styles/package.json -third_party/node/node_modules/@babel/highlight/node_modules/supports-color/package.json -third_party/node/node_modules/@babel/parser/package.json -third_party/node/node_modules/@babel/template/package.json -third_party/node/node_modules/@babel/traverse/package.json -third_party/node/node_modules/@babel/types/package.json -third_party/node/node_modules/@eslint/eslintrc/node_modules/acorn/dist/acorn.js -third_party/node/node_modules/@eslint/eslintrc/node_modules/acorn/package.json -third_party/node/node_modules/@eslint/eslintrc/node_modules/espree/espree.js third_party/node/node_modules/@eslint/eslintrc/node_modules/globals/package.json -third_party/node/node_modules/@eslint/eslintrc/node_modules/lodash/_compareMultiple.js -third_party/node/node_modules/@eslint/eslintrc/node_modules/lodash/_setData.js -third_party/node/node_modules/@eslint/eslintrc/node_modules/lodash/lodash.js -third_party/node/node_modules/@eslint/eslintrc/node_modules/lodash/package.json -third_party/node/node_modules/@eslint/eslintrc/node_modules/lodash/template.js -third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/debug/package.json -third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/debug/src/browser.js -third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/lodash/_compareMultiple.js -third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/lodash/_setData.js -third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/lodash/lodash.js -third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/lodash/package.json -third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/lodash/template.js -third_party/node/node_modules/@typescript-eslint/parser/node_modules/debug/package.json -third_party/node/node_modules/@typescript-eslint/parser/node_modules/debug/src/browser.js -third_party/node/node_modules/@typescript-eslint/typescript-estree/node_modules/debug/package.json -third_party/node/node_modules/@typescript-eslint/typescript-estree/node_modules/debug/src/browser.js -third_party/node/node_modules/acorn-jsx/node_modules/acorn/dist/acorn.es.js -third_party/node/node_modules/acorn-jsx/node_modules/acorn/dist/acorn.js -third_party/node/node_modules/acorn-jsx/node_modules/acorn/package.json -third_party/node/node_modules/acorn-jsx/node_modules/acorn/src/index.js -third_party/node/node_modules/acorn-jsx/node_modules/acorn/src/loose/index.js -third_party/node/node_modules/acorn-jsx/node_modules/acorn/src/options.js -third_party/node/node_modules/acorn/dist/acorn.es.js +third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope/lib/definition.js +third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope/lib/index.js +third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope/lib/pattern-visitor.js +third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope/lib/reference.js +third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope/lib/referencer.js +third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope/lib/scope-manager.js +third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope/lib/scope.js +third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope/lib/variable.js third_party/node/node_modules/acorn/dist/acorn.js -third_party/node/node_modules/acorn/dist/acorn_loose.es.js -third_party/node/node_modules/acorn/dist/acorn_loose.js third_party/node/node_modules/acorn/package.json third_party/node/node_modules/ajv/dist/ajv.bundle.js third_party/node/node_modules/ansi-escape-sequences/package.json @@ -10091,20 +10093,13 @@ third_party/node/node_modules/ansi-styles/package.json third_party/node/node_modules/array-back/package.json third_party/node/node_modules/array-union/package.json third_party/node/node_modules/astral-regex/package.json +third_party/node/node_modules/babel-code-frame/node_modules/ansi-regex/package.json +third_party/node/node_modules/babel-code-frame/node_modules/ansi-styles/package.json +third_party/node/node_modules/babel-code-frame/node_modules/chalk/package.json +third_party/node/node_modules/babel-code-frame/node_modules/strip-ansi/package.json +third_party/node/node_modules/babel-code-frame/node_modules/supports-color/package.json third_party/node/node_modules/babel-code-frame/package.json -third_party/node/node_modules/babel-eslint/node_modules/eslint-scope/lib/definition.js -third_party/node/node_modules/babel-eslint/node_modules/eslint-scope/lib/index.js -third_party/node/node_modules/babel-eslint/node_modules/eslint-scope/lib/pattern-visitor.js -third_party/node/node_modules/babel-eslint/node_modules/eslint-scope/lib/reference.js -third_party/node/node_modules/babel-eslint/node_modules/eslint-scope/lib/referencer.js -third_party/node/node_modules/babel-eslint/node_modules/eslint-scope/lib/scope-manager.js -third_party/node/node_modules/babel-eslint/node_modules/eslint-scope/lib/scope.js -third_party/node/node_modules/babel-eslint/node_modules/eslint-scope/lib/variable.js third_party/node/node_modules/babel-eslint/package.json -third_party/node/node_modules/babel-generator/node_modules/source-map/dist/source-map.js -third_party/node/node_modules/babel-generator/node_modules/source-map/lib/base64-vlq.js -third_party/node/node_modules/babel-generator/node_modules/source-map/lib/source-map-consumer.js -third_party/node/node_modules/babel-generator/node_modules/source-map/package.json third_party/node/node_modules/babel-generator/package.json third_party/node/node_modules/babel-messages/package.json third_party/node/node_modules/babel-runtime/package.json @@ -10115,12 +10110,10 @@ third_party/node/node_modules/babel-traverse/package.json third_party/node/node_modules/babel-types/node_modules/to-fast-properties/package.json third_party/node/node_modules/babel-types/package.json third_party/node/node_modules/babylon/package.json +third_party/node/node_modules/call-bind/package.json third_party/node/node_modules/callsites/package.json third_party/node/node_modules/cancel-token/package.json -third_party/node/node_modules/chalk/package.json third_party/node/node_modules/clone/package.json -third_party/node/node_modules/coa/node_modules/ansi-styles/package.json -third_party/node/node_modules/coa/node_modules/supports-color/package.json third_party/node/node_modules/color-convert/package.json third_party/node/node_modules/color-name/package.json third_party/node/node_modules/command-line-args/package.json @@ -10138,10 +10131,6 @@ third_party/node/node_modules/css-select-base-adapter/package.json third_party/node/node_modules/css-tree/data/patch.json third_party/node/node_modules/css-tree/lib/lexer/generic.js third_party/node/node_modules/css-tree/lib/syntax/function/element.js -third_party/node/node_modules/css-tree/node_modules/source-map/dist/source-map.js -third_party/node/node_modules/css-tree/node_modules/source-map/lib/base64-vlq.js -third_party/node/node_modules/css-tree/node_modules/source-map/lib/source-map-consumer.js -third_party/node/node_modules/css-tree/node_modules/source-map/package.json third_party/node/node_modules/css-tree/package.json third_party/node/node_modules/css-url-regex/package.json third_party/node/node_modules/csso/lib/restructure/6-restructBlock.js @@ -10149,12 +10138,7 @@ third_party/node/node_modules/csso/node_modules/css-tree/data/patch.json third_party/node/node_modules/csso/node_modules/css-tree/lib/lexer/generic.js third_party/node/node_modules/csso/node_modules/css-tree/lib/syntax/function/element.js third_party/node/node_modules/csso/node_modules/css-tree/package.json -third_party/node/node_modules/csso/node_modules/source-map/dist/source-map.js -third_party/node/node_modules/csso/node_modules/source-map/lib/base64-vlq.js -third_party/node/node_modules/csso/node_modules/source-map/lib/source-map-consumer.js -third_party/node/node_modules/csso/node_modules/source-map/package.json third_party/node/node_modules/csso/package.json -third_party/node/node_modules/debug/dist/debug.js third_party/node/node_modules/debug/package.json third_party/node/node_modules/debug/src/browser.js third_party/node/node_modules/deep-extend/lib/deep-extend.js @@ -10166,8 +10150,8 @@ third_party/node/node_modules/doctrine/lib/typed.js third_party/node/node_modules/doctrine/lib/utility.js third_party/node/node_modules/doctrine/package.json third_party/node/node_modules/dom5/dom5.js -third_party/node/node_modules/es-abstract/es2015.js third_party/node/node_modules/es-abstract/package.json +third_party/node/node_modules/es-to-primitive/package.json third_party/node/node_modules/escape-string-regexp/package.json third_party/node/node_modules/eslint-scope/lib/definition.js third_party/node/node_modules/eslint-scope/lib/index.js @@ -10177,32 +10161,20 @@ third_party/node/node_modules/eslint-scope/lib/referencer.js third_party/node/node_modules/eslint-scope/lib/scope-manager.js third_party/node/node_modules/eslint-scope/lib/scope.js third_party/node/node_modules/eslint-scope/lib/variable.js -third_party/node/node_modules/eslint-scope/node_modules/esrecurse/esrecurse.js -third_party/node/node_modules/eslint-scope/node_modules/esrecurse/gulpfile.babel.js -third_party/node/node_modules/eslint-scope/node_modules/esrecurse/node_modules/estraverse/estraverse.js -third_party/node/node_modules/eslint-scope/node_modules/esrecurse/node_modules/estraverse/gulpfile.js -third_party/node/node_modules/eslint-scope/node_modules/esrecurse/node_modules/estraverse/package.json -third_party/node/node_modules/eslint-scope/node_modules/esrecurse/package.json third_party/node/node_modules/eslint/lib/rules/max-lines-per-function.js -third_party/node/node_modules/eslint/node_modules/acorn/dist/acorn.js -third_party/node/node_modules/eslint/node_modules/acorn/package.json -third_party/node/node_modules/eslint/node_modules/ansi-regex/package.json third_party/node/node_modules/eslint/node_modules/ansi-styles/package.json third_party/node/node_modules/eslint/node_modules/color-convert/package.json third_party/node/node_modules/eslint/node_modules/color-name/package.json -third_party/node/node_modules/eslint/node_modules/doctrine/lib/doctrine.js -third_party/node/node_modules/eslint/node_modules/doctrine/lib/typed.js -third_party/node/node_modules/eslint/node_modules/doctrine/lib/utility.js -third_party/node/node_modules/eslint/node_modules/doctrine/package.json -third_party/node/node_modules/eslint/node_modules/espree/espree.js +third_party/node/node_modules/eslint/node_modules/eslint-scope/lib/definition.js +third_party/node/node_modules/eslint/node_modules/eslint-scope/lib/index.js +third_party/node/node_modules/eslint/node_modules/eslint-scope/lib/pattern-visitor.js +third_party/node/node_modules/eslint/node_modules/eslint-scope/lib/reference.js +third_party/node/node_modules/eslint/node_modules/eslint-scope/lib/referencer.js +third_party/node/node_modules/eslint/node_modules/eslint-scope/lib/scope-manager.js +third_party/node/node_modules/eslint/node_modules/eslint-scope/lib/scope.js +third_party/node/node_modules/eslint/node_modules/eslint-scope/lib/variable.js third_party/node/node_modules/eslint/node_modules/globals/package.json third_party/node/node_modules/eslint/node_modules/has-flag/package.json -third_party/node/node_modules/eslint/node_modules/lodash/_compareMultiple.js -third_party/node/node_modules/eslint/node_modules/lodash/_setData.js -third_party/node/node_modules/eslint/node_modules/lodash/lodash.js -third_party/node/node_modules/eslint/node_modules/lodash/package.json -third_party/node/node_modules/eslint/node_modules/lodash/template.js -third_party/node/node_modules/eslint/node_modules/strip-ansi/package.json third_party/node/node_modules/eslint/node_modules/supports-color/package.json third_party/node/node_modules/espree/espree.js third_party/node/node_modules/esprima/package.json @@ -10214,6 +10186,9 @@ third_party/node/node_modules/esquery/node_modules/estraverse/package.json third_party/node/node_modules/esquery/package.json third_party/node/node_modules/esrecurse/esrecurse.js third_party/node/node_modules/esrecurse/gulpfile.babel.js +third_party/node/node_modules/esrecurse/node_modules/estraverse/estraverse.js +third_party/node/node_modules/esrecurse/node_modules/estraverse/gulpfile.js +third_party/node/node_modules/esrecurse/node_modules/estraverse/package.json third_party/node/node_modules/esrecurse/package.json third_party/node/node_modules/estraverse/estraverse.js third_party/node/node_modules/estraverse/gulpfile.js @@ -10226,21 +10201,37 @@ third_party/node/node_modules/esutils/package.json third_party/node/node_modules/feature-detect-es6/package.json third_party/node/node_modules/find-replace/package.json third_party/node/node_modules/function-bind/package.json +third_party/node/node_modules/get-intrinsic/package.json +third_party/node/node_modules/get-symbol-description/package.json third_party/node/node_modules/glob-parent/package.json third_party/node/node_modules/globals/package.json third_party/node/node_modules/globby/package.json +third_party/node/node_modules/has-ansi/node_modules/ansi-regex/package.json third_party/node/node_modules/has-ansi/package.json +third_party/node/node_modules/has-bigints/package.json third_party/node/node_modules/has-flag/package.json third_party/node/node_modules/has-symbols/package.json +third_party/node/node_modules/has-tostringtag/package.json third_party/node/node_modules/has/package.json third_party/node/node_modules/import-fresh/package.json third_party/node/node_modules/imurmurhash/imurmurhash.js third_party/node/node_modules/imurmurhash/imurmurhash.min.js third_party/node/node_modules/imurmurhash/package.json +third_party/node/node_modules/internal-slot/package.json third_party/node/node_modules/invariant/package.json +third_party/node/node_modules/is-bigint/package.json +third_party/node/node_modules/is-boolean-object/package.json third_party/node/node_modules/is-callable/package.json +third_party/node/node_modules/is-core-module/package.json third_party/node/node_modules/is-finite/package.json third_party/node/node_modules/is-fullwidth-code-point/package.json +third_party/node/node_modules/is-negative-zero/package.json +third_party/node/node_modules/is-number-object/package.json +third_party/node/node_modules/is-regex/package.json +third_party/node/node_modules/is-shared-array-buffer/package.json +third_party/node/node_modules/is-string/package.json +third_party/node/node_modules/is-symbol/package.json +third_party/node/node_modules/is-weakref/package.json third_party/node/node_modules/js-yaml/package.json third_party/node/node_modules/lodash.camelcase/package.json third_party/node/node_modules/lodash.padend/package.json @@ -10253,55 +10244,65 @@ third_party/node/node_modules/lodash/package.json third_party/node/node_modules/lodash/template.js third_party/node/node_modules/loose-envify/package.json third_party/node/node_modules/mdn-data/package.json -third_party/node/node_modules/number-is-nan/package.json third_party/node/node_modules/object-keys/package.json +third_party/node/node_modules/object.getownpropertydescriptors/package.json +third_party/node/node_modules/object.values/package.json third_party/node/node_modules/parent-module/package.json third_party/node/node_modules/parse5/lib/tokenization/tokenizer.js third_party/node/node_modules/parse5/package.json third_party/node/node_modules/path-is-absolute/package.json third_party/node/node_modules/path-key/package.json third_party/node/node_modules/path-type/package.json +third_party/node/node_modules/polymer-analyzer/node_modules/ansi-regex/package.json +third_party/node/node_modules/polymer-analyzer/node_modules/ansi-styles/package.json third_party/node/node_modules/polymer-analyzer/node_modules/babylon/package.json +third_party/node/node_modules/polymer-analyzer/node_modules/chalk/package.json third_party/node/node_modules/polymer-analyzer/node_modules/clone/package.json +third_party/node/node_modules/polymer-analyzer/node_modules/doctrine/lib/doctrine.js +third_party/node/node_modules/polymer-analyzer/node_modules/doctrine/lib/typed.js +third_party/node/node_modules/polymer-analyzer/node_modules/doctrine/lib/utility.js +third_party/node/node_modules/polymer-analyzer/node_modules/doctrine/package.json third_party/node/node_modules/polymer-analyzer/node_modules/dom5/lib/util.js third_party/node/node_modules/polymer-analyzer/node_modules/parse5/lib/tokenizer/index.js third_party/node/node_modules/polymer-analyzer/node_modules/parse5/package.json +third_party/node/node_modules/polymer-analyzer/node_modules/strip-ansi/package.json +third_party/node/node_modules/polymer-analyzer/node_modules/supports-color/package.json third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2/encode-string.js -third_party/node/node_modules/polymer-bundler/node_modules/ansi-styles/package.json +third_party/node/node_modules/polymer-bundler/node_modules/acorn-jsx/node_modules/acorn/dist/acorn.es.js +third_party/node/node_modules/polymer-bundler/node_modules/acorn-jsx/node_modules/acorn/dist/acorn.js +third_party/node/node_modules/polymer-bundler/node_modules/acorn-jsx/node_modules/acorn/package.json +third_party/node/node_modules/polymer-bundler/node_modules/acorn-jsx/node_modules/acorn/src/index.js +third_party/node/node_modules/polymer-bundler/node_modules/acorn-jsx/node_modules/acorn/src/loose/index.js +third_party/node/node_modules/polymer-bundler/node_modules/acorn-jsx/node_modules/acorn/src/options.js third_party/node/node_modules/polymer-bundler/node_modules/array-back/package.json -third_party/node/node_modules/polymer-bundler/node_modules/babylon/package.json third_party/node/node_modules/polymer-bundler/node_modules/clone/package.json +third_party/node/node_modules/polymer-bundler/node_modules/command-line-args/node_modules/typical/package.json third_party/node/node_modules/polymer-bundler/node_modules/command-line-args/package.json third_party/node/node_modules/polymer-bundler/node_modules/command-line-usage/node_modules/array-back/package.json -third_party/node/node_modules/polymer-bundler/node_modules/command-line-usage/node_modules/typical/package.json third_party/node/node_modules/polymer-bundler/node_modules/command-line-usage/package.json third_party/node/node_modules/polymer-bundler/node_modules/deep-extend/lib/deep-extend.js third_party/node/node_modules/polymer-bundler/node_modules/deep-extend/package.json third_party/node/node_modules/polymer-bundler/node_modules/dom5/lib/util.js +third_party/node/node_modules/polymer-bundler/node_modules/espree/espree.js +third_party/node/node_modules/polymer-bundler/node_modules/espree/node_modules/acorn/acorn/dist/acorn.js +third_party/node/node_modules/polymer-bundler/node_modules/espree/node_modules/acorn/dist/acorn.es.js +third_party/node/node_modules/polymer-bundler/node_modules/espree/node_modules/acorn/dist/acorn.js +third_party/node/node_modules/polymer-bundler/node_modules/espree/node_modules/acorn/dist/acorn_loose.es.js +third_party/node/node_modules/polymer-bundler/node_modules/espree/node_modules/acorn/dist/acorn_loose.js +third_party/node/node_modules/polymer-bundler/node_modules/espree/node_modules/acorn/package.json third_party/node/node_modules/polymer-bundler/node_modules/find-replace/package.json third_party/node/node_modules/polymer-bundler/node_modules/parse5/lib/tokenizer/index.js third_party/node/node_modules/polymer-bundler/node_modules/parse5/package.json -third_party/node/node_modules/polymer-bundler/node_modules/polymer-analyzer/node_modules/ansi-styles/package.json -third_party/node/node_modules/polymer-bundler/node_modules/polymer-analyzer/node_modules/chalk/package.json -third_party/node/node_modules/polymer-bundler/node_modules/polymer-analyzer/node_modules/supports-color/package.json -third_party/node/node_modules/polymer-bundler/node_modules/source-map/dist/source-map.js -third_party/node/node_modules/polymer-bundler/node_modules/source-map/lib/base64-vlq.js -third_party/node/node_modules/polymer-bundler/node_modules/source-map/lib/source-map-consumer.js -third_party/node/node_modules/polymer-bundler/node_modules/source-map/package.json -third_party/node/node_modules/polymer-bundler/node_modules/supports-color/package.json +third_party/node/node_modules/polymer-bundler/node_modules/rollup/package.json third_party/node/node_modules/polymer-bundler/node_modules/table-layout/node_modules/array-back/package.json -third_party/node/node_modules/polymer-bundler/node_modules/table-layout/node_modules/typical/package.json third_party/node/node_modules/polymer-bundler/node_modules/table-layout/package.json -third_party/node/node_modules/polymer-bundler/node_modules/typical/package.json -third_party/node/node_modules/polymer-bundler/node_modules/wordwrapjs/node_modules/typical/package.json third_party/node/node_modules/polymer-bundler/node_modules/wordwrapjs/package.json third_party/node/node_modules/polymer-css-build/lib/bundled-shadycss.js -third_party/node/node_modules/polymer-css-build/node_modules/ansi-styles/package.json third_party/node/node_modules/polymer-css-build/node_modules/array-back/package.json third_party/node/node_modules/polymer-css-build/node_modules/clone/package.json +third_party/node/node_modules/polymer-css-build/node_modules/command-line-args/node_modules/typical/package.json third_party/node/node_modules/polymer-css-build/node_modules/command-line-args/package.json third_party/node/node_modules/polymer-css-build/node_modules/command-line-usage/node_modules/array-back/package.json -third_party/node/node_modules/polymer-css-build/node_modules/command-line-usage/node_modules/typical/package.json third_party/node/node_modules/polymer-css-build/node_modules/command-line-usage/package.json third_party/node/node_modules/polymer-css-build/node_modules/deep-extend/lib/deep-extend.js third_party/node/node_modules/polymer-css-build/node_modules/deep-extend/package.json @@ -10309,12 +10310,8 @@ third_party/node/node_modules/polymer-css-build/node_modules/dom5/lib/util.js third_party/node/node_modules/polymer-css-build/node_modules/find-replace/package.json third_party/node/node_modules/polymer-css-build/node_modules/parse5/lib/tokenizer/index.js third_party/node/node_modules/polymer-css-build/node_modules/parse5/package.json -third_party/node/node_modules/polymer-css-build/node_modules/supports-color/package.json third_party/node/node_modules/polymer-css-build/node_modules/table-layout/node_modules/array-back/package.json -third_party/node/node_modules/polymer-css-build/node_modules/table-layout/node_modules/typical/package.json third_party/node/node_modules/polymer-css-build/node_modules/table-layout/package.json -third_party/node/node_modules/polymer-css-build/node_modules/typical/package.json -third_party/node/node_modules/polymer-css-build/node_modules/wordwrapjs/node_modules/typical/package.json third_party/node/node_modules/polymer-css-build/node_modules/wordwrapjs/package.json third_party/node/node_modules/progress/package.json third_party/node/node_modules/q/package.json @@ -10323,15 +10320,14 @@ third_party/node/node_modules/regenerator-runtime/runtime.js third_party/node/node_modules/repeating/package.json third_party/node/node_modules/resolve-from/package.json third_party/node/node_modules/resolve/lib/caller.js -third_party/node/node_modules/rollup/dist/rollup.es.js -third_party/node/node_modules/rollup/dist/rollup.js -third_party/node/node_modules/rollup/node_modules/acorn/dist/acorn.js -third_party/node/node_modules/rollup/node_modules/acorn/package.json -third_party/node/node_modules/rollup/package.json +third_party/node/node_modules/rollup/dist/es/shared/rollup.js +third_party/node/node_modules/rollup/dist/es/shared/watch.js +third_party/node/node_modules/rollup/dist/shared/index.js +third_party/node/node_modules/rollup/dist/shared/rollup.js third_party/node/node_modules/shebang-command/package.json third_party/node/node_modules/shebang-regex/package.json +third_party/node/node_modules/side-channel/package.json third_party/node/node_modules/slash/package.json -third_party/node/node_modules/slice-ansi/node_modules/ansi-styles/package.json third_party/node/node_modules/source-map-support/node_modules/source-map/dist/source-map.js third_party/node/node_modules/source-map-support/node_modules/source-map/lib/base64-vlq.js third_party/node/node_modules/source-map-support/node_modules/source-map/lib/source-map-consumer.js @@ -10344,12 +10340,12 @@ third_party/node/node_modules/source-map/package.json third_party/node/node_modules/string-width/node_modules/ansi-regex/package.json third_party/node/node_modules/string-width/node_modules/strip-ansi/package.json third_party/node/node_modules/string-width/package.json +third_party/node/node_modules/string.prototype.trimend/package.json +third_party/node/node_modules/string.prototype.trimstart/package.json third_party/node/node_modules/strip-ansi/package.json third_party/node/node_modules/strip-indent/package.json third_party/node/node_modules/strip-json-comments/package.json third_party/node/node_modules/supports-color/package.json -third_party/node/node_modules/svgo/node_modules/ansi-styles/package.json -third_party/node/node_modules/svgo/node_modules/supports-color/package.json third_party/node/node_modules/svgo/plugins/_collections.js third_party/node/node_modules/svgo/plugins/inlineStyles.js third_party/node/node_modules/svgo/plugins/minifyStyles.js @@ -10358,11 +10354,6 @@ third_party/node/node_modules/svgo/plugins/removeAttributesBySelector.js third_party/node/node_modules/svgo/plugins/removeDesc.js third_party/node/node_modules/svgo/plugins/removeTitle.js third_party/node/node_modules/table-layout/package.json -third_party/node/node_modules/table/node_modules/lodash/_compareMultiple.js -third_party/node/node_modules/table/node_modules/lodash/_setData.js -third_party/node/node_modules/table/node_modules/lodash/lodash.js -third_party/node/node_modules/table/node_modules/lodash/package.json -third_party/node/node_modules/table/node_modules/lodash/template.js third_party/node/node_modules/terser/dist/bundle.min.js third_party/node/node_modules/terser/lib/ast.js third_party/node/node_modules/terser/lib/compress/index.js @@ -10374,6 +10365,10 @@ third_party/node/node_modules/terser/lib/scope.js third_party/node/node_modules/terser/lib/sourcemap.js third_party/node/node_modules/terser/lib/transform.js third_party/node/node_modules/terser/lib/utils/index.js +third_party/node/node_modules/terser/node_modules/source-map/dist/source-map.js +third_party/node/node_modules/terser/node_modules/source-map/lib/base64-vlq.js +third_party/node/node_modules/terser/node_modules/source-map/lib/source-map-consumer.js +third_party/node/node_modules/terser/node_modules/source-map/package.json third_party/node/node_modules/terser/package.json third_party/node/node_modules/test-value/package.json third_party/node/node_modules/to-fast-properties/package.json @@ -10382,11 +10377,13 @@ third_party/node/node_modules/type-fest/package.json third_party/node/node_modules/typescript/lib/tsserver.js third_party/node/node_modules/typescript/lib/typescript.js third_party/node/node_modules/typical/package.json +third_party/node/node_modules/unbox-primitive/package.json third_party/node/node_modules/uri-js/dist/es5/uri.all.js 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/util.promisify/package.json third_party/node/node_modules/v8-compile-cache/package.json +third_party/node/node_modules/which-boxed-primitive/package.json third_party/node/node_modules/word-wrap/package.json third_party/node/node_modules/wordwrapjs/package.json third_party/node/package.json @@ -10494,14 +10491,12 @@ third_party/pdfium/testing/tools/safetynet_compare.py third_party/pdfium/third_party/agg23/agg_math.h third_party/pdfium/third_party/base/allocator/partition_allocator/address_space_randomization.h third_party/pdfium/third_party/base/memory/aligned_memory.cc -third_party/pdfium/third_party/base/optional.h third_party/pdfium/third_party/freetype/include/freetype-custom-config/ftoption.h third_party/pdfium/third_party/libopenjpeg20/j2k.c third_party/pdfium/third_party/libopenjpeg20/opj_includes.h third_party/pdfium/third_party/libopenjpeg20/opj_inttypes.h third_party/pdfium/third_party/libopenjpeg20/opj_stdint.h third_party/pdfium/third_party/libopenjpeg20/t2.c -third_party/pdfium/third_party/libtiff/tif_ojpeg.c third_party/pdfium/third_party/skia_shared/SkFloatToDecimal.cpp third_party/pdfium/tools/lsan/lsan_suppressions.txt third_party/pdfium/xfa/fgas/font/cfgas_fontmgr.cpp @@ -11349,6 +11344,7 @@ third_party/skia/BUILD.gn third_party/skia/PRESUBMIT.py third_party/skia/RELEASE_NOTES.txt third_party/skia/bench/DashBench.cpp +third_party/skia/bench/DecodeBench.cpp third_party/skia/demos.skia.org/demos/image_decode_web_worker/index.html third_party/skia/demos.skia.org/demos/path_performance/index.html third_party/skia/demos.skia.org/demos/web_worker/index.html @@ -11387,7 +11383,6 @@ third_party/skia/infra/bots/assets/clang_linux/create.py third_party/skia/infra/bots/assets/clang_win/create.py third_party/skia/infra/bots/assets/gcloud_linux/create.py third_party/skia/infra/bots/assets/procdump_win/create.py -third_party/skia/infra/bots/cfg.json third_party/skia/infra/bots/check_deps.py third_party/skia/infra/bots/git_utils.py third_party/skia/infra/bots/recipe_modules/build/api.py @@ -11499,7 +11494,6 @@ third_party/skia/src/ports/SkFontMgr_mac_ct.cpp third_party/skia/src/ports/SkScalerContext_mac_ct.cpp third_party/skia/src/ports/SkScalerContext_win_dw.cpp third_party/skia/src/ports/SkTypeface_mac_ct.cpp -third_party/skia/src/shaders/SkImageShader.cpp third_party/skia/src/utils/SkFloatToDecimal.cpp third_party/skia/src/utils/SkFloatUtils.h third_party/skia/tests/BitmapTest.cpp @@ -11595,7 +11589,6 @@ third_party/swiftshader/src/OpenGL/libGLESv2/CMakeLists.txt third_party/swiftshader/src/Shader/Shader.hpp third_party/swiftshader/src/System/Synchronization.hpp third_party/swiftshader/tests/ReactorUnitTests/ReactorUnitTests.cpp -third_party/swiftshader/tests/fuzzers/VertexRoutineFuzzer.cpp third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/spir-v.xml third_party/swiftshader/third_party/SPIRV-Tools/PRESUBMIT.py third_party/swiftshader/third_party/SPIRV-Tools/tools/sva/package.json @@ -11779,7 +11772,6 @@ third_party/tensorflow-text/src/tensorflow_text/python/metrics/text_similarity_m third_party/tflite/src/configure.py third_party/tflite/src/tensorflow/compiler/mlir/hlo/lib/Dialect/mhlo/transforms/chlo_legalize_to_hlo.cc third_party/tflite/src/tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.cc -third_party/tflite/src/tensorflow/compiler/xla/service/gpu/kernel_mapping_scheme.h third_party/tflite/src/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc third_party/tflite/src/tensorflow/compiler/xla/service/hlo_graph_dumper.cc third_party/tflite/src/tensorflow/compiler/xla/service/hlo_verifier.cc @@ -11801,6 +11793,8 @@ third_party/tflite/src/tensorflow/core/platform/cloud/http_request.h third_party/tflite/src/tensorflow/core/platform/cloud/oauth_client_test.cc third_party/tflite/src/tensorflow/core/platform/cloud/testdata/application_default_credentials.json third_party/tflite/src/tensorflow/core/platform/cloud/testdata/service_account_credentials.json +third_party/tflite/src/tensorflow/core/platform/status.cc +third_party/tflite/src/tensorflow/core/platform/status.h third_party/tflite/src/tensorflow/core/platform/windows/env.cc third_party/tflite/src/tensorflow/core/platform/windows/stacktrace.cc third_party/tflite/src/tensorflow/core/platform/windows/stacktrace_handler.cc @@ -11812,6 +11806,7 @@ third_party/tflite/src/tensorflow/examples/speech_commands/train.py third_party/tflite/src/tensorflow/lite/delegates/nnapi/nnapi_delegate.h third_party/tflite/src/tensorflow/lite/experimental/acceleration/mini_benchmark/libjpeg_decoder.cc third_party/tflite/src/tensorflow/lite/experimental/acceleration/mini_benchmark/runner.cc +third_party/tflite/src/tensorflow/lite/g3doc/tools/build_java_api_docs.py third_party/tflite/src/tensorflow/lite/kernels/ctc/ctc_beam_search.h third_party/tflite/src/tensorflow/lite/kernels/internal/reference/svdf.h third_party/tflite/src/tensorflow/lite/kernels/svdf.cc @@ -12365,8 +12360,6 @@ third_party/webrtc/modules/video_coding/codecs/vp9/vp9.cc third_party/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc third_party/webrtc/modules/video_coding/packet_buffer.cc third_party/webrtc/modules/video_coding/utility/quality_scaler.cc -third_party/webrtc/net/dcsctp/public/strong_alias.h -third_party/webrtc/net/dcsctp/public/strong_alias_test.cc third_party/webrtc/p2p/base/port_unittest.cc third_party/webrtc/p2p/base/stun_server_unittest.cc third_party/webrtc/p2p/base/turn_port.cc @@ -12402,6 +12395,8 @@ third_party/webrtc/rtc_base/physical_socket_server.cc third_party/webrtc/rtc_base/physical_socket_server_unittest.cc third_party/webrtc/rtc_base/platform_thread_types.cc third_party/webrtc/rtc_base/ssl_stream_adapter_unittest.cc +third_party/webrtc/rtc_base/strong_alias.h +third_party/webrtc/rtc_base/strong_alias_unittest.cc third_party/webrtc/rtc_base/system/arch.h third_party/webrtc/rtc_base/thread_annotations.h third_party/webrtc/rtc_base/thread_unittest.cc @@ -12484,6 +12479,7 @@ third_party/woff2/src/transform.cc third_party/woff2/src/woff2_common.h third_party/woff2/src/woff2_dec.cc third_party/wpt_tools/wpt/tools/lint/rules.py +third_party/wpt_tools/wpt/tools/third_party/pywebsocket3/setup.py third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py third_party/wpt_tools/wpt/tools/wpt/android.py third_party/wpt_tools/wpt/tools/wpt/browser.py @@ -12783,6 +12779,7 @@ tools/metrics/histograms/metadata/service/histograms.xml tools/metrics/histograms/metadata/session/histograms.xml tools/metrics/histograms/metadata/settings/histograms.xml tools/metrics/histograms/metadata/sharing/histograms.xml +tools/metrics/histograms/metadata/side_search/histograms.xml tools/metrics/histograms/metadata/signin/histograms.xml tools/metrics/histograms/metadata/simple/histograms.xml tools/metrics/histograms/metadata/software/histograms.xml @@ -12902,6 +12899,7 @@ tools/perf/core/shard_maps/timing_data/mac-10_12_laptop_low_end-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-10_13_laptop_high_end-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json +tools/perf/core/shard_maps/timing_data/win-10_amd-perf_timing.json tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json tools/perf/core/test_data/benchmarks_to_shard.json tools/perf/core/test_data/test_timing_data.json @@ -13089,7 +13087,6 @@ tools/traceline/svgui/traceline.js tools/tracing/PRESUBMIT.py tools/tracing/rename_breakpad.py tools/traffic_annotation/auditor/tests/extractor_outputs/good_partial_annotation.txt -tools/traffic_annotation/auditor/traffic_annotation_auditor_ui.cc tools/traffic_annotation/sample_traffic_annotation.cc tools/traffic_annotation/scripts/annotation_tools.py tools/traffic_annotation/scripts/auditor/auditor.py @@ -13213,7 +13210,6 @@ ui/file_manager/file_manager/manifest.json ui/file_manager/image_loader/piex/Makefile ui/file_manager/image_loader/piex/package.json ui/file_manager/integration_tests/remote_call.js -ui/file_manager/video_player/manifest.json ui/gfx/color_analysis.h ui/gfx/color_space_win.h ui/gfx/font.h @@ -13233,7 +13229,6 @@ ui/gl/gl_surface_egl.cc ui/gl/gl_surface_presentation_helper.cc ui/gl/hdr_metadata_helper_win.cc ui/gl/vsync_thread_win.cc -ui/gtk/gtk_util.cc ui/gtk/printing/print_dialog_gtk.cc ui/latency/latency_info.h ui/native_theme/native_theme_win.cc diff --git a/patches/core/bromite/disable-fetching-field-trials.patch b/patches/core/bromite/disable-fetching-field-trials.patch index 8cd6e8e4..dc93974b 100644 --- a/patches/core/bromite/disable-fetching-field-trials.patch +++ b/patches/core/bromite/disable-fetching-field-trials.patch @@ -67,7 +67,7 @@ Subject: Disable fetching of all field trials /* Alphabetical: */ --- a/components/variations/service/variations_service.cc +++ b/components/variations/service/variations_service.cc -@@ -240,17 +240,7 @@ bool GetInstanceManipulations(const net: +@@ -238,17 +238,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 c674b9b0..7570f2f0 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 -@@ -2180,7 +2180,6 @@ static_library("browser") { +@@ -2195,7 +2195,6 @@ static_library("browser") { "//components/reputation/core:proto", "//components/resources", "//components/safe_browsing/content/browser", @@ -8,7 +8,7 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", -@@ -3660,8 +3659,6 @@ static_library("browser") { +@@ -3706,8 +3705,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -30,7 +30,7 @@ namespace subresource_filter { class RulesetService; } -@@ -214,9 +210,6 @@ class BrowserProcess { +@@ -218,9 +214,6 @@ class BrowserProcess { // on this platform (or this is a unit test). virtual StatusTray* status_tray() = 0; @@ -50,7 +50,7 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/site_isolation/prefs_observer.h" #include "chrome/browser/ssl/secure_origin_prefs_observer.h" -@@ -392,8 +391,6 @@ void BrowserProcessImpl::StartTearDown() +@@ -395,8 +394,6 @@ void BrowserProcessImpl::StartTearDown() metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -59,7 +59,7 @@ network_time_tracker_.reset(); #if BUILDFLAG(ENABLE_PLUGINS) plugins_resource_service_.reset(); -@@ -1023,14 +1020,6 @@ StatusTray* BrowserProcessImpl::status_t +@@ -1030,14 +1027,6 @@ StatusTray* BrowserProcessImpl::status_t return status_tray_.get(); } @@ -74,7 +74,7 @@ subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1295,26 +1284,6 @@ void BrowserProcessImpl::CreateBackgroun +@@ -1300,26 +1289,6 @@ void BrowserProcessImpl::CreateBackgroun #endif } @@ -103,7 +103,7 @@ created_subresource_filter_ruleset_service_ = true; --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -186,7 +186,6 @@ class BrowserProcessImpl : public Browse +@@ -190,7 +190,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr manager) override; #endif StatusTray* status_tray() override; @@ -111,7 +111,7 @@ subresource_filter::RulesetService* subresource_filter_ruleset_service() override; federated_learning::FlocSortingLshClustersService* -@@ -340,9 +339,6 @@ class BrowserProcessImpl : public Browse +@@ -344,9 +343,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr background_mode_manager_; #endif @@ -131,7 +131,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/share/share_history.h" #include "chrome/browser/share/share_ranking.h" -@@ -662,10 +661,6 @@ void ChromeBrowsingDataRemoverDelegate:: +@@ -643,10 +642,6 @@ void ChromeBrowsingDataRemoverDelegate:: base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -144,7 +144,7 @@ delete_begin, delete_end, filter_builder, host_content_settings_map_, --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -916,30 +916,6 @@ void SetApplicationLocaleOnIOThread(cons +@@ -921,34 +921,6 @@ void SetApplicationLocaleOnIOThread(cons GetIOThreadApplicationLocale() = locale; } @@ -158,6 +158,12 @@ - content::WebContents* web_contents) - : service_(CertificateReportingServiceFactory::GetForBrowserContext( - web_contents->GetBrowserContext())) {} +- +- CertificateReportingServiceCertReporter( +- const CertificateReportingServiceCertReporter&) = delete; +- CertificateReportingServiceCertReporter& operator=( +- const CertificateReportingServiceCertReporter&) = delete; +- - ~CertificateReportingServiceCertReporter() override {} - - // SSLCertReporter implementation @@ -168,14 +174,12 @@ - - private: - CertificateReportingService* service_; -- -- DISALLOW_COPY_AND_ASSIGN(CertificateReportingServiceCertReporter); -}; - #if BUILDFLAG(ENABLE_EXTENSIONS) AppLoadedInTabSource ClassifyAppLoadedInTabSource( -@@ -1356,7 +1332,6 @@ void ChromeContentBrowserClient::PostAft +@@ -1423,7 +1395,6 @@ void ChromeContentBrowserClient::PostAft InitNetworkContextsParentDirectory(); DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -183,7 +187,7 @@ } bool ChromeContentBrowserClient::IsBrowserStartupComplete() { -@@ -4059,7 +4034,7 @@ ChromeContentBrowserClient::CreateThrott +@@ -4229,7 +4200,7 @@ ChromeContentBrowserClient::CreateThrott content::WebContents* web_contents = handle->GetWebContents(); throttles.push_back(std::make_unique( handle, @@ -192,7 +196,7 @@ base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp), base::BindOnce( &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps))); -@@ -4088,15 +4063,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -4258,15 +4229,6 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -233,7 +237,7 @@ } // namespace --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -396,13 +396,6 @@ ChromeDownloadManagerDelegate::~ChromeDo +@@ -436,13 +436,6 @@ ChromeDownloadManagerDelegate::~ChromeDo void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) { download_manager_ = dm; @@ -247,7 +251,7 @@ } #if defined(OS_ANDROID) -@@ -749,16 +742,6 @@ void ChromeDownloadManagerDelegate::Choo +@@ -791,16 +784,6 @@ void ChromeDownloadManagerDelegate::Choo void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( base::FilePath* filename) { @@ -266,7 +270,7 @@ void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -87,7 +87,7 @@ class DownloadItemModelData : public bas +@@ -86,7 +86,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. @@ -275,7 +279,7 @@ // Whether the download is currently being revived. bool is_being_revived_; -@@ -124,7 +124,7 @@ DownloadItemModelData::DownloadItemModel +@@ -123,7 +123,7 @@ DownloadItemModelData::DownloadItemModel : should_show_in_shelf_(true), was_ui_notified_(false), should_prefer_opening_in_browser_(false), @@ -284,7 +288,7 @@ is_being_revived_(false) {} } // namespace -@@ -378,13 +378,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -381,13 +381,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -301,7 +305,7 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -593,9 +593,6 @@ bool DownloadItemModel::IsCommandEnabled +@@ -599,9 +599,6 @@ bool DownloadItemModel::IsCommandEnabled // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -313,7 +317,7 @@ return !download_->IsSavePackageDownload() && --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc -@@ -259,14 +259,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr +@@ -260,14 +260,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) + extension); @@ -329,7 +333,7 @@ } } -@@ -474,10 +467,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c +@@ -475,10 +468,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension( const base::FilePath& file_name) { base::FilePath::StringType extension = file_name.Extension(); @@ -397,7 +401,7 @@ #include "chrome/browser/download/download_file_icon_extractor.h" #include "chrome/browser/download/download_open_prompt.h" #include "chrome/browser/download/download_prefs.h" -@@ -1271,9 +1270,6 @@ DownloadsAcceptDangerFunction::Downloads +@@ -1274,9 +1273,6 @@ DownloadsAcceptDangerFunction::Downloads DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} @@ -407,7 +411,7 @@ ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() { std::unique_ptr params( downloads::AcceptDanger::Params::Create(args())); -@@ -1311,42 +1307,7 @@ void DownloadsAcceptDangerFunction::Prom +@@ -1314,42 +1310,7 @@ void DownloadsAcceptDangerFunction::Prom return; } RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); @@ -461,7 +465,7 @@ #include "chrome/common/extensions/api/downloads.h" #include "components/download/content/public/all_download_item_notifier.h" #include "components/download/public/common/download_path_reservation_tracker.h" -@@ -187,26 +186,16 @@ class DownloadsRemoveFileFunction : publ +@@ -199,13 +198,6 @@ class DownloadsRemoveFileFunction : publ class DownloadsAcceptDangerFunction : public ExtensionFunction { public: @@ -474,7 +478,8 @@ - DECLARE_EXTENSION_FUNCTION("downloads.acceptDanger", DOWNLOADS_ACCEPTDANGER) DownloadsAcceptDangerFunction(); - ResponseAction Run() override; + +@@ -217,13 +209,10 @@ class DownloadsAcceptDangerFunction : pu protected: ~DownloadsAcceptDangerFunction() override; @@ -485,9 +490,9 @@ void PromptOrWait(int download_id, int retries); - static OnPromptCreatedCallback* on_prompt_created_; - DISALLOW_COPY_AND_ASSIGN(DownloadsAcceptDangerFunction); }; + class DownloadsShowFunction : public ExtensionFunction { --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc @@ -54,38 +54,7 @@ SafeBrowsingPrivateGetReferrerChainFunct @@ -531,7 +536,7 @@ referrer_entries))); --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -681,18 +681,6 @@ void WebstorePrivateBeginInstallWithMani +@@ -683,18 +683,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -550,7 +555,7 @@ } void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone( -@@ -1157,52 +1145,9 @@ WebstorePrivateGetReferrerChainFunction: +@@ -1159,52 +1147,9 @@ WebstorePrivateGetReferrerChainFunction: ExtensionFunction::ResponseAction WebstorePrivateGetReferrerChainFunction::Run() { @@ -667,7 +672,7 @@ std::unique_ptr response_body) { --- a/chrome/browser/extensions/blocklist_state_fetcher.h +++ b/chrome/browser/extensions/blocklist_state_fetcher.h -@@ -34,8 +34,6 @@ class BlocklistStateFetcher { +@@ -37,8 +37,6 @@ class BlocklistStateFetcher { virtual void Request(const std::string& id, RequestCallback callback); @@ -676,7 +681,7 @@ protected: void OnURLLoaderComplete(network::SimpleURLLoader* url_loader, std::unique_ptr response_body); -@@ -54,7 +52,6 @@ class BlocklistStateFetcher { +@@ -57,7 +55,6 @@ class BlocklistStateFetcher { void SendRequest(const std::string& id); @@ -686,7 +691,7 @@ // SimpleURLLoader -> (owned loader, extension id). --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -823,9 +823,6 @@ void ChromeMetricsServiceClient::Registe +@@ -828,9 +828,6 @@ void ChromeMetricsServiceClient::Registe metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -710,7 +715,7 @@ // static --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -294,7 +294,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -297,7 +297,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(IS_CHROMEOS_LACROS) CertDbInitializerFactory::GetInstance(); #endif @@ -725,10 +730,10 @@ #include "chrome/browser/push_messaging/push_messaging_service_factory.h" #include "chrome/browser/push_messaging/push_messaging_service_impl.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" + #include "chrome/browser/sessions/exit_type_service.h" #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" - #include "chrome/browser/signin/signin_ui_util.h" -@@ -658,17 +657,6 @@ void ProfileImpl::LoadPrefsForNormalStar +@@ -627,17 +626,6 @@ void ProfileImpl::LoadPrefsForNormalStar mojo::PendingRemote pref_validation_delegate; @@ -768,7 +773,7 @@ sources = [ "chrome_controller_client.cc", "chrome_controller_client.h", -@@ -86,6 +87,7 @@ static_library("safe_browsing") { +@@ -88,6 +89,7 @@ static_library("safe_browsing") { "//extensions/browser", ] } @@ -776,7 +781,7 @@ if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode -@@ -410,6 +412,7 @@ static_library("advanced_protection") { +@@ -411,6 +413,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -784,7 +789,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -426,6 +429,7 @@ source_set("metrics_collector") { +@@ -428,6 +431,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -886,7 +891,7 @@ --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -3885,7 +3885,6 @@ static_library("ui") { +@@ -3946,7 +3946,6 @@ static_library("ui") { "views/device_chooser_content_view.h", "views/devtools_process_observer.cc", "views/devtools_process_observer.h", @@ -896,7 +901,7 @@ "views/download/download_item_view.cc", --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -318,16 +318,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -330,16 +330,6 @@ void TabHelpers::AttachTabHelpers(WebCon // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); @@ -932,8 +937,8 @@ - ShowDangerPrompt(file); } - void DownloadsDOMHandler::DiscardDangerous(const std::string& id) { -@@ -319,12 +315,6 @@ void DownloadsDOMHandler::RemoveDownload + void DownloadsDOMHandler::AcceptIncognitoWarning(const std::string& id) { +@@ -325,12 +321,6 @@ void DownloadsDOMHandler::RemoveDownload IdSet ids; for (auto* download : to_remove) { @@ -946,7 +951,7 @@ DownloadItemModel item_model(download); if (!item_model.ShouldShowInShelf() || download->GetState() == download::DownloadItem::IN_PROGRESS) { -@@ -398,44 +388,6 @@ void DownloadsDOMHandler::FinalizeRemova +@@ -404,44 +394,6 @@ void DownloadsDOMHandler::FinalizeRemova } } @@ -1001,7 +1006,7 @@ #include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h" #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h" #include "content/public/browser/web_contents_observer.h" -@@ -89,18 +88,6 @@ class DownloadsDOMHandler : public conte +@@ -94,18 +93,6 @@ class DownloadsDOMHandler : public conte // null-checking |original_notifier_|. content::DownloadManager* GetOriginalNotifierManager() const; @@ -1022,7 +1027,7 @@ bool IsDeletingHistoryAllowed(); --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -279,117 +279,6 @@ CreateHttpsOnlyModePage(content::WebCont +@@ -281,116 +281,6 @@ CreateHttpsOnlyModePage(content::WebCont request_url)); } @@ -1063,8 +1068,6 @@ - resource.is_subresource = request_url != main_frame_url; - resource.is_subframe = false; - resource.threat_type = threat_type; -- resource.web_contents_getter = -- security_interstitials::GetWebContentsGetter(primary_main_frame_id); - resource.render_process_id = primary_main_frame_id.child_id; - resource.render_frame_id = primary_main_frame_id.frame_routing_id; - resource.threat_source = g_browser_process->safe_browsing_service() @@ -1112,14 +1115,15 @@ - is_giant_webview = true; - } - } +- const content::GlobalRenderFrameHostId primary_main_frame_id = +- web_contents->GetMainFrame()->GetGlobalId(); - safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource; - resource.url = request_url; - resource.is_subresource = request_url != main_frame_url; - resource.is_subframe = false; - resource.threat_type = threat_type; -- resource.web_contents_getter = security_interstitials::GetWebContentsGetter( -- web_contents->GetMainFrame()->GetProcess()->GetID(), -- web_contents->GetMainFrame()->GetRoutingID()); +- resource.render_process_id = primary_main_frame_id.child_id; +- resource.render_frame_id = primary_main_frame_id.frame_routing_id; - resource.threat_source = g_browser_process->safe_browsing_service() - ->database_manager() - ->GetThreatSource(); @@ -1140,7 +1144,7 @@ #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) std::unique_ptr CreateCaptivePortalBlockingPage( content::WebContents* web_contents) { -@@ -506,8 +395,6 @@ void InterstitialHTMLSource::StartDataRe +@@ -507,8 +397,6 @@ void InterstitialHTMLSource::StartDataRe interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents); } else if (path_without_query == "/legacy-tls") { interstitial_delegate = CreateLegacyTLSBlockingPage(web_contents); @@ -1149,7 +1153,7 @@ } else if (path_without_query == "/clock") { interstitial_delegate = CreateBadClockBlockingPage(web_contents); } else if (path_without_query == "/lookalike") { -@@ -524,16 +411,12 @@ void InterstitialHTMLSource::StartDataRe +@@ -525,16 +413,12 @@ void InterstitialHTMLSource::StartDataRe interstitial_delegate = CreateHttpsOnlyModePage(web_contents); } diff --git a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch index d5b671e0..e2ae5e95 100644 --- a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch +++ b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch @@ -1,6 +1,6 @@ --- a/components/autofill/core/browser/autofill_download_manager.cc +++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -825,96 +825,6 @@ std::tuple AutofillDo +@@ -824,96 +824,6 @@ std::tuple AutofillDo } bool AutofillDownloadManager::StartRequest(FormRequestData request_data) { diff --git a/patches/core/inox-patchset/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index e8701cf6..0d747d5d 100644 --- a/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -22,7 +22,7 @@ } #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -526,18 +521,6 @@ void ComponentLoader::AddDefaultComponen +@@ -495,18 +490,6 @@ void ComponentLoader::AddDefaultComponen AddHangoutServicesExtension(); #endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) @@ -55,7 +55,7 @@ { --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc -@@ -556,20 +556,6 @@ void WebstoreInstaller::DownloadNextPend +@@ -555,20 +555,6 @@ void WebstoreInstaller::DownloadNextPend void WebstoreInstaller::DownloadCrx( const std::string& extension_id, InstallSource source) { @@ -76,7 +76,7 @@ } // http://crbug.com/165634 -@@ -713,21 +699,6 @@ void WebstoreInstaller::UpdateDownloadPr +@@ -712,21 +698,6 @@ void WebstoreInstaller::UpdateDownloadPr void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!crx_installer_.get()); diff --git a/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch b/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch index d473edee..ecdb88c1 100644 --- a/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch +++ b/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch @@ -1,6 +1,6 @@ --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -138,10 +138,10 @@ const unsigned kMinimumTTLSeconds = kCac +@@ -139,10 +139,10 @@ const unsigned kMinimumTTLSeconds = kCac // cached. const int kIPv6ProbePeriodMs = 1000; diff --git a/patches/core/inox-patchset/0021-disable-rlz.patch b/patches/core/inox-patchset/0021-disable-rlz.patch index c4dd7541..1ed581ab 100644 --- a/patches/core/inox-patchset/0021-disable-rlz.patch +++ b/patches/core/inox-patchset/0021-disable-rlz.patch @@ -2,7 +2,7 @@ --- a/BUILD.gn +++ b/BUILD.gn -@@ -483,14 +483,6 @@ group("gn_all") { +@@ -485,14 +485,6 @@ group("gn_all") { deps += [ "//chromeos:chromeos_unittests" ] } diff --git a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index 3b3d3902..335eb85c 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. constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold = --- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc +++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc -@@ -46,8 +46,8 @@ namespace { +@@ -52,8 +52,8 @@ namespace { const char kGoogleDotCom[] = "google.com"; constexpr const char* kGoogleGstaticAppIds[] = { @@ -192,7 +192,7 @@ by default. --- a/chrome/browser/safe_browsing/download_protection/download_feedback.cc +++ b/chrome/browser/safe_browsing/download_protection/download_feedback.cc -@@ -200,7 +200,7 @@ const int64_t DownloadFeedback::kMaxUplo +@@ -202,7 +202,7 @@ const int64_t DownloadFeedback::kMaxUplo // static const char DownloadFeedback::kSbFeedbackURL[] = @@ -223,28 +223,17 @@ by default. // The filename under which we'll store the denylist (in the user data dir). The // old file will be used as a backup in case the new file has not been loaded // yet. ---- a/chrome/browser/tracing/crash_service_uploader.cc -+++ b/chrome/browser/tracing/crash_service_uploader.cc -@@ -42,7 +42,7 @@ using std::string; - - namespace { - --const char kUploadURL[] = "https://clients2.google.com/cr/report"; -+const char kUploadURL[] = "trk:109:https://clients2.google.com/cr/report"; - const char kCrashUploadContentType[] = "multipart/form-data"; - const char kCrashMultipartBoundary[] = - "----**--yradnuoBgoLtrapitluMklaTelgooG--**----"; --- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc +++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc -@@ -37,7 +37,7 @@ namespace { +@@ -54,7 +54,7 @@ const char* kUpdateBrowserRedirectUrl = + #else + // The URL to be used to re-install Chrome when auto-update failed for + // too long. +- "https://www.google.com/chrome"; ++ "trk:242:https://www.google.com/chrome"; + #endif - // The URL to be used to re-install Chrome when auto-update failed for too long. - constexpr char kDownloadChromeUrl[] = -- "https://www.google.com/chrome/?&brand=CHWL" -+ "trk:242:https://www.google.com/chrome/?&brand=CHWL" - "&utm_campaign=en&utm_source=en-et-na-us-chrome-bubble&utm_medium=et"; - - // The maximum number of ignored bubble we track in the NumLaterPerReinstall + bool g_upgrade_bubble_is_showing = false; --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -67,17 +67,17 @@ namespace { @@ -395,7 +384,7 @@ by default. --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc -@@ -142,7 +142,7 @@ bool IsGoogleSearchSubdomainUrl(const GU +@@ -143,7 +143,7 @@ bool IsGoogleSearchSubdomainUrl(const GU // Global functions ----------------------------------------------------------- @@ -526,7 +515,7 @@ by default. return GetContentClient()->browser()->GetWebAuthenticationDelegate(); --- a/content/shell/browser/shell_browser_main_parts.cc +++ b/content/shell/browser/shell_browser_main_parts.cc -@@ -95,7 +95,7 @@ GURL GetStartupURL() { +@@ -96,7 +96,7 @@ GURL GetStartupURL() { #else const base::CommandLine::StringVector& args = command_line->GetArgs(); if (args.empty()) @@ -719,8 +708,8 @@ by default. - "https://www.googleapis.com/auth/supportcontent"; + "trk:104:https://www.googleapis.com/auth/supportcontent"; - // Used to mint uber auth tokens when needed. - const char kGaiaSid[] = "sid"; + // OAuth 2 scope for NTP Photos module API. + const char kPhotosModuleOAuth2Scope[] = --- a/google_apis/gaia/gaia_urls.cc +++ b/google_apis/gaia/gaia_urls.cc @@ -24,6 +24,7 @@ @@ -757,7 +746,7 @@ by default. std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) { --- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc +++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc -@@ -33,7 +33,7 @@ class GaiaCookieMechanism : public jingl +@@ -36,7 +36,7 @@ class GaiaCookieMechanism : public jingl // These attributes are necessary for working with non-gmail gaia // accounts. const std::string NS_GOOGLE_AUTH_PROTOCOL( diff --git a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch index 547d70c5..090f23bd 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -39,7 +39,7 @@ the URL so we get notified if this happens again in the future). kSafeBrowsingIncidentTrafficAnnotation = --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -304,11 +304,14 @@ IncidentReportingService::UploadContext: +@@ -308,11 +308,14 @@ IncidentReportingService::UploadContext: // static bool IncidentReportingService::IsEnabledForProfile(Profile* profile) { @@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future). IncidentReportingService::IncidentReportingService( --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -282,7 +282,7 @@ SafeBrowsingUIManager* SafeBrowsingServi +@@ -286,7 +286,7 @@ SafeBrowsingUIManager* SafeBrowsingServi } void SafeBrowsingService::RegisterAllDelayedAnalysis() { diff --git a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch index 22c45798..f7c2da46 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch @@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware). --- a/components/safe_browsing/content/browser/client_side_detection_service.cc +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc -@@ -210,6 +210,10 @@ void ClientSideDetectionService::StartCl +@@ -209,6 +209,10 @@ void ClientSideDetectionService::StartCl return; } @@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware). // Fill in metadata about which model we used. *request->mutable_population() = delegate_->GetUserPopulation(); -@@ -290,6 +294,7 @@ void ClientSideDetectionService::StartCl +@@ -288,6 +292,7 @@ void ClientSideDetectionService::StartCl base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent, base::Unretained(WebUIInfoSingleton::GetInstance()), std::move(request), access_token)); diff --git a/patches/core/ungoogled-chromium/block-requests.patch b/patches/core/ungoogled-chromium/block-requests.patch index 338a6526..127b09f8 100644 --- a/patches/core/ungoogled-chromium/block-requests.patch +++ b/patches/core/ungoogled-chromium/block-requests.patch @@ -35,7 +35,7 @@ --- a/chrome/browser/search/background/ntp_background_service.cc +++ b/chrome/browser/search/background/ntp_background_service.cc -@@ -66,6 +66,7 @@ void NtpBackgroundService::Shutdown() { +@@ -83,6 +83,7 @@ void NtpBackgroundService::Shutdown() { } void NtpBackgroundService::FetchCollectionInfo() { @@ -65,7 +65,7 @@ if (state_ == REQUESTING) { --- a/components/update_client/update_checker.cc +++ b/components/update_client/update_checker.cc -@@ -127,6 +127,7 @@ void UpdateCheckerImpl::CheckForUpdates( +@@ -129,6 +129,7 @@ void UpdateCheckerImpl::CheckForUpdates( const base::flat_map& additional_attributes, bool enabled_component_updates, UpdateCheckCallback update_check_callback) { diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index fd0dfca1..f2627284 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -35,7 +35,7 @@ GURL rewritten_tab_url = tab_url; --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc -@@ -532,7 +532,8 @@ void AutocompleteInput::ParseForEmphasiz +@@ -533,7 +533,8 @@ void AutocompleteInput::ParseForEmphasiz // For the view-source and blob schemes, we should emphasize the host of the // URL qualified by the view-source or blob prefix. if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) || @@ -60,7 +60,7 @@ return GURL(parts.scheme.is_valid() ? text : FixupPath(text)); --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc -@@ -821,6 +821,7 @@ ChildProcessSecurityPolicyImpl::ChildPro +@@ -861,6 +861,7 @@ ChildProcessSecurityPolicyImpl::ChildPro #endif // BUILDFLAG(ENABLE_WEBSOCKETS) RegisterWebSafeScheme(url::kFtpScheme); RegisterWebSafeScheme(url::kDataScheme); @@ -70,7 +70,7 @@ // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1008,6 +1008,8 @@ component("net") { +@@ -1010,6 +1010,8 @@ component("net") { "url_request/report_sender.h", "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", @@ -160,7 +160,7 @@ using base::Time; using std::string; -@@ -584,6 +586,12 @@ URLRequest::URLRequest(const GURL& url, +@@ -595,6 +597,12 @@ URLRequest::URLRequest(const GURL& url, // Sanity check out environment. DCHECK(base::ThreadTaskRunnerHandle::IsSet()); diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index 4cb3692b..a191c638 100644 --- a/patches/core/ungoogled-chromium/disable-crash-reporter.patch +++ b/patches/core/ungoogled-chromium/disable-crash-reporter.patch @@ -1,39 +1,8 @@ # Disable some background communication with clients2.google.com ---- a/chrome/browser/tracing/crash_service_uploader.cc -+++ b/chrome/browser/tracing/crash_service_uploader.cc -@@ -131,11 +131,16 @@ void TraceCrashServiceUploader::DoUpload - progress_callback_ = progress_callback; - done_callback_ = std::move(done_callback); - -- base::ThreadPool::PostTask( -+ if (!progress_callback_.is_null()) { -+ base::ThreadPool::PostTask( - FROM_HERE, {base::TaskPriority::BEST_EFFORT}, -- base::BindOnce(&TraceCrashServiceUploader::DoCompressOnBackgroundThread, -- base::Unretained(this), file_contents, upload_mode, -- upload_url_, std::move(metadata))); -+ base::BindOnce(progress_callback_, 1, 1)); -+ } -+ if (!done_callback_.is_null()) { -+ base::ThreadPool::PostTask( -+ FROM_HERE, {base::TaskPriority::BEST_EFFORT}, -+ base::BindOnce(std::move(done_callback_), true, "Upload skipped.")); -+ } - } - - void TraceCrashServiceUploader::DoCompressOnBackgroundThread( -@@ -312,6 +317,7 @@ bool TraceCrashServiceUploader::Compress - void TraceCrashServiceUploader::CreateAndStartURLLoader( - const std::string& upload_url, - const std::string& post_data) { -+ return; - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - DCHECK(!simple_url_loader_); - --- a/components/crash/core/app/crashpad_linux.cc +++ b/components/crash/core/app/crashpad_linux.cc -@@ -55,8 +55,7 @@ void SetFirstChanceExceptionHandler(bool +@@ -59,8 +59,7 @@ void SetFirstChanceExceptionHandler(bool } bool IsCrashpadEnabled() { diff --git a/patches/core/ungoogled-chromium/disable-floc.patch b/patches/core/ungoogled-chromium/disable-floc.patch index b88acdc2..a43271e1 100644 --- a/patches/core/ungoogled-chromium/disable-floc.patch +++ b/patches/core/ungoogled-chromium/disable-floc.patch @@ -56,7 +56,7 @@ } // Returns the number of days in |time|, rounded to the closest day by hour if -@@ -208,7 +207,7 @@ PrivacySandboxSettings::PrivacySandboxSe +@@ -207,7 +206,7 @@ PrivacySandboxSettings::PrivacySandboxSe PrivacySandboxSettings::~PrivacySandboxSettings() = default; bool PrivacySandboxSettings::IsFlocAllowed() const { diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index 66a3709d..047b47b3 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -130,7 +130,7 @@ #endif --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc -@@ -33,111 +33,6 @@ namespace google_util { +@@ -33,112 +33,6 @@ namespace google_util { namespace { @@ -148,10 +148,11 @@ -// with a valid TLD that appears in |allowed_tlds|. If |subdomain_permission| is -// ALLOW_SUBDOMAIN, we check against host "*.." -// instead. +-template -bool IsValidHostName(base::StringPiece host, - base::StringPiece domain_in_lower_case, - SubdomainPermission subdomain_permission, -- const base::flat_set& allowed_tlds) { +- const Container& allowed_tlds) { - // Fast path to avoid searching the registry set. - if (host.find(domain_in_lower_case) == base::StringPiece::npos) - return false; @@ -205,21 +206,21 @@ - if (base_url.is_valid() && (canonical_host == base_url.host_piece())) - return true; - -- static const base::NoDestructor> -- google_tlds(std::initializer_list({GOOGLE_TLD_LIST})); +- static constexpr auto google_tlds = +- base::MakeFixedFlatSet({GOOGLE_TLD_LIST}); - return IsValidHostName(canonical_host, "google", subdomain_permission, -- *google_tlds); +- google_tlds); -} - -bool IsCanonicalHostYoutubeHostname(base::StringPiece canonical_host, - SubdomainPermission subdomain_permission) { -- static const base::NoDestructor> -- youtube_tlds( -- std::initializer_list({YOUTUBE_TLD_LIST})); +- static constexpr auto youtube_tlds = +- base::MakeFixedFlatSet({YOUTUBE_TLD_LIST}); +- - return IsValidHostName(canonical_host, "youtube", subdomain_permission, -- *youtube_tlds) || -- IsValidHostName(canonical_host, "youtubekids", subdomain_permission, -- *youtube_tlds); +- youtube_tlds) || +- IsValidHostName(canonical_host, "youtubekids", subdomain_permission, +- youtube_tlds); -} - -// True if |url| is a valid URL with a host that is in the static list of @@ -232,17 +233,17 @@ - base::StringPiece host(url.host_piece()); - StripTrailingDot(&host); - -- static const base::NoDestructor> -- google_subdomains(std::initializer_list( -- {"ipv4.google.com", "ipv6.google.com"})); +- static constexpr auto google_subdomains = +- base::MakeFixedFlatSet( +- {"ipv4.google.com", "ipv6.google.com"}); - -- return google_subdomains->contains(host); +- return google_subdomains.contains(host); -} - } // namespace // Global functions ----------------------------------------------------------- -@@ -145,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU +@@ -146,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/"; bool HasGoogleSearchQueryParam(base::StringPiece str) { @@ -255,7 +256,7 @@ return false; } -@@ -161,161 +50,53 @@ std::string GetGoogleLocale(const std::s +@@ -162,161 +50,53 @@ std::string GetGoogleLocale(const std::s GURL AppendGoogleLocaleParam(const GURL& url, const std::string& application_locale) { @@ -484,7 +485,7 @@ bool IsGoogleHostname(const GURL& url) { --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -526,11 +526,7 @@ std::u16string TemplateURLRef::SearchTer +@@ -527,11 +527,7 @@ std::u16string TemplateURLRef::SearchTer bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); @@ -510,8 +511,8 @@ namespace { // The result of checking whether a request to a URL should have variations -@@ -235,29 +231,7 @@ class VariationsHeaderHelper { - } +@@ -238,29 +234,7 @@ class VariationsHeaderHelper { + VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete; bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) { - AppendOmniboxOnDeviceSuggestionsHeaderIfNeeded(url, resource_request_); @@ -541,7 +542,7 @@ } private: -@@ -327,8 +301,6 @@ void RemoveVariationsHeaderIfNeeded( +@@ -328,8 +302,6 @@ void RemoveVariationsHeaderIfNeeded( const net::RedirectInfo& redirect_info, const network::mojom::URLResponseHead& response_head, std::vector* to_be_removed_headers) { @@ -550,7 +551,7 @@ } std::unique_ptr -@@ -358,14 +330,11 @@ CreateSimpleURLLoaderWithVariationsHeade +@@ -359,14 +331,11 @@ CreateSimpleURLLoaderWithVariationsHeade } bool IsVariationsHeader(const std::string& header_name) { @@ -567,7 +568,7 @@ } bool ShouldAppendVariationsHeaderForTesting( -@@ -376,12 +345,6 @@ bool ShouldAppendVariationsHeaderForTest +@@ -377,12 +346,6 @@ bool ShouldAppendVariationsHeaderForTest void UpdateCorsExemptHeaderForVariations( network::mojom::NetworkContextParams* params) { diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index f3eca9ce..3eaf70ce 100644 --- a/patches/core/ungoogled-chromium/disable-mei-preload.patch +++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch @@ -7,7 +7,7 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -345,7 +345,6 @@ if (!is_android && !is_mac) { +@@ -351,7 +351,6 @@ if (!is_android && !is_mac) { } data_deps += [ @@ -15,7 +15,7 @@ "//third_party/widevine/cdm", ] } -@@ -1151,7 +1150,6 @@ if (is_win) { +@@ -1157,7 +1156,6 @@ if (is_win) { ":keystone_registration_framework", ":swiftshader_library", ":widevine_cdm_library", diff --git a/patches/core/ungoogled-chromium/disable-network-time-tracker.patch b/patches/core/ungoogled-chromium/disable-network-time-tracker.patch index 4b34b118..9149da9e 100644 --- a/patches/core/ungoogled-chromium/disable-network-time-tracker.patch +++ b/patches/core/ungoogled-chromium/disable-network-time-tracker.patch @@ -5,7 +5,7 @@ --- a/components/network_time/network_time_tracker.cc +++ b/components/network_time/network_time_tracker.cc -@@ -278,7 +278,7 @@ void NetworkTimeTracker::UpdateNetworkTi +@@ -277,7 +277,7 @@ void NetworkTimeTracker::UpdateNetworkTi } bool NetworkTimeTracker::AreTimeFetchesEnabled() const { diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch index 94cd6732..74686f6e 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc +++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc -@@ -379,7 +379,7 @@ std::vector PrivacySandboxSettings +@@ -378,7 +378,7 @@ std::vector PrivacySandboxSettings } bool PrivacySandboxSettings::IsPrivacySandboxAllowed() { @@ -9,7 +9,7 @@ } bool PrivacySandboxSettings::IsPrivacySandboxEnabled() { -@@ -391,8 +391,6 @@ bool PrivacySandboxSettings::IsPrivacySa +@@ -390,8 +390,6 @@ bool PrivacySandboxSettings::IsPrivacySa } void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) { @@ -20,7 +20,7 @@ void PrivacySandboxSettings::OnCookiesCleared() { --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -65,19 +65,6 @@ +@@ -64,19 +64,6 @@ sub-label="$i18n{permissionsPageDescription}" on-click="onPermissionsPageClick_" role-description="$i18n{subpageArrowRoleDescription}"> @@ -40,17 +40,6 @@ ---- a/chrome/common/chrome_features.cc -+++ b/chrome/common/chrome_features.cc -@@ -789,7 +789,7 @@ const base::Feature kPrivacyReview{"Priv - - // Enables additional control set 2 on the privacy sandbox settings page. - const base::Feature kPrivacySandboxSettings2{"PrivacySandboxSettings2", -- base::FEATURE_ENABLED_BY_DEFAULT}; -+ base::FEATURE_DISABLED_BY_DEFAULT}; - const base::FeatureParam kPrivacySandboxSettings2FlocURL{ - &kPrivacySandboxSettings2, "floc-website-url", - "https://privacysandbox.com/proposals/floc"}; --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc +++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc @@ -31,7 +31,7 @@ namespace privacy_sandbox { diff --git a/patches/core/ungoogled-chromium/disable-untraceable-urls.patch b/patches/core/ungoogled-chromium/disable-untraceable-urls.patch index 8430bb03..8e3bfa82 100644 --- a/patches/core/ungoogled-chromium/disable-untraceable-urls.patch +++ b/patches/core/ungoogled-chromium/disable-untraceable-urls.patch @@ -32,7 +32,7 @@ const char ModelLoader::kClientModelNamePattern[] = "client_model_v5%s_variation_%d.pb"; #if !BUILDFLAG(FULL_SAFE_BROWSING) -@@ -125,7 +123,7 @@ ModelLoader::ModelLoader( +@@ -123,7 +121,7 @@ ModelLoader::ModelLoader( scoped_refptr url_loader_factory, bool is_extended_reporting) : name_(FillInModelName(is_extended_reporting, GetModelNumber())), @@ -41,7 +41,7 @@ update_renderers_callback_(update_renderers_callback), url_loader_factory_(url_loader_factory), last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) { -@@ -138,7 +136,7 @@ ModelLoader::ModelLoader( +@@ -136,7 +134,7 @@ ModelLoader::ModelLoader( scoped_refptr url_loader_factory, const std::string& model_name) : name_(model_name), @@ -50,16 +50,6 @@ update_renderers_callback_(update_renderers_callback), url_loader_factory_(url_loader_factory), last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) { ---- a/components/safe_browsing/content/browser/client_side_model_loader.h -+++ b/components/safe_browsing/content/browser/client_side_model_loader.h -@@ -42,7 +42,6 @@ class ModelLoader { - static const int kClientModelFetchIntervalMs; - static const char kClientModelFinchExperiment[]; - static const char kClientModelFinchParam[]; -- static const char kClientModelUrlPrefix[]; - static const char kClientModelNamePattern[]; - - // Enum used to keep stats about why we fail to get the client model. This --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc @@ -338,7 +338,7 @@ FinancialPing::PingResponse FinancialPin diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index fcc7d175..2760390a 100644 --- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch +++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch @@ -66,17 +66,17 @@ class Profile; -@@ -37,6 +38,7 @@ class ExtensionMigrator : public Externa +@@ -40,6 +41,7 @@ class ExtensionMigrator : public Externa Profile* profile_; const std::string old_id_; const std::string new_id_; + GURL chrome_blank_; - - DISALLOW_COPY_AND_ASSIGN(ExtensionMigrator); }; + + } // namespace extensions --- a/extensions/browser/updater/extension_downloader.cc +++ b/extensions/browser/updater/extension_downloader.cc -@@ -94,27 +94,18 @@ const char kNotFromWebstoreInstallSource +@@ -93,27 +93,18 @@ const char kNotFromWebstoreInstallSource const char kDefaultInstallSource[] = ""; const char kReinstallInstallSource[] = "reinstall"; @@ -106,7 +106,7 @@ bool ShouldRetryRequest(const network::SimpleURLLoader* loader) { DCHECK(loader); -@@ -310,12 +301,6 @@ void ExtensionDownloader::DoStartAllPend +@@ -309,12 +300,6 @@ void ExtensionDownloader::DoStartAllPend ReportStats(); url_stats_ = URLStats(); @@ -119,7 +119,7 @@ fetches_preparing_.clear(); } -@@ -354,11 +339,6 @@ bool ExtensionDownloader::AddExtensionDa +@@ -353,11 +338,6 @@ bool ExtensionDownloader::AddExtensionDa return false; } @@ -131,7 +131,7 @@ // Skip extensions with empty IDs. if (id.empty()) { DLOG(WARNING) << "Found extension with empty ID"; -@@ -367,12 +347,10 @@ bool ExtensionDownloader::AddExtensionDa +@@ -366,12 +346,10 @@ bool ExtensionDownloader::AddExtensionDa return false; } @@ -146,7 +146,7 @@ } else { url_stats_.other_url_count++; } -@@ -846,20 +824,6 @@ void ExtensionDownloader::HandleManifest +@@ -845,20 +823,6 @@ void ExtensionDownloader::HandleManifest update->info); } @@ -155,7 +155,7 @@ - if (fetch_data->base_url().DomainIs(kGoogleDotCom) && - results->daystart_elapsed_seconds >= 0) { - Time day_start = -- Time::Now() - TimeDelta::FromSeconds(results->daystart_elapsed_seconds); +- Time::Now() - base::Seconds(results->daystart_elapsed_seconds); - - for (const ExtensionId& id : extension_ids) { - ExtensionDownloaderDelegate::PingResult& result = ping_results_[id]; @@ -167,7 +167,7 @@ NotifyExtensionsDownloadStageChanged( no_updates, ExtensionDownloaderDelegate::Stage::FINISHED); NotifyExtensionsDownloadFailed( -@@ -1418,11 +1382,7 @@ bool ExtensionDownloader::IterateFetchCr +@@ -1417,11 +1381,7 @@ bool ExtensionDownloader::IterateFetchCr // fetch. switch (fetch->credentials) { case ExtensionFetch::CREDENTIALS_NONE: diff --git a/patches/core/ungoogled-chromium/doh-changes.patch b/patches/core/ungoogled-chromium/doh-changes.patch index 81837832..25cadce7 100644 --- a/patches/core/ungoogled-chromium/doh-changes.patch +++ b/patches/core/ungoogled-chromium/doh-changes.patch @@ -1,11 +1,11 @@ --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -309,12 +309,7 @@ const base::Feature kDesktopPWAsWebBundl +@@ -323,12 +323,7 @@ const base::Feature kDesktopPWAsWebBundl // Enable DNS over HTTPS (DoH). const base::Feature kDnsOverHttps { "DnsOverHttps", -#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_ANDROID) +- defined(OS_ANDROID) || defined(OS_LINUX) - base::FEATURE_ENABLED_BY_DEFAULT -#else base::FEATURE_DISABLED_BY_DEFAULT @@ -13,19 +13,6 @@ }; // Provides a mechanism to remove providers from the dropdown list in the -@@ -331,12 +326,7 @@ const base::FeatureParam kDnsOverH - // Sets whether the DoH setting is displayed in the settings UI. - const base::FeatureParam kDnsOverHttpsShowUiParam { - &kDnsOverHttps, "ShowUi", --#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_ANDROID) - true --#else -- false --#endif - }; - - // Supply one or more space-separated DoH server URI templates to use when this --- a/net/dns/public/doh_provider_entry.cc +++ b/net/dns/public/doh_provider_entry.cc @@ -117,24 +117,6 @@ const DohProviderEntry::List& DohProvide @@ -55,7 +42,7 @@ "https://public.dns.iij.jp/dns-query", --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -113,12 +113,7 @@ const base::Feature kSplitAuthCacheByNet +@@ -114,12 +114,7 @@ const base::Feature kSplitAuthCacheByNet // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode. const base::Feature kDnsOverHttpsUpgrade { "DnsOverHttpsUpgrade", 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 e403aafc..fc8bcc97 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -3,7 +3,7 @@ --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn -@@ -308,11 +308,7 @@ source_set("lib") { +@@ -311,11 +311,7 @@ source_set("lib") { } } @@ -15,7 +15,7 @@ executable("$chromedriver_output") { testonly = true -@@ -336,16 +332,6 @@ executable("$chromedriver_output") { +@@ -337,16 +333,6 @@ executable("$chromedriver_output") { } } @@ -34,7 +34,7 @@ deps = [ --- a/third_party/devtools-frontend/src/BUILD.gn +++ b/third_party/devtools-frontend/src/BUILD.gn -@@ -137,7 +137,6 @@ foreach(module_file, non_autostart_non_r +@@ -136,7 +136,6 @@ foreach(module_file, non_autostart_non_r devtools_frontend_resources_deps = [ ":build_release_devtools", "front_end", diff --git a/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch b/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch index 16438a58..8973bc85 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch @@ -1,6 +1,6 @@ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -1250,6 +1250,10 @@ source_set("browser") { +@@ -1274,6 +1274,10 @@ source_set("browser") { "net/browser_online_state_observer.cc", "net/browser_online_state_observer.h", "net/cookie_store_factory.cc", @@ -11,7 +11,7 @@ "net/network_errors_listing_ui.cc", "net/network_errors_listing_ui.h", "net/network_quality_observer_impl.cc", -@@ -3008,10 +3012,6 @@ source_set("browser") { +@@ -3034,10 +3038,6 @@ source_set("browser") { if (enable_reporting) { sources += [ @@ -24,7 +24,7 @@ ] --- a/content/browser/devtools/protocol/network_handler.h +++ b/content/browser/devtools/protocol/network_handler.h -@@ -304,8 +304,10 @@ class NetworkHandler : public DevToolsDo +@@ -309,8 +309,10 @@ class NetworkHandler : public DevToolsDo Response response, mojo::ScopedDataPipeConsumerHandle pipe, const std::string& mime_type); @@ -51,7 +51,7 @@ base::FeatureList::OVERRIDE_ENABLE_FEATURE}, --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -1137,6 +1137,11 @@ void NetworkContext::QueueSignedExchange +@@ -1140,6 +1140,11 @@ void NetworkContext::QueueSignedExchange const net::NetworkIsolationKey& network_isolation_key) { NOTREACHED(); } @@ -65,7 +65,7 @@ void NetworkContext::ClearDomainReliability( --- a/services/network/network_context.h +++ b/services/network/network_context.h -@@ -567,10 +567,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) +@@ -570,10 +570,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) return require_network_isolation_key_; } @@ -87,7 +87,7 @@ #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h" #include "services/network/public/cpp/features.h" #include "services/network/public/mojom/content_security_policy.mojom-blink.h" -@@ -2284,9 +2285,11 @@ const base::UnguessableToken& LocalFrame +@@ -2304,9 +2305,11 @@ const base::UnguessableToken& LocalFrame return base::UnguessableToken::Null(); } @@ -109,7 +109,7 @@ #include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h" #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h" #include "third_party/blink/public/common/frame/frame_ad_evidence.h" -@@ -545,7 +546,9 @@ class CORE_EXPORT LocalFrame final : pub +@@ -546,7 +547,9 @@ class CORE_EXPORT LocalFrame final : pub SmoothScrollSequencer& GetSmoothScrollSequencer(); diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index f8a6c6d3..6ca4e163 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch @@ -2,7 +2,15 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3680,9 +3680,6 @@ static_library("browser") { +@@ -1953,7 +1953,6 @@ static_library("browser") { + "//chrome/browser/net:probe_message_proto", + "//chrome/browser/new_tab_page/modules/drive:mojo_bindings", + "//chrome/browser/new_tab_page/modules/photos:mojo_bindings", +- "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings", + "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings", + "//chrome/browser/notifications", + "//chrome/browser/notifications/scheduler:factory", +@@ -3726,9 +3725,6 @@ static_library("browser") { "download/offline_item_model_manager_factory.h", "enterprise/connectors/analysis/analysis_service_settings.cc", "enterprise/connectors/analysis/analysis_service_settings.h", @@ -12,7 +20,18 @@ "enterprise/connectors/analysis/content_analysis_dialog.cc", "enterprise/connectors/analysis/content_analysis_dialog.h", "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc", -@@ -6903,9 +6900,14 @@ static_library("browser") { +@@ -3978,10 +3974,6 @@ static_library("browser") { + "new_tab_page/modules/photos/photos_service.h", + "new_tab_page/modules/photos/photos_service_factory.cc", + "new_tab_page/modules/photos/photos_service_factory.h", +- "new_tab_page/modules/safe_browsing/safe_browsing_handler.cc", +- "new_tab_page/modules/safe_browsing/safe_browsing_handler.h", +- "new_tab_page/modules/safe_browsing/safe_browsing_prefs.cc", +- "new_tab_page/modules/safe_browsing/safe_browsing_prefs.h", + "new_tab_page/modules/task_module/task_module_handler.cc", + "new_tab_page/modules/task_module/task_module_handler.h", + "new_tab_page/modules/task_module/task_module_service.cc", +@@ -7012,9 +7004,14 @@ static_library("browser") { "//components/safe_browsing/content/browser:safe_browsing_blocking_page", "//components/safe_browsing/content/browser/download:download_stats", "//components/safe_browsing/content/common:file_type_policies", @@ -44,7 +63,7 @@ auto delegate = std::make_unique(profile); --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -4063,11 +4063,13 @@ ChromeContentBrowserClient::CreateThrott +@@ -4229,11 +4229,13 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -58,7 +77,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -@@ -5452,26 +5454,7 @@ ChromeContentBrowserClient::GetSafeBrows +@@ -5632,26 +5634,7 @@ ChromeContentBrowserClient::GetSafeBrows const std::vector& allowlist_domains) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -86,7 +105,7 @@ } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -5492,11 +5475,6 @@ ChromeContentBrowserClient::GetUrlLookup +@@ -5672,11 +5655,6 @@ ChromeContentBrowserClient::GetUrlLookup GetForProfile(profile); } #endif @@ -100,7 +119,7 @@ --- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc +++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc -@@ -135,45 +135,6 @@ void MaybeCreateSafeBrowsingForRenderer( +@@ -139,45 +139,6 @@ void MaybeCreateSafeBrowsingForRenderer( const std::vector& allowlist_domains)> get_checker_delegate, mojo::PendingReceiver receiver) { @@ -181,7 +200,7 @@ --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -130,7 +130,6 @@ using content::DownloadManager; +@@ -135,7 +135,6 @@ using content::DownloadManager; using download::DownloadItem; using download::DownloadPathReservationTracker; using download::PathValidationResult; @@ -189,7 +208,7 @@ using safe_browsing::DownloadProtectionService; using ConnectionType = net::NetworkChangeNotifier::ConnectionType; -@@ -1389,8 +1388,6 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -1517,8 +1516,6 @@ void ChromeDownloadManagerDelegate::OnDo if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif @@ -198,29 +217,64 @@ } if (ShouldBlockFile(target_info->danger_type, item)) { MaybeReportDangerousDownloadBlocked( -@@ -1529,10 +1526,10 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1670,7 +1667,6 @@ void ChromeDownloadManagerDelegate::Mayb service->MaybeSendDangerousDownloadOpenedReport(download, show_download_in_folder); } -#endif - safe_browsing::RecordDownloadOpened(download->GetDangerType(), - base::Time::Now(), download->GetEndTime(), - show_download_in_folder); + if (!download->GetAutoOpened()) { + download::DownloadContent download_content = + download::DownloadContentFromMimeType(download->GetMimeType(), false); +@@ -1678,6 +1674,7 @@ void ChromeDownloadManagerDelegate::Mayb + download->GetDangerType(), download_content, base::Time::Now(), + download->GetEndTime(), show_download_in_folder); + } +#endif } void ChromeDownloadManagerDelegate::CheckDownloadAllowed( +@@ -1754,30 +1751,6 @@ void ChromeDownloadManagerDelegate::Chec + std::move(callback).Run(true); + return; + } +- +- absl::optional settings = +- safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item); +- +- if (settings.has_value()) { +- DownloadProtectionService* service = GetDownloadProtectionService(); +- // Save package never need malware scans, so exempt them from scanning if +- // there are no other tags. +- settings->tags.erase("malware"); +- if (!settings->tags.empty() && service) { +- download_item->SetUserData( +- enterprise_connectors::SavePackageScanningData::kKey, +- std::make_unique( +- std::move(callback))); +- +- service->UploadSavePackageForDeepScanning( +- download_item, std::move(save_package_files), +- base::BindRepeating( +- &ChromeDownloadManagerDelegate::CheckSavePackageScanningDone, +- weak_ptr_factory_.GetWeakPtr(), download_item->GetId()), +- std::move(settings.value())); +- return; +- } +- } + #endif + std::move(callback).Run(true); + } --- a/chrome/browser/download/download_stats.cc +++ b/chrome/browser/download/download_stats.cc -@@ -7,6 +7,7 @@ - #include "base/metrics/histogram_functions.h" +@@ -8,6 +8,7 @@ #include "base/metrics/user_metrics.h" + #include "base/notreached.h" #include "components/profile_metrics/browser_profile_type.h" +#include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/browser/download/download_stats.h" void RecordDownloadCount(ChromeDownloadCountTypes type) { -@@ -26,8 +27,10 @@ void RecordDangerousDownloadWarningShown +@@ -27,8 +28,10 @@ void RecordDangerousDownloadWarningShown bool has_user_gesture) { base::UmaHistogramEnumeration("Download.ShowedDownloadWarning", danger_type, download::DOWNLOAD_DANGER_TYPE_MAX); @@ -284,7 +338,7 @@ #include "crypto/secure_hash.h" --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -422,19 +422,6 @@ absl::optional ConnectorsSe +@@ -475,19 +475,6 @@ absl::optional ConnectorsSe return absl::nullopt; } @@ -306,7 +360,7 @@ } --- a/chrome/browser/enterprise/connectors/connectors_service.h +++ b/chrome/browser/enterprise/connectors/connectors_service.h -@@ -14,7 +14,6 @@ +@@ -13,7 +13,6 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/keyed_service.h" #include "components/policy/core/common/policy_types.h" @@ -314,7 +368,7 @@ #include "content/public/browser/browser_context.h" namespace base { -@@ -79,12 +78,6 @@ class ConnectorsService : public KeyedSe +@@ -78,12 +77,6 @@ class ConnectorsService : public KeyedSe // is no token to use. absl::optional GetDMTokenForRealTimeUrlCheck() const; @@ -327,17 +381,45 @@ // Returns the CBCM domain or profile domain that enables connector policies. // If both set Connector policies, the CBCM domain is returned as it has // precedence. +--- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc ++++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc +@@ -38,9 +38,6 @@ void CommonSignalsDecorator::Decorate(Si + // Get signals from policy values. + signals.set_built_in_dns_client_enabled( + enterprise_signals::utils::GetBuiltInDnsClientEnabled(local_state_)); +- signals.set_safe_browsing_protection_level(static_cast( +- enterprise_signals::utils::GetSafeBrowsingProtectionLevel( +- profile_prefs_))); + signals.set_remote_desktop_available( + enterprise_signals::utils::GetChromeRemoteDesktopAppBlocked( + policy_blocklist_service_)); +@@ -58,15 +55,6 @@ void CommonSignalsDecorator::Decorate(Si + signals.set_chrome_cleanup_enabled(chrome_cleanup_enabled.value()); + } + +- absl::optional +- password_protection_warning_trigger = +- enterprise_signals::utils::GetPasswordProtectionWarningTrigger( +- profile_prefs_); +- if (password_protection_warning_trigger.has_value()) { +- signals.set_password_protection_warning_trigger( +- static_cast(password_protection_warning_trigger.value())); +- } +- + std::move(done_closure).Run(); + } + --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc -@@ -179,7 +179,6 @@ void ContextInfoFetcher::Fetch(ContextIn +@@ -169,7 +169,6 @@ void ContextInfoFetcher::Fetch(ContextIn GetAnalysisConnectorProviders(enterprise_connectors::FILE_DOWNLOADED); info.on_bulk_data_entry_providers = GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY); - info.realtime_url_check_mode = GetRealtimeUrlCheckMode(); info.on_security_event_providers = GetOnSecurityEventProviders(); info.browser_version = version_info::GetVersionNumber(); - info.safe_browsing_protection_level = GetSafeBrowsingProtectionLevel(); -@@ -228,11 +227,6 @@ std::vector ContextInfoFetc + info.site_isolation_enabled = +@@ -227,11 +226,6 @@ std::vector ContextInfoFetc return connectors_service_->GetAnalysisServiceProviderNames(connector); } @@ -381,6 +463,81 @@ std::vector GetOnSecurityEventProviders(); +--- a/chrome/browser/enterprise/signals/signals_utils.cc ++++ b/chrome/browser/enterprise/signals/signals_utils.cc +@@ -10,7 +10,6 @@ + #include "components/policy/content/policy_blocklist_service.h" + #include "components/policy/core/browser/url_blocklist_manager.h" + #include "components/prefs/pref_service.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + + #if defined(OS_WIN) + #include "components/component_updater/pref_names.h" +@@ -33,24 +32,6 @@ bool IsURLBlocked(const GURL& url, Polic + + } // namespace + +-safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel( +- PrefService* profile_prefs) { +- DCHECK(profile_prefs); +- bool safe_browsing_enabled = +- profile_prefs->GetBoolean(prefs::kSafeBrowsingEnabled); +- bool safe_browsing_enhanced_enabled = +- profile_prefs->GetBoolean(prefs::kSafeBrowsingEnhanced); +- +- if (safe_browsing_enabled) { +- if (safe_browsing_enhanced_enabled) +- return safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION; +- else +- return safe_browsing::SafeBrowsingState::STANDARD_PROTECTION; +- } else { +- return safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING; +- } +-} +- + absl::optional GetThirdPartyBlockingEnabled(PrefService* local_state) { + DCHECK(local_state); + #if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) +@@ -65,15 +46,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ + return local_state->GetBoolean(prefs::kBuiltInDnsClientEnabled); + } + +-absl::optional +-GetPasswordProtectionWarningTrigger(PrefService* profile_prefs) { +- DCHECK(profile_prefs); +- if (!profile_prefs->HasPrefPath(prefs::kPasswordProtectionWarningTrigger)) +- return absl::nullopt; +- return static_cast( +- profile_prefs->GetInteger(prefs::kPasswordProtectionWarningTrigger)); +-} +- + absl::optional GetChromeCleanupEnabled(PrefService* local_state) { + DCHECK(local_state); + #if defined(OS_WIN) +--- a/chrome/browser/enterprise/signals/signals_utils.h ++++ b/chrome/browser/enterprise/signals/signals_utils.h +@@ -5,8 +5,6 @@ + #ifndef CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_ + #define CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_ + +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" +- + #include "third_party/abseil-cpp/absl/types/optional.h" + + class PolicyBlocklistService; +@@ -21,12 +19,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ + + absl::optional GetChromeCleanupEnabled(PrefService* local_state); + +-absl::optional +-GetPasswordProtectionWarningTrigger(PrefService* profile_prefs); +- +-safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel( +- PrefService* profile_prefs); +- + bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service); + + } // namespace utils --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -650,8 +650,6 @@ static_library("extensions") { @@ -414,7 +571,7 @@ --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc -@@ -325,6 +325,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -326,6 +326,7 @@ void SafeBrowsingPrivateEventRouter::OnD event_router_->BroadcastEvent(std::move(extension_event)); } @@ -422,7 +579,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -355,6 +356,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -356,6 +357,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -430,7 +587,7 @@ } void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown( -@@ -382,6 +384,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -383,6 +385,7 @@ void SafeBrowsingPrivateEventRouter::OnS event_router_->BroadcastEvent(std::move(extension_event)); } @@ -438,7 +595,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -405,6 +408,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -406,6 +409,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()), std::move(event)); @@ -446,7 +603,7 @@ } void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded( -@@ -432,6 +436,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -433,6 +437,7 @@ void SafeBrowsingPrivateEventRouter::OnS event_router_->BroadcastEvent(std::move(extension_event)); } @@ -454,7 +611,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -451,6 +456,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -452,6 +457,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()), std::move(event)); @@ -462,7 +619,7 @@ } void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorResult( -@@ -464,6 +470,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -465,6 +471,7 @@ void SafeBrowsingPrivateEventRouter::OnA const enterprise_connectors::ContentAnalysisResponse::Result& result, const int64_t content_size, safe_browsing::EventResult event_result) { @@ -470,7 +627,7 @@ if (result.tag() == "malware") { DCHECK_EQ(1, result.triggered_rules().size()); OnDangerousDeepScanningResult( -@@ -475,6 +482,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -476,6 +483,7 @@ void SafeBrowsingPrivateEventRouter::OnA OnSensitiveDataEvent(url, file_name, download_digest_sha256, mime_type, trigger, scan_id, result, content_size, event_result); } @@ -478,7 +635,7 @@ } void SafeBrowsingPrivateEventRouter::OnDangerousDeepScanningResult( -@@ -490,6 +498,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -491,6 +499,7 @@ void SafeBrowsingPrivateEventRouter::OnD const std::string& malware_category, const std::string& evidence_locker_filepath, const std::string& scan_id) { @@ -486,7 +643,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -527,6 +536,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -528,6 +537,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -494,7 +651,7 @@ } void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent( -@@ -539,6 +549,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -540,6 +550,7 @@ void SafeBrowsingPrivateEventRouter::OnS const enterprise_connectors::ContentAnalysisResponse::Result& result, const int64_t content_size, safe_browsing::EventResult event_result) { @@ -502,7 +659,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -571,6 +582,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -572,6 +583,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()), std::move(event)); @@ -510,7 +667,7 @@ } void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed( -@@ -583,6 +595,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -584,6 +596,7 @@ void SafeBrowsingPrivateEventRouter::OnA safe_browsing::DeepScanAccessPoint access_point, const enterprise_connectors::ContentAnalysisResponse::Result& result, const int64_t content_size) { @@ -518,7 +675,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -615,6 +628,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -616,6 +629,7 @@ void SafeBrowsingPrivateEventRouter::OnA ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()), std::move(event)); @@ -526,7 +683,7 @@ } void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent( -@@ -627,6 +641,7 @@ void SafeBrowsingPrivateEventRouter::OnU +@@ -628,6 +642,7 @@ void SafeBrowsingPrivateEventRouter::OnU const std::string& reason, const int64_t content_size, safe_browsing::EventResult event_result) { @@ -534,7 +691,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -653,6 +668,7 @@ void SafeBrowsingPrivateEventRouter::OnU +@@ -654,6 +669,7 @@ void SafeBrowsingPrivateEventRouter::OnU ReportRealtimeEvent(kKeyUnscannedFileEvent, std::move(settings.value()), std::move(event)); @@ -542,7 +699,7 @@ } void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent( -@@ -678,6 +694,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -679,6 +695,7 @@ void SafeBrowsingPrivateEventRouter::OnD const std::string& scan_id, const int64_t content_size, safe_browsing::EventResult event_result) { @@ -550,7 +707,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -708,6 +725,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -709,6 +726,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -558,7 +715,7 @@ } void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed( -@@ -731,6 +749,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -732,6 +750,7 @@ void SafeBrowsingPrivateEventRouter::OnD const std::string& mime_type, const std::string& scan_id, const int64_t content_size) { @@ -566,7 +723,7 @@ absl::optional settings = GetReportingSettings(); if (!settings.has_value() || -@@ -761,6 +780,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -762,6 +781,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -574,7 +731,7 @@ } void SafeBrowsingPrivateEventRouter::OnLoginEvent( -@@ -1089,7 +1109,11 @@ void SafeBrowsingPrivateEventRouter::Rep +@@ -1087,7 +1107,11 @@ void SafeBrowsingPrivateEventRouter::Rep } std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const { @@ -588,7 +745,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -54,7 +54,6 @@ +@@ -52,7 +52,6 @@ #include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h" #include "chrome/browser/extensions/install_verifier.h" #include "chrome/browser/extensions/installed_loader.h" @@ -596,7 +753,7 @@ #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/browser/extensions/shared_module_service.h" -@@ -374,7 +373,6 @@ ExtensionService::ExtensionService(Profi +@@ -370,7 +369,6 @@ ExtensionService::ExtensionService(Profi safe_browsing_verdict_handler_(extension_prefs, ExtensionRegistry::Get(profile), this), @@ -604,7 +761,7 @@ registry_(ExtensionRegistry::Get(profile)), pending_extension_manager_(profile), install_directory_(install_directory), -@@ -855,47 +853,6 @@ bool ExtensionService::IsExtensionEnable +@@ -852,47 +850,6 @@ bool ExtensionService::IsExtensionEnable return extension_registrar_.IsExtensionEnabled(extension_id); } @@ -652,7 +809,7 @@ void ExtensionService::MaybeEnableRemotelyDisabledExtension( const std::string& extension_id) { -@@ -912,56 +869,6 @@ void ExtensionService::MaybeEnableRemote +@@ -909,56 +866,6 @@ void ExtensionService::MaybeEnableRemote unchanged.erase(extension_id); // Remove the extension from the blocklist. UpdateBlocklistedExtensions({}, unchanged); @@ -672,8 +829,8 @@ - } - // Clear all acknowledged states so the extension will still get disabled if - // it is added to the greylist again. -- blocklist_prefs::ClearAcknowledgedBlocklistStates(extension_id, -- extension_prefs_); +- blocklist_prefs::ClearAcknowledgedGreylistStates(extension_id, +- extension_prefs_); - RemoveDisableReasonAndMaybeEnable(extension_id, - disable_reason::DISABLE_GREYLIST); -} @@ -719,7 +876,7 @@ #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/safe_browsing_verdict_handler.h" #include "chrome/browser/profiles/profile_manager.h" -@@ -258,28 +257,11 @@ class ExtensionService : public Extensio +@@ -269,28 +268,11 @@ class ExtensionService : public Extensio // nothing. void EnableExtension(const std::string& extension_id); @@ -748,7 +905,7 @@ // Disables the extension. If the extension is already disabled, just adds // the |disable_reasons| (a bitmask of disable_reason::DisableReason - there // can be multiple DisableReasons e.g. when an extension comes in disabled -@@ -551,11 +533,6 @@ class ExtensionService : public Extensio +@@ -562,11 +544,6 @@ class ExtensionService : public Extensio // Helper method to determine if an extension can be blocked. bool CanBlockExtension(const Extension* extension) const; @@ -760,7 +917,7 @@ // Enables an extension that was only previously disabled remotely. void MaybeEnableRemotelyDisabledExtension(const std::string& extension_id); -@@ -628,8 +605,6 @@ class ExtensionService : public Extensio +@@ -639,8 +616,6 @@ class ExtensionService : public Extensio SafeBrowsingVerdictHandler safe_browsing_verdict_handler_; @@ -771,7 +928,7 @@ --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc -@@ -467,8 +467,6 @@ void ExtensionSystemImpl::InstallUpdate( +@@ -465,8 +465,6 @@ void ExtensionSystemImpl::InstallUpdate( void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes( const std::string& extension_id, const base::Value& attributes) { @@ -788,18 +945,18 @@ extension_prefs_); - extension_service_->ClearGreylistedAcknowledgedStateAndMaybeReenable( - extension->id()); + UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Enabled", + extension->location()); } - - // Iterate over `greylist` instead of `not_yet_greylisted`, because the -@@ -123,8 +121,6 @@ void SafeBrowsingVerdictHandler::UpdateG +@@ -125,8 +123,6 @@ void SafeBrowsingVerdictHandler::UpdateG blocklist_prefs::BlocklistStateToBitMapBlocklistState(greylist_state); blocklist_prefs::SetSafeBrowsingExtensionBlocklistState( extension->id(), bitmap_greylist_state, extension_prefs_); - extension_service_->MaybeDisableGreylistedExtension(id, - bitmap_greylist_state); + UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Disabled", + extension->location()); } - } - --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc @@ -35,8 +35,6 @@ @@ -811,7 +968,7 @@ #include "chrome/browser/ui/file_system_access_dialogs.h" #include "chrome/common/chrome_paths.h" #include "components/content_settings/core/browser/host_content_settings_map.h" -@@ -301,83 +299,6 @@ BindResultCallbackToCurrentSequence( +@@ -299,83 +297,6 @@ BindResultCallbackToCurrentSequence( base::SequencedTaskRunnerHandle::Get(), std::move(callback)); } @@ -895,7 +1052,7 @@ std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey : base::StrCat({kCustomLastPickedDirectoryKey, "-", id}); -@@ -1108,28 +1029,6 @@ void ChromeFileSystemAccessPermissionCon +@@ -1106,28 +1027,6 @@ void ChromeFileSystemAccessPermissionCon std::move(callback))); } @@ -973,7 +1130,7 @@ #include "chrome/browser/safe_browsing/user_interaction_observer.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/sync/sync_service_factory.h" -@@ -111,11 +110,11 @@ +@@ -110,11 +109,11 @@ #if BUILDFLAG(FULL_SAFE_BROWSING) #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h" #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" @@ -985,8 +1142,8 @@ -#endif #if defined(OS_ANDROID) - #include "base/feature_list.h" -@@ -824,6 +823,7 @@ autofill::LanguageCode ChromePasswordMan + #include "chrome/browser/android/tab_android.h" +@@ -826,6 +825,7 @@ autofill::LanguageCode ChromePasswordMan return autofill::LanguageCode(); } @@ -994,7 +1151,7 @@ safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { return safe_browsing::ChromePasswordProtectionService:: -@@ -834,13 +834,6 @@ ChromePasswordManagerClient::GetPassword +@@ -836,13 +836,6 @@ ChromePasswordManagerClient::GetPassword void ChromePasswordManagerClient::CheckSafeBrowsingReputation( const GURL& form_action, const GURL& frame_url) { @@ -1008,7 +1165,7 @@ } #endif // defined(ON_FOCUS_PING_ENABLED) -@@ -850,22 +843,10 @@ void ChromePasswordManagerClient::CheckP +@@ -852,22 +845,10 @@ void ChromePasswordManagerClient::CheckP const std::vector& matching_reused_credentials, bool password_field_exists) { @@ -1032,7 +1189,7 @@ } #if !defined(OS_ANDROID) -@@ -1342,9 +1323,11 @@ void ChromePasswordManagerClient::OnPast +@@ -1365,9 +1346,11 @@ void ChromePasswordManagerClient::OnPast } was_on_paste_called_ = true; @@ -1045,7 +1202,7 @@ void ChromePasswordManagerClient::RenderFrameCreated( content::RenderFrameHost* render_frame_host) { -@@ -1379,7 +1362,9 @@ void ChromePasswordManagerClient::OnInpu +@@ -1402,7 +1385,9 @@ void ChromePasswordManagerClient::OnInpu if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) { OnPaste(); } else { @@ -1055,7 +1212,7 @@ } #endif // defined(OS_ANDROID) } -@@ -1418,6 +1403,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1441,6 +1426,7 @@ bool ChromePasswordManagerClient::IsPass is_enabled = false; } @@ -1063,7 +1220,7 @@ // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Disable password -@@ -1428,6 +1414,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1451,6 +1437,7 @@ bool ChromePasswordManagerClient::IsPass observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -1073,7 +1230,7 @@ password_manager::BrowserSavePasswordProgressLogger logger( --- a/chrome/browser/password_manager/chrome_password_manager_client.h +++ b/chrome/browser/password_manager/chrome_password_manager_client.h -@@ -200,13 +200,14 @@ class ChromePasswordManagerClient +@@ -207,13 +207,14 @@ class ChromePasswordManagerClient void AnnotateNavigationEntry(bool has_password_field) override; autofill::LanguageCode GetPageLanguage() const override; @@ -1089,14 +1246,14 @@ void CheckProtectedPasswordEntry( password_manager::metrics_util::PasswordType reused_password_type, -@@ -214,6 +215,7 @@ class ChromePasswordManagerClient +@@ -221,6 +222,7 @@ class ChromePasswordManagerClient const std::vector& matching_reused_credentials, bool password_field_exists) override; +#endif // BUILDFLAG(FULL_SAFE_BROWSING) void LogPasswordReuseDetectedEvent() override; - #if !defined(OS_ANDROID) + --- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc +++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc @@ -17,7 +17,6 @@ @@ -1175,7 +1332,7 @@ void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived( --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -22,7 +22,6 @@ +@@ -23,7 +23,6 @@ #include "components/permissions/prediction_service/prediction_service.h" #include "components/permissions/prediction_service/prediction_service_messages.pb.h" #include "components/prefs/pref_service.h" @@ -1183,7 +1340,7 @@ namespace { -@@ -205,10 +204,8 @@ bool PredictionBasedPermissionUiSelector +@@ -212,10 +211,8 @@ bool PredictionBasedPermissionUiSelector permissions::RequestType request_type) { // We need to also check `kQuietNotificationPrompts` here since there is no // generic safeguard anywhere else in the stack. @@ -1195,9 +1352,27 @@ double hold_back_chance = 0.0; bool is_permissions_predictions_enabled = false; switch (request_type) { +--- a/chrome/browser/prefs/browser_prefs.cc ++++ b/chrome/browser/prefs/browser_prefs.cc +@@ -243,7 +243,6 @@ + #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h" + #include "chrome/browser/new_tab_page/modules/drive/drive_service.h" + #include "chrome/browser/new_tab_page/modules/photos/photos_service.h" +-#include "chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.h" + #include "chrome/browser/new_tab_page/modules/task_module/task_module_service.h" + #include "chrome/browser/new_tab_page/promos/promo_service.h" + #include "chrome/browser/search/background/ntp_custom_background_service.h" +@@ -1277,7 +1276,6 @@ void RegisterProfilePrefs(user_prefs::Pr + NewTabPageHandler::RegisterProfilePrefs(registry); + NewTabPageUI::RegisterProfilePrefs(registry); + NewTabUI::RegisterProfilePrefs(registry); +- ntp::SafeBrowsingHandler::RegisterProfilePrefs(registry); + ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry); + PhotosService::RegisterProfilePrefs(registry); + PinnedTabCodec::RegisterProfilePrefs(registry); --- a/chrome/browser/reputation/reputation_service.cc +++ b/chrome/browser/reputation/reputation_service.cc -@@ -119,9 +119,7 @@ void ReputationService::GetReputationSta +@@ -120,9 +120,7 @@ void ReputationService::GetReputationSta ReputationCheckCallback callback) { DCHECK(url.SchemeIsHTTPOrHTTPS()); @@ -1266,6 +1441,68 @@ } } // namespace safe_browsing +--- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc ++++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc +@@ -142,15 +142,6 @@ CreateSettingsPageHelper() { + CreateChromeSettingsPageHelper(); + } + +-void LogSafeBrowsingSecuritySensitiveAction( +- safe_browsing::SafeBrowsingMetricsCollector* metrics_collector) { +- if (metrics_collector) { +- metrics_collector->AddSafeBrowsingEventToPref( +- safe_browsing::SafeBrowsingMetricsCollector::EventType:: +- SECURITY_SENSITIVE_SSL_INTERSTITIAL); +- } +-} +- + } // namespace + + std::unique_ptr +@@ -192,10 +183,6 @@ ChromeSecurityBlockingPageFactory::Creat + } + } + +- LogSafeBrowsingSecuritySensitiveAction( +- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( +- Profile::FromBrowserContext(web_contents->GetBrowserContext()))); +- + auto controller_client = std::make_unique( + web_contents, ssl_info, cert_error, request_url, + std::move(metrics_helper), CreateSettingsPageHelper()); +@@ -264,10 +251,6 @@ ChromeSecurityBlockingPageFactory::Creat + const GURL& request_url, + std::unique_ptr ssl_cert_reporter, + const net::SSLInfo& ssl_info) { +- LogSafeBrowsingSecuritySensitiveAction( +- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( +- Profile::FromBrowserContext(web_contents->GetBrowserContext()))); +- + auto page = std::make_unique( + web_contents, cert_error, request_url, std::move(ssl_cert_reporter), + /*can_show_enhanced_protection_message=*/true, ssl_info, +@@ -289,10 +272,6 @@ ChromeSecurityBlockingPageFactory::Creat + std::unique_ptr ssl_cert_reporter, + const net::SSLInfo& ssl_info, + const std::string& mitm_software_name) { +- LogSafeBrowsingSecuritySensitiveAction( +- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( +- Profile::FromBrowserContext(web_contents->GetBrowserContext()))); +- + auto page = std::make_unique( + web_contents, cert_error, request_url, std::move(ssl_cert_reporter), + /*can_show_enhanced_protection_message=*/true, ssl_info, +@@ -314,10 +293,6 @@ ChromeSecurityBlockingPageFactory::Creat + const GURL& request_url, + std::unique_ptr ssl_cert_reporter, + const net::SSLInfo& ssl_info) { +- LogSafeBrowsingSecuritySensitiveAction( +- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( +- Profile::FromBrowserContext(web_contents->GetBrowserContext()))); +- + auto page = std::make_unique( + web_contents, cert_error, request_url, std::move(ssl_cert_reporter), + /*can_show_enhanced_protection_message=*/true, ssl_info, --- a/chrome/browser/ssl/sct_reporting_service_factory.cc +++ b/chrome/browser/ssl/sct_reporting_service_factory.cc @@ -32,15 +32,7 @@ SCTReportingServiceFactory::~SCTReportin @@ -1309,7 +1546,7 @@ } // namespace --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -512,7 +512,6 @@ static_library("ui") { +@@ -533,7 +533,6 @@ static_library("ui") { "//components/renderer_context_menu", "//components/resources", "//components/safe_browsing/content/browser", @@ -1405,9 +1642,9 @@ if (!enterprise_connectors::ContentAnalysisDelegate::IsEnabled( profile, web_contents->GetLastCommittedURL(), &data, connector)) { std::move(callback).Run( -@@ -141,4 +151,8 @@ void HandleOnPerformDrop( - base::BindOnce(&HandleDropScanData::ScanData, - handle_drop_scan_data->GetWeakPtr())); +@@ -154,4 +164,8 @@ void HandleOnPerformDrop( + std::move(callback).Run( + content::WebContentsViewDelegate::DropCompletionResult::kContinue); } +#else + std::move(callback).Run( @@ -1416,7 +1653,7 @@ } --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc -@@ -836,9 +836,7 @@ void DownloadItemView::UpdateLabels() { +@@ -837,9 +837,7 @@ void DownloadItemView::UpdateLabels() { deep_scanning_label_->SetVisible(mode_ == download::DownloadItemMode::kDeepScanning); if (deep_scanning_label_->GetVisible()) { @@ -1427,7 +1664,7 @@ ? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD : IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD; const std::u16string filename = ElidedFilename(*deep_scanning_label_); -@@ -885,11 +883,15 @@ void DownloadItemView::UpdateButtons() { +@@ -886,11 +884,15 @@ void DownloadItemView::UpdateButtons() { } const bool allow_open_during_deep_scan = @@ -1443,7 +1680,7 @@ open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) || prompt_to_scan || allow_open_during_deep_scan); -@@ -1406,7 +1408,9 @@ void DownloadItemView::ShowContextMenuIm +@@ -1427,7 +1429,9 @@ void DownloadItemView::ShowContextMenuIm } void DownloadItemView::OpenDownloadDuringAsyncScanning() { @@ -1455,7 +1692,7 @@ --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -360,7 +360,6 @@ void DownloadsDOMHandler::OpenDuringScan +@@ -366,7 +366,6 @@ void DownloadsDOMHandler::OpenDuringScan if (download) { DownloadItemModel model(download); model.SetOpenWhenComplete(true); @@ -1465,7 +1702,7 @@ --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -809,12 +809,6 @@ base::Value ManagementUIHandler::GetThre +@@ -805,12 +805,6 @@ base::Value ManagementUIHandler::GetThre &info); } @@ -1475,12 +1712,12 @@ - kManagementOnPageVisitedVisibleData, &info); - } - - #if BUILDFLAG(IS_CHROMEOS_ASH) - std::string enterprise_manager = GetDeviceManager(); - if (enterprise_manager.empty()) + const std::string enterprise_manager = + connectors_service->GetManagementDomain(); + --- a/chrome/browser/webshare/share_service_impl.cc +++ b/chrome/browser/webshare/share_service_impl.cc -@@ -15,7 +15,9 @@ +@@ -14,7 +14,9 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_features.h" @@ -1490,7 +1727,7 @@ #include "components/safe_browsing/core/browser/db/database_manager.h" #include "content/public/browser/web_contents.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" -@@ -183,11 +185,13 @@ void ShareServiceImpl::Share(const std:: +@@ -182,11 +184,13 @@ void ShareServiceImpl::Share(const std:: // Check if at least one file is marked by the download protection service // to send a ping to check this file type. const base::FilePath path = base::FilePath::FromUTF8Unsafe(file->name); @@ -1504,7 +1741,7 @@ // In the case where the original blob handle was to a native file (of // unknown size), the serialized data does not contain an accurate file -@@ -197,6 +201,7 @@ void ShareServiceImpl::Share(const std:: +@@ -196,6 +200,7 @@ void ShareServiceImpl::Share(const std:: } DCHECK(!safe_browsing_request_); @@ -1512,7 +1749,7 @@ if (should_check_url && g_browser_process->safe_browsing_service()) { safe_browsing_request_.emplace( g_browser_process->safe_browsing_service()->database_manager(), -@@ -206,6 +211,7 @@ void ShareServiceImpl::Share(const std:: +@@ -205,6 +210,7 @@ void ShareServiceImpl::Share(const std:: std::move(files), std::move(callback))); return; } @@ -1522,7 +1759,7 @@ std::move(callback), --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1241,7 +1241,6 @@ if (!is_android && !is_fuchsia) { +@@ -1196,7 +1196,6 @@ if (!is_android && !is_fuchsia) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1530,17 +1767,17 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:test_support", -@@ -5358,7 +5357,6 @@ test("unit_tests") { +@@ -5349,7 +5348,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", - "//components/safe_browsing/content/browser:client_side_detection", - "//components/safe_browsing/content/browser:client_side_model_loader", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:mock_password_protection", + "//components/safe_browsing/content/browser/web_ui", --- a/components/password_manager/content/browser/content_password_manager_driver.cc +++ b/components/password_manager/content/browser/content_password_manager_driver.cc -@@ -408,7 +408,7 @@ void ContentPasswordManagerDriver::Check +@@ -407,7 +407,7 @@ void ContentPasswordManagerDriver::Check if (client_->GetMetricsRecorder()) { client_->GetMetricsRecorder()->RecordUserFocusedPasswordField(); } @@ -1551,7 +1788,7 @@ } --- a/components/password_manager/core/browser/password_manager_client.h +++ b/components/password_manager/core/browser/password_manager_client.h -@@ -340,11 +340,14 @@ class PasswordManagerClient { +@@ -339,11 +339,14 @@ class PasswordManagerClient { // Returns the current best guess as to the page's display language. virtual autofill::LanguageCode GetPageLanguage() const; @@ -1567,7 +1804,7 @@ // Checks the safe browsing reputation of the webpage when the // user focuses on a username/password field. This is used for reporting // only, and won't trigger a warning. -@@ -352,6 +355,7 @@ class PasswordManagerClient { +@@ -351,6 +354,7 @@ class PasswordManagerClient { const GURL& frame_url) = 0; #endif @@ -1575,7 +1812,7 @@ // Checks the safe browsing reputation of the webpage where password reuse // happens. This is called by the PasswordReuseDetectionManager when a // protected password is typed on the wrong domain. This may trigger a -@@ -364,6 +368,7 @@ class PasswordManagerClient { +@@ -363,6 +367,7 @@ class PasswordManagerClient { const std::string& username, const std::vector& matching_reused_credentials, bool password_field_exists) = 0; @@ -1585,7 +1822,7 @@ virtual void LogPasswordReuseDetectedEvent() = 0; --- a/components/password_manager/core/browser/password_reuse_detection_manager.cc +++ b/components/password_manager/core/browser/password_reuse_detection_manager.cc -@@ -162,9 +162,11 @@ void PasswordReuseDetectionManager::OnRe +@@ -161,9 +161,11 @@ void PasswordReuseDetectionManager::OnRe ? reused_protected_password_hash->username : ""; @@ -1599,7 +1836,7 @@ void PasswordReuseDetectionManager::SetClockForTesting(base::Clock* clock) { --- a/components/safe_browsing/content/browser/BUILD.gn +++ b/components/safe_browsing/content/browser/BUILD.gn -@@ -83,8 +83,6 @@ source_set("browser") { +@@ -82,8 +82,6 @@ source_set("browser") { "threat_details_cache.h", "threat_details_history.cc", "threat_details_history.h", @@ -1635,74 +1872,74 @@ // Interface for setting the CSD model and to start phishing classification. interface PhishingDetector { // A classification model for client-side phishing detection. ---- a/content/browser/file_system_access/file_system_access_file_writer_impl.cc -+++ b/content/browser/file_system_access/file_system_access_file_writer_impl.cc -@@ -343,15 +343,8 @@ void FileSystemAccessFileWriterImpl::Clo +--- a/content/browser/file_system_access/safe_move_helper.cc ++++ b/content/browser/file_system_access/safe_move_helper.cc +@@ -150,14 +150,8 @@ void SafeMoveHelper::Start(SafeMoveHelpe + return; + } - close_callback_ = std::move(callback); - -- if (!RequireSecurityChecks() || !manager()->permission_context()) { -- DidAfterWriteCheck( -- FileSystemAccessPermissionContext::AfterWriteCheckResult::kAllow); +- if (!RequireSecurityChecks() || !manager_->permission_context()) { + DidAfterWriteCheck( + FileSystemAccessPermissionContext::AfterWriteCheckResult::kAllow); - return; - } - -- ComputeHashForSwapFile( -- base::BindOnce(&FileSystemAccessFileWriterImpl::DoAfterWriteCheck, -- weak_factory_.GetWeakPtr())); -+ DidAfterWriteCheck( -+ FileSystemAccessPermissionContext::AfterWriteCheckResult::kAllow); +- ComputeHashForSourceFile(base::BindOnce(&SafeMoveHelper::DoAfterWriteCheck, +- weak_factory_.GetWeakPtr())); } - void FileSystemAccessFileWriterImpl::AbortImpl(AbortCallback callback) { -@@ -371,35 +364,6 @@ void FileSystemAccessFileWriterImpl::Abo - manager()->RemoveFileWriter(this); + void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) { +@@ -177,38 +171,6 @@ void SafeMoveHelper::ComputeHashForSourc + std::move(wrapped_callback), source_url())); } --// static --void FileSystemAccessFileWriterImpl::DoAfterWriteCheck( -- base::File::Error hash_result, -- const std::string& hash, -- int64_t size) { +-void SafeMoveHelper::DoAfterWriteCheck(base::File::Error hash_result, +- const std::string& hash, +- int64_t size) { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - - if (hash_result != base::File::FILE_OK) { -- // Calculating the hash failed, the destructor will try to delete the swap -- // file, so call the callback to report the error and delete `this`. -- CallCloseCallbackAndDeleteThis(file_system_access_error::FromStatus( -- FileSystemAccessStatus::kOperationAborted, +- // Calculating the hash failed. +- std::move(callback_).Run(file_system_access_error::FromStatus( +- blink::mojom::FileSystemAccessStatus::kOperationAborted, - "Failed to perform Safe Browsing check.")); - return; - } - +- if (!manager_) { +- std::move(callback_).Run(file_system_access_error::FromStatus( +- blink::mojom::FileSystemAccessStatus::kOperationAborted)); +- return; +- } +- - auto item = std::make_unique(); -- item->target_file_path = url().path(); -- item->full_path = swap_url().path(); +- item->target_file_path = dest_url().path(); +- item->full_path = source_url().path(); - item->sha256_hash = hash; - item->size = size; -- item->frame_url = context().url; +- item->frame_url = context_.url; - item->has_user_gesture = has_transient_user_activation_; -- manager()->permission_context()->PerformAfterWriteChecks( -- std::move(item), context().frame_id, -- base::BindOnce(&FileSystemAccessFileWriterImpl::DidAfterWriteCheck, +- manager_->permission_context()->PerformAfterWriteChecks( +- std::move(item), context_.frame_id, +- base::BindOnce(&SafeMoveHelper::DidAfterWriteCheck, - weak_factory_.GetWeakPtr())); -} - - void FileSystemAccessFileWriterImpl::DidAfterWriteCheck( + void SafeMoveHelper::DidAfterWriteCheck( FileSystemAccessPermissionContext::AfterWriteCheckResult result) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ---- a/content/browser/file_system_access/file_system_access_file_writer_impl.h -+++ b/content/browser/file_system_access/file_system_access_file_writer_impl.h -@@ -104,9 +104,6 @@ class CONTENT_EXPORT FileSystemAccessFil - void TruncateImpl(uint64_t length, TruncateCallback callback); - void CloseImpl(CloseCallback callback); - void AbortImpl(AbortCallback callback); +--- a/content/browser/file_system_access/safe_move_helper.h ++++ b/content/browser/file_system_access/safe_move_helper.h +@@ -52,9 +52,6 @@ class CONTENT_EXPORT SafeMoveHelper { + private: + SEQUENCE_CHECKER(sequence_checker_); + - void DoAfterWriteCheck(base::File::Error hash_result, - const std::string& hash, - int64_t size); void DidAfterWriteCheck( FileSystemAccessPermissionContext::AfterWriteCheckResult result); - void DidSwapFileSkipQuarantine(base::File::Error result); + void DidFileSkipQuarantine(base::File::Error result); --- a/content/public/browser/file_system_access_permission_context.h +++ b/content/public/browser/file_system_access_permission_context.h @@ -107,12 +107,6 @@ class FileSystemAccessPermissionContext @@ -1736,7 +1973,7 @@ UpdateService::UpdateService( --- a/weblayer/BUILD.gn +++ b/weblayer/BUILD.gn -@@ -458,7 +458,6 @@ source_set("weblayer_lib_base") { +@@ -463,7 +463,6 @@ source_set("weblayer_lib_base") { "//components/prefs", "//components/profile_metrics", "//components/safe_browsing/content/browser", diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index be3afcfc..d2e85ba6 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -12,7 +12,7 @@ #include "components/url_formatter/url_fixer.h" #include "components/user_prefs/user_prefs.h" #include "components/visitedlink/browser/visitedlink_writer.h" -@@ -463,8 +462,6 @@ void AwBrowserContext::RebuildTable( +@@ -470,8 +469,6 @@ void AwBrowserContext::RebuildTable( } void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) { @@ -120,7 +120,7 @@ #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "content/public/browser/browser_context.h" -@@ -92,8 +90,6 @@ class ProfileDataRemover : public conten +@@ -95,8 +93,6 @@ class ProfileDataRemover : public conten // All the Profile data has been wiped. Clear the last signed in username // as well, so that the next signin doesn't trigger the account // change dialog. @@ -129,7 +129,7 @@ } origin_runner_->PostTask(FROM_HERE, std::move(callback_)); -@@ -131,11 +127,6 @@ SigninManagerAndroid::SigninManagerAndro +@@ -132,11 +128,6 @@ SigninManagerAndroid::SigninManagerAndro DCHECK(user_cloud_policy_manager_); DCHECK(user_policy_signin_service_); @@ -141,7 +141,7 @@ force_browser_signin_.Init(prefs::kForceBrowserSignin, g_browser_process->local_state()); -@@ -159,7 +150,7 @@ void SigninManagerAndroid::Shutdown() { +@@ -160,7 +151,7 @@ void SigninManagerAndroid::Shutdown() { } bool SigninManagerAndroid::IsSigninAllowed() const { @@ -152,7 +152,7 @@ jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const { --- a/chrome/browser/android/signin/signin_manager_android.h +++ b/chrome/browser/android/signin/signin_manager_android.h -@@ -114,9 +114,6 @@ class SigninManagerAndroid : public Keye +@@ -117,9 +117,6 @@ class SigninManagerAndroid : public Keye Profile* const profile_ = nullptr; @@ -233,7 +233,7 @@ user_manager::known_user::SetStringPref( --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -221,7 +221,6 @@ +@@ -225,7 +225,6 @@ #include "components/safe_browsing/core/browser/realtime/url_lookup_service.h" #include "components/safe_browsing/core/browser/url_checker_delegate.h" #include "components/safe_browsing/core/common/features.h" @@ -253,7 +253,7 @@ #include "components/services/quarantine/test_support.h" --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -765,6 +765,7 @@ void DownloadItemModel::ExecuteCommand(D +@@ -783,6 +783,7 @@ void DownloadItemModel::ExecuteCommand(D DownloadUIModel::ExecuteCommand(download_commands, command); break; case DownloadCommands::DEEP_SCAN: @@ -261,10 +261,10 @@ safe_browsing::SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); if (!sb_service) -@@ -790,6 +791,7 @@ void DownloadItemModel::ExecuteCommand(D +@@ -808,6 +809,7 @@ void DownloadItemModel::ExecuteCommand(D safe_browsing::DeepScanningRequest::DeepScanTrigger:: TRIGGER_APP_PROMPT, - std::move(settings)); + safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings)); +#endif break; } @@ -297,7 +297,7 @@ #include "components/signin/public/identity_manager/consent_level.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/user_prefs/user_prefs.h" -@@ -365,8 +364,7 @@ std::string ConnectorsService::GetManage +@@ -406,8 +405,7 @@ std::string ConnectorsService::GetManage absl::optional scope = absl::nullopt; for (const char* scope_pref : @@ -307,7 +307,7 @@ ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED), ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY), ConnectorScopePref(ReportingConnector::SECURITY_EVENT)}) { -@@ -405,20 +403,6 @@ std::string ConnectorsService::GetManage +@@ -458,20 +456,6 @@ std::string ConnectorsService::GetManage absl::optional ConnectorsService::GetDMTokenForRealTimeUrlCheck() const { @@ -330,74 +330,21 @@ --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc -@@ -181,12 +181,9 @@ void ContextInfoFetcher::Fetch(ContextIn - GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY); - info.on_security_event_providers = GetOnSecurityEventProviders(); - info.browser_version = version_info::GetVersionNumber(); -- info.safe_browsing_protection_level = GetSafeBrowsingProtectionLevel(); - info.site_isolation_enabled = - content::SiteIsolationPolicy::UseDedicatedProcessesForAllSites(); - info.built_in_dns_client_enabled = GetBuiltInDnsClientEnabled(); +@@ -183,11 +183,6 @@ void ContextInfoFetcher::Fetch(ContextIn + info.third_party_blocking_enabled = + utils::GetThirdPartyBlockingEnabled(g_browser_process->local_state()); + +- Profile* profile = Profile::FromBrowserContext(browser_context_); +- info.safe_browsing_protection_level = +- utils::GetSafeBrowsingProtectionLevel(profile->GetPrefs()); - info.password_protection_warning_trigger = -- GetPasswordProtectionWarningTrigger(); - info.chrome_cleanup_enabled = GetChromeCleanupEnabled(); - info.chrome_remote_desktop_app_blocked = GetChromeRemoteDesktopAppBlocked(); - info.third_party_blocking_enabled = GetThirdPartyBLockingEnabled(); -@@ -232,25 +229,6 @@ std::vector ContextInfoFetc - enterprise_connectors::ReportingConnector::SECURITY_EVENT); - } +- utils::GetPasswordProtectionWarningTrigger(profile->GetPrefs()); --safe_browsing::SafeBrowsingState --ContextInfoFetcher::GetSafeBrowsingProtectionLevel() { -- Profile* profile = Profile::FromBrowserContext(browser_context_); -- -- bool safe_browsing_enabled = -- profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled); -- bool safe_browsing_enhanced_enabled = -- profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnhanced); -- -- if (safe_browsing_enabled) { -- if (safe_browsing_enhanced_enabled) -- return safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION; -- else -- return safe_browsing::SafeBrowsingState::STANDARD_PROTECTION; -- } else { -- return safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING; -- } --} -- - absl::optional ContextInfoFetcher::GetThirdPartyBLockingEnabled() { - #if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) - return g_browser_process->local_state()->GetBoolean( -@@ -265,17 +243,6 @@ bool ContextInfoFetcher::GetBuiltInDnsCl - prefs::kBuiltInDnsClientEnabled); - } - --absl::optional --ContextInfoFetcher::GetPasswordProtectionWarningTrigger() { -- Profile* profile = Profile::FromBrowserContext(browser_context_); -- if (!profile->GetPrefs()->HasPrefPath( -- prefs::kPasswordProtectionWarningTrigger)) -- return absl::nullopt; -- return static_cast( -- profile->GetPrefs()->GetInteger( -- prefs::kPasswordProtectionWarningTrigger)); --} -- - absl::optional ContextInfoFetcher::GetChromeCleanupEnabled() { #if defined(OS_WIN) - return g_browser_process->local_state()->GetBoolean( + base::ThreadPool::CreateCOMSTATaskRunner({base::MayBlock()}) --- a/chrome/browser/enterprise/signals/context_info_fetcher.h +++ b/chrome/browser/enterprise/signals/context_info_fetcher.h -@@ -12,6 +12,7 @@ - #include "base/callback_forward.h" - #include "build/build_config.h" - #include "chrome/browser/enterprise/signals/signals_common.h" -+#include "third_party/abseil-cpp/absl/types/optional.h" - - namespace content { - class BrowserContext; -@@ -38,11 +39,8 @@ struct ContextInfo { +@@ -38,11 +38,8 @@ struct ContextInfo { std::vector on_bulk_data_entry_providers; std::vector on_security_event_providers; std::string browser_version; @@ -409,20 +356,6 @@ absl::optional chrome_cleanup_enabled; bool chrome_remote_desktop_app_blocked; absl::optional third_party_blocking_enabled; -@@ -90,13 +88,8 @@ class ContextInfoFetcher { - - std::vector GetOnSecurityEventProviders(); - -- safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel(); -- - bool GetBuiltInDnsClientEnabled(); - -- absl::optional -- GetPasswordProtectionWarningTrigger(); -- - absl::optional GetThirdPartyBLockingEnabled(); - - absl::optional GetChromeCleanupEnabled(); --- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc +++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc @@ -77,45 +77,10 @@ api::enterprise_reporting_private::Conte @@ -526,7 +459,7 @@ {"searchSuggestEnabled", prefs::kSearchSuggestEnabled, APIPermissionID::kPrivacy, APIPermissionID::kPrivacy}, {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, -@@ -843,18 +837,6 @@ ExtensionFunction::ResponseAction SetPre +@@ -844,18 +838,6 @@ ExtensionFunction::ResponseAction SetPre base::Value(browser_pref_value->GetBool())); } @@ -545,7 +478,7 @@ preference_api->SetExtensionControlledPref( extension_id(), browser_pref, scope, base::Value::FromUniquePtrValue(std::move(browser_pref_value))); -@@ -907,18 +889,6 @@ ExtensionFunction::ResponseAction ClearP +@@ -908,18 +890,6 @@ ExtensionFunction::ResponseAction ClearP PreferenceAPI::Get(browser_context()) ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); @@ -647,7 +580,7 @@ --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc -@@ -643,9 +643,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore +@@ -647,9 +647,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, GetReferrerChainForNonSafeBrowsingUser) { PrefService* pref_service = browser()->profile()->GetPrefs(); @@ -662,7 +595,7 @@ @@ -9,7 +9,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h" - #include "components/safe_browsing/content/browser/safe_browsing_metrics_collector.h" + #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "extensions/browser/allowlist_state.h" #include "extensions/browser/extension_registry.h" @@ -727,7 +660,7 @@ int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) { --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -42,7 +42,6 @@ +@@ -43,7 +43,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -735,7 +668,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/network_service_instance.h" -@@ -738,13 +737,6 @@ void ProfileNetworkContextService::Confi +@@ -741,13 +740,6 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; network_context_params->enable_expect_ct_reporting = true; @@ -803,7 +736,7 @@ #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver_set.h" -@@ -71,7 +70,6 @@ class TrialComparisonCertVerifierControl +@@ -77,7 +76,6 @@ class TrialComparisonCertVerifierControl void RefreshState(); Profile* profile_; @@ -903,7 +836,7 @@ } --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -82,12 +82,9 @@ +@@ -83,12 +83,9 @@ #include "components/policy/core/common/schema.h" #include "components/policy/policy_constants.h" #include "components/proxy_config/proxy_policy_handler.h" @@ -916,7 +849,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/driver/sync_policy_handler.h" -@@ -204,15 +201,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -209,15 +206,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kQuicAllowed, prefs::kQuicAllowed, base::Value::Type::BOOLEAN }, @@ -932,7 +865,7 @@ { key::kUrlKeyedAnonymizedDataCollectionEnabled, unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, base::Value::Type::BOOLEAN }, -@@ -348,15 +336,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -353,15 +341,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGloballyScopeHTTPAuthCacheEnabled, prefs::kGloballyScopeHTTPAuthCacheEnabled, base::Value::Type::BOOLEAN }, @@ -948,7 +881,7 @@ { key::kSafeSitesFilterBehavior, policy_prefs::kSafeSitesFilterBehavior, base::Value::Type::INTEGER }, -@@ -465,18 +444,12 @@ const PolicyToPreferenceMapEntry kSimple +@@ -470,18 +449,12 @@ const PolicyToPreferenceMapEntry kSimple { key::kMaxConnectionsPerProxy, prefs::kMaxConnectionsPerProxy, base::Value::Type::INTEGER }, @@ -967,7 +900,7 @@ { key::kCECPQ2Enabled, prefs::kCECPQ2Enabled, base::Value::Type::BOOLEAN }, -@@ -676,9 +649,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -684,9 +657,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kIntranetRedirectBehavior, omnibox::kIntranetRedirectBehavior, base::Value::Type::INTEGER }, @@ -977,7 +910,7 @@ { key::kAccessibilityImageLabelsEnabled, prefs::kAccessibilityImageLabelsEnabled, base::Value::Type::BOOLEAN }, -@@ -1600,8 +1570,6 @@ std::unique_ptrAddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); @@ -986,7 +919,7 @@ handlers->AddHandler(std::make_unique( std::make_unique(key::kAuthServerWhitelist, prefs::kAuthServerAllowlist, -@@ -1625,9 +1593,6 @@ std::unique_ptrAddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); -@@ -1716,12 +1681,6 @@ std::unique_ptrAddHandler(std::make_unique( - key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, -@@ -1764,17 +1723,6 @@ std::unique_ptr( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); @@ -1029,7 +962,7 @@ std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -135,7 +135,6 @@ +@@ -139,7 +139,6 @@ #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/proxy_config/pref_proxy_config_tracker_impl.h" @@ -1037,7 +970,7 @@ #include "components/search_engines/template_url_prepopulate_data.h" #include "components/security_interstitials/content/insecure_form_blocking_page.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" -@@ -905,7 +904,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -921,7 +920,6 @@ void RegisterLocalState(PrefRegistrySimp ProfileNetworkContextService::RegisterLocalStatePrefs(registry); profiles::RegisterPrefs(registry); RegisterScreenshotPrefs(registry); @@ -1045,7 +978,7 @@ secure_origin_allowlist::RegisterPrefs(registry); #if !defined(OS_ANDROID) SerialPolicyAllowedPorts::RegisterPrefs(registry); -@@ -1152,7 +1150,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1171,7 +1169,6 @@ void RegisterProfilePrefs(user_prefs::Pr PushMessagingAppIdentifier::RegisterProfilePrefs(registry); QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); @@ -1055,7 +988,7 @@ registry); --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc -@@ -29,7 +29,6 @@ +@@ -31,7 +31,6 @@ #include "components/language/core/browser/pref_names.h" #include "components/proxy_config/proxy_config_dictionary.h" #include "components/proxy_config/proxy_config_pref_names.h" @@ -1063,7 +996,7 @@ #include "components/safe_browsing/core/common/safebrowsing_switches.h" #include "components/sync/base/pref_names.h" #include "content/public/common/content_switches.h" -@@ -74,8 +73,6 @@ const CommandLinePrefStore::BooleanSwitc +@@ -78,8 +77,6 @@ const CommandLinePrefStore::BooleanSwitc {switches::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, true}, {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true}, @@ -1144,7 +1077,7 @@ EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); --- a/chrome/browser/profiles/gaia_info_update_service.cc +++ b/chrome/browser/profiles/gaia_info_update_service.cc -@@ -21,7 +21,6 @@ +@@ -19,7 +19,6 @@ #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/avatar_icon_util.h" @@ -1154,7 +1087,7 @@ #include "components/signin/public/identity_manager/consent_level.h" --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc -@@ -28,7 +28,6 @@ +@@ -27,7 +27,6 @@ #include "chrome/test/base/testing_profile_manager.h" #include "components/prefs/pref_service.h" #include "components/profile_metrics/state.h" @@ -1164,7 +1097,7 @@ #include "content/public/test/browser_task_environment.h" --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc -@@ -28,7 +28,6 @@ +@@ -29,7 +29,6 @@ #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" #include "components/profile_metrics/state.h" @@ -1172,7 +1105,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/resource/resource_bundle.h" -@@ -489,7 +488,7 @@ bool ProfileAttributesEntry::IsUsingDefa +@@ -490,7 +489,7 @@ bool ProfileAttributesEntry::IsUsingDefa } bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const { @@ -1181,7 +1114,7 @@ } size_t ProfileAttributesEntry::GetAvatarIconIndex() const { -@@ -671,9 +670,6 @@ void ProfileAttributesEntry::SetLastDown +@@ -672,9 +671,6 @@ void ProfileAttributesEntry::SetLastDown } void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) { @@ -1193,7 +1126,7 @@ void ProfileAttributesEntry::LockForceSigninProfile(bool is_lock) { --- a/chrome/browser/profiles/profile_attributes_storage.cc +++ b/chrome/browser/profiles/profile_attributes_storage.cc -@@ -35,7 +35,6 @@ +@@ -36,7 +36,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/profile_metrics/state.h" #include "components/signin/public/base/persistent_repeating_timer.h" @@ -1201,7 +1134,7 @@ #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "third_party/icu/source/i18n/unicode/coll.h" -@@ -373,8 +372,6 @@ void ProfileAttributesStorage::AddProfil +@@ -374,8 +373,6 @@ void ProfileAttributesStorage::AddProfil if (params.account_id.HasAccountIdKey()) info.SetStringKey(ProfileAttributesEntry::kAccountIdKey, params.account_id.GetAccountIdKey()); @@ -1212,7 +1145,7 @@ ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted); --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -149,7 +149,6 @@ +@@ -150,7 +150,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/profile_metrics/browser_profile_type.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" @@ -1222,7 +1155,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -91,7 +91,6 @@ +@@ -94,7 +94,6 @@ #include "components/search_engines/default_search_manager.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -1230,7 +1163,7 @@ #include "components/signin/public/identity_manager/consent_level.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -2092,8 +2091,7 @@ void ProfileManager::AddProfileToStorage +@@ -2105,8 +2104,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1240,7 +1173,7 @@ #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -2148,14 +2146,13 @@ void ProfileManager::AddProfileToStorage +@@ -2161,14 +2159,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsEphemeral(profile); init_params.is_signed_in_with_credential_provider = @@ -1293,7 +1226,7 @@ --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -536,7 +536,7 @@ +@@ -535,7 +535,7 @@ @@ -1302,9 +1235,9 @@ no-search> ---- a/chrome/browser/resources/settings/privacy_page/security_page.js -+++ b/chrome/browser/resources/settings/privacy_page/security_page.js -@@ -175,15 +175,6 @@ export class SettingsSecurityPageElement - /** @override */ +--- a/chrome/browser/resources/settings/privacy_page/security_page.ts ++++ b/chrome/browser/resources/settings/privacy_page/security_page.ts +@@ -182,15 +182,6 @@ export class SettingsSecurityPageElement + ready() { super.ready(); - @@ -1448,19 +1381,19 @@ } /** -@@ -241,8 +232,7 @@ export class SettingsSecurityPageElement - * @private - */ - getDisabledExtendedSafeBrowsing_() { +@@ -239,8 +230,7 @@ export class SettingsSecurityPageElement + } + + private getDisabledExtendedSafeBrowsing_(): boolean { - return this.getPref('generated.safe_browsing').value !== - SafeBrowsingSetting.STANDARD; + return true; } - /** ---- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js -+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js -@@ -51,7 +51,7 @@ function getCategoryItemMap() { + private getPasswordsLeakToggleSubLabel_(): string { +--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts ++++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +@@ -47,7 +47,7 @@ function getCategoryItemMap(): Map @@ -1489,19 +1422,18 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/consent_level.h" -@@ -64,10 +63,7 @@ void AdvancedProtectionStatusManager::Ma +@@ -63,9 +62,7 @@ void AdvancedProtectionStatusManager::Ma is_under_advanced_protection_ = core_info.is_under_advanced_protection; - if (pref_service_->HasPrefPath(prefs::kAdvancedProtectionLastRefreshInUs)) { -- last_refreshed_ = base::Time::FromDeltaSinceWindowsEpoch( -- base::TimeDelta::FromMicroseconds(pref_service_->GetInt64( -- prefs::kAdvancedProtectionLastRefreshInUs))); +- last_refreshed_ = base::Time::FromDeltaSinceWindowsEpoch(base::Microseconds( +- pref_service_->GetInt64(prefs::kAdvancedProtectionLastRefreshInUs))); + if (false) { if (is_under_advanced_protection_) ScheduleNextRefresh(); } else { -@@ -233,20 +229,10 @@ void AdvancedProtectionStatusManager::Ca +@@ -231,20 +228,10 @@ void AdvancedProtectionStatusManager::Ca void AdvancedProtectionStatusManager::UpdateLastRefreshTime() { last_refreshed_ = base::Time::Now(); @@ -1595,7 +1527,7 @@ namespace safe_browsing { --- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc -@@ -62,7 +62,6 @@ +@@ -63,7 +63,6 @@ #include "components/safe_browsing/core/browser/verdict_cache_manager.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -1603,7 +1535,7 @@ #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "components/safe_browsing/core/common/utils.h" #include "components/security_interstitials/content/unsafe_resource_util.h" -@@ -1308,14 +1307,6 @@ bool ChromePasswordProtectionService::Ha +@@ -1220,14 +1219,6 @@ bool ChromePasswordProtectionService::Ha } void ChromePasswordProtectionService::OnWarningTriggerChanged() { @@ -1618,7 +1550,7 @@ // Clears captured enterprise password hashes or GSuite sync password hashes. password_manager::PasswordReuseManager* reuse_manager = GetPasswordReuseManager(); -@@ -1473,7 +1464,7 @@ PrefService* ChromePasswordProtectionSer +@@ -1385,7 +1376,7 @@ PrefService* ChromePasswordProtectionSer } bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() { @@ -1627,7 +1559,7 @@ } bool ChromePasswordProtectionService::IsExtendedReporting() { -@@ -1493,44 +1484,7 @@ bool ChromePasswordProtectionService::Is +@@ -1405,44 +1396,7 @@ bool ChromePasswordProtectionService::Is bool ChromePasswordProtectionService::IsPingingEnabled( LoginReputationClientRequest::TriggerType trigger_type, ReusedPasswordAccountType password_type) { @@ -1673,7 +1605,7 @@ } RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason( -@@ -1725,22 +1679,6 @@ MaybeCreateNavigationThrottle(content::N +@@ -1661,22 +1615,6 @@ MaybeCreateNavigationThrottle(content::N : nullptr; } @@ -1698,7 +1630,7 @@ if (!profile_) --- a/chrome/browser/safe_browsing/chrome_password_protection_service.h +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h -@@ -213,13 +213,6 @@ class ChromePasswordProtectionService : +@@ -211,13 +211,6 @@ class ChromePasswordProtectionService : bool UserClickedThroughSBInterstitial( PasswordProtectionRequest* request) override; @@ -1969,8 +1901,8 @@ #include "content/public/test/browser_task_environment.h" --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc -@@ -73,7 +73,6 @@ - #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" +@@ -74,7 +74,6 @@ + #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" #include "components/safe_browsing/core/browser/verdict_cache_manager.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" @@ -1979,7 +1911,7 @@ #include "components/security_interstitials/content/security_interstitial_tab_helper.h" --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -100,7 +100,6 @@ base::FilePath SafeBrowsingService::GetB +@@ -103,7 +103,6 @@ base::FilePath SafeBrowsingService::GetB SafeBrowsingService::SafeBrowsingService() : services_delegate_(ServicesDelegate::Create(this)), @@ -1987,7 +1919,7 @@ shutdown_(false), enabled_(false), enabled_by_prefs_(false) {} -@@ -253,8 +252,6 @@ TriggerManager* SafeBrowsingService::tri +@@ -257,8 +256,6 @@ TriggerManager* SafeBrowsingService::tri PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService( Profile* profile) const { @@ -1996,7 +1928,7 @@ return nullptr; } -@@ -383,9 +380,6 @@ void SafeBrowsingService::OnProfileAdded +@@ -387,9 +384,6 @@ void SafeBrowsingService::OnProfileAdded std::unique_ptr registrar = std::make_unique(); registrar->Init(pref_service); @@ -2006,9 +1938,9 @@ // ClientSideDetectionService will need to be refresh the models // renderers have if extended-reporting changes. registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled, -@@ -397,14 +391,6 @@ void SafeBrowsingService::OnProfileAdded - prefs_map_[pref_service] = std::move(registrar); - RefreshState(); +@@ -418,14 +412,6 @@ void SafeBrowsingService::OnProfileAdded + NoCachedPopulationReason::kChangeMbbPref)); + user_population_prefs_[pref_service] = std::move(registrar); - // Record the current pref state for standard protection. - UMA_HISTOGRAM_BOOLEAN(kSafeBrowsingEnabledHistogramName, @@ -2021,8 +1953,8 @@ // Extended Reporting metrics are handled together elsewhere. RecordExtendedReportingMetrics(*pref_service); -@@ -442,18 +428,6 @@ void SafeBrowsingService::RefreshState() - DCHECK_CURRENTLY_ON(BrowserThread::UI); +@@ -465,18 +451,6 @@ void SafeBrowsingService::RefreshState() + // Check if any profile requires the service to be active. enabled_by_prefs_ = false; - estimated_extended_reporting_by_prefs_ = SBER_LEVEL_OFF; @@ -2050,7 +1982,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "services/network/public/mojom/network_context.mojom-forward.h" -@@ -94,15 +93,6 @@ class SafeBrowsingService : public SafeB +@@ -97,15 +96,6 @@ class SafeBrowsingService : public SafeB // Called on the main thread to let us know that the io_thread is going away. void ShutDown(); @@ -2066,7 +1998,7 @@ // Get current enabled status. Must be called on IO thread. bool enabled() const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); -@@ -284,10 +274,6 @@ class SafeBrowsingService : public SafeB +@@ -287,10 +277,6 @@ class SafeBrowsingService : public SafeB // Provides phishing and malware statistics. Accessed on UI thread. std::unique_ptr ping_manager_; @@ -2119,9 +2051,9 @@ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/security_interstitials/content/unsafe_resource_util.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" - #include "content/public/browser/navigation_entry.h" --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc @@ -19,7 +19,6 @@ @@ -2132,7 +2064,7 @@ #include "google_apis/google_api_keys.h" #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -101,7 +100,6 @@ AccountConsistencyModeManager::AccountCo +@@ -98,7 +97,6 @@ AccountConsistencyModeManager::AccountCo // pref. bool signin_allowed = IsDiceSignInAllowed() && prefs->GetBoolean(prefs::kSigninAllowedOnNextStartup); @@ -2140,7 +2072,7 @@ UMA_HISTOGRAM_BOOLEAN("Signin.SigninAllowed", signin_allowed); #endif -@@ -220,16 +218,7 @@ AccountConsistencyModeManager::ComputeAc +@@ -196,16 +194,7 @@ AccountConsistencyModeManager::ComputeAc // AccountManager is not available, when DICE has been disabled on Lacros. #endif @@ -2243,7 +2175,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/tribool.h" -@@ -112,7 +111,7 @@ void HeaderModificationDelegateImpl::Pro +@@ -113,7 +112,7 @@ void HeaderModificationDelegateImpl::Pro #endif #if BUILDFLAG(ENABLE_DICE_SUPPORT) sync_service && sync_service->IsSyncFeatureEnabled(), @@ -2340,7 +2272,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/identity_utils.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -230,7 +229,7 @@ void EnsurePrimaryAccountAllowedForProfi +@@ -232,7 +231,7 @@ void EnsurePrimaryAccountAllowedForProfi CoreAccountInfo primary_account = identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync); @@ -2510,7 +2442,7 @@ InitCommandState(); -@@ -1526,7 +1521,7 @@ void BrowserCommandController::UpdateSho +@@ -1525,7 +1520,7 @@ void BrowserCommandController::UpdateSho return; command_updater_.UpdateCommandEnabled( @@ -2521,7 +2453,7 @@ // static --- a/chrome/browser/ui/browser_command_controller.h +++ b/chrome/browser/ui/browser_command_controller.h -@@ -207,7 +207,6 @@ class BrowserCommandController : public +@@ -211,7 +211,6 @@ class BrowserCommandController : public PrefChangeRegistrar profile_pref_registrar_; PrefChangeRegistrar local_pref_registrar_; @@ -2648,7 +2580,7 @@ url_(web_contents->GetLastCommittedURL()), password_type_(password_type) { bool show_check_passwords = false; -@@ -163,34 +162,13 @@ PasswordReuseModalWarningDialog::Passwor +@@ -163,29 +162,13 @@ PasswordReuseModalWarningDialog::Passwor SetCancelCallback(make_done_callback(WarningAction::IGNORE_WARNING)); SetCloseCallback(make_done_callback(WarningAction::CLOSE)); @@ -2656,21 +2588,16 @@ - if (service_) - service_->AddObserver(this); - -- std::vector placeholder_offsets; -- - if (password_type.account_type() == - ReusedPasswordAccountType::SAVED_PASSWORD) { - const std::u16string message_body = -- service_->GetWarningDetailText(password_type, &placeholder_offsets); +- service_->GetWarningDetailText(password_type); - -- CreateSavedPasswordReuseModalWarningDialog( -- message_body, service_->GetPlaceholdersForSavedPasswordWarningText(), -- placeholder_offsets); +- CreateSavedPasswordReuseModalWarningDialog(message_body); - } else { - views::Label* message_body_label = CreateMessageBodyLabel( - service_ -- ? service_->GetWarningDetailText(password_type, -- &placeholder_offsets) +- ? service_->GetWarningDetailText(password_type) - : l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS)); - CreateGaiaPasswordReuseModalWarningDialog(message_body_label); - } @@ -2688,7 +2615,7 @@ --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h -@@ -62,7 +62,6 @@ class PasswordReuseModalWarningDialog +@@ -60,7 +60,6 @@ class PasswordReuseModalWarningDialog private: OnWarningDone done_callback_; @@ -2774,15 +2701,14 @@ ProfileInfoWatcher::~ProfileInfoWatcher() { --- a/chrome/browser/ui/webui/profile_info_watcher.h +++ b/chrome/browser/ui/webui/profile_info_watcher.h -@@ -45,8 +45,6 @@ class ProfileInfoWatcher : public Profil +@@ -49,7 +49,6 @@ class ProfileInfoWatcher : public Profil // Called when the authenticated username changes. base::RepeatingClosure callback_; - BooleanPrefMember signin_allowed_pref_; -- - DISALLOW_COPY_AND_ASSIGN(ProfileInfoWatcher); }; + #endif // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_ --- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc +++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc @@ -17,7 +17,6 @@ @@ -2803,7 +2729,7 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/consent_level.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -292,10 +291,6 @@ void PeopleHandler::RegisterMessages() { +@@ -290,10 +289,6 @@ void PeopleHandler::RegisterMessages() { void PeopleHandler::OnJavascriptAllowed() { PrefService* prefs = profile_->GetPrefs(); profile_pref_registrar_.Init(prefs); @@ -2834,7 +2760,7 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/strings/grit/components_chromium_strings.h" #include "components/strings/grit/components_strings.h" -@@ -1390,46 +1389,6 @@ void AddPrivacyStrings(content::WebUIDat +@@ -1391,46 +1390,6 @@ void AddPrivacyStrings(content::WebUIDat {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, @@ -2881,7 +2807,7 @@ {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL}, {"syncAndGoogleServicesPrivacyDescription", IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT}, -@@ -2582,11 +2541,6 @@ void AddSiteSettingsStrings(content::Web +@@ -2626,11 +2585,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -2895,7 +2821,7 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -71,7 +71,6 @@ +@@ -72,7 +72,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2903,7 +2829,7 @@ #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -@@ -276,9 +275,7 @@ SettingsUI::SettingsUI(content::WebUI* w +@@ -274,9 +273,7 @@ SettingsUI::SettingsUI(content::WebUI* w ? "enable-branding-update" : ""); @@ -2916,7 +2842,7 @@ base::FeatureList::IsEnabled( --- a/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc +++ b/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc -@@ -47,7 +47,6 @@ +@@ -46,7 +46,6 @@ #include "components/policy/core/common/management/management_service.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/signin_metrics.h" @@ -2924,7 +2850,7 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -242,8 +241,7 @@ DiceTurnSyncOnHelper::DiceTurnSyncOnHelp +@@ -248,8 +247,7 @@ DiceTurnSyncOnHelper::DiceTurnSyncOnHelp // last authenticated account of the current profile, then Chrome will show a // confirmation dialog before starting sync. // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754). @@ -3025,7 +2951,7 @@ } --- a/chrome/browser/ui/webui/welcome/welcome_ui.cc +++ b/chrome/browser/ui/webui/welcome/welcome_ui.cc -@@ -23,7 +23,6 @@ +@@ -24,7 +24,6 @@ #include "chrome/grit/welcome_resources.h" #include "chrome/grit/welcome_resources_map.h" #include "components/prefs/pref_service.h" @@ -3033,7 +2959,7 @@ #include "components/strings/grit/components_strings.h" #include "net/base/url_util.h" #include "ui/base/webui/web_ui_util.h" -@@ -165,7 +164,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web +@@ -166,7 +165,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web "returningUserModules", welcome::GetModules(profile).FindKey("returning-user")->GetString()); html_source->AddBoolean( @@ -3089,7 +3015,7 @@ #include "services/network/public/cpp/shared_url_loader_factory.h" namespace password_manager { -@@ -163,28 +162,7 @@ void LeakDetectionDelegate::OnError(Leak +@@ -169,28 +168,7 @@ void LeakDetectionDelegate::OnError(Leak bool CanStartLeakCheck(const PrefService& prefs, const PasswordManagerClient* client) { @@ -3183,7 +3109,7 @@ void PasswordReuseManagerImpl::OnGetPasswordStoreResults( --- a/components/password_manager/core/browser/password_store.cc +++ b/components/password_manager/core/browser/password_store.cc -@@ -44,7 +44,6 @@ +@@ -39,7 +39,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" @@ -3243,235 +3169,9 @@ #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "components/safe_browsing/core/common/utils.h" #include "content/public/browser/browser_task_traits.h" ---- a/components/safe_browsing/content/browser/safe_browsing_metrics_collector.cc -+++ b/components/safe_browsing/content/browser/safe_browsing_metrics_collector.cc -@@ -11,13 +11,11 @@ - #include "base/time/time.h" - #include "components/prefs/pref_service.h" - #include "components/prefs/scoped_user_pref_update.h" --#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - - namespace { - - using EventType = safe_browsing::SafeBrowsingMetricsCollector::EventType; - using UserState = safe_browsing::SafeBrowsingMetricsCollector::UserState; --using SafeBrowsingState = safe_browsing::SafeBrowsingState; - - const int kMetricsLoggingIntervalDay = 1; - -@@ -54,11 +52,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi - PrefService* pref_service) - : pref_service_(pref_service) { - pref_change_registrar_.Init(pref_service_); -- pref_change_registrar_.Add( -- prefs::kSafeBrowsingEnhanced, -- base::BindRepeating( -- &SafeBrowsingMetricsCollector::OnEnhancedProtectionPrefChanged, -- base::Unretained(this))); - } - - void SafeBrowsingMetricsCollector::Shutdown() { -@@ -66,17 +59,6 @@ void SafeBrowsingMetricsCollector::Shutd - } - - void SafeBrowsingMetricsCollector::StartLogging() { -- base::TimeDelta log_interval = -- base::TimeDelta::FromDays(kMetricsLoggingIntervalDay); -- base::Time last_log_time = -- base::Time::FromDeltaSinceWindowsEpoch(base::TimeDelta::FromSeconds( -- pref_service_->GetInt64(prefs::kSafeBrowsingMetricsLastLogTime))); -- base::TimeDelta delay = base::Time::Now() - last_log_time; -- if (delay >= log_interval) { -- LogMetricsAndScheduleNextLogging(); -- } else { -- ScheduleNextLoggingAfterInterval(log_interval - delay); -- } - } - - void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() { -@@ -84,9 +66,6 @@ void SafeBrowsingMetricsCollector::LogMe - LogDailyEventMetrics(); - RemoveOldEventsFromPref(); - -- pref_service_->SetInt64( -- prefs::kSafeBrowsingMetricsLastLogTime, -- base::Time::Now().ToDeltaSinceWindowsEpoch().InSeconds()); - ScheduleNextLoggingAfterInterval( - base::TimeDelta::FromDays(kMetricsLoggingIntervalDay)); - } -@@ -100,146 +79,34 @@ void SafeBrowsingMetricsCollector::Sched - } - - void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() { -- base::UmaHistogramEnumeration("SafeBrowsing.Pref.Daily.SafeBrowsingState", -- GetSafeBrowsingState(*pref_service_)); -- base::UmaHistogramBoolean("SafeBrowsing.Pref.Daily.Extended", -- IsExtendedReportingEnabled(*pref_service_)); -- base::UmaHistogramBoolean("SafeBrowsing.Pref.Daily.SafeBrowsingModeManaged", -- IsSafeBrowsingPolicyManaged(*pref_service_)); - } - - void SafeBrowsingMetricsCollector::LogDailyEventMetrics() { -- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_); -- if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) { -- return; -- } -- UserState user_state = GetUserState(); -- -- int total_bypass_count = 0; -- for (int event_type_int = 0; event_type_int <= EventType::kMaxValue; -- event_type_int += 1) { -- EventType event_type = static_cast(event_type_int); -- if (!IsBypassEventType(event_type)) { -- continue; -- } -- int bypass_count = -- GetEventCountSince(user_state, event_type, -- base::Time::Now() - base::TimeDelta::FromDays(28)); -- base::UmaHistogramCounts100("SafeBrowsing.Daily.BypassCountLast28Days." + -- GetUserStateMetricSuffix(user_state) + "." + -- GetEventTypeMetricSuffix(event_type), -- bypass_count); -- total_bypass_count += bypass_count; -- } -- base::UmaHistogramCounts100("SafeBrowsing.Daily.BypassCountLast28Days." + -- GetUserStateMetricSuffix(user_state) + -- ".AllEvents", -- total_bypass_count); - } - - void SafeBrowsingMetricsCollector::RemoveOldEventsFromPref() { -- DictionaryPrefUpdate update(pref_service_, -- prefs::kSafeBrowsingEventTimestamps); -- base::DictionaryValue* mutable_state_dict = update.Get(); -- bool is_pref_valid = mutable_state_dict->is_dict(); -- base::UmaHistogramBoolean("SafeBrowsing.MetricsCollector.IsPrefValid", -- is_pref_valid); -- if (!is_pref_valid) { -- return; -- } -- -- for (auto state_map : mutable_state_dict->DictItems()) { -- for (auto event_map : state_map.second.DictItems()) { -- event_map.second.EraseListValueIf([&](const auto& timestamp) { -- return base::Time::Now() - PrefValueToTime(timestamp) > -- base::TimeDelta::FromDays(kEventMaxDurationDay); -- }); -- } -- } - } - - void SafeBrowsingMetricsCollector::AddSafeBrowsingEventToPref( - EventType event_type) { -- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_); -- // Skip the event if Safe Browsing is disabled. -- if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) { -- return; -- } -- -- AddSafeBrowsingEventAndUserStateToPref(GetUserState(), event_type); - } - - absl::optional - SafeBrowsingMetricsCollector::GetLatestEventTimestamp(EventType event_type) { -- // Events are not logged when Safe Browsing is disabled. -- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_); -- if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) { - return absl::nullopt; -- } -- -- const absl::optional event = -- GetLatestEventFromEventType(GetUserState(), event_type); -- return event ? absl::optional(event.value().timestamp) -- : absl::nullopt; - } - - void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref( - UserState user_state, - EventType event_type) { -- DictionaryPrefUpdate update(pref_service_, -- prefs::kSafeBrowsingEventTimestamps); -- base::DictionaryValue* mutable_state_dict = update.Get(); -- -- base::Value* event_dict = -- mutable_state_dict->FindDictKey(UserStateToPrefKey(user_state)); -- if (!event_dict) { -- event_dict = -- mutable_state_dict->SetKey(UserStateToPrefKey(user_state), -- base::Value(base::Value::Type::DICTIONARY)); -- } -- -- base::Value* timestamps = -- event_dict->FindListKey(EventTypeToPrefKey(event_type)); -- if (!timestamps) { -- timestamps = event_dict->SetKey(EventTypeToPrefKey(event_type), -- base::Value(base::Value::Type::LIST)); -- } -- -- // Remove the oldest timestamp if the length of the timestamps hits the limit. -- while (timestamps->GetList().size() >= kTimestampsMaxLength) { -- timestamps->EraseListIter(timestamps->GetList().begin()); -- } -- -- timestamps->Append(TimeToPrefValue(base::Time::Now())); - } - - void SafeBrowsingMetricsCollector::OnEnhancedProtectionPrefChanged() { -- // Pref changed by policy is not initiated by users, so this case is ignored. -- if (IsSafeBrowsingPolicyManaged(*pref_service_)) { -- return; -- } -- -- if (!pref_service_->GetBoolean(prefs::kSafeBrowsingEnhanced)) { -- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection, -- EventType::USER_STATE_DISABLED); -- int disabled_times_last_week = GetEventCountSince( -- UserState::kEnhancedProtection, EventType::USER_STATE_DISABLED, -- base::Time::Now() - base::TimeDelta::FromDays(7)); -- if (disabled_times_last_week <= kEsbDisabledMetricsQuota) { -- LogEnhancedProtectionDisabledMetrics(); -- } -- } else { -- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection, -- EventType::USER_STATE_ENABLED); -- } - } - - const base::Value* SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary( - UserState user_state) { -- const base::DictionaryValue* state_dict = -- pref_service_->GetDictionary(prefs::kSafeBrowsingEventTimestamps); -- -- return state_dict->FindDictKey(UserStateToPrefKey(user_state)); -+ return nullptr; - } - - absl::optional -@@ -337,20 +204,7 @@ int SafeBrowsingMetricsCollector::GetEve - } - - UserState SafeBrowsingMetricsCollector::GetUserState() { -- if (IsSafeBrowsingPolicyManaged(*pref_service_)) { -- return UserState::kManaged; -- } -- -- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_); -- switch (sb_state) { -- case SafeBrowsingState::ENHANCED_PROTECTION: -- return UserState::kEnhancedProtection; -- case SafeBrowsingState::STANDARD_PROTECTION: -- return UserState::kStandardProtection; -- case SafeBrowsingState::NO_SAFE_BROWSING: -- NOTREACHED() << "Unexpected Safe Browsing state."; -- return UserState::kStandardProtection; -- } -+ NOTREACHED() << "Unexpected Safe Browsing state."; - } - - bool SafeBrowsingMetricsCollector::IsBypassEventType(const EventType& type) { --- a/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc +++ b/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc -@@ -19,7 +19,6 @@ +@@ -20,7 +20,6 @@ #include "components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager_util.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/core/common/features.h" @@ -3479,7 +3179,7 @@ #include "components/safe_browsing/core/common/utils.h" #include "components/sessions/content/session_tab_helper.h" #include "content/public/browser/navigation_details.h" -@@ -304,7 +303,7 @@ GURL SafeBrowsingNavigationObserverManag +@@ -306,7 +305,7 @@ GURL SafeBrowsingNavigationObserverManag bool SafeBrowsingNavigationObserverManager::IsEnabledAndReady( PrefService* prefs, bool has_safe_browsing_service) { @@ -3612,10 +3312,10 @@ #include "services/network/public/mojom/cookie_manager.mojom.h" #if BUILDFLAG(FULL_SAFE_BROWSING) #include "components/enterprise/common/proto/connectors.pb.h" -@@ -1991,18 +1990,13 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -2035,18 +2034,13 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); - std::string callback_id; - args->GetString(0, &callback_id); + DCHECK(!args->GetList().empty()); + std::string callback_id = args->GetList()[0].GetString(); - ResolveJavascriptCallback(base::Value(callback_id), - safe_browsing::GetSafeBrowsingPreferencesList( - user_prefs::UserPrefs::Get(browser_context_))); @@ -3624,8 +3324,8 @@ void SafeBrowsingUIHandler::GetPolicies(const base::ListValue* args) { AllowJavascript(); - std::string callback_id; - args->GetString(0, &callback_id); + DCHECK(!args->GetList().empty()); + std::string callback_id = args->GetList()[0].GetString(); - ResolveJavascriptCallback(base::Value(callback_id), - safe_browsing::GetSafeBrowsingPoliciesList( - user_prefs::UserPrefs::Get(browser_context_))); @@ -3710,9 +3410,9 @@ - ExtendedReportingLevelCallback extended_reporting_level_callback); + scoped_refptr io_task_runner); - // Populates the protobuf with the database data. - void CollectDatabaseManagerInfo( -@@ -105,7 +104,6 @@ class V4LocalDatabaseManager : public Sa + V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete; + V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete; +@@ -108,7 +107,6 @@ class V4LocalDatabaseManager : public Sa // Must be initialized by calling StartOnIOThread() before using. V4LocalDatabaseManager( const base::FilePath& base_path, @@ -3720,7 +3420,7 @@ scoped_refptr ui_task_runner, scoped_refptr io_task_runner, scoped_refptr task_runner_for_tests); -@@ -364,10 +362,6 @@ class V4LocalDatabaseManager : public Sa +@@ -367,10 +365,6 @@ class V4LocalDatabaseManager : public Sa // ready to process next update. DatabaseUpdatedCallback db_updated_callback_; @@ -3733,7 +3433,7 @@ // information in the full hash request. --- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc +++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc -@@ -89,7 +89,6 @@ void SetSbV4UrlPrefixForTesting(const ch +@@ -88,7 +88,6 @@ void SetSbV4UrlPrefixForTesting(const ch std::string GetReportUrl(const V4ProtocolConfig& config, const std::string& method, @@ -3741,7 +3441,7 @@ const bool is_enhanced_protection) { std::string url = base::StringPrintf( "%s/%s?client=%s&appver=%s&pver=4.0", kSbReportsURLPrefix, method.c_str(), -@@ -99,8 +98,6 @@ std::string GetReportUrl(const V4Protoco +@@ -98,8 +97,6 @@ std::string GetReportUrl(const V4Protoco base::StringAppendF(&url, "&key=%s", net::EscapeQueryParamValue(api_key, true).c_str()); } @@ -3775,7 +3475,7 @@ // Different types of threats that SafeBrowsing protects against. This is the --- a/components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc +++ b/components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc -@@ -79,19 +79,8 @@ static const int kV4TimerStartIntervalSe +@@ -78,19 +78,8 @@ static const int kV4TimerStartIntervalSe // Maximum time, in seconds, to wait for a response to an update request. static const int kV4TimerUpdateWaitSecMax = 15 * 60; // 15 minutes @@ -3797,7 +3497,7 @@ } // The default V4UpdateProtocolManagerFactory. -@@ -103,12 +92,10 @@ class V4UpdateProtocolManagerFactoryImpl +@@ -108,12 +97,10 @@ class V4UpdateProtocolManagerFactoryImpl std::unique_ptr CreateProtocolManager( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3810,9 +3510,9 @@ - extended_reporting_level_callback)); + new V4UpdateProtocolManager(url_loader_factory, config, update_callback)); } + }; - private: -@@ -124,14 +111,12 @@ V4UpdateProtocolManagerFactory* V4Update +@@ -126,14 +113,12 @@ V4UpdateProtocolManagerFactory* V4Update std::unique_ptr V4UpdateProtocolManager::Create( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3829,7 +3529,7 @@ } void V4UpdateProtocolManager::ResetUpdateErrors() { -@@ -142,8 +127,7 @@ void V4UpdateProtocolManager::ResetUpdat +@@ -144,8 +129,7 @@ void V4UpdateProtocolManager::ResetUpdat V4UpdateProtocolManager::V4UpdateProtocolManager( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3838,9 +3538,9 @@ + V4UpdateCallback update_callback) : update_error_count_(0), update_back_off_mult_(1), - next_update_interval_(base::TimeDelta::FromSeconds( -@@ -151,8 +135,7 @@ V4UpdateProtocolManager::V4UpdateProtoco - kV4TimerStartIntervalSecMax))), + next_update_interval_( +@@ -153,8 +137,7 @@ V4UpdateProtocolManager::V4UpdateProtoco + kV4TimerStartIntervalSecMax))), config_(config), url_loader_factory_(url_loader_factory), - update_callback_(update_callback), @@ -3849,7 +3549,7 @@ // Do not auto-schedule updates. Let the owner (V4LocalDatabaseManager) do it // when it is ready to process updates. } -@@ -247,11 +230,6 @@ std::string V4UpdateProtocolManager::Get +@@ -249,11 +232,6 @@ std::string V4UpdateProtocolManager::Get RICE); } @@ -3880,8 +3580,8 @@ - class V4UpdateProtocolManager { public: - ~V4UpdateProtocolManager(); -@@ -62,8 +58,7 @@ class V4UpdateProtocolManager { + V4UpdateProtocolManager(const V4UpdateProtocolManager&) = delete; +@@ -65,8 +61,7 @@ class V4UpdateProtocolManager { static std::unique_ptr Create( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3891,7 +3591,7 @@ void OnURLLoaderComplete(std::unique_ptr response_body); -@@ -85,8 +80,7 @@ class V4UpdateProtocolManager { +@@ -88,8 +83,7 @@ class V4UpdateProtocolManager { V4UpdateProtocolManager( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3901,36 +3601,36 @@ private: FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest, -@@ -204,8 +198,6 @@ class V4UpdateProtocolManager { +@@ -207,8 +201,6 @@ class V4UpdateProtocolManager { // complete. base::OneShotTimer timeout_timer_; - ExtendedReportingLevelCallback extended_reporting_level_callback_; - SEQUENCE_CHECKER(sequence_checker_); + }; - DISALLOW_COPY_AND_ASSIGN(V4UpdateProtocolManager); -@@ -219,8 +211,7 @@ class V4UpdateProtocolManagerFactory { +@@ -226,8 +218,7 @@ class V4UpdateProtocolManagerFactory { virtual std::unique_ptr CreateProtocolManager( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, - V4UpdateCallback update_callback, - ExtendedReportingLevelCallback extended_reporting_level_callback) = 0; + V4UpdateCallback update_callback) = 0; + }; - private: - DISALLOW_COPY_AND_ASSIGN(V4UpdateProtocolManagerFactory); + } // namespace safe_browsing --- a/components/safe_browsing/core/browser/password_protection/password_protection_service_base.h +++ b/components/safe_browsing/core/browser/password_protection/password_protection_service_base.h -@@ -27,7 +27,6 @@ - #include "components/safe_browsing/core/browser/referrer_chain_provider.h" +@@ -28,7 +28,6 @@ + #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/sessions/core/session_id.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -143,10 +142,6 @@ class PasswordProtectionServiceBase : pu +@@ -149,10 +148,6 @@ class PasswordProtectionServiceBase : pu // Returns if the warning UI is enabled. bool IsWarningEnabled(ReusedPasswordAccountType password_type); @@ -4003,7 +3703,7 @@ unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged, base::Unretained(this))); -@@ -134,7 +129,7 @@ int RealTimeUrlLookupService::GetReferre +@@ -144,7 +139,7 @@ bool RealTimeUrlLookupService::CanSendPa } bool RealTimeUrlLookupService::CanCheckSubresourceURL() const { @@ -4022,6 +3722,266 @@ #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "components/safe_browsing/core/common/utils.h" #include "net/base/ip_address.h" +--- a/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc ++++ b/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc +@@ -11,13 +11,11 @@ + #include "base/time/time.h" + #include "components/prefs/pref_service.h" + #include "components/prefs/scoped_user_pref_update.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + + namespace { + + using EventType = safe_browsing::SafeBrowsingMetricsCollector::EventType; + using UserState = safe_browsing::SafeBrowsingMetricsCollector::UserState; +-using SafeBrowsingState = safe_browsing::SafeBrowsingState; + + const int kMetricsLoggingIntervalDay = 1; + +@@ -54,11 +52,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi + PrefService* pref_service) + : pref_service_(pref_service) { + pref_change_registrar_.Init(pref_service_); +- pref_change_registrar_.Add( +- prefs::kSafeBrowsingEnhanced, +- base::BindRepeating( +- &SafeBrowsingMetricsCollector::OnEnhancedProtectionPrefChanged, +- base::Unretained(this))); + } + + void SafeBrowsingMetricsCollector::Shutdown() { +@@ -66,16 +59,6 @@ void SafeBrowsingMetricsCollector::Shutd + } + + void SafeBrowsingMetricsCollector::StartLogging() { +- base::TimeDelta log_interval = base::Days(kMetricsLoggingIntervalDay); +- base::Time last_log_time = +- base::Time::FromDeltaSinceWindowsEpoch(base::Seconds( +- pref_service_->GetInt64(prefs::kSafeBrowsingMetricsLastLogTime))); +- base::TimeDelta delay = base::Time::Now() - last_log_time; +- if (delay >= log_interval) { +- LogMetricsAndScheduleNextLogging(); +- } else { +- ScheduleNextLoggingAfterInterval(log_interval - delay); +- } + } + + void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() { +@@ -83,9 +66,6 @@ void SafeBrowsingMetricsCollector::LogMe + LogDailyEventMetrics(); + RemoveOldEventsFromPref(); + +- pref_service_->SetInt64( +- prefs::kSafeBrowsingMetricsLastLogTime, +- base::Time::Now().ToDeltaSinceWindowsEpoch().InSeconds()); + ScheduleNextLoggingAfterInterval(base::Days(kMetricsLoggingIntervalDay)); + } + +@@ -98,181 +78,40 @@ void SafeBrowsingMetricsCollector::Sched + } + + void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() { +- base::UmaHistogramEnumeration("SafeBrowsing.Pref.Daily.SafeBrowsingState", +- GetSafeBrowsingState(*pref_service_)); +- base::UmaHistogramBoolean("SafeBrowsing.Pref.Daily.Extended", +- IsExtendedReportingEnabled(*pref_service_)); +- base::UmaHistogramBoolean("SafeBrowsing.Pref.Daily.SafeBrowsingModeManaged", +- IsSafeBrowsingPolicyManaged(*pref_service_)); + } + + void SafeBrowsingMetricsCollector::LogDailyEventMetrics() { +- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_); +- if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) { +- return; +- } +- UserState user_state = GetUserState(); +- +- int total_bypass_count = 0; +- int total_security_sensitive_event_count = 0; +- for (int event_type_int = 0; event_type_int <= EventType::kMaxValue; +- event_type_int += 1) { +- EventType event_type = static_cast(event_type_int); +- if (IsBypassEventType(event_type)) { +- int bypass_count = GetEventCountSince(user_state, event_type, +- base::Time::Now() - base::Days(28)); +- base::UmaHistogramCounts100("SafeBrowsing.Daily.BypassCountLast28Days." + +- GetUserStateMetricSuffix(user_state) + +- "." + +- GetEventTypeMetricSuffix(event_type), +- bypass_count); +- total_bypass_count += bypass_count; +- } +- if (IsSecuritySensitiveEventType(event_type)) { +- int security_sensitive_event_count = GetEventCountSince( +- user_state, event_type, base::Time::Now() - base::Days(28)); +- base::UmaHistogramCounts100( +- "SafeBrowsing.Daily.SecuritySensitiveCountLast28Days." + +- GetUserStateMetricSuffix(user_state) + "." + +- GetEventTypeMetricSuffix(event_type), +- security_sensitive_event_count); +- total_security_sensitive_event_count += security_sensitive_event_count; +- } +- } +- base::UmaHistogramCounts100("SafeBrowsing.Daily.BypassCountLast28Days." + +- GetUserStateMetricSuffix(user_state) + +- ".AllEvents", +- total_bypass_count); +- base::UmaHistogramCounts100( +- "SafeBrowsing.Daily.SecuritySensitiveCountLast28Days." + +- GetUserStateMetricSuffix(user_state) + ".AllEvents", +- total_security_sensitive_event_count); + } + + void SafeBrowsingMetricsCollector::RemoveOldEventsFromPref() { +- DictionaryPrefUpdate update(pref_service_, +- prefs::kSafeBrowsingEventTimestamps); +- base::DictionaryValue* mutable_state_dict = update.Get(); +- bool is_pref_valid = mutable_state_dict->is_dict(); +- base::UmaHistogramBoolean("SafeBrowsing.MetricsCollector.IsPrefValid", +- is_pref_valid); +- if (!is_pref_valid) { +- return; +- } +- +- for (auto state_map : mutable_state_dict->DictItems()) { +- for (auto event_map : state_map.second.DictItems()) { +- event_map.second.EraseListValueIf([&](const auto& timestamp) { +- return base::Time::Now() - PrefValueToTime(timestamp) > +- base::Days(kEventMaxDurationDay); +- }); +- } +- } + } + + void SafeBrowsingMetricsCollector::AddSafeBrowsingEventToPref( + EventType event_type) { +- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_); +- // Skip the event if Safe Browsing is disabled. +- if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) { +- return; +- } +- +- AddSafeBrowsingEventAndUserStateToPref(GetUserState(), event_type); + } + + absl::optional + SafeBrowsingMetricsCollector::GetLatestEventTimestamp(EventType event_type) { +- // Events are not logged when Safe Browsing is disabled. +- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_); +- if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) { + return absl::nullopt; +- } +- +- const absl::optional event = +- GetLatestEventFromEventType(GetUserState(), event_type); +- return event ? absl::optional(event.value().timestamp) +- : absl::nullopt; + } + + absl::optional + SafeBrowsingMetricsCollector::GetLatestSecuritySensitiveEventTimestamp() { +- std::vector> security_sensitive_event_times{ +- GetLatestEventTimestamp(SECURITY_SENSITIVE_SAFE_BROWSING_INTERSTITIAL), +- GetLatestEventTimestamp(SECURITY_SENSITIVE_SSL_INTERSTITIAL), +- GetLatestEventTimestamp(SECURITY_SENSITIVE_PASSWORD_PROTECTION), +- GetLatestEventTimestamp(SECURITY_SENSITIVE_DOWNLOAD)}; + absl::optional latest_event_time = absl::nullopt; +- for (absl::optional security_sensitive_event_time : +- security_sensitive_event_times) { +- if (!security_sensitive_event_time) { +- continue; +- } +- if (!latest_event_time || +- (latest_event_time.value() < security_sensitive_event_time.value())) { +- latest_event_time = security_sensitive_event_time; +- } +- } + return latest_event_time; + } + + void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref( + UserState user_state, + EventType event_type) { +- DictionaryPrefUpdate update(pref_service_, +- prefs::kSafeBrowsingEventTimestamps); +- base::DictionaryValue* mutable_state_dict = update.Get(); +- +- base::Value* event_dict = +- mutable_state_dict->FindDictKey(UserStateToPrefKey(user_state)); +- if (!event_dict) { +- event_dict = +- mutable_state_dict->SetKey(UserStateToPrefKey(user_state), +- base::Value(base::Value::Type::DICTIONARY)); +- } +- +- base::Value* timestamps = +- event_dict->FindListKey(EventTypeToPrefKey(event_type)); +- if (!timestamps) { +- timestamps = event_dict->SetKey(EventTypeToPrefKey(event_type), +- base::Value(base::Value::Type::LIST)); +- } +- +- // Remove the oldest timestamp if the length of the timestamps hits the limit. +- while (timestamps->GetList().size() >= kTimestampsMaxLength) { +- timestamps->EraseListIter(timestamps->GetList().begin()); +- } +- +- timestamps->Append(TimeToPrefValue(base::Time::Now())); + } + + void SafeBrowsingMetricsCollector::OnEnhancedProtectionPrefChanged() { +- // Pref changed by policy is not initiated by users, so this case is ignored. +- if (IsSafeBrowsingPolicyManaged(*pref_service_)) { +- return; +- } +- +- if (!pref_service_->GetBoolean(prefs::kSafeBrowsingEnhanced)) { +- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection, +- EventType::USER_STATE_DISABLED); +- int disabled_times_last_week = GetEventCountSince( +- UserState::kEnhancedProtection, EventType::USER_STATE_DISABLED, +- base::Time::Now() - base::Days(7)); +- if (disabled_times_last_week <= kEsbDisabledMetricsQuota) { +- LogEnhancedProtectionDisabledMetrics(); +- } +- } else { +- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection, +- EventType::USER_STATE_ENABLED); +- } + } + + const base::Value* SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary( + UserState user_state) { +- const base::DictionaryValue* state_dict = +- pref_service_->GetDictionary(prefs::kSafeBrowsingEventTimestamps); +- +- return state_dict->FindDictKey(UserStateToPrefKey(user_state)); ++ return nullptr; + } + + absl::optional +@@ -370,20 +209,7 @@ int SafeBrowsingMetricsCollector::GetEve + } + + UserState SafeBrowsingMetricsCollector::GetUserState() { +- if (IsSafeBrowsingPolicyManaged(*pref_service_)) { +- return UserState::kManaged; +- } +- +- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_); +- switch (sb_state) { +- case SafeBrowsingState::ENHANCED_PROTECTION: +- return UserState::kEnhancedProtection; +- case SafeBrowsingState::STANDARD_PROTECTION: +- return UserState::kStandardProtection; +- case SafeBrowsingState::NO_SAFE_BROWSING: +- NOTREACHED() << "Unexpected Safe Browsing state."; +- return UserState::kStandardProtection; +- } ++ NOTREACHED() << "Unexpected Safe Browsing state."; + } + + bool SafeBrowsingMetricsCollector::IsBypassEventType(const EventType& type) { --- a/components/safe_browsing/core/common/BUILD.gn +++ b/components/safe_browsing/core/common/BUILD.gn @@ -6,20 +6,8 @@ import("//build/config/features.gni") @@ -4298,7 +4258,7 @@ return false; --- a/components/security_interstitials/content/security_interstitial_controller_client.h +++ b/components/security_interstitials/content/security_interstitial_controller_client.h -@@ -49,8 +49,6 @@ class SecurityInterstitialControllerClie +@@ -54,8 +54,6 @@ class SecurityInterstitialControllerClie bool CanGoBackBeforeNavigation() override; protected: @@ -4371,7 +4331,7 @@ : MetricsHelper::SET_EXTENDED_REPORTING_DISABLED); --- a/components/security_interstitials/core/controller_client.h +++ b/components/security_interstitials/core/controller_client.h -@@ -118,9 +118,6 @@ class ControllerClient { +@@ -122,9 +122,6 @@ class ControllerClient { void SetBaseHelpCenterUrlForTesting(const GURL& test_url); @@ -4391,7 +4351,7 @@ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/google_service_auth_error.h" -@@ -67,25 +66,12 @@ AccountInvestigator::~AccountInvestigato +@@ -66,25 +65,12 @@ AccountInvestigator::~AccountInvestigato // static void AccountInvestigator::RegisterPrefs(PrefRegistrySimple* registry) { @@ -4411,13 +4371,13 @@ - pref_service_->GetDouble(prefs::kGaiaCookiePeriodicReportTime)); - if (previous.is_null()) - previous = Time::Now(); -- const TimeDelta delay = +- const base::TimeDelta delay = - CalculatePeriodicDelay(previous, Time::Now(), kPeriodicReportingInterval); - timer_.Start(FROM_HERE, delay, this, &AccountInvestigator::TryPeriodicReport); } void AccountInvestigator::Shutdown() { -@@ -112,7 +98,7 @@ void AccountInvestigator::OnAccountsInCo +@@ -111,7 +97,7 @@ void AccountInvestigator::OnAccountsInCo // a valid cached ListAccounts response ready for us. Or even both of these // could be simultaneously happening, although this should be extremely // infrequent. @@ -4426,7 +4386,7 @@ const std::string new_hash( HashAccounts(signed_in_accounts, signed_out_accounts)); const bool currently_authenticated = -@@ -120,9 +106,6 @@ void AccountInvestigator::OnAccountsInCo +@@ -119,9 +105,6 @@ void AccountInvestigator::OnAccountsInCo if (old_hash != new_hash) { SharedCookieJarReport(signed_in_accounts, signed_out_accounts, Time::Now(), ReportingType::ON_CHANGE); @@ -4454,9 +4414,9 @@ - const Time last_changed = Time::FromDoubleT( - pref_service_->GetDouble(prefs::kGaiaCookieChangedTime)); + const Time last_changed = Time::Now(); - TimeDelta stable_age; + base::TimeDelta stable_age; if (!last_changed.is_null()) - stable_age = std::max(now - last_changed, TimeDelta()); + stable_age = std::max(now - last_changed, base::TimeDelta()); --- a/components/signin/core/browser/account_investigator_unittest.cc +++ b/components/signin/core/browser/account_investigator_unittest.cc @@ -12,7 +12,6 @@ @@ -4680,7 +4640,7 @@ CoreAccountId AccountTrackerService::PickAccountIdForAccount( --- a/components/signin/internal/identity_manager/account_tracker_service.h +++ b/components/signin/internal/identity_manager/account_tracker_service.h -@@ -232,6 +232,8 @@ class AccountTrackerService { +@@ -236,6 +236,8 @@ class AccountTrackerService { AccountInfoCallback on_account_updated_callback_; AccountInfoCallback on_account_removed_callback_; @@ -4709,7 +4669,7 @@ #include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_urls.h" -@@ -457,9 +456,7 @@ GaiaCookieManagerService::GaiaCookieMana +@@ -456,9 +455,7 @@ GaiaCookieManagerService::GaiaCookieMana listAccountsUnexpectedServerResponseRetried_(false), external_cc_result_fetched_(false), list_accounts_stale_(true) { @@ -4720,7 +4680,7 @@ if (!gaia_cookie_last_list_accounts_data.empty()) { if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data, -@@ -483,8 +480,6 @@ GaiaCookieManagerService::~GaiaCookieMan +@@ -482,8 +479,6 @@ GaiaCookieManagerService::~GaiaCookieMan // static void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) { @@ -4729,7 +4689,7 @@ } void GaiaCookieManagerService::InitCookieListener() { -@@ -907,16 +902,12 @@ void GaiaCookieManagerService::OnListAcc +@@ -906,16 +901,12 @@ void GaiaCookieManagerService::OnListAcc &signed_out_accounts_)) { listed_accounts_.clear(); signed_out_accounts_.clear(); @@ -4775,7 +4735,7 @@ } } // namespace -@@ -241,7 +240,6 @@ MutableProfileOAuth2TokenServiceDelegate +@@ -243,7 +242,6 @@ MutableProfileOAuth2TokenServiceDelegate // static void MutableProfileOAuth2TokenServiceDelegate::RegisterProfilePrefs( PrefRegistrySimple* registry) { @@ -4783,7 +4743,7 @@ } std::unique_ptr -@@ -600,9 +598,6 @@ void MutableProfileOAuth2TokenServiceDel +@@ -602,9 +600,6 @@ void MutableProfileOAuth2TokenServiceDel UpdateCredentials(loading_primary_account_id_, old_login_token); } } @@ -4793,7 +4753,7 @@ } void MutableProfileOAuth2TokenServiceDelegate::UpdateCredentials( -@@ -793,8 +788,6 @@ void MutableProfileOAuth2TokenServiceDel +@@ -795,8 +790,6 @@ void MutableProfileOAuth2TokenServiceDel } void MutableProfileOAuth2TokenServiceDelegate::FinishLoadingCredentials() { @@ -4802,7 +4762,7 @@ FireRefreshTokensLoaded(); } -@@ -825,8 +818,7 @@ void MutableProfileOAuth2TokenServiceDel +@@ -827,8 +820,7 @@ void MutableProfileOAuth2TokenServiceDel LOAD_CREDENTIALS_FINISHED_WITH_DB_CANNOT_BE_OPENED); if (account_consistency_ == signin::AccountConsistencyMethod::kDice && @@ -4961,7 +4921,7 @@ #include "google_apis/gaia/core_account_id.h" namespace signin { -@@ -58,7 +57,7 @@ bool PrimaryAccountMutatorImpl::SetPrima +@@ -58,7 +57,7 @@ PrimaryAccountMutatorImpl::SetPrimaryAcc DCHECK(!account_info.gaia.empty()); #if !BUILDFLAG(IS_CHROMEOS_ASH) @@ -5001,7 +4961,7 @@ signin::ConsentLevel::kSync); --- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl.h +++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl.h -@@ -50,9 +50,6 @@ class PrimaryAccountPolicyManagerImpl : +@@ -56,9 +56,6 @@ class PrimaryAccountPolicyManagerImpl : // profile-specific local prefs (like kGoogleServicesUsernamePattern). PrefChangeRegistrar local_state_pref_registrar_; @@ -5010,7 +4970,7 @@ - base::WeakPtrFactory weak_pointer_factory_{ this}; - + }; --- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc +++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc @@ -15,7 +15,6 @@ @@ -5031,7 +4991,7 @@ #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_access_token_consumer.h" -@@ -137,8 +136,6 @@ bool ProfileOAuth2TokenService::HasRefre +@@ -132,8 +131,6 @@ bool ProfileOAuth2TokenService::HasRefre // static void ProfileOAuth2TokenService::RegisterProfilePrefs( PrefRegistrySimple* registry) { @@ -5042,8 +5002,8 @@ ProfileOAuth2TokenServiceDelegate* ProfileOAuth2TokenService::GetDelegate() { --- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc +++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc -@@ -24,7 +24,6 @@ - #include "components/account_manager_core/chromeos/account_manager_mojo_service.h" +@@ -25,7 +25,6 @@ + #include "components/account_manager_core/mock_account_manager_facade.h" #include "components/signin/internal/identity_manager/account_tracker_service.h" #include "components/signin/internal/identity_manager/profile_oauth2_token_service_observer.h" -#include "components/signin/public/base/signin_pref_names.h" @@ -5200,7 +5160,7 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -82687,7 +82687,6 @@ Full version information for the fingerp +@@ -83745,7 +83745,6 @@ Full version information for the fingerp @@ -5208,7 +5168,7 @@ -@@ -82702,10 +82701,7 @@ Full version information for the fingerp +@@ -83760,10 +83759,7 @@ Full version information for the fingerp diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index 5dbe6577..f63c8249 100644 --- a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch +++ b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch @@ -1,7 +1,7 @@ # Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -131,6 +131,7 @@ +@@ -133,6 +133,7 @@ #include "components/spellcheck/common/spellcheck_common.h" #include "components/spellcheck/spellcheck_buildflags.h" #include "components/strings/grit/components_strings.h" @@ -9,7 +9,7 @@ #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" -@@ -1729,6 +1730,8 @@ void RenderViewContextMenu::AppendPageIt +@@ -1751,6 +1752,8 @@ void RenderViewContextMenu::AppendPageIt menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); } @@ -18,7 +18,7 @@ ChromeTranslateClient* chrome_translate_client = ChromeTranslateClient::FromWebContents(embedder_web_contents_); const bool canTranslate = -@@ -1750,6 +1753,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -1772,6 +1775,7 @@ void RenderViewContextMenu::AppendPageIt IDC_CONTENT_CONTEXT_TRANSLATE, l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language)); } diff --git a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch index 833c87b0..358ce880 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 -@@ -2354,6 +2354,7 @@ static_library("browser") { +@@ -2370,6 +2370,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 -@@ -147,6 +147,7 @@ +@@ -151,6 +151,7 @@ #include "components/translate/core/browser/translate_ranker_impl.h" #include "components/translate/core/common/translate_util.h" #include "components/ui_devtools/switches.h" @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -220,6 +220,7 @@ source_set("browser") { +@@ -222,6 +222,7 @@ source_set("browser") { "//third_party/libyuv", "//third_party/re2", "//third_party/sqlite", @@ -62,7 +62,7 @@ #include "components/viz/common/switches.h" #include "components/viz/host/gpu_client.h" #include "content/browser/bad_message.h" -@@ -3479,6 +3480,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3465,6 +3466,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLDraftExtensions, switches::kEnableWebGLImageChromium, switches::kFileUrlPathAlias, @@ -91,7 +91,7 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -468,6 +469,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -466,6 +467,10 @@ void SetRuntimeFeaturesFromCommandLine(c {wrf::EnableWebGPU, switches::kEnableUnsafeWebGPU, true}, {wrf::ForceOverlayFullscreenVideo, switches::kForceOverlayFullscreenVideo, true}, @@ -104,15 +104,15 @@ if (command_line.HasSwitch(mapping.switch_name)) --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -219,6 +219,8 @@ class WebRuntimeFeatures { +@@ -218,6 +218,8 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool); BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool); BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool); + BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool); + BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool); - BLINK_PLATFORM_EXPORT static void - EnableSignedExchangePrefetchCacheForNavigations(bool); BLINK_PLATFORM_EXPORT static void EnableSignedExchangeSubresourcePrefetch( + bool); + BLINK_PLATFORM_EXPORT static void EnableSubresourceWebBundles(bool); --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc @@ -42,6 +42,7 @@ @@ -123,7 +123,7 @@ #include "base/time/time.h" #include "cc/input/overscroll_behavior.h" #include "cc/input/scroll_snap_data.h" -@@ -856,6 +857,14 @@ Range* Document::CreateRangeAdjustedToTr +@@ -855,6 +856,14 @@ Range* Document::CreateRangeAdjustedToTr Position::BeforeNode(*shadow_host)); } @@ -138,7 +138,7 @@ SelectorQueryCache& Document::GetSelectorQueryCache() { if (!selector_query_cache_) selector_query_cache_ = std::make_unique(); -@@ -2146,6 +2155,15 @@ void Document::UpdateStyleAndLayoutTreeF +@@ -2145,6 +2154,15 @@ void Document::UpdateStyleAndLayoutTreeF #if DCHECK_IS_ON() AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */); #endif @@ -167,7 +167,7 @@ AtomicString visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -2074,6 +2078,9 @@ class CORE_EXPORT Document : public Cont +@@ -2078,6 +2082,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -179,7 +179,7 @@ HeapVector> current_script_stack_; --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2115,6 +2115,11 @@ DOMRectList* Element::getClientRects() { +@@ -2114,6 +2114,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom( quads, *element_layout_object); @@ -191,7 +191,7 @@ return MakeGarbageCollected(quads); } -@@ -2132,6 +2137,9 @@ FloatRect Element::GetBoundingClientRect +@@ -2131,6 +2136,9 @@ FloatRect Element::GetBoundingClientRect DCHECK(element_layout_object); GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -203,7 +203,7 @@ --- a/third_party/blink/renderer/core/dom/range.cc +++ b/third_party/blink/renderer/core/dom/range.cc -@@ -1595,11 +1595,21 @@ DOMRectList* Range::getClientRects() con +@@ -1598,11 +1598,21 @@ DOMRectList* Range::getClientRects() con Vector quads; GetBorderAndTextQuads(quads); @@ -266,7 +266,7 @@ const TextDirection&, --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -963,9 +963,15 @@ TextMetrics* CanvasRenderingContext2D::m +@@ -912,9 +912,15 @@ TextMetrics* CanvasRenderingContext2D::m TextDirection direction = ToTextDirection(GetState().GetDirection(), canvas()); @@ -285,7 +285,7 @@ void CanvasRenderingContext2D::fillFormattedText( --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1681,6 +1681,7 @@ component("platform") { +@@ -1686,6 +1686,7 @@ component("platform") { "//components/paint_preview/common", "//components/power_scheduler", "//components/search_engines:search_engine_utils", @@ -295,7 +295,7 @@ "//crypto", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -700,4 +700,12 @@ void WebRuntimeFeatures::EnableCLSScroll +@@ -689,4 +689,12 @@ void WebRuntimeFeatures::EnableCLSScroll RuntimeEnabledFeatures::SetCLSScrollAnchoringEnabled(enable); } @@ -310,8 +310,8 @@ } // namespace blink --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1066,6 +1066,12 @@ - origin_trial_feature_name: "FledgeInterestGroupAPI", +@@ -1076,6 +1076,12 @@ + origin_trial_feature_name: "Fledge", }, { + name: "FingerprintingClientRectsNoise", 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 4973e46e..01d37e3f 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 -@@ -3482,6 +3482,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3468,6 +3468,7 @@ void RenderProcessHostImpl::PropagateBro switches::kFileUrlPathAlias, switches::kFingerprintingClientRectsNoise, switches::kFingerprintingCanvasMeasureTextNoise, @@ -44,7 +44,7 @@ approach to change color components. switches::kForceGpuMemAvailableMb, --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -473,6 +473,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -471,6 +471,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -55,25 +55,25 @@ approach to change color components. if (command_line.HasSwitch(mapping.switch_name)) --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -221,6 +221,7 @@ class WebRuntimeFeatures { +@@ -220,6 +220,7 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool); BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool); BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool); + BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasImageDataNoise(bool); - BLINK_PLATFORM_EXPORT static void - EnableSignedExchangePrefetchCacheForNavigations(bool); BLINK_PLATFORM_EXPORT static void EnableSignedExchangeSubresourcePrefetch( + bool); + BLINK_PLATFORM_EXPORT static void EnableSubresourceWebBundles(bool); --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -28,6 +28,7 @@ +@@ -30,6 +30,7 @@ #include "third_party/blink/renderer/platform/graphics/bitmap_image.h" #include "third_party/blink/renderer/platform/graphics/graphics_context.h" #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" +#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h" #include "third_party/blink/renderer/platform/graphics/stroke_data.h" + #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h" #include "third_party/blink/renderer/platform/heap/heap.h" - #include "third_party/blink/renderer/platform/instrumentation/use_counter.h" -@@ -2273,6 +2274,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -2311,6 +2312,9 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -85,7 +85,7 @@ approach to change color components. return image_data; --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1639,7 +1639,9 @@ component("platform") { +@@ -1645,7 +1645,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -98,7 +98,7 @@ approach to change color components. "//third_party/blink/renderer/platform/blob", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -708,4 +708,8 @@ void WebRuntimeFeatures::EnableFingerpri +@@ -697,4 +697,8 @@ void WebRuntimeFeatures::EnableFingerpri RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable); } @@ -322,7 +322,7 @@ approach to change color components. // Methods overridden by all sub-classes --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1072,6 +1072,9 @@ +@@ -1082,6 +1082,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 8b92fd15..c72b783a 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 -@@ -2113,6 +2113,7 @@ static_library("browser") { +@@ -2126,6 +2126,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -80,7 +80,7 @@ with limited CPU/memory resources and it is disabled by default. #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/features.h" -@@ -342,6 +346,18 @@ void BrowserProcessImpl::Init() { +@@ -345,6 +349,18 @@ void BrowserProcessImpl::Init() { base::BindRepeating(&ApplyMetricsReportingPolicy)); #endif @@ -101,7 +101,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1567,6 +1567,10 @@ const char kMediaHistoryDescription[] = +@@ -1621,6 +1621,10 @@ const char kMediaHistoryDescription[] = "Enables Media History which records data around media playbacks on " "websites."; @@ -114,7 +114,7 @@ with limited CPU/memory resources and it is disabled by default. const char kMediaRouterCastAllowAllIPsDescription[] = --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -902,6 +902,9 @@ extern const char kLogJsConsoleMessagesD +@@ -930,6 +930,9 @@ extern const char kLogJsConsoleMessagesD extern const char kMediaHistoryName[]; extern const char kMediaHistoryDescription[]; diff --git a/patches/extra/debian/disable/google-api-warning.patch b/patches/extra/debian/disable/google-api-warning.patch index 71b1420a..698f7cb5 100644 --- a/patches/extra/debian/disable/google-api-warning.patch +++ b/patches/extra/debian/disable/google-api-warning.patch @@ -3,9 +3,9 @@ author: Michael Gilbert --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -695,9 +695,6 @@ void StartupBrowserCreatorImpl::AddInfoB - } - #endif +@@ -672,9 +672,6 @@ void StartupBrowserCreatorImpl::AddInfoB + infobars::ContentInfoBarManager* infobar_manager = + infobars::ContentInfoBarManager::FromWebContents(web_contents); - if (!google_apis::HasAPIKeyConfigured()) - GoogleApiKeysInfoBarDelegate::Create(infobar_manager); diff --git a/patches/extra/debian/disable/welcome-page.patch b/patches/extra/debian/disable/welcome-page.patch index 24ddade1..58f45a4f 100644 --- a/patches/extra/debian/disable/welcome-page.patch +++ b/patches/extra/debian/disable/welcome-page.patch @@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1294,7 +1294,7 @@ void ProfileManager::InitProfileUserPref +@@ -1310,7 +1310,7 @@ void ProfileManager::InitProfileUserPref profile->GetPrefs()->SetString(prefs::kSupervisedUserId, supervised_user_id); } diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 74a6fffb..a6ee1dcf 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 -@@ -1178,7 +1178,7 @@ void ChromeContentBrowserClient::Registe +@@ -1238,7 +1238,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -45,7 +45,7 @@ enum class NetworkPredictionStatus { --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -318,7 +318,7 @@ void ProfileNetworkContextService::Updat +@@ -319,7 +319,7 @@ void ProfileNetworkContextService::Updat void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -56,7 +56,7 @@ registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled, --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -281,7 +281,7 @@ const char Profile::kProfileKey[] = "__P +@@ -276,7 +276,7 @@ const char Profile::kProfileKey[] = "__P void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, @@ -78,10 +78,10 @@ --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -125,7 +125,7 @@ void AccountConsistencyModeManager::Regi - #if BUILDFLAG(ENABLE_DICE_SUPPORT) - registry->RegisterBooleanPref(kDiceMigrationCompletePref, false); - #endif +@@ -111,7 +111,7 @@ AccountConsistencyModeManager::~AccountC + // static + void AccountConsistencyModeManager::RegisterProfilePrefs( + user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true); + registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false); } diff --git a/patches/extra/inox-patchset/0019-disable-battery-status-service.patch b/patches/extra/inox-patchset/0019-disable-battery-status-service.patch index 5ee69f29..0ca8a9bd 100644 --- a/patches/extra/inox-patchset/0019-disable-battery-status-service.patch +++ b/patches/extra/inox-patchset/0019-disable-battery-status-service.patch @@ -84,7 +84,7 @@ } --- a/services/device/battery/battery_status_service.h +++ b/services/device/battery/battery_status_service.h -@@ -56,15 +56,10 @@ class BatteryStatusService { +@@ -60,15 +60,10 @@ class BatteryStatusService { // Updates current battery status and sends new status to interested // render processes. Can be called on any thread via a callback. void NotifyConsumers(const mojom::BatteryStatus& status); @@ -98,5 +98,5 @@ - mojom::BatteryStatus status_; - bool status_updated_; bool is_shutdown_; + }; - DISALLOW_COPY_AND_ASSIGN(BatteryStatusService); 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 55caefc4..3dfa34cf 100644 --- a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch +++ b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch @@ -9,7 +9,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1484,8 +1484,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1492,8 +1492,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { diff --git a/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch b/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch index 62cada01..265a2167 100644 --- a/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch +++ b/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch @@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily. --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc -@@ -270,7 +270,7 @@ void DownloadPrefs::RegisterProfilePrefs +@@ -271,7 +271,7 @@ void DownloadPrefs::RegisterProfilePrefs user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kPromptForDownload, diff --git a/patches/extra/iridium-browser/updater-disable-auto-update.patch b/patches/extra/iridium-browser/updater-disable-auto-update.patch index 0315822b..1394a10b 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 -@@ -863,7 +863,7 @@ static base::mac::ScopedObjCClassSwizzle +@@ -866,7 +866,7 @@ static base::mac::ScopedObjCClassSwizzle CFStringRef checkInterval = CFSTR("checkInterval"); CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app); if (!plist) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch index 6dbf5b12..52ceba46 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -9,7 +9,7 @@ #include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/browser/ui/web_applications/web_app_launch_utils.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" -@@ -468,6 +470,7 @@ Browser::Browser(const CreateParams& par +@@ -467,6 +469,7 @@ Browser::Browser(const CreateParams& par omit_from_session_restore_(params.omit_from_session_restore), should_trigger_session_restore_(params.should_trigger_session_restore), cancel_download_confirmation_state_(NOT_PROMPTED), @@ -17,7 +17,7 @@ override_bounds_(params.initial_bounds), initial_show_state_(params.initial_show_state), initial_workspace_(params.initial_workspace), -@@ -831,7 +834,7 @@ Browser::WarnBeforeClosingResult Browser +@@ -830,7 +833,7 @@ Browser::WarnBeforeClosingResult Browser // If the browser can close right away (there are no pending downloads we need // to prompt about) then there's no need to warn. In the future, we might need // to check other conditions as well. @@ -26,7 +26,7 @@ return WarnBeforeClosingResult::kOkToClose; DCHECK(!warn_before_closing_callback_) -@@ -861,6 +864,7 @@ bool Browser::TryToCloseWindow( +@@ -860,6 +863,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = NOT_PROMPTED; @@ -34,7 +34,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -2699,6 +2703,62 @@ bool Browser::CanCloseWithInProgressDown +@@ -2702,6 +2706,62 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -97,7 +97,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -2717,6 +2777,22 @@ void Browser::InProgressDownloadResponse +@@ -2720,6 +2780,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -130,7 +130,7 @@ #include "chrome/browser/ui/signin_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/unload_controller.h" -@@ -1005,12 +1006,17 @@ class Browser : public TabStripModelObse +@@ -1008,12 +1009,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -148,7 +148,7 @@ // Called when all warnings have completed when attempting to close the // browser directly (e.g. via hotkey, close button, terminate signal, etc.) // Used as a WarnBeforeClosingCallback by ShouldCloseWindow(). -@@ -1173,6 +1179,8 @@ class Browser : public TabStripModelObse +@@ -1176,6 +1182,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 99878aa0..ca7d3708 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 -@@ -738,6 +738,9 @@ bool HandleNewTabPageLocationOverride( +@@ -743,6 +743,9 @@ bool HandleNewTabPageLocationOverride( Profile* profile = Profile::FromBrowserContext(browser_context); std::string ntp_location = profile->GetPrefs()->GetString(prefs::kNewTabPageLocationOverride); diff --git a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch index acb9befd..f1b52ae8 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 @@ -80,7 +80,7 @@ #include "base/feature_list.h" #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" -@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_p +@@ -646,6 +647,9 @@ void SearchProvider::Run(bool query_is_p } void SearchProvider::DoHistoryQuery(bool minimal_changes) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch b/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch index 75dd1154..2dba0ccf 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5818,7 +5818,7 @@ bool ChromeContentBrowserClient::ShouldA +@@ -6001,7 +6001,7 @@ bool ChromeContentBrowserClient::ShouldA const url::Origin& embedder_origin, const content::PepperPluginInfo& plugin_info) { #if BUILDFLAG(ENABLE_PDF) @@ -33,15 +33,12 @@ plugin_service->RegisterInternalPlugin(info, true); --- a/chrome/browser/plugins/plugin_prefs.cc +++ b/chrome/browser/plugins/plugin_prefs.cc -@@ -37,9 +37,9 @@ namespace { - - bool IsPDFViewerPlugin(const std::u16string& plugin_name) { - return (plugin_name == -- base::ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName)) || -+ base::ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName())) || - (plugin_name == -- base::ASCIIToUTF16(ChromeContentClient::kPDFInternalPluginName)); -+ base::ASCIIToUTF16(ChromeContentClient::GetPDFInternalPluginName())); +@@ -40,7 +40,7 @@ bool IsPDFViewerPlugin(const std::u16str + // plugin, which is also used for Print Preview. Note that only the PDF viewer + // and Print Preview can create the internal PDF plugin in the first place. + return plugin_name == +- base::ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName); ++ base::ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName()); } } // namespace @@ -254,7 +251,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -246,6 +246,7 @@ static_library("common") { +@@ -249,6 +249,7 @@ static_library("common") { "//components/no_state_prefetch/common", "//components/no_state_prefetch/common:mojo_bindings", "//components/page_load_metrics/common:common", @@ -363,7 +360,7 @@ FILE_PATH_LITERAL("internal-pdf-viewer"); --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -1043,7 +1043,7 @@ WebPlugin* ChromeContentRendererClient:: +@@ -1047,7 +1047,7 @@ WebPlugin* ChromeContentRendererClient:: } } } else if (info.name == @@ -372,7 +369,7 @@ // Report PDF load metrics. Since the PDF plugin is comprised of an // extension that loads a second plugin, avoid double counting by // ignoring the creation of the second plugin. -@@ -1075,7 +1075,7 @@ WebPlugin* ChromeContentRendererClient:: +@@ -1079,7 +1079,7 @@ WebPlugin* ChromeContentRendererClient:: #if BUILDFLAG(ENABLE_PDF) if (info.name == @@ -381,7 +378,7 @@ return pdf::CreateInternalPlugin( info, std::move(params), render_frame, std::make_unique()); -@@ -1088,7 +1088,7 @@ WebPlugin* ChromeContentRendererClient:: +@@ -1092,7 +1092,7 @@ WebPlugin* ChromeContentRendererClient:: PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type, url); if (info.name == diff --git a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch index a281082b..02813e49 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch @@ -1,19 +1,16 @@ --- a/chrome/browser/sharing/features.cc +++ b/chrome/browser/sharing/features.cc -@@ -33,6 +33,8 @@ const base::Feature kSharingPreferVapid +@@ -32,3 +32,5 @@ const base::Feature kSharingPreferVapid + base::FEATURE_DISABLED_BY_DEFAULT #endif // defined(OS_ANDROID) }; - -+const base::Feature kDisableQRGenerator{"DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT}; + - namespace sharing { - - const base::Feature kShareMenu{ ++const base::Feature kDisableQRGenerator{"DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT}; --- a/chrome/browser/sharing/features.h +++ b/chrome/browser/sharing/features.h -@@ -40,4 +40,5 @@ extern const base::Feature kShareMenu; - - } // namespace sharing +@@ -34,4 +34,5 @@ extern const base::Feature kSharingSendV + // Feature flag for prefer sending sharing message using VAPID. + extern const base::Feature kSharingPreferVapid; +extern const base::Feature kDisableQRGenerator; #endif // CHROME_BROWSER_SHARING_FEATURES_H_ @@ -30,7 +27,7 @@ return true; --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -296,7 +296,8 @@ void LocationBarView::Init() { +@@ -297,7 +297,8 @@ void LocationBarView::Init() { // the left most icon. params.types_enabled.push_back(PageActionIconType::kSendTabToSelf); params.types_enabled.push_back(PageActionIconType::kClickToCall); diff --git a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch index 2caa71bc..a5e954bf 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 @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc -@@ -140,9 +140,10 @@ ChromeRenderFrameObserver::ChromeRenderF +@@ -139,9 +139,10 @@ ChromeRenderFrameObserver::ChromeRenderF if (!render_frame->IsMainFrame()) return; @@ -25,7 +25,7 @@ if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection)) SetClientSidePhishingDetection(); #endif -@@ -202,14 +203,16 @@ void ChromeRenderFrameObserver::DidFinis +@@ -201,14 +202,16 @@ void ChromeRenderFrameObserver::DidFinis if (frame->Parent()) return; @@ -52,7 +52,7 @@ --- a/chrome/renderer/chrome_render_frame_observer.h +++ b/chrome/renderer/chrome_render_frame_observer.h -@@ -134,6 +134,7 @@ class ChromeRenderFrameObserver : public +@@ -139,6 +139,7 @@ class ChromeRenderFrameObserver : public #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) safe_browsing::PhishingClassifierDelegate* phishing_classifier_ = nullptr; #endif @@ -83,7 +83,7 @@ } // namespace // TemplateURLService::LessWithPrefix ----------------------------------------- -@@ -281,6 +288,7 @@ TemplateURLService::TemplateURLService( +@@ -282,6 +289,7 @@ TemplateURLService::TemplateURLService( std::unique_ptr client, const base::RepeatingClosure& dsp_change_callback) : prefs_(prefs), @@ -91,7 +91,7 @@ search_terms_data_(std::move(search_terms_data)), web_data_service_(web_data_service), client_(std::move(client)), -@@ -362,8 +370,8 @@ bool TemplateURLService::CanAddAutogener +@@ -363,8 +371,8 @@ bool TemplateURLService::CanAddAutogener // that may interfere with search queries). An easy heuristic for this is // whether the user has a TemplateURL that has been manually modified (e.g., // renamed) connected to the same host. @@ -102,7 +102,7 @@ } bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy( -@@ -1495,6 +1503,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -1496,6 +1504,8 @@ SyncDataMap TemplateURLService::CreateGU void TemplateURLService::Init(const Initializer* initializers, int num_initializers) { @@ -111,7 +111,7 @@ if (client_) client_->SetOwner(this); -@@ -1631,6 +1641,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -1632,6 +1642,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -123,7 +123,7 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -702,6 +702,8 @@ class TemplateURLService : public WebDat +@@ -706,6 +706,8 @@ class TemplateURLService : public WebDat // ---------- Browser state related members --------------------------------- PrefService* prefs_ = nullptr; 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 93ad67bb..a6189608 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 -@@ -1141,7 +1141,8 @@ void BrowserCommandController::InitComma +@@ -1139,7 +1139,8 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, normal_window); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch index cf76c010..2e4c7b9b 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch @@ -1,15 +1,15 @@ --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc -@@ -26,6 +26,7 @@ - #include "chrome/browser/ui/browser.h" - #include "chrome/browser/ui/browser_list.h" - #include "chrome/browser/ui/tabs/tab_strip_model.h" +@@ -24,6 +24,7 @@ + #include "chrome/browser/profiles/profile.h" + #include "chrome/browser/profiles/profile_manager.h" + #include "chrome/browser/sync/sync_service_factory.h" +#include "components/browsing_data/core/features.h" #include "components/browsing_data/core/pref_names.h" #include "components/keep_alive_registry/keep_alive_types.h" #include "components/keep_alive_registry/scoped_keep_alive.h" -@@ -137,6 +138,21 @@ class BrowsingDataRemoverObserver - std::unique_ptr keep_alive_; +@@ -151,6 +152,21 @@ class BrowsingDataRemoverObserver + #endif }; +uint64_t AllOriginTypeMask() { @@ -30,7 +30,7 @@ uint64_t GetOriginTypeMask(const base::Value& data_types) { uint64_t result = 0; for (const auto& data_type : data_types.GetList()) { -@@ -277,8 +293,9 @@ void ChromeBrowsingDataLifetimeManager:: +@@ -292,8 +308,9 @@ void ChromeBrowsingDataLifetimeManager:: bool keep_browser_alive) { auto* data_types = profile_->GetPrefs()->GetList( browsing_data::prefs::kClearBrowsingDataOnExitList); @@ -42,9 +42,9 @@ profile_->GetPrefs()->SetBoolean( browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true); auto* remover = profile_->GetBrowsingDataRemover(); -@@ -294,8 +311,8 @@ void ChromeBrowsingDataLifetimeManager:: - KeepAliveRestartOption::DISABLED) - : nullptr; +@@ -304,8 +321,8 @@ void ChromeBrowsingDataLifetimeManager:: + DCHECK(keep_browser_alive); + #endif remover->RemoveAndReply(base::Time(), base::Time::Max(), - GetRemoveMask(*data_types), - GetOriginTypeMask(*data_types), @@ -52,7 +52,7 @@ + cdoe ? AllOriginTypeMask() : GetOriginTypeMask(*data_types), BrowsingDataRemoverObserver::Create( remover, /*filterable_deletion=*/true, profile_, - std::move(keep_alive))); + keep_browser_alive)); --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc @@ -48,6 +48,8 @@ ChromeBrowsingDataLifetimeManagerFactory @@ -77,10 +77,10 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/browsing_data/core/features.cc +++ b/components/browsing_data/core/features.cc -@@ -12,5 +12,7 @@ const base::Feature kEnableRemovingAllTh - +@@ -19,5 +19,7 @@ const base::Feature kEnableBrowsingDataL const base::Feature kEnableBrowsingDataLifetimeManager{ "BrowsingDataLifetimeManager", base::FEATURE_ENABLED_BY_DEFAULT}; + #endif + +const base::Feature kClearDataOnExit{"ClearDataOnExit", base::FEATURE_DISABLED_BY_DEFAULT}; } // namespace features 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 a7a035a4..d4b84c8a 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -8,7 +8,7 @@ #include "base/containers/flat_map.h" #include "base/cxx17_backports.h" #include "base/metrics/histogram_macros.h" -@@ -1780,6 +1781,10 @@ bool TabStripModel::CloseTabs(base::span +@@ -1779,6 +1780,10 @@ bool TabStripModel::CloseTabs(base::span if (items.empty()) return true; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index 9e2df0a6..b5ba8078 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 @@ -77,7 +77,7 @@ #include "base/containers/contains.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" -@@ -238,6 +239,13 @@ bool ExtensionManagement::IsInstallation +@@ -250,6 +251,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-disable-beforeunload.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch index d6903972..c6ec2046 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch @@ -21,7 +21,7 @@ #include "base/i18n/rtl.h" #include "base/macros.h" #include "base/metrics/histogram_macros.h" -@@ -194,7 +195,8 @@ void AppModalDialogManager::RunBeforeUnl +@@ -196,7 +197,8 @@ void AppModalDialogManager::RunBeforeUnl ChromeJavaScriptDialogExtraData* extra_data = &javascript_dialog_extra_data_[web_contents]; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch index 003b583a..35abc335 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,13 +21,13 @@ #include "base/callback_helpers.h" #include "base/compiler_specific.h" #include "base/containers/flat_set.h" -@@ -916,7 +917,8 @@ void HistoryBackend::InitImpl( +@@ -911,7 +912,8 @@ void HistoryBackend::InitImpl( db_->GetStartDate(&first_recorded_time_); // Start expiring old stuff. -- expirer_.StartExpiringOldStuff(TimeDelta::FromDays(kExpireDaysThreshold)); +- expirer_.StartExpiringOldStuff(base::Days(kExpireDaysThreshold)); + if (!base::CommandLine::ForCurrentProcess()->HasSwitch("keep-old-history")) -+ expirer_.StartExpiringOldStuff(TimeDelta::FromDays(kExpireDaysThreshold)); ++ expirer_.StartExpiringOldStuff(base::Days(kExpireDaysThreshold)); LOCAL_HISTOGRAM_TIMES("History.InitTime", TimeTicks::Now() - beginning_time); } 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 6926ec11..5ec4fde6 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/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -651,7 +651,8 @@ void StartupBrowserCreatorImpl::AddInfoB +@@ -648,7 +648,8 @@ void StartupBrowserCreatorImpl::AddInfoB if (command_line_.HasSwitch(switches::kKioskMode)) return; 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 84a9e032..564a195d 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 -@@ -268,14 +268,30 @@ void ToolbarView::Init() { +@@ -273,12 +273,28 @@ void ToolbarView::Init() { std::unique_ptr toolbar_account_icon_container; @@ -15,12 +15,10 @@ + bool show_avatar_toolbar_button = true; #if BUILDFLAG(IS_CHROMEOS_ASH) - if (!base::FeatureList::IsEnabled(chromeos::features::kAvatarToolbarButton)) { - // ChromeOS only badges Incognito and Guest icons in the browser window. -- show_avatar_toolbar_button = browser_->profile()->IsOffTheRecord() || -- browser_->profile()->IsGuestSession(); -+ show_avatar_toolbar_button = in_incognito_or_guest_mode; - } + // ChromeOS only badges Incognito and Guest icons in the browser window. +- show_avatar_toolbar_button = browser_->profile()->IsOffTheRecord() || +- browser_->profile()->IsGuestSession(); ++ show_avatar_toolbar_button = in_incognito_or_guest_mode; #endif + + if (flag_value == "always") diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index e8b650a5..e3a61dfd 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -266,5 +266,7 @@ const base::Feature kPartitionedCookies{ +@@ -263,5 +263,7 @@ const base::Feature kPartitionedCookies{ const base::Feature kExtraCookieValidityChecks{ "ExtraCookieValidityChecks", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -23,7 +23,7 @@ } // namespace net --- a/net/base/features.h +++ b/net/base/features.h -@@ -400,6 +400,8 @@ NET_EXPORT extern const base::Feature kP +@@ -396,6 +396,8 @@ NET_EXPORT extern const base::Feature kP // feature flag, assuming no breakage occurs with it enabled. NET_EXPORT extern const base::Feature kExtraCookieValidityChecks; @@ -34,7 +34,7 @@ --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -138,11 +138,6 @@ const unsigned kMinimumTTLSeconds = kCac +@@ -139,11 +139,6 @@ const unsigned kMinimumTTLSeconds = kCac // cached. const int kIPv6ProbePeriodMs = 1000; @@ -46,7 +46,7 @@ enum DnsResolveStatus { RESOLVE_STATUS_DNS_SUCCESS = 0, RESOLVE_STATUS_PROC_SUCCESS, -@@ -3693,7 +3688,7 @@ bool HostResolverManager::IsIPv6Reachabl +@@ -3696,7 +3691,7 @@ bool HostResolverManager::IsIPv6Reachabl (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { SetLastIPv6ProbeResult( diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index bc202fb3..37f68d92 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -27,7 +27,7 @@ searchEngine: CrInputElement, }; } -@@ -55,6 +56,7 @@ class SettingsSearchEngineDialogElement +@@ -54,6 +55,7 @@ class SettingsSearchEngineDialogElement searchEngine_: String, keyword_: String, queryUrl_: String, @@ -35,7 +35,7 @@ dialogTitle_: String, actionButtonText_: String, }; -@@ -64,6 +66,7 @@ class SettingsSearchEngineDialogElement +@@ -63,6 +65,7 @@ class SettingsSearchEngineDialogElement private searchEngine_: string; private keyword_: string; private queryUrl_: string; @@ -43,7 +43,7 @@ private dialogTitle_: string; private actionButtonText_: string; private browserProxy_: SearchEnginesBrowserProxy = -@@ -93,6 +96,7 @@ class SettingsSearchEngineDialogElement +@@ -92,6 +95,7 @@ class SettingsSearchEngineDialogElement this.searchEngine_ = this.model.name; this.keyword_ = this.model.keyword; this.queryUrl_ = this.model.url; @@ -51,7 +51,7 @@ } else { this.dialogTitle_ = loadTimeData.getString('searchEnginesAddSearchEngine'); -@@ -128,8 +132,12 @@ class SettingsSearchEngineDialogElement +@@ -127,8 +131,12 @@ class SettingsSearchEngineDialogElement } } @@ -66,7 +66,7 @@ } private cancel_() { -@@ -138,7 +146,8 @@ class SettingsSearchEngineDialogElement +@@ -137,7 +145,8 @@ class SettingsSearchEngineDialogElement private onActionButtonTap_() { this.browserProxy_.searchEngineEditCompleted( @@ -76,7 +76,7 @@ this.$.dialog.close(); } -@@ -166,9 +175,11 @@ class SettingsSearchEngineDialogElement +@@ -165,9 +174,11 @@ class SettingsSearchEngineDialogElement private updateActionButtonState_() { const allValid = [ @@ -92,7 +92,7 @@ } --- a/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts +++ b/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts -@@ -28,6 +28,7 @@ export type SearchEngine = { +@@ -30,6 +30,7 @@ export type SearchEngine = { modelIndex: number, name: string, url: string, @@ -100,7 +100,7 @@ urlLocked: boolean, }; -@@ -51,7 +52,7 @@ export interface SearchEnginesBrowserPro +@@ -53,7 +54,7 @@ export interface SearchEnginesBrowserPro searchEngineEditCancelled(): void; searchEngineEditCompleted( @@ -109,7 +109,7 @@ getSearchEnginesList(): Promise; -@@ -82,11 +83,12 @@ export class SearchEnginesBrowserProxyIm +@@ -84,11 +85,12 @@ export class SearchEnginesBrowserProxyIm } searchEngineEditCompleted( @@ -177,7 +177,7 @@ protected: virtual ~EditSearchEngineControllerDelegate() {} -@@ -49,6 +50,8 @@ class EditSearchEngineController { +@@ -54,6 +55,8 @@ class EditSearchEngineController { // character results in a valid url. bool IsURLValid(const std::string& url_input) const; @@ -186,7 +186,7 @@ // Returns true if the value of |keyword_input| represents a valid keyword. // The keyword is valid if it is non-empty and does not conflict with an // existing entry. NOTE: this is just the keyword, not the title and url. -@@ -57,7 +60,8 @@ class EditSearchEngineController { +@@ -62,7 +65,8 @@ class EditSearchEngineController { // Completes the add or edit of a search engine. void AcceptAddOrEdit(const std::u16string& title_input, const std::u16string& keyword_input, @@ -251,7 +251,7 @@ } --- a/chrome/browser/ui/search_engines/keyword_editor_controller.h +++ b/chrome/browser/ui/search_engines/keyword_editor_controller.h -@@ -25,14 +25,16 @@ class KeywordEditorController { +@@ -29,14 +29,16 @@ class KeywordEditorController { // model. Returns the index of the added URL. int AddTemplateURL(const std::u16string& title, const std::u16string& keyword, @@ -315,7 +315,7 @@ TemplateURL* TemplateURLTableModel::GetTemplateURL(int index) { --- a/chrome/browser/ui/search_engines/template_url_table_model.h +++ b/chrome/browser/ui/search_engines/template_url_table_model.h -@@ -51,13 +51,15 @@ class TemplateURLTableModel : public ui: +@@ -54,13 +54,15 @@ class TemplateURLTableModel : public ui: void Add(int index, const std::u16string& short_name, const std::u16string& keyword, @@ -353,7 +353,7 @@ dict->SetBoolean("urlLocked", template_url->prepopulate_id() > 0); GURL icon_url = template_url->favicon_url(); if (icon_url.is_valid()) -@@ -320,12 +324,14 @@ void SearchEnginesHandler::HandleSearchE +@@ -325,12 +329,14 @@ void SearchEnginesHandler::HandleSearchE void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url, const std::u16string& title, const std::u16string& keyword, @@ -371,7 +371,7 @@ edit_controller_.reset(); } -@@ -356,6 +362,8 @@ bool SearchEnginesHandler::CheckFieldVal +@@ -361,6 +367,8 @@ bool SearchEnginesHandler::CheckFieldVal is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value)); else if (field_name.compare(kQueryUrlField) == 0) is_valid = edit_controller_->IsURLValid(field_value); @@ -380,7 +380,7 @@ else NOTREACHED(); -@@ -377,17 +385,21 @@ void SearchEnginesHandler::HandleSearchE +@@ -382,17 +390,21 @@ void SearchEnginesHandler::HandleSearchE std::string search_engine; std::string keyword; std::string query_url; @@ -406,7 +406,7 @@ --- a/chrome/browser/ui/webui/settings/search_engines_handler.h +++ b/chrome/browser/ui/webui/settings/search_engines_handler.h -@@ -46,7 +46,8 @@ class SearchEnginesHandler : public Sett +@@ -50,7 +50,8 @@ class SearchEnginesHandler : public Sett void OnEditedKeyword(TemplateURL* template_url, const std::u16string& title, const std::u16string& keyword, @@ -416,7 +416,7 @@ // SettingsPageUIHandler implementation. void RegisterMessages() override; -@@ -78,8 +79,8 @@ class SearchEnginesHandler : public Sett +@@ -82,8 +83,8 @@ class SearchEnginesHandler : public Sett // to WebUI. Called from WebUI. void HandleValidateSearchEngineInput(const base::ListValue* args); @@ -429,7 +429,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -640,7 +640,8 @@ void TemplateURLService::IncrementUsageC +@@ -641,7 +641,8 @@ void TemplateURLService::IncrementUsageC void TemplateURLService::ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -439,7 +439,7 @@ DCHECK(!IsCreatedByExtension(url)); DCHECK(!keyword.empty()); DCHECK(!search_url.empty()); -@@ -655,6 +656,7 @@ void TemplateURLService::ResetTemplateUR +@@ -656,6 +657,7 @@ void TemplateURLService::ResetTemplateUR data.safe_for_autoreplace = false; data.last_modified = clock_->Now(); data.is_active = TemplateURLData::ActiveStatus::kTrue; @@ -449,7 +449,7 @@ } --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -249,7 +249,8 @@ class TemplateURLService : public WebDat +@@ -253,7 +253,8 @@ class TemplateURLService : public WebDat 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 d3c853c0..333f2611 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 -@@ -2764,7 +2764,13 @@ const FeatureEntry::Choice kDocumentTran +@@ -2728,7 +2728,13 @@ const FeatureEntry::FeatureVariation kWi // calculate and verify checksum. // // When adding a new choice, add it to the end of the list. diff --git a/patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch b/patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch index 50f9f038..f6e507ec 100644 --- a/patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch +++ b/patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/media/router/discovery/dial/dial_registry.cc +++ b/chrome/browser/media/router/discovery/dial/dial_registry.cc -@@ -191,10 +191,6 @@ void DialRegistry::StartPeriodicDiscover +@@ -190,10 +190,6 @@ void DialRegistry::StartPeriodicDiscover dial_ = CreateDialService(); dial_->AddObserver(this); @@ -14,7 +14,7 @@ } void DialRegistry::DoDiscovery() { -@@ -208,8 +204,6 @@ void DialRegistry::StopPeriodicDiscovery +@@ -207,8 +203,6 @@ void DialRegistry::StopPeriodicDiscovery if (!dial_) return; diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index 31fb82ca..0352e60e 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -10,7 +10,7 @@ #include "crypto/secure_hash.h" #if defined(OS_WIN) -@@ -533,105 +532,6 @@ DownloadInterruptReason BaseFile::Publis +@@ -535,105 +534,6 @@ DownloadInterruptReason BaseFile::Publis } #endif // defined(OS_ANDROID) @@ -116,7 +116,7 @@ void BaseFile::AnnotateWithSourceInformation( const std::string& client_guid, -@@ -639,32 +539,8 @@ void BaseFile::AnnotateWithSourceInforma +@@ -641,32 +541,8 @@ void BaseFile::AnnotateWithSourceInforma const GURL& referrer_url, mojo::PendingRemote remote_quarantine, OnAnnotationDoneCallback on_annotation_done_callback) { @@ -161,48 +161,46 @@ "//components/services/storage", "//components/services/storage:filesystem_proxy_factory", "//components/services/storage/dom_storage:local_storage_proto", ---- a/content/browser/file_system_access/file_system_access_file_writer_impl.cc -+++ b/content/browser/file_system_access/file_system_access_file_writer_impl.cc -@@ -11,7 +11,6 @@ +--- a/content/browser/file_system_access/safe_move_helper.cc ++++ b/content/browser/file_system_access/safe_move_helper.cc +@@ -12,7 +12,6 @@ #include "base/task/thread_pool.h" + #include "base/threading/sequenced_task_runner_handle.h" #include "build/build_config.h" - #include "build/chromeos_buildflags.h" -#include "components/services/quarantine/quarantine.h" #include "content/browser/file_system_access/file_system_access_error.h" - #include "content/browser/file_system_access/file_system_access_manager_impl.h" #include "content/public/browser/content_browser_client.h" -@@ -382,22 +381,9 @@ void FileSystemAccessFileWriterImpl::Did - // In case of error, the swap file URL will point to a valid filesystem - // location. The file at this URL will be deleted when the mojo pipe closes. + #include "content/public/common/content_client.h" +@@ -193,20 +192,8 @@ void SafeMoveHelper::DidAfterWriteCheck( + // not exist anymore. In case of error, the source file URL will point to a + // valid filesystem location. base::OnceCallback result_callback; - if (RequireSecurityChecks()) { -- GURL referrer_url = manager()->is_off_the_record() ? GURL() : context().url; +- GURL referrer_url = manager_->is_off_the_record() ? GURL() : context_.url; - mojo::Remote quarantine_remote; - if (quarantine_connection_callback_) { - quarantine_connection_callback_.Run( - quarantine_remote.BindNewPipeAndPassReceiver()); - } -- result_callback = -- base::BindOnce(&FileSystemAccessFileWriterImpl::DidSwapFileDoQuarantine, -- weak_factory_.GetWeakPtr(), url(), referrer_url, -- std::move(quarantine_remote)); +- result_callback = base::BindOnce( +- &SafeMoveHelper::DidFileDoQuarantine, weak_factory_.GetWeakPtr(), +- dest_url(), referrer_url, std::move(quarantine_remote)); - } else { - result_callback = base::BindOnce( - &FileSystemAccessFileWriterImpl::DidSwapFileSkipQuarantine, - weak_factory_.GetWeakPtr()); + result_callback = base::BindOnce(&SafeMoveHelper::DidFileSkipQuarantine, + weak_factory_.GetWeakPtr()); - } - DoFileSystemOperation( - FROM_HERE, &FileSystemOperationRunner::MoveFileLocal, - std::move(result_callback), swap_url(), url(), -@@ -422,7 +408,6 @@ void FileSystemAccessFileWriterImpl::Did - void FileSystemAccessFileWriterImpl::DidSwapFileDoQuarantine( + manager_->DoFileSystemOperation( + FROM_HERE, &storage::FileSystemOperationRunner::MoveFileLocal, + std::move(result_callback), source_url(), dest_url(), option_); +@@ -220,7 +207,6 @@ void SafeMoveHelper::DidFileSkipQuaranti + void SafeMoveHelper::DidFileDoQuarantine( const storage::FileSystemURL& target_url, const GURL& referrer_url, - mojo::Remote quarantine_remote, base::File::Error result) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -453,37 +438,9 @@ void FileSystemAccessFileWriterImpl::Did +@@ -251,37 +237,9 @@ void SafeMoveHelper::DidFileDoQuarantine referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS() ? referrer_url : GURL(); @@ -215,7 +213,7 @@ - ->browser() - ->GetApplicationClientGUIDForQuarantineCheck(), - mojo::WrapCallbackWithDefaultInvokeIfNotRun( -- base::BindOnce(&FileSystemAccessFileWriterImpl::DidAnnotateFile, +- base::BindOnce(&SafeMoveHelper::DidAnnotateFile, - weak_factory_.GetWeakPtr(), - std::move(quarantine_remote)), - quarantine::mojom::QuarantineFileResult::ANNOTATION_FAILED)); @@ -225,7 +223,7 @@ - FROM_HERE, {base::MayBlock()}, - base::BindOnce(&quarantine::SetInternetZoneIdentifierDirectly, - target_url.path(), authority_url, referrer_url), -- base::BindOnce(&FileSystemAccessFileWriterImpl::DidAnnotateFile, +- base::BindOnce(&SafeMoveHelper::DidAnnotateFile, - weak_factory_.GetWeakPtr(), - std::move(quarantine_remote))); -#else @@ -235,15 +233,15 @@ - } } - void FileSystemAccessFileWriterImpl::DidAnnotateFile( + void SafeMoveHelper::DidAnnotateFile( - mojo::Remote quarantine_remote, quarantine::mojom::QuarantineFileResult result) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ---- a/content/browser/file_system_access/file_system_access_file_writer_impl.h -+++ b/content/browser/file_system_access/file_system_access_file_writer_impl.h -@@ -110,10 +110,8 @@ class CONTENT_EXPORT FileSystemAccessFil - void DidSwapFileDoQuarantine( +--- a/content/browser/file_system_access/safe_move_helper.h ++++ b/content/browser/file_system_access/safe_move_helper.h +@@ -58,10 +58,8 @@ class CONTENT_EXPORT SafeMoveHelper { + void DidFileDoQuarantine( const storage::FileSystemURL& target_url, const GURL& referrer_url, - mojo::Remote quarantine_remote, @@ -252,10 +250,10 @@ - mojo::Remote quarantine_remote, quarantine::mojom::QuarantineFileResult result); - // After write and quarantine checks should apply to paths on all filesystems + void ComputeHashForSourceFile(HashCallback callback); --- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -480,7 +480,7 @@ void PepperFileIOHost::OnLocalFileOpened +@@ -456,7 +456,7 @@ void PepperFileIOHost::OnLocalFileOpened ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { @@ -264,7 +262,7 @@ // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -514,7 +514,7 @@ void PepperFileIOHost::OnLocalFileOpened +@@ -490,7 +490,7 @@ void PepperFileIOHost::OnLocalFileOpened #endif } @@ -283,7 +281,7 @@ #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_platform_file.h" -@@ -89,12 +88,6 @@ class PepperFileIOHost : public ppapi::h +@@ -93,12 +92,6 @@ class PepperFileIOHost : public ppapi::h const base::FilePath& path, base::File::Error error_code); diff --git a/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch b/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch index 851b0479..bc2945b8 100644 --- a/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch +++ b/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc -@@ -121,9 +121,7 @@ void IntranetRedirectDetector::FinishSle +@@ -119,9 +119,7 @@ void IntranetRedirectDetector::FinishSle simple_loaders_.clear(); resulting_origins_.clear(); diff --git a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch index d73cb28a..1e571b66 100644 --- a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch @@ -3,7 +3,7 @@ --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3596,8 +3596,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3595,8 +3595,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -13,7 +13,7 @@ } SynthesizeGLError( GL_INVALID_ENUM, "getParameter", -@@ -3611,8 +3610,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3610,8 +3609,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_VENDOR)))); } diff --git a/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch b/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch index 1e524a43..21ddd68c 100644 --- a/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch +++ b/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch @@ -2,7 +2,7 @@ --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -408,7 +408,7 @@ const base::Feature kComputePressure{"Co +@@ -416,7 +416,7 @@ const base::Feature kComputePressure{"Co // Prefetch request properties are updated to be privacy-preserving. See // crbug.com/988956. const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges", diff --git a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch index 48de75f6..d9fcbe9e 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 -@@ -438,11 +438,6 @@ int GetContentRestrictions(const Browser +@@ -440,11 +440,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; } -@@ -1338,8 +1333,7 @@ bool CanSavePage(const Browser* browser) +@@ -1342,8 +1337,7 @@ bool CanSavePage(const Browser* browser) prefs::kAllowFileSelectionDialogs)) { return false; } @@ -64,7 +64,7 @@ // These lists are lazily initialized below and are leaked on shutdown to --- a/content/public/common/url_utils.cc +++ b/content/public/common/url_utils.cc -@@ -27,11 +27,7 @@ bool HasWebUIScheme(const GURL& url) { +@@ -26,11 +26,7 @@ bool HasWebUIScheme(const GURL& url) { } bool IsSavableURL(const GURL& url) { diff --git a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch index 95a846b6..57cd6ec1 100644 --- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch +++ b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch @@ -13,7 +13,7 @@ AddChildView(std::make_unique()); --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -2676,8 +2676,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2680,8 +2680,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { @@ -22,7 +22,7 @@ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); CHECK(clipboard); std::u16string clipboard_text; -@@ -2685,7 +2683,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2689,7 +2687,6 @@ void TabStrip::NewTabButtonPressed(const /* data_dst = */ nullptr, &clipboard_text); if (!clipboard_text.empty()) controller_->CreateNewTabWithLocation(clipboard_text); diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index ef973f94..2507bf8a 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -51,18 +51,20 @@ - --- a/chrome/browser/resources/history/side_bar.html +++ b/chrome/browser/resources/history/side_bar.html -@@ -111,11 +111,6 @@ - - - -- + +- +- - $i18n{openTabsMenuItem} - -
--- a/chrome/browser/resources/settings/autofill_page/passwords_section.html +++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html -@@ -106,6 +106,7 @@ +@@ -107,6 +107,7 @@ label="$i18n{trustedVaultOptInLabel}" sub-label="$i18n{trustedVaultOptInSubLabel}"> @@ -135,7 +137,7 @@
-@@ -154,6 +155,7 @@ +@@ -155,6 +156,7 @@
$i18nRaw{managePasswordsLabel}
@@ -221,14 +223,14 @@ --- a/chrome/browser/resources/settings/settings_menu/settings_menu.html +++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html @@ -111,7 +111,7 @@ - $i18n{autofillPageTitle} + -