diff --git a/chromium_version.txt b/chromium_version.txt index a65f82e6..0538c9c9 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -123.0.6312.122 +124.0.6367.60 diff --git a/domain_substitution.list b/domain_substitution.list index 0f6b3c00..1ec34739 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -35,6 +35,7 @@ ash/ambient/ambient_controller_unittest.cc ash/ambient/backdrop/ambient_backend_controller_impl.cc ash/ambient/managed/screensaver_image_downloader.cc ash/ambient/metrics/ambient_metrics.cc +ash/api/tasks/fake_tasks_client.cc ash/api/tasks/tasks_types.h ash/app_list/PRESUBMIT.py ash/app_list/app_list_controller_impl_unittest.cc @@ -48,6 +49,8 @@ ash/assistant/ui/main_stage/assistant_onboarding_view_unittest.cc ash/assistant/ui/main_stage/suggestion_chip_view_unittest.cc ash/assistant/util/deep_link_util.cc ash/assistant/util/deep_link_util_unittest.cc +ash/birch/birch_item.cc +ash/birch/birch_item_unittest.cc ash/capture_mode/capture_mode_camera_unittests.cc ash/capture_mode/capture_mode_controller.cc ash/capture_mode/capture_mode_unittests.cc @@ -63,7 +66,6 @@ ash/constants/ash_features.cc ash/constants/ash_switches.cc ash/constants/url_constants.cc ash/controls/contextual_nudge.cc -ash/events/keyboard_capability_unittest.cc ash/fast_ink/laser/laser_pointer_view.cc ash/game_dashboard/game_dashboard_main_menu_view.cc ash/glanceables/classroom/fake_glanceables_classroom_client.cc @@ -74,12 +76,13 @@ ash/glanceables/tasks/glanceables_task_view.cc ash/glanceables/tasks/glanceables_task_view_v2.cc ash/glanceables/tasks/glanceables_tasks_view.cc ash/glanceables/tasks/glanceables_tasks_view_unittest.cc +ash/glanceables/tasks/test/glanceables_tasks_test_util.cc ash/login/ui/auth_icon_view.cc ash/login/ui/login_remove_account_dialog_unittest.cc ash/metrics/login_unlock_throughput_recorder.h ash/picker/picker_asset_fetcher_impl.cc ash/picker/picker_controller.cc -ash/picker/picker_search_controller_unittest.cc +ash/picker/search/picker_search_controller_unittest.cc ash/projector/projector_metadata_model.cc ash/public/cpp/android_intent_helper_unittest.cc ash/public/cpp/system_notification_builder_unittest.cc @@ -169,6 +172,7 @@ ash/webui/common/resources/cr_elements/icons.html ash/webui/common/resources/cr_picture/png.js ash/webui/common/resources/keyboard_layouts.js ash/webui/common/resources/quick_unlock/pin_keyboard_icons.html +ash/webui/common/resources/sea_pen/constants_generated.ts ash/webui/diagnostics_ui/backend/input/input_data_provider_keyboard_unittest.cc ash/webui/diagnostics_ui/diagnostics_ui.cc ash/webui/diagnostics_ui/resources/PRESUBMIT.py @@ -219,6 +223,7 @@ base/BUILD.gn base/PRESUBMIT.py base/allocator/partition_alloc_support.cc base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h +base/allocator/partition_allocator/src/partition_alloc/in_slot_metadata.h base/allocator/partition_allocator/src/partition_alloc/oom.cc base/allocator/partition_allocator/src/partition_alloc/oom.h base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_win.h @@ -232,12 +237,12 @@ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_win.cc base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h base/allocator/partition_allocator/src/partition_alloc/partition_alloc_unittest.cc -base/allocator/partition_allocator/src/partition_alloc/partition_ref_count.h base/allocator/partition_allocator/src/partition_alloc/partition_tls.h base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr.h base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc base/allocator/partition_allocator/src/partition_alloc/starscan/stack/asm/x64/push_registers_asm.cc base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc +base/allocator/partition_allocator/src/partition_alloc/tagging.h base/android/jni_android.cc base/android/jni_string.cc base/android/library_loader/library_loader_hooks.h @@ -282,6 +287,7 @@ base/memory/scoped_refptr.h base/memory/shared_memory_mapping_unittest.cc base/memory/shared_memory_security_policy.cc base/memory/weak_ptr.h +base/message_loop/message_pump_android.h base/message_loop/message_pump_win.cc base/metrics/field_trial_list_including_low_anonymity.h base/metrics/histogram_functions.h @@ -456,12 +462,14 @@ cc/PRESUBMIT.py cc/input/browser_controls_offset_manager.cc cc/input/scroll_state.h cc/input/scrollbar_controller.h +cc/layers/heads_up_display_layer_impl.cc cc/metrics/average_lag_tracker.h cc/metrics/ukm_smoothness_data.h cc/paint/paint_image.h cc/raster/one_copy_raster_buffer_provider.cc cc/tiles/gpu_image_decode_cache.h cc/trees/layer_tree_host_impl.cc +cc/trees/layer_tree_host_unittest_animation.cc cc/trees/proxy_main.cc chrome/BUILD.gn chrome/PRESUBMIT.py @@ -479,11 +487,11 @@ chrome/android/javatests/src/org/chromium/chrome/test/smoke/AndroidManifest_bund chrome/android/trichrome.gni chrome/android/webapk/PRESUBMIT.py chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json -chrome/android/webapk/shell_apk/manifest/maps_go_manifest_config.json chrome/android/webapk/shell_apk/res/values/dimens.xml chrome/app/PRESUBMIT.py chrome/app/app_management_strings.grdp chrome/app/chrome_command_ids.h +chrome/app/chrome_main_delegate.cc chrome/app/chromeos_strings.grdp chrome/app/chromium_strings.grd chrome/app/delay_load_failure_hook_win.cc @@ -512,7 +520,6 @@ chrome/browser/android/history_report/delta_file_commons_unittest.cc chrome/browser/android/omnibox/chrome_omnibox_navigation_observer_android_unittest.cc chrome/browser/android/search_permissions/search_permissions_service.h chrome/browser/android/search_permissions/search_permissions_service_unittest.cc -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 @@ -552,6 +559,7 @@ chrome/browser/apps/digital_goods/digital_goods_ash.cc chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc chrome/browser/apps/guest_view/web_view_browsertest.cc chrome/browser/apps/intent_helper/intent_chip_display_prefs_unittest.cc +chrome/browser/apps/link_capturing/link_capturing_navigation_throttle_browsertest.cc chrome/browser/apps/link_capturing/link_capturing_navigation_throttle_unittest.cc chrome/browser/apps/platform_apps/app_browsertest.cc chrome/browser/apps/platform_apps/app_window_browsertest.cc @@ -587,6 +595,7 @@ chrome/browser/ash/app_mode/kiosk_troubleshooting_tools_browsertest.cc chrome/browser/ash/app_restore/arc_app_single_restore_handler_unittest.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/app_restore/pine_browsertest.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/adbd/arc_adbd_monitor_bridge_unittest.cc @@ -618,6 +627,7 @@ chrome/browser/ash/attestation/attestation_ca_client_unittest.cc chrome/browser/ash/attestation/platform_verification_flow_unittest.cc chrome/browser/ash/attestation/soft_bind_attestation_flow_impl_unittest.cc chrome/browser/ash/attestation/tpm_challenge_key_subtle_unittest.cc +chrome/browser/ash/bluetooth/bluetooth_log_controller_unittest.cc chrome/browser/ash/bluetooth/debug_logs_manager_unittest.cc chrome/browser/ash/bruschetta/bruschetta_download.cc chrome/browser/ash/cert_provisioning/cert_provisioning_test_helpers.cc @@ -633,6 +643,7 @@ chrome/browser/ash/crosapi/browser_data_migrator_unittest.cc chrome/browser/ash/crosapi/browser_util_unittest.cc chrome/browser/ash/crosapi/local_printer_ash_unittest.cc chrome/browser/ash/crosapi/network_settings_translation_unittest.cc +chrome/browser/ash/crosapi/one_drive_integration_service_ash_unittest.cc chrome/browser/ash/crostini/crostini_installer.h chrome/browser/ash/crostini/crostini_simple_types.h chrome/browser/ash/crostini/crostini_util.h @@ -665,6 +676,7 @@ chrome/browser/ash/file_suggest/item_suggest_cache_unittest.cc chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h chrome/browser/ash/floating_workspace/floating_workspace_service_unittest.cc chrome/browser/ash/growth/install_web_app_action_unittest.cc +chrome/browser/ash/growth/open_url_action_performer_unittest.cc chrome/browser/ash/hats/hats_dialog.cc chrome/browser/ash/http_auth_dialog.h chrome/browser/ash/input_method/assistive_input_denylist.cc @@ -683,7 +695,6 @@ chrome/browser/ash/login/ash_hud_login_browsertest.cc chrome/browser/ash/login/device_family_link_allowed_policy_browsertest.cc chrome/browser/ash/login/encryption_migration_browsertest.cc chrome/browser/ash/login/existing_user_controller_browsertest.cc -chrome/browser/ash/login/hats_unlock_survey_trigger_unittest.cc chrome/browser/ash/login/help_app_launcher.h chrome/browser/ash/login/lock/lock_screen_integration_test.cc chrome/browser/ash/login/login_browsertest.cc @@ -772,6 +783,7 @@ 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/scalable_iph/scalable_iph_browsertest.cc chrome/browser/ash/scalable_iph/scalable_iph_delegate_impl.cc chrome/browser/ash/scanning/chrome_scanning_app_delegate_unittest.cc chrome/browser/ash/scheduler_configuration_manager.h @@ -800,7 +812,6 @@ chrome/browser/autofill/android/save_update_address_profile_prompt_controller_un chrome/browser/autofill/autofill_browsertest.cc chrome/browser/autofill/autofill_captured_sites_interactive_uitest.cc chrome/browser/autofill/autofill_interactive_uitest.cc -chrome/browser/autofill/autofill_offer_notification_infobar_delegate_mobile_unittest.cc chrome/browser/autofill/autofill_server_browsertest.cc chrome/browser/autofill/automated_tests/cache_replayer.cc chrome/browser/autofill/automated_tests/cache_replayer.h @@ -809,6 +820,7 @@ chrome/browser/autofill/captured_sites_test_utils.cc chrome/browser/background/background_contents_service.cc chrome/browser/background_sync/periodic_background_sync_permission_context.cc chrome/browser/bluetooth/web_bluetooth_browsertest.cc +chrome/browser/bookmarks/android/bookmark_bridge_unittest.cc chrome/browser/bookmarks/managed_bookmark_service_unittest.cc chrome/browser/breadcrumbs/breadcrumb_manager_tab_helper_unittest.cc chrome/browser/browser_about_handler_unittest.cc @@ -857,6 +869,7 @@ chrome/browser/chromeos/extensions/desk_api/desk_api_extension_manager.h chrome/browser/chromeos/extensions/odfs_config_private/odfs_config_private_api_unittest.cc chrome/browser/chromeos/extensions/telemetry/api/common/api_guard_delegate_unittest.cc chrome/browser/chromeos/network/network_portal_signin_window_ash_browsertest.cc +chrome/browser/chromeos/network/network_portal_signin_window_lacros_browsertest.cc chrome/browser/chromeos/platform_keys/extension_key_permissions_service.cc chrome/browser/chromeos/platform_keys/extension_platform_keys_service.cc chrome/browser/chromeos/policy/default_notifications_setting_browsertest.cc @@ -886,10 +899,10 @@ chrome/browser/content_settings/sound_content_setting_observer_unittest.cc chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc chrome/browser/device_identity/device_oauth2_token_service_unittest.cc chrome/browser/device_notifications/device_connection_tracker_unittest.cc -chrome/browser/devtools/aida_client.cc chrome/browser/devtools/device/adb/adb_client_socket_browsertest.cc chrome/browser/devtools/device/adb/mock_adb_server.cc chrome/browser/devtools/devtools_browsertest.cc +chrome/browser/devtools/devtools_ui_bindings.cc chrome/browser/devtools/devtools_ui_bindings_unittest.cc chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc chrome/browser/devtools/url_constants.cc @@ -906,6 +919,7 @@ chrome/browser/download/save_page_browsertest.cc chrome/browser/engagement/important_sites_util_browsertest.cc chrome/browser/engagement/important_sites_util_unittest.cc chrome/browser/engagement/site_engagement_service_unittest.cc +chrome/browser/enterprise/browser_management/browser_management_service.cc chrome/browser/enterprise/connectors/analysis/analysis_service_settings_unittest.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_browsertest.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_unittest.cc @@ -1020,7 +1034,6 @@ chrome/browser/extensions/chrome_extension_function_details.cc chrome/browser/extensions/component_extensions_allowlist/allowlist.h chrome/browser/extensions/content_script_apitest.cc chrome/browser/extensions/convert_user_script_unittest.cc -chrome/browser/extensions/corb_and_cors_extension_browsertest.cc chrome/browser/extensions/crx_installer_browsertest.cc chrome/browser/extensions/cws_info_service.cc chrome/browser/extensions/extension_action_runner_unittest.cc @@ -1050,6 +1063,7 @@ chrome/browser/extensions/menu_manager_unittest.cc chrome/browser/extensions/native_bindings_apitest.cc chrome/browser/extensions/navigation_extension_enabler.cc chrome/browser/extensions/navigation_extension_enabler_browsertest.cc +chrome/browser/extensions/orb_and_cors_extension_browsertest.cc chrome/browser/extensions/permission_message_combinations_unittest.cc chrome/browser/extensions/permissions_updater.cc chrome/browser/extensions/permissions_updater_unittest.cc @@ -1144,6 +1158,7 @@ chrome/browser/media/webrtc/webrtc_browsertest_common.cc chrome/browser/media/webrtc/webrtc_event_log_uploader.cc chrome/browser/media/webrtc/webrtc_log_uploader.cc chrome/browser/media_galleries/fileapi/media_path_filter.cc +chrome/browser/metrics/chrome_metrics_service_client.cc chrome/browser/metrics/chrome_metrics_service_client_ash_unittest.cc chrome/browser/metrics/family_link_user_metrics_provider_unittest.cc chrome/browser/metrics/family_user_metrics_provider_browsertest.cc @@ -1221,8 +1236,9 @@ chrome/browser/optimization_guide/hints_fetcher_browsertest.cc chrome/browser/optimization_guide/model_execution/model_execution_browsertest.cc chrome/browser/optimization_guide/model_execution/model_execution_validation_browsertest.cc chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc -chrome/browser/optimization_guide/page_content_annotations_service_browsertest.cc chrome/browser/origin_trials/origin_trials_browsertest.cc +chrome/browser/os_crypt/app_bound_encryption_win.cc +chrome/browser/page_content_annotations/page_content_annotations_service_browsertest.cc chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/core/ukm_page_load_metrics_observer_unittest.cc @@ -1247,6 +1263,7 @@ chrome/browser/password_check/android/password_check_manager_unittest.cc chrome/browser/password_manager/android/built_in_backend_to_android_backend_migrator_unittest.cc chrome/browser/password_manager/android/chromesync_status_code.h chrome/browser/password_manager/android/credential_leak_controller_android_unittest.cc +chrome/browser/password_manager/android/legacy_password_store_backend_migration_decorator_unittest.cc chrome/browser/password_manager/android/password_checkup_launcher_helper.h chrome/browser/password_manager/android/password_checkup_launcher_helper_impl.h chrome/browser/password_manager/android/password_manager_android_util_unittest.cc @@ -1354,7 +1371,7 @@ chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc chrome/browser/renderer_host/chrome_navigation_ui_data.h chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc chrome/browser/resources/PRESUBMIT.py -chrome/browser/resources/about_sys/log_entry.ts +chrome/browser/resources/about_sys/shared/key_value_pair_entry.ts chrome/browser/resources/accessibility/chromevox_helper_manifest.json.jinja2 chrome/browser/resources/accessibility/embedded_a11y_helper/service_worker.ts chrome/browser/resources/accessibility/embedded_a11y_helper_manifest.json.jinja2 @@ -1394,6 +1411,7 @@ chrome/browser/resources/chromeos/accessibility/chromevox/common/spannable_test. chrome/browser/resources/chromeos/accessibility/chromevox/panel/tutorial_test.js chrome/browser/resources/chromeos/accessibility/chromevox_manifest.json.jinja2 chrome/browser/resources/chromeos/accessibility/common/cursors/cursors_test.js +chrome/browser/resources/chromeos/accessibility/common/cursors/recovery_strategy_test.js chrome/browser/resources/chromeos/accessibility/common/flags.ts chrome/browser/resources/chromeos/accessibility/common/node_navigation_utils.ts chrome/browser/resources/chromeos/accessibility/common/node_utils.ts @@ -1431,7 +1449,7 @@ chrome/browser/resources/chromeos/emulator/icons.html chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json chrome/browser/resources/chromeos/login/components/web_view_loader.ts chrome/browser/resources/chromeos/login/debug/debug.js -chrome/browser/resources/chromeos/login/debug/quick_start_debugger.js +chrome/browser/resources/chromeos/login/debug/quick_start_debugger.ts chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html chrome/browser/resources/chromeos/login/screens/login/encryption_migration.ts chrome/browser/resources/chromeos/login/screens/login/offline_login.html @@ -1507,6 +1525,7 @@ chrome/browser/safe_browsing/chrome_ping_manager_factory_unittest.cc chrome/browser/safe_browsing/client_side_detection_host_unittest.cc chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service.cc chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service_unittest.cc +chrome/browser/safe_browsing/cloud_content_scanning/resumable_uploader_unittest.cc chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc chrome/browser/safe_browsing/download_protection/deep_scanning_browsertest.cc chrome/browser/safe_browsing/download_protection/deep_scanning_request_unittest.cc @@ -1604,7 +1623,6 @@ chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc chrome/browser/ssl/typed_navigation_upgrade_throttle_browsertest.cc chrome/browser/startup_data.h chrome/browser/storage/durable_storage_permission_context_unittest.cc -chrome/browser/storage_access_api/storage_access_grant_permission_context.cc chrome/browser/subresource_filter/subresource_filter_browsertest.cc chrome/browser/subresource_filter/subresource_filter_fenced_frame_browsertest.cc chrome/browser/supervised_user/android/java/res/drawable/ic_family_link.xml @@ -1660,11 +1678,16 @@ chrome/browser/ui/android/strings/android_chrome_strings.grd chrome/browser/ui/ash/ambient/ambient_client_impl.cc chrome/browser/ui/ash/ambient/ambient_client_impl_unittest.cc chrome/browser/ui/ash/api/tasks/chrome_tasks_delegate.cc +chrome/browser/ui/ash/api/tasks/tasks_client_impl_unittest.cc chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc chrome/browser/ui/ash/arc_open_url_delegate_impl_browsertest.cc chrome/browser/ui/ash/ash_web_view_impl_browsertest.cc chrome/browser/ui/ash/assistant/assistant_state_client_unittest.cc chrome/browser/ui/ash/assistant/assistant_test_mixin.cc +chrome/browser/ui/ash/birch/birch_calendar_fetcher.cc +chrome/browser/ui/ash/birch/birch_calendar_fetcher_unittest.cc +chrome/browser/ui/ash/birch/birch_keyed_service_unittest.cc +chrome/browser/ui/ash/birch/refresh_token_waiter_unittest.cc chrome/browser/ui/ash/calendar/calendar_keyed_service.cc chrome/browser/ui/ash/calendar/calendar_keyed_service_unittest.cc chrome/browser/ui/ash/chrome_shell_delegate.cc @@ -1678,6 +1701,7 @@ chrome/browser/ui/ash/google_one_offer_iph_tab_helper_browsertest.cc chrome/browser/ui/ash/google_one_offer_iph_tab_helper_constants.h chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc chrome/browser/ui/ash/in_session_auth_dialog_client.cc +chrome/browser/ui/ash/network/network_portal_signin_controller_browsertest.cc chrome/browser/ui/ash/network/network_portal_signin_controller_unittest.cc chrome/browser/ui/ash/projector/pending_screencast_manager.cc chrome/browser/ui/ash/projector/pending_screencast_manager_browsertest.cc @@ -1835,6 +1859,7 @@ chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc chrome/browser/ui/views/passwords/password_generation_popup_view_views_browsertest.cc chrome/browser/ui/views/payments/payment_method_view_controller_browsertest.cc chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc +chrome/browser/ui/views/profiles/avatar_toolbar_button_browsertest.cc chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view_unittest.cc chrome/browser/ui/views/profiles/first_run_interactive_uitest.cc chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc @@ -1872,6 +1897,7 @@ chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.cc chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc chrome/browser/ui/webauthn/authenticator_request_window.cc +chrome/browser/ui/webauthn/sheet_models.cc chrome/browser/ui/webui/PRESUBMIT.py chrome/browser/ui/webui/access_code_cast/access_code_cast_handler_unittest.cc chrome/browser/ui/webui/app_home/app_home_page_handler.cc @@ -1908,11 +1934,11 @@ chrome/browser/ui/webui/devtools/devtools_ui_data_source_unittest.cc chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc chrome/browser/ui/webui/favicon_source_unittest.cc -chrome/browser/ui/webui/feed/feed_ui.cc chrome/browser/ui/webui/hats/hats_ui.cc chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc chrome/browser/ui/webui/history_clusters/history_clusters_handler_unittest.cc chrome/browser/ui/webui/interstitials/interstitial_ui.cc +chrome/browser/ui/webui/lens/lens_untrusted_ui.cc chrome/browser/ui/webui/log_web_ui_url_unittest.cc chrome/browser/ui/webui/management/management_ui_handler_unittest.cc chrome/browser/ui/webui/media_router/cast_feedback_ui.cc @@ -1963,6 +1989,7 @@ chrome/browser/ui/webui/signin/profile_picker_handler_unittest.cc chrome/browser/ui/webui/signin/signin_error_handler_unittest.cc chrome/browser/ui/webui/signin/signin_reauth_ui.h chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc +chrome/browser/ui/webui/signin/sync_confirmation_ui.cc chrome/browser/ui/webui/signin/turn_sync_on_helper_browsertest.cc chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc chrome/browser/ui/webui/tab_search/tab_search_page_handler.cc @@ -1993,6 +2020,7 @@ chrome/browser/web_applications/commands/install_preloaded_verified_app_command. chrome/browser/web_applications/commands/install_preloaded_verified_app_command_browsertest.cc chrome/browser/web_applications/extensions/bookmark_app_util_unittest.cc chrome/browser/web_applications/isolated_web_apps/isolated_web_app_downloader.cc +chrome/browser/web_applications/isolated_web_apps/isolated_web_app_source_unittest.cc chrome/browser/web_applications/isolated_web_apps/isolated_web_app_update_manager.h chrome/browser/web_applications/isolated_web_apps/update_manifest/update_manifest_fetcher.cc chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.cc @@ -2022,7 +2050,9 @@ chrome/browser/webauthn/authenticator_request_dialog_model.cc chrome/browser/webauthn/cablev2_devices.h chrome/browser/webauthn/chrome_authenticator_request_delegate.cc chrome/browser/webauthn/chrome_authenticator_request_delegate_unittest.cc +chrome/browser/webauthn/enclave_manager.cc chrome/browser/webauthn/enclave_manager_unittest.cc +chrome/browser/webauthn/fake_security_domain_service.cc chrome/browser/webshare/win/fake_random_access_stream.cc chrome/browser/webshare/win/share_operation.cc chrome/browser/win/chrome_process_finder.cc @@ -2072,7 +2102,6 @@ chrome/common/extensions/api/windows.json chrome/common/extensions/chrome_extensions_client.cc chrome/common/extensions/manifest_handlers/automation_unittest.cc chrome/common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc -chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc chrome/common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc @@ -2092,6 +2121,8 @@ chrome/common/pref_names.h chrome/common/url_constants.h chrome/common/webui_url_constants.cc chrome/common/win/delay_load_failure_hook.cc +chrome/common/win/delay_load_notify_hook.cc +chrome/common/win/delay_load_notify_hook.h chrome/credential_provider/extension/os_service_manager.h chrome/credential_provider/extension/service.h chrome/credential_provider/extension/task_manager_unittests.cc @@ -2187,7 +2218,6 @@ chrome/notification_helper/notification_activator.h chrome/notification_helper/notification_helper.cc chrome/renderer/accessibility/read_anything_app_controller.cc chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc -chrome/renderer/accessibility/read_anything_app_model_browsertest.cc chrome/renderer/app_categorizer_unittest.cc chrome/renderer/ash_merge_session_loader_throttle_unittest.cc chrome/renderer/autofill/autofill_renderer_browsertest.cc @@ -2374,6 +2404,7 @@ chromeos/ash/components/dbus/dlcservice/dlcservice_client.h chromeos/ash/components/dbus/rmad/fake_rmad_client.cc chromeos/ash/components/drivefs/drivefs_http_client_unittest.cc chromeos/ash/components/geolocation/simple_geolocation_provider.h +chromeos/ash/components/growth/campaigns_model.h chromeos/ash/components/local_search_service/content_extraction_utils_unittest.cc chromeos/ash/components/login/auth/recovery/service_constants.cc chromeos/ash/components/login/hibernate/hibernate_manager_unittest.cc @@ -2389,6 +2420,7 @@ chromeos/ash/components/nearby/presence/nearby_presence_service_impl_unittest.cc chromeos/ash/components/network/geolocation_handler.cc chromeos/ash/components/network/network_cert_loader.cc chromeos/ash/components/network/network_util.h +chromeos/ash/components/network/onc/network_onc_utils.cc chromeos/ash/components/network/profile_policies.h chromeos/ash/components/network/system_token_cert_db_storage.h chromeos/ash/components/phonehub/notification.h @@ -2434,6 +2466,7 @@ chromeos/components/quick_answers/translation_result_loader_unittest.cc chromeos/components/quick_answers/utils/spell_check_language.cc chromeos/components/quick_answers/utils/translation_v2_utils.cc chromeos/components/test/data/onc/proxy_config.json +chromeos/components/test/data/onc/proxy_config_from_onc.json chromeos/components/test/data/onc/shill_wifi_proxy.json chromeos/constants/chromeos_features.cc chromeos/dbus/permission_broker/permission_broker_client.h @@ -2562,6 +2595,7 @@ components/commerce/core/account_checker.cc components/commerce/core/account_checker_unittest.cc components/commerce/core/commerce_constants.cc components/commerce/core/commerce_feature_list.h +components/commerce/core/compare/product_specifications_server_proxy.cc components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json components/commerce/core/parcel/parcels_server_proxy.cc components/commerce/core/parcel/parcels_server_proxy_unittest.cc @@ -2656,7 +2690,6 @@ components/feed/core/v2/api_test/feed_api_stream_unittest.cc components/feed/core/v2/feed_network_impl.cc components/feed/core/v2/feed_network_impl_unittest.cc components/feed/core/v2/public/public_types_unittest.cc -components/feed/feed_feature_list.cc components/feedback/feedback_common.cc components/feedback/feedback_common_unittest.cc components/feedback/feedback_report.h @@ -2669,6 +2702,8 @@ components/gcm_driver/gcm_account_mapper.cc components/gcm_driver/gcm_account_mapper_unittest.cc components/gcm_driver/gcm_client_impl.cc components/gcm_driver/gcm_client_impl_unittest.cc +components/global_media_controls/public/media_session_notification_item_unittest.cc +components/global_media_controls/public/views/media_item_ui_detailed_view_unittest.cc components/google/core/common/google_util.cc components/google/core/common/google_util_unittest.cc components/guest_view/browser/guest_view_base.h @@ -2704,7 +2739,6 @@ components/history/metrics/domain_diversity_reporter_unittest.cc components/history_clusters/core/cluster_interaction_state_processor_unittest.cc components/history_clusters/core/cluster_similarity_heuristics_processor_unittest.cc components/history_clusters/core/clusterer_unittest.cc -components/history_clusters/core/content_annotations_cluster_processor_unittest.cc components/history_clusters/core/content_visibility_cluster_finalizer_unittest.cc components/history_clusters/core/file_clustering_backend_unittest.cc components/history_clusters/core/history_clusters_service_test_api.cc @@ -2720,6 +2754,7 @@ components/infobars/content/content_infobar_manager.cc components/invalidation/impl/fcm_invalidation_service_unittest.cc components/invalidation/impl/per_user_topic_subscription_manager.cc components/invalidation/impl/per_user_topic_subscription_manager_unittest.cc +components/ip_protection/ip_protection_proxy_config_retriever.cc components/javascript_dialogs/tab_modal_dialog_manager.cc components/javascript_dialogs_strings.grdp components/keyed_service/core/keyed_service_base_factory.cc @@ -2733,11 +2768,13 @@ 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/manta/base_provider.cc +components/manta/base_provider_test_helper.cc +components/manta/mahi_provider.cc components/manta/manta_service_callbacks.cc components/manta/orca_provider.cc components/manta/orca_provider_unittest.cc components/manta/snapper_provider.cc -components/manta/snapper_provider_unittest.cc 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 @@ -2842,10 +2879,6 @@ components/omnibox/browser/zero_suggest_verbatim_match_provider_unittest.cc components/omnibox/resources/omnibox_pedal_synonyms.grd components/omnibox_pedal_ui_strings.grdp components/omnibox_strings.grdp -components/optimization_guide/content/browser/page_content_annotations_service_unittest.cc -components/optimization_guide/content/browser/page_content_annotations_web_contents_observer_unittest.cc -components/optimization_guide/core/entity_metadata.cc -components/optimization_guide/core/entity_metadata.h components/optimization_guide/core/hints_component_util_unittest.cc components/optimization_guide/core/hints_manager_unittest.cc components/optimization_guide/core/model_execution/model_execution_fetcher.cc @@ -2859,14 +2892,14 @@ components/optimization_guide/core/optimization_guide_constants.cc components/optimization_guide/core/optimization_guide_util.h components/optimization_guide/core/optimization_guide_util_unittest.cc components/optimization_guide/core/optimization_metadata_unittest.cc -components/optimization_guide/core/page_entities_model_handler_impl.cc components/optimization_guide/core/prediction_manager.cc components/optimization_guide/core/prediction_manager_unittest.cc components/optimization_guide/core/tflite_model_executor_unittest.cc components/optimization_guide/optimization_guide_internals/resources/optimization_guide_internals.ts components/optimization_guide/tools/gen_on_device_proto_descriptors.py components/origin_trials/browser/leveldb_persistence_provider_unittest.cc -components/page_image_service/image_service_unittest.cc +components/page_content_annotations/core/page_content_annotations_service_unittest.cc +components/page_image_service/image_service_impl_unittest.cc components/page_info/core/about_this_site_service.cc components/page_info/core/about_this_site_service_unittest.cc components/page_info/page_info.cc @@ -3021,9 +3054,9 @@ components/permissions/prediction_service/prediction_common.h components/permissions/prediction_service/prediction_service_base.h components/permissions/test/mock_permission_request.h components/permissions_strings.grdp -components/plus_addresses/plus_address_http_client.cc -components/plus_addresses/plus_address_http_client_unittest.cc -components/plus_addresses/plus_address_parser_unittest.cc +components/plus_addresses/plus_address_http_client_impl.cc +components/plus_addresses/plus_address_http_client_impl_unittest.cc +components/plus_addresses/plus_address_parsing_utils_unittest.cc components/policy/PRESUBMIT.py components/policy/core/browser/browser_policy_connector.cc components/policy/core/browser/configuration_policy_pref_store_unittest.cc @@ -3061,6 +3094,8 @@ components/policy/test/data/pref_mapping/AlwaysOnVpnPreConnectUrlAllowlist.json components/policy/test/data/pref_mapping/AppLaunchAutomation.json components/policy/test/data/pref_mapping/AudioCaptureAllowedUrls.json components/policy/test/data/pref_mapping/AutoOpenAllowedForURLs.json +components/policy/test/data/pref_mapping/AutomaticFullscreenAllowedForUrls.json +components/policy/test/data/pref_mapping/AutomaticFullscreenBlockedForUrls.json components/policy/test/data/pref_mapping/BrowserSwitcherUrlGreylist.json components/policy/test/data/pref_mapping/BrowserSwitcherUrlList.json components/policy/test/data/pref_mapping/ClipboardAllowedForUrls.json @@ -3078,6 +3113,8 @@ components/policy/test/data/pref_mapping/DeviceAuthenticationURLBlocklist.json components/policy/test/data/pref_mapping/DeviceLoginScreenExtensions.json components/policy/test/data/pref_mapping/DeviceLoginScreenWebHidAllowDevicesForUrls.json components/policy/test/data/pref_mapping/DeviceLoginScreenWebUsbAllowDevicesForUrls.json +components/policy/test/data/pref_mapping/DirectSocketsAllowedForUrls.json +components/policy/test/data/pref_mapping/DirectSocketsBlockedForUrls.json components/policy/test/data/pref_mapping/DisabledSchemes.json components/policy/test/data/pref_mapping/ExtensionInstallForcelist.json components/policy/test/data/pref_mapping/ExtensionOAuthRedirectUrls.json @@ -3168,7 +3205,7 @@ components/printing/renderer/print_render_frame_helper.cc components/printing/test/print_render_frame_helper_browsertest.cc components/privacy_sandbox/privacy_sandbox_settings_impl.cc components/privacy_sandbox/privacy_sandbox_settings_impl_unittest.cc -components/privacy_sandbox_strings.grdp +components/privacy_sandbox_chrome_strings.grdp components/protocol_handler_strings.grdp components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc components/proxy_config/proxy_policy_handler_unittest.cc @@ -3240,6 +3277,7 @@ components/safe_browsing/content/browser/password_protection/password_protection 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/browser/ui_manager_unittest.cc components/safe_browsing/content/renderer/phishing_classifier/features.h components/safe_browsing/content/resources/PRESUBMIT.py components/safe_browsing/content/resources/real_time_url_checks_allowlist/store_real_time_url_allowlist_prefixes.py @@ -3402,12 +3440,12 @@ components/supervised_user/core/browser/supervised_user_settings_service_unittes components/supervised_user/core/browser/supervised_user_url_filter.cc components/supervised_user/core/browser/supervised_user_url_filter.h components/supervised_user/core/browser/supervised_user_url_filter_unittest.cc -components/supervised_user/core/common/features.cc components/supervised_user/core/common/supervised_user_constants.cc components/supervised_user/core/common/supervised_user_constants.h components/supervised_user/test_support/kids_chrome_management_test_utils.cc components/supervised_user/test_support/kids_management_api_server_mock.cc components/sync/PRESUBMIT.py +components/sync/base/model_type.cc components/sync/base/sync_util.h components/sync/engine/bookmark_update_preprocessing.cc components/sync/engine/net/http_bridge_unittest.cc @@ -3431,7 +3469,6 @@ components/translate/core/browser/translate_language_list_unittest.cc components/translate/core/browser/translate_ranker_impl.cc components/translate/core/browser/translate_script.cc components/translate/core/common/translate_util.cc -components/translate/ios/browser/translate_controller_unittest.mm components/translate_strings.grdp components/trusted_vault/command_line_switches.cc components/trusted_vault/recovery_key_store_connection_impl.cc @@ -3468,6 +3505,7 @@ components/url_matcher/url_util_unittest.cc components/url_pattern_index/PRESUBMIT.py components/url_pattern_index/url_pattern_index_unittest.cc components/url_pattern_index/url_pattern_unittest.cc +components/user_manager/account_id_util_unittest.cc components/user_manager/known_user_unittest.cc components/user_manager/user.h components/user_manager/user_type.h @@ -3589,6 +3627,7 @@ content/browser/media/media_devices_permission_checker_unittest.cc content/browser/media/session/media_session_impl_service_routing_unittest.cc content/browser/mojo_binder_policy_applier.h content/browser/navigation_browsertest.cc +content/browser/navigation_transitions/back_forward_transition_animation_manager_android_browsertest.cc content/browser/network/accept_header_browsertest.cc content/browser/network/trust_token_browsertest.cc content/browser/network/trust_token_origin_trial_browsertest.cc @@ -3611,6 +3650,7 @@ content/browser/private_aggregation/PRESUBMIT.py content/browser/process_lock.h content/browser/push_messaging/push_messaging_manager.cc content/browser/renderer_host/back_forward_cache_metrics.cc +content/browser/renderer_host/back_forward_cache_subframe_navigation_throttle_unittest.cc content/browser/renderer_host/clipboard_host_impl_unittest.cc content/browser/renderer_host/dwrite_font_proxy_impl_win.cc content/browser/renderer_host/frame_tree_unittest.cc @@ -3661,7 +3701,7 @@ content/browser/sms/sms_parser_unittest.cc content/browser/sms/sms_provider_gms_unittest.cc content/browser/sms/webotp_service_unittest.cc content/browser/speech/endpointer/energy_endpointer.cc -content/browser/speech/speech_recognition_engine.cc +content/browser/speech/network_speech_recognition_engine_impl.cc content/browser/speech/tts_mac.mm content/browser/speech/tts_win.cc content/browser/storage_partition_impl_unittest.cc @@ -3688,6 +3728,7 @@ content/browser/webid/idp_network_request_manager_unittest.cc content/browser/zygote_host/zygote_host_impl_linux.cc content/child/runtime_features.cc content/common/features.cc +content/common/input/render_input_router.h content/common/input/touch_action_filter.h content/common/service_worker/race_network_request_url_loader_client.cc content/common/zygote/zygote_communication_linux.h @@ -3783,6 +3824,7 @@ crypto/nss_util.cc crypto/rsa_private_key_unittest.cc crypto/secure_util.h crypto/unexportable_key.h +crypto/unexportable_key_unittest.cc crypto/unexportable_key_win.cc device/bluetooth/bluetooth_adapter_android.cc device/bluetooth/bluetooth_adapter_mac.mm @@ -3895,6 +3937,7 @@ extensions/common/manifest_constants.h extensions/common/manifest_handlers/content_capabilities_manifest_unittest.cc extensions/common/manifest_handlers/csp_info_unittest.cc extensions/common/manifest_handlers/externally_connectable_unittest.cc +extensions/common/manifest_handlers/homepage_url_unittest.cc extensions/common/manifest_handlers/oauth2_manifest_unittest.cc extensions/common/manifest_handlers/replacement_apps_unittest.cc extensions/common/message_bundle.h @@ -3981,6 +4024,7 @@ google_apis/google_api_keys.cc google_apis/google_api_keys.h google_apis/tasks/tasks_api_requests.h google_apis/tasks/tasks_api_response_types.h +google_apis/tasks/tasks_api_response_types_unittest.cc google_apis/tasks/tasks_api_task_status.h google_apis/tasks/tasks_api_url_generator_utils.h google_apis/tasks/tasks_api_url_generator_utils_unittest.cc @@ -4018,7 +4062,9 @@ gpu/command_buffer/service/shared_image/video_image_reader_image_backing.cc gpu/command_buffer/service/surface_texture_gl_owner.cc gpu/config/PRESUBMIT.py gpu/config/gpu_control_list_format.txt +gpu/config/gpu_finch_features.cc gpu/config/gpu_info_collector_win.cc +gpu/config/gpu_switches.cc gpu/ipc/common/PRESUBMIT.py gpu/ipc/service/gpu_memory_buffer_factory_dxgi.cc gpu/vulkan/PRESUBMIT.py @@ -4072,7 +4118,6 @@ ios/chrome/browser/policy/model/new_tab_page_location_policy_handler_unittest.cc ios/chrome/browser/policy/model/reporting/profile_report_generator_ios_unittest.mm ios/chrome/browser/policy/model/restrict_accounts_policy_handler_unittest.cc ios/chrome/browser/prerender/model/prerender_service_impl_unittest.mm -ios/chrome/browser/qr_scanner/ui_bundled/qr_scanner_app_interface.mm ios/chrome/browser/reading_list/model/reading_list_browser_agent_unittest.mm ios/chrome/browser/safe_browsing/model/safe_browsing_client_impl_unittest.mm ios/chrome/browser/safe_browsing/model/tailored_security/tailored_security_tab_helper_unittest.mm @@ -4083,6 +4128,7 @@ ios/chrome/browser/search_engines/model/search_engine_js_unittest.mm ios/chrome/browser/search_engines/model/search_engine_tab_helper.h ios/chrome/browser/search_engines/model/search_engine_tab_helper.mm ios/chrome/browser/shared/coordinator/scene/scene_controller.mm +ios/chrome/browser/shared/coordinator/scene/scene_controller_unittest.mm ios/chrome/browser/shared/model/url/chrome_url_constants.cc ios/chrome/browser/shared/model/web_state_list/order_controller_source_from_web_state_list_unittest.mm ios/chrome/browser/shared/model/web_state_list/web_state_list_unittest.mm @@ -4098,6 +4144,7 @@ ios/chrome/browser/signin/model/pattern_account_restriction_unittest.mm ios/chrome/browser/signin/model/system_identity_manager.h ios/chrome/browser/ssl/model/ios_ssl_error_handler_unittest.mm ios/chrome/browser/supervised_user/model/supervised_user_url_filter_tab_helper_unittest.mm +ios/chrome/browser/ui/authentication/history_sync/history_sync_capabilities_fetcher_unittest.mm ios/chrome/browser/ui/authentication/signin/add_account_signin/add_account_signin_manager_unittest.mm ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/advanced_settings_signin_mediator_unittest.mm ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator_unittest.mm @@ -4115,9 +4162,9 @@ ios/chrome/browser/ui/bookmarks/bookmark_earl_grey.mm ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_ui.h ios/chrome/browser/ui/bookmarks/bookmark_mediator_unittest.mm ios/chrome/browser/ui/bookmarks/bookmarks_egtest.mm +ios/chrome/browser/ui/bookmarks/folder_chooser/bookmarks_folder_chooser_egtest.mm ios/chrome/browser/ui/bring_android_tabs/tab_list_from_android_mediator_unittest.mm ios/chrome/browser/ui/content_suggestions/cells/most_visited_tiles_mediator_unittest.mm -ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator_unittest.mm ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller_unittest.mm ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm ios/chrome/browser/ui/content_suggestions/parcel_tracking/parcel_tracking_mediator_unittest.mm @@ -4139,6 +4186,7 @@ ios/chrome/browser/ui/omnibox/zero_suggest_prefetch_helper_unittest.mm ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator_unittest.mm ios/chrome/browser/ui/overlays/infobar_banner/tab_pickup/tab_pickup_infobar_banner_overlay_mediator_unittest.mm ios/chrome/browser/ui/overlays/infobar_modal/passwords/password_infobar_modal_overlay_mediator_unittest.mm +ios/chrome/browser/ui/page_info/page_info_egtest.mm ios/chrome/browser/ui/page_info/page_info_security_egtest.mm ios/chrome/browser/ui/permissions/permissions_egtest.mm ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator_unittest.mm @@ -4174,7 +4222,6 @@ ios/chrome/browser/ui/settings/password/password_sharing/sharing_status_mediator ios/chrome/browser/ui/settings/password/passwords_mediator_unittest.mm ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm ios/chrome/browser/ui/settings/search_engine_table_view_controller_unittest.mm -ios/chrome/browser/ui/settings/settings_app_interface.mm ios/chrome/browser/ui/settings/supervised_user_settings_app_interface.mm ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm ios/chrome/browser/ui/settings/translate_table_view_controller.mm @@ -4189,8 +4236,6 @@ ios/chrome/browser/ui/sharing/qr_generator/qr_generator_util_unittest.mm ios/chrome/browser/ui/start_surface/start_surface_scene_agent_unittest.mm ios/chrome/browser/ui/tab_switcher/tab_grid/grid/base_grid_mediator_unittest.mm ios/chrome/browser/ui/toolbar/adaptive_toolbar_mediator_unittest.mm -ios/chrome/browser/ui/whats_new/data_source/resources/m116/calendar_event.json -ios/chrome/browser/ui/whats_new/data_source/resources/m116/calendar_event_darkmode.json ios/chrome/browser/url_loading/model/image_search_param_generator_unittest.mm ios/chrome/browser/web/model/chrome_web_client_unittest.mm ios/chrome/browser/web/model/font_size/font_size_tab_helper_unittest.mm @@ -4341,9 +4386,9 @@ media/gpu/v4l2/mt21/mt21_decompressor_unittest.cc media/gpu/v4l2/mt21/mt21_util.h media/gpu/v4l2/stateless/av1_delegate.cc media/gpu/v4l2/test/av1_decoder.cc -media/gpu/v4l2/test/v4l2_unittest.cc media/gpu/v4l2/test/video_decoder.cc media/gpu/v4l2/v4l2_stateful_video_decoder.cc +media/gpu/v4l2/v4l2_unittest.cc media/gpu/v4l2/v4l2_video_decoder_delegate_av1.cc media/gpu/vaapi/test/av1_decoder.cc media/gpu/vaapi/test/vp8_decoder.cc @@ -4686,7 +4731,7 @@ net/quic/properties_based_quic_server_info_test.cc net/quic/quic_chromium_client_session_test.cc net/quic/quic_chromium_client_stream_test.cc net/quic/quic_network_transaction_unittest.cc -net/quic/quic_proxy_client_socket_unittest.cc +net/quic/quic_proxy_client_socket_test_base.h net/quic/quic_session_pool.cc net/quic/quic_session_pool_test.cc net/server/web_socket.h @@ -4813,7 +4858,7 @@ printing/printing_context.h printing/test/PRESUBMIT.py remoting/android/java/res/layout/host_offline.xml remoting/android/java/res/layout/host_online.xml -remoting/base/corp_session_authz_service_client_factory.cc +remoting/base/corp_auth_util.cc remoting/base/is_google_email.cc remoting/base/service_urls.cc remoting/client/notification/gstatic_json_fetcher.cc @@ -4936,12 +4981,12 @@ services/network/http_cache_data_counter_unittest.cc services/network/http_cache_data_remover_unittest.cc services/network/mojo_host_resolver_impl_unittest.cc services/network/network_context_unittest.cc +services/network/orb/orb_impl.cc +services/network/orb/orb_impl.h +services/network/orb/orb_impl_unittest.cc +services/network/orb/orb_sniffers.cc services/network/proxy_resolver_factory_mojo_unittest.cc services/network/public/cpp/content_security_policy/content_security_policy_unittest.cc -services/network/public/cpp/corb/corb_impl.cc -services/network/public/cpp/corb/corb_impl_unittest.cc -services/network/public/cpp/corb/orb_impl.cc -services/network/public/cpp/corb/orb_impl.h services/network/public/cpp/cors/cors_unittest.cc services/network/public/cpp/cors/origin_access_entry_unittest.cc services/network/public/cpp/cors/origin_access_list_unittest.cc @@ -4983,6 +5028,7 @@ services/video_capture/test/fake_video_capture_device_unittest.cc services/viz/public/cpp/gpu/gpu.cc services/webnn/dml/adapter.cc services/webnn/dml/command_recorder.cc +services/webnn/dml/context_impl.cc services/webnn/dml/graph_builder.h services/webnn/dml/graph_impl.cc services/webnn/dml/tensor_desc.cc @@ -5352,8 +5398,10 @@ third_party/angle/src/tests/gl_tests/VulkanPerformanceCounterTest.cpp third_party/angle/src/tests/gl_tests/gles1/BootAnimationTest.cpp third_party/angle/src/tests/perf_tests/ANGLEPerfTest.h third_party/angle/src/tests/perf_tests/DrawCallPerf.cpp +third_party/angle/src/tests/perf_tests/TracePerfTest.cpp third_party/angle/src/tests/restricted_traces/gen_restricted_traces.py third_party/angle/src/tests/restricted_traces/sync_restricted_traces_to_cipd.py +third_party/angle/src/tests/run_perf_tests.py third_party/angle/src/tests/test_utils/angle_test_instantiate.cpp third_party/angle/src/tests/test_utils/runner/TestSuite.cpp third_party/angle/src/tests/test_utils/runner/android/java/AndroidManifest.xml.jinja2 @@ -5376,6 +5424,8 @@ third_party/anonymous_tokens/src/anonymous_tokens/cpp/shared/proto_utils.h third_party/ashmem/ashmem-dev.c third_party/axe-core/axe.js third_party/axe-core/axe.min.js +third_party/beto-core/src/nearby/presence/ldt_np_adv_ffi/c/fuzz/ldt_fuzzer.cc +third_party/beto-core/src/nearby/presence/np_cpp_ffi/shared/shared_test_util.h third_party/blink/PRESUBMIT.py third_party/blink/common/PRESUBMIT.py third_party/blink/common/loader/record_load_histograms.cc @@ -5539,6 +5589,7 @@ third_party/blink/public/common/custom_handlers/protocol_handler_utils.h third_party/blink/public/common/frame/delegated_capability_request_token.h third_party/blink/public/common/frame/user_activation_state.h third_party/blink/public/common/input/web_keyboard_event.h +third_party/blink/public/common/loader/throttling_url_loader.h third_party/blink/public/common/origin_trials/trial_token.h third_party/blink/public/common/scheduler/PRESUBMIT.py third_party/blink/public/common/storage_key/storage_key.h @@ -5557,7 +5608,6 @@ third_party/blink/public/web/web_window_features.h third_party/blink/renderer/PRESUBMIT.py third_party/blink/renderer/bindings/PRESUBMIT.py third_party/blink/renderer/bindings/core/v8/generated_code_helper.cc -third_party/blink/renderer/bindings/core/v8/script_regexp.cc third_party/blink/renderer/bindings/core/v8/window_proxy.cc third_party/blink/renderer/bindings/core/v8/window_proxy.h third_party/blink/renderer/build/scripts/core/style/make_computed_style_base.py @@ -5631,6 +5681,7 @@ third_party/blink/renderer/core/dom/node_iterator_base.h third_party/blink/renderer/core/dom/node_list.idl third_party/blink/renderer/core/dom/node_lists_node_data.h third_party/blink/renderer/core/dom/node_rare_data.h +third_party/blink/renderer/core/dom/observable.cc third_party/blink/renderer/core/dom/observable.h third_party/blink/renderer/core/dom/processing_instruction.idl third_party/blink/renderer/core/dom/range.cc @@ -5645,7 +5696,10 @@ third_party/blink/renderer/core/editing/commands/style_commands.cc third_party/blink/renderer/core/editing/dom_selection.cc third_party/blink/renderer/core/editing/editing_behavior.cc third_party/blink/renderer/core/editing/editing_utilities.cc +third_party/blink/renderer/core/editing/editing_utilities_test.cc +third_party/blink/renderer/core/editing/finder/find_buffer.cc third_party/blink/renderer/core/editing/finder/find_buffer.h +third_party/blink/renderer/core/editing/finder/find_buffer_test.cc third_party/blink/renderer/core/editing/serializers/serialization.cc 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 @@ -5909,6 +5963,7 @@ third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc third_party/blink/renderer/modules/accessibility/ax_layout_object.cc third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h +third_party/blink/renderer/modules/accessibility/testing/internals_accessibility.h third_party/blink/renderer/modules/bluetooth/bluetooth_error.cc third_party/blink/renderer/modules/clipboard/clipboard_promise.cc third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc @@ -5961,6 +6016,7 @@ third_party/blink/renderer/modules/xr/xr_session.h third_party/blink/renderer/modules/xr/xr_system.cc third_party/blink/renderer/platform/PRESUBMIT.py third_party/blink/renderer/platform/animation/timing_function.h +third_party/blink/renderer/platform/bindings/script_regexp.cc third_party/blink/renderer/platform/exported/web_crypto_algorithm.cc third_party/blink/renderer/platform/exported/web_url_response.cc third_party/blink/renderer/platform/fonts/bitmap_glyphs_block_list.cc @@ -6021,6 +6077,7 @@ third_party/blink/renderer/platform/image-decoders/png/png_image_reader.cc third_party/blink/renderer/platform/image-decoders/webp/webp_image_decoder.cc third_party/blink/renderer/platform/instrumentation/use_counter.h third_party/blink/renderer/platform/loader/fetch/client_hints_preferences_test.cc +third_party/blink/renderer/platform/loader/fetch/fetch_utils.h third_party/blink/renderer/platform/loader/fetch/raw_resource.h third_party/blink/renderer/platform/loader/fetch/resource.cc third_party/blink/renderer/platform/loader/fetch/resource.h @@ -6091,6 +6148,7 @@ third_party/boringssl/src/crypto/pkcs7/pkcs7_test.cc third_party/boringssl/src/crypto/pkcs8/pkcs8_x509.c third_party/boringssl/src/crypto/rand_extra/windows.c third_party/boringssl/src/crypto/test/abi_test.h +third_party/boringssl/src/crypto/test/file_util.cc third_party/boringssl/src/crypto/thread_win.c third_party/boringssl/src/include/openssl/base.h third_party/boringssl/src/include/openssl/ssl.h @@ -6469,7 +6527,6 @@ third_party/catapult/telemetry/third_party/mox3/mox3/tests/test_mox.py third_party/catapult/telemetry/third_party/mox3/mox3/tests/test_stubout.py third_party/catapult/telemetry/third_party/png/png.py third_party/catapult/telemetry/third_party/websocket-client/setup.py -third_party/catapult/third_party/WebOb/docs/differences.txt third_party/catapult/third_party/apiclient/googleapiclient/discovery.py third_party/catapult/third_party/apiclient/googleapiclient/errors.py third_party/catapult/third_party/apiclient/googleapiclient/http.py @@ -7693,6 +7750,7 @@ third_party/crashpad/crashpad/util/win/safe_terminate_process_test.cc third_party/crashpad/crashpad/util/win/xp_compat.h third_party/crashpad/update.py third_party/cros-components/src/card/card.ts +third_party/cros-components/src/orca_feedback/orca-feedback.ts third_party/cros-components/src/snackbar/show_snackbar.ts third_party/cros-components/src/textfield/textfield.ts third_party/cros-components/src/tooltip/tooltip.ts @@ -7776,7 +7834,6 @@ third_party/dawn/src/dawn/tests/unittests/validation/ComputeValidationTests.cpp third_party/dawn/src/dawn/tests/unittests/validation/CopyCommandsValidationTests.cpp third_party/dawn/src/dawn/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp third_party/dawn/src/dawn/tests/unittests/validation/ValidationTest.cpp -third_party/dawn/src/dawn/tests/unittests/validation/VertexBufferValidationTests.cpp third_party/dawn/src/dawn/tests/white_box/SharedTextureMemoryTests_dmabuf.cpp third_party/dawn/src/dawn/tests/white_box/VulkanImageWrappingTests_DmaBuf.cpp third_party/dawn/src/dawn/utils/WindowsDebugLogger.cpp @@ -7952,6 +8009,7 @@ third_party/dawn/third_party/webgpu-cts/src/webgpu/api/operation/render_pipeline third_party/dawn/third_party/webgpu-cts/src/webgpu/api/operation/rendering/depth_bias.spec.ts third_party/dawn/third_party/webgpu-cts/src/webgpu/api/operation/sampling/filter_mode.spec.ts third_party/dawn/third_party/webgpu-cts/src/webgpu/multisample_info.ts +third_party/dawn/third_party/webgpu-cts/src/webgpu/shader/execution/shader_io/fragment_builtins.spec.ts third_party/dawn/third_party/webgpu-cts/standalone/index.html third_party/dawn/tools/src/cmd/cts/config.json third_party/dawn/tools/src/cmd/cts/treemap/treemap.html @@ -8154,7 +8212,9 @@ third_party/devtools-frontend/src/PRESUBMIT.py third_party/devtools-frontend/src/extensions/cxx_debugging/third_party/lit-html/lib/template.js third_party/devtools-frontend/src/extensions/cxx_debugging/third_party/lit-html/src/lib/template.ts third_party/devtools-frontend/src/front_end/core/common/ColorConverter.ts +third_party/devtools-frontend/src/front_end/core/host/AidaClient.test.ts third_party/devtools-frontend/src/front_end/core/host/InspectorFrontendHost.ts +third_party/devtools-frontend/src/front_end/core/i18n/i18n.test.ts third_party/devtools-frontend/src/front_end/core/i18n/locales/af.json third_party/devtools-frontend/src/front_end/core/i18n/locales/am.json third_party/devtools-frontend/src/front_end/core/i18n/locales/ar.json @@ -8236,10 +8296,13 @@ third_party/devtools-frontend/src/front_end/core/i18n/locales/zh-HK.json third_party/devtools-frontend/src/front_end/core/i18n/locales/zh-TW.json third_party/devtools-frontend/src/front_end/core/i18n/locales/zh.json third_party/devtools-frontend/src/front_end/core/i18n/locales/zu.json +third_party/devtools-frontend/src/front_end/core/platform/StringUtilities.test.ts +third_party/devtools-frontend/src/front_end/core/platform/StringUtilities.ts third_party/devtools-frontend/src/front_end/core/platform/UIString.ts -third_party/devtools-frontend/src/front_end/core/platform/string-utilities.ts +third_party/devtools-frontend/src/front_end/core/root/Runtime.test.ts third_party/devtools-frontend/src/front_end/core/sdk/CSSMetadata.ts third_party/devtools-frontend/src/front_end/core/sdk/Cookie.ts +third_party/devtools-frontend/src/front_end/core/sdk/CookieModel.test.ts third_party/devtools-frontend/src/front_end/core/sdk/NetworkRequest.ts third_party/devtools-frontend/src/front_end/core/sdk/ResourceTreeModel.ts third_party/devtools-frontend/src/front_end/core/sdk/SourceMap.ts @@ -8254,7 +8317,9 @@ third_party/devtools-frontend/src/front_end/generated/protocol-proxy-api.d.ts third_party/devtools-frontend/src/front_end/generated/protocol.ts third_party/devtools-frontend/src/front_end/integration_test_runner.html third_party/devtools-frontend/src/front_end/models/bindings/ResourceUtils.ts +third_party/devtools-frontend/src/front_end/models/extensions/ExtensionServer.test.ts third_party/devtools-frontend/src/front_end/models/extensions/ExtensionServer.ts +third_party/devtools-frontend/src/front_end/models/extensions/HostUrlPattern.test.ts third_party/devtools-frontend/src/front_end/models/issues_manager/ContentSecurityPolicyIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/CookieDeprecationMetadataIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/CookieIssue.ts @@ -8263,11 +8328,18 @@ third_party/devtools-frontend/src/front_end/models/issues_manager/DeprecationIss third_party/devtools-frontend/src/front_end/models/issues_manager/GenericIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/HeavyAdIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/SharedArrayBufferIssue.ts +third_party/devtools-frontend/src/front_end/models/persistence/NetworkPersistenceManager.test.ts third_party/devtools-frontend/src/front_end/models/persistence/NetworkPersistenceManager.ts +third_party/devtools-frontend/src/front_end/models/persistence/PersistenceImpl.test.ts third_party/devtools-frontend/src/front_end/models/timeline_model/TimelineModel.ts +third_party/devtools-frontend/src/front_end/models/trace/ModelImpl.test.ts +third_party/devtools-frontend/src/front_end/models/trace/handlers/MetaHandler.test.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/MetaHandler.ts +third_party/devtools-frontend/src/front_end/models/trace/handlers/NetworkRequestsHandler.test.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/UserInteractionsHandler.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/UserTimingsHandler.ts +third_party/devtools-frontend/src/front_end/models/trace/helpers/Trace.test.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/RenderBlocking.test.ts third_party/devtools-frontend/src/front_end/models/trace/types/TraceEvents.ts third_party/devtools-frontend/src/front_end/panels/accessibility/AccessibilityNodeView.ts third_party/devtools-frontend/src/front_end/panels/accessibility/AccessibilityStrings.ts @@ -8275,8 +8347,8 @@ third_party/devtools-frontend/src/front_end/panels/application/AppManifestView.t third_party/devtools-frontend/src/front_end/panels/application/ApplicationPanelSidebar.ts third_party/devtools-frontend/src/front_end/panels/application/BackgroundServiceView.ts third_party/devtools-frontend/src/front_end/panels/application/InterestGroupTreeElement.ts +third_party/devtools-frontend/src/front_end/panels/application/ReportingApiReportsView.test.ts third_party/devtools-frontend/src/front_end/panels/application/ReportingApiReportsView.ts -third_party/devtools-frontend/src/front_end/panels/application/ResourcesPanel.ts third_party/devtools-frontend/src/front_end/panels/application/ServiceWorkerCacheTreeElement.ts third_party/devtools-frontend/src/front_end/panels/application/StorageView.ts third_party/devtools-frontend/src/front_end/panels/application/components/BackForwardCacheStrings.ts @@ -8286,12 +8358,17 @@ third_party/devtools-frontend/src/front_end/panels/application/components/Report third_party/devtools-frontend/src/front_end/panels/application/components/TrustTokensView.ts third_party/devtools-frontend/src/front_end/panels/application/preloading/components/PreloadingDisabledInfobar.ts third_party/devtools-frontend/src/front_end/panels/application/preloading/components/PreloadingString.ts +third_party/devtools-frontend/src/front_end/panels/application/preloading/components/UsedPreloadingView.test.ts third_party/devtools-frontend/src/front_end/panels/application/preloading/components/UsedPreloadingView.ts +third_party/devtools-frontend/src/front_end/panels/autofill/AutofillView.ts +third_party/devtools-frontend/src/front_end/panels/console/ErrorStackParser.test.ts third_party/devtools-frontend/src/front_end/panels/css_overview/components/CSSOverviewStartView.ts third_party/devtools-frontend/src/front_end/panels/elements/CSSRuleValidator.ts third_party/devtools-frontend/src/front_end/panels/elements/ElementStatePaneWidget.ts +third_party/devtools-frontend/src/front_end/panels/elements/components/CSSPropertyDocsView.test.ts third_party/devtools-frontend/src/front_end/panels/emulation/DeviceModeToolbar.ts third_party/devtools-frontend/src/front_end/panels/emulation/emulation-meta.ts +third_party/devtools-frontend/src/front_end/panels/explain/components/ConsoleInsight.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedCookiesView.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedDirectivesView.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedMetadataAllowedSitesView.ts @@ -8304,23 +8381,30 @@ third_party/devtools-frontend/src/front_end/panels/network/RequestCookiesView.ts third_party/devtools-frontend/src/front_end/panels/network/RequestTimingView.ts third_party/devtools-frontend/src/front_end/panels/network/ResourceWebSocketFrameView.ts third_party/devtools-frontend/src/front_end/panels/network/components/RequestHeaderSection.ts +third_party/devtools-frontend/src/front_end/panels/network/components/RequestHeadersView.test.ts third_party/devtools-frontend/src/front_end/panels/network/components/RequestHeadersView.ts +third_party/devtools-frontend/src/front_end/panels/profiler/HeapSnapshotGridNodes.ts third_party/devtools-frontend/src/front_end/panels/recorder/RecorderController.ts third_party/devtools-frontend/src/front_end/panels/recorder/components/CreateRecordingView.ts third_party/devtools-frontend/src/front_end/panels/recorder/components/StartView.ts third_party/devtools-frontend/src/front_end/panels/settings/FrameworkIgnoreListSettingsTab.ts third_party/devtools-frontend/src/front_end/panels/settings/KeybindsSettingsTab.ts third_party/devtools-frontend/src/front_end/panels/settings/SettingsScreen.ts +third_party/devtools-frontend/src/front_end/panels/settings/components/SyncSection.test.ts third_party/devtools-frontend/src/front_end/panels/sources/BreakpointEditDialog.ts third_party/devtools-frontend/src/front_end/panels/sources/DebuggerPausedMessage.ts third_party/devtools-frontend/src/front_end/panels/sources/SourcesNavigator.ts +third_party/devtools-frontend/src/front_end/panels/sources/components/BreakpointsView.test.ts +third_party/devtools-frontend/src/front_end/panels/sources/components/BreakpointsViewUtils.test.ts third_party/devtools-frontend/src/front_end/panels/sources/components/BreakpointsViewUtils.ts +third_party/devtools-frontend/src/front_end/panels/sources/components/HeadersView.test.ts third_party/devtools-frontend/src/front_end/panels/sources/components/HeadersView.ts third_party/devtools-frontend/src/front_end/panels/timeline/EventUICategory.ts third_party/devtools-frontend/src/front_end/panels/timeline/ThreadAppender.ts third_party/devtools-frontend/src/front_end/panels/timeline/TimelinePanel.ts -third_party/devtools-frontend/src/front_end/panels/timeline/TimelineUIUtils.ts +third_party/devtools-frontend/src/front_end/panels/timeline/TimelineUIUtils.test.ts third_party/devtools-frontend/src/front_end/panels/timeline/components/DetailsView.ts +third_party/devtools-frontend/src/front_end/panels/timeline/track_appenders/ThreadAppender.test.ts third_party/devtools-frontend/src/front_end/panels/webauthn/WebauthnPane.ts third_party/devtools-frontend/src/front_end/services/tracing/PerformanceTracing.ts third_party/devtools-frontend/src/front_end/third_party/acorn/package/dist/acorn.js @@ -8525,12 +8609,17 @@ third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data/p third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data/package/data/browsers.html-data.json third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/package.json third_party/devtools-frontend/src/front_end/ui/components/code_highlighter/CodeHighlighter.ts +third_party/devtools-frontend/src/front_end/ui/components/markdown_view/CodeBlock.ts third_party/devtools-frontend/src/front_end/ui/components/markdown_view/MarkdownLinksMap.ts third_party/devtools-frontend/src/front_end/ui/legacy/RemoteDebuggingTerminatedScreen.ts third_party/devtools-frontend/src/front_end/ui/legacy/SearchableView.ts +third_party/devtools-frontend/src/front_end/ui/legacy/UIUtils.test.ts third_party/devtools-frontend/src/front_end/ui/legacy/UIUtils.ts +third_party/devtools-frontend/src/front_end/ui/legacy/components/object_ui/ObjectPropertiesSection.test.ts +third_party/devtools-frontend/src/front_end/ui/legacy/components/utils/JSPresentationUtils.test.ts +third_party/devtools-frontend/src/front_end/ui/legacy/components/utils/Linkifier.test.ts third_party/devtools-frontend/src/front_end/ui/legacy/themeColors.css -third_party/devtools-frontend/src/front_end/ui/legacy/theme_support/theme_support_impl.ts +third_party/devtools-frontend/src/front_end/ui/legacy/theme_support/ThemeSupport.ts third_party/devtools-frontend/src/node_modules/@aashutoshrathi/word-wrap/package.json third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/dist/source-map.debug.js third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/dist/source-map.js @@ -8547,9 +8636,19 @@ third_party/devtools-frontend/src/node_modules/@eslint/eslintrc/node_modules/typ third_party/devtools-frontend/src/node_modules/@eslint/eslintrc/node_modules/type-fest/source/basic.d.ts third_party/devtools-frontend/src/node_modules/@eslint/eslintrc/node_modules/type-fest/source/entries.d.ts third_party/devtools-frontend/src/node_modules/@eslint/eslintrc/node_modules/type-fest/source/entry.d.ts +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/cjs/browser-data/browser-data.d.ts +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/cjs/browser-data/browser-data.js +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/cjs/browser-data/chrome-headless-shell.js +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/cjs/browser-data/chrome.js +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/cjs/browser-data/chromedriver.js third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/cjs/browser-data/chromium.js third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/cjs/browser-data/firefox.js third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/cjs/install.d.ts +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/esm/browser-data/browser-data.d.ts +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/esm/browser-data/browser-data.js +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/esm/browser-data/chrome-headless-shell.js +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/esm/browser-data/chrome.js +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/esm/browser-data/chromedriver.js third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/esm/browser-data/chromium.js third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/esm/browser-data/firefox.js third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/esm/install.d.ts @@ -8557,13 +8656,13 @@ third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/node_modules/ third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/node_modules/debug/package.json third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/node_modules/strip-ansi/package.json +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/browser-data/browser-data.ts +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/browser-data/chrome-headless-shell.ts +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/browser-data/chrome.ts +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/browser-data/chromedriver.ts third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/browser-data/chromium.ts third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/browser-data/firefox.ts third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/install.ts -third_party/devtools-frontend/src/node_modules/@puppeteer/replay/lib/main.js -third_party/devtools-frontend/src/node_modules/@puppeteer/replay/node_modules/ansi-regex/package.json -third_party/devtools-frontend/src/node_modules/@puppeteer/replay/node_modules/strip-ansi/package.json -third_party/devtools-frontend/src/node_modules/@puppeteer/replay/package.json third_party/devtools-frontend/src/node_modules/@rollup/plugin-node-resolve/node_modules/@rollup/pluginutils/package.json third_party/devtools-frontend/src/node_modules/@rollup/plugin-node-resolve/package.json third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/package.json @@ -8663,7 +8762,6 @@ third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/ third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/domains/context/BrowsingContextProcessor.js third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/domains/input/ActionDispatcher.js third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/domains/input/InputSource.js -third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/domains/network/NetworkRequest.js third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/utils/uuid.js third_party/devtools-frontend/src/node_modules/clone-regexp/index.d.ts third_party/devtools-frontend/src/node_modules/clone-regexp/package.json @@ -8720,6 +8818,7 @@ third_party/devtools-frontend/src/node_modules/degenerator/node_modules/estraver third_party/devtools-frontend/src/node_modules/devtools-protocol/json/browser_protocol.json third_party/devtools-frontend/src/node_modules/devtools-protocol/types/protocol-mapping.d.ts third_party/devtools-frontend/src/node_modules/devtools-protocol/types/protocol-proxy-api.d.ts +third_party/devtools-frontend/src/node_modules/devtools-protocol/types/protocol-tests-proxy-api.d.ts third_party/devtools-frontend/src/node_modules/devtools-protocol/types/protocol.d.ts third_party/devtools-frontend/src/node_modules/di/package.json third_party/devtools-frontend/src/node_modules/diff/dist/diff.js @@ -8848,8 +8947,8 @@ third_party/devtools-frontend/src/node_modules/get-stream/package.json third_party/devtools-frontend/src/node_modules/get-symbol-description/package.json third_party/devtools-frontend/src/node_modules/get-uri/node_modules/debug/package.json third_party/devtools-frontend/src/node_modules/get-uri/node_modules/debug/src/browser.js +third_party/devtools-frontend/src/node_modules/get-uri/node_modules/fs-extra/lib/mkdirs/utils.js third_party/devtools-frontend/src/node_modules/get-uri/node_modules/fs-extra/package.json -third_party/devtools-frontend/src/node_modules/get-uri/node_modules/jsonfile/package.json third_party/devtools-frontend/src/node_modules/glob-parent/package.json third_party/devtools-frontend/src/node_modules/globals/package.json third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/package.json @@ -9044,6 +9143,7 @@ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/api/Target.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/api/WebWorker.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/api/WebWorker.js +third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/bidi/Frame.js third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/cdp/FirefoxTargetManager.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/cdp/FirefoxTargetManager.js third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/cdp/Input.js @@ -9080,6 +9180,7 @@ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/api/Target.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/api/WebWorker.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/api/WebWorker.js +third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/bidi/Frame.js third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/cdp/FirefoxTargetManager.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/cdp/FirefoxTargetManager.js third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/cdp/Input.js @@ -9115,6 +9216,7 @@ third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/Input.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/Page.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/Target.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/WebWorker.ts +third_party/devtools-frontend/src/node_modules/puppeteer-core/src/bidi/Frame.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/FirefoxTargetManager.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/Input.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/PredefinedNetworkConditions.ts @@ -9288,6 +9390,7 @@ third_party/devtools-frontend/src/node_modules/typescript/lib/ja/diagnosticMessa third_party/devtools-frontend/src/node_modules/typescript/lib/ko/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/lib.dom.d.ts third_party/devtools-frontend/src/node_modules/typescript/lib/lib.dom.iterable.d.ts +third_party/devtools-frontend/src/node_modules/typescript/lib/lib.es2016.intl.d.ts third_party/devtools-frontend/src/node_modules/typescript/lib/lib.es2020.bigint.d.ts third_party/devtools-frontend/src/node_modules/typescript/lib/lib.es2020.intl.d.ts third_party/devtools-frontend/src/node_modules/typescript/lib/lib.es2021.intl.d.ts @@ -9300,7 +9403,6 @@ third_party/devtools-frontend/src/node_modules/typescript/lib/ru/diagnosticMessa third_party/devtools-frontend/src/node_modules/typescript/lib/tr/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/tsc.js third_party/devtools-frontend/src/node_modules/typescript/lib/tsserver.js -third_party/devtools-frontend/src/node_modules/typescript/lib/tsserverlibrary.js third_party/devtools-frontend/src/node_modules/typescript/lib/typescript.js third_party/devtools-frontend/src/node_modules/typescript/lib/typingsInstaller.js third_party/devtools-frontend/src/node_modules/typescript/lib/zh-cn/diagnosticMessages.generated.json @@ -9338,7 +9440,6 @@ third_party/devtools-frontend/src/scripts/deps/download_emscripten.py third_party/devtools-frontend/src/scripts/deps/roll_to_chromium.py third_party/devtools-frontend/src/scripts/hosted_mode/server.js third_party/devtools-frontend/src/scripts/tools/update_goldens.py -third_party/devtools-frontend/src/test/conductor/mocha_hooks.ts third_party/devtools-frontend/src/test/e2e/application/reporting-api_test.ts third_party/devtools-frontend/src/test/e2e/console/console-message-format_test.ts third_party/devtools-frontend/src/test/e2e/console/console-truncate-long-messages_test.ts @@ -9349,35 +9450,8 @@ third_party/devtools-frontend/src/test/e2e/lighthouse/timespan_test.ts third_party/devtools-frontend/src/test/e2e/rendering/Rendering_test.ts third_party/devtools-frontend/src/test/e2e/resources/console/primitives.html third_party/devtools-frontend/src/test/e2e/resources/elements/inactive-css-page.html +third_party/devtools-frontend/src/test/perf/report/report.ts third_party/devtools-frontend/src/test/shared/resultsdb.ts -third_party/devtools-frontend/src/test/unittests/front_end/core/i18n/i18n_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/core/platform/StringUtilities_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/core/root/Runtime_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/core/sdk/CookieModel_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/models/extensions/ExtensionServer_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/models/extensions/HostUrlPattern_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/models/persistence/NetworkPersistenceManager_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/models/persistence/PersistenceImpl_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/models/trace/ModelImpl_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/models/trace/handlers/MetaHandler_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/models/trace/handlers/NetworkRequestsHandler_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/models/trace/helpers/Trace_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/application/ReportingApiReportsView_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/application/preloading/components/UsedPreloadingView_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/console/ErrorStackParser_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/elements/components/CSSPropertyDocsView_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/explain/InsightProvider_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/network/components/RequestHeadersView_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/settings/components/SyncSection_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/sources/components/BreakpointsViewUtils_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/sources/components/BreakpointsView_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/sources/components/HeadersView_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/timeline/TimelineUIUtils_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/panels/timeline/track_appenders/ThreadAppender_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/ui/UIUtils_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/ui/legacy/components/object_ui/ObjectPropertiesSection_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/ui/legacy/components/utils/JSPresentationUtils_test.ts -third_party/devtools-frontend/src/test/unittests/front_end/ui/legacy/components/utils/Linkifier_test.ts third_party/devtools-frontend/src/third_party/blink/public/devtools_protocol/browser_protocol.json third_party/devtools-frontend/src/third_party/pyjson5/src/benchmarks/chromium.linux.json third_party/devtools-frontend/src/third_party/pyjson5/src/setup.py @@ -10194,7 +10268,6 @@ third_party/ffmpeg/compat/w32pthreads.h third_party/ffmpeg/doc/examples/transcode_aac.c third_party/ffmpeg/doc/style.min.css third_party/ffmpeg/ffmpeg_options.gni -third_party/ffmpeg/libavcodec/aac_adtstoasc_bsf.c third_party/ffmpeg/libavcodec/aacdec.c third_party/ffmpeg/libavcodec/aacdec_template.c third_party/ffmpeg/libavcodec/aacps.c @@ -10231,17 +10304,22 @@ third_party/ffmpeg/libavcodec/aliaspixdec.c third_party/ffmpeg/libavcodec/aliaspixenc.c third_party/ffmpeg/libavcodec/atrac9dec.c third_party/ffmpeg/libavcodec/atrac9tab.h -third_party/ffmpeg/libavcodec/av1_frame_merge_bsf.c -third_party/ffmpeg/libavcodec/av1_frame_split_bsf.c third_party/ffmpeg/libavcodec/av1_parser.c third_party/ffmpeg/libavcodec/avs2_parser.c third_party/ffmpeg/libavcodec/avs3.h third_party/ffmpeg/libavcodec/avs3_parser.c +third_party/ffmpeg/libavcodec/bsf/aac_adtstoasc.c +third_party/ffmpeg/libavcodec/bsf/av1_frame_merge.c +third_party/ffmpeg/libavcodec/bsf/av1_frame_split.c +third_party/ffmpeg/libavcodec/bsf/chomp.c +third_party/ffmpeg/libavcodec/bsf/evc_frame_merge.c +third_party/ffmpeg/libavcodec/bsf/mpeg4_unpack_bframes.c +third_party/ffmpeg/libavcodec/bsf/pgs_frame_merge.c +third_party/ffmpeg/libavcodec/bsf/vp9_superframe.c third_party/ffmpeg/libavcodec/bytestream.h third_party/ffmpeg/libavcodec/c93.c third_party/ffmpeg/libavcodec/canopus.c third_party/ffmpeg/libavcodec/canopus.h -third_party/ffmpeg/libavcodec/chomp_bsf.c third_party/ffmpeg/libavcodec/cook_parser.c third_party/ffmpeg/libavcodec/cpia.c third_party/ffmpeg/libavcodec/d3d12va_decode.h @@ -10254,6 +10332,8 @@ third_party/ffmpeg/libavcodec/diracdec.c third_party/ffmpeg/libavcodec/diractab.c third_party/ffmpeg/libavcodec/diractab.h third_party/ffmpeg/libavcodec/dxv.c +third_party/ffmpeg/libavcodec/dxv.h +third_party/ffmpeg/libavcodec/dxvenc.c third_party/ffmpeg/libavcodec/eac3_data.c third_party/ffmpeg/libavcodec/eac3_data.h third_party/ffmpeg/libavcodec/eac3dec.c @@ -10263,7 +10343,6 @@ third_party/ffmpeg/libavcodec/elbg.c third_party/ffmpeg/libavcodec/elbg.h third_party/ffmpeg/libavcodec/escape124.c third_party/ffmpeg/libavcodec/escape130.c -third_party/ffmpeg/libavcodec/evc_frame_merge_bsf.c third_party/ffmpeg/libavcodec/flacenc.c third_party/ffmpeg/libavcodec/g723_1enc.c third_party/ffmpeg/libavcodec/hap.c @@ -10311,7 +10390,6 @@ third_party/ffmpeg/libavcodec/mfenc.c third_party/ffmpeg/libavcodec/mimic.c third_party/ffmpeg/libavcodec/mlz.c third_party/ffmpeg/libavcodec/mlz.h -third_party/ffmpeg/libavcodec/mpeg4_unpack_bframes_bsf.c third_party/ffmpeg/libavcodec/mpeg4audio.c third_party/ffmpeg/libavcodec/mpeg4audio_sample_rates.c third_party/ffmpeg/libavcodec/mpeg4audio_sample_rates.h @@ -10333,7 +10411,6 @@ third_party/ffmpeg/libavcodec/opusenc_psy.h third_party/ffmpeg/libavcodec/opusenc_utils.h third_party/ffmpeg/libavcodec/opustab.c third_party/ffmpeg/libavcodec/opustab.h -third_party/ffmpeg/libavcodec/pgs_frame_merge_bsf.c third_party/ffmpeg/libavcodec/roqvideoenc.c third_party/ffmpeg/libavcodec/rscc.c third_party/ffmpeg/libavcodec/s302m.c @@ -10356,7 +10433,6 @@ third_party/ffmpeg/libavcodec/vc2enc_dwt.c third_party/ffmpeg/libavcodec/vc2enc_dwt.h third_party/ffmpeg/libavcodec/videotoolboxenc.c third_party/ffmpeg/libavcodec/vp9_mc_template.c -third_party/ffmpeg/libavcodec/vp9_superframe_bsf.c third_party/ffmpeg/libavcodec/vp9recon.c third_party/ffmpeg/libavcodec/vvc_parser.c third_party/ffmpeg/libavcodec/webp.c @@ -10450,6 +10526,8 @@ third_party/ffmpeg/libavformat/iamf.c third_party/ffmpeg/libavformat/iamf.h third_party/ffmpeg/libavformat/iamf_parse.c third_party/ffmpeg/libavformat/iamf_parse.h +third_party/ffmpeg/libavformat/iamf_reader.c +third_party/ffmpeg/libavformat/iamf_reader.h third_party/ffmpeg/libavformat/iamf_writer.c third_party/ffmpeg/libavformat/iamf_writer.h third_party/ffmpeg/libavformat/iamfdec.c @@ -10558,6 +10636,7 @@ third_party/freetype/src/src/sfnt/ttsvg.c third_party/freetype/src/src/truetype/ttgxvar.c third_party/freetype/src/src/truetype/ttinterp.h third_party/fuchsia-gn-sdk/src/gen_fidl_response_file.py +third_party/fuchsia-gn-sdk/src/gn_configs.gni third_party/fuchsia-gn-sdk/src/prepare_package_inputs.py third_party/gemmlowp/src/contrib/CMakeLists.txt third_party/gemmlowp/src/standalone/neon-gemm-kernel-benchmark.cc @@ -10813,7 +10892,6 @@ third_party/google-closure-library/doc/js/article.js third_party/google-closure-library/package.json third_party/google-closure-library/scripts/generate_deps_js.js third_party/google-closure-library/third_party/closure/goog/mochikit/async/deferred.js -third_party/google_benchmark/src/setup.py third_party/google_benchmark/src/src/cycleclock.h third_party/google_input_tools/src/chrome/os/inputview/adapter.js third_party/google_input_tools/src/chrome/os/inputview/canvas.js @@ -11339,6 +11417,7 @@ third_party/libusb/src/libusb/os/windows_usb.c third_party/libusb/src/msvc/inttypes.h third_party/libusb/src/msvc/stdint.h third_party/libvpx/BUILD.gn +third_party/libvpx/source/libvpx/build/make/Android.mk third_party/libvpx/source/libvpx/examples/vpx_dec_fuzzer.cc third_party/libvpx/source/libvpx/libs.mk third_party/libvpx/source/libvpx/test/vp8_datarate_test.cc @@ -11543,6 +11622,7 @@ third_party/material_web_components/components-chromium/node_modules/@lit/reacti third_party/material_web_components/components-chromium/node_modules/@lit/reactive-element/decorators/query-async.d.ts third_party/material_web_components/components-chromium/node_modules/@lit/reactive-element/decorators/query.d.ts third_party/material_web_components/components-chromium/node_modules/@lit/reactive-element/reactive-element.d.ts +third_party/material_web_components/components-chromium/node_modules/@lit/task/task.d.ts third_party/material_web_components/components-chromium/node_modules/@material/web/checkbox/internal/checkbox.d.ts third_party/material_web_components/components-chromium/node_modules/@material/web/checkbox/internal/checkbox.js third_party/material_web_components/components-chromium/node_modules/@material/web/dialog/internal/dialog.d.ts @@ -11662,6 +11742,7 @@ third_party/nearby/src/sharing/text_attachment_test.cc third_party/node/node_modules/@aashutoshrathi/word-wrap/package.json third_party/node/node_modules/@eslint/eslintrc/node_modules/globals/package.json third_party/node/node_modules/@lit/reactive-element/reactive-element.d.ts +third_party/node/node_modules/@mediapipe/tasks-vision/vision.d.ts third_party/node/node_modules/@types/dom-speech-recognition/index.d.ts third_party/node/node_modules/@types/dom-webcodecs/index.d.ts third_party/node/node_modules/@types/google.analytics/index.d.ts @@ -11835,6 +11916,7 @@ third_party/node/node_modules/terser/package.json third_party/node/node_modules/type-fest/package.json third_party/node/node_modules/typescript/lib/lib.dom.d.ts third_party/node/node_modules/typescript/lib/lib.dom.iterable.d.ts +third_party/node/node_modules/typescript/lib/lib.es2016.intl.d.ts third_party/node/node_modules/typescript/lib/lib.es2020.bigint.d.ts third_party/node/node_modules/typescript/lib/lib.es2020.intl.d.ts third_party/node/node_modules/typescript/lib/lib.es2021.intl.d.ts @@ -11857,6 +11939,7 @@ third_party/openh264/src/module/task_utils.py third_party/openh264/src/module/task_utils_generated.h third_party/openh264/src/test/build/windowsphone/codec_ut/CodecUTApp/Properties/AppManifest.xml third_party/openh264/src/test/build/windowsphone/codec_ut/CodecUTApp/Properties/WMAppManifest.xml +third_party/openscreen/src/BUILD.gn third_party/openscreen/src/PRESUBMIT.py third_party/openscreen/src/buildtools/README.txt third_party/openscreen/src/buildtools/clang_format/README.txt @@ -12415,6 +12498,7 @@ third_party/pdfium/PRESUBMIT.py third_party/pdfium/core/fpdfapi/cmaps/fpdf_cmaps.cpp third_party/pdfium/core/fpdfapi/edit/cpdf_contentstream_write_utils.cpp third_party/pdfium/core/fpdftext/cpdf_linkextract_unittest.cpp +third_party/pdfium/core/fxcrt/fx_memory.cpp third_party/pdfium/core/fxcrt/fx_memory_pa.cpp third_party/pdfium/core/fxcrt/widestring_unittest.cpp third_party/pdfium/core/fxge/win32/cgdi_device_driver.cpp @@ -12429,7 +12513,6 @@ third_party/pdfium/testing/gtest/BUILD.gn third_party/pdfium/testing/tools/PRESUBMIT.py third_party/pdfium/testing/tools/safetynet_compare.py third_party/pdfium/third_party/agg23/agg_math.h -third_party/pdfium/third_party/base/memory/aligned_memory.cc third_party/pdfium/third_party/freetype/include/freetype-custom-config/ftoption.h third_party/pdfium/third_party/libopenjpeg/j2k.c third_party/pdfium/third_party/libopenjpeg/opj_includes.h @@ -12495,8 +12578,8 @@ third_party/perfetto/src/profiling/symbolizer/breakpad_parser.cc third_party/perfetto/src/profiling/symbolizer/breakpad_parser.h third_party/perfetto/src/trace_processor/forwarding_trace_parser.cc third_party/perfetto/src/trace_processor/importers/common/args_translation_table.cc +third_party/perfetto/src/trace_processor/importers/common/thread_state_tracker.cc third_party/perfetto/src/trace_processor/importers/ftrace/binder_tracker.cc -third_party/perfetto/src/trace_processor/importers/ftrace/thread_state_tracker.cc third_party/perfetto/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.h third_party/perfetto/src/trace_processor/importers/fuchsia/fuchsia_trace_utils.h third_party/perfetto/src/trace_processor/importers/ninja/ninja_log_parser.cc @@ -12560,6 +12643,61 @@ third_party/polymer/v3_0/components-chromium/paper-tooltip/paper-tooltip.js third_party/polymer/v3_0/components-chromium/polymer/interfaces.d.ts third_party/polymer/v3_0/package.json third_party/private_membership/BUILD.gn +third_party/protobuf-javascript/src/binary/arith.js +third_party/protobuf-javascript/src/binary/arith_test.js +third_party/protobuf-javascript/src/binary/constants.js +third_party/protobuf-javascript/src/binary/decoder.js +third_party/protobuf-javascript/src/binary/decoder_test.js +third_party/protobuf-javascript/src/binary/encoder.js +third_party/protobuf-javascript/src/binary/message_test.js +third_party/protobuf-javascript/src/binary/proto_test.js +third_party/protobuf-javascript/src/binary/reader.js +third_party/protobuf-javascript/src/binary/reader_test.js +third_party/protobuf-javascript/src/binary/utils.js +third_party/protobuf-javascript/src/binary/utils_test.js +third_party/protobuf-javascript/src/binary/writer.js +third_party/protobuf-javascript/src/binary/writer_test.js +third_party/protobuf-javascript/src/commonjs/import_test.js +third_party/protobuf-javascript/src/commonjs/strict_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/arith_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/decoder_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/proto_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/reader_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/utils_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/writer_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/commonjs/import_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/debug_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/message_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/proto3_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/arith_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/decoder_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/proto_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/reader_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/utils_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/writer_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/debug_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/maps_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/message_test.js +third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/proto3_test.js +third_party/protobuf-javascript/src/debug.js +third_party/protobuf-javascript/src/debug_test.js +third_party/protobuf-javascript/src/experimental/runtime/int64.js +third_party/protobuf-javascript/src/experimental/runtime/kernel/kernel_compatibility_test.js +third_party/protobuf-javascript/src/experimental/runtime/kernel/storage.js +third_party/protobuf-javascript/src/experimental/runtime/kernel/writer.js +third_party/protobuf-javascript/src/generator/js_generator.cc +third_party/protobuf-javascript/src/generator/js_generator.h +third_party/protobuf-javascript/src/generator/protoc-gen-js.cc +third_party/protobuf-javascript/src/generator/well_known_types_embed.cc +third_party/protobuf-javascript/src/generator/well_known_types_embed.h +third_party/protobuf-javascript/src/gulpfile.js +third_party/protobuf-javascript/src/map.js +third_party/protobuf-javascript/src/maps_test.js +third_party/protobuf-javascript/src/message.js +third_party/protobuf-javascript/src/message_test.js +third_party/protobuf-javascript/src/node_loader.js +third_party/protobuf-javascript/src/proto3_test.js +third_party/protobuf-javascript/src/test_bootstrap.js third_party/protobuf/CHANGES.txt third_party/protobuf/CONTRIBUTORS.txt third_party/protobuf/benchmarks/cpp/cpp_benchmark.cc @@ -13320,6 +13458,7 @@ third_party/re2/src/util/pcre.h third_party/rust/aho_corasick/v1/BUILD.gn third_party/rust/anyhow/v1/BUILD.gn third_party/rust/autocfg/v1/BUILD.gn +third_party/rust/bytemuck/v1/BUILD.gn third_party/rust/cxx/v1/BUILD.gn third_party/rust/cxxbridge_cmd/v1/BUILD.gn third_party/rust/cxxbridge_flags/v1/BUILD.gn @@ -13349,6 +13488,7 @@ third_party/rust/serde/v1/BUILD.gn third_party/rust/serde_derive/v1/BUILD.gn third_party/rust/serde_json/v1/BUILD.gn third_party/rust/serde_json_lenient/v0_1/BUILD.gn +third_party/rust/serde_json_lenient/v0_2/BUILD.gn third_party/rust/strum/v0_25/BUILD.gn third_party/rust/strum_macros/v0_25/BUILD.gn third_party/rust/syn/v1/BUILD.gn @@ -13569,6 +13709,7 @@ third_party/skia/tools/add_codereview_message.py third_party/skia/tools/bloaty_treemap.py third_party/skia/tools/copyright/main.py third_party/skia/tools/flags/CommandLineFlags.h +third_party/skia/tools/gpu/vk/VkTestMemoryAllocator.h third_party/skia/tools/perf-canvaskit-puppeteer/canvas_perf.js third_party/skia/tools/run-wasm-gm-tests/run-wasm-gm-tests.html third_party/skia/tools/skp/generate_page_set.py @@ -13626,7 +13767,7 @@ third_party/speedometer/v3.0/resources/newssite/news-next/dist/_next/static/chun third_party/speedometer/v3.0/resources/perf.webkit.org/public/data/manifest.json third_party/speedometer/v3.0/resources/react-stockcharts/package-lock.json third_party/speedometer/v3.0/resources/todomvc/architecture-examples/angular-complex/dist/3rdpartylicenses.txt -third_party/speedometer/v3.0/resources/todomvc/architecture-examples/angular-complex/dist/styles.4407ee83dbe11741.css +third_party/speedometer/v3.0/resources/todomvc/architecture-examples/angular-complex/dist/styles.746a93d9fd4de753.css third_party/speedometer/v3.0/resources/todomvc/architecture-examples/angular/dist/3rdpartylicenses.txt third_party/speedometer/v3.0/resources/todomvc/architecture-examples/backbone-complex/dist/index.css third_party/speedometer/v3.0/resources/todomvc/architecture-examples/backbone/dist/index.css @@ -13845,7 +13986,6 @@ third_party/tflite/src/tensorflow/tools/android/test/jni/rgb2yuv.cc third_party/tflite/src/tensorflow/tools/compatibility/tf_upgrade_v2_safety_test.py third_party/tflite/src/tensorflow/tools/pip_package/THIRD_PARTY_NOTICES.txt third_party/tflite/src/tensorflow/tools/pip_package/setup.py -third_party/tflite/src/tensorflow/tools/pip_package/v2/setup.py third_party/tflite/src/third_party/xla/third_party/tsl/tsl/distributed_runtime/coordination/coordination_service_error_util.h third_party/tflite/src/third_party/xla/third_party/tsl/tsl/distributed_runtime/rpc/grpc_util.h third_party/tflite/src/third_party/xla/third_party/tsl/tsl/lib/io/format.h @@ -13868,8 +14008,10 @@ third_party/tflite/src/third_party/xla/third_party/tsl/tsl/platform/windows/env. third_party/tflite/src/third_party/xla/third_party/tsl/tsl/platform/windows/stacktrace.cc third_party/tflite/src/third_party/xla/third_party/tsl/tsl/platform/windows/stacktrace_handler.cc third_party/tflite/src/third_party/xla/xla/mlir_hlo/mhlo/transforms/chlo_legalize_to_hlo/chlo_legalize_to_hlo.cc +third_party/tflite/src/third_party/xla/xla/pjrt/c/pjrt_c_api.h third_party/tflite/src/third_party/xla/xla/pjrt/pjrt_api.cc third_party/tflite/src/third_party/xla/xla/service/gpu/fusions/transpose.h +third_party/tflite/src/third_party/xla/xla/service/gpu/fusions/transpose_mlir.h third_party/tflite/src/third_party/xla/xla/service/hlo_graph_dumper.cc third_party/tflite/src/third_party/xla/xla/service/hlo_verifier.cc third_party/tflite_support/src/tensorflow_lite_support/c/task/processor/category.h @@ -14285,7 +14427,6 @@ third_party/webrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c third_party/webrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c third_party/webrtc/examples/peerconnection/client/defaults.cc third_party/webrtc/examples/stunprober/main.cc -third_party/webrtc/examples/unityplugin/simple_peer_connection.cc third_party/webrtc/infra/specs/gn_isolate_map.pyl third_party/webrtc/media/base/video_common.cc third_party/webrtc/media/base/video_common.h @@ -14497,16 +14638,13 @@ third_party/wpt_tools/wpt/tools/third_party_modified/mozlog/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 -third_party/wpt_tools/wpt/tools/wpt/run.py third_party/wpt_tools/wpt/tools/wptrunner/requirements.txt third_party/wpt_tools/wpt/tools/wptrunner/setup.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/android_weblayer.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/android_webview.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/base.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/chrome.py -third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/content_shell.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/browsers/firefox.py -third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorcontentshell.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executormarionette.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/test-wait.js @@ -14628,6 +14766,7 @@ tools/code_coverage/coverage.py tools/code_coverage/js_source_maps/create_js_source_maps/PRESUBMIT.py tools/cr/cr/base/android.py tools/cr/main.py +tools/crates/create_update_cl.py tools/crates/gnrt/lib/test_metadata.json tools/crbug/crbug.js tools/crbug/pinpoint.js @@ -14852,6 +14991,7 @@ tools/metrics/histograms/metadata/language/histograms.xml tools/metrics/histograms/metadata/leveldb_proto/histograms.xml tools/metrics/histograms/metadata/local/histograms.xml tools/metrics/histograms/metadata/login/histograms.xml +tools/metrics/histograms/metadata/magic_stack/enums.xml tools/metrics/histograms/metadata/magic_stack/histograms.xml tools/metrics/histograms/metadata/media/enums.xml tools/metrics/histograms/metadata/media/histograms.xml @@ -14985,6 +15125,7 @@ tools/metrics/histograms/metadata/webapps/enums.xml tools/metrics/histograms/metadata/webapps/histograms.xml tools/metrics/histograms/metadata/webauthn/enums.xml tools/metrics/histograms/metadata/webauthn/histograms.xml +tools/metrics/histograms/metadata/webnn/histograms.xml tools/metrics/histograms/metadata/windows/enums.xml tools/metrics/histograms/metadata/windows/histograms.xml tools/metrics/histograms/metadata/xr/enums.xml @@ -15081,13 +15222,13 @@ tools/perf/core/shard_maps/timing_data/android-pixel4-perf_timing.json tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf_timing.json tools/perf/core/shard_maps/timing_data/android-pixel6-perf_timing.json tools/perf/core/shard_maps/timing_data/android-pixel6-pro-perf_timing.json -tools/perf/core/shard_maps/timing_data/lacros-x86-perf_timing.json tools/perf/core/shard_maps/timing_data/linux-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-laptop_low_end-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json +tools/perf/core/shard_maps/timing_data/win-11-perf_timing.json tools/perf/core/test_data/benchmarks_to_shard.json tools/perf/core/test_data/test_timing_data.json tools/perf/core/test_data/test_timing_data_1_build.json @@ -15301,6 +15442,8 @@ tools/typescript/definitions/system_display.d.ts tools/usb_gadget/gadget.py tools/usb_gadget/msos20_descriptors.py tools/utr/cipd.py +tools/utr/output_adapter_test.py +tools/utr/recipe.py tools/variations/bisect_variations.py tools/variations/fieldtrial_util_unittest.py tools/visual_debugger/app.html @@ -15392,7 +15535,7 @@ ui/color/color_provider_key.h ui/display/display_switches.cc ui/display/display_transform.cc ui/display/mac/display_link_mac.cc -ui/display/win/test/virtual_display_win_util.cc +ui/display/win/test/virtual_display_util_win.cc ui/events/android/motion_event_android_unittest.cc ui/events/blink/blink_event_util.cc ui/events/devices/input_device_observer_win.cc @@ -15414,6 +15557,7 @@ ui/file_manager/base/gn/PRESUBMIT.py ui/file_manager/file_manager/background/js/volume_info.ts ui/file_manager/file_manager/background/js/volume_manager_unittest.ts ui/file_manager/file_manager/common/js/files_app_entry_types.ts +ui/file_manager/file_manager/common/js/filtered_volume_manager.ts ui/file_manager/file_manager/common/js/trash.ts ui/file_manager/file_manager/foreground/elements/icons.html ui/file_manager/file_manager/foreground/js/file_manager_commands.ts @@ -15560,7 +15704,6 @@ v8/src/libsampler/sampler.cc v8/src/objects/js-array-buffer.h v8/src/objects/js-number-format.cc v8/src/objects/map.h -v8/src/objects/maybe-object.h v8/src/objects/objects.h v8/src/objects/ordered-hash-table.h v8/src/objects/string-inl.h 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 b116aaa3..dd2786ec 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 -@@ -2367,7 +2367,6 @@ static_library("browser") { +@@ -2378,7 +2378,6 @@ static_library("browser") { "//components/reporting/util:task_runner_context", "//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", -@@ -3763,8 +3762,6 @@ static_library("browser") { +@@ -3771,8 +3770,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -123,7 +123,7 @@ subresource_filter_ruleset_service_; --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -66,7 +66,6 @@ +@@ -68,7 +68,6 @@ #include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/reading_list/reading_list_model_factory.h" @@ -131,7 +131,7 @@ #include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/share/share_history.h" -@@ -637,10 +636,6 @@ void ChromeBrowsingDataRemoverDelegate:: +@@ -639,10 +638,6 @@ void ChromeBrowsingDataRemoverDelegate:: base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -144,7 +144,7 @@ browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_, --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5047,10 +5047,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -5091,10 +5091,6 @@ ChromeContentBrowserClient::CreateThrott throttles.push_back(std::make_unique( handle, handle->GetWebContents()->GetBrowserContext())); @@ -155,7 +155,7 @@ throttles.push_back(std::make_unique( handle, base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp), -@@ -5098,16 +5094,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -5146,16 +5142,6 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -172,7 +172,7 @@ if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) { throttles.push_back( std::make_unique( -@@ -5400,8 +5386,6 @@ bool ChromeContentBrowserClient::IsPlugi +@@ -5448,8 +5434,6 @@ bool ChromeContentBrowserClient::IsPlugi void ChromeContentBrowserClient::InitOnUIThread() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -207,7 +207,7 @@ } // namespace --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -499,13 +499,6 @@ void ChromeDownloadManagerDelegate::SetD +@@ -502,13 +502,6 @@ void ChromeDownloadManagerDelegate::SetD download_manager_ = dm; @@ -221,7 +221,7 @@ if (download_manager_) { download_manager_->AddObserver(this); } -@@ -911,17 +904,6 @@ void ChromeDownloadManagerDelegate::Choo +@@ -924,17 +917,6 @@ void ChromeDownloadManagerDelegate::Choo void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( base::FilePath* filename, const GURL& source_url) { @@ -241,7 +241,7 @@ void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -110,7 +110,7 @@ class DownloadItemModelData : public bas +@@ -114,7 +114,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. @@ -250,7 +250,7 @@ // Whether the download is currently being revived. bool is_being_revived_ = false; -@@ -526,13 +526,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -531,13 +531,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -267,7 +267,7 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -709,9 +709,6 @@ bool DownloadItemModel::IsCommandEnabled +@@ -714,9 +714,6 @@ bool DownloadItemModel::IsCommandEnabled // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -279,7 +279,7 @@ return !download_->IsSavePackageDownload() && --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc -@@ -262,14 +262,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr +@@ -263,14 +263,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) + extension); @@ -295,7 +295,7 @@ } } -@@ -447,10 +440,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c +@@ -448,10 +441,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension( const base::FilePath& file_name) { base::FilePath::StringType extension = file_name.Extension(); @@ -322,7 +322,7 @@ // If no mime type or explicitly specified a name, don't replace file // extension. if (sniffed_mime_type.empty() || !suggested_filename.empty()) -@@ -1287,30 +1280,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1291,30 +1284,7 @@ DownloadFileType::DangerLevel DownloadTa download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; @@ -364,7 +364,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" -@@ -1378,9 +1377,6 @@ DownloadsAcceptDangerFunction::Downloads +@@ -1380,9 +1379,6 @@ DownloadsAcceptDangerFunction::Downloads DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} @@ -374,7 +374,7 @@ ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() { std::optional params = downloads::AcceptDanger::Params::Create(args()); -@@ -1418,42 +1414,7 @@ void DownloadsAcceptDangerFunction::Prom +@@ -1420,42 +1416,7 @@ void DownloadsAcceptDangerFunction::Prom return; } RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); @@ -500,7 +500,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 -@@ -704,18 +704,6 @@ void WebstorePrivateBeginInstallWithMani +@@ -731,18 +731,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -519,7 +519,7 @@ } void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone( -@@ -1219,54 +1207,9 @@ WebstorePrivateGetReferrerChainFunction: +@@ -1255,54 +1243,9 @@ WebstorePrivateGetReferrerChainFunction: ExtensionFunction::ResponseAction WebstorePrivateGetReferrerChainFunction::Run() { @@ -655,7 +655,7 @@ #include "chrome/browser/sessions/exit_type_service.h" #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" -@@ -639,17 +638,6 @@ void ProfileImpl::LoadPrefsForNormalStar +@@ -643,17 +642,6 @@ void ProfileImpl::LoadPrefsForNormalStar mojo::PendingRemote pref_validation_delegate; @@ -703,7 +703,7 @@ if (is_android) { deps += [ "//chrome/browser/password_manager/android:utils" ] -@@ -501,6 +503,7 @@ static_library("advanced_protection") { +@@ -505,6 +507,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -711,7 +711,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -520,6 +523,7 @@ source_set("metrics_collector") { +@@ -524,6 +527,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -721,10 +721,12 @@ source_set("test_support") { --- a/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc -@@ -174,92 +174,6 @@ bool SecurityStateTabHelper::UsedPolicyI +@@ -174,93 +174,6 @@ bool SecurityStateTabHelper::UsedPolicyI security_state::MaliciousContentStatus SecurityStateTabHelper::GetMaliciousContentStatus() const { +- using enum safe_browsing::SBThreatType; +- - content::NavigationEntry* entry = - web_contents()->GetController().GetVisibleEntry(); - if (!entry) @@ -738,20 +740,20 @@ - if (sb_ui_manager->IsUrlAllowlistedOrPendingForWebContents( - entry->GetURL(), false, entry, web_contents(), false, &threat_type)) { - switch (threat_type) { -- case safe_browsing::SB_THREAT_TYPE_UNUSED: -- case safe_browsing::SB_THREAT_TYPE_SAFE: -- case safe_browsing::SB_THREAT_TYPE_URL_PHISHING: -- case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING: +- case SB_THREAT_TYPE_UNUSED: +- case SB_THREAT_TYPE_SAFE: +- case SB_THREAT_TYPE_URL_PHISHING: +- case SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING: - return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING; -- case safe_browsing::SB_THREAT_TYPE_URL_MALWARE: +- case SB_THREAT_TYPE_URL_MALWARE: - return security_state::MALICIOUS_CONTENT_STATUS_MALWARE; -- case safe_browsing::SB_THREAT_TYPE_URL_UNWANTED: +- case SB_THREAT_TYPE_URL_UNWANTED: - return security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE; -- case safe_browsing::SB_THREAT_TYPE_SAVED_PASSWORD_REUSE: +- case SB_THREAT_TYPE_SAVED_PASSWORD_REUSE: -#if BUILDFLAG(FULL_SAFE_BROWSING) - return security_state::MALICIOUS_CONTENT_STATUS_SAVED_PASSWORD_REUSE; -#endif -- case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_SYNC_PASSWORD_REUSE: +- case SB_THREAT_TYPE_SIGNED_IN_SYNC_PASSWORD_REUSE: -#if BUILDFLAG(FULL_SAFE_BROWSING) - if (safe_browsing::ChromePasswordProtectionService:: - ShouldShowPasswordReusePageInfoBubble( @@ -761,7 +763,7 @@ - } -#endif - [[fallthrough]]; -- case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_NON_SYNC_PASSWORD_REUSE: +- case SB_THREAT_TYPE_SIGNED_IN_NON_SYNC_PASSWORD_REUSE: -#if BUILDFLAG(FULL_SAFE_BROWSING) - if (safe_browsing::ChromePasswordProtectionService:: - ShouldShowPasswordReusePageInfoBubble( @@ -771,7 +773,7 @@ - } -#endif - [[fallthrough]]; -- case safe_browsing::SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE: +- case SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE: -#if BUILDFLAG(FULL_SAFE_BROWSING) - if (safe_browsing::ChromePasswordProtectionService:: - ShouldShowPasswordReusePageInfoBubble( @@ -783,27 +785,26 @@ - // If user has already changed password or FULL_SAFE_BROWSING isn't - // enabled, returns the regular social engineering content status. - return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING; -- case safe_browsing::SB_THREAT_TYPE_BILLING: +- case SB_THREAT_TYPE_BILLING: - return security_state::MALICIOUS_CONTENT_STATUS_BILLING; -- case safe_browsing::SB_THREAT_TYPE_MANAGED_POLICY_BLOCK: +- case SB_THREAT_TYPE_MANAGED_POLICY_BLOCK: - return security_state::MALICIOUS_CONTENT_STATUS_MANAGED_POLICY_BLOCK; -- case safe_browsing::SB_THREAT_TYPE_MANAGED_POLICY_WARN: +- case SB_THREAT_TYPE_MANAGED_POLICY_WARN: - return security_state::MALICIOUS_CONTENT_STATUS_MANAGED_POLICY_WARN; -- case safe_browsing:: -- DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING: -- case safe_browsing::DEPRECATED_SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE: -- case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE: -- case safe_browsing::SB_THREAT_TYPE_EXTENSION: -- case safe_browsing::SB_THREAT_TYPE_BLOCKLISTED_RESOURCE: -- case safe_browsing::SB_THREAT_TYPE_API_ABUSE: -- case safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER: -- case safe_browsing::SB_THREAT_TYPE_CSD_ALLOWLIST: -- case safe_browsing::SB_THREAT_TYPE_AD_SAMPLE: -- case safe_browsing::SB_THREAT_TYPE_BLOCKED_AD_POPUP: -- case safe_browsing::SB_THREAT_TYPE_BLOCKED_AD_REDIRECT: -- case safe_browsing::SB_THREAT_TYPE_SUSPICIOUS_SITE: -- case safe_browsing::SB_THREAT_TYPE_APK_DOWNLOAD: -- case safe_browsing::SB_THREAT_TYPE_HIGH_CONFIDENCE_ALLOWLIST: +- case DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING: +- case DEPRECATED_SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE: +- case SB_THREAT_TYPE_URL_BINARY_MALWARE: +- case SB_THREAT_TYPE_EXTENSION: +- case SB_THREAT_TYPE_BLOCKLISTED_RESOURCE: +- case SB_THREAT_TYPE_API_ABUSE: +- case SB_THREAT_TYPE_SUBRESOURCE_FILTER: +- case SB_THREAT_TYPE_CSD_ALLOWLIST: +- case SB_THREAT_TYPE_AD_SAMPLE: +- case SB_THREAT_TYPE_BLOCKED_AD_POPUP: +- case SB_THREAT_TYPE_BLOCKED_AD_REDIRECT: +- case SB_THREAT_TYPE_SUSPICIOUS_SITE: +- case SB_THREAT_TYPE_APK_DOWNLOAD: +- case SB_THREAT_TYPE_HIGH_CONFIDENCE_ALLOWLIST: - // These threat types are not currently associated with - // interstitials, and thus resources with these threat types are - // not ever whitelisted or pending whitelisting. @@ -816,7 +817,7 @@ --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -5195,7 +5195,6 @@ static_library("ui") { +@@ -5251,7 +5251,6 @@ static_library("ui") { "views/download/bubble/download_dialog_view.h", "views/download/bubble/download_toolbar_button_view.cc", "views/download/bubble/download_toolbar_button_view.h", @@ -859,7 +860,7 @@ #include "chrome/browser/download/download_history.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_item_warning_data.h" -@@ -280,13 +279,6 @@ void DownloadsDOMHandler::SaveDangerousR +@@ -287,13 +286,6 @@ void DownloadsDOMHandler::SaveDangerousR } CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); @@ -873,7 +874,7 @@ } // "Suspicious" in this context applies to insecure as well as dangerous -@@ -540,12 +532,6 @@ void DownloadsDOMHandler::RemoveDownload +@@ -558,12 +550,6 @@ void DownloadsDOMHandler::RemoveDownload IdSet ids; for (download::DownloadItem* download : to_remove) { @@ -886,7 +887,7 @@ DownloadItemModel item_model(download); if (!item_model.ShouldShowInShelf() || download->GetState() == download::DownloadItem::IN_PROGRESS) { -@@ -685,50 +671,6 @@ void DownloadsDOMHandler::FinalizeRemova +@@ -723,54 +709,6 @@ void DownloadsDOMHandler::FinalizeRemova } } @@ -907,15 +908,19 @@ -void DownloadsDOMHandler::DangerPromptDone( - int download_id, - DownloadDangerPrompt::Action action) { -- if (action != DownloadDangerPrompt::ACCEPT) +- if (action != DownloadDangerPrompt::ACCEPT) { - return; +- } - download::DownloadItem* item = nullptr; -- if (GetMainNotifierManager()) +- if (GetMainNotifierManager()) { - item = GetMainNotifierManager()->GetDownload(download_id); -- if (!item && GetOriginalNotifierManager()) +- } +- if (!item && GetOriginalNotifierManager()) { - item = GetOriginalNotifierManager()->GetDownload(download_id); -- if (!item || item->IsDone()) +- } +- if (!item || item->IsDone()) { - return; +- } - CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); - - // If a download is insecure, validate that first. Is most cases, insecure @@ -936,7 +941,7 @@ - bool DownloadsDOMHandler::IsDeletingHistoryAllowed() { content::DownloadManager* manager = GetMainNotifierManager(); - return manager && + return manager && Profile::FromBrowserContext(manager->GetBrowserContext()) --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h @@ -12,7 +12,6 @@ @@ -947,7 +952,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" -@@ -102,18 +101,6 @@ class DownloadsDOMHandler : public conte +@@ -104,18 +103,6 @@ class DownloadsDOMHandler : public conte // null-checking |original_notifier_|. content::DownloadManager* GetOriginalNotifierManager() const; @@ -1031,7 +1036,7 @@ - ui_manager->CreateBlockingPage( - web_contents, main_frame_url, {resource}, - /*forward_extension_event=*/false, -- /*blocked_page_shown_timestamp=*/absl::nullopt)); +- /*blocked_page_shown_timestamp=*/std::nullopt)); -} - std::unique_ptr CreateEnterpriseBlockPage( @@ -1167,7 +1172,7 @@ html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -102,7 +102,6 @@ +@@ -103,7 +103,6 @@ #include "components/pdf/common/constants.h" #include "components/permissions/features.h" #include "components/safe_browsing/buildflags.h" @@ -1175,7 +1180,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/subresource_filter/content/renderer/subresource_filter_agent.h" #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h" -@@ -458,12 +457,8 @@ void ChromeContentRendererClient::Render +@@ -467,12 +466,8 @@ void ChromeContentRendererClient::Render subresource_filter_ruleset_dealer_ = std::make_unique(); 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 5e447356..833b8c8d 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 -@@ -151,10 +151,10 @@ const size_t kMaxHostLength = 4096; +@@ -150,10 +150,10 @@ const size_t kMaxHostLength = 4096; // 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 f3d95922..cd9263e6 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 -@@ -460,14 +460,6 @@ group("gn_all") { +@@ -459,14 +459,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 72b9464e..13fe08b5 100644 --- a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch +++ b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch @@ -90,7 +90,7 @@ by default. // once per machine. --- a/chrome/browser/extensions/install_signer.cc +++ b/chrome/browser/extensions/install_signer.cc -@@ -63,7 +63,7 @@ const int kSignatureFormatVersion = 2; +@@ -64,7 +64,7 @@ const int kSignatureFormatVersion = 2; const size_t kSaltBytes = 32; const char kBackendUrl[] = @@ -378,9 +378,9 @@ by default. const char kDefaultInsecureServerUrl[] = "http://clientservices.googleapis.com/chrome-variations/seed"; ---- a/content/browser/speech/speech_recognition_engine.cc -+++ b/content/browser/speech/speech_recognition_engine.cc -@@ -33,7 +33,7 @@ namespace content { +--- a/content/browser/speech/network_speech_recognition_engine_impl.cc ++++ b/content/browser/speech/network_speech_recognition_engine_impl.cc +@@ -34,7 +34,7 @@ namespace content { namespace { const char kWebServiceBaseUrl[] = @@ -668,7 +668,7 @@ by default. std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) { --- a/remoting/protocol/jingle_messages.cc +++ b/remoting/protocol/jingle_messages.cc -@@ -26,7 +26,7 @@ const char kJabberNamespace[] = "jabber: +@@ -28,7 +28,7 @@ const char kJabberNamespace[] = "jabber: const char kJingleNamespace[] = "urn:xmpp:jingle:1"; // Namespace for transport messages when using standard ICE. 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 b73a518e..0d90b35b 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future). IncidentReportingService::IncidentReportingService( --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -322,7 +322,7 @@ SafeBrowsingUIManager* SafeBrowsingServi +@@ -333,7 +333,7 @@ SafeBrowsingUIManager* SafeBrowsingServi } void SafeBrowsingService::RegisterAllDelayedAnalysis() { diff --git a/patches/core/ungoogled-chromium/block-requests.patch b/patches/core/ungoogled-chromium/block-requests.patch index 9d53209d..7ca58019 100644 --- a/patches/core/ungoogled-chromium/block-requests.patch +++ b/patches/core/ungoogled-chromium/block-requests.patch @@ -28,7 +28,7 @@ // via the feature params. --- a/chrome/browser/search/background/ntp_background_service.cc +++ b/chrome/browser/search/background/ntp_background_service.cc -@@ -97,6 +97,7 @@ void NtpBackgroundService::Shutdown() { +@@ -99,6 +99,7 @@ void NtpBackgroundService::Shutdown() { } void NtpBackgroundService::FetchCollectionInfo() { diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index 8629f94e..e07f8b71 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -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 -@@ -837,6 +837,7 @@ ChildProcessSecurityPolicyImpl::ChildPro +@@ -836,6 +836,7 @@ ChildProcessSecurityPolicyImpl::ChildPro RegisterWebSafeScheme(url::kWssScheme); #endif // BUILDFLAG(ENABLE_WEBSOCKETS) RegisterWebSafeScheme(url::kDataScheme); @@ -70,7 +70,7 @@ // other origins, so we should not treat them as web safe. Remove callers of --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -981,6 +981,8 @@ component("net") { +@@ -988,6 +988,8 @@ component("net") { "url_request/referrer_policy.h", "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", @@ -204,15 +204,15 @@ const char kUuidInPackageScheme[] = "uuid-in-package"; --- a/url/url_constants.h +++ b/url/url_constants.h -@@ -48,6 +48,8 @@ COMPONENT_EXPORT(URL) extern const char - COMPONENT_EXPORT(URL) extern const char16_t kMailToScheme16[]; - COMPONENT_EXPORT(URL) extern const char kTelScheme[]; - COMPONENT_EXPORT(URL) extern const char16_t kTelScheme16[]; -+COMPONENT_EXPORT(URL) extern const char kTraceScheme[]; -+COMPONENT_EXPORT(URL) extern const char16_t kTraceScheme16[]; - COMPONENT_EXPORT(URL) extern const char kUrnScheme[]; - COMPONENT_EXPORT(URL) extern const char16_t kUrnScheme16[]; - COMPONENT_EXPORT(URL) extern const char kUuidInPackageScheme[]; +@@ -45,6 +45,8 @@ inline constexpr char kMailToScheme[] = + inline constexpr char16_t kMailToScheme16[] = u"mailto"; + inline constexpr char kTelScheme[] = "tel"; + inline constexpr char16_t kTelScheme16[] = u"tel"; ++inline constexpr char kTraceScheme[] = "trk"; ++inline constexpr char16_t kTraceScheme16[] = u"trk"; + inline constexpr char kUrnScheme[] = "urn"; + inline constexpr char16_t kUrnScheme16[] = u"urn"; + inline constexpr char kUuidInPackageScheme[] = "uuid-in-package"; --- a/url/url_util.cc +++ b/url/url_util.cc @@ -78,6 +78,7 @@ struct SchemeRegistry { diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index d92a5f2e..bf1b3cdb 100644 --- a/patches/core/ungoogled-chromium/disable-crash-reporter.patch +++ b/patches/core/ungoogled-chromium/disable-crash-reporter.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -2501,24 +2501,6 @@ void ChromeContentBrowserClient::AppendE +@@ -2514,24 +2514,6 @@ void ChromeContentBrowserClient::AppendE command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -29,7 +29,7 @@ if (logging::DialogsAreSuppressed()) --- a/components/crash/core/app/crashpad.cc +++ b/components/crash/core/app/crashpad.cc -@@ -74,6 +74,12 @@ void InitializeDatabasePath(const base:: +@@ -81,6 +81,12 @@ void InitializeDatabasePath(const base:: } bool InitializeCrashpadImpl(bool initial_client, @@ -44,7 +44,7 @@ const base::FilePath& exe_path, --- a/components/gwp_asan/client/gwp_asan.cc +++ b/components/gwp_asan/client/gwp_asan.cc -@@ -238,6 +238,11 @@ bool IsMutuallyExclusiveFeatureAllowed(c +@@ -239,6 +239,11 @@ bool IsMutuallyExclusiveFeatureAllowed(c // Exported for testing. GWP_ASAN_EXPORT std::optional GetAllocatorSettings( diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index 4944115e..be732986 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -24,8 +24,8 @@ - #if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) #include "chrome/common/bound_session_request_throttled_handler.h" - #include "components/signin/public/base/signin_switches.h" -@@ -152,65 +148,6 @@ void GoogleURLLoaderThrottle::DetachFrom + #include "net/cookies/cookie_util.h" +@@ -148,66 +144,6 @@ void GoogleURLLoaderThrottle::DetachFrom void GoogleURLLoaderThrottle::WillStartRequest( network::ResourceRequest* request, bool* defer) { @@ -69,7 +69,8 @@ - is_main_frame_navigation_ = - request->is_outermost_main_frame && - request->destination == network::mojom::RequestDestination::kDocument; -- if (switches::IsBoundSessionCredentialsEnabled() && request->SendsCookies()) { +- sends_cookies_ = request->SendsCookies(); +- if (sends_cookies_) { - RequestBoundSessionStatus status = GetRequestBoundSessionStatus( - request->url, dynamic_params_->bound_session_throttler_params.get()); - if (IsCoveredRequestBoundSessionStatus(status)) { @@ -91,7 +92,7 @@ } void GoogleURLLoaderThrottle::WillRedirectRequest( -@@ -220,95 +157,12 @@ void GoogleURLLoaderThrottle::WillRedire +@@ -217,95 +153,12 @@ void GoogleURLLoaderThrottle::WillRedire std::vector* to_be_removed_headers, net::HttpRequestHeaders* modified_headers, net::HttpRequestHeaders* modified_cors_exempt_headers) { @@ -127,7 +128,7 @@ - } -#endif -#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) -- if (switches::IsBoundSessionCredentialsEnabled()) { +- if (sends_cookies_) { - RequestBoundSessionStatus status = GetRequestBoundSessionStatus( - redirect_info->new_url, - dynamic_params_->bound_session_throttler_params.get()); diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index e3631beb..bdbf4a35 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 -@@ -364,7 +364,6 @@ if (!is_android && !is_mac) { +@@ -369,7 +369,6 @@ if (!is_android && !is_mac) { } data_deps += [ @@ -15,7 +15,7 @@ "//third_party/widevine/cdm", ] if (invoker.collect_inputs_only) { -@@ -1210,7 +1209,6 @@ if (is_win) { +@@ -1215,7 +1214,6 @@ if (is_win) { ":optimization_guide_library", ":swiftshader_library", ":widevine_cdm_library", diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch index 0704b6fa..942236e3 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -9,17 +9,6 @@ BASE_FEATURE(kAttributionReportingTriggerContextId, "AttributionReportingTriggerContextId", ---- a/components/privacy_sandbox/privacy_sandbox_prefs.cc -+++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc -@@ -12,7 +12,7 @@ namespace privacy_sandbox { - - void RegisterProfilePrefs(PrefRegistrySimple* registry) { - registry->RegisterBooleanPref( -- prefs::kPrivacySandboxApisEnabled, true, -+ prefs::kPrivacySandboxApisEnabled, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterBooleanPref(prefs::kPrivacySandboxM1ConsentDecisionMade, - false); --- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc +++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc @@ -123,7 +123,7 @@ std::set GetTopi diff --git a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch index 2f0263f8..cf3a0743 100644 --- a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch +++ b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch @@ -116,7 +116,7 @@ --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -101,7 +101,7 @@ void RegisterBrowserUserPrefs(user_prefs +@@ -100,7 +100,7 @@ void RegisterBrowserUserPrefs(user_prefs registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string()); registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false); registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls); diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index 47632723..42bed4dc 100644 --- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch +++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc +++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc -@@ -725,12 +725,6 @@ std::vector ChromeContentBr +@@ -707,12 +707,6 @@ std::vector ChromeContentBr GetOriginsRequiringDedicatedProcess() { std::vector list; @@ -17,7 +17,7 @@ --- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc +++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc -@@ -285,17 +285,7 @@ bool ChromeContentVerifierDelegate::IsFr +@@ -303,17 +303,7 @@ bool ChromeContentVerifierDelegate::IsFr // between which extensions are considered in-store. // See https://crbug.com/766806 for details. if (!InstallVerifier::IsFromStore(extension, context_)) { diff --git a/patches/core/ungoogled-chromium/doh-changes.patch b/patches/core/ungoogled-chromium/doh-changes.patch index 05bb4183..3f874595 100644 --- a/patches/core/ungoogled-chromium/doh-changes.patch +++ b/patches/core/ungoogled-chromium/doh-changes.patch @@ -1,6 +1,6 @@ --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -382,12 +382,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm +@@ -363,12 +363,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm // Enable DNS over HTTPS (DoH). BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", diff --git a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch index c14798b0..dac7012e 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/BUILD.gn +++ b/chrome/BUILD.gn -@@ -929,8 +929,6 @@ if (is_win) { +@@ -934,8 +934,6 @@ if (is_win) { bundle_data("chrome_framework_resources") { sources = [ @@ -14,7 +14,7 @@ # from disk image and Keystone promotion (if so enabled). It --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -851,10 +851,6 @@ static_library("browser") { +@@ -847,10 +847,6 @@ static_library("browser") { "navigation_predictor/navigation_predictor_metrics_document_data.h", "navigation_predictor/navigation_predictor_preconnect_client.cc", "navigation_predictor/navigation_predictor_preconnect_client.h", @@ -25,7 +25,7 @@ "navigation_predictor/search_engine_preconnector.cc", "navigation_predictor/search_engine_preconnector.h", "net/chrome_mojo_proxy_resolver_factory.cc", -@@ -965,10 +961,6 @@ static_library("browser") { +@@ -963,10 +959,6 @@ static_library("browser") { "optimization_guide/chrome_prediction_model_store.h", "optimization_guide/model_execution/chrome_on_device_model_service_controller.cc", "optimization_guide/model_execution/chrome_on_device_model_service_controller.h", @@ -38,7 +38,7 @@ "optimization_guide/optimization_guide_keyed_service.cc", --- a/chrome/browser/navigation_predictor/navigation_predictor.cc +++ b/chrome/browser/navigation_predictor/navigation_predictor.cc -@@ -17,8 +17,6 @@ +@@ -18,8 +18,6 @@ #include "base/time/default_tick_clock.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" @@ -47,7 +47,7 @@ #include "chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_manager_factory.h" #include "chrome/browser/preloading/preloading_prefs.h" #include "chrome/browser/profiles/profile.h" -@@ -93,11 +91,6 @@ base::TimeDelta MLModelExecutionTimerSta +@@ -95,11 +93,6 @@ base::TimeDelta MLModelExecutionTimerSta return base::Milliseconds(timer_start_delay); } @@ -57,9 +57,9 @@ - return base::Milliseconds(timer_interval); -} - } // namespace - -@@ -317,69 +310,6 @@ void NavigationPredictor::ProcessPointer + bool MaySendTraffic() { + // TODO(b/290223353): Due to concerns about the amount of traffic this feature +@@ -363,69 +356,6 @@ void NavigationPredictor::ProcessPointer } void NavigationPredictor::OnMLModelExecutionTimerFired() { @@ -131,7 +131,7 @@ void NavigationPredictor::SetModelScoreCallbackForTesting( --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -92,7 +92,6 @@ +@@ -93,7 +93,6 @@ #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h" #include "chrome/browser/metrics/variations/google_groups_updater_service_factory.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" @@ -139,7 +139,7 @@ #include "chrome/browser/net/dns_probe_service_factory.h" #include "chrome/browser/net/profile_network_context_service_factory.h" #include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h" -@@ -919,7 +918,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -933,7 +932,6 @@ void ChromeBrowserMainExtraPartsProfiles #endif ModelTypeStoreServiceFactory::GetInstance(); NavigationPredictorKeyedServiceFactory::GetInstance(); @@ -147,7 +147,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) NearbySharingServiceFactory::GetInstance(); if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) { -@@ -966,9 +964,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -980,9 +978,6 @@ void ChromeBrowserMainExtraPartsProfiles } #endif OpenerHeuristicServiceFactory::GetInstance(); @@ -167,7 +167,7 @@ #include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/delete_profile_helper.h" -@@ -1550,9 +1549,6 @@ void ProfileManager::DoFinalInitForServi +@@ -1545,9 +1544,6 @@ void ProfileManager::DoFinalInitForServi // Ensure NavigationPredictorKeyedService is started. NavigationPredictorKeyedServiceFactory::GetForProfile(profile); @@ -188,58 +188,6 @@ } // ---- a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc -+++ b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc -@@ -39,7 +39,6 @@ - #include "components/omnibox/browser/autocomplete_match.h" - #include "components/omnibox/browser/autocomplete_provider.h" - #include "components/omnibox/browser/autocomplete_result.h" --#include "components/omnibox/browser/autocomplete_scoring_model_service.h" - #include "components/omnibox/browser/omnibox_field_trial.h" - #include "components/search_engines/template_url.h" - #include "content/public/browser/web_ui.h" -@@ -498,31 +497,12 @@ void OmniboxPageHandler::StartOmniboxQue - } - - void OmniboxPageHandler::GetMlModelVersion(GetMlModelVersionCallback callback) { -- if (auto* service = GetMlService()) { -- auto version = service->GetModelVersion(); -- if (version == -1) { -- service->AddOnModelUpdatedCallback( -- base::BindOnce(&OmniboxPageHandler::GetMlModelVersion, -- weak_factory_.GetWeakPtr(), std::move(callback))); -- } else { -- std::move(callback).Run(version); -- } -- } else { - std::move(callback).Run(-1); -- } - } - - void OmniboxPageHandler::StartMl(mojom::SignalsPtr mojom_signals, - StartMlCallback callback) { -- if (auto* service = GetMlService()) { -- AutocompleteMatch::ScoringSignals signals = -- mojo::ConvertTo(mojom_signals); -- std::vector result = -- service->BatchScoreAutocompleteUrlMatchesSync({&signals}); -- std::move(callback).Run(result.size() ? result[0].value_or(-1) : -1); -- } else { - std::move(callback).Run(-1); -- } - } - - std::unique_ptr OmniboxPageHandler::CreateController( -@@ -547,8 +527,5 @@ OmniboxPageHandler::GetAutocompleteContr - } - - AutocompleteScoringModelService* OmniboxPageHandler::GetMlService() { -- return OmniboxFieldTrial::IsMlUrlScoringEnabled() -- ? AutocompleteScoringModelServiceFactory::GetInstance() -- ->GetForProfile(profile_) -- : nullptr; -+ return nullptr; - } --- a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc +++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc @@ -39,13 +39,6 @@ void AccessibilityMainHandler::RegisterM @@ -370,7 +318,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/views/side_panel/read_anything/read_anything_controller.h" -@@ -204,15 +202,6 @@ ReadAnythingUntrustedPageHandler::ReadAn +@@ -206,15 +204,6 @@ ReadAnythingUntrustedPageHandler::ReadAn highlightGranularity); } @@ -386,25 +334,9 @@ OnActiveWebContentsChanged(); } ---- a/chrome/test/BUILD.gn -+++ b/chrome/test/BUILD.gn -@@ -3107,13 +3107,6 @@ if (!is_android) { - "//pdf/loader", - ] - -- # Add a data dependency for pdf_extension_accessibility_test.cc to notify -- # testing builders that this test needs this library, which will need to -- # be downloaded from CIPD as defined in //DEPS. -- if (is_linux || is_mac) { -- data_deps += [ "//third_party/screen-ai:screen_ai" ] -- } -- - if (enable_printing) { - sources += [ "../browser/pdf/pdf_extension_printing_test.cc" ] - --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn -@@ -398,7 +398,7 @@ source_set("lib") { +@@ -407,7 +407,7 @@ source_set("lib") { } } @@ -425,7 +357,7 @@ python_library("fixtures") { --- a/components/omnibox/browser/autocomplete_classifier.cc +++ b/components/omnibox/browser/autocomplete_classifier.cc -@@ -97,8 +97,6 @@ void AutocompleteClassifier::Classify( +@@ -99,8 +99,6 @@ void AutocompleteClassifier::Classify( metrics::OmniboxEventProto::PageClassification page_classification, AutocompleteMatch* match, GURL* alternate_nav_url) { @@ -434,34 +366,6 @@ DCHECK(!inside_classify_); base::AutoReset reset(&inside_classify_, true); AutocompleteInput input(text, page_classification, *scheme_classifier_); ---- a/components/omnibox/browser/autocomplete_controller.cc -+++ b/components/omnibox/browser/autocomplete_controller.cc -@@ -46,7 +46,6 @@ - #include "components/omnibox/browser/autocomplete_match_type.h" - #include "components/omnibox/browser/autocomplete_provider.h" - #include "components/omnibox/browser/autocomplete_provider_client.h" --#include "components/omnibox/browser/autocomplete_scoring_model_service.h" - #include "components/omnibox/browser/autocomplete_scoring_signals_annotator.h" - #include "components/omnibox/browser/bookmark_provider.h" - #include "components/omnibox/browser/bookmark_scoring_signals_annotator.h" ---- a/components/services/screen_ai/buildflags/features.gni -+++ b/components/services/screen_ai/buildflags/features.gni -@@ -8,12 +8,12 @@ import("//build/config/sanitizers/saniti - - declare_args() { - # Screen AI service is only supported on desktop platforms. -- enable_screen_ai_service = is_linux || is_mac || is_chromeos || is_win -+ enable_screen_ai_service = false - - # Screen AI library is not yet available for browser tests on Windows and - # ChromeOS. -- enable_screen_ai_browsertests = is_linux || is_mac -+ enable_screen_ai_browsertests = false - - # Screen AI library is not available for MSAN and UBSAN. -- use_fake_screen_ai = is_msan || is_ubsan || is_ubsan_vptr || is_ubsan_security -+ use_fake_screen_ai = false - } --- a/components/update_client/BUILD.gn +++ b/components/update_client/BUILD.gn @@ -312,8 +312,6 @@ source_set("unit_tests") { @@ -475,7 +379,7 @@ fuzzer_test("update_client_protocol_serializer_fuzzer") { --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -736,10 +736,6 @@ if (is_apple) { +@@ -773,10 +773,6 @@ if (is_apple) { deps = [ "//third_party/icu:icudata" ] } @@ -486,9 +390,29 @@ if (v8_use_external_startup_data) { public_deps += [ "//v8" ] if (use_v8_context_snapshot) { +--- a/services/screen_ai/buildflags/features.gni ++++ b/services/screen_ai/buildflags/features.gni +@@ -7,14 +7,13 @@ import("//build/config/sanitizers/saniti + + declare_args() { + # Screen AI service is only supported on desktop platforms. +- enable_screen_ai_service = is_linux || is_mac || is_chromeos || is_win ++ enable_screen_ai_service = false + + # Screen AI library is not yet available for browser tests on ChromeOS. + # TODO(b/40267312): Expand this browser test for all supported targets. + enable_screen_ai_browsertests = +- is_linux || (is_mac && (target_cpu == "arm64" || target_cpu == "x64")) || +- (is_win && (target_cpu == "x64" || target_cpu == "x86")) ++ false + + # Screen AI library is not available for MSAN and UBSAN. +- use_fake_screen_ai = is_msan || is_ubsan || is_ubsan_vptr || is_ubsan_security ++ use_fake_screen_ai = false + } --- a/third_party/devtools-frontend/src/BUILD.gn +++ b/third_party/devtools-frontend/src/BUILD.gn -@@ -13,7 +13,6 @@ import("./third_party/blink/public/publi +@@ -14,7 +14,6 @@ import("./third_party/typescript/typescr devtools_frontend_resources_deps = [ "front_end", @@ -496,6 +420,16 @@ ] group("devtools_all_files") { +--- a/third_party/devtools-frontend/src/front_end/BUILD.gn ++++ b/third_party/devtools-frontend/src/front_end/BUILD.gn +@@ -185,7 +185,6 @@ group("unittests") { + "panels/sources/components:unittests", + "panels/timeline:unittests", + "panels/timeline/components:unittests", +- "panels/timeline/fixtures/traces", + "panels/timeline/track_appenders:unittests", + "panels/utils:unittests", + "panels/web_audio:unittests", --- a/third_party/puffin/BUILD.gn +++ b/third_party/puffin/BUILD.gn @@ -115,7 +115,6 @@ executable("puffin_unittest") { diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index 214d4c00..1c585999 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -631,8 +631,6 @@ static_library("browser") { +@@ -635,8 +635,6 @@ static_library("browser") { "internal_auth.h", "interstitials/chrome_settings_page_helper.cc", "interstitials/chrome_settings_page_helper.h", @@ -10,8 +10,8 @@ - "interstitials/enterprise_util.h", "invalidation/profile_invalidation_provider_factory.cc", "invalidation/profile_invalidation_provider_factory.h", - "ip_protection/ip_protection_config_http.cc", -@@ -3779,9 +3777,6 @@ static_library("browser") { + "k_anonymity_service/k_anonymity_service_client.cc", +@@ -3787,9 +3785,6 @@ static_library("browser") { "enterprise/connectors/analysis/analysis_service_settings.h", "enterprise/connectors/analysis/analysis_settings.cc", "enterprise/connectors/analysis/analysis_settings.h", @@ -21,7 +21,7 @@ "enterprise/connectors/analysis/content_analysis_dialog.cc", "enterprise/connectors/analysis/content_analysis_dialog.h", "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc", -@@ -4088,10 +4083,6 @@ static_library("browser") { +@@ -4098,10 +4093,6 @@ static_library("browser") { "new_tab_page/modules/recipes/recipes_service_factory.h", "new_tab_page/modules/recipes/time_format_util.cc", "new_tab_page/modules/recipes/time_format_util.h", @@ -32,7 +32,7 @@ "new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.cc", "new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.h", "new_tab_page/modules/v2/tab_resumption/tab_resumption_page_handler.cc", -@@ -4569,7 +4560,6 @@ static_library("browser") { +@@ -4579,7 +4570,6 @@ static_library("browser") { "//chrome/browser/new_tab_page/modules/history_clusters/discount:mojo_bindings", "//chrome/browser/new_tab_page/modules/photos:mojo_bindings", "//chrome/browser/new_tab_page/modules/recipes:mojo_bindings", @@ -40,7 +40,7 @@ "//chrome/browser/new_tab_page/modules/v2/history_clusters:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/tab_resumption:mojo_bindings", "//chrome/browser/policy:path_parser", -@@ -6392,10 +6382,6 @@ static_library("browser") { +@@ -6421,10 +6411,6 @@ static_library("browser") { sources += [ "enterprise/chrome_browser_main_extra_parts_enterprise.cc", "enterprise/chrome_browser_main_extra_parts_enterprise.h", @@ -51,7 +51,7 @@ "enterprise/connectors/device_trust/attestation/browser/attestation_switches.cc", "enterprise/connectors/device_trust/attestation/browser/attestation_switches.h", "enterprise/connectors/device_trust/attestation/browser/attester.h", -@@ -7948,9 +7934,14 @@ static_library("browser") { +@@ -7990,9 +7976,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", @@ -69,7 +69,7 @@ sources += [ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5076,11 +5076,13 @@ ChromeContentBrowserClient::CreateThrott +@@ -5124,11 +5124,13 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -83,9 +83,9 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: -@@ -6903,26 +6905,7 @@ ChromeContentBrowserClient::GetSafeBrows - ? content::BrowserThread::UI - : content::BrowserThread::IO); +@@ -6957,26 +6959,7 @@ ChromeContentBrowserClient::GetSafeBrows + const std::vector& allowlist_domains) { + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - // Should not bypass safe browsing check if the check is for enterprise - // lookup. @@ -111,7 +111,7 @@ } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -6943,11 +6926,6 @@ ChromeContentBrowserClient::GetUrlLookup +@@ -6997,11 +6980,6 @@ ChromeContentBrowserClient::GetUrlLookup GetForProfile(profile); } #endif @@ -123,7 +123,7 @@ return nullptr; } -@@ -6959,32 +6937,7 @@ ChromeContentBrowserClient::GetAsyncChec +@@ -7013,32 +6991,7 @@ ChromeContentBrowserClient::GetAsyncChec safe_browsing::hash_realtime_utils::HashRealTimeSelection hash_realtime_selection, int frame_tree_node_id) { @@ -198,7 +198,7 @@ RetryDownload(model.get(), command); --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -148,7 +148,6 @@ using content::DownloadManager; +@@ -149,7 +149,6 @@ using content::DownloadManager; using download::DownloadItem; using download::DownloadPathReservationTracker; using download::PathValidationResult; @@ -206,7 +206,7 @@ using ConnectionType = net::NetworkChangeNotifier::ConnectionType; #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -642,15 +641,6 @@ bool ChromeDownloadManagerDelegate::Shou +@@ -645,15 +644,6 @@ bool ChromeDownloadManagerDelegate::Shou #endif bool should_open = download_prefs_->IsAutoOpenEnabled(url, path); @@ -222,7 +222,7 @@ return should_open; } -@@ -1607,7 +1597,6 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -1633,7 +1623,6 @@ void ChromeDownloadManagerDelegate::OnDo DownloadItemModel model(item); model.DetermineAndSetShouldPreferOpeningInBrowser( target_info.target_path, target_info.is_filetype_handled_safely); @@ -230,7 +230,7 @@ } if (ShouldBlockFile(item, target_info.danger_type)) { MaybeReportDangerousDownloadBlocked( -@@ -1688,59 +1677,6 @@ bool ChromeDownloadManagerDelegate::IsOp +@@ -1714,59 +1703,6 @@ bool ChromeDownloadManagerDelegate::IsOp bool ChromeDownloadManagerDelegate::ShouldBlockFile( download::DownloadItem* item, download::DownloadDangerType danger_type) const { @@ -290,7 +290,7 @@ return false; } -@@ -1755,7 +1691,6 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1781,7 +1717,6 @@ void ChromeDownloadManagerDelegate::Mayb service->MaybeSendDangerousDownloadOpenedReport(download, show_download_in_folder); } @@ -298,7 +298,7 @@ if (!download->GetAutoOpened()) { download::DownloadContent download_content = download::DownloadContentFromMimeType(download->GetMimeType(), false); -@@ -1763,6 +1698,7 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1789,6 +1724,7 @@ void ChromeDownloadManagerDelegate::Mayb download->GetDangerType(), download_content, base::Time::Now(), download->GetEndTime(), show_download_in_folder); } @@ -306,7 +306,7 @@ } void ChromeDownloadManagerDelegate::CheckDownloadAllowed( -@@ -1820,8 +1756,7 @@ void ChromeDownloadManagerDelegate::Chec +@@ -1846,8 +1782,7 @@ void ChromeDownloadManagerDelegate::Chec DCHECK(download_item); DCHECK(download_item->IsSavePackageDownload()); @@ -318,7 +318,7 @@ --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -903,30 +903,6 @@ void DownloadItemModel::ExecuteCommand(D +@@ -910,30 +910,6 @@ void DownloadItemModel::ExecuteCommand(D } TailoredWarningType DownloadItemModel::GetTailoredWarningType() const { @@ -359,7 +359,7 @@ #include "components/safe_browsing/content/browser/download/download_stats.h" void RecordDownloadSource(ChromeDownloadSource source) { -@@ -32,9 +33,6 @@ void MaybeRecordDangerousDownloadWarning +@@ -33,9 +34,6 @@ void MaybeRecordDangerousDownloadWarning base::UmaHistogramEnumeration("SBClientDownload.TailoredWarningType", model.GetTailoredWarningType()); #endif // BUILDFLAG(IS_ANDROID) @@ -371,7 +371,7 @@ } --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -999,12 +999,6 @@ void DownloadTargetDeterminer::CheckVisi +@@ -1003,12 +1003,6 @@ void DownloadTargetDeterminer::CheckVisi bool visited_referrer_before) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); @@ -384,7 +384,7 @@ danger_level_ = GetDangerLevel( visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER); if (danger_level_ != DownloadFileType::NOT_DANGEROUS && -@@ -1285,14 +1279,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1289,14 +1283,7 @@ DownloadFileType::DangerLevel DownloadTa std::optional DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { @@ -424,7 +424,7 @@ -#include "chrome/browser/safe_browsing/download_protection/check_client_download_request.h" #include "chrome/grit/generated_resources.h" #include "components/enterprise/buildflags/buildflags.h" - #include "components/enterprise/common/proto/connectors.pb.h" + #include "components/enterprise/common/files_scan_data.h" --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc @@ -119,7 +119,7 @@ ContentAnalysisDownloadsDelegate::GetCus @@ -522,7 +522,7 @@ void OnGotFileInfo( --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -450,19 +450,6 @@ std::optional ConnectorsSer +@@ -452,37 +452,8 @@ std::optional ConnectorsSer return std::nullopt; } @@ -539,9 +539,27 @@ - prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode)); -} - - ConnectorsManager* ConnectorsService::ConnectorsManagerForTesting() { - return connectors_manager_.get(); + std::string ConnectorsService::GetRealTimeUrlCheckIdentifier() const { +- auto dm_token = +- GetDmToken(prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope); +- if (!dm_token) { + return std::string(); +- } +- +- Profile* profile = Profile::FromBrowserContext(context_); +- if (dm_token->scope == policy::POLICY_SCOPE_MACHINE) { +- return GetClientId(profile); +- } +- +- auto* identity_manager = IdentityManagerFactory::GetForProfile(profile); +- if (!identity_manager) { +- return std::string(); +- } +- +- return safe_browsing::GetProfileEmail(identity_manager); } + + ConnectorsManager* ConnectorsService::ConnectorsManagerForTesting() { --- a/chrome/browser/enterprise/connectors/connectors_service.h +++ b/chrome/browser/enterprise/connectors/connectors_service.h @@ -88,12 +88,6 @@ class ConnectorsService : public KeyedSe @@ -554,9 +572,9 @@ - safe_browsing::EnterpriseRealTimeUrlCheckMode GetAppliedRealTimeUrlCheck() - const; - - // 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. + // Returns the profile email if real-time URL check is set for the profile, + // the device ID if it is set for the device, or an empty string if it is + // unset. --- a/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/BUILD.gn +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/BUILD.gn @@ -35,7 +35,6 @@ source_set("network") { @@ -614,7 +632,7 @@ signals.Set(device_signals::names::kBuiltInDnsClientEnabled, --- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc +++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc -@@ -507,8 +507,7 @@ void RealtimeReportingClient::ReportEven +@@ -500,8 +500,7 @@ void RealtimeReportingClient::ReportEven } std::string RealtimeReportingClient::GetProfileUserName() const { @@ -643,6 +661,61 @@ } const base::Value::List* enabled_opt_in_events_value = +--- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc ++++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc +@@ -49,20 +49,6 @@ void RunPendingNavigationCallback( + auto* user_data = GetUserData(web_contents); + DCHECK(user_data); + +- // TODO: Move this logic out of this class and into DataProtectionPageUserData +- if (!user_data->watermark_text().empty() && user_data->rt_lookup_response() && +- !user_data->rt_lookup_response()->threat_info().empty() && +- user_data->rt_lookup_response()->threat_info(0).verdict_type() == +- safe_browsing::RTLookupResponse::ThreatInfo::SAFE) { +- // For warn/block+watermark verdicts, a security event is reported as part +- // of the interstitial page appearing. For SAFE verdicts no interstitial is +- // shown, so the report indicating a watermark was shown to the user must be +- // done separately here. +- MaybeTriggerUrlFilteringInterstitialEvent( +- web_contents, web_contents->GetLastCommittedURL(), +- /*threat_type=*/"", *user_data->rt_lookup_response()); +- } +- + std::move(callback).Run(user_data->watermark_text()); + } + +@@ -218,16 +204,6 @@ void DataProtectionNavigationObserver::C + std::move(callback).Run(std::string()); + return; + } +- +- // GetForProfile() return nullptr if enterprise policies are not set. +- auto* lookup_service = safe_browsing:: +- ChromeEnterpriseRealTimeUrlLookupServiceFactory::GetForProfile(profile); +- if (lookup_service) { +- enterprise_data_protection::DataProtectionNavigationObserver:: +- CreateForNavigationHandle(*navigation_handle, lookup_service, +- navigation_handle->GetWebContents(), +- std::move(callback)); +- } + } + + // static +@@ -245,14 +221,7 @@ void DataProtectionNavigationObserver::G + return; + } + +- auto* lookup_service = safe_browsing:: +- ChromeEnterpriseRealTimeUrlLookupServiceFactory::GetForProfile(profile); +- if (lookup_service && web_contents->GetLastCommittedURL().is_valid()) { +- DoStringLookup(lookup_service, web_contents->GetLastCommittedURL(), +- GetIdentifier(profile), std::move(callback), web_contents); +- } else { + std::move(callback).Run(std::string()); +- } + } + + DataProtectionNavigationObserver::DataProtectionNavigationObserver( --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc @@ -221,7 +221,6 @@ void ContextInfoFetcher::Fetch(ContextIn @@ -751,7 +824,7 @@ } // namespace utils --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -305,10 +305,6 @@ static_library("extensions") { +@@ -313,10 +313,6 @@ static_library("extensions") { "api/runtime/chrome_runtime_api_delegate.h", "api/safe_browsing_private/safe_browsing_private_api.cc", "api/safe_browsing_private/safe_browsing_private_api.h", @@ -762,7 +835,7 @@ "api/safe_browsing_private/safe_browsing_util.cc", "api/safe_browsing_private/safe_browsing_util.h", "api/search/search_api.cc", -@@ -647,8 +643,6 @@ static_library("extensions") { +@@ -655,8 +651,6 @@ static_library("extensions") { "menu_manager_factory.h", "navigation_extension_enabler.cc", "navigation_extension_enabler.h", @@ -773,7 +846,7 @@ "pending_extension_info.cc", --- a/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc +++ b/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -122,7 +122,6 @@ void EnsureApiBrowserContextKeyedService +@@ -123,7 +123,6 @@ void EnsureApiBrowserContextKeyedService #endif extensions::ProcessesAPI::GetFactoryInstance(); extensions::ReadingListEventRouter::GetFactoryInstance(); @@ -849,7 +922,7 @@ info.enterprise_profile_id = signals.enterprise_profile_id; --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -342,8 +342,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -341,8 +341,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; (*s_allowlist)[::kGeneratedHttpsFirstModePref] = settings_api::PrefType::kNumber; @@ -892,7 +965,7 @@ } // namespace --- a/chrome/browser/extensions/blocklist.cc +++ b/chrome/browser/extensions/blocklist.cc -@@ -204,20 +204,8 @@ Blocklist* Blocklist::Get(content::Brows +@@ -185,20 +185,8 @@ Blocklist* Blocklist::Get(content::Brows void Blocklist::GetBlocklistedIDs(const std::set& ids, GetBlocklistedIDsCallback callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -915,7 +988,7 @@ void Blocklist::GetMalwareIDs(const std::set& ids, --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc -@@ -749,81 +749,23 @@ void ChromeExtensionsBrowserClient::Noti +@@ -794,81 +794,23 @@ void ChromeExtensionsBrowserClient::Noti content::BrowserContext* context, const ExtensionId& extension_id, const std::string& code) const { @@ -998,7 +1071,7 @@ } // static -@@ -992,7 +934,6 @@ void ChromeExtensionsBrowserClient::GetW +@@ -1037,7 +979,6 @@ void ChromeExtensionsBrowserClient::GetW void ChromeExtensionsBrowserClient::CreatePasswordReuseDetectionManager( content::WebContents* web_contents) const { @@ -1023,8 +1096,16 @@ - OnBlocklistStateAdded(extension_id); } + void ExtensionService::GreylistExtensionForTest( +@@ -241,7 +239,6 @@ void ExtensionService::GreylistExtension + const BitMapBlocklistState& state) { + blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(extension_id, state, + extension_prefs_); +- OnGreylistStateAdded(extension_id, state); + } + bool ExtensionService::OnExternalExtensionUpdateUrlFound( -@@ -401,9 +399,6 @@ ExtensionService::ExtensionService( +@@ -409,9 +406,6 @@ ExtensionService::ExtensionService( safe_browsing_verdict_handler_(extension_prefs, ExtensionRegistry::Get(profile), this), @@ -1034,7 +1115,7 @@ extension_telemetry_service_verdict_handler_( extension_prefs, ExtensionRegistry::Get(profile), -@@ -936,17 +931,6 @@ bool ExtensionService::IsExtensionEnable +@@ -944,17 +938,6 @@ bool ExtensionService::IsExtensionEnable return extension_registrar_.IsExtensionEnabled(extension_id); } @@ -1052,7 +1133,7 @@ void ExtensionService::PerformActionBasedOnExtensionTelemetryServiceVerdicts( const Blocklist::BlocklistStateMap& blocklist_state_map) { DCHECK_CURRENTLY_ON(BrowserThread::UI); -@@ -956,89 +940,6 @@ void ExtensionService::PerformActionBase +@@ -964,89 +947,6 @@ void ExtensionService::PerformActionBase error_controller_->ShowErrorIfNeeded(); } @@ -1193,7 +1274,7 @@ // Performs action based on verdicts received from the Extension Telemetry // server. Currently, these verdicts are limited to off-store extensions. void PerformActionBasedOnExtensionTelemetryServiceVerdicts( -@@ -676,8 +646,6 @@ class ExtensionService : public Extensio +@@ -680,8 +650,6 @@ class ExtensionService : public Extensio SafeBrowsingVerdictHandler safe_browsing_verdict_handler_; @@ -1266,7 +1347,7 @@ } --- 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,7 +35,6 @@ +@@ -36,7 +36,6 @@ #include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -1274,7 +1355,7 @@ #include "chrome/browser/ui/file_system_access_dialogs.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pdf_util.h" -@@ -425,88 +424,6 @@ bool ShouldBlockAccessToPath(const base: +@@ -426,90 +425,6 @@ bool ShouldBlockAccessToPath(const base: return true; } @@ -1340,6 +1421,7 @@ - case Result::BLOCKED_TOO_LARGE: - case Result::BLOCKED_UNSUPPORTED_FILE_TYPE: - case Result::DANGEROUS_ACCOUNT_COMPROMISE: +- case Result::BLOCKED_SCAN_FAILED: - return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult:: - kBlock; - @@ -1352,6 +1434,7 @@ - case Result::PROMPT_FOR_SCANNING: - case Result::PROMPT_FOR_LOCAL_PASSWORD_SCANNING: - case Result::DEEP_SCANNED_FAILED: +- case Result::IMMEDIATE_DEEP_SCAN: - NOTREACHED(); - return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult:: - kAllow; @@ -1363,7 +1446,7 @@ std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey : base::StrCat({kCustomLastPickedDirectoryKey, "-", id}); -@@ -526,13 +443,7 @@ std::string_view GetGrantKeyFromGrantTyp +@@ -529,13 +444,7 @@ std::string_view GetGrantKeyFromGrantTyp bool FileHasDangerousExtension(const url::Origin& origin, const base::FilePath& path, Profile* profile) { @@ -1378,7 +1461,7 @@ } } // namespace -@@ -1591,29 +1502,6 @@ void ChromeFileSystemAccessPermissionCon +@@ -1693,29 +1602,6 @@ void ChromeFileSystemAccessPermissionCon std::move(callback)); } @@ -1410,7 +1493,7 @@ const base::FilePath& path, --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h -@@ -172,10 +172,6 @@ class ChromeFileSystemAccessPermissionCo +@@ -178,10 +178,6 @@ class ChromeFileSystemAccessPermissionCo UserAction user_action, content::GlobalRenderFrameHostId frame_id, base::OnceCallback callback) override; @@ -1423,7 +1506,7 @@ void SetLastPickedDirectory(const url::Origin& origin, --- a/chrome/browser/media/webrtc/display_media_access_handler.cc +++ b/chrome/browser/media/webrtc/display_media_access_handler.cc -@@ -25,6 +25,7 @@ +@@ -24,6 +24,7 @@ #include "chrome/browser/ui/url_identity.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" @@ -1431,7 +1514,7 @@ #include "components/url_formatter/elide_url.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/desktop_media_id.h" -@@ -122,6 +123,7 @@ void DisplayMediaAccessHandler::HandleRe +@@ -121,6 +122,7 @@ void DisplayMediaAccessHandler::HandleRe return; } @@ -1439,7 +1522,7 @@ // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Show the warning -@@ -137,6 +139,7 @@ void DisplayMediaAccessHandler::HandleRe +@@ -136,6 +138,7 @@ void DisplayMediaAccessHandler::HandleRe observer->OnDesktopCaptureRequest(); return; } @@ -1473,7 +1556,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" -@@ -878,6 +877,7 @@ autofill::LanguageCode ChromePasswordMan +@@ -898,6 +897,7 @@ autofill::LanguageCode ChromePasswordMan return autofill::LanguageCode(); } @@ -1481,7 +1564,7 @@ safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { return safe_browsing::ChromePasswordProtectionService:: -@@ -897,6 +897,7 @@ void ChromePasswordManagerClient::CheckS +@@ -917,6 +917,7 @@ void ChromePasswordManagerClient::CheckS } } #endif // defined(ON_FOCUS_PING_ENABLED) @@ -1489,7 +1572,7 @@ #if !BUILDFLAG(IS_ANDROID) void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent( -@@ -904,28 +905,10 @@ void ChromePasswordManagerClient::MaybeR +@@ -924,28 +925,10 @@ void ChromePasswordManagerClient::MaybeR bool is_federated, const url::Origin& federated_origin, const std::u16string& login_user_name) const { @@ -1518,7 +1601,7 @@ } #endif -@@ -1538,6 +1521,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1565,6 +1548,7 @@ bool ChromePasswordManagerClient::IsPass is_enabled = false; } @@ -1526,7 +1609,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 -@@ -1548,6 +1532,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1575,6 +1559,7 @@ bool ChromePasswordManagerClient::IsPass observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -1739,15 +1822,15 @@ } --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -105,6 +105,7 @@ - #include "components/policy/policy_constants.h" +@@ -108,6 +108,7 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" + #include "components/privacy_sandbox/tracking_protection_prefs.h" #include "components/proxy_config/proxy_policy_handler.h" +#include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/common/file_type_policies_prefs.h" #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" #include "components/safe_browsing/core/common/safe_browsing_prefs.h" -@@ -2204,8 +2205,6 @@ std::unique_ptrAddHandler( std::make_unique( chrome_schema)); @@ -1756,7 +1839,7 @@ handlers->AddHandler(std::make_unique()); handlers->AddHandler( std::make_unique(key::kURLBlocklist)); -@@ -2290,20 +2289,6 @@ std::unique_ptr password) { - if (DownloadUIModel* model = GetDownloadModel(id); model) { - LogDeepScanEvent(model->GetDownloadItem(), - safe_browsing::DeepScanEvent::kPromptAccepted); - safe_browsing::DownloadProtectionService::UploadForConsumerDeepScanning( -- model->GetDownloadItem(), password); +- model->GetDownloadItem(), trigger, password); - } } @@ -2164,6 +2247,38 @@ } bool DownloadBubbleContentsView::IsEncryptedArchive(const ContentId& id) { +--- a/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc ++++ b/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc +@@ -792,29 +792,6 @@ void DownloadToolbarButtonView::ShowIphP + return; + } + #endif +- +- // Notify users that we're removing the ESB deep scanning +- // prompt. Users should only see the prompt if: +- // - They're not incognito, since we don't want to imply deep scans +- // happen incognito +- // - They're ESB users, since this isn't relevant to SSB users +- // - They didn't opt-in with the friendlier settings strings, since +- // then they should know this is possible. +- // - chrome://settings/security currently shows the friendlier +- // settings strings, so that clicking "Settings" on the IPH would +- // show them strings saying this is possible. +- if (!profile->IsOffTheRecord() && +- safe_browsing::IsEnhancedProtectionEnabled(*profile->GetPrefs()) && +- !profile->GetPrefs()->GetBoolean( +- prefs::kSafeBrowsingEsbOptInWithFriendlierSettings) && +- base::FeatureList::IsEnabled( +- safe_browsing::kFriendlierSafeBrowsingSettingsEnhancedProtection) && +- browser_->window()->MaybeShowFeaturePromo( +- feature_engagement::kIPHDeepScanPromptRemovalFeature)) { +- profile->GetPrefs()->SetBoolean( +- prefs::kSafeBrowsingAutomaticDeepScanningIPHSeen, true); +- return; +- } + } + + void DownloadToolbarButtonView::OnPartialViewClosed() { --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -38,7 +38,6 @@ @@ -2201,7 +2316,7 @@ open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) || prompt_to_scan || allow_open_during_deep_scan); -@@ -1273,7 +1274,9 @@ void DownloadItemView::ShowContextMenuIm +@@ -1274,7 +1275,9 @@ void DownloadItemView::ShowContextMenuIm } void DownloadItemView::OpenDownloadDuringAsyncScanning() { @@ -2257,18 +2372,19 @@ std::unique_ptr --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -484,8 +484,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc +@@ -485,9 +485,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc } if (url.host_piece() == chrome::kChromeUIPredictorsHost) return &NewWebUI; - if (url.host_piece() == safe_browsing::kChromeUISafeBrowsingHost) -- return &NewWebUI; +- return &NewComponentUI; if (url.host_piece() == chrome::kChromeUISegmentationInternalsHost) return &NewWebUI; if (url.host_piece() == chrome::kChromeUISignInInternalsHost) --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -155,10 +155,6 @@ void MaybeReportBypassAction(download::D +@@ -156,10 +156,6 @@ void MaybeReportBypassAction(download::D if (action != WarningAction::PROCEED && action != WarningAction::DISCARD) { return; } @@ -2279,7 +2395,7 @@ } // Triggers a Trust and Safety sentiment survey (if enabled). Should be called -@@ -167,21 +163,6 @@ void MaybeReportBypassAction(download::D +@@ -168,21 +164,6 @@ void MaybeReportBypassAction(download::D void MaybeTriggerTrustSafetySurvey(download::DownloadItem* file, WarningSurface surface, WarningAction action) { @@ -2301,7 +2417,7 @@ } void RecordDownloadsPageValidatedHistogram(download::DownloadItem* item) { -@@ -285,100 +266,17 @@ void DownloadsDOMHandler::SaveDangerousR +@@ -292,100 +273,17 @@ void DownloadsDOMHandler::SaveDangerousR // downloads of certain danger types. void DownloadsDOMHandler::SaveSuspiciousRequiringGesture( const std::string& id) { @@ -2402,15 +2518,11 @@ } void DownloadsDOMHandler::DiscardDangerous(const std::string& id) { -@@ -590,19 +488,6 @@ void DownloadsDOMHandler::DeepScan(const +@@ -609,15 +507,6 @@ void DownloadsDOMHandler::DeepScan(const return; } -- if ((base::FeatureList::IsEnabled( -- safe_browsing::kDeepScanningEncryptedArchives) || -- base::FeatureList::IsEnabled( -- safe_browsing::kEncryptedArchivesMetadata)) && -- DownloadItemWarningData::IsEncryptedArchive(download)) { +- if (DownloadItemWarningData::IsEncryptedArchive(download)) { - // For encrypted archives, we need a password from the user. We will request - // this in the download bubble. - PromptForScanningInBubble(GetWebUIWebContents(), download); @@ -2422,7 +2534,7 @@ DownloadItemModel model(download); DownloadCommands commands(model.GetWeakPtr()); commands.ExecuteCommand(DownloadCommands::DEEP_SCAN); -@@ -625,10 +510,7 @@ void DownloadsDOMHandler::BypassDeepScan +@@ -640,10 +529,7 @@ void DownloadsDOMHandler::BypassDeepScan // file" which does not imply opening the file. In the old behavior, the // button says "Open anyway" so we should open the file. commands.ExecuteCommand( @@ -2434,7 +2546,7 @@ } } -@@ -639,12 +521,6 @@ void DownloadsDOMHandler::ReviewDangerou +@@ -654,12 +540,6 @@ void DownloadsDOMHandler::ReviewDangerou return; } @@ -2446,6 +2558,21 @@ - } } + void DownloadsDOMHandler::OpenEsbSettings() { +@@ -674,14 +554,7 @@ void DownloadsDOMHandler::OpenEsbSetting + + void DownloadsDOMHandler::IsEligibleForEsbPromo( + IsEligibleForEsbPromoCallback callback) { +- content::DownloadManager* manager = GetMainNotifierManager(); +- if (manager) { +- std::move(callback).Run( +- safe_browsing::SafeBrowsingService::IsUserEligibleForESBPromo( +- Profile::FromBrowserContext(manager->GetBrowserContext()))); +- } else { + std::move(callback).Run(false); +- } + } + // DownloadsDOMHandler, private: -------------------------------------------- --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc @@ -2587,7 +2714,7 @@ std::move(callback), --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -725,7 +725,6 @@ const char* const kChromeHostURLs[] = { +@@ -729,7 +729,6 @@ const char* const kChromeHostURLs[] = { kChromeUISuggestInternalsHost, #endif kChromeUINTPTilesInternalsHost, @@ -2597,7 +2724,7 @@ kChromeUITabSearchHost, --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1884,8 +1884,6 @@ if (!is_android) { +@@ -1928,8 +1928,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2606,7 +2733,7 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:test_support", -@@ -6873,8 +6871,6 @@ test("unit_tests") { +@@ -6956,8 +6954,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2617,7 +2744,7 @@ "//components/safe_browsing/content/browser/web_ui", --- a/components/enterprise/buildflags/buildflags.gni +++ b/components/enterprise/buildflags/buildflags.gni -@@ -13,17 +13,17 @@ declare_args() { +@@ -12,17 +12,17 @@ declare_args() { # Indicates support for content analysis against a cloud agent for Enterprise # Connector policies. enterprise_cloud_content_analysis = @@ -2639,7 +2766,7 @@ # The watermark is currently implemented using the views framework enterprise_watermark = -@@ -36,7 +36,7 @@ declare_args() { +@@ -35,7 +35,7 @@ declare_args() { # the fact that `enterprise_cloud_content_analysis` is a superset of # `enterprise_local_content_analysis`. enterprise_content_analysis = @@ -2650,7 +2777,7 @@ # These two flags are equivalent, but `enable_print_content_analysis` still --- a/components/password_manager/content/browser/content_password_manager_driver.cc +++ b/components/password_manager/content/browser/content_password_manager_driver.cc -@@ -525,7 +525,7 @@ void ContentPasswordManagerDriver::Check +@@ -540,7 +540,7 @@ void ContentPasswordManagerDriver::Check if (!password_manager::bad_message::CheckFrameNotPrerendering( render_frame_host_)) return; @@ -2661,7 +2788,7 @@ } --- a/components/password_manager/core/browser/password_manager_client.h +++ b/components/password_manager/core/browser/password_manager_client.h -@@ -396,11 +396,14 @@ class PasswordManagerClient { +@@ -397,11 +397,14 @@ class PasswordManagerClient { // Returns the current best guess as to the page's display language. virtual autofill::LanguageCode GetPageLanguage() const; @@ -2696,8 +2823,8 @@ +# } --- a/components/safe_browsing/content/common/safe_browsing.mojom +++ b/components/safe_browsing/content/common/safe_browsing.mojom -@@ -158,7 +158,6 @@ interface PhishingDetector { - => (PhishingDetectorResult result, string request_proto); +@@ -159,7 +159,6 @@ interface PhishingDetector { + mojo_base.mojom.ByteString request_proto); }; -[EnableIf=full_safe_browsing] @@ -2790,7 +2917,7 @@ void OhttpKeyService::Shutdown() { --- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc -@@ -248,17 +248,6 @@ void RealTimeUrlLookupService::MaybeLogP +@@ -250,17 +250,6 @@ void RealTimeUrlLookupService::MaybeLogP bool request_had_cookie, bool was_first_request, bool sent_with_token) { @@ -3052,7 +3179,7 @@ (const url::Origin& origin), --- a/content/public/browser/file_system_access_permission_context.h +++ b/content/public/browser/file_system_access_permission_context.h -@@ -122,12 +122,6 @@ class FileSystemAccessPermissionContext +@@ -128,12 +128,6 @@ class FileSystemAccessPermissionContext base::OnceCallback callback) = 0; enum class AfterWriteCheckResult { kAllow, kBlock }; @@ -3097,7 +3224,7 @@ --- a/extensions/browser/updater/update_service.cc +++ b/extensions/browser/updater/update_service.cc -@@ -133,13 +133,6 @@ void UpdateService::OnCrxStateChange(Upd +@@ -134,13 +134,6 @@ void UpdateService::OnCrxStateChange(Upd break; } diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 9e2bb128..f5e2af7b 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -182,7 +182,7 @@ } --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -282,7 +282,6 @@ +@@ -285,7 +285,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" @@ -202,7 +202,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -813,8 +813,6 @@ void DownloadItemModel::ExecuteCommand(D +@@ -818,8 +818,6 @@ void DownloadItemModel::ExecuteCommand(D #if BUILDFLAG(FULL_SAFE_BROWSING) CompleteSafeBrowsingScan(); #endif @@ -211,12 +211,14 @@ [[fallthrough]]; case DownloadCommands::KEEP: #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -881,22 +879,9 @@ void DownloadItemModel::ExecuteCommand(D +@@ -886,24 +884,9 @@ void DownloadItemModel::ExecuteCommand(D DownloadUIModel::ExecuteCommand(download_commands, command); break; case DownloadCommands::DEEP_SCAN: { - safe_browsing::DownloadProtectionService::UploadForConsumerDeepScanning( -- download_, /*password=*/std::nullopt); +- download_, +- DownloadItemWarningData::DeepScanTrigger::TRIGGER_CONSUMER_PROMPT, +- /*password=*/std::nullopt); break; } case DownloadCommands::CANCEL_DEEP_SCAN: { @@ -256,7 +258,7 @@ #include "chrome/browser/browser_process.h" --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc -@@ -44,7 +44,6 @@ +@@ -45,7 +45,6 @@ #include "components/policy/core/common/chrome_schema.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -274,7 +276,7 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/user_prefs/user_prefs.h" -@@ -380,8 +379,7 @@ std::string ConnectorsService::GetManage +@@ -382,8 +381,7 @@ std::string ConnectorsService::GetManage std::optional scope = std::nullopt; for (const char* scope_pref : @@ -284,7 +286,7 @@ ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED), ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY), ConnectorScopePref(AnalysisConnector::PRINT), -@@ -433,20 +431,6 @@ std::string ConnectorsService::GetManage +@@ -435,20 +433,6 @@ std::string ConnectorsService::GetManage std::optional ConnectorsService::GetDMTokenForRealTimeUrlCheck() const { @@ -418,11 +420,12 @@ OidcManagedProfileCreationDelegate::OidcManagedProfileCreationDelegate() = default; -@@ -32,7 +31,6 @@ void OidcManagedProfileCreationDelegate: +@@ -35,8 +34,6 @@ void OidcManagedProfileCreationDelegate: + void OidcManagedProfileCreationDelegate::CheckManagedProfileStatus( Profile* new_profile) { - // TODO(b/319477219): Add full sign in support for OIDC profiles -- CHECK(!new_profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)); +- CHECK_EQ(new_profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed), +- dasher_based_); } void OidcManagedProfileCreationDelegate::OnManagedProfileInitialized( @@ -523,15 +526,15 @@ base::StringPiece GetOAuth2MintTokenFlowVersion() { --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc -@@ -32,7 +32,6 @@ +@@ -24,7 +24,6 @@ + #include "chrome/common/pref_names.h" + #include "components/autofill/core/common/autofill_prefs.h" #include "components/prefs/pref_service.h" - #include "components/privacy_sandbox/privacy_sandbox_prefs.h" - #include "components/proxy_config/proxy_config_pref_names.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "extensions/browser/api/content_settings/content_settings_service.h" #include "extensions/browser/extension_pref_value_map.h" #include "extensions/browser/extension_pref_value_map_factory.h" -@@ -845,17 +844,6 @@ ExtensionFunction::ResponseAction SetPre +@@ -695,17 +694,6 @@ ExtensionFunction::ResponseAction SetPre base::Value(browser_pref_value->GetBool())); } @@ -549,7 +552,7 @@ prefs_helper->SetExtensionControlledPref(extension_id(), browser_pref, scope, browser_pref_value->Clone()); -@@ -943,16 +931,6 @@ ExtensionFunction::ResponseAction ClearP +@@ -793,16 +781,6 @@ ExtensionFunction::ResponseAction ClearP prefs_helper->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); @@ -622,18 +625,17 @@ #include "extensions/browser/test_event_router.h" --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -50,10 +50,8 @@ +@@ -50,9 +50,7 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/privacy_sandbox/tracking_protection_prefs.h" #include "components/proxy_config/proxy_config_pref_names.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/search_engines/default_search_manager.h" - #include "components/services/screen_ai/buildflags/buildflags.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/spellcheck/browser/pref_names.h" - #include "components/supervised_user/core/common/features.h" #include "components/supervised_user/core/common/pref_names.h" -@@ -304,8 +302,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil + #include "components/translate/core/browser/translate_pref_names.h" +@@ -303,8 +301,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil #endif // Privacy page @@ -642,7 +644,7 @@ (*s_allowlist)[::prefs::kDnsOverHttpsMode] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kDnsOverHttpsTemplates] = settings_api::PrefType::kString; -@@ -328,16 +324,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -327,16 +323,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; // Security page @@ -661,7 +663,7 @@ (*s_allowlist)[::kGeneratedHttpsFirstModePref] = --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc -@@ -629,9 +629,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore +@@ -736,9 +736,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, GetReferrerChainForNonSafeBrowsingUser) { PrefService* pref_service = browser()->profile()->GetPrefs(); @@ -734,7 +736,7 @@ #include "components/supervised_user/core/common/buildflags.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" -@@ -544,10 +543,7 @@ void ExtensionService::Init() { +@@ -551,10 +550,7 @@ void ExtensionService::Init() { LoadExtensionsFromCommandLineFlag(::switches::kDisableExtensionsExcept); if (load_command_line_extensions) { @@ -800,7 +802,7 @@ {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -60,7 +60,6 @@ +@@ -61,7 +61,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" @@ -808,7 +810,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/first_party_sets_handler.h" -@@ -998,15 +997,8 @@ void ProfileNetworkContextService::Confi +@@ -1098,15 +1097,8 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; @@ -983,7 +985,7 @@ } // namespace policy --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -107,14 +107,11 @@ +@@ -110,15 +110,12 @@ #include "components/proxy_config/proxy_policy_handler.h" #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/common/file_type_policies_prefs.h" @@ -994,11 +996,12 @@ #include "components/security_interstitials/core/https_only_mode_policy_handler.h" #include "components/security_interstitials/core/pref_names.h" #include "components/services/storage/public/cpp/storage_prefs.h" + #include "components/signin/public/base/signin_buildflags.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/service/sync_policy_handler.h" -@@ -288,9 +285,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -293,9 +290,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kForcePermissionPolicyUnloadDefaultEnabled, policy_prefs::kForcePermissionPolicyUnloadDefaultEnabled, base::Value::Type::BOOLEAN}, @@ -1008,7 +1011,7 @@ { key::kDomainReliabilityAllowed, domain_reliability::prefs::kDomainReliabilityAllowedByPolicy, base::Value::Type::BOOLEAN }, -@@ -324,12 +318,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -329,12 +323,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kOopPrintDriversAllowedByPolicy, base::Value::Type::BOOLEAN }, #endif @@ -1021,7 +1024,7 @@ { key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled, base::Value::Type::BOOLEAN }, -@@ -430,9 +418,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -435,9 +423,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdsSettingForIntrusiveAdsSites, prefs::kManagedDefaultAdsSetting, base::Value::Type::INTEGER }, @@ -1031,7 +1034,7 @@ { key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, base::Value::Type::BOOLEAN }, -@@ -632,15 +617,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -646,15 +631,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kPasswordDismissCompromisedAlertEnabled, password_manager::prefs::kPasswordDismissCompromisedAlertEnabled, base::Value::Type::BOOLEAN }, @@ -1047,7 +1050,7 @@ #if BUILDFLAG(ENABLE_PDF) { key::kPdfLocalFileAccessAllowedForDomains, prefs::kPdfLocalFileAccessAllowedForDomains, -@@ -687,9 +663,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -701,9 +677,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRestoreOnStartupURLs, prefs::kURLsToRestoreOnStartup, base::Value::Type::LIST }, @@ -1057,7 +1060,7 @@ { key::kSameOriginTabCaptureAllowedByOrigins, prefs::kSameOriginTabCaptureAllowedByOrigins, base::Value::Type::LIST }, -@@ -801,9 +774,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -815,9 +788,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdditionalDnsQueryTypesEnabled, prefs::kAdditionalDnsQueryTypesEnabled, base::Value::Type::BOOLEAN }, @@ -1067,7 +1070,7 @@ { key::kForceGoogleSafeSearch, policy_prefs::kForceGoogleSafeSearch, base::Value::Type::BOOLEAN }, -@@ -859,9 +829,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -873,9 +843,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, @@ -1077,17 +1080,17 @@ #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ -@@ -1718,9 +1685,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1741,9 +1708,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, - { key::kProfileSeparationDomainExceptionList, - prefs::kProfileSeparationDomainExceptionList, - base::Value::Type::LIST }, - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ - || BUILDFLAG(IS_FUCHSIA) -@@ -1781,9 +1745,6 @@ const PolicyToPreferenceMapEntry kSimple + { key::kCustomProfileLabel, + prefs::kCustomProfileLabel, + base::Value::Type::STRING }, +@@ -1807,9 +1771,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kImportDialogAutofillFormData, base::Value::Type::BOOLEAN }, @@ -1097,7 +1100,7 @@ { key::kHardwareAccelerationModeEnabled, prefs::kHardwareAccelerationModeEnabled, base::Value::Type::BOOLEAN }, -@@ -2067,9 +2028,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2090,9 +2051,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGoogleSearchSidePanelEnabled, prefs::kGoogleSearchSidePanelEnabled, base::Value::Type::BOOLEAN }, @@ -1107,7 +1110,7 @@ #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) { key::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, policy_prefs::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, -@@ -2282,12 +2240,6 @@ std::unique_ptrAddHandler( std::make_unique()); -@@ -2477,21 +2429,7 @@ std::unique_ptrAddHandler(std::make_unique( key::kProfileReauthPrompt, enterprise_signin::prefs::kProfileReauthPrompt, static_cast(enterprise_signin::ProfileReauthPrompt::kDoNotPrompt), -@@ -2541,24 +2479,6 @@ std::unique_ptr> signin_legacy_policies; @@ -1169,7 +1172,7 @@ std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -158,7 +158,6 @@ +@@ -157,7 +157,6 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "components/safe_browsing/content/common/file_type_policies_prefs.h" @@ -1177,15 +1180,15 @@ #include "components/search_engines/template_url_prepopulate_data.h" #include "components/security_interstitials/content/insecure_form_blocking_page.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" -@@ -167,7 +166,6 @@ - #include "components/services/screen_ai/buildflags/buildflags.h" +@@ -165,7 +164,6 @@ + #include "components/segmentation_platform/public/segmentation_platform_service.h" #include "components/services/storage/public/cpp/storage_prefs.h" #include "components/sessions/core/session_id_generator.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_engagement/content/site_engagement_service.h" #include "components/subresource_filter/content/browser/ruleset_service.h" -@@ -1473,7 +1471,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1502,7 +1500,6 @@ void RegisterLocalState(PrefRegistrySimp PushMessagingServiceImpl::RegisterPrefs(registry); #endif RegisterScreenshotPrefs(registry); @@ -1193,7 +1196,7 @@ secure_origin_allowlist::RegisterPrefs(registry); segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs( registry); -@@ -1762,8 +1759,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1791,8 +1788,6 @@ void RegisterProfilePrefs(user_prefs::Pr QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); RegisterPrefersDefaultScrollbarStylesPrefs(registry); @@ -1202,7 +1205,7 @@ SearchPrefetchService::RegisterProfilePrefs(registry); blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs( registry); -@@ -2304,20 +2299,6 @@ void MigrateObsoleteProfilePrefs(PrefSer +@@ -2333,20 +2328,6 @@ void MigrateObsoleteProfilePrefs(PrefSer chrome_browser_net::secure_dns::MigrateProbesSettingToOrFromBackup( profile_prefs); @@ -1221,9 +1224,9 @@ - } - } - // Added 03/2023. - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -2589,9 +2570,6 @@ void MigrateObsoleteProfilePrefs(PrefSer + // TODO(326079444): After experiment is over, update the deprecated date and + // allow this to be cleaned up. +@@ -2605,9 +2586,6 @@ void MigrateObsoleteProfilePrefs(PrefSer // If the sync (old) pref still exists, copy it to signin (new), // and clear the sync part of the pref. if (profile_prefs->HasPrefPath(kSync_ExplicitBrowserSignin)) { @@ -1233,6 +1236,17 @@ profile_prefs->ClearPref(kSync_ExplicitBrowserSignin); } +@@ -2699,10 +2677,6 @@ void MigrateObsoleteProfilePrefs(PrefSer + // Added 03/2024. + profile_prefs->ClearPref(kDefaultSearchProviderChoicePendingDeprecated); + +- // Added 02/2024, but DO NOT REMOVE after the usual year! +- // TODO(crbug.com/40282890): Remove ~one year after full launch. +- browser_sync::MaybeMigrateSyncingUserToSignedIn(profile_path, profile_prefs); +- + // Please don't delete the following line. It is used by PRESUBMIT.py. + // END_MIGRATE_OBSOLETE_PROFILE_PREFS + --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc @@ -25,7 +25,6 @@ @@ -1390,10 +1404,10 @@ info.Set(ProfileAttributesEntry::kAccountIdKey, --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -150,7 +150,6 @@ +@@ -149,7 +149,6 @@ + #include "components/profile_metrics/browser_profile_type.h" #include "components/safe_search_api/safe_search_util.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" - #include "components/services/screen_ai/buildflags/buildflags.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_isolation/site_isolation_policy.h" @@ -1408,7 +1422,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/supervised_user/core/common/buildflags.h" -@@ -1983,8 +1982,7 @@ void ProfileManager::AddProfileToStorage +@@ -1978,8 +1977,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1418,7 +1432,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -2034,14 +2032,13 @@ void ProfileManager::AddProfileToStorage +@@ -2028,14 +2026,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsForceEphemeralProfilesEnabled(profile); init_params.is_signed_in_with_credential_provider = @@ -1456,7 +1470,7 @@ #if BUILDFLAG(IS_CHROMEOS_LACROS) --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -851,7 +851,7 @@ +@@ -845,7 +845,7 @@ @@ -1671,7 +1685,7 @@

$i18n{advancedPageTitle}

-@@ -368,11 +182,3 @@ +@@ -366,11 +180,3 @@ on-click="onAdvancedProtectionProgramLinkClick_" external> @@ -1685,7 +1699,7 @@ - --- a/chrome/browser/resources/settings/privacy_page/security_page.ts +++ b/chrome/browser/resources/settings/privacy_page/security_page.ts -@@ -281,17 +281,6 @@ export class SettingsSecurityPageElement +@@ -275,17 +275,6 @@ export class SettingsSecurityPageElement super.ready(); CrSettingsPrefs.initialized.then(() => { @@ -1703,7 +1717,7 @@ // The HTTPS-First Mode generated pref should never be set to // ENABLED_INCOGNITO if the feature flag is not enabled. if (!loadTimeData.getBoolean('enableHttpsFirstModeNewSettings')) { -@@ -301,10 +290,6 @@ export class SettingsSecurityPageElement +@@ -295,10 +284,6 @@ export class SettingsSecurityPageElement } }); @@ -1714,7 +1728,7 @@ // Initialize the last focus time on page load. this.lastFocusTime_ = HatsBrowserProxyImpl.getInstance().now(); } -@@ -428,8 +413,7 @@ export class SettingsSecurityPageElement +@@ -422,8 +407,7 @@ export class SettingsSecurityPageElement } private getDisabledExtendedSafeBrowsing_(): boolean { @@ -1756,7 +1770,7 @@ if (is_under_advanced_protection_) ScheduleNextRefresh(); } else { -@@ -255,20 +252,10 @@ void AdvancedProtectionStatusManager::Ca +@@ -257,20 +254,10 @@ void AdvancedProtectionStatusManager::Ca void AdvancedProtectionStatusManager::UpdateLastRefreshTime() { last_refreshed_ = base::Time::Now(); @@ -1808,7 +1822,7 @@ #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "components/safe_browsing/core/common/utils.h" #include "components/security_interstitials/core/unsafe_resource.h" -@@ -1311,14 +1310,6 @@ bool ChromePasswordProtectionService::Ha +@@ -1316,14 +1315,6 @@ bool ChromePasswordProtectionService::Ha } void ChromePasswordProtectionService::OnWarningTriggerChanged() { @@ -1823,7 +1837,7 @@ // Clears captured enterprise password hashes or GSuite sync password hashes. password_manager::PasswordReuseManager* reuse_manager = GetPasswordReuseManager(); -@@ -1491,7 +1482,7 @@ PrefService* ChromePasswordProtectionSer +@@ -1496,7 +1487,7 @@ PrefService* ChromePasswordProtectionSer } bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() { @@ -1832,7 +1846,7 @@ } bool ChromePasswordProtectionService::IsExtendedReporting() { -@@ -1511,39 +1502,7 @@ bool ChromePasswordProtectionService::Is +@@ -1516,39 +1507,7 @@ bool ChromePasswordProtectionService::Is bool ChromePasswordProtectionService::IsPingingEnabled( LoginReputationClientRequest::TriggerType trigger_type, ReusedPasswordAccountType password_type) { @@ -1873,7 +1887,7 @@ } RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason( -@@ -1798,23 +1757,6 @@ MaybeCreateCommitDeferringCondition( +@@ -1804,23 +1763,6 @@ MaybeCreateCommitDeferringCondition( : nullptr; } @@ -1957,7 +1971,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc -@@ -95,7 +95,6 @@ +@@ -96,7 +96,6 @@ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -2186,7 +2200,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 -@@ -151,7 +151,6 @@ base::FilePath SafeBrowsingService::GetB +@@ -162,7 +162,6 @@ bool SafeBrowsingService::IsUserEligible SafeBrowsingService::SafeBrowsingService() : services_delegate_(ServicesDelegate::Create(this)), @@ -2194,7 +2208,7 @@ shutdown_(false), enabled_(false), enabled_by_prefs_(false) {} -@@ -283,9 +282,6 @@ TriggerManager* SafeBrowsingService::tri +@@ -294,9 +293,6 @@ TriggerManager* SafeBrowsingService::tri PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService( Profile* profile) const { @@ -2204,7 +2218,7 @@ return nullptr; } -@@ -409,9 +405,6 @@ void SafeBrowsingService::OnProfileAdded +@@ -378,9 +374,6 @@ void SafeBrowsingService::OnProfileAdded std::unique_ptr registrar = std::make_unique(); registrar->Init(pref_service); @@ -2214,7 +2228,7 @@ // ClientSideDetectionService will need to be refresh the models // renderers have if extended-reporting changes. registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled, -@@ -440,14 +433,6 @@ void SafeBrowsingService::OnProfileAdded +@@ -409,14 +402,6 @@ void SafeBrowsingService::OnProfileAdded NoCachedPopulationReason::kChangeMbbPref)); user_population_prefs_[pref_service] = std::move(registrar); @@ -2229,7 +2243,7 @@ // Record the current enhanced protection pref state for regular profiles only if (profiles::IsRegularUserProfile(profile)) { -@@ -498,18 +483,6 @@ void SafeBrowsingService::RefreshState() +@@ -467,18 +452,6 @@ void SafeBrowsingService::RefreshState() // Check if any profile requires the service to be active. enabled_by_prefs_ = false; @@ -2258,7 +2272,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" -@@ -102,15 +101,6 @@ class SafeBrowsingService : public SafeB +@@ -105,15 +104,6 @@ class SafeBrowsingService : public SafeB // Called on the main thread to let us know that the io_thread is going away. void ShutDown(); @@ -2274,7 +2288,7 @@ // Get current enabled status. Must be called on IO thread. bool enabled() const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); -@@ -324,10 +314,6 @@ class SafeBrowsingService : public SafeB +@@ -313,10 +303,6 @@ class SafeBrowsingService : public SafeB std::unique_ptr proxy_config_monitor_; @@ -2287,7 +2301,7 @@ --- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc +++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc -@@ -27,7 +27,6 @@ +@@ -26,7 +26,6 @@ #include "components/safe_browsing/core/browser/db/database_manager.h" #include "components/safe_browsing/core/browser/ping_manager.h" #include "components/safe_browsing/core/common/features.h" @@ -2295,7 +2309,7 @@ #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item_utils.h" -@@ -141,11 +140,9 @@ bool AndroidTelemetryService::CanSendPin +@@ -123,11 +122,9 @@ bool AndroidTelemetryService::CanSendPin return false; } @@ -2373,7 +2387,7 @@ } // static -@@ -208,16 +198,7 @@ AccountConsistencyModeManager::ComputeAc +@@ -213,16 +203,7 @@ AccountConsistencyModeManager::ComputeAc return AccountConsistencyMethod::kMirror; #endif @@ -2400,6 +2414,24 @@ #include "components/sync_preferences/testing_pref_service_syncable.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" +--- a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_refresh_service_factory.cc ++++ b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_refresh_service_factory.cc +@@ -18,7 +18,6 @@ + #include "chrome/browser/signin/signin_features.h" + #include "components/pref_registry/pref_registry_syncable.h" + #include "components/signin/public/base/account_consistency_method.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" + #include "content/public/browser/network_service_instance.h" + +@@ -96,7 +95,4 @@ BoundSessionCookieRefreshServiceFactory: + void BoundSessionCookieRefreshServiceFactory::RegisterProfilePrefs( + user_prefs::PrefRegistrySyncable* registry) { + BoundSessionParamsStorage::RegisterProfilePrefs(registry); +- // Default value for this pref doesn't matter since it is only used when +- // explicitly set. +- registry->RegisterBooleanPref(prefs::kBoundSessionCredentialsEnabled, false); + } --- a/chrome/browser/signin/chrome_device_id_helper.cc +++ b/chrome/browser/signin/chrome_device_id_helper.cc @@ -19,7 +19,6 @@ @@ -2458,14 +2490,14 @@ #include "components/user_manager/user.h" --- a/chrome/browser/signin/dice_browsertest.cc +++ b/chrome/browser/signin/dice_browsertest.cc -@@ -62,7 +62,6 @@ +@@ -66,7 +66,6 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" + #include "components/signin/public/identity_manager/account_capabilities_test_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" - #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/chrome/browser/signin/dice_signed_in_profile_creator.cc +++ b/chrome/browser/signin/dice_signed_in_profile_creator.cc @@ -20,7 +20,6 @@ @@ -2478,7 +2510,7 @@ #include "content/public/browser/storage_partition.h" --- a/chrome/browser/signin/dice_web_signin_interceptor.cc +++ b/chrome/browser/signin/dice_web_signin_interceptor.cc -@@ -69,7 +69,6 @@ +@@ -71,7 +71,6 @@ #include "components/search_engines/template_url_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2486,7 +2518,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" -@@ -316,16 +315,8 @@ void DiceWebSigninInterceptor::RegisterP +@@ -330,16 +329,8 @@ void DiceWebSigninInterceptor::RegisterP registry->RegisterBooleanPref(prefs::kSigninInterceptionEnabled, true); registry->RegisterStringPref(prefs::kManagedAccountsSigninRestriction, std::string()); @@ -2503,7 +2535,7 @@ // TODO(b/314079566): Consider merging the different similar pref counts into // a single pref where the email hash maps to multiple values, includes the // following two prefs and `kProfileCreationInterceptionDeclinedPref` above. -@@ -1275,16 +1266,6 @@ void DiceWebSigninInterceptor:: +@@ -1393,16 +1384,6 @@ void DiceWebSigninInterceptor:: g_browser_process->browser_policy_connector(), g_browser_process->system_network_context_manager() ->GetSharedURLLoaderFactory()); @@ -2638,7 +2670,7 @@ UpdateUnconsentedPrimaryAccount(); identity_manager_observation_.Observe(&identity_manager_.get()); } -@@ -211,16 +206,6 @@ CoreAccountInfo SigninManager::ComputeUn +@@ -210,16 +205,6 @@ CoreAccountInfo SigninManager::ComputeUn signin::ConsentLevel::kSync); } @@ -2859,7 +2891,7 @@ #include "components/sync/service/sync_service.h" --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -79,7 +79,6 @@ +@@ -78,7 +78,6 @@ #include "components/sessions/core/tab_restore_service.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -2879,7 +2911,7 @@ #include "ui/events/keycodes/dom/dom_code.h" --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -76,7 +76,6 @@ +@@ -77,7 +77,6 @@ #if !BUILDFLAG(IS_ANDROID) #include "base/metrics/histogram_functions.h" #include "chrome/browser/signin/identity_manager_factory.h" @@ -2889,16 +2921,16 @@ --- a/chrome/browser/ui/hats/trust_safety_sentiment_service.cc +++ b/chrome/browser/ui/hats/trust_safety_sentiment_service.cc -@@ -26,8 +26,6 @@ - #include "components/prefs/pref_service.h" +@@ -27,8 +27,6 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/privacy_sandbox/tracking_protection_prefs.h" + #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/unified_consent/pref_names.h" #include "components/version_info/channel.h" -@@ -73,9 +71,6 @@ bool HasNonDefaultPrivacySetting(Profile +@@ -74,9 +72,6 @@ bool HasNonDefaultPrivacySetting(Profile auto* prefs = profile->GetPrefs(); std::vector prefs_to_check = { @@ -2908,7 +2940,7 @@ prefs::kEnableDoNotTrack, password_manager::prefs::kPasswordLeakDetectionEnabled, prefs::kCookieControlsMode, -@@ -93,13 +88,9 @@ bool HasNonDefaultPrivacySetting(Profile +@@ -94,13 +89,9 @@ bool HasNonDefaultPrivacySetting(Profile // Users consenting to sync automatically enable UKM collection auto* ukm_pref = prefs->FindPreference( unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled); @@ -2923,7 +2955,7 @@ // Check the default value for each user facing content setting. Note that // this will not include content setting exceptions set via permission -@@ -174,8 +165,6 @@ std::map BuildProduct +@@ -175,8 +166,6 @@ std::map BuildProduct PasswordProtectionUIType ui_type, PasswordProtectionUIAction action) { std::map product_specific_data; @@ -2932,7 +2964,7 @@ product_specific_data["Is page info UI"] = false; product_specific_data["Is modal dialog UI"] = false; product_specific_data["Is interstitial UI"] = false; -@@ -432,30 +421,12 @@ void TrustSafetySentimentService::Intera +@@ -433,31 +422,12 @@ void TrustSafetySentimentService::Intera void TrustSafetySentimentService::InteractedWithSafeBrowsingInterstitial( bool did_proceed, safe_browsing::SBThreatType threat_type) { @@ -2941,14 +2973,15 @@ - product_specific_data["Enhanced protection enabled"] = - safe_browsing::IsEnhancedProtectionEnabled(*profile_->GetPrefs()); - product_specific_data["Threat is phishing"] = -- threat_type == safe_browsing::SB_THREAT_TYPE_URL_PHISHING || -- threat_type == safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING; +- threat_type == safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_PHISHING || +- threat_type == +- safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING; - product_specific_data["Threat is malware"] = -- threat_type == safe_browsing::SB_THREAT_TYPE_URL_MALWARE; +- threat_type == safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_MALWARE; - product_specific_data["Threat is unwanted software"] = -- threat_type == safe_browsing::SB_THREAT_TYPE_URL_UNWANTED; +- threat_type == safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_UNWANTED; - product_specific_data["Threat is billing"] = -- threat_type == safe_browsing::SB_THREAT_TYPE_BILLING; +- threat_type == safe_browsing::SBThreatType::SB_THREAT_TYPE_BILLING; - DCHECK(!IsOtherSBInterstitialCategory(threat_type)); - TriggerOccurred(FeatureArea::kSafeBrowsingInterstitial, - product_specific_data); @@ -3083,7 +3116,7 @@ void SetFirstRunFinished(FirstRunService::FinishedReason reason) { --- a/chrome/browser/ui/toolbar/app_menu_model.cc +++ b/chrome/browser/ui/toolbar/app_menu_model.cc -@@ -91,7 +91,6 @@ +@@ -94,7 +94,6 @@ #include "components/prefs/pref_service.h" #include "components/profile_metrics/browser_profile_type.h" #include "components/signin/public/base/signin_metrics.h" @@ -3091,7 +3124,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" #include "components/vector_icons/vector_icons.h" -@@ -416,62 +415,7 @@ int ProfileSubMenuModel::GetAndIncrement +@@ -524,62 +523,7 @@ int ProfileSubMenuModel::GetAndIncrement } bool ProfileSubMenuModel::BuildSyncSection() { @@ -3156,7 +3189,7 @@ class PasswordsAndAutofillSubMenuModel : public ui::SimpleMenuModel { --- a/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc +++ b/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc -@@ -43,7 +43,6 @@ +@@ -44,7 +44,6 @@ #include "components/feature_engagement/public/feature_constants.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" @@ -3176,7 +3209,7 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -62,7 +62,6 @@ +@@ -65,7 +65,6 @@ #include "chrome/grit/theme_resources.h" #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/public/base/consent_level.h" @@ -3184,7 +3217,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -618,7 +617,6 @@ void ProfileMenuView::BuildAutofillButto +@@ -643,7 +642,6 @@ void ProfileMenuView::BuildAutofillButto void ProfileMenuView::BuildSyncInfo() { Profile* profile = browser()->profile(); @@ -3275,7 +3308,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/zoom/page_zoom.h" #include "components/zoom/zoom_controller.h" -@@ -353,67 +352,6 @@ void AddSignedInChipToProfileMenuItem( +@@ -352,67 +351,6 @@ void AddSignedInChipToProfileMenuItem( const int horizontal_padding, std::vector& profile_menu_subscription_list) { @@ -3369,17 +3402,17 @@ break; --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -49,7 +49,6 @@ +@@ -50,7 +50,6 @@ #include "components/history/core/common/pref_names.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/safebrowsing_referral_methods.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item_utils.h" - #include "content/public/browser/download_manager.h" --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc -@@ -47,7 +47,6 @@ +@@ -49,7 +49,6 @@ #include "components/page_image_service/image_service.h" #include "components/page_image_service/image_service_handler.h" #include "components/prefs/pref_service.h" @@ -3387,7 +3420,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" -@@ -152,8 +151,6 @@ content::WebUIDataSource* CreateAndAddHi +@@ -154,8 +153,6 @@ content::WebUIDataSource* CreateAndAddHi source->AddBoolean("allowDeletingHistory", allow_deleting_history); source->AddBoolean("isGuestSession", profile->IsGuestSession()); @@ -3416,7 +3449,7 @@ #include "components/strings/grit/components_strings.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" -@@ -315,15 +314,6 @@ void PolicyUIHandler::HandleSetLocalTest +@@ -324,15 +323,6 @@ void PolicyUIHandler::HandleSetLocalTest CHECK(local_test_provider); @@ -3432,7 +3465,7 @@ Profile::FromWebUI(web_ui()) ->GetProfilePolicyConnector() ->UseLocalTestPolicyProvider(); -@@ -335,13 +325,6 @@ void PolicyUIHandler::HandleSetLocalTest +@@ -344,13 +334,6 @@ void PolicyUIHandler::HandleSetLocalTest void PolicyUIHandler::HandleRevertLocalTestPolicies( const base::Value::List& args) { @@ -3552,10 +3585,10 @@ #include "components/safe_browsing/core/browser/hashprefix_realtime/hash_realtime_utils.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - #include "components/services/screen_ai/buildflags/buildflags.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_switches.h" -@@ -3431,11 +3430,6 @@ void AddSiteSettingsStrings(content::Web + #include "components/strings/grit/components_branded_strings.h" +@@ -3427,11 +3426,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -3577,7 +3610,7 @@ #include "components/sync/base/features.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" -@@ -305,9 +304,7 @@ SettingsUI::SettingsUI(content::WebUI* w +@@ -306,9 +305,7 @@ SettingsUI::SettingsUI(content::WebUI* w } #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -3687,7 +3720,7 @@ #include "components/strings/grit/components_strings.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" -@@ -112,9 +111,7 @@ void SigninErrorUI::Initialize(Browser* +@@ -108,9 +107,7 @@ void SigninErrorUI::Initialize(Browser* if (is_profile_blocked) { source->AddLocalizedString("profileBlockedMessage", IDS_OLD_PROFILES_DISABLED_MESSAGE); @@ -3862,6 +3895,64 @@ "searchSuggestEnabled": { "$ref": "types.ChromeSetting", "value": ["searchSuggestEnabled", {"type":"boolean"}], +--- a/components/autofill/core/browser/personal_data_manager.cc ++++ b/components/autofill/core/browser/personal_data_manager.cc +@@ -72,7 +72,6 @@ + #include "components/history/core/browser/history_types.h" + #include "components/prefs/pref_service.h" + #include "components/signin/public/base/consent_level.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" + #include "components/signin/public/identity_manager/account_info.h" + #include "components/signin/public/identity_manager/identity_manager.h" +@@ -847,47 +846,7 @@ AutofillImageFetcherBase* PersonalDataMa + } + + bool PersonalDataManager::IsAutofillSyncToggleAvailable() const { +- auto is_unsupported_passphrase_user = [&] { +- if (!sync_service_) { + return false; +- } +- return sync_service_->GetUserSettings()->IsUsingExplicitPassphrase() && +- !base::FeatureList::IsEnabled( +- syncer::kSyncEnableContactInfoDataTypeForCustomPassphraseUsers); +- }; +- auto is_unsupported_dasher_user = [&] { +- if (!account_status_finder_) { +- return false; +- } +- using StatusOutcome = signin::AccountManagedStatusFinder::Outcome; +- StatusOutcome outcome = account_status_finder_->GetOutcome(); +- return outcome == StatusOutcome::kEnterprise && +- !base::FeatureList::IsEnabled( +- syncer::kSyncEnableContactInfoDataTypeForDasherUsers); +- }; +- auto is_child_account = [&] { +- if (!sync_service_ || !identity_manager_ || +- !identity_manager_->AreRefreshTokensLoaded()) { +- return false; +- } +- return identity_manager_ +- ->FindExtendedAccountInfo(sync_service_->GetAccountInfo()) +- .capabilities.is_subject_to_parental_controls() == +- signin::Tribool::kTrue; +- }; +- return sync_service_ && !sync_service_->GetAccountInfo().IsEmpty() && +- !sync_service_->HasSyncConsent() && +- !sync_service_->GetUserSettings()->IsTypeManagedByPolicy( +- syncer::UserSelectableType::kAutofill) && +- !is_unsupported_passphrase_user() && !is_unsupported_dasher_user() && +- !is_child_account() && +- base::FeatureList::IsEnabled( +- syncer::kSyncEnableContactInfoDataTypeInTransportMode) && +- base::FeatureList::IsEnabled( +- syncer::kSyncDecoupleAddressPaymentSettings) && +- ::switches::IsExplicitBrowserSigninUIOnDesktopEnabled( +- ::switches::ExplicitBrowserSigninPhase::kFull) && +- pref_service_->GetBoolean(::prefs::kExplicitBrowserSignin); + } + + void PersonalDataManager::AddFullServerCreditCardForTesting( --- a/components/browser_sync/BUILD.gn +++ b/components/browser_sync/BUILD.gn @@ -17,8 +17,6 @@ static_library("browser_sync") { @@ -3875,7 +3966,7 @@ public_deps = [ --- a/components/feed/core/v2/feed_stream.cc +++ b/components/feed/core/v2/feed_stream.cc -@@ -66,7 +66,6 @@ +@@ -65,7 +65,6 @@ #include "components/feed/feed_feature_list.h" #include "components/offline_pages/task/closure_task.h" #include "components/prefs/pref_service.h" @@ -3883,7 +3974,7 @@ namespace feed { namespace { -@@ -178,9 +177,6 @@ FeedStream::FeedStream(RefreshTaskSchedu +@@ -177,9 +176,6 @@ FeedStream::FeedStream(RefreshTaskSchedu snippets_enabled_by_dse_.Init(prefs::kEnableSnippetsByDse, profile_prefs, preference_change_callback); has_stored_data_.Init(feed::prefs::kHasStoredData, profile_prefs); @@ -3922,6 +4013,29 @@ #include "base/ranges/algorithm.h" #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" #include "third_party/re2/src/re2/re2.h" +--- a/components/password_manager/core/browser/features/password_manager_features_util_desktop.cc ++++ b/components/password_manager/core/browser/features/password_manager_features_util_desktop.cc +@@ -15,7 +15,6 @@ + #include "components/password_manager/core/common/password_manager_pref_names.h" + #include "components/prefs/scoped_user_pref_update.h" + #include "components/signin/public/base/gaia_id_hash.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" + #include "components/signin/public/identity_manager/account_info.h" + #include "components/sync/base/pref_names.h" +@@ -406,11 +405,7 @@ bool ShouldShowAccountStorageSettingTogg + } + + bool IsAccountStorageEnabledByDefault(const PrefService* prefs) { +- // When signin is explicit, account storage is enabled by default. Users who +- // disabled it manually should not be prompted to re-enable it. +- return prefs->GetBoolean(::prefs::kExplicitBrowserSignin) && +- switches::IsExplicitBrowserSigninUIOnDesktopEnabled( +- switches::ExplicitBrowserSigninPhase::kFull); ++ return false; + } + + // Note: See also password_manager_features_util_common.cc for shared --- a/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc +++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc @@ -19,7 +19,6 @@ @@ -4303,7 +4417,7 @@ #include "components/security_interstitials/core/base_safe_browsing_error_ui.h" --- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc +++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc -@@ -38,7 +38,6 @@ +@@ -37,7 +37,6 @@ #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" #include "components/safe_browsing/core/common/proto/safebrowsingv5.pb.h" @@ -4311,7 +4425,7 @@ #include "content/public/browser/global_routing_id.h" #include "services/network/public/mojom/cookie_manager.mojom.h" #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -1804,17 +1803,7 @@ std::string SerializeHitReport(const Hit +@@ -1807,17 +1806,7 @@ std::string SerializeHitReport(const Hit } hit_report_dict.Set("threat_source", threat_source); std::string extended_reporting_level; @@ -4329,7 +4443,7 @@ hit_report_dict.Set("extended_reporting_level", extended_reporting_level); hit_report_dict.Set("is_enhanced_protection", hit_report.is_enhanced_protection); -@@ -2905,18 +2894,13 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -2912,18 +2901,13 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); DCHECK(!args.empty()); std::string callback_id = args[0].GetString(); @@ -4379,7 +4493,7 @@ --- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc +++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc -@@ -321,12 +321,9 @@ const V4LocalDatabaseManager* +@@ -327,12 +327,9 @@ const V4LocalDatabaseManager* scoped_refptr V4LocalDatabaseManager::Create( const base::FilePath& base_path, scoped_refptr ui_task_runner, @@ -4394,7 +4508,7 @@ std::move(io_task_runner), nullptr)); } -@@ -349,17 +346,12 @@ void V4LocalDatabaseManager::CollectData +@@ -355,17 +352,12 @@ void V4LocalDatabaseManager::CollectData V4LocalDatabaseManager::V4LocalDatabaseManager( const base::FilePath& base_path, @@ -4412,7 +4526,7 @@ list_infos_(GetListInfos()), task_runner_(task_runner_for_tests ? task_runner_for_tests -@@ -700,12 +692,6 @@ void V4LocalDatabaseManager::DatabaseRea +@@ -706,12 +698,6 @@ void V4LocalDatabaseManager::DatabaseRea v4_database_ = std::move(v4_database); v4_database_->RecordFileSizeHistograms(); @@ -4425,7 +4539,7 @@ PopulateArtificialDatabase(); -@@ -1278,8 +1264,7 @@ void V4LocalDatabaseManager::SetupUpdate +@@ -1285,8 +1271,7 @@ void V4LocalDatabaseManager::SetupUpdate weak_factory_.GetWeakPtr()); v4_update_protocol_manager_ = V4UpdateProtocolManager::Create( @@ -4457,7 +4571,7 @@ scoped_refptr ui_task_runner, scoped_refptr io_task_runner, scoped_refptr task_runner_for_tests); -@@ -430,13 +426,6 @@ class V4LocalDatabaseManager : public Sa +@@ -431,13 +427,6 @@ class V4LocalDatabaseManager : public Sa // ready to process next update. DatabaseUpdatedCallback db_updated_callback_; @@ -4741,7 +4855,7 @@ // policy. --- a/components/safe_browsing/core/browser/ping_manager.cc +++ b/components/safe_browsing/core/browser/ping_manager.cc -@@ -324,7 +324,7 @@ GURL PingManager::SafeBrowsingHitUrl( +@@ -348,7 +348,7 @@ GURL PingManager::SafeBrowsingHitUrl( hit_report->threat_type == SB_THREAT_TYPE_URL_BINARY_MALWARE || hit_report->threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING); std::string url = @@ -4807,7 +4921,7 @@ unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged, base::Unretained(this))); -@@ -137,8 +132,7 @@ bool RealTimeUrlLookupService::CanSendPa +@@ -139,8 +134,7 @@ bool RealTimeUrlLookupService::CanSendPa } bool RealTimeUrlLookupService::CanIncludeSubframeUrlInReferrerChain() const { @@ -4817,7 +4931,7 @@ } bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const { -@@ -155,9 +149,7 @@ bool RealTimeUrlLookupService::CanCheckS +@@ -157,9 +151,7 @@ bool RealTimeUrlLookupService::CanCheckS } bool RealTimeUrlLookupService::CanSendRTSampleRequest() const { @@ -4828,7 +4942,7 @@ } void RealTimeUrlLookupService::Shutdown() { -@@ -234,14 +226,6 @@ RealTimeUrlLookupService::GetMinAllowedT +@@ -236,14 +228,6 @@ RealTimeUrlLookupService::GetMinAllowedT void RealTimeUrlLookupService::MaybeLogLastProtegoPingTimeToPrefs( bool sent_with_token) { @@ -4898,8 +5012,8 @@ } void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() { -@@ -90,59 +73,11 @@ void SafeBrowsingMetricsCollector::LogMe - MaybeLogDailyEsbProtegoPingSentLast24Hours(); +@@ -90,80 +73,10 @@ void SafeBrowsingMetricsCollector::LogMe + MaybeLogDailyEsbProtegoPingSent(); RemoveOldEventsFromPref(); - pref_service_->SetInt64( @@ -4908,8 +5022,7 @@ ScheduleNextLoggingAfterInterval(base::Days(kMetricsLoggingIntervalDay)); } - void SafeBrowsingMetricsCollector:: - MaybeLogDailyEsbProtegoPingSentLast24Hours() { + void SafeBrowsingMetricsCollector::MaybeLogDailyEsbProtegoPingSent() { - if (GetSafeBrowsingState(*pref_service_) != - SafeBrowsingState::ENHANCED_PROTECTION) { - return; @@ -4930,10 +5043,6 @@ - - bool sent_ping_since_last_collector_run = - most_recent_ping_time > most_recent_collector_run_time; -- base::UmaHistogramEnumeration( -- "SafeBrowsing.Enhanced.ProtegoRequestSentInLast24Hours", -- sent_ping_since_last_collector_run ? most_recent_ping_type -- : ProtegoPingType::kNone); - - auto logged_ping_type = ProtegoPingType::kNone; - @@ -4953,12 +5062,38 @@ - logged_ping_type = ProtegoPingType::kWithoutToken; - } - base::UmaHistogramEnumeration( +- "SafeBrowsing.Enhanced.ProtegoRequestSentInLast24Hours", +- sent_ping_since_last_collector_run ? most_recent_ping_type +- : ProtegoPingType::kNone); +- +- base::UmaHistogramEnumeration( - "SafeBrowsing.Enhanced.ProtegoRequestSentInLast24Hours2", - logged_ping_type); +- +- auto logged_ping_last_7_days_type = ProtegoPingType::kNone; +- if (base::Time::Now() - last_ping_with_token < base::Days(7)) { +- // If a ping with token was sent within the last 7 days, +- // the most recent ping type is kWithToken. +- // If both last_ping_with_token and last_ping_without_token are present, +- // we log kWithToken instead of kWithoutToken because if a token has been +- // sent before, we are certain that this account is a signed in account +- // and the server has received the token. +- // The kWithoutToken ping could be sent after the account logged out. +- logged_ping_last_7_days_type = ProtegoPingType::kWithToken; +- } else if (base::Time::Now() - last_ping_without_token < base::Days(7)) { +- // If no ping with token was sent but a ping without token was sent within +- // the last 7 days, the most recent ping type is kWithoutToken. +- // Otherwise, it is the default value, kNone. +- logged_ping_last_7_days_type = ProtegoPingType::kWithoutToken; +- } +- +- base::UmaHistogramEnumeration( +- "SafeBrowsing.Enhanced.ProtegoRequestSentInLast7Days", +- logged_ping_last_7_days_type); } void SafeBrowsingMetricsCollector::ScheduleNextLoggingAfterInterval( -@@ -154,76 +89,16 @@ void SafeBrowsingMetricsCollector::Sched +@@ -175,71 +88,16 @@ void SafeBrowsingMetricsCollector::Sched } void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() { @@ -5007,20 +5142,15 @@ - ScopedDictPrefUpdate update(pref_service_, - prefs::kSafeBrowsingEventTimestamps); - base::Value::Dict& mutable_state_dict = update.Get(); -- size_t total_size = 0; - - for (auto state_map : mutable_state_dict) { - for (auto event_map : state_map.second.GetDict()) { -- total_size += event_map.second.GetList().size(); - event_map.second.GetList().EraseIf([&](const auto& timestamp) { - return base::Time::Now() - PrefValueToTime(timestamp) > - base::Days(kEventMaxDurationDay); - }); - } - } -- -- base::UmaHistogramCounts1000( -- "SafeBrowsing.MetricsCollectorEventCountAtCleanup", total_size); } void SafeBrowsingMetricsCollector::AddSafeBrowsingEventToPref( @@ -5035,7 +5165,7 @@ } void SafeBrowsingMetricsCollector::AddBypassEventToPref( -@@ -268,15 +143,7 @@ std::optional SafeBrowsingMe +@@ -284,15 +142,7 @@ std::optional SafeBrowsingMe std::optional SafeBrowsingMetricsCollector::GetLatestEventTimestamp( EventTypeFilter event_type_filter) { // Events are not logged when Safe Browsing is disabled. @@ -5051,7 +5181,7 @@ } std::optional -@@ -288,45 +155,15 @@ SafeBrowsingMetricsCollector::GetLatestS +@@ -304,45 +154,15 @@ SafeBrowsingMetricsCollector::GetLatestS void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref( UserState user_state, EventType event_type) { @@ -5098,7 +5228,7 @@ } std::optional -@@ -453,23 +290,6 @@ int SafeBrowsingMetricsCollector::GetEve +@@ -469,23 +289,6 @@ int SafeBrowsingMetricsCollector::GetEve }); } @@ -5619,7 +5749,7 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" --- a/components/signin/internal/identity_manager/account_tracker_service.cc +++ b/components/signin/internal/identity_manager/account_tracker_service.cc -@@ -37,7 +37,6 @@ +@@ -36,7 +36,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/signin/internal/identity_manager/account_capabilities_constants.h" #include "components/signin/internal/identity_manager/account_info_util.h" @@ -5627,7 +5757,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_capabilities.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -204,11 +203,6 @@ AccountTrackerService::~AccountTrackerSe +@@ -203,11 +202,6 @@ AccountTrackerService::~AccountTrackerSe // static void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) { @@ -5639,7 +5769,7 @@ } void AccountTrackerService::Initialize(PrefService* pref_service, -@@ -533,14 +527,12 @@ AccountTrackerService::ComputeNewMigrati +@@ -529,14 +523,12 @@ AccountTrackerService::ComputeNewMigrati void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) { DCHECK(state != MIGRATION_DONE || AreAllAccountsMigrated()) << "state: " << state << ", accounts = " << AccountsToString(accounts_); @@ -5655,7 +5785,7 @@ } #endif // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -598,26 +590,6 @@ void AccountTrackerService::OnAccountIma +@@ -594,26 +586,6 @@ void AccountTrackerService::OnAccountIma const CoreAccountId& account_id, const std::string& image_url_with_size, bool success) { @@ -5682,7 +5812,7 @@ } void AccountTrackerService::RemoveAccountImageFromDisk( -@@ -629,191 +601,16 @@ void AccountTrackerService::RemoveAccoun +@@ -625,191 +597,16 @@ void AccountTrackerService::RemoveAccoun } void AccountTrackerService::LoadFromPrefs() { @@ -5971,7 +6101,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "google_apis/gaia/core_account_id.h" -@@ -214,63 +213,13 @@ PrimaryAccountManager::~PrimaryAccountMa +@@ -213,63 +212,13 @@ PrimaryAccountManager::~PrimaryAccountMa // static void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { @@ -6035,7 +6165,7 @@ } std::pair -@@ -298,46 +247,10 @@ PrimaryAccountManager::GetOrRestorePrima +@@ -297,46 +246,10 @@ PrimaryAccountManager::GetOrRestorePrima kEmptyAccountInfo_RestoreFailedNotSyncConsented); } @@ -6082,7 +6212,7 @@ } void PrimaryAccountManager::Initialize() { -@@ -347,11 +260,9 @@ void PrimaryAccountManager::Initialize() +@@ -346,11 +259,9 @@ void PrimaryAccountManager::Initialize() // Prepare prefs before loading them. PrepareToLoadPrefs(); @@ -6096,7 +6226,7 @@ LogPrimaryAccountPrefsOnInitialize(pref_account_id, pref_consented_to_sync); ScopedPrefCommit scoped_pref_commit(client_->GetPrefs(), -@@ -369,13 +280,6 @@ void PrimaryAccountManager::Initialize() +@@ -368,13 +279,6 @@ void PrimaryAccountManager::Initialize() if (pref_consented_to_sync && !account_info.IsEmpty()) { SetPrimaryAccountInternal(account_info, /*consented_to_sync=*/true, scoped_pref_commit); @@ -6110,7 +6240,7 @@ } else { SetPrimaryAccountInternal(account_info, /*consented_to_sync=*/false, scoped_pref_commit); -@@ -502,10 +406,6 @@ void PrimaryAccountManager::SetSyncPrima +@@ -501,10 +405,6 @@ void PrimaryAccountManager::SetSyncPrima // Go ahead and update the last signed in account info here as well. Once a // user is signed in the corresponding preferences should match. Doing it here // as opposed to on signin allows us to catch the upgrade scenario. @@ -6121,7 +6251,7 @@ } void PrimaryAccountManager::SetPrimaryAccountInternal( -@@ -517,19 +417,6 @@ void PrimaryAccountManager::SetPrimaryAc +@@ -516,19 +416,6 @@ void PrimaryAccountManager::SetPrimaryAc // 'account_info' might be a reference to the contents of `primary_account_`. // Create a PrimaryAccount object before calling emplace to avoid crashes. primary_account_.emplace(PrimaryAccount(account_info, consented_to_sync)); @@ -6141,7 +6271,7 @@ } void PrimaryAccountManager::RecordHadPreviousSyncAccount() const { -@@ -539,7 +426,7 @@ void PrimaryAccountManager::RecordHadPre +@@ -538,7 +425,7 @@ void PrimaryAccountManager::RecordHadPre } const std::string& last_gaia_id_with_sync_enabled = @@ -6150,9 +6280,9 @@ const bool existed_primary_account_with_sync = !last_gaia_id_with_sync_enabled.empty(); -@@ -699,27 +586,6 @@ void PrimaryAccountManager::ComputeExpli - const absl::variant& event_source, +@@ -688,36 +575,6 @@ PrimaryAccountChangeEvent::State Primary + void PrimaryAccountManager::ComputeExplicitBrowserSignin( + const PrimaryAccountChangeEvent& event_details, ScopedPrefCommit& scoped_pref_commit) { - switch (event_details.GetEventTypeFor(signin::ConsentLevel::kSignin)) { - case PrimaryAccountChangeEvent::Type::kNone: @@ -6161,14 +6291,23 @@ - scoped_pref_commit.ClearPref(prefs::kExplicitBrowserSignin); - return; - case PrimaryAccountChangeEvent::Type::kSet: -- CHECK(absl::holds_alternative(event_source)); +- CHECK(event_details.GetAccessPoint().has_value()); - signin_metrics::AccessPoint access_point = -- absl::get(event_source); +- event_details.GetAccessPoint().value(); - - if (access_point == signin_metrics::AccessPoint::ACCESS_POINT_UNKNOWN || -- access_point == -- signin_metrics::AccessPoint::ACCESS_POINT_WEB_SIGNIN) { +- (access_point == +- signin_metrics::AccessPoint::ACCESS_POINT_WEB_SIGNIN && +- !switches::IsExplicitBrowserSigninUIOnDesktopEnabled( +- switches::ExplicitBrowserSigninPhase::kFull))) { - scoped_pref_commit.ClearPref(prefs::kExplicitBrowserSignin); +- } else if (access_point == +- signin_metrics::AccessPoint::ACCESS_POINT_WEB_SIGNIN && +- switches::IsExplicitBrowserSigninUIOnDesktopEnabled( +- switches::ExplicitBrowserSigninPhase::kFull)) { +- // If a web sign in occurs, we do not want to clear the explicit signin +- // pref, since it might be a result of previously accepting the bubble. +- // Therefore we just keep the value as is. - } else { - // All others access points are explicit sign ins except the Web - // Signin event. @@ -6238,14 +6377,14 @@ #include "components/sync_preferences/testing_pref_service_syncable.h" --- a/components/signin/public/base/BUILD.gn +++ b/components/signin/public/base/BUILD.gn -@@ -49,8 +49,6 @@ static_library("base") { - "signin_client.h", - "signin_metrics.cc", - "signin_metrics.h", +@@ -164,8 +164,6 @@ component("signin_switches") { + defines = [ "IS_SIGNIN_SWITCHES_IMPL" ] + + sources = [ - "signin_pref_names.cc", - "signin_pref_names.h", - "wait_for_network_callback_helper.cc", - "wait_for_network_callback_helper.h", + "signin_switches.cc", + "signin_switches.h", ] --- a/components/signin/public/base/device_id_helper.cc +++ b/components/signin/public/base/device_id_helper.cc @@ -6330,6 +6469,28 @@ } #endif +--- a/components/signin/public/base/signin_switches.cc ++++ b/components/signin/public/base/signin_switches.cc +@@ -7,7 +7,6 @@ + #include "base/feature_list.h" + #include "base/metrics/field_trial_params.h" + #include "components/prefs/pref_service.h" +-#include "components/signin/public/base/signin_pref_names.h" + + namespace switches { + +@@ -36,11 +35,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti + base::FEATURE_DISABLED_BY_DEFAULT); + + bool IsBoundSessionCredentialsEnabled(const PrefService* profile_prefs) { +- // Enterprise policy takes precedence over the feature value. +- if (profile_prefs->HasPrefPath(prefs::kBoundSessionCredentialsEnabled)) { +- return profile_prefs->GetBoolean(prefs::kBoundSessionCredentialsEnabled); +- } +- + return base::FeatureList::IsEnabled(kEnableBoundSessionCredentials); + } + --- a/components/signin/public/identity_manager/identity_utils.cc +++ b/components/signin/public/identity_manager/identity_utils.cc @@ -11,7 +11,6 @@ @@ -6380,7 +6541,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/supervised_user/core/browser/supervised_user_settings_service.h" #include "components/supervised_user/core/browser/supervised_user_url_filter.h" -@@ -60,14 +59,6 @@ SupervisedUserSettingsPrefMappingEntry k +@@ -56,14 +55,6 @@ SupervisedUserSettingsPrefMappingEntry k prefs::kSupervisedUserSafeSites, }, { @@ -6405,19 +6566,25 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "components/sync/base/passphrase_enums.h" -@@ -270,16 +269,6 @@ UserSelectableTypeSet SyncPrefs::GetSele - } else if (type == UserSelectableType::kPasswords) { +@@ -271,22 +270,6 @@ UserSelectableTypeSet SyncPrefs::GetSele + type == UserSelectableType::kAutofill) { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) type_enabled = true; -#else -- // kPasswords is only on by default if there was an explicit sign in -- // recordedand the `switches::kUnoDesktop` is enabled. -- // Otherwise the type requires a dedicated opt-in. Note: If -- // this changes, also update the migration logic in +- // kPasswords and kAutofill are only on by default if there was an +- // explicit sign in recorded and +- // `IsExplicitBrowserSigninUIOnDesktopEnabled()` is true. +- // Otherwise: +- // - kPasswords requires a dedicated opt-in. +- // - kAutofill cannot be enabled. +- // Note: If this changes, also update the migration logic in - // MigrateGlobalDataTypePrefsToAccount(). +- switches::ExplicitBrowserSigninPhase phase = +- type == UserSelectableType::kPasswords +- ? switches::ExplicitBrowserSigninPhase::kExperimental +- : switches::ExplicitBrowserSigninPhase::kFull; - type_enabled = -- switches::IsExplicitBrowserSigninUIOnDesktopEnabled( -- switches::ExplicitBrowserSigninPhase::kExperimental) && +- switches::IsExplicitBrowserSigninUIOnDesktopEnabled(phase) && - pref_service_->GetBoolean(::prefs::kExplicitBrowserSignin); #endif } else if (type == UserSelectableType::kBookmarks || @@ -6442,7 +6609,7 @@ kSyncedDefaultSearchProviderGUID = 49, kPrefForceTriggerTranslateCount = 50, // kPrefNeverPromptSitesDeprecated = 51, (deprecated) -@@ -250,16 +247,9 @@ constexpr auto kCommonSyncablePrefsAllow +@@ -255,16 +252,9 @@ constexpr auto kCommonSyncablePrefsAllow {payments::kCanMakePaymentEnabled, {syncable_prefs_ids::kCanMakePaymentEnabled, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index 3b06f92a..dedbe3d0 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 -@@ -168,6 +168,7 @@ +@@ -167,6 +167,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/strings/grit/components_strings.h" #include "components/supervised_user/core/common/buildflags.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" -@@ -2189,6 +2190,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -2199,6 +2200,7 @@ void RenderViewContextMenu::AppendPageIt menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); if (CanTranslate(/*menu_logging=*/true)) { @@ -92,14 +92,14 @@ server_params.c_str()); GURL security_origin = translate::GetTranslateSecurityOrigin(); -- base::StringAppendF(&data_, "var securityOrigin = '%s';", +- base::StringAppendF(&data_, "var securityOrigin = '%s';\n", - security_origin.spec().c_str()); + const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); + if (command_line.HasSwitch(translate::switches::kTranslateScriptURL)) { -+ base::StringAppendF(&data_, "var securityOrigin = '%s';", ++ base::StringAppendF(&data_, "var securityOrigin = '%s';\n", + security_origin.spec().c_str()); + } else { -+ base::StringAppendF(&data_, "var securityOrigin = '';"); ++ base::StringAppendF(&data_, "var securityOrigin = '';\n"); + } // Load embedded translate.js. 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 6636fd58..a49540b5 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 -@@ -2552,6 +2552,7 @@ static_library("browser") { +@@ -2562,6 +2562,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 -@@ -168,6 +168,7 @@ +@@ -169,6 +169,7 @@ #include "components/translate/core/common/translate_util.h" #include "components/trusted_vault/features.h" #include "components/ui_devtools/switches.h" @@ -51,7 +51,7 @@ + "//components/ungoogled:ungoogled_switches", "//third_party/webrtc_overrides:webrtc_component", "//third_party/zlib", - "//third_party/zlib/google:zip", + "//tools/v8_context_snapshot:buildflags", --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -77,6 +77,7 @@ @@ -62,7 +62,7 @@ #include "components/viz/common/switches.h" #include "components/viz/host/gpu_client.h" #include "content/browser/bad_message.h" -@@ -3441,6 +3442,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3440,6 +3441,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLImageChromium, switches::kEnableWebGPUDeveloperFeatures, switches::kFileUrlPathAlias, @@ -83,7 +83,7 @@ "//ui/events/blink", --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -40,6 +40,7 @@ +@@ -39,6 +39,7 @@ #include "third_party/blink/public/common/loader/referrer_utils.h" #include "third_party/blink/public/common/switches.h" #include "third_party/blink/public/platform/web_runtime_features.h" @@ -91,9 +91,9 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -506,6 +507,10 @@ void SetRuntimeFeaturesFromCommandLine(c - true}, - {wrf::EnableDirectSockets, switches::kEnableIsolatedWebAppsInRenderer, +@@ -508,6 +509,10 @@ void SetRuntimeFeaturesFromCommandLine(c + switches::kEnableWebGPUDeveloperFeatures, true}, + {wrf::EnableWebGPUExperimentalFeatures, switches::kEnableUnsafeWebGPU, true}, + {wrf::EnableFingerprintingClientRectsNoise, + switches::kFingerprintingClientRectsNoise, true}, @@ -124,9 +124,9 @@ #include "base/ranges/algorithm.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" -@@ -929,6 +930,11 @@ Document::Document(const DocumentInit& i - : nullptr), - data_(MakeGarbageCollected(GetExecutionContext())) { +@@ -934,6 +935,11 @@ Document::Document(const DocumentInit& i + TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this), + TRACE_EVENT_FLAG_FLOW_OUT); DCHECK(agent_); + if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) { + // Precompute -0.0003% to 0.0003% noise factor for get*ClientRect*() fingerprinting @@ -136,7 +136,7 @@ if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) && features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) { script_runner_delayer_->Activate(); -@@ -1041,6 +1047,14 @@ const Position Document::PositionAdjuste +@@ -1046,6 +1052,14 @@ const Position Document::PositionAdjuste return Position::BeforeNode(*shadow_host); } @@ -153,7 +153,7 @@ selector_query_cache_ = std::make_unique(); --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -531,6 +531,10 @@ class CORE_EXPORT Document : public Cont +@@ -532,6 +532,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -164,7 +164,7 @@ AtomicString visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -2507,6 +2511,9 @@ class CORE_EXPORT Document : public Cont +@@ -2533,6 +2537,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -176,7 +176,7 @@ --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2342,6 +2342,11 @@ DOMRectList* Element::getClientRects() { +@@ -2344,6 +2344,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads, *element_layout_object); @@ -188,7 +188,7 @@ return MakeGarbageCollected(quads); } -@@ -2369,6 +2374,9 @@ gfx::RectF Element::GetBoundingClientRec +@@ -2371,6 +2376,9 @@ gfx::RectF Element::GetBoundingClientRec DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -266,7 +266,7 @@ const TextDirection&, --- 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 -@@ -75,6 +75,9 @@ +@@ -78,6 +78,9 @@ #include "ui/gfx/geometry/quad_f.h" #include "ui/gfx/geometry/skia_conversions.h" @@ -276,7 +276,7 @@ namespace blink { BASE_FEATURE(kDisableCanvasOverdrawOptimization, -@@ -3163,8 +3166,22 @@ TextMetrics* BaseRenderingContext2D::mea +@@ -3166,8 +3169,22 @@ TextMetrics* BaseRenderingContext2D::mea const CanvasRenderingContext2DState& state = GetState(); TextDirection direction = ToTextDirection(state.GetDirection(), canvas); @@ -303,7 +303,7 @@ void BaseRenderingContext2D::SnapshotStateForFilter() { --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1708,6 +1708,7 @@ component("platform") { +@@ -1716,6 +1716,7 @@ component("platform") { "//cc/mojo_embedder", "//components/paint_preview/common", "//components/search_engines:search_engine_utils", @@ -328,7 +328,7 @@ } // namespace blink --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1753,6 +1753,12 @@ +@@ -1789,6 +1789,12 @@ status: "experimental", }, { 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 3b0d4e3d..e56a509b 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 -@@ -3444,6 +3444,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3443,6 +3443,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 -@@ -511,6 +511,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -513,6 +513,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -65,7 +65,7 @@ approach to change color components. }; --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -66,6 +66,7 @@ +@@ -68,6 +68,7 @@ #include "third_party/blink/renderer/platform/graphics/image_data_buffer.h" #include "third_party/blink/renderer/platform/graphics/memory_managed_paint_recorder.h" #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" @@ -73,7 +73,7 @@ approach to change color components. #include "third_party/blink/renderer/platform/graphics/stroke_data.h" #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" -@@ -2489,6 +2490,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -2492,6 +2493,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 -@@ -1661,7 +1661,9 @@ component("platform") { +@@ -1669,7 +1669,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -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 -@@ -1759,6 +1759,9 @@ +@@ -1795,6 +1795,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 be651d1e..e9f961b3 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 -@@ -2269,6 +2269,7 @@ static_library("browser") { +@@ -2278,6 +2278,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -100,7 +100,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2318,6 +2318,10 @@ const char kUndoAutofillDescription[] = +@@ -2333,6 +2333,10 @@ const char kUndoAutofillDescription[] = "Allows reverting Autofill filling operations. Replaces Clear Form " "functionality"; @@ -113,7 +113,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 -@@ -1312,6 +1312,9 @@ extern const char kLogJsConsoleMessagesD +@@ -1330,6 +1330,9 @@ extern const char kLogJsConsoleMessagesD extern const char kUndoAutofillName[]; extern const char kUndoAutofillDescription[]; diff --git a/patches/extra/debian/disable/google-api-warning.patch b/patches/extra/debian/disable/google-api-warning.patch index ca9115f4..bdf82c75 100644 --- a/patches/extra/debian/disable/google-api-warning.patch +++ b/patches/extra/debian/disable/google-api-warning.patch @@ -3,12 +3,13 @@ author: Michael Gilbert --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc -@@ -146,9 +146,6 @@ void AddInfoBarsIfNecessary(Browser* bro +@@ -151,10 +151,6 @@ void AddInfoBarsIfNecessary(Browser* bro infobars::ContentInfoBarManager* infobar_manager = infobars::ContentInfoBarManager::FromWebContents(web_contents); -- if (!google_apis::HasAPIKeyConfigured()) +- if (!google_apis::HasAPIKeyConfigured()) { - GoogleApiKeysInfoBarDelegate::Create(infobar_manager); +- } - if (ObsoleteSystem::IsObsoleteNowOrSoon()) { PrefService* local_state = g_browser_process->local_state(); diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 40b21c8d..cbe89d62 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 -@@ -1476,7 +1476,7 @@ void ChromeContentBrowserClient::Registe +@@ -1483,7 +1483,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -23,7 +23,7 @@ // used for mapping the command-line flags). --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -378,7 +378,7 @@ void ProfileNetworkContextService::Updat +@@ -381,7 +381,7 @@ void ProfileNetworkContextService::Updat void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled, @@ -67,7 +67,7 @@ --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -85,7 +85,7 @@ void RegisterBrowserUserPrefs(user_prefs +@@ -84,7 +84,7 @@ void RegisterBrowserUserPrefs(user_prefs registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); registry->RegisterBooleanPref( @@ -98,7 +98,7 @@ prefs::kAutofillPaymentCvcStorage, true, --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc -@@ -487,7 +487,7 @@ bool DoesBookmarkContainWords(const std: +@@ -490,7 +490,7 @@ bool DoesBookmarkContainWords(const std: void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch index a76e3674..67a95967 100644 --- a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch +++ b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch @@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1643,11 +1643,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1651,11 +1651,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 568dc9d7..7ea38311 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 -@@ -273,7 +273,7 @@ void DownloadPrefs::RegisterProfilePrefs +@@ -274,7 +274,7 @@ void DownloadPrefs::RegisterProfilePrefs user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kPromptForDownload, diff --git a/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch b/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch index 59a8c615..df4ad687 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch @@ -8,17 +8,17 @@ #include "base/observer_list.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" -@@ -70,10 +71,12 @@ bool BookmarkTabHelper::ShouldShowBookma - !prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar)) - return false; +@@ -81,9 +82,12 @@ bool BookmarkTabHelper::ShouldShowBookma + const bool has_saved_tab_groups = + stg_service && (stg_service->model()->Count() > 0); + const std::string flag_value = + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("bookmark-bar-ntp"); // The bookmark bar is only shown on the NTP if the user // has added something to it. - return IsNTP(web_contents()) && bookmark_model_ && -- bookmark_model_->HasBookmarks(); -+ bookmark_model_->HasBookmarks() && (flag_value != "never"); +- return IsNTP(web_contents()) && (has_bookmarks || has_saved_tab_groups); ++ return IsNTP(web_contents()) && (has_bookmarks || has_saved_tab_groups) && ++ (flag_value != "never"); } void BookmarkTabHelper::AddObserver(BookmarkTabHelperObserver* observer) { 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 c4e46af6..3c101de4 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -33,7 +33,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -2945,6 +2950,62 @@ bool Browser::CanCloseWithInProgressDown +@@ -2951,6 +2956,62 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -96,7 +96,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -2963,6 +3024,22 @@ void Browser::InProgressDownloadResponse +@@ -2969,6 +3030,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -129,7 +129,7 @@ #include "chrome/browser/ui/signin/signin_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/unload_controller.h" -@@ -1131,12 +1132,17 @@ class Browser : public TabStripModelObse +@@ -1130,12 +1131,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -147,7 +147,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 HandleBeforeClose(). -@@ -1306,6 +1312,8 @@ class Browser : public TabStripModelObse +@@ -1305,6 +1311,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 bd82f255..9d842086 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 -@@ -871,10 +871,14 @@ bool HandleNewTabPageLocationOverride( +@@ -880,10 +880,14 @@ bool HandleNewTabPageLocationOverride( // Don't change the URL when incognito mode. if (profile->IsOffTheRecord()) diff --git a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch index ed8a12ce..f8a22c43 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -179,6 +179,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKe +@@ -205,6 +205,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKe "AutofillSendUnidentifiedKeyAfterFill", base::FEATURE_DISABLED_BY_DEFAULT); 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 98ae9044..a86e6b98 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 @@ -41,7 +41,7 @@ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/functional/bind.h" -@@ -392,6 +393,15 @@ AutocompleteController::AutocompleteCont +@@ -399,6 +400,15 @@ AutocompleteController::AutocompleteCont steady_state_omnibox_position_( metrics::OmniboxEventProto::UNKNOWN_POSITION) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); 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 5e104efa..413a5aff 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch @@ -27,7 +27,7 @@ return true; --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -348,7 +348,8 @@ void LocationBarView::Init() { +@@ -358,7 +358,8 @@ void LocationBarView::Init() { 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 4aa35be5..c884d961 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 -@@ -250,14 +250,16 @@ void ChromeRenderFrameObserver::DidFinis +@@ -257,14 +257,16 @@ void ChromeRenderFrameObserver::DidFinis if (frame->Parent() || frame->IsInFencedFrameTree()) return; @@ -80,7 +80,7 @@ } bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy( -@@ -1910,6 +1918,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -1912,6 +1920,8 @@ SyncDataMap TemplateURLService::CreateGU } void TemplateURLService::Init() { @@ -89,7 +89,7 @@ if (client_) client_->SetOwner(this); -@@ -2084,6 +2094,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -2087,6 +2097,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch index 6b804f79..c8215350 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch @@ -27,7 +27,7 @@ #include "base/compiler_specific.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" -@@ -1762,6 +1763,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -1764,6 +1765,8 @@ void TabStrip::OnMouseEventInTab(views:: } void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) { 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 5cbc15b7..c630502f 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -8,7 +8,7 @@ #include "base/containers/adapters.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" -@@ -1964,6 +1965,10 @@ void TabStripModel::CloseTabs(base::span +@@ -1981,6 +1982,10 @@ void TabStripModel::CloseTabs(base::span return; } 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 4338b8d7..6856c784 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch @@ -50,7 +50,7 @@ bool IsExtensionDownload(const download::DownloadItem& download_item); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1188,10 +1188,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1192,10 +1192,12 @@ DownloadConfirmationReason DownloadTarge return DownloadConfirmationReason::SAVE_AS; #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch index 4de099d1..93027842 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -1256,6 +1256,8 @@ WindowOpenDisposition NavigationPolicyTo +@@ -1254,6 +1254,8 @@ WindowOpenDisposition NavigationPolicyTo case blink::kWebNavigationPolicyNewWindow: return WindowOpenDisposition::NEW_WINDOW; case blink::kWebNavigationPolicyNewPopup: diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch index 50912830..0ee1cfff 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/net/socket/ssl_client_socket_impl.cc +++ b/net/socket/ssl_client_socket_impl.cc -@@ -298,7 +298,8 @@ class SSLClientSocketImpl::SSLContext { +@@ -206,7 +206,8 @@ class SSLClientSocketImpl::SSLContext { SSL_CTX_sess_set_new_cb(ssl_ctx_.get(), NewSessionCallback); SSL_CTX_set_timeout(ssl_ctx_.get(), 1 * 60 * 60 /* one hour */); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch index 69d2c9c8..0adb7334 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,8 +3,8 @@ --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc -@@ -117,7 +117,8 @@ void AddInfoBarsIfNecessary(Browser* bro - return; +@@ -120,7 +120,8 @@ void AddInfoBarsIfNecessary(Browser* bro + } // Web apps should not display the session restore bubble (crbug.com/1264121) - if (!is_web_app && HasPendingUncleanExit(browser->profile())) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch index 9eaf87d3..eb5097e1 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch @@ -16,7 +16,7 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/feature_engagement/public/event_constants.h" -@@ -543,6 +545,17 @@ void ExtensionsToolbarContainer::AnchorA +@@ -533,6 +535,17 @@ void ExtensionsToolbarContainer::AnchorA widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView( anchor_view && anchor_view->GetVisible() ? anchor_view : GetExtensionsButton()); @@ -34,7 +34,7 @@ widget->Show(); } -@@ -920,6 +933,9 @@ void ExtensionsToolbarContainer::UpdateC +@@ -941,6 +954,9 @@ void ExtensionsToolbarContainer::UpdateC } bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch index fdc95a3f..5119208d 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -1938,6 +1938,10 @@ void BrowserView::UpdateExclusiveAccessE +@@ -1968,6 +1968,10 @@ void BrowserView::UpdateExclusiveAccessE ExclusiveAccessBubbleHideCallback bubble_first_hide_callback, bool notify_download, bool force_update) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch index f105862b..6857d919 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch @@ -1,14 +1,14 @@ --- a/chrome/browser/ui/views/frame/browser_root_view.cc +++ b/chrome/browser/ui/views/frame/browser_root_view.cc -@@ -9,6 +9,7 @@ - #include - #include +@@ -12,6 +12,7 @@ + #include + #include "base/check_op.h" +#include "base/command_line.h" + #include "base/containers/adapters.h" #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" - #include "base/metrics/user_metrics.h" -@@ -113,6 +114,18 @@ DragOperation GetDropEffect(const ui::Dr +@@ -172,6 +173,18 @@ DragOperation GetDropEffect(const ui::Dr return DragOperation::kMove; } @@ -27,7 +27,7 @@ } // namespace BrowserRootView::DropInfo::DropInfo() = default; -@@ -124,7 +137,9 @@ BrowserRootView::DropInfo::~DropInfo() { +@@ -184,7 +197,9 @@ BrowserRootView::DropInfo::~DropInfo() { BrowserRootView::BrowserRootView(BrowserView* browser_view, views::Widget* widget) @@ -38,7 +38,7 @@ BrowserRootView::~BrowserRootView() { // It's possible to destroy the browser while a drop is active. In this case, -@@ -251,7 +266,7 @@ bool BrowserRootView::OnMouseWheel(const +@@ -328,7 +343,7 @@ bool BrowserRootView::OnMouseWheel(const // Scroll-event-changes-tab is incompatible with scrolling tabstrip, so // disable it if the latter feature is enabled. @@ -49,7 +49,7 @@ // tabstrip, or the empty space beside the tabstrip. --- a/chrome/browser/ui/views/frame/browser_root_view.h +++ b/chrome/browser/ui/views/frame/browser_root_view.h -@@ -143,6 +143,8 @@ class BrowserRootView : public views::in +@@ -161,6 +161,8 @@ class BrowserRootView : public views::in int scroll_remainder_x_ = 0; int scroll_remainder_y_ = 0; @@ -57,7 +57,7 @@ + std::unique_ptr drop_info_; - base::WeakPtrFactory weak_ptr_factory_{this}; + base::OnceClosure on_filtering_complete_closure_; --- a/chrome/browser/ungoogled_flag_choices.h +++ b/chrome/browser/ungoogled_flag_choices.h @@ -25,4 +25,13 @@ const FeatureEntry::Choice kShowAvatarBu diff --git a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch index e8fae8ac..bc867a07 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3737,10 +3737,12 @@ const FeatureEntry::Choice kAccountBookm +@@ -3816,10 +3816,12 @@ const FeatureEntry::FeatureVariation kDe #include "chrome/browser/ungoogled_flag_choices.h" #include "chrome/browser/bromite_flag_choices.h" #include "chrome/browser/ungoogled_platform_flag_choices.h" diff --git a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch index b32a412e..4bc14702 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch @@ -38,7 +38,7 @@ if (is_android || enable_library_cdms) { --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -1054,6 +1054,14 @@ BASE_FEATURE(kNewFilesPolicyUX, +@@ -998,6 +998,14 @@ BASE_FEATURE(kNewFilesPolicyUX, // referrers instead of their ordinary behavior. BASE_FEATURE(kNoReferrers, "NoReferrers", base::FEATURE_DISABLED_BY_DEFAULT); @@ -55,7 +55,7 @@ // on-screen until dismissed, they are instead shown for a very long time. --- a/chrome/common/chrome_features.h +++ b/chrome/common/chrome_features.h -@@ -621,6 +621,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX); +@@ -592,6 +592,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers); @@ -152,7 +152,7 @@ +#endif // CHROME_COMMON_REFERRER_SANITIZER_H_ --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn -@@ -350,8 +350,7 @@ source_set("lib") { +@@ -359,8 +359,7 @@ source_set("lib") { "//base/third_party/dynamic_annotations", "//build:branding_buildflags", "//build:chromeos_buildflags", @@ -173,7 +173,7 @@ disallowed_extension_deps_ = [ # Components should largely not depend on //extensions. Since // extensions # is not a component target and is linked with //chrome, depending on most -@@ -831,7 +831,7 @@ test("components_unittests") { +@@ -832,7 +832,7 @@ test("components_unittests") { # On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -193,15 +193,15 @@ } --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -43,6 +43,7 @@ +@@ -42,6 +42,7 @@ #include "build/build_config.h" #include "build/buildflag.h" #include "build/chromeos_buildflags.h" +#include "chrome/common/referrer_sanitizer.h" + #include "components/viz/host/host_frame_sink_manager.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" #include "content/browser/browsing_topics/header_util.h" - #include "content/browser/child_process_security_policy_impl.h" -@@ -396,10 +397,10 @@ void AddAdditionalRequestHeaders( +@@ -398,10 +399,10 @@ void AddAdditionalRequestHeaders( net::HttpRequestHeaders::kUserAgent, ComputeUserAgentValue(*headers, user_agent_override, browser_context)); @@ -226,7 +226,7 @@ #include "content/common/associated_interfaces.mojom.h" #include "content/common/content_navigation_policy.h" #include "content/common/content_switches_internal.h" -@@ -4524,10 +4525,13 @@ void RenderFrameImpl::WillSendRequestInt +@@ -4544,10 +4545,13 @@ void RenderFrameImpl::WillSendRequestInt request.SetHasUserGesture(frame_->HasTransientUserActivation()); @@ -246,7 +246,7 @@ void RenderFrameImpl::DidLoadResourceFromMemoryCache( --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -279,6 +279,7 @@ static_library("content_shell_lib") { +@@ -299,6 +299,7 @@ static_library("content_shell_lib") { "//base/third_party/dynamic_annotations", "//build:chromeos_buildflags", "//cc/base", diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index 90e8402d..83ae56cf 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -35,7 +35,7 @@ // https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html. --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -151,11 +151,6 @@ const size_t kMaxHostLength = 4096; +@@ -150,11 +150,6 @@ const size_t kMaxHostLength = 4096; // cached. const int kIPv6ProbePeriodMs = 1000; @@ -47,7 +47,7 @@ // True if |hostname| ends with either ".local" or ".local.". bool ResemblesMulticastDNSName(base::StringPiece hostname) { return hostname.ends_with(".local") || hostname.ends_with(".local."); -@@ -1373,33 +1368,10 @@ int HostResolverManager::StartIPv6Reacha +@@ -1351,33 +1346,10 @@ int HostResolverManager::StartIPv6Reacha return OK; } diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index 4f7b78cc..4d9d343d 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 -@@ -3733,7 +3733,13 @@ const FeatureEntry::Choice kAccountBookm +@@ -3812,7 +3812,13 @@ const FeatureEntry::FeatureVariation kDe // calculate and verify checksum. // // When adding a new choice, add it to the end of the list. diff --git a/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch b/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch index f1c68fe7..5d49d87e 100644 --- a/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch +++ b/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -97,7 +97,7 @@ void RegisterBrowserUserPrefs(user_prefs +@@ -96,7 +96,7 @@ void RegisterBrowserUserPrefs(user_prefs false); #endif registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy, diff --git a/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch b/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch index 00d637d2..e34261c5 100644 --- a/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch +++ b/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch @@ -1,10 +1,10 @@ --- a/chrome/browser/media/webrtc/capture_policy_utils.cc +++ b/chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -140,69 +140,12 @@ void RegisterProfilePrefs(PrefRegistrySi +@@ -141,69 +141,12 @@ void RegisterProfilePrefs(PrefRegistrySi } bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_CHROMEOS) - Profile* profile = Profile::FromBrowserContext(context); - if (!profile) { - return false; @@ -39,7 +39,7 @@ bool IsGetAllScreensMediaAllowed(content::BrowserContext* context, const GURL& url) { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_CHROMEOS) - Profile* profile = Profile::FromBrowserContext(context); - if (!profile) { - return false; diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index f9c5f307..cda81941 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -147,9 +147,9 @@ "//components/power_monitor", "//components/services/filesystem:lib", - "//components/services/quarantine:quarantine", - "//components/services/screen_ai/buildflags", "//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_safe_move_helper.cc +++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc @@ -14,7 +14,6 @@ diff --git a/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch b/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch index 1c969a9b..4c76e254 100644 --- a/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch +++ b/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch @@ -1,6 +1,6 @@ --- a/components/optimization_guide/core/optimization_guide_features.cc +++ b/components/optimization_guide/core/optimization_guide_features.cc -@@ -133,7 +133,7 @@ BASE_FEATURE(kOptimizationHints, +@@ -53,7 +53,7 @@ BASE_FEATURE(kOptimizationHints, // Enables fetching from a remote Optimization Guide Service. BASE_FEATURE(kRemoteOptimizationGuideFetching, "OptimizationHintsFetching", diff --git a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch index 2564c5f1..e88fd44d 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 -@@ -3865,8 +3865,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3868,8 +3868,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -13,7 +13,7 @@ } SynthesizeGLError( GL_INVALID_ENUM, "getParameter", -@@ -3880,8 +3879,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3883,8 +3882,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 6a3f5c45..96074d0f 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 -@@ -1667,7 +1667,7 @@ BASE_FEATURE(kPrefetchFontLookupTables, +@@ -1733,7 +1733,7 @@ BASE_FEATURE(kPrefetchFontLookupTables, // crbug.com/988956. 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 222d963a..7f3e7920 100644 --- a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch +++ b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch @@ -14,7 +14,7 @@ } return content_restrictions; } -@@ -1663,8 +1658,7 @@ bool CanSavePage(const Browser* browser) +@@ -1664,8 +1659,7 @@ bool CanSavePage(const Browser* browser) DownloadPrefs::DownloadRestriction::ALL_FILES) { return false; } @@ -62,7 +62,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 -@@ -32,11 +32,7 @@ bool HasWebUIOrigin(const url::Origin& o +@@ -40,11 +40,7 @@ bool IsPdfInternalPluginAllowedOrigin(co } 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 a9eb96fc..870e88c5 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 @@ -15,7 +15,7 @@ reserved_grab_handle_space_ = --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -1998,8 +1998,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2001,8 +2001,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { @@ -24,7 +24,7 @@ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); CHECK(clipboard); std::u16string clipboard_text; -@@ -2008,7 +2006,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2011,7 +2009,6 @@ void TabStrip::NewTabButtonPressed(const if (!clipboard_text.empty()) { controller_->CreateNewTabWithLocation(clipboard_text); } diff --git a/patches/extra/ungoogled-chromium/first-run-page.patch b/patches/extra/ungoogled-chromium/first-run-page.patch index 08d6085f..2737819a 100644 --- a/patches/extra/ungoogled-chromium/first-run-page.patch +++ b/patches/extra/ungoogled-chromium/first-run-page.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1070,6 +1070,7 @@ int ChromeBrowserMainParts::PreCreateThr +@@ -1086,6 +1086,7 @@ int ChromeBrowserMainParts::PreCreateThr if (first_run::IsChromeFirstRun()) { if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) && !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) { @@ -10,7 +10,7 @@ --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -60,6 +60,7 @@ +@@ -61,6 +61,7 @@ #include "chrome/browser/ui/webui/suggest_internals/suggest_internals_ui.h" #include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h" #include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h" @@ -18,7 +18,7 @@ #include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h" #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h" #include "chrome/browser/ui/webui/version/version_ui.h" -@@ -836,6 +837,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc +@@ -837,6 +838,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc return &NewWebUI; } @@ -169,7 +169,7 @@ +#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_ --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -669,6 +669,7 @@ const char kExtensionConfigureCommandsSu +@@ -673,6 +673,7 @@ const char kExtensionConfigureCommandsSu // Add hosts here to be included in chrome://chrome-urls (about:about). // These hosts will also be suggested by BuiltinProvider. const char* const kChromeHostURLs[] = { diff --git a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch index 7db4b0be..273ebc66 100644 --- a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch +++ b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch @@ -1,9 +1,9 @@ ## template_url_prepopulate_data.cc # Adds DDG to the default search engines. # ---- a/components/search_engines/template_url_prepopulate_data.cc -+++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -66,6 +66,7 @@ constexpr EngineAndTier engines_default[ +--- a/components/search_engines/search_engine_countries-inc.cc ++++ b/components/search_engines/search_engine_countries-inc.cc +@@ -36,6 +36,7 @@ constexpr EngineAndTier engines_default[ {SearchEngineTier::kTopEngines, &google}, {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &yahoo}, diff --git a/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch b/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch index 95450e4c..ce2435b0 100644 --- a/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch +++ b/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -72,7 +72,6 @@ const char* const kBadFlags[] = { +@@ -73,7 +73,6 @@ const char* const kBadFlags[] = { // These flags disable sandbox-related security. sandbox::policy::switches::kDisableGpuSandbox, sandbox::policy::switches::kDisableSeccompFilterSandbox, diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 81c499c9..39fbeb96 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -112,7 +112,7 @@ - -