diff --git a/chromium_version.txt b/chromium_version.txt index a2eb6c55..4ae33117 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -136.0.7103.113 +137.0.7151.55 diff --git a/domain_substitution.list b/domain_substitution.list index 1bbeff14..e7460c2f 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -172,8 +172,8 @@ ash/webui/common/resources/PRESUBMIT.py 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.ts ash/webui/common/resources/sea_pen/constants_generated.ts -ash/webui/common/resources/sea_pen/sea_pen_untranslated_constants.ts ash/webui/common/resources/sea_pen/surface_effects/sparkle.ts ash/webui/diagnostics_ui/backend/input/input_data_provider_keyboard_unittest.cc ash/webui/diagnostics_ui/diagnostics_ui.cc @@ -231,7 +231,6 @@ ash/webui/shortcut_customization_ui/resources/PRESUBMIT.py ash/webui/shortcut_customization_ui/url_constants.cc ash/webui/system_apps/public/system_web_app_type.h ash/wm/coral/coral_controller_unittest.cc -ash/wm/desks/desks_unittests.cc ash/wm/desks/templates/admin_template_unittest.cc ash/wm/desks/templates/saved_desk_unittest.cc ash/wm/overview/birch/birch_bar_unittest.cc @@ -242,6 +241,7 @@ base/BUILD.gn base/PRESUBMIT.py base/allocator/partition_alloc_support.cc base/allocator/partition_allocator/PRESUBMIT.py +base/allocator/partition_allocator/partition_alloc.gni base/allocator/partition_allocator/src/partition_alloc/BUILD.gn base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h base/allocator/partition_allocator/src/partition_alloc/build_config.h @@ -252,6 +252,7 @@ base/allocator/partition_allocator/src/partition_alloc/oom.h base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_win.h base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h +base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace.cc base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.h base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/memory/scoped_refptr.h base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc @@ -274,8 +275,10 @@ base/android/library_loader/library_loader_hooks.h base/android/meminfo_dump_provider.cc base/android/requires_api.h base/android/resource_exclusions.gni +base/android/sys_utils.cc base/apple/foundation_util_unittest.mm base/apple/owned_objc.h +base/apple/owned_objc_types.h base/atomicops.h base/barrier_callback.h base/base_paths_win.cc @@ -285,11 +288,13 @@ base/command_line.h base/compiler_specific.h base/containers/checked_iterators_unittest.cc base/debug/debugger_posix.cc +base/debug/stack_trace.cc base/debug/stack_trace_fuchsia.cc base/debug/stack_trace_posix.cc base/debug/stack_trace_win.cc base/file_version_info.h base/files/file_enumerator_posix.cc +base/files/file_path.cc base/files/file_path_watcher_unittest.cc base/files/file_path_watcher_win.cc base/files/file_unittest.cc @@ -341,7 +346,6 @@ base/profiler/metadata_recorder.h base/rand_util_win.cc base/strings/pattern_unittest.cc base/strings/string_number_conversions_unittest.cc -base/synchronization/lock.h base/synchronization/lock_impl_posix.cc base/system/sys_info.h base/task/sequence_manager/sequence_manager_impl.cc @@ -394,6 +398,7 @@ base/win/shortcut.cc base/win/win_util.cc base/win/win_util.h base/win/wincrypt_shim.h +base/win/windows_handle_util.h base/win/windows_version.h base/win/windows_version_unittest.cc base/win/wmi.cc @@ -448,6 +453,7 @@ build/chromeos/PRESUBMIT.py build/chromeos/test_runner.py build/config/BUILDCONFIG.gn build/config/android/BUILD.gn +build/config/android/config.gni build/config/android/internal_rules.gni build/config/android/rules.gni build/config/arm.gni @@ -469,6 +475,7 @@ build/config/win/control_flow_guard.gni build/fuchsia/PRESUBMIT.py build/fuchsia/binary_size_differ.py build/fuchsia/binary_sizes.py +build/fuchsia/gen_build_defs.py build/fuchsia/get_auth_token.py build/fuchsia/test/PRESUBMIT.py build/gn_ast/gn_ast.py @@ -480,7 +487,6 @@ build/linux/unbundle/remove_bundled_libraries.py build/mac_toolchain.py build/nocompile.gni build/rust/rustc_wrapper.py -build/rust/std/remap_alloc.cc build/rust/std/rules/BUILD.gn build/sanitizers/lsan_suppressions.cc build/sanitizers/tsan_suppressions.cc @@ -538,7 +544,9 @@ chrome/app/theme/PRESUBMIT.py chrome/browser/PRESUBMIT.py chrome/browser/about_flags.cc chrome/browser/accessibility/live_caption/live_caption_speech_recognition_host_browsertest.cc +chrome/browser/actor/tools/page_tool.cc chrome/browser/ai/ai_data_keyed_service.cc +chrome/browser/ai/ai_data_keyed_service_browsertest.cc chrome/browser/ai/ai_language_model.cc chrome/browser/ai/ai_language_model_unittest.cc chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc @@ -666,7 +674,7 @@ chrome/browser/ash/bluetooth/bluetooth_log_controller_unittest.cc chrome/browser/ash/bluetooth/debug_logs_manager_unittest.cc chrome/browser/ash/boca/on_task/on_task_locked_session_navigation_throttle_interactive_ui_test.cc chrome/browser/ash/boca/on_task/on_task_locked_session_window_tracker_browsertest.cc -chrome/browser/ash/boca/spotlight/spotlight_crd_manager_impl_unittest.cc +chrome/browser/ash/boca/spotlight/spotlight_crd_manager_impl_browsertest.cc chrome/browser/ash/bruschetta/bruschetta_download.cc chrome/browser/ash/calendar/calendar_client_impl.cc chrome/browser/ash/calendar/calendar_client_impl_unittest.cc @@ -844,7 +852,7 @@ chrome/browser/ash/wallpaper_handlers/google_photos_wallpaper_handlers_unittest. chrome/browser/ash/wallpaper_handlers/sea_pen_fetcher.cc chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc chrome/browser/autocomplete/autocomplete_browsertest.cc -chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc +chrome/browser/autocomplete/chrome_autocomplete_provider_client_browsertest.cc chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier_unittest.cc chrome/browser/autocomplete/search_provider_unittest.cc chrome/browser/autocomplete/tab_matcher_desktop_unittest.cc @@ -861,6 +869,7 @@ 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/bookmark_merged_surface_service_unittest.cc +chrome/browser/bookmarks/bookmark_test_utils.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 @@ -928,7 +937,6 @@ chrome/browser/content_settings/content_settings_pref_provider_unittest.cc chrome/browser/content_settings/host_content_settings_map_unittest.cc chrome/browser/content_settings/javascript_optimizer_provider_android_unittest.cc chrome/browser/content_settings/sound_content_setting_observer_unittest.cc -chrome/browser/contextual_cueing/contextual_cueing_helper_interactive_uitest.cc chrome/browser/contextual_cueing/zero_state_suggestions_page_data_browsertest.cc chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc chrome/browser/data_sharing/desktop/data_sharing_conversion_utils_unittest.cc @@ -987,11 +995,12 @@ chrome/browser/enterprise/profile_management/profile_management_navigation_throt chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc chrome/browser/enterprise/reporting/extension_request/extension_request_notification_unittest.cc chrome/browser/enterprise/reporting/extension_request/extension_request_observer_unittest.cc -chrome/browser/enterprise/signals/signals_utils.cc +chrome/browser/enterprise/signals/profile_signals_collector_browsertest.cc chrome/browser/enterprise/signin/enterprise_signin_service_browsertest.cc chrome/browser/enterprise/signin/token_managed_profile_creation_delegate_unittest.cc chrome/browser/enterprise/util/managed_browser_utils.cc chrome/browser/enterprise/util/managed_browser_utils.h +chrome/browser/enterprise/webstore/chrome_web_store_navigation_throttle_unittest.cc chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc chrome/browser/error_reporting/chrome_js_error_report_processor_unittest.cc chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc @@ -1086,6 +1095,7 @@ chrome/browser/extensions/extension_util_unittest.cc chrome/browser/extensions/external_policy_loader_unittest.cc chrome/browser/extensions/external_pref_loader.cc chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc +chrome/browser/extensions/file_handlers/web_file_handlers_permission_handler.cc chrome/browser/extensions/forced_extensions/force_installed_test_base.cc chrome/browser/extensions/install_signer.cc chrome/browser/extensions/installed_loader_unittest.cc @@ -1163,6 +1173,7 @@ chrome/browser/keyboard_accessory/android/address_accessory_controller_impl_unit chrome/browser/keyboard_accessory/android/password_accessory_controller_impl_unittest.cc chrome/browser/lifetime/switch_utils_unittest.cc chrome/browser/loader/from_gws_navigation_and_keep_alive_request_observer_unittest.cc +chrome/browser/loader/keep_alive_request_browsertest_util.h chrome/browser/loader/keep_alive_request_tracker.h chrome/browser/loader/keep_alive_url_browsertest.cc chrome/browser/local_discovery/service_discovery_client_mac.mm @@ -1190,8 +1201,6 @@ chrome/browser/media/router/providers/cast/cast_media_route_provider_unittest.cc chrome/browser/media/router/providers/dial/dial_activity_manager_unittest.cc chrome/browser/media/router/providers/dial/dial_media_route_provider.cc chrome/browser/media/router/providers/dial/dial_media_route_provider_unittest.cc -chrome/browser/media/webrtc/capture_policy_utils_browsertest.cc -chrome/browser/media/webrtc/capture_policy_utils_unittest.cc chrome/browser/media/webrtc/display_media_access_handler_unittest.cc chrome/browser/media/webrtc/webrtc_browsertest_common.cc chrome/browser/media/webrtc/webrtc_event_log_uploader.cc @@ -1354,6 +1363,7 @@ chrome/browser/policy/test/force_google_safe_search_policy_browsertest.cc chrome/browser/policy/test/policy_statistics_collector_browsertest.cc chrome/browser/policy/test/policy_test_google_browsertest.cc chrome/browser/policy/test/safe_browsing_policy_browsertest.cc +chrome/browser/policy/test/sharing_policy_browsertest.cc chrome/browser/policy/test/system_features_policy_browsertest.cc chrome/browser/policy/webhid_device_policy_handler_unittest.cc chrome/browser/policy/webusb_allow_devices_for_urls_policy_handler_unittest.cc @@ -1383,6 +1393,7 @@ chrome/browser/preloading/prefetch/prefetch_service/chrome_prefetch_service_dele chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper_browsertest.cc chrome/browser/preloading/preview/preview_navigation_throttle.h chrome/browser/preloading/preview/preview_zoom_controller.h +chrome/browser/preloading/search_preload/search_preload_pipeline_manager.cc chrome/browser/printing/print_preview_dialog_controller_unittest.cc chrome/browser/privacy/secure_dns_bridge.cc chrome/browser/privacy_sandbox/PRESUBMIT.py @@ -1456,11 +1467,14 @@ chrome/browser/resources/ash/settings/os_people_page/add_user_dialog.ts chrome/browser/resources/ash/settings/os_privacy_page/os_privacy_page.ts chrome/browser/resources/ash/settings/os_settings_icons.html chrome/browser/resources/ash/settings/settings_shared.css +chrome/browser/resources/bookmarks/browser_proxy.ts chrome/browser/resources/bookmarks/command_manager.ts chrome/browser/resources/browsing_topics/browsing_topics_internals.html chrome/browser/resources/chromeos/about_os_credits.html -chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/macros/list_commands_macro.ts -chrome/browser/resources/chromeos/accessibility/accessibility_common/facegaze/mouse_controller.ts +chrome/browser/resources/chromeos/accessibility/accessibility_common/mv2/dictation/macros/list_commands_macro.ts +chrome/browser/resources/chromeos/accessibility/accessibility_common/mv2/facegaze/mouse_controller.ts +chrome/browser/resources/chromeos/accessibility/accessibility_common/mv3/dictation/macros/list_commands_macro.ts +chrome/browser/resources/chromeos/accessibility/accessibility_common/mv3/facegaze/mouse_controller.ts chrome/browser/resources/chromeos/accessibility/chromevox/mv2/background/background_test.js chrome/browser/resources/chromeos/accessibility/chromevox/mv2/background/braille/braille_input_handler_test.js chrome/browser/resources/chromeos/accessibility/chromevox/mv2/background/editing/editable_text_test.js @@ -1468,6 +1482,13 @@ chrome/browser/resources/chromeos/accessibility/chromevox/mv2/background/input/c chrome/browser/resources/chromeos/accessibility/chromevox/mv2/common/locale_output_helper_test.js chrome/browser/resources/chromeos/accessibility/chromevox/mv2/common/spannable_test.js chrome/browser/resources/chromeos/accessibility/chromevox/mv2/panel/tutorial_test.js +chrome/browser/resources/chromeos/accessibility/chromevox/mv3/background/background_test.js +chrome/browser/resources/chromeos/accessibility/chromevox/mv3/background/braille/braille_input_handler_test.js +chrome/browser/resources/chromeos/accessibility/chromevox/mv3/background/editing/editable_text_test.js +chrome/browser/resources/chromeos/accessibility/chromevox/mv3/background/input/command_handler.ts +chrome/browser/resources/chromeos/accessibility/chromevox/mv3/common/locale_output_helper_test.js +chrome/browser/resources/chromeos/accessibility/chromevox/mv3/common/spannable_test.js +chrome/browser/resources/chromeos/accessibility/chromevox/mv3/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 @@ -1509,7 +1530,7 @@ chrome/browser/resources/chromeos/emoji_picker/emoji_picker_api_proxy.ts chrome/browser/resources/chromeos/emoji_picker/icons.html chrome/browser/resources/chromeos/emoji_picker/prefix_search.ts chrome/browser/resources/chromeos/emulator/icons.html -chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json +chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json.jinja2 chrome/browser/resources/chromeos/login/components/web_view_loader.ts chrome/browser/resources/chromeos/login/debug/debug.ts chrome/browser/resources/chromeos/login/debug/quick_start_debugger.ts @@ -1616,10 +1637,11 @@ chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc chrome/browser/safe_browsing/notification_content_detection/notification_content_detection_service_browsertest.cc +chrome/browser/safe_browsing/notification_telemetry/notification_telemetry_service.cc +chrome/browser/safe_browsing/notification_telemetry/notification_telemetry_service_unittest.cc chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc chrome/browser/safe_browsing/tailored_security/chrome_tailored_security_service_unittest.cc chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer_unittest.cc -chrome/browser/search/background/ntp_background_service.cc chrome/browser/search/background/ntp_custom_background_service.cc chrome/browser/search/ntp_features_unittest.cc chrome/browser/search/search.h @@ -1754,6 +1776,7 @@ chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc chrome/browser/sync_file_system/sync_file_system_service.h chrome/browser/tab/web_contents_state.cc chrome/browser/tab_contents/navigation_metrics_recorder_browsertest.cc +chrome/browser/tab_ui/android/java/strings/android_tab_ui_strings.grd chrome/browser/task_manager/sampling/shared_sampler_win_defines.h chrome/browser/themes/theme_syncable_service.cc chrome/browser/translate/translate_manager_browsertest.cc @@ -1763,7 +1786,6 @@ chrome/browser/ui/android/strings/android_chrome_strings.grd chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc chrome/browser/ui/ash/arc/arc_open_url_delegate_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_browsertest.cc chrome/browser/ui/ash/birch/birch_calendar_fetcher.cc chrome/browser/ui/ash/birch/birch_calendar_fetcher_unittest.cc @@ -1808,6 +1830,7 @@ chrome/browser/ui/ash/wallpaper/wallpaper_controller_client_impl.cc chrome/browser/ui/ash/web_view/ash_web_view_impl_browsertest.cc chrome/browser/ui/ash/wm/coral_browsertest.cc chrome/browser/ui/autofill/address_editor_controller_unittest.cc +chrome/browser/ui/autofill/chrome_autofill_client.cc chrome/browser/ui/autofill/delete_address_profile_dialog_controller_impl_unittest.cc chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl_unittest.cc chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc @@ -1857,6 +1880,7 @@ chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc chrome/browser/ui/lens/lens_overlay_gen204_controller.cc chrome/browser/ui/lens/lens_overlay_languages_controller.cc chrome/browser/ui/lens/lens_overlay_live_test.cc +chrome/browser/ui/lens/lens_overlay_proto_converter_unittest.cc chrome/browser/ui/lens/lens_overlay_query_controller.cc chrome/browser/ui/lens/lens_overlay_query_controller_unittest.cc chrome/browser/ui/lens/lens_overlay_side_panel_coordinator.cc @@ -1908,6 +1932,7 @@ chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate_unittest.cc chrome/browser/ui/tabs/pinned_tab_codec_browsertest.cc chrome/browser/ui/tabs/pinned_tab_service_browsertest.cc chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data_unittest.cc +chrome/browser/ui/tabs/saved_tab_groups/instant_message_queue_processor_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/tab_group_sync_delegate_browsertest.cc chrome/browser/ui/tabs/tab_strip_model_unittest.cc @@ -1928,6 +1953,7 @@ chrome/browser/ui/views/autofill/popup/popup_row_factory_utils_browsertest.cc chrome/browser/ui/views/autofill/popup/popup_separator_view.h chrome/browser/ui/views/autofill/popup/popup_view_views_browsertest.cc chrome/browser/ui/views/autofill/popup/popup_view_views_unittest.cc +chrome/browser/ui/views/bookmarks/bookmark_account_storage_move_dialog_interactive_uitest.cc chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc chrome/browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc @@ -1947,7 +1973,6 @@ chrome/browser/ui/views/download/bubble/download_bubble_security_view_unittest.c chrome/browser/ui/views/extensions/device_chooser_extension_browsertest.cc chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc -chrome/browser/ui/views/extensions/web_file_handlers/web_file_handlers_file_launch_dialog.cc chrome/browser/ui/views/file_system_access/file_system_access_usage_bubble_view_browsertest.cc chrome/browser/ui/views/frame/browser_root_view_browsertest.cc chrome/browser/ui/views/frame/browser_view.h @@ -2022,6 +2047,7 @@ chrome/browser/ui/webui/app_management/app_management_page_handler_chromeos.cc chrome/browser/ui/webui/app_management/app_management_page_handler_unittest.cc chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.cc chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui_browsertest.cc +chrome/browser/ui/webui/ash/borealis_motd/borealis_motd_dialog.cc chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog.cc chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog_browsertest.cc chrome/browser/ui/webui/ash/cloud_upload/drive_upload_handler.cc @@ -2083,6 +2109,7 @@ chrome/browser/ui/webui/settings/settings_utils_unittest.cc chrome/browser/ui/webui/settings/settings_utils_win.cc chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc chrome/browser/ui/webui/settings/site_settings_helper_unittest.cc +chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_page_handler_unittest.cc chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler.cc chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler_unittest.cc chrome/browser/ui/webui/side_panel/customize_chrome/wallpaper_search/wallpaper_search_handler.cc @@ -2204,7 +2231,6 @@ chrome/common/extensions/api/file_system_provider.idl chrome/common/extensions/api/gcm.json chrome/common/extensions/api/generated_externs_list.txt chrome/common/extensions/api/identity.idl -chrome/common/extensions/api/image_writer_private.idl chrome/common/extensions/api/instance_id.json chrome/common/extensions/api/printing.idl chrome/common/extensions/api/privacy.json @@ -2438,6 +2464,8 @@ chrome/test/enterprise/e2e/policy/youtube_restrict/youtube_restrict.py chrome/test/fuzzing/atspi_in_process_fuzzer.cc chrome/test/fuzzing/in_process_fuzzer.cc chrome/test/interaction/interactive_browser_test_interactive_uitest.cc +chrome/test/media_router/media_router_gmc_ui_for_test.cc +chrome/test/media_router/media_router_integration_ui_browsertest.cc chrome/test/mini_installer/PRESUBMIT.py chrome/test/mini_installer/create_zip.py chrome/test/mini_installer/installer_test.py @@ -2508,11 +2536,13 @@ chromeos/ash/components/boca/boca_app_client.cc chromeos/ash/components/boca/boca_metrics_manager_unittest.cc chromeos/ash/components/boca/boca_role_util_unittest.cc chromeos/ash/components/boca/boca_session_manager_unittest.cc +chromeos/ash/components/boca/session_api/add_students_request_unittest.cc chromeos/ash/components/boca/session_api/constants.h chromeos/ash/components/boca/session_api/create_session_request_unittest.cc chromeos/ash/components/boca/session_api/get_session_request_unittest.cc chromeos/ash/components/boca/session_api/join_session_request_unittest.cc chromeos/ash/components/boca/session_api/session_parser_unittest.cc +chromeos/ash/components/boca/session_api/update_session_config_request_unittest.cc chromeos/ash/components/boca/session_api/update_session_request_unittest.cc chromeos/ash/components/boca/session_api/update_student_activities_request_unittest.cc chromeos/ash/components/boca/spotlight/spotlight_service_unittest.cc @@ -2731,6 +2761,7 @@ components/browser_ui/strings/android/site_settings.grdp components/browsing_data/content/browsing_data_helper_unittest.cc components/browsing_data/content/cookie_helper_unittest.cc components/browsing_data/content/local_storage_helper_browsertest.cc +components/browsing_data/core/browsing_data_utils_unittest.cc components/browsing_data/core/counters/history_counter.cc components/browsing_data/core/history_notice_utils.cc components/browsing_data_strings.grdp @@ -2787,22 +2818,21 @@ components/crash/core/common/crash_key.h components/cronet/PRESUBMIT.py components/cronet/android/test/javaperftests/AndroidManifest.xml components/cronet/android/test/javatests/AndroidManifest.xml -components/cronet/gn2bp/PRESUBMIT.py components/cronet/gn2bp/gen_android_bp.py components/cronet/gn2bp/gn_utils.py +components/cronet/gn2bp/run_gn2bp.py components/cronet/license/license_utils.py -components/cronet/license/tests/license_converter_test.py components/cronet/native/cronet.idl components/cronet/native/perftest/perf_test.cc components/cronet/tools/cr_cronet.py components/cronet/tools/utils.py components/custom_handlers/protocol_handler_registry_unittest.cc +components/data_sharing/internal/android/data_sharing_service_android.cc components/data_sharing/internal/data_sharing_service_impl_unittest.cc components/data_sharing/internal/group_data_proto_utils_unittest.cc components/data_sharing/internal/preview_server_proxy.cc components/data_sharing/internal/preview_server_proxy_unittest.cc components/data_sharing/public/data_sharing_network_utils.h -components/data_sharing/public/data_type_controller/managed_account_precondition_checker.cc components/data_sharing/public/features.cc components/data_sharing/public/group_data.h components/desks_storage/core/admin_template_service_unittests.cc @@ -2814,6 +2844,7 @@ components/desks_storage/core/desk_template_semantics_unittests.cc components/desks_storage/core/desk_test_util.h components/desks_storage/core/desk_test_util_unittests.cc components/desks_storage/core/local_desk_data_manager_unittests.cc +components/device_signals/core/browser/browser_utils.cc components/device_signals/core/browser/os_signals_collector_unittest.cc components/device_signals/core/common/win/platform_utils_win.cc components/device_signals/core/common/win/win_types.h @@ -3084,6 +3115,7 @@ components/omnibox/browser/shortcuts_backend_unittest.cc components/omnibox/browser/shortcuts_database_unittest.cc components/omnibox/browser/shortcuts_provider_unittest.cc components/omnibox/browser/suggestion_group_unittest.cc +components/omnibox/browser/tab_group_provider_unittest.cc components/omnibox/browser/titled_url_match_utils.cc components/omnibox/browser/titled_url_match_utils_unittest.cc components/omnibox/browser/zero_suggest_cache_service_unittest.cc @@ -3140,7 +3172,6 @@ components/page_load_metrics/browser/page_load_tracker.h components/page_load_metrics/google/browser/google_url_util.cc components/page_load_metrics/google/browser/google_url_util.h components/page_load_metrics/google/browser/google_url_util_unittest.cc -components/page_load_metrics/google/browser/gws_page_load_metrics_observer.cc components/page_load_metrics/renderer/fake_page_timing_sender.h components/paint_preview/browser/file_manager_unittest.cc components/paint_preview/browser/paint_preview_base_service_unittest.cc @@ -3249,7 +3280,6 @@ components/payments/content/utility/payment_manifest_parser.h components/payments/content/utility/payment_method_manifest_parser_fuzzer.cc components/payments/core/error_strings.cc components/payments/core/error_strings.h -components/payments/core/journey_logger.cc components/payments/core/journey_logger_unittest.cc components/payments/core/method_strings.cc components/payments/core/method_strings.h @@ -3258,6 +3288,7 @@ components/payments/core/url_util.h components/payments/core/url_util_unittest.cc components/payments_strings.grdp components/pdf/renderer/pdf_accessibility_tree_browsertest.cc +components/performance_manager/decorators/frame_input_state_decorator.cc components/performance_manager/graph/frame_node_impl.cc components/performance_manager/public/graph/frame_node.h components/performance_manager/public/graph/process_node.h @@ -3349,7 +3380,6 @@ components/policy/test/data/pref_mapping/ExtensionOAuthRedirectUrls.json components/policy/test/data/pref_mapping/ExtensionSettings.json components/policy/test/data/pref_mapping/FloatingSsoDomainBlocklist.json components/policy/test/data/pref_mapping/FloatingSsoDomainBlocklistExceptions.json -components/policy/test/data/pref_mapping/GetDisplayMediaSetSelectAllScreensAllowedForUrls.json components/policy/test/data/pref_mapping/HomepageLocation.json components/policy/test/data/pref_mapping/ImagesAllowedForUrls.json components/policy/test/data/pref_mapping/ImagesBlockedForUrls.json @@ -3437,7 +3467,6 @@ 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/privacy_sandbox_survey_service_unittest.cc components/privacy_sandbox_chrome_strings.grdp components/privacy_sandbox_strings.grd components/protocol_handler_strings.grdp @@ -3706,6 +3735,7 @@ components/sync/base/data_type.cc components/sync/base/sync_util.h components/sync/engine/bookmark_update_preprocessing.cc components/sync/engine/net/http_bridge_unittest.cc +components/sync/model/data_type_sync_bridge.h components/sync/model/syncable_service.h components/sync/protocol/proto_value_conversions_unittest.cc components/sync/service/local_data_description.h @@ -3723,6 +3753,7 @@ components/sync_sessions/session_store_unittest.cc components/sync_sessions/session_sync_bridge.h components/sync_sessions/synced_session_unittest.cc components/system_cpu/cpu_probe_win.cc +components/themes/ntp_background_service.cc components/tpcd/enterprise_reporting/enterprise_reporting_tab_helper_unittest.cc components/tpcd/metadata/browser/parser_unittest.cc components/tracing/common/etw_consumer_win.cc @@ -3736,6 +3767,7 @@ components/translate/core/browser/translate_script.cc components/translate/core/common/translate_util.cc components/translate_strings.grdp components/trusted_vault/command_line_switches.cc +components/trusted_vault/recovery_key_store_certificate.h components/trusted_vault/recovery_key_store_connection_impl.cc components/trusted_vault/recovery_key_store_connection_unittest.cc components/trusted_vault/trusted_vault_access_token_fetcher_frontend.cc @@ -3810,6 +3842,7 @@ components/viz/service/display/overlay_processor_using_strategy.cc components/viz/service/display/renderer_pixeltest.cc components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc components/viz/service/display_embedder/skia_render_copy_results.cc +components/viz/service/input/input_manager.cc components/webapps/browser/android/add_to_homescreen_data_fetcher_unittest.cc components/webapps/browser/android/java/res/values/dimens.xml components/webapps/browser/android/shortcut_info.cc @@ -3888,8 +3921,8 @@ content/browser/idle/idle_manager_unittest.cc content/browser/indexed_db/indexed_db_context_impl.h content/browser/indexed_db/indexed_db_context_unittest.cc content/browser/indexed_db/indexed_db_reporting.cc -content/browser/indexed_db/instance/backing_store.cc -content/browser/indexed_db/instance/backing_store_unittest.cc +content/browser/indexed_db/instance/leveldb/backing_store.cc +content/browser/indexed_db/instance/leveldb/backing_store_unittest.cc content/browser/installedapp/fetch_related_win_apps_task.cc content/browser/installedapp/native_win_app_fetcher_impl.cc content/browser/interest_group/ad_auction_headers_util_unittest.cc @@ -4474,13 +4507,11 @@ media/audio/android/audio_track_output_stream.cc media/audio/android/opensles_util.cc media/audio/cras/cras_util.cc media/audio/ios/audio_session_manager_ios.mm -media/audio/win/audio_low_latency_input_win.cc media/audio/win/audio_low_latency_output_win.h media/audio/win/core_audio_util_win.cc media/audio/win/core_audio_util_win.h media/base/android/media_codec_bridge_impl.cc media/base/android/media_drm_bridge.cc -media/base/android/media_player_bridge.h media/base/container_names.cc media/base/format_utils.cc media/base/key_systems_impl.cc @@ -4659,6 +4690,7 @@ net/device_bound_sessions/registration_fetcher_param.cc net/device_bound_sessions/session_json_utils.cc net/device_bound_sessions/session_unittest.cc net/device_bound_sessions/unexportable_key_service_factory.cc +net/disk_cache/blockfile/file_ios.cc net/disk_cache/disk_cache.h net/disk_cache/simple/simple_backend_impl.h net/disk_cache/simple/simple_file_enumerator.h @@ -4984,6 +5016,7 @@ sandbox/win/src/sandbox_nt_util.cc sandbox/win/src/sandbox_nt_util.h sandbox/win/src/sandbox_policy.h sandbox/win/src/security_level.h +sandbox/win/src/startup_information_helper.cc services/BUILD.gn services/accessibility/features/javascript/event.js services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc @@ -5034,7 +5067,7 @@ services/network/trust_tokens/trust_token_client_data_canonicalization.h services/network/trust_tokens/trust_token_key_commitment_parser.h services/network/trust_tokens/trust_token_key_commitments.h services/network/udp_socket_unittest.cc -services/network/url_loader.cc +services/network/url_loader_util.cc services/network/websocket_throttler.h services/preferences/tracked/device_id_unittest.cc services/proxy_resolver/host_resolver_mojo.cc @@ -5076,6 +5109,7 @@ skia/ext/SkMemory_new_handler.cpp skia/ext/skia_utils_ios_unittest.mm skia/rusty_png_feature.h sql/database.cc +sql/vfs_wrapper.cc storage/browser/blob/blob_reader.h storage/browser/file_system/external_mount_points_unittest.cc storage/browser/file_system/file_system_backend.h @@ -5350,6 +5384,7 @@ third_party/angle/src/libANGLE/renderer/vulkan/FramebufferVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/ImageVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/PersistentCommandPool.cpp third_party/angle/src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp +third_party/angle/src/libANGLE/renderer/vulkan/ShaderVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/VkImageImageSiblingVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp third_party/angle/src/libANGLE/renderer/vulkan/linux/DmaBufImageSiblingVkLinux.cpp @@ -5408,8 +5443,6 @@ 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/features.cc @@ -5608,6 +5641,7 @@ third_party/blink/renderer/core/html/forms/html_option_element.idl third_party/blink/renderer/core/html/forms/html_options_collection.idl third_party/blink/renderer/core/html/forms/html_select_element.idl third_party/blink/renderer/core/html/forms/html_text_area_element.idl +third_party/blink/renderer/core/html/forms/select_type.cc third_party/blink/renderer/core/html/forms/validity_state.cc third_party/blink/renderer/core/html/forms/validity_state.h third_party/blink/renderer/core/html/forms/validity_state.idl @@ -5642,6 +5676,7 @@ third_party/blink/renderer/core/html/html_table_row_element.idl third_party/blink/renderer/core/html/html_table_section_element.idl third_party/blink/renderer/core/html/media/autoplay_policy.cc third_party/blink/renderer/core/html/media/html_media_element.cc +third_party/blink/renderer/core/html/parser/html_document_parser.cc third_party/blink/renderer/core/input/event_handler.cc third_party/blink/renderer/core/input/event_handling_util.cc third_party/blink/renderer/core/input/mouse_event_manager.cc @@ -5653,10 +5688,7 @@ third_party/blink/renderer/core/layout/block_node.cc third_party/blink/renderer/core/layout/geometry/logical_offset.h third_party/blink/renderer/core/layout/geometry/logical_rect.h third_party/blink/renderer/core/layout/geometry/logical_size.h -third_party/blink/renderer/core/layout/geometry/physical_offset.h third_party/blink/renderer/core/layout/geometry/physical_rect.h -third_party/blink/renderer/core/layout/geometry/physical_size.h -third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.h third_party/blink/renderer/core/layout/hit_test_cache.h third_party/blink/renderer/core/layout/hit_test_location.h third_party/blink/renderer/core/layout/inline/inline_items_builder.cc @@ -5728,6 +5760,7 @@ third_party/blink/renderer/core/paint/paint_layer_scrollable_area.cc third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h third_party/blink/renderer/core/paint/paint_layer_stacking_node.cc third_party/blink/renderer/core/paint/paint_layer_stacking_node.h +third_party/blink/renderer/core/paint/paint_property_tree_builder.cc third_party/blink/renderer/core/paint/theme_painter_default.h third_party/blink/renderer/core/paint/timing/first_meaningful_paint_detector.cc third_party/blink/renderer/core/paint/timing/first_meaningful_paint_detector.h @@ -5826,7 +5859,6 @@ third_party/blink/renderer/modules/manifest/fuzzer_seed_corpus/play_app_url_mani third_party/blink/renderer/modules/media_capabilities/media_capabilities.cc third_party/blink/renderer/modules/mediarecorder/media_recorder.cc third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc -third_party/blink/renderer/modules/mediarecorder/vpx_encoder.cc third_party/blink/renderer/modules/mediastream/media_devices_test.cc third_party/blink/renderer/modules/mediastream/media_stream_utils.cc third_party/blink/renderer/modules/mediastream/media_stream_video_renderer_sink.h @@ -5898,6 +5930,8 @@ third_party/blink/renderer/platform/fonts/vdmx_parser.cc third_party/blink/renderer/platform/fonts/web_font_decoder.cc third_party/blink/renderer/platform/fonts/win/font_cache_skia_win.cc third_party/blink/renderer/platform/fonts/win/font_fallback_win.cc +third_party/blink/renderer/platform/geometry/physical_offset.h +third_party/blink/renderer/platform/geometry/physical_size.h third_party/blink/renderer/platform/graphics/bitmap_image.cc third_party/blink/renderer/platform/graphics/bitmap_image.h third_party/blink/renderer/platform/graphics/canvas_resource_provider.cc @@ -7353,9 +7387,11 @@ third_party/crossbench/tests/crossbench/benchmarks/loading/config/test_example_c third_party/crossbench/tests/crossbench/benchmarks/loading/config/test_login.py third_party/crossbench/tests/crossbench/benchmarks/loading/config/test_pages.py third_party/crossbench/tests/crossbench/benchmarks/loading/test_loading.py +third_party/crossbench/tests/crossbench/plt/test_chromeos_ssh.py third_party/crossbench/tests/crossbench/probes/test_js.py third_party/crossbench/tests/crossbench/probes/test_perfetto.py third_party/crossbench/tests/crossbench/probes/test_v8_rcs.py +third_party/crossbench/tests/crossbench/test_env.py third_party/crossbench/tests/end2end/android/test_wpr_record_and_replay.py third_party/crossbench/tests/end2end/desktop/test_cli.py third_party/dav1d/BUILD.gn @@ -7367,6 +7403,7 @@ third_party/dav1d/libdav1d/tools/input/section5.c third_party/dawn/.vscode/tasks.json third_party/dawn/CMakeLists.txt third_party/dawn/generator/dawn_json_generator.py +third_party/dawn/infra/specs/PRESUBMIT.py third_party/dawn/src/dawn/common/Math.h third_party/dawn/src/dawn/dawn.json third_party/dawn/src/dawn/native/CommandAllocator.cpp @@ -7374,6 +7411,7 @@ third_party/dawn/src/dawn/native/CopyTextureForBrowserHelper.cpp third_party/dawn/src/dawn/native/Features.cpp third_party/dawn/src/dawn/native/Sampler.h third_party/dawn/src/dawn/native/SubresourceStorage.h +third_party/dawn/src/dawn/native/Toggles.cpp third_party/dawn/src/dawn/native/d3d/D3DError.cpp third_party/dawn/src/dawn/native/d3d11/BindGroupTrackerD3D11.cpp third_party/dawn/src/dawn/native/d3d11/BufferD3D11.cpp @@ -7422,7 +7460,6 @@ third_party/dawn/src/dawn/tests/unittests/validation/RenderPassDescriptorValidat 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 -third_party/dawn/src/tint/lang/core/constant/eval_builtin_test.cc third_party/dawn/src/tint/lang/hlsl/type/rasterizer_ordered_texture_2d.h third_party/dawn/src/tint/lang/hlsl/writer/ast_printer/ast_printer.cc third_party/dawn/src/tint/lang/hlsl/writer/printer/printer.cc @@ -7431,6 +7468,7 @@ third_party/dawn/src/tint/lang/spirv/reader/ast_parser/function.cc third_party/dawn/src/tint/lang/spirv/reader/ast_parser/function_cfg_test.cc third_party/dawn/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl_test.cc third_party/dawn/src/tint/lang/wgsl/reader/parser/lexer_test.cc +third_party/dawn/src/tint/lang/wgsl/resolver/eval_builtin_test.cc third_party/dawn/third_party/dxc/include/dxc/Support/Unicode.h third_party/dawn/third_party/dxc/include/llvm/DebugInfo/PDB/PDBSymbol.h third_party/dawn/third_party/dxc/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h @@ -7653,6 +7691,7 @@ third_party/depot_tools/infra_lib/telemetry/proto/clientanalytics_pb2.py third_party/depot_tools/infra_lib/telemetry/proto/trace_span_pb2.py third_party/depot_tools/man/README.txt third_party/depot_tools/man/html/depot_tools.html +third_party/depot_tools/man/html/depot_tools_gerrit_auth.html third_party/depot_tools/man/html/depot_tools_tutorial.html third_party/depot_tools/man/html/git-cl.html third_party/depot_tools/man/html/git-footers.html @@ -7671,6 +7710,7 @@ third_party/depot_tools/man/html/git-retry.html third_party/depot_tools/man/html/git-squash-branch.html third_party/depot_tools/man/html/git-thaw.html third_party/depot_tools/man/html/git-upstream-diff.html +third_party/depot_tools/man/src/depot_tools_gerrit_auth.txt third_party/depot_tools/man/src/depot_tools_tutorial.txt third_party/depot_tools/metadata/dependency_metadata.py third_party/depot_tools/metadata/fields/custom/license.py @@ -7678,6 +7718,7 @@ third_party/depot_tools/metadata/fields/custom/license_allowlist.py third_party/depot_tools/metadata/tests/parse_test.py third_party/depot_tools/metrics_utils.py third_party/depot_tools/my_activity.py +third_party/depot_tools/newauth.py third_party/depot_tools/ninja.py third_party/depot_tools/ninjalog_uploader.py third_party/depot_tools/owners_client.py @@ -7991,6 +8032,7 @@ third_party/devtools-frontend/src/front_end/panels/accessibility/AccessibilityNo third_party/devtools-frontend/src/front_end/panels/accessibility/AccessibilityStrings.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/AiAssistancePanel.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/PatchWidget.ts +third_party/devtools-frontend/src/front_end/panels/ai_assistance/SelectWorkspaceDialog.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/components/UserActionRow.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/components/chatView.css third_party/devtools-frontend/src/front_end/panels/animation/AnimationTimeline.ts @@ -8005,6 +8047,7 @@ third_party/devtools-frontend/src/front_end/panels/application/ServiceWorkerCach third_party/devtools-frontend/src/front_end/panels/application/StorageBucketsTreeElement.ts third_party/devtools-frontend/src/front_end/panels/application/StorageView.ts third_party/devtools-frontend/src/front_end/panels/application/components/EndpointsGrid.ts +third_party/devtools-frontend/src/front_end/panels/application/components/FrameDetailsView.test.ts third_party/devtools-frontend/src/front_end/panels/application/components/FrameDetailsView.ts third_party/devtools-frontend/src/front_end/panels/application/components/ReportsGrid.ts third_party/devtools-frontend/src/front_end/panels/application/components/SharedStorageAccessGrid.ts @@ -8062,6 +8105,7 @@ third_party/devtools-frontend/src/front_end/panels/settings/components/SyncSecti 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/TabbedEditorContainer.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 @@ -8089,6 +8133,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/utils/EntryStyles.ts third_party/devtools-frontend/src/front_end/panels/timeline/utils/Helpers.test.ts third_party/devtools-frontend/src/front_end/panels/timeline/utils/Helpers.ts third_party/devtools-frontend/src/front_end/panels/timeline/utils/IgnoreList.test.ts +third_party/devtools-frontend/src/front_end/panels/timeline/utils/Treemap.test.ts third_party/devtools-frontend/src/front_end/panels/web_audio/WebAudioView.ts third_party/devtools-frontend/src/front_end/panels/webauthn/WebauthnPane.ts third_party/devtools-frontend/src/front_end/panels/whats_new/ReleaseNote.test.ts @@ -8228,6 +8273,7 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cj third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/node/LaunchOptions.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/node/PuppeteerNode.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/node/PuppeteerNode.js +third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/util/encoding.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/es5-iife/puppeteer-core-browser.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/es5-iife/puppeteer-core-browser.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/api/Browser.d.ts @@ -8264,6 +8310,7 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/es third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/LaunchOptions.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/PuppeteerNode.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/PuppeteerNode.js +third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/util/encoding.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/types.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/api/Browser.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/api/BrowserContext.ts @@ -8288,6 +8335,7 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/co third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/node/FirefoxLauncher.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/node/LaunchOptions.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/node/PuppeteerNode.ts +third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/util/encoding.ts third_party/devtools-frontend/src/front_end/third_party/third-party-web/lib/nostats-subset.js third_party/devtools-frontend/src/front_end/third_party/third-party-web/package/dist/entities-httparchive-nostats.json third_party/devtools-frontend/src/front_end/third_party/third-party-web/package/dist/entities-httparchive.json @@ -8331,7 +8379,6 @@ third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-m third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/lib/base64-vlq.js third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/lib/source-map-consumer.js third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/package.json -third_party/devtools-frontend/src/node_modules/@babel/runtime/package.json third_party/devtools-frontend/src/node_modules/@babel/traverse/node_modules/globals/package.json third_party/devtools-frontend/src/node_modules/@colors/colors/lib/colors.js third_party/devtools-frontend/src/node_modules/@colors/colors/lib/styles.js @@ -8468,6 +8515,8 @@ third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/esm/bidiMapper/ third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/esm/bidiMapper/modules/storage/StorageProcessor.js third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/esm/utils/uuid.js third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/iife/mapperTab.js +third_party/devtools-frontend/src/node_modules/cli-cursor/package.json +third_party/devtools-frontend/src/node_modules/cli-spinners/package.json third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/package.json third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/color-convert/package.json @@ -8616,6 +8665,7 @@ third_party/devtools-frontend/src/node_modules/function-bind/package.json third_party/devtools-frontend/src/node_modules/function.prototype.name/package.json third_party/devtools-frontend/src/node_modules/functions-have-names/package.json third_party/devtools-frontend/src/node_modules/gensync/package.json +third_party/devtools-frontend/src/node_modules/get-east-asian-width/package.json third_party/devtools-frontend/src/node_modules/get-intrinsic/package.json third_party/devtools-frontend/src/node_modules/get-stream/package.json third_party/devtools-frontend/src/node_modules/get-symbol-description/package.json @@ -8652,6 +8702,7 @@ third_party/devtools-frontend/src/node_modules/is-data-view/package.json third_party/devtools-frontend/src/node_modules/is-finalizationregistry/package.json third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/package.json third_party/devtools-frontend/src/node_modules/is-generator-function/package.json +third_party/devtools-frontend/src/node_modules/is-interactive/package.json third_party/devtools-frontend/src/node_modules/is-map/package.json third_party/devtools-frontend/src/node_modules/is-negative-zero/package.json third_party/devtools-frontend/src/node_modules/is-number-object/package.json @@ -8726,6 +8777,8 @@ third_party/devtools-frontend/src/node_modules/mdn-data/css/types.schema.json third_party/devtools-frontend/src/node_modules/mdn-data/package.json third_party/devtools-frontend/src/node_modules/meow/build/index.d.ts third_party/devtools-frontend/src/node_modules/meow/package.json +third_party/devtools-frontend/src/node_modules/mimic-function/index.d.ts +third_party/devtools-frontend/src/node_modules/mimic-function/package.json third_party/devtools-frontend/src/node_modules/mocha/lib/browser/growl.js third_party/devtools-frontend/src/node_modules/mocha/lib/runnable.js third_party/devtools-frontend/src/node_modules/mocha/lib/utils.js @@ -8746,6 +8799,14 @@ third_party/devtools-frontend/src/node_modules/object-keys/package.json third_party/devtools-frontend/src/node_modules/object.fromentries/package.json third_party/devtools-frontend/src/node_modules/object.groupby/package.json third_party/devtools-frontend/src/node_modules/object.values/package.json +third_party/devtools-frontend/src/node_modules/onetime/package.json +third_party/devtools-frontend/src/node_modules/ora/node_modules/ansi-regex/package.json +third_party/devtools-frontend/src/node_modules/ora/node_modules/is-unicode-supported/package.json +third_party/devtools-frontend/src/node_modules/ora/node_modules/log-symbols/node_modules/is-unicode-supported/package.json +third_party/devtools-frontend/src/node_modules/ora/node_modules/log-symbols/package.json +third_party/devtools-frontend/src/node_modules/ora/node_modules/string-width/package.json +third_party/devtools-frontend/src/node_modules/ora/node_modules/strip-ansi/package.json +third_party/devtools-frontend/src/node_modules/ora/package.json third_party/devtools-frontend/src/node_modules/os-homedir/package.json third_party/devtools-frontend/src/node_modules/os-tmpdir/package.json third_party/devtools-frontend/src/node_modules/p-limit/package.json @@ -8896,13 +8957,13 @@ third_party/devtools-frontend/src/node_modules/qs/package.json third_party/devtools-frontend/src/node_modules/randombytes/browser.js third_party/devtools-frontend/src/node_modules/raw-body/package.json third_party/devtools-frontend/src/node_modules/reflect.getprototypeof/package.json -third_party/devtools-frontend/src/node_modules/regenerator-runtime/runtime.js third_party/devtools-frontend/src/node_modules/regexp.prototype.flags/package.json third_party/devtools-frontend/src/node_modules/require-directory/package.json third_party/devtools-frontend/src/node_modules/require-from-string/package.json third_party/devtools-frontend/src/node_modules/requires-port/test.js third_party/devtools-frontend/src/node_modules/resolve-from/package.json third_party/devtools-frontend/src/node_modules/resolve/lib/caller.js +third_party/devtools-frontend/src/node_modules/restore-cursor/package.json third_party/devtools-frontend/src/node_modules/rollup/dist/es/shared/node-entry.js third_party/devtools-frontend/src/node_modules/rollup/dist/es/shared/watch.js third_party/devtools-frontend/src/node_modules/rollup/dist/shared/index.js @@ -8951,6 +9012,7 @@ third_party/devtools-frontend/src/node_modules/source-map/lib/base64-vlq.js third_party/devtools-frontend/src/node_modules/source-map/lib/source-map-consumer.js third_party/devtools-frontend/src/node_modules/source-map/package.json third_party/devtools-frontend/src/node_modules/spdx-correct/package.json +third_party/devtools-frontend/src/node_modules/stdin-discarder/package.json third_party/devtools-frontend/src/node_modules/streamroller/package.json third_party/devtools-frontend/src/node_modules/string-width/node_modules/ansi-regex/package.json third_party/devtools-frontend/src/node_modules/string-width/node_modules/strip-ansi/package.json @@ -9026,7 +9088,6 @@ third_party/devtools-frontend/src/node_modules/terser/lib/utils/index.js third_party/devtools-frontend/src/node_modules/terser/package.json third_party/devtools-frontend/src/node_modules/through/package.json third_party/devtools-frontend/src/node_modules/tmp/package.json -third_party/devtools-frontend/src/node_modules/to-fast-properties/package.json third_party/devtools-frontend/src/node_modules/toidentifier/package.json third_party/devtools-frontend/src/node_modules/treeify/package.json third_party/devtools-frontend/src/node_modules/treeify/treeify.js @@ -9142,8 +9203,9 @@ third_party/devtools-frontend/src/scripts/build/compress_files.js third_party/devtools-frontend/src/scripts/check_external_links.js third_party/devtools-frontend/src/scripts/deps/download_emscripten.py third_party/devtools-frontend/src/scripts/deps/roll_to_chromium.py -third_party/devtools-frontend/src/scripts/eslint_rules/lib/no-customized-builtin-elements.js -third_party/devtools-frontend/src/scripts/eslint_rules/tests/no-imperative-dom-api.test.js +third_party/devtools-frontend/src/scripts/eslint_rules/lib/no-customized-builtin-elements.ts +third_party/devtools-frontend/src/scripts/eslint_rules/lib/utils/ruleCreator.ts +third_party/devtools-frontend/src/scripts/eslint_rules/tests/no-imperative-dom-api.test.ts 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/resultsdb.ts @@ -9177,6 +9239,10 @@ third_party/domato/src/rules/jshelpers.txt third_party/domato/src/svg_tags.py third_party/domato/src/vbscript/generator.py third_party/domato/src/webgl/generator.py +third_party/dragonbox/src/include/dragonbox/dragonbox.h +third_party/dragonbox/src/other_files/unknown_win64_vc2019.html +third_party/dragonbox/src/subproject/3rdparty/schubfach/schubfach_32.cc +third_party/dragonbox/src/subproject/3rdparty/schubfach/schubfach_64.cc third_party/eigen3/src/Eigen/src/Cholesky/LDLT.h third_party/eigen3/src/Eigen/src/Cholesky/LLT.h third_party/eigen3/src/Eigen/src/CholmodSupport/CholmodSupport.h @@ -9940,6 +10006,7 @@ third_party/eigen3/src/unsupported/test/special_functions.cpp third_party/eigen3/src/unsupported/test/special_packetmath.cpp third_party/eigen3/src/unsupported/test/splines.cpp third_party/expat/src/expat/CMakeLists.txt +third_party/expat/src/expat/fuzz/xml_lpm_fuzzer.cpp third_party/expat/src/expat/lib/expat_external.h third_party/expat/src/expat/lib/internal.h third_party/expat/src/expat/lib/xmlparse.c @@ -9948,6 +10015,7 @@ third_party/expat/src/expat/lib/xmltok_impl.c third_party/expat/src/expat/tests/acc_tests.c third_party/expat/src/expat/xmlwf/readfilemap.c third_party/expat/src/expat/xmlwf/win32filemap.c +third_party/expat/src/expat/xmlwf/xmlfile.c third_party/expat/src/expat/xmlwf/xmlwf.c third_party/farmhash/src/dev/builder.cc third_party/farmhash/src/dev/farmhash.h @@ -10332,6 +10400,8 @@ third_party/ffmpeg/libavutil/tests/random_seed.c third_party/ffmpeg/libavutil/tests/side_data_array.c third_party/ffmpeg/libavutil/timecode.c third_party/ffmpeg/libavutil/timecode.h +third_party/ffmpeg/libavutil/timecode_internal.c +third_party/ffmpeg/libavutil/timecode_internal.h third_party/ffmpeg/libavutil/tx.c third_party/ffmpeg/libavutil/x86/w64xmmtest.h third_party/ffmpeg/libswscale/arm/swscale_unscaled.c @@ -10370,6 +10440,8 @@ third_party/freetype/src/include/freetype/ftdriver.h third_party/freetype/src/include/freetype/ftimage.h third_party/freetype/src/include/freetype/ftwinfnt.h third_party/freetype/src/include/freetype/ttnameid.h +third_party/freetype/src/src/autofit/afadjust.c +third_party/freetype/src/src/autofit/afadjust.h third_party/freetype/src/src/autofit/afindic.c third_party/freetype/src/src/autofit/afindic.h third_party/freetype/src/src/base/ftbase.h @@ -11087,6 +11159,7 @@ third_party/hunspell/src/hunspell/replist.hxx third_party/hunspell/src/hunspell/suggestmgr.cxx third_party/hunspell/src/hunspell/suggestmgr.hxx third_party/hunspell/src/hunspell/utf_info.cxx +third_party/hunspell/src/hunspell/utf_info.hxx third_party/hunspell/src/hunspell/w_char.hxx third_party/hunspell/src/parsers/firstparser.cxx third_party/hunspell/src/parsers/firstparser.hxx @@ -11214,6 +11287,7 @@ third_party/libaom/source/libaom/third_party/googletest/src/googletest/include/g third_party/libaom/source/libaom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h third_party/libaom/source/libaom/third_party/googletest/src/googletest/src/gtest-death-test.cc third_party/libaom/source/libaom/third_party/googletest/src/googletest/src/gtest.cc +third_party/libaom/source/libaom/third_party/highway/hwy/stats.h third_party/libaom/source/libaom/third_party/libwebm/AUTHORS.TXT third_party/libaom/source/libaom/third_party/libwebm/mkvmuxer/mkvwriter.cc third_party/libaom/source/libaom/third_party/libwebm/mkvparser/mkvreader.cc @@ -11507,6 +11581,7 @@ third_party/llvm-libc/src/src/__support/macros/properties/compiler.h third_party/llvm-libc/src/src/__support/time/windows/clock_gettime.cpp third_party/llvm-libc/src/src/time/windows/clock_getres.cpp third_party/lottie/lottie_worker.js +third_party/lzma_sdk/BUILD.gn third_party/mako/mako/test/templates/internationalization.html third_party/material_web_components/components-chromium/node_modules/@lit/reactive-element/decorators/event-options.d.ts third_party/material_web_components/components-chromium/node_modules/@lit/reactive-element/decorators/query-all.d.ts @@ -11564,6 +11639,7 @@ third_party/mediapipe/src/mediapipe/util/tracking/motion_estimation.cc third_party/metrics_proto/PRESUBMIT.py third_party/minigbm/src/common.mk third_party/minigbm/src/gbm.h +third_party/nasm/win/manifest.xml third_party/nearby/src/connections/implementation/endpoint_manager.cc third_party/nearby/src/embedded/common/source/nearby_event.h third_party/nearby/src/embedded/common/source/nearby_message_stream.h @@ -11624,6 +11700,7 @@ third_party/node/node_modules/@azure/msal-browser/lib/types/network/FetchClient. third_party/node/node_modules/@azure/msal-browser/package.json third_party/node/node_modules/@azure/msal-common/lib/types/telemetry/performance/PerformanceEvent.d.ts third_party/node/node_modules/@azure/msal-common/package.json +third_party/node/node_modules/@lit/reactive-element/css-tag.d.ts 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/@rollup/wasm-node/dist/shared/index.js @@ -11843,7 +11920,6 @@ third_party/openscreen/src/cast/streaming/public/constants.h third_party/openscreen/src/cast/streaming/public/encoded_frame.h third_party/openscreen/src/cast/streaming/public/receiver_constraints.h third_party/openscreen/src/cast/streaming/public/receiver_session.h -third_party/openscreen/src/cast/streaming/public/sender.cc third_party/openscreen/src/cast/streaming/receiver.h third_party/openscreen/src/cast/streaming/receiver_constraints.h third_party/openscreen/src/cast/streaming/receiver_message.h @@ -12408,8 +12484,8 @@ third_party/perfetto/include/perfetto/public/te_category_macros.h third_party/perfetto/infra/ci/Makefile third_party/perfetto/infra/ci/common_utils.py third_party/perfetto/infra/ci/config.py -third_party/perfetto/infra/ci/controller/main.py -third_party/perfetto/infra/ci/controller/stackdriver_metrics.py +third_party/perfetto/infra/ci/frontend/main.py +third_party/perfetto/infra/ci/frontend/stackdriver_metrics.py third_party/perfetto/infra/ci/frontend/static/index.html third_party/perfetto/infra/ci/frontend/static/script.js third_party/perfetto/infra/ci/sandbox/artifacts_uploader.py @@ -12424,7 +12500,6 @@ third_party/perfetto/infra/luci/recipes/perfetto.expected/ci_tag.json third_party/perfetto/infra/luci/recipes/perfetto.expected/ci_win.json third_party/perfetto/infra/luci/recipes/perfetto.expected/unofficial.json third_party/perfetto/infra/luci/recipes/perfetto.py -third_party/perfetto/infra/perfetto-get.appspot.com/main.py third_party/perfetto/infra/perfetto.dev/appengine/main.py third_party/perfetto/infra/perfetto.dev/src/assets/script.js third_party/perfetto/infra/perfetto.dev/src/markdown_render.js @@ -12440,6 +12515,7 @@ third_party/perfetto/python/tools/install_test_reporter_app.py third_party/perfetto/python/tools/record_android_trace.py third_party/perfetto/python/tools/update_permalink.py third_party/perfetto/src/android_internal/health_hal.cc +third_party/perfetto/src/android_sdk/jni/dev_perfetto_sdk_PerfettoNativeMemoryCleaner.cc third_party/perfetto/src/android_sdk/nativehelper/BUILD.gn third_party/perfetto/src/android_sdk/nativehelper/JNIHelp.h third_party/perfetto/src/android_sdk/nativehelper/nativehelper_utils.h @@ -12477,6 +12553,7 @@ third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/android/startup/tim third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/chrome/page_loads.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/export/to_firefox_profile.sql third_party/perfetto/src/trace_processor/util/trace_type.cc +third_party/perfetto/src/trace_redaction/redact_process_events.cc third_party/perfetto/src/traceconv/trace_to_firefox.h third_party/perfetto/src/traceconv/trace_to_hprof.cc third_party/perfetto/src/traced/probes/android_log/android_log_data_source.cc @@ -12489,7 +12566,6 @@ third_party/perfetto/test/trace_processor/diff_tests/parser/simpleperf/tests.py third_party/perfetto/test/vts/AndroidTest.xml third_party/perfetto/tools/download_changed_screenshots.py third_party/perfetto/ui/.eslintrc.js -third_party/perfetto/ui/package.json third_party/perfetto/ui/release/build_all_channels.py third_party/perfetto/ui/src/assets/bigtrace.html third_party/perfetto/ui/src/assets/index.html @@ -13721,7 +13797,7 @@ third_party/rust/anyhow/v1/BUILD.gn third_party/rust/autocfg/v1/BUILD.gn third_party/rust/bytemuck/v1/BUILD.gn third_party/rust/bytemuck_derive/v1/BUILD.gn -third_party/rust/chromium_crates_io/vendor/cxx-1.0.150/.bcr/metadata.template.json +third_party/rust/chromium_crates_io/vendor/cxx-v1/.bcr/metadata.template.json third_party/rust/cxx/v1/BUILD.gn third_party/rust/cxxbridge_cmd/v1/BUILD.gn third_party/rust/cxxbridge_flags/v1/BUILD.gn @@ -13729,7 +13805,9 @@ third_party/rust/cxxbridge_macro/v1/BUILD.gn third_party/rust/diplomat/v0_10/BUILD.gn third_party/rust/diplomat_core/v0_10/BUILD.gn third_party/rust/diplomat_runtime/v0_10/BUILD.gn +third_party/rust/ff/v0_13/BUILD.gn third_party/rust/foldhash/v0_1/BUILD.gn +third_party/rust/group/v0_13/BUILD.gn third_party/rust/hashbrown/v0_15/BUILD.gn third_party/rust/itoa/v1/BUILD.gn third_party/rust/lazy_static/v1/BUILD.gn @@ -13741,24 +13819,26 @@ third_party/rust/prost_derive/v0_13/BUILD.gn third_party/rust/qr_code/v2/BUILD.gn third_party/rust/quote/v1/BUILD.gn third_party/rust/regex_automata/v0_4/BUILD.gn +third_party/rust/regex_syntax/v0_8/BUILD.gn third_party/rust/rustc_demangle_capi/v0_1/BUILD.gn third_party/rust/rustversion/v1/BUILD.gn third_party/rust/ryu/v1/BUILD.gn 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_2/BUILD.gn third_party/rust/sfv/v0_10/BUILD.gn third_party/rust/stable_deref_trait/v1/BUILD.gn third_party/rust/strck/v1/BUILD.gn +third_party/rust/strum/v0_27/BUILD.gn +third_party/rust/strum_macros/v0_27/BUILD.gn third_party/rust/syn/v2/BUILD.gn third_party/rust/termcolor/v1/BUILD.gn -third_party/rust/tinyvec/v1/BUILD.gn third_party/rust/unicode_ident/v1/BUILD.gn third_party/rust/unicode_width/v0_1/BUILD.gn third_party/rust/winapi_util/v0_1/BUILD.gn third_party/rust/yoke/v0_8/BUILD.gn third_party/rust/yoke_derive/v0_8/BUILD.gn -third_party/rust/zerocopy/v0_8/BUILD.gn third_party/rust/zerofrom/v0_1/BUILD.gn third_party/rust/zerofrom_derive/v0_1/BUILD.gn third_party/rust/zerovec_derive/v0_11/BUILD.gn @@ -13917,6 +13997,7 @@ third_party/skia/src/codec/SkCodec.cpp third_party/skia/src/codec/SkWebpCodec.cpp third_party/skia/src/codec/SkWuffsCodec.cpp third_party/skia/src/codec/SkXmp.cpp +third_party/skia/src/core/SkEdge.cpp third_party/skia/src/core/SkGeometry.cpp third_party/skia/src/core/SkGeometry.h third_party/skia/src/core/SkMaskGamma.cpp @@ -13972,7 +14053,6 @@ third_party/skia/tests/ColorPrivTest.cpp third_party/skia/tests/CtsEnforcement.h third_party/skia/tests/DrawPathTest.cpp third_party/skia/tests/DrawTextTest.cpp -third_party/skia/tests/FillPathTest.cpp third_party/skia/tests/GradientTest.cpp third_party/skia/tests/ImageGeneratorTest.cpp third_party/skia/tests/PDFPrimitivesTest.cpp @@ -14191,7 +14271,6 @@ third_party/tflite/src/tensorflow/core/kernels/image/decode_image_op.cc third_party/tflite/src/tensorflow/core/platform/cloud/testdata/application_default_credentials.json third_party/tflite/src/tensorflow/core/platform/cloud/testdata/service_account_credentials.json third_party/tflite/src/tensorflow/core/platform/error_payloads.h -third_party/tflite/src/tensorflow/core/profiler/convert/hlo_proto_to_graph_view.cc third_party/tflite/src/tensorflow/core/tpu/tpu_compile_interface.h third_party/tflite/src/tensorflow/core/tpu/tpu_embedding_errors.h third_party/tflite/src/tensorflow/core/util/ctc/ctc_beam_search.h @@ -14505,6 +14584,7 @@ third_party/webpagereplay/PRESUBMIT.py third_party/webrtc/BUILD.gn third_party/webrtc/PRESUBMIT.py third_party/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h +third_party/webrtc/api/data_channel_event_observer_interface.h third_party/webrtc/api/location.h third_party/webrtc/api/scoped_refptr.h third_party/webrtc/api/uma_metrics.h @@ -14577,6 +14657,7 @@ third_party/webrtc/pc/jsep_session_description.cc third_party/webrtc/pc/media_session_unittest.cc third_party/webrtc/pc/peer_connection_bundle_unittest.cc third_party/webrtc/pc/peer_connection_crypto_unittest.cc +third_party/webrtc/pc/peer_connection_encodings_integrationtest.cc third_party/webrtc/pc/peer_connection_end_to_end_unittest.cc third_party/webrtc/pc/peer_connection_factory_unittest.cc third_party/webrtc/pc/peer_connection_field_trial_tests.cc @@ -14637,6 +14718,7 @@ third_party/webrtc/test/test_main_lib.cc third_party/webrtc/test/testsupport/perf_test.h third_party/webrtc/tools_webrtc/autoroller/roll_deps.py third_party/webrtc/tools_webrtc/autoroller/unittests/roll_deps_test.py +third_party/webrtc/tools_webrtc/iwyu/apply_include_cleaner.py third_party/webrtc/tools_webrtc/network_emulator/emulate.py third_party/webrtc/tools_webrtc/perf/catapult_uploader.py third_party/webrtc/tools_webrtc/sanitizers/lsan_suppressions_webrtc.cc @@ -14749,6 +14831,7 @@ third_party/wuffs/BUILD.gn third_party/wuffs/src/release/c/wuffs-v0.3.c third_party/xdg-utils/scripts/desc/xdg-settings.xml third_party/xnnpack/src/CMakeLists.txt +third_party/zlib/BUILD.gn third_party/zlib/deflate.c third_party/zlib/google/compression_utils_portable.cc third_party/zlib/google/zip_reader.h @@ -14860,6 +14943,8 @@ tools/clang/scripts/update.py tools/clang/spanify/evaluate_patches.py tools/clang/spanify/extract_edits.py tools/clang/spanify/list-required-pragma.py +tools/clang/spanify/tests/cycle-expected.cc +tools/clang/spanify/tests/cycle-original.cc tools/clang/translation_unit/test_translation_unit.py tools/code_coverage/coverage.py tools/code_coverage/js_source_maps/create_js_source_maps/PRESUBMIT.py @@ -15176,6 +15261,7 @@ tools/metrics/histograms/metadata/platform/histograms.xml tools/metrics/histograms/metadata/plugin_vm/histograms.xml tools/metrics/histograms/metadata/plus_addresses/enums.xml tools/metrics/histograms/metadata/plus_addresses/histograms.xml +tools/metrics/histograms/metadata/power/enums.xml tools/metrics/histograms/metadata/power/histograms.xml tools/metrics/histograms/metadata/prefetch/histograms.xml tools/metrics/histograms/metadata/preloading/histograms.xml @@ -15227,6 +15313,8 @@ tools/metrics/histograms/metadata/shortcuts/histograms.xml tools/metrics/histograms/metadata/signin/enums.xml tools/metrics/histograms/metadata/signin/histograms.xml tools/metrics/histograms/metadata/simple/histograms.xml +tools/metrics/histograms/metadata/skia/enums.xml +tools/metrics/histograms/metadata/skia/histograms.xml tools/metrics/histograms/metadata/sql/enums.xml tools/metrics/histograms/metadata/sql/histograms.xml tools/metrics/histograms/metadata/stability/enums.xml @@ -15383,7 +15471,6 @@ tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf-pgo_timing.js 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/linux-perf_timing.json tools/perf/core/shard_maps/timing_data/linux-r350-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-intel-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf_timing.json @@ -15529,6 +15616,7 @@ ui/accessibility/ax_role_properties.cc ui/accessibility/extensions/color_contrast_companion/help.html ui/accessibility/extensions/strings/accessibility_extensions_strings.grd ui/accessibility/extensions/tools/webstore_extension_util.py +ui/accessibility/platform/ax_platform.cc ui/accessibility/platform/ax_platform_node_base_unittest.cc ui/accessibility/platform/ax_platform_node_delegate_utils_win.cc ui/accessibility/platform/ax_platform_node_textrangeprovider_win.cc @@ -15653,11 +15741,11 @@ ui/latency/latency_info.h ui/native_theme/native_theme_win.cc ui/native_theme/native_theme_win.h ui/ozone/ozone.gni -ui/ozone/platform/wayland/host/shell_popup_wrapper.cc ui/ozone/platform/wayland/host/wayland_clipboard.cc ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc ui/ozone/platform/wayland/host/wayland_output.h ui/ozone/platform/wayland/host/wayland_window.cc +ui/ozone/platform/wayland/host/xdg_popup.cc ui/ozone/platform/x11/test/os_exchange_data_provider_x11_unittest.cc ui/ozone/platform/x11/x11_window.cc ui/resources/PRESUBMIT.py @@ -15684,6 +15772,7 @@ ui/views/layout/flex_layout_unittest.cc ui/views/view.h ui/views/view_targeter_delegate.h ui/views/view_unittest.cc +ui/views/widget/desktop_aura/desktop_native_widget_aura.cc ui/views/win/hwnd_message_handler.cc ui/views/window/non_client_view.cc ui/webui/resources/cr_components/certificate_manager/certificate_manager_v2_icons.html @@ -15796,6 +15885,7 @@ v8/src/wasm/interpreter/wasm-interpreter.h v8/src/wasm/interpreter/x64/interpreter-builtins-x64.cc v8/src/wasm/wasm-code-manager.cc v8/src/wasm/wasm-debug.cc +v8/src/wasm/wasm-feature-flags.h v8/testing/gtest/BUILD.gn v8/third_party/googletest/BUILD.gn v8/third_party/inspector_protocol/crdtp/cbor.cc @@ -15834,7 +15924,6 @@ v8/tools/sanitizers/sancov_merger.py v8/tools/sanitizers/tsan_suppressions.txt v8/tools/system-analyzer/index.html v8/tools/testrunner/local/variants.py -v8/tools/tracing/proto-converter/proto-to-json.ts v8/tools/try_perf.py v8/tools/unittests/run_perf_test.py v8/tools/unittests/testdata/test1.json 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 c72955bb..b711857d 100644 --- a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch +++ b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch @@ -1,9 +1,9 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3685,8 +3685,6 @@ static_library("browser") { +@@ -3694,8 +3694,6 @@ static_library("browser") { + "download/download_auto_open_policy_handler.cc", + "download/download_auto_open_policy_handler.h", "download/download_commands.cc", - "download/download_crx_util.cc", - "download/download_crx_util.h", - "download/download_danger_prompt.cc", - "download/download_danger_prompt.h", "download/download_dir_policy_handler.cc", @@ -11,7 +11,7 @@ "download/download_dir_util.cc", --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5467,10 +5467,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -5511,10 +5511,6 @@ ChromeContentBrowserClient::CreateThrott throttles.push_back(std::make_unique( handle, handle->GetWebContents()->GetBrowserContext())); @@ -180,7 +180,7 @@ class DownloadsShowFunction : public ExtensionFunction { --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -711,18 +711,6 @@ void WebstorePrivateBeginInstallWithMani +@@ -705,18 +705,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -226,7 +226,7 @@ std::unique_ptr response_body) { --- a/chrome/browser/extensions/blocklist_state_fetcher.h +++ b/chrome/browser/extensions/blocklist_state_fetcher.h -@@ -36,8 +36,6 @@ class BlocklistStateFetcher { +@@ -39,8 +39,6 @@ class BlocklistStateFetcher { virtual void Request(const std::string& id, RequestCallback callback); @@ -253,7 +253,7 @@ # Note: is_android is not equivalent to safe_browsing_mode == 2. # Sources and dependencies added to this block must not depend on anything -@@ -564,6 +566,7 @@ static_library("advanced_protection") { +@@ -577,6 +579,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -261,14 +261,14 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -583,6 +586,7 @@ source_set("metrics_collector") { +@@ -596,6 +599,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] + } } - source_set("test_support") { + source_set("unit_tests") { --- a/chrome/browser/ui/views/download/BUILD.gn +++ b/chrome/browser/ui/views/download/BUILD.gn @@ -27,7 +27,6 @@ source_set("download") { diff --git a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch index 5beb439f..a1a92489 100644 --- a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch +++ b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch @@ -1,6 +1,6 @@ --- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc +++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc -@@ -890,93 +890,6 @@ std::tuple AutofillCr +@@ -891,93 +891,6 @@ std::tuple AutofillCr } bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) { diff --git a/patches/core/inox-patchset/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index e8881d08..0abc033d 100644 --- a/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -10,7 +10,7 @@ extension_misc::kAssessmentAssistantExtensionId, --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc -@@ -407,11 +407,6 @@ void ComponentLoader::AddWebStoreApp() { +@@ -418,11 +418,6 @@ void ComponentLoader::AddWebStoreApp() { return; } #endif @@ -36,7 +36,7 @@ { --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc -@@ -488,20 +488,6 @@ void WebstoreInstaller::DownloadNextPend +@@ -485,20 +485,6 @@ void WebstoreInstaller::DownloadNextPend void WebstoreInstaller::DownloadCrx(const extensions::ExtensionId& extension_id, InstallSource source) { @@ -57,15 +57,11 @@ } // http://crbug.com/165634 -@@ -656,25 +642,6 @@ void WebstoreInstaller::UpdateDownloadPr +@@ -653,21 +639,6 @@ void WebstoreInstaller::UpdateDownloadPr void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!crx_installer_.get()); - -- ExtensionService* service = ExtensionSystem::Get(profile_)-> -- extension_service(); -- CHECK(service); -- - const InstallApproval* approval = GetAssociatedApproval(download); - DCHECK(approval); - 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 7e86dc56..a1c295aa 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 @@ -178,7 +178,7 @@ by default. base::ToLowerASCII(bdict_file)); --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ namespace { // The URL to be used to re-install Chrome when auto-update failed for too long. @@ -405,7 +405,7 @@ by default. GURL url(base::WideToUTF16(args[0])); --- a/extensions/common/extension_urls.cc +++ b/extensions/common/extension_urls.cc -@@ -38,11 +38,11 @@ const GURL* g_item_snippet_url_for_test_ +@@ -38,13 +38,13 @@ const GURL* g_item_snippet_url_for_test_ } // namespace @@ -413,6 +413,9 @@ by default. -const char kNewChromeWebstoreBaseURL[] = "https://chromewebstore.google.com/"; +const char kChromeWebstoreBaseURL[] = "trk:09:https://chrome.google.com/webstore"; +const char kNewChromeWebstoreBaseURL[] = "trk:08:https://chromewebstore.google.com/"; + const char kExtensionsDocsWhatsNewURL[] = +- "https://developer.chrome.com/docs/extensions/whats-new"; ++ "trk:06:https://developer.chrome.com/docs/extensions/whats-new"; const char kChromeWebstoreUpdateURL[] = - "https://clients2.google.com/service/update2/crx"; -const char kChromeWebstoreApiURL[] = "https://chromewebstore.googleapis.com/"; diff --git a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch index 275eab1e..47e9dc6b 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch @@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware). --- a/components/safe_browsing/content/browser/client_side_detection_service.cc +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc -@@ -324,6 +324,10 @@ void ClientSideDetectionService::StartCl +@@ -342,6 +342,10 @@ void ClientSideDetectionService::StartCl return; } @@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware). std::string request_data; request->SerializeToString(&request_data); -@@ -406,6 +410,7 @@ void ClientSideDetectionService::StartCl +@@ -424,6 +428,7 @@ void ClientSideDetectionService::StartCl base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent, base::Unretained(WebUIInfoSingleton::GetInstance()), std::move(request), access_token)); diff --git a/patches/core/ungoogled-chromium/block-requests.patch b/patches/core/ungoogled-chromium/block-requests.patch index ba30bd93..f3a081e7 100644 --- a/patches/core/ungoogled-chromium/block-requests.patch +++ b/patches/core/ungoogled-chromium/block-requests.patch @@ -26,16 +26,6 @@ std::string command_id; // Replace the promo URL with "command:" if such a command ID is set // via the feature params. ---- a/chrome/browser/search/background/ntp_background_service.cc -+++ b/chrome/browser/search/background/ntp_background_service.cc -@@ -96,6 +96,7 @@ void NtpBackgroundService::Shutdown() { - } - - void NtpBackgroundService::FetchCollectionInfo() { -+ return; - if (collections_loader_ != nullptr) - return; - collection_error_info_.ClearError(); --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc @@ -280,6 +280,7 @@ GURL SpellcheckHunspellDictionary::GetDi @@ -48,7 +38,7 @@ --- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc +++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc -@@ -137,6 +137,10 @@ AffiliationFetcherDelegate* HashAffiliat +@@ -132,6 +132,10 @@ HashAffiliationFetcher::~HashAffiliation } void HashAffiliationFetcher::StartRequest( @@ -61,7 +51,7 @@ base::OnceCallback result_callback) { --- a/components/affiliations/core/browser/hash_affiliation_fetcher.h +++ b/components/affiliations/core/browser/hash_affiliation_fetcher.h -@@ -40,6 +40,8 @@ class HashAffiliationFetcher : public Af +@@ -39,6 +39,8 @@ class HashAffiliationFetcher : public Af const std::vector& facet_uris, RequestInfo request_info, base::OnceCallback result_callback) override; @@ -80,6 +70,16 @@ // This function is not supposed to be called if the previous operation is not // finished. if (state_ == REQUESTING) { +--- a/components/themes/ntp_background_service.cc ++++ b/components/themes/ntp_background_service.cc +@@ -96,6 +96,7 @@ void NtpBackgroundService::Shutdown() { + } + + void NtpBackgroundService::FetchCollectionInfo() { ++ return; + if (collections_loader_ != nullptr) { + return; + } --- a/components/update_client/update_checker.cc +++ b/components/update_client/update_checker.cc @@ -104,6 +104,7 @@ void UpdateCheckerImpl::CheckForUpdates( @@ -92,12 +92,24 @@ update_check_callback_ = std::move(update_check_callback); --- a/third_party/devtools-frontend/src/front_end/panels/elements/WebCustomData.ts +++ b/third_party/devtools-frontend/src/front_end/panels/elements/WebCustomData.ts -@@ -19,18 +19,7 @@ export class WebCustomData { - readonly fetchPromiseForTest: Promise; +@@ -2,7 +2,6 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. - constructor(remoteBase: string) { +-import * as Root from '../../core/root/root.js'; + + /** + * Lazily loads the vscode.web-custom-data/browser.css-data.json and allows +@@ -15,33 +14,14 @@ import * as Root from '../../core/root/r + export class WebCustomData { + #data = new Map(); + +- /** The test actually needs to wait for the result */ +- readonly fetchPromiseForTest: Promise; +- +- constructor(remoteBase: string) { - if (!remoteBase) { - this.fetchPromiseForTest = Promise.resolve(); +- this.fetchPromiseForTest = Promise.resolve(); - return; - } - this.fetchPromiseForTest = fetch(`${remoteBase}third_party/vscode.web-custom-data/browsers.css-data.json`) @@ -108,6 +120,28 @@ - } - }) - .catch(); +- } +- + /** + * Creates a fresh `WebCustomData` instance using the standard + * DevTools remote base. + * Throws if no valid remoteBase was found. + */ + static create(): WebCustomData { +- const remoteBase = Root.Runtime.getRemoteBase(); + // Silently skip loading of the CSS data if remoteBase is not set properly. +- return new WebCustomData(remoteBase?.base ?? ''); ++ return new WebCustomData(); } /** +@@ -54,9 +34,6 @@ export class WebCustomData { + } + } + +-interface CSSBrowserData { +- properties: CSSProperty[]; +-} + + export interface CSSProperty { + name: string; diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index 520c2b6f..19c8b7f7 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -23,7 +23,7 @@ url.SchemeIs(dom_distiller::kDomDistillerScheme)) --- a/chrome/browser/ui/singleton_tabs.cc +++ b/chrome/browser/ui/singleton_tabs.cc -@@ -124,7 +124,8 @@ int GetIndexOfExistingTab(Browser* brows +@@ -132,7 +132,8 @@ int GetIndexOfExistingTab(Browser* brows // RewriteURLIfNecessary removes the "view-source:" scheme which could lead // to incorrect matching, so ensure that the target and the candidate are // either both view-source:, or neither is. @@ -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 -@@ -1081,6 +1081,8 @@ component("net") { +@@ -1094,6 +1094,8 @@ component("net") { "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", "url_request/storage_access_status_cache.h", @@ -173,7 +173,7 @@ return NetLogURLRequestConstructorParams(url, priority_, --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc -@@ -50,6 +50,7 @@ +@@ -53,6 +53,7 @@ #include "net/socket/network_binding_client_socket_factory.h" #include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/static_http_user_agent_settings.h" @@ -181,7 +181,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job_factory.h" #include "url/url_constants.h" -@@ -597,6 +598,9 @@ std::unique_ptr URLRe +@@ -612,6 +613,9 @@ std::unique_ptr URLRe } protocol_handlers_.clear(); diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index f495fb68..1d46ed88 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 -@@ -2714,24 +2714,6 @@ void ChromeContentBrowserClient::AppendE +@@ -2752,24 +2752,6 @@ void ChromeContentBrowserClient::AppendE command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } diff --git a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch index 6ab6485a..48d3cb8d 100644 --- a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch +++ b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch @@ -2,7 +2,7 @@ --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc -@@ -297,7 +297,7 @@ bool DomDistillerViewerSource::ShouldSer +@@ -291,7 +291,7 @@ bool DomDistillerViewerSource::ShouldSer std::string DomDistillerViewerSource::GetContentSecurityPolicy( network::mojom::CSPDirectiveName directive) { if (directive == network::mojom::CSPDirectiveName::StyleSrc) { diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index a5a4c7ba..fbb84be8 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -681,7 +681,7 @@ } // namespace variations --- a/content/browser/preloading/prefetch/prefetch_container.cc +++ b/content/browser/preloading/prefetch/prefetch_container.cc -@@ -999,7 +999,7 @@ void PrefetchContainer::AddRedirectHop(c +@@ -970,7 +970,7 @@ void PrefetchContainer::AddRedirectHop(c // some which are added by throttles). These aren't yet supported for // prefetch, including browsing topics and client hints. net::HttpRequestHeaders updated_headers; diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index 08ee8ca2..f7b4b2a1 100644 --- a/patches/core/ungoogled-chromium/disable-mei-preload.patch +++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch @@ -12,20 +12,20 @@ data_deps += [ - "//chrome/browser/resources/media/mei_preload:component", - "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component", + "//components/webapps/isolated_web_apps/preload:component", "//third_party/widevine/cdm", ] -@@ -1202,7 +1201,6 @@ if (is_win) { +@@ -1206,7 +1205,6 @@ if (is_win) { ":optimization_guide_library", ":swiftshader_binaries", ":widevine_cdm_library", - "//chrome/browser/resources/media/mei_preload:component_bundle", - "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component_bundle", + "//components/webapps/isolated_web_apps/preload:component_bundle", ] --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn -@@ -88,11 +88,6 @@ group("resources") { +@@ -89,11 +89,6 @@ group("resources") { public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ] } @@ -36,4 +36,4 @@ - } if (is_win || is_mac || is_linux || is_chromeos) { - public_deps += [ + public_deps += [ "connectors_internals:resources" ] diff --git a/patches/core/ungoogled-chromium/disable-network-time-tracker.patch b/patches/core/ungoogled-chromium/disable-network-time-tracker.patch index c34a8585..3e14d826 100644 --- a/patches/core/ungoogled-chromium/disable-network-time-tracker.patch +++ b/patches/core/ungoogled-chromium/disable-network-time-tracker.patch @@ -5,7 +5,7 @@ --- a/components/network_time/network_time_tracker.cc +++ b/components/network_time/network_time_tracker.cc -@@ -282,7 +282,7 @@ void NetworkTimeTracker::UpdateNetworkTi +@@ -279,7 +279,7 @@ void NetworkTimeTracker::UpdateNetworkTi } bool NetworkTimeTracker::AreTimeFetchesEnabled() const { diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch index 1d7b2e35..807e7a6f 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -52,7 +52,7 @@ } // static -@@ -861,7 +861,7 @@ void PrivacySandboxSettingsImpl::SetTopi +@@ -864,7 +864,7 @@ void PrivacySandboxSettingsImpl::SetTopi } bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const { @@ -61,7 +61,7 @@ } bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const { -@@ -947,11 +947,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa +@@ -933,11 +933,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa return Status::kIncognitoProfile; } @@ -164,7 +164,7 @@ // static --- a/content/browser/interest_group/ad_auction_service_impl.cc +++ b/content/browser/interest_group/ad_auction_service_impl.cc -@@ -191,11 +191,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD +@@ -193,11 +193,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD void AdAuctionServiceImpl::CreateMojoService( RenderFrameHost* render_frame_host, mojo::PendingReceiver receiver) { @@ -178,7 +178,7 @@ void AdAuctionServiceImpl::JoinInterestGroup( --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc -@@ -1483,38 +1483,7 @@ void StoragePartitionImpl::Initialize( +@@ -1466,38 +1466,7 @@ void StoragePartitionImpl::Initialize( bucket_manager_ = std::make_unique(this); @@ -217,7 +217,7 @@ GeneratedCodeCacheSettings settings = GetContentClient()->browser()->GetGeneratedCodeCacheSettings( -@@ -1543,8 +1512,6 @@ void StoragePartitionImpl::Initialize( +@@ -1526,8 +1495,6 @@ void StoragePartitionImpl::Initialize( font_access_manager_ = FontAccessManager::Create(); @@ -226,7 +226,7 @@ #if BUILDFLAG(ENABLE_LIBRARY_CDMS) if (is_in_memory()) { -@@ -1568,11 +1535,6 @@ void StoragePartitionImpl::Initialize( +@@ -1551,11 +1518,6 @@ void StoragePartitionImpl::Initialize( std::make_unique(this); } @@ -240,7 +240,7 @@ void StoragePartitionImpl::OnStorageServiceDisconnected() { --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3949,12 +3949,6 @@ void WebContentsImpl::Init(const WebCont +@@ -3979,12 +3979,6 @@ void WebContentsImpl::Init(const WebCont DateTimeChooser::CreateDateTimeChooser(this); #endif @@ -255,7 +255,7 @@ BtmWebContentsObserver::MaybeCreateForWebContents(this); --- a/content/services/auction_worklet/private_aggregation_bindings.cc +++ b/content/services/auction_worklet/private_aggregation_bindings.cc -@@ -402,56 +402,6 @@ PrivateAggregationBindings::~PrivateAggr +@@ -406,53 +406,6 @@ PrivateAggregationBindings::~PrivateAggr void PrivateAggregationBindings::AttachToContext( v8::Local context) { @@ -281,8 +281,6 @@ - send_histogram_report_function) - .Check(); - -- if (blink::features::kPrivateAggregationApiProtectedAudienceExtensionsEnabled -- .Get()) { - v8::Local report_contribution_for_event_function = - v8::Function::New( - context, &PrivateAggregationBindings::ContributeToHistogramOnEvent, @@ -294,7 +292,6 @@ - v8_helper_->CreateStringFromLiteral("contributeToHistogramOnEvent"), - report_contribution_for_event_function) - .Check(); -- } - - v8::Local enable_debug_mode_function = - v8::Function::New(context, &PrivateAggregationBindings::EnableDebugMode, diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index 4b990b80..3543d088 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 -@@ -680,12 +680,6 @@ std::vector ChromeContentBr +@@ -678,12 +678,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 -@@ -300,17 +300,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_)) { @@ -60,15 +60,15 @@ } --- a/chrome/browser/extensions/extension_migrator.h +++ b/chrome/browser/extensions/extension_migrator.h -@@ -9,6 +9,7 @@ - +@@ -10,6 +10,7 @@ #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/external_loader.h" + #include "extensions/buildflags/buildflags.h" +#include "url/gurl.h" - class Profile; + static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); -@@ -40,6 +41,7 @@ class ExtensionMigrator : public Externa +@@ -43,6 +44,7 @@ class ExtensionMigrator : public Externa raw_ptr profile_; const std::string old_id_; const std::string new_id_; @@ -177,7 +177,7 @@ fetch->oauth2_attempt_count++; --- a/extensions/common/extension_urls.cc +++ b/extensions/common/extension_urls.cc -@@ -68,8 +68,6 @@ GURL AppendUtmSource(const GURL& url, st +@@ -74,8 +74,6 @@ GURL AppendUtmSource(const GURL& url, st GURL GetWebstoreExtensionsCategoryURL() { GURL base_url = GetNewWebstoreLaunchURL(); diff --git a/patches/core/ungoogled-chromium/extensions-manifestv2.patch b/patches/core/ungoogled-chromium/extensions-manifestv2.patch index 6ba16258..fdafccd5 100644 --- a/patches/core/ungoogled-chromium/extensions-manifestv2.patch +++ b/patches/core/ungoogled-chromium/extensions-manifestv2.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc -@@ -132,17 +132,6 @@ void ExtensionInfoGenerator::FillExtensi +@@ -61,17 +61,6 @@ void ExtensionInfoGenerator::FillExtensi info.controlled_info.emplace(); info.controlled_info->text = l10n_util::GetStringUTF8(IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE); @@ -17,10 +17,10 @@ - } } - bool is_enabled = state == developer::ExtensionState::kEnabled; + // Dependent extensions. --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -317,31 +317,7 @@ bool ExtensionManagement::IsAllowedManif +@@ -322,31 +322,7 @@ bool ExtensionManagement::IsAllowedManif int manifest_version, const std::string& extension_id, Manifest::Type manifest_type) { @@ -52,7 +52,7 @@ } bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) { -@@ -362,26 +338,8 @@ bool ExtensionManagement::IsExemptFromMV +@@ -367,26 +343,8 @@ bool ExtensionManagement::IsExemptFromMV return false; } @@ -81,7 +81,7 @@ bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy( --- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc +++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc -@@ -145,22 +145,6 @@ bool ManifestV2ExperimentManagerFactory: +@@ -146,22 +146,6 @@ bool ManifestV2ExperimentManagerFactory: // Determines the current stage of the MV2 deprecation experiments. MV2ExperimentStage CalculateCurrentExperimentStage() { @@ -104,7 +104,7 @@ return MV2ExperimentStage::kNone; } -@@ -200,19 +184,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF +@@ -201,19 +185,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF // Returns true if legacy extensions should be disabled, looking at both // experiment stage and global state. bool ShouldDisableLegacyExtensions(MV2ExperimentStage stage) { @@ -126,7 +126,7 @@ // Returns true if the given `stage` is one in which extension enablement should --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -481,7 +481,7 @@ content::WebUIDataSource* CreateAndAddEx +@@ -490,7 +490,7 @@ content::WebUIDataSource* CreateAndAddEx extensions_features::kExtensionsMenuAccessControlWithPermittedSites)); source->AddBoolean( "safetyHubThreeDotDetails", 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 19d9db0b..ffaf804a 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -3,15 +3,15 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -374,7 +374,6 @@ if (!is_android && !is_mac) { +@@ -373,7 +373,6 @@ if (!is_android && !is_mac) { + data_deps += [ "//chrome/browser/resources/media/mei_preload:component", - "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component", - "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component", + "//components/webapps/isolated_web_apps/preload:component", "//third_party/widevine/cdm", ] - -@@ -933,8 +932,6 @@ if (is_win) { +@@ -937,8 +936,6 @@ if (is_win) { bundle_data("chrome_framework_resources") { sources = [ @@ -20,17 +20,17 @@ # This image is used to badge the lock icon in the # authentication dialogs, such as those used for installation # from disk image and Keystone promotion (if so enabled). It -@@ -1207,7 +1204,6 @@ if (is_win) { +@@ -1210,7 +1207,6 @@ if (is_win) { + ":swiftshader_binaries", ":widevine_cdm_library", "//chrome/browser/resources/media/mei_preload:component_bundle", - "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component_bundle", - "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component_bundle", + "//components/webapps/isolated_web_apps/preload:component_bundle", ] - if (is_chrome_branded) { --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -765,10 +765,6 @@ static_library("browser") { +@@ -761,10 +761,6 @@ static_library("browser") { "navigation_predictor/navigation_predictor_metrics_document_data.h", "navigation_predictor/navigation_predictor_preconnect_client.cc", "navigation_predictor/navigation_predictor_preconnect_client.h", @@ -41,7 +41,7 @@ "navigation_predictor/search_engine_preconnector_keyed_service_factory.cc", "navigation_predictor/search_engine_preconnector_keyed_service_factory.h", "net/cert_verifier_service_time_updater.cc", -@@ -3549,10 +3545,6 @@ static_library("browser") { +@@ -3560,10 +3556,6 @@ static_library("browser") { } else { #!is_android sources += [ @@ -52,7 +52,7 @@ "accessibility/caption_bubble_context_browser.h", "accessibility/embedded_a11y_extension_loader.cc", "accessibility/embedded_a11y_extension_loader.h", -@@ -4268,8 +4260,6 @@ static_library("browser") { +@@ -4283,8 +4275,6 @@ static_library("browser") { "//chrome/app:command_ids", "//chrome/app/theme:chrome_unscaled_resources_grit", "//chrome/app/vector_icons", @@ -60,8 +60,8 @@ - "//chrome/browser/accessibility/tree_fixing:service", "//chrome/browser/apps/app_service", "//chrome/browser/apps/link_capturing", - "//chrome/browser/autofill_ai:util", -@@ -4291,10 +4281,6 @@ static_library("browser") { + "//chrome/browser/contextual_cueing", +@@ -4305,10 +4295,6 @@ static_library("browser") { "//chrome/browser/new_tab_page/chrome_colors", "//chrome/browser/policy:path_parser", "//chrome/browser/resources:component_extension_resources", @@ -72,7 +72,7 @@ "//chrome/browser/search/background", "//chrome/browser/smart_card", "//chrome/browser/themes", -@@ -4419,9 +4405,6 @@ static_library("browser") { +@@ -4442,9 +4428,6 @@ static_library("browser") { "//components/webauthn/core/browser", "//components/webauthn/core/browser:passkey_model", "//services/device/public/cpp/hid", @@ -82,7 +82,7 @@ "//third_party/crashpad/crashpad/client:common", "//third_party/zxcvbn-cpp", "//ui/views", -@@ -4516,8 +4499,6 @@ static_library("browser") { +@@ -4544,8 +4527,6 @@ static_library("browser") { sources += [ "accessibility/soda_installer_impl.cc", "accessibility/soda_installer_impl.h", @@ -91,7 +91,7 @@ "device_identity/device_oauth2_token_store_desktop.cc", "device_identity/device_oauth2_token_store_desktop.h", "device_notifications/device_status_icon_renderer.cc", -@@ -4556,8 +4537,6 @@ static_library("browser") { +@@ -4584,8 +4565,6 @@ static_library("browser") { "profiles/profile_activity_metrics_recorder.h", "profiles/profile_list_desktop.cc", "profiles/profile_list_desktop.h", @@ -100,7 +100,7 @@ "signin/force_signin_verifier.cc", "signin/force_signin_verifier.h", "signin/signin_manager.cc", -@@ -5359,7 +5338,6 @@ static_library("browser") { +@@ -5386,7 +5365,6 @@ static_library("browser") { "//chrome/browser/policy:system_features_disable_list", "//chrome/browser/push_notification:push_notification", "//chrome/browser/resources:app_icon_resources", @@ -108,7 +108,7 @@ "//chrome/browser/support_tool/ash", "//chrome/browser/ui/ash/accelerator", "//chrome/browser/ui/ash/accessibility", -@@ -5623,7 +5601,6 @@ static_library("browser") { +@@ -5651,7 +5629,6 @@ static_library("browser") { "//remoting/host/chromeos:browser_interop", "//remoting/host/chromeos:features", "//services/device/public/cpp/geolocation", @@ -116,7 +116,7 @@ "//third_party/nearby:rpc_resources_proto", "//third_party/nearby:wire_format_proto", "//ui/chromeos", -@@ -7850,12 +7827,6 @@ static_library("browser") { +@@ -7893,12 +7870,6 @@ static_library("browser") { } if (enable_pdf) { @@ -131,18 +131,21 @@ "//chrome/browser/pdf:pdf_pref_names", --- a/chrome/browser/accessibility/tree_fixing/BUILD.gn +++ b/chrome/browser/accessibility/tree_fixing/BUILD.gn -@@ -60,8 +60,6 @@ source_set("internal") { +@@ -64,11 +64,9 @@ source_set("internal") { deps = [ "//base", "//chrome/browser/profiles:profile", - "//chrome/browser/screen_ai:screen_ai_service_router_factory", + "//components/paint_preview/browser", + "//components/paint_preview/common", + "//components/paint_preview/public", "//content/public/browser:browser", - "//services/screen_ai/public/mojom:mojom", ] } --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -249,12 +249,10 @@ +@@ -250,12 +250,10 @@ #if BUILDFLAG(IS_CHROMEOS) #include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h" #include "chrome/browser/hid/hid_pinned_notification.h" @@ -155,7 +158,7 @@ #include "chrome/browser/usb/usb_status_icon.h" #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif -@@ -1359,9 +1357,6 @@ void BrowserProcessImpl::PreMainMessageL +@@ -1381,9 +1379,6 @@ void BrowserProcessImpl::PreMainMessageL soda_installer_impl_ = std::make_unique(); #endif // BUILDFLAG(IS_CHROMEOS) @@ -177,7 +180,7 @@ // Real implementation of BrowserProcess that creates and returns the services. class BrowserProcessImpl : public BrowserProcess, -@@ -431,9 +428,6 @@ class BrowserProcessImpl : public Browse +@@ -439,9 +436,6 @@ class BrowserProcessImpl : public Browse // to ensure that SodaInstallerImpl gets destructed first. std::unique_ptr soda_installer_impl_; @@ -189,7 +192,7 @@ std::unique_ptr platform_part_; --- a/chrome/browser/chrome_browser_interface_binders.cc +++ b/chrome/browser/chrome_browser_interface_binders.cc -@@ -78,8 +78,6 @@ +@@ -82,8 +82,6 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) @@ -198,7 +201,7 @@ #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #endif -@@ -357,27 +355,6 @@ void BindMediaFoundationPreferences( +@@ -362,27 +360,6 @@ void BindMediaFoundationPreferences( } #endif // BUILDFLAG(IS_WIN) @@ -224,9 +227,9 @@ -} -#endif - } // namespace - -@@ -510,11 +487,6 @@ void PopulateChromeFrameBinders( + void BindModelBroker( + content::RenderFrameHost* frame_host, +@@ -530,11 +507,6 @@ void PopulateChromeFrameBinders( base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed)); } @@ -364,7 +367,7 @@ void NavigationPredictor::SetModelScoreCallbackForTesting( --- a/chrome/browser/pdf/pdf_extension_util.cc +++ b/chrome/browser/pdf/pdf_extension_util.cc -@@ -104,7 +104,6 @@ void AddPdfViewerStrings(base::Value::Di +@@ -100,7 +100,6 @@ void AddPdfViewerStrings(base::Value::Di {"rotationStateLabel90", IDS_PDF_ROTATION_STATE_LABEL_90}, {"rotationStateLabel180", IDS_PDF_ROTATION_STATE_LABEL_180}, {"rotationStateLabel270", IDS_PDF_ROTATION_STATE_LABEL_270}, @@ -374,17 +377,17 @@ {"tooltipDocumentOutline", IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE}, --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -282,21 +282,6 @@ void PredictionBasedPermissionUiSelector +@@ -283,21 +283,6 @@ void PredictionBasedPermissionUiSelector if (inner_text.size() > kPageContentMaxLength) { inner_text.resize(kPageContentMaxLength); } - if (PredictionModelHandlerProvider* prediction_model_handler_provider = - PredictionModelHandlerProviderFactory::GetForBrowserContext( - profile_)) { -- if (PermissionsAiHandler* gen_ai_model_handler = -- prediction_model_handler_provider->GetPermissionsAiHandler()) { +- if (PermissionsAiv1Handler* aiv1_model_handler = +- prediction_model_handler_provider->GetPermissionsAiv1Handler()) { - VLOG(1) << "[PermissionsAIv1] Inquire model."; -- gen_ai_model_handler->InquireAiOnDeviceModel( +- aiv1_model_handler->InquireAiOnDeviceModel( - std::move(inner_text), request_type, - base::BindRepeating(&PredictionBasedPermissionUiSelector:: - AiOnDeviceModelExecutionCallback, @@ -398,7 +401,7 @@ VLOG(1) << "[PermissionsAIv1] The page's contnet too short or empty"; --- a/chrome/browser/prefs/BUILD.gn +++ b/chrome/browser/prefs/BUILD.gn -@@ -267,7 +267,6 @@ source_set("impl") { +@@ -274,7 +274,6 @@ source_set("impl") { } else { deps += [ "//chrome/browser/promos:utils", @@ -408,7 +411,7 @@ "//chrome/browser/search_engines", --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1792,9 +1792,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1807,9 +1807,6 @@ void RegisterLocalState(PrefRegistrySimp DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry); #endif @@ -420,7 +423,7 @@ PlatformAuthPolicyObserver::RegisterPrefs(registry); --- a/chrome/browser/profiles/BUILD.gn +++ b/chrome/browser/profiles/BUILD.gn -@@ -294,7 +294,6 @@ source_set("profiles_extra_parts_impl") +@@ -297,7 +297,6 @@ source_set("profiles_extra_parts_impl") ] } else { deps += [ @@ -428,7 +431,7 @@ "//chrome/browser/apps/app_service", "//chrome/browser/autofill", "//chrome/browser/contextual_cueing", -@@ -302,7 +301,6 @@ source_set("profiles_extra_parts_impl") +@@ -305,7 +304,6 @@ source_set("profiles_extra_parts_impl") "//chrome/browser/feedback", "//chrome/browser/hid", "//chrome/browser/media/router/discovery/access_code:access_code_sink_service", @@ -438,7 +441,7 @@ "//chrome/browser/search_engine_choice", --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -102,7 +102,6 @@ +@@ -104,7 +104,6 @@ #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h" #include "chrome/browser/metrics/variations/google_groups_manager_factory.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" @@ -446,7 +449,7 @@ #include "chrome/browser/navigation_predictor/search_engine_preconnector.h" #include "chrome/browser/navigation_predictor/search_engine_preconnector_keyed_service_factory.h" #include "chrome/browser/net/dns_probe_service_factory.h" -@@ -322,7 +321,6 @@ +@@ -326,7 +325,6 @@ #include "chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h" #include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h" #include "chrome/browser/profile_resetter/reset_report_uploader_factory.h" @@ -454,7 +457,7 @@ #include "chrome/browser/search/background/ntp_background_service_factory.h" #include "chrome/browser/search/background/ntp_custom_background_service_factory.h" #include "chrome/browser/search/instant_service_factory.h" -@@ -1005,7 +1003,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1025,7 +1023,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) net::ServerCertificateDatabaseServiceFactory::GetInstance(); #endif @@ -462,7 +465,7 @@ #if BUILDFLAG(IS_CHROMEOS) NearbySharingServiceFactory::GetInstance(); if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) { -@@ -1057,9 +1054,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1077,9 +1074,6 @@ void ChromeBrowserMainExtraPartsProfiles OneTimePermissionsTrackerFactory::GetInstance(); #endif OpenerHeuristicServiceFactory::GetInstance(); @@ -472,7 +475,7 @@ OptimizationGuideKeyedServiceFactory::GetInstance(); OriginKeyedPermissionActionServiceFactory::GetInstance(); OriginTrialsFactory::GetInstance(); -@@ -1123,13 +1117,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1146,13 +1140,6 @@ void ChromeBrowserMainExtraPartsProfiles policy::UserPolicySigninServiceFactory::GetInstance(); #endif PolicyBlocklistFactory::GetInstance(); @@ -486,7 +489,7 @@ PredictionServiceFactory::GetInstance(); predictors::AutocompleteActionPredictorFactory::GetInstance(); predictors::LoadingPredictorFactory::GetInstance(); -@@ -1215,13 +1202,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1239,13 +1226,6 @@ void ChromeBrowserMainExtraPartsProfiles #else SafetyHubMenuNotificationServiceFactory::GetInstance(); SafetyHubHatsServiceFactory::GetInstance(); @@ -500,7 +503,7 @@ #endif #if BUILDFLAG(IS_CHROMEOS) if (ash::features::IsScannerEnabled()) { -@@ -1331,7 +1311,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1356,7 +1336,6 @@ void ChromeBrowserMainExtraPartsProfiles TrackingProtectionSettingsFactory::GetInstance(); translate::TranslateRankerFactory::GetInstance(); #if !BUILDFLAG(IS_ANDROID) @@ -510,7 +513,7 @@ #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc -@@ -221,11 +221,6 @@ void OffTheRecordProfileImpl::Init() { +@@ -225,11 +225,6 @@ void OffTheRecordProfileImpl::Init() { // AccessibilityLabelsService has a default prefs behavior in incognito. AccessibilityLabelsService::InitOffTheRecordPrefs(this); @@ -559,7 +562,7 @@ #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/delete_profile_helper.h" #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h" -@@ -1508,9 +1507,6 @@ void ProfileManager::DoFinalInitForServi +@@ -1506,9 +1505,6 @@ void ProfileManager::DoFinalInitForServi // Ensure NavigationPredictorKeyedService is started. NavigationPredictorKeyedServiceFactory::GetForProfile(profile); @@ -571,7 +574,7 @@ #if BUILDFLAG(IS_ANDROID) --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn -@@ -91,7 +91,6 @@ group("resources") { +@@ -92,7 +92,6 @@ group("resources") { if (is_mac) { public_deps += [ "//chrome/browser/resources/media/mei_preload:component", @@ -581,7 +584,7 @@ --- a/chrome/browser/resources/pdf/pdf_viewer.html +++ b/chrome/browser/resources/pdf/pdf_viewer.html -@@ -94,10 +94,6 @@ import {AnnotationMode} from './constant +@@ -98,10 +98,6 @@ import {AnnotationMode} from './constant ` : ''} @@ -594,7 +597,7 @@ ${this.showErrorDialog ? html` --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1716,8 +1716,6 @@ static_library("ui") { +@@ -1722,8 +1722,6 @@ static_library("ui") { "//chrome/browser/regional_capabilities", "//chrome/browser/safe_browsing", "//chrome/browser/safe_browsing:advanced_protection", @@ -603,7 +606,7 @@ "//chrome/browser/smart_card:smart_card", "//chrome/browser/tab_group_sync:utils", "//chrome/browser/themes", -@@ -2397,7 +2395,6 @@ static_library("ui") { +@@ -2415,7 +2413,6 @@ static_library("ui") { "//chrome/browser/policy:onc", "//chrome/browser/policy:system_features_disable_list", "//chrome/browser/push_notification:push_notification", @@ -747,7 +750,7 @@ #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/ui/browser.h" -@@ -371,24 +369,6 @@ ReadAnythingUntrustedPageHandler::ReadAn +@@ -364,24 +362,6 @@ ReadAnythingUntrustedPageHandler::ReadAn prefs_lang = language::ExtractBaseLanguage(prefs_lang); SetDefaultLanguageCode(prefs_lang); @@ -772,7 +775,7 @@ // Enable accessibility for the top level render frame and all descendants. // This causes AXTreeSerializer to reset and send accessibility events of -@@ -842,12 +822,6 @@ void ReadAnythingUntrustedPageHandler::S +@@ -829,12 +809,6 @@ void ReadAnythingUntrustedPageHandler::S weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode); } } @@ -848,7 +851,7 @@ void ChromeRenderFrameObserver::DidMeaningfulLayout( --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -2187,9 +2187,6 @@ if (!is_android) { +@@ -2250,9 +2250,6 @@ if (!is_android) { "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/safe_browsing:advanced_protection", "//chrome/browser/safe_browsing:verdict_cache_manager_factory", @@ -858,7 +861,7 @@ "//chrome/browser/search", "//chrome/browser/search_engines", "//chrome/browser/segmentation_platform:test_utils", -@@ -2592,9 +2589,6 @@ if (!is_android) { +@@ -2664,9 +2661,6 @@ if (!is_android) { "//services/network/public/proto:sct_audit_report_proto", "//services/preferences/public/cpp", "//services/preferences/public/cpp/tracked", @@ -868,7 +871,7 @@ "//services/service_manager/public/cpp", "//services/strings", "//services/test/echo/public/mojom", -@@ -8121,7 +8115,6 @@ test("unit_tests") { +@@ -8211,7 +8205,6 @@ test("unit_tests") { # Non-android deps for "unit_tests" target. deps += [ @@ -876,7 +879,7 @@ "//chrome:packed_resources_integrity_header", "//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps/app_service", -@@ -8156,7 +8149,6 @@ test("unit_tests") { +@@ -8246,7 +8239,6 @@ test("unit_tests") { "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/resources:component_extension_resources_grit", "//chrome/browser/resources/new_tab_page_instant:resources_grit", @@ -884,7 +887,7 @@ "//chrome/browser/search/background", "//chrome/browser/search/background:constants", "//chrome/browser/search_engine_choice:unit_tests", -@@ -8265,7 +8257,6 @@ test("unit_tests") { +@@ -8358,7 +8350,6 @@ test("unit_tests") { "//components/webapps/browser", "//services/metrics/public/cpp:ukm_builders", "//services/network:test_support", @@ -955,9 +958,19 @@ #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE) +--- a/components/BUILD.gn ++++ b/components/BUILD.gn +@@ -597,7 +597,6 @@ test("components_unittests") { + "//components/media_router/common/providers/cast/channel:unit_tests", + "//components/page_info:unit_tests", + "//components/permissions:unit_tests", +- "//components/permissions/prediction_service:unit_tests", + "//components/privacy_sandbox:unit_tests", + "//components/privacy_sandbox/privacy_sandbox_attestations:unit_tests", + "//components/safety_check:unit_tests", --- a/components/omnibox/browser/autocomplete_classifier.cc +++ b/components/omnibox/browser/autocomplete_classifier.cc -@@ -122,8 +122,6 @@ void AutocompleteClassifier::Classify( +@@ -126,8 +126,6 @@ void AutocompleteClassifier::Classify( metrics::OmniboxEventProto::PageClassification page_classification, AutocompleteMatch* match, GURL* alternate_nav_url) { @@ -1083,7 +1096,7 @@ }; --- a/components/update_client/BUILD.gn +++ b/components/update_client/BUILD.gn -@@ -341,8 +341,6 @@ source_set("unit_tests") { +@@ -361,8 +361,6 @@ source_set("unit_tests") { "//third_party/puffin:libpuffpatch", "//third_party/re2", ] @@ -1094,7 +1107,7 @@ fuzzer_test("update_client_protocol_serializer_fuzzer") { --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -820,10 +820,6 @@ if (is_apple) { +@@ -830,10 +830,6 @@ if (is_apple) { deps = [ "//third_party/icu:icudata" ] } @@ -1160,7 +1173,7 @@ --- a/pdf/pdfium/pdfium_engine.cc +++ b/pdf/pdfium/pdfium_engine.cc -@@ -2696,7 +2696,7 @@ void PDFiumEngine::HandleLongPress(const +@@ -2697,7 +2697,7 @@ void PDFiumEngine::HandleLongPress(const SkBitmap PDFiumEngine::GetImageForOcr(int page_index, int image_index) { DCHECK(PageIndexInBounds(page_index)); @@ -1209,19 +1222,9 @@ - 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 -@@ -16,7 +16,6 @@ import("./third_party/blink/public/publi - devtools_frontend_resources_deps = [ - ":favicon", - "front_end", -- "test", - ] - - group("devtools_all_files") { --- a/third_party/devtools-frontend/src/front_end/BUILD.gn +++ b/third_party/devtools-frontend/src/front_end/BUILD.gn -@@ -213,7 +213,6 @@ group("unittests") { +@@ -207,7 +207,6 @@ group("unittests") { "panels/timeline:unittests", "panels/timeline/components:unittests", "panels/timeline/components/insights:unittests", diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index 6343c84f..31378a6f 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 -@@ -608,8 +608,6 @@ static_library("browser") { +@@ -606,8 +606,6 @@ static_library("browser") { "infobars/simple_alert_infobar_creator.h", "interstitials/chrome_settings_page_helper.cc", "interstitials/chrome_settings_page_helper.h", @@ -19,7 +19,7 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/content/common/proto:download_file_types_proto", -@@ -3892,10 +3889,6 @@ static_library("browser") { +@@ -3903,10 +3900,6 @@ static_library("browser") { "new_tab_page/modules/modules_switches.h", "new_tab_page/modules/new_tab_page_modules.cc", "new_tab_page/modules/new_tab_page_modules.h", @@ -30,7 +30,7 @@ "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.cc", "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h", "new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc", -@@ -8468,7 +8461,6 @@ static_library("browser_generated_files" +@@ -8515,7 +8508,6 @@ static_library("browser_generated_files" "//chrome/browser/new_tab_page/chrome_colors:generate_chrome_colors_info", "//chrome/browser/new_tab_page/chrome_colors:generate_colors_info", "//chrome/browser/new_tab_page/modules/file_suggestion:mojo_bindings", @@ -38,7 +38,7 @@ "//chrome/browser/new_tab_page/modules/v2/authentication:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings", -@@ -8954,8 +8946,6 @@ static_library("test_support") { +@@ -9005,8 +8997,6 @@ static_library("test_support") { "//components/reporting/util:status", "//components/reporting/util:status_macros", "//components/reporting/util:task_runner_context", @@ -74,7 +74,7 @@ // Launch a HaTS survey. Note this needs to come before the command is --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -169,7 +169,6 @@ using content::DownloadManager; +@@ -171,7 +171,6 @@ using content::DownloadManager; using download::DownloadItem; using download::DownloadPathReservationTracker; using download::PathValidationResult; @@ -82,7 +82,7 @@ using ConnectionType = net::NetworkChangeNotifier::ConnectionType; #if BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION) -@@ -1815,7 +1814,6 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -1840,7 +1839,6 @@ void ChromeDownloadManagerDelegate::OnDo DownloadItemModel model(item); model.DetermineAndSetShouldPreferOpeningInBrowser( target_info.target_path, target_info.is_filetype_handled_safely); @@ -90,7 +90,7 @@ } if (ShouldBlockFile(item, target_info.danger_type)) { MaybeReportDangerousDownloadBlocked( -@@ -1896,49 +1894,20 @@ bool ChromeDownloadManagerDelegate::IsOp +@@ -1921,49 +1919,20 @@ bool ChromeDownloadManagerDelegate::IsOp bool ChromeDownloadManagerDelegate::ShouldBlockFile( download::DownloadItem* item, download::DownloadDangerType danger_type) const { @@ -146,7 +146,7 @@ << static_cast(download_restriction); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1373,14 +1373,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1371,14 +1371,7 @@ DownloadFileType::DangerLevel DownloadTa std::optional DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { @@ -294,15 +294,15 @@ analysis_config_->supported_tags[0].max_file_size; --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc -@@ -40,8 +40,6 @@ - #include "chrome/browser/profiles/profile.h" +@@ -41,8 +41,6 @@ + #include "chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_factory.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" -#include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h" -#include "chrome/browser/safe_browsing/download_protection/check_client_download_request.h" + #include "chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager_factory.h" #include "chrome/grit/generated_resources.h" #include "components/enterprise/buildflags/buildflags.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 @@ -126,7 +126,7 @@ ContentAnalysisDownloadsDelegate::GetCus @@ -491,7 +491,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 -@@ -188,20 +188,7 @@ void RealtimeReportingClient::SetProfile +@@ -187,20 +187,7 @@ void RealtimeReportingClient::SetProfile } std::string RealtimeReportingClient::GetProfileUserName() { @@ -513,6 +513,28 @@ } std::string RealtimeReportingClient::GetProfileIdentifier() { +--- a/chrome/browser/enterprise/connectors/reporting/telomere_reporting_context.cc ++++ b/chrome/browser/enterprise/connectors/reporting/telomere_reporting_context.cc +@@ -176,19 +176,6 @@ TelomereReportingContext* TelomereReport + } + + RealtimeReportingClient* TelomereReportingContext::GetReportingClient() const { +- for (auto& it : active_profiles_) { +- Profile* profile = it.second; +- RealtimeReportingClient* reporting_client = +- RealtimeReportingClientFactory::GetForProfile(profile); +- if (!reporting_client) { +- continue; +- } +- std::optional settings = +- reporting_client->GetReportingSettings(); +- if (settings.has_value() && !settings->per_profile) { +- return reporting_client; +- } +- } + return nullptr; + } + --- a/chrome/browser/enterprise/data_controls/reporting_service.cc +++ b/chrome/browser/enterprise/data_controls/reporting_service.cc @@ -163,10 +163,6 @@ void ReportingService::ReportPaste( @@ -641,73 +663,47 @@ std::string browser_version; safe_browsing::SafeBrowsingState safe_browsing_protection_level; bool site_isolation_enabled; ---- a/chrome/browser/enterprise/signals/signals_utils.cc -+++ b/chrome/browser/enterprise/signals/signals_utils.cc -@@ -33,38 +33,11 @@ bool IsURLBlocked(const GURL& url, Polic - - } // namespace - --safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel( -- PrefService* profile_prefs) { -- DCHECK(profile_prefs); -- bool safe_browsing_enabled = -- profile_prefs->GetBoolean(prefs::kSafeBrowsingEnabled); -- bool safe_browsing_enhanced_enabled = -- profile_prefs->GetBoolean(prefs::kSafeBrowsingEnhanced); -- -- if (safe_browsing_enabled) { -- if (safe_browsing_enhanced_enabled) -- return safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION; -- else -- return safe_browsing::SafeBrowsingState::STANDARD_PROTECTION; -- } else { -- return safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING; -- } --} -- - bool GetBuiltInDnsClientEnabled(PrefService* local_state) { - DCHECK(local_state); - return local_state->GetBoolean(prefs::kBuiltInDnsClientEnabled); +--- a/chrome/browser/enterprise/signals/profile_signals_collector.cc ++++ b/chrome/browser/enterprise/signals/profile_signals_collector.cc +@@ -45,13 +45,7 @@ ProfileSignalsCollector::ProfileSignalsC + policy_blocklist_service_( + PolicyBlocklistFactory::GetForBrowserContext(profile)), + profile_prefs_(profile->GetPrefs()), +- policy_manager_(profile->GetCloudPolicyManager()), +- connectors_service_( +- enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext( +- profile)) { +-#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) +- DCHECK(connectors_service_); +-#endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) ++ policy_manager_(profile->GetCloudPolicyManager()) { + DCHECK(policy_blocklist_service_); } --std::optional --GetPasswordProtectionWarningTrigger(PrefService* profile_prefs) { -- DCHECK(profile_prefs); -- if (!profile_prefs->HasPrefPath(prefs::kPasswordProtectionWarningTrigger)) -- return std::nullopt; -- return static_cast( -- profile_prefs->GetInteger(prefs::kPasswordProtectionWarningTrigger)); --} -- - bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service) { - DCHECK(service); - return IsURLBlocked(GURL("https://remotedesktop.google.com"), service) || ---- a/chrome/browser/enterprise/signals/signals_utils.h -+++ b/chrome/browser/enterprise/signals/signals_utils.h -@@ -17,12 +17,6 @@ namespace utils { - - bool GetBuiltInDnsClientEnabled(PrefService* local_state); - --std::optional --GetPasswordProtectionWarningTrigger(PrefService* profile_prefs); -- --safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel( -- PrefService* profile_prefs); -- - bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service); - - } // namespace utils +@@ -68,12 +62,8 @@ void ProfileSignalsCollector::GetProfile + signal_response.chrome_remote_desktop_app_blocked = + device_signals::GetChromeRemoteDesktopAppBlocked( + policy_blocklist_service_); +- signal_response.password_protection_warning_trigger = +- device_signals::GetPasswordProtectionWarningTrigger(profile_prefs_); + signal_response.profile_enrollment_domain = + device_signals::TryGetEnrollmentDomain(policy_manager_); +- signal_response.safe_browsing_protection_level = +- device_signals::GetSafeBrowsingProtectionLevel(profile_prefs_); + signal_response.site_isolation_enabled = + device_signals::GetSiteIsolationEnabled(); + #if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -705,8 +705,6 @@ source_set("extensions") { - "mv2_deprecation_impact_checker.h", - "navigation_extension_enabler.cc", - "navigation_extension_enabler.h", -- "omaha_attributes_handler.cc", -- "omaha_attributes_handler.h", - "permissions/site_permissions_helper.cc", - "permissions/site_permissions_helper.h", - "permissions_based_management_policy_provider.cc", +@@ -330,8 +330,6 @@ source_set("extensions") { + "management/management_util.h", + "manifest_check_level.h", + "mv2_experiment_stage.h", +- "omaha_attributes_handler.cc", +- "omaha_attributes_handler.h", + "pack_extension_job.cc", + "pack_extension_job.h", + "permissions/permissions_updater.cc", --- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc +++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc @@ -99,16 +99,8 @@ api::enterprise_reporting_private::Conte @@ -753,15 +749,15 @@ void Blocklist::GetMalwareIDs(const std::set& ids, --- a/chrome/browser/extensions/chrome_extension_system.cc +++ b/chrome/browser/extensions/chrome_extension_system.cc -@@ -454,8 +454,6 @@ void ChromeExtensionSystem::InstallUpdat - void ChromeExtensionSystem::PerformActionBasedOnOmahaAttributes( - const std::string& extension_id, +@@ -465,8 +465,6 @@ void ChromeExtensionSystem::PerformActio const base::Value::Dict& attributes) { + #if BUILDFLAG(ENABLE_EXTENSIONS) + // TODO(crbug.com/413460628): Port ExtensionService to desktop Android. - extension_service()->PerformActionBasedOnOmahaAttributes(extension_id, - attributes); - } - - bool ChromeExtensionSystem::FinishDelayedInstallationIfReady( + #else + NOTIMPLEMENTED(); + #endif --- a/chrome/browser/extensions/extension_allowlist_factory.cc +++ b/chrome/browser/extensions/extension_allowlist_factory.cc @@ -45,7 +45,6 @@ ExtensionAllowlistFactory::ExtensionAllo @@ -774,28 +770,38 @@ ExtensionAllowlistFactory::~ExtensionAllowlistFactory() = default; --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -57,7 +57,6 @@ +@@ -54,7 +54,6 @@ + #include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h" + #include "chrome/browser/extensions/install_verifier.h" #include "chrome/browser/extensions/installed_loader.h" - #include "chrome/browser/extensions/manifest_v2_experiment_manager.h" - #include "chrome/browser/extensions/mv2_experiment_stage.h" -#include "chrome/browser/extensions/omaha_attributes_handler.h" - #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/permissions/permissions_updater.h" #include "chrome/browser/extensions/profile_util.h" -@@ -218,10 +217,6 @@ ExtensionService::ExtensionService( - this, - component_loader_.get())), - extension_registrar_(ExtensionRegistrar::Get(profile)), + #include "chrome/browser/extensions/unpacked_installer.h" +@@ -215,9 +214,6 @@ ExtensionService::ExtensionService( + extension_telemetry_service_verdict_handler_(extension_prefs, + registry_, + extension_registrar_), - omaha_attributes_handler_(extension_prefs, -- ExtensionRegistry::Get(profile), -- this, +- registry_, - extension_registrar_), force_installed_tracker_(registry_, profile_), force_installed_metrics_(registry_, profile_, &force_installed_tracker_), corrupted_extension_reinstaller_( -@@ -451,17 +446,6 @@ bool ExtensionService::UninstallExtensio - transient_extension_id, reason, error, std::move(done_callback)); +@@ -358,10 +354,6 @@ void ExtensionService::Init() { + extensions_features::kDisableLoadExtensionCommandLineSwitch)) { + LOG(WARNING) + << "--load-extension is not allowed in Google Chrome, ignoring."; +- } else if (safe_browsing::IsEnhancedProtectionEnabled( +- *profile_->GetPrefs())) { +- VLOG(1) << "--load-extension is not allowed for users opted into " +- << "Enhanced Safe Browsing, ignoring."; + } else if (ShouldBlockCommandLineExtension(*profile_)) { + // TODO(crbug.com/401529219): Deprecate this restriction once + // --load-extension switch is restricted on Chrome builds. +@@ -440,17 +432,6 @@ void ExtensionService::LoadSigninProfile } + #endif -void ExtensionService::PerformActionBasedOnOmahaAttributes( - const std::string& extension_id, @@ -813,7 +819,7 @@ DCHECK_CURRENTLY_ON(BrowserThread::UI); --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h -@@ -28,7 +28,6 @@ +@@ -27,7 +27,6 @@ #include "chrome/browser/extensions/extension_telemetry_service_verdict_handler.h" #include "chrome/browser/extensions/forced_extensions/force_installed_metrics.h" #include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h" @@ -821,9 +827,9 @@ #include "chrome/browser/extensions/safe_browsing_verdict_handler.h" #include "chrome/browser/profiles/profile_manager_observer.h" #include "chrome/browser/upgrade_detector/upgrade_observer.h" -@@ -252,10 +251,6 @@ class ExtensionService : public Extensio - void RemoveDisableReasonAndMaybeEnable(const std::string& extension_id, - disable_reason::DisableReason reason); +@@ -170,10 +169,6 @@ class ExtensionService : public Extensio + // nothing. + void EnableExtension(const std::string& extension_id); - // Performs action based on Omaha attributes for the extension. - void PerformActionBasedOnOmahaAttributes(const std::string& extension_id, @@ -832,9 +838,9 @@ // Performs action based on verdicts received from the Extension Telemetry // server. Currently, these verdicts are limited to off-store extensions. void PerformActionBasedOnExtensionTelemetryServiceVerdicts( -@@ -553,8 +548,6 @@ class ExtensionService : public Extensio - // Helper to register and unregister extensions. - raw_ptr extension_registrar_ = nullptr; +@@ -371,8 +366,6 @@ class ExtensionService : public Extensio + ExtensionTelemetryServiceVerdictHandler + extension_telemetry_service_verdict_handler_; - // Needs `extension_registrar_` during construction. - OmahaAttributesHandler omaha_attributes_handler_; @@ -847,54 +853,54 @@ blocklist_prefs::SetExtensionTelemetryServiceBlocklistState( extension_id, BitMapBlocklistState::NOT_BLOCKLISTED, extension_prefs_); -- extension_service_->OnBlocklistStateRemoved(extension_id); +- registrar_->OnBlocklistStateRemoved(extension_id); ReportOffstoreExtensionReenabled(current_state); break; case BLOCKLISTED_MALWARE: blocklist_prefs::SetExtensionTelemetryServiceBlocklistState( extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE, extension_prefs_); -- extension_service_->OnBlocklistStateAdded(extension_id); +- registrar_->OnBlocklistStateAdded(extension_id); ReportOffstoreExtensionDisabled( ExtensionTelemetryDisableReason::kMalware); break; --- a/chrome/browser/extensions/safe_browsing_verdict_handler.cc +++ b/chrome/browser/extensions/safe_browsing_verdict_handler.cc -@@ -119,7 +119,6 @@ void SafeBrowsingVerdictHandler::UpdateB +@@ -120,7 +120,6 @@ void SafeBrowsingVerdictHandler::UpdateB blocklist_.Remove(id); blocklist_prefs::SetSafeBrowsingExtensionBlocklistState( id, BitMapBlocklistState::NOT_BLOCKLISTED, extension_prefs_); -- extension_service_->OnBlocklistStateRemoved(id); +- registrar_->OnBlocklistStateRemoved(id); UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.UnblacklistInstalled", extension->location()); } -@@ -133,7 +132,6 @@ void SafeBrowsingVerdictHandler::UpdateB +@@ -134,7 +133,6 @@ void SafeBrowsingVerdictHandler::UpdateB blocklist_.Insert(extension); blocklist_prefs::SetSafeBrowsingExtensionBlocklistState( id, BitMapBlocklistState::BLOCKLISTED_MALWARE, extension_prefs_); -- extension_service_->OnBlocklistStateAdded(id); +- registrar_->OnBlocklistStateAdded(id); UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.BlacklistInstalled", extension->location()); } -@@ -157,7 +155,6 @@ void SafeBrowsingVerdictHandler::UpdateG +@@ -158,7 +156,6 @@ void SafeBrowsingVerdictHandler::UpdateG blocklist_prefs::SetSafeBrowsingExtensionBlocklistState( extension->id(), BitMapBlocklistState::NOT_BLOCKLISTED, extension_prefs_); -- extension_service_->OnGreylistStateRemoved(extension->id()); +- registrar_->OnGreylistStateRemoved(extension->id()); UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Enabled", extension->location()); } -@@ -177,7 +174,6 @@ void SafeBrowsingVerdictHandler::UpdateG +@@ -178,7 +175,6 @@ void SafeBrowsingVerdictHandler::UpdateG blocklist_prefs::BlocklistStateToBitMapBlocklistState(greylist_state); blocklist_prefs::SetSafeBrowsingExtensionBlocklistState( extension->id(), bitmap_greylist_state, extension_prefs_); -- extension_service_->OnGreylistStateAdded(id, bitmap_greylist_state); +- registrar_->OnGreylistStateAdded(id, bitmap_greylist_state); UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Disabled", extension->location()); } --- a/chrome/browser/notifications/persistent_notification_handler.cc +++ b/chrome/browser/notifications/persistent_notification_handler.cc -@@ -212,16 +212,6 @@ void PersistentNotificationHandler::Disa +@@ -235,16 +235,6 @@ void PersistentNotificationHandler::Disa NotificationPermissionContext::UpdatePermission(profile, origin, CONTENT_SETTING_BLOCK); #endif @@ -911,6 +917,76 @@ } void PersistentNotificationHandler::OpenSettings(Profile* profile, +@@ -282,42 +272,6 @@ void PersistentNotificationHandler::OnMa + Profile* profile, + bool did_show_warning, + bool did_user_unsubscribe) { +- CHECK(profile); +- +- // In case the data volume becomes excessive, logging should happen at a +- // sampled rate. This rate is defined by the +- // `kReportNotificationContentDetectionDataRate` feature parameter. +- if (base::RandDouble() * 100 > +- safe_browsing::kReportNotificationContentDetectionDataRate.Get()) { +- return; +- } +- +- scoped_refptr notification_context = +- profile->GetStoragePartitionForUrl(url)->GetPlatformNotificationContext(); +- if (!notification_context || +- !OptimizationGuideKeyedServiceFactory::GetForProfile(profile)) { +- return; +- } +- +- blink::mojom::EngagementLevel engagement_level = +- blink::mojom::EngagementLevel::NONE; +- if (site_engagement::SiteEngagementService::Get(profile)) { +- engagement_level = site_engagement::SiteEngagementService::Get(profile) +- ->GetEngagementLevel(url); +- } +- +- // Read notification data from database and upload as log to model quality +- // service. +- notification_context->ReadNotificationDataAndRecordInteraction( +- notification_id, url, +- content::PlatformNotificationContext::Interaction::NONE, +- base::BindOnce( +- &safe_browsing::SendNotificationContentDetectionDataToMQLSServer, +- OptimizationGuideKeyedServiceFactory::GetForProfile(profile) +- ->GetModelQualityLogsUploaderService() +- ->GetWeakPtr(), +- safe_browsing::NotificationContentDetectionMQLSMetadata( +- did_show_warning, did_user_unsubscribe, engagement_level))); + } + + #if BUILDFLAG(ENABLE_BACKGROUND_MODE) +--- a/chrome/browser/notifications/platform_notification_service_impl.cc ++++ b/chrome/browser/notifications/platform_notification_service_impl.cc +@@ -773,24 +773,6 @@ void PlatformNotificationServiceImpl::Up + std::unique_ptr persistent_metadata, + bool should_show_warning, + std::optional serialized_content_detection_metadata) { +- if (base::FeatureList::IsEnabled( +- safe_browsing::kReportNotificationContentDetectionData) && +- serialized_content_detection_metadata.has_value()) { +- scoped_refptr notification_context = +- profile_->GetStoragePartitionForUrl(notification.origin_url()) +- ->GetPlatformNotificationContext(); +- if (notification_context) { +- notification_context->WriteNotificationMetadata( +- notification.id(), notification.origin_url(), +- safe_browsing::kMetadataDictionaryKey, +- serialized_content_detection_metadata.value(), +- base::BindOnce( +- &PlatformNotificationServiceImpl::DidUpdatePersistentMetadata, +- weak_ptr_factory_.GetWeakPtr(), std::move(persistent_metadata), +- notification, should_show_warning)); +- return; +- } +- } + DoUpdatePersistentMetadataThenDisplay(std::move(persistent_metadata), + notification, should_show_warning); + } --- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc +++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc @@ -16,7 +16,6 @@ @@ -998,7 +1074,7 @@ --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -462,55 +462,5 @@ bool PredictionBasedPermissionUiSelector +@@ -463,55 +463,5 @@ bool PredictionBasedPermissionUiSelector PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse( permissions::RequestType request_type) { @@ -1056,7 +1132,7 @@ } --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -2489,8 +2489,6 @@ std::unique_ptrAddHandler( std::make_unique( chrome_schema)); @@ -1067,7 +1143,7 @@ std::make_unique(key::kURLBlocklist)); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -275,7 +275,6 @@ +@@ -283,7 +283,6 @@ #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h" #include "chrome/browser/new_tab_page/modules/file_suggestion/drive_service.h" #include "chrome/browser/new_tab_page/modules/file_suggestion/microsoft_files_page_handler.h" @@ -1075,19 +1151,21 @@ #include "chrome/browser/new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h" #include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h" #include "chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.h" -@@ -2029,7 +2028,6 @@ void RegisterProfilePrefs(user_prefs::Pr - MicrosoftFilesPageHandler::RegisterProfilePrefs(registry); +@@ -2054,7 +2053,6 @@ void RegisterProfilePrefs(user_prefs::Pr + NewTabFooterUI::RegisterProfilePrefs(registry); NewTabPageHandler::RegisterProfilePrefs(registry); NewTabPageUI::RegisterProfilePrefs(registry); - ntp::SafeBrowsingHandler::RegisterProfilePrefs(registry); - ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry); OutlookCalendarPageHandler::RegisterProfilePrefs(registry); PinnedTabCodec::RegisterProfilePrefs(registry); + promos_utils::RegisterProfilePrefs(registry); --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -839,7 +839,6 @@ void ChromeBrowserMainExtraPartsProfiles - enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance(); +@@ -854,9 +854,7 @@ void ChromeBrowserMainExtraPartsProfiles + enterprise_connectors::TelomereEventRouterFactory::GetInstance(); + } #endif +- enterprise_connectors::BrowserCrashEventRouterFactory::GetInstance(); enterprise_connectors::ConnectorsServiceFactory::GetInstance(); - enterprise_connectors::ReportingEventRouterFactory::GetInstance(); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -1260,7 +1338,7 @@ // certificate. So, when users click proceed on an interstitial, move the tab --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -4558,8 +4558,6 @@ static_library("ui") { +@@ -4585,8 +4585,6 @@ static_library("ui") { "views/safe_browsing/prompt_for_scanning_modal_dialog.h", "views/safe_browsing/tailored_security_desktop_dialog_manager.cc", "views/safe_browsing/tailored_security_desktop_dialog_manager.h", @@ -1269,18 +1347,18 @@ "views/select_audio_output/select_audio_output_dialog.cc", "views/select_audio_output/select_audio_output_dialog.h", "views/select_audio_output/select_audio_output_views.cc", ---- a/chrome/browser/ui/safety_hub/unused_site_permissions_service.cc -+++ b/chrome/browser/ui/safety_hub/unused_site_permissions_service.cc -@@ -52,7 +52,6 @@ +--- a/chrome/browser/ui/safety_hub/revoked_permissions_service.cc ++++ b/chrome/browser/ui/safety_hub/revoked_permissions_service.cc +@@ -53,7 +53,6 @@ #include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" - #include "ui/base/l10n/l10n_util.h" -@@ -371,34 +370,6 @@ UnusedSitePermissionsService::UnusedSite - base::Unretained(this))); + #include "revoked_permissions_service.h" +@@ -386,34 +385,6 @@ RevokedPermissionsService::RevokedPermis + base::Unretained(this))); #endif // BUILDFLAG(IS_ANDROID) - if (base::FeatureList::IsEnabled( @@ -1296,28 +1374,28 @@ -#endif - hcsm()); - -- if (base::FeatureList::IsEnabled( -- safe_browsing::kSafetyHubDisruptiveNotificationRevocation)) { -- disruptive_notification_manager_ = -- std::make_unique( -- hcsm(), -- site_engagement::SiteEngagementServiceFactory::GetForProfile( -- browser_context_)); -- } -- - pref_change_registrar_->Add( - prefs::kSafeBrowsingEnabled, -- base::BindRepeating(&UnusedSitePermissionsService:: +- base::BindRepeating(&RevokedPermissionsService:: - OnPermissionsAutorevocationControlChanged, - base::Unretained(this))); +- } +- +- if (base::FeatureList::IsEnabled( +- safe_browsing::kSafetyHubDisruptiveNotificationRevocation)) { +- disruptive_notification_manager_ = +- std::make_unique( +- hcsm(), +- site_engagement::SiteEngagementServiceFactory::GetForProfile( +- browser_context_)); - } bool migration_completed = pref_change_registrar_->prefs()->GetBoolean( safety_hub_prefs::kUnusedSitePermissionsRevocationMigrationCompleted); -@@ -1056,9 +1027,7 @@ bool UnusedSitePermissionsService::IsUnu +@@ -1154,9 +1125,7 @@ bool RevokedPermissionsService::IsUnused + } - bool UnusedSitePermissionsService:: - IsAbusiveNotificationAutoRevocationEnabled() { + bool RevokedPermissionsService::IsAbusiveNotificationAutoRevocationEnabled() { - return base::FeatureList::IsEnabled( - safe_browsing::kSafetyHubAbusiveNotificationRevocation) && - safe_browsing::IsSafeBrowsingEnabled(*pref_change_registrar_->prefs()); @@ -1327,7 +1405,7 @@ const std::set --- a/chrome/browser/ui/tab_contents/BUILD.gn +++ b/chrome/browser/ui/tab_contents/BUILD.gn -@@ -50,7 +50,6 @@ source_set("impl") { +@@ -51,7 +51,6 @@ source_set("impl") { if (is_win || is_mac || is_linux || is_chromeos) { sources += [ "chrome_web_contents_menu_helper.cc", @@ -1343,7 +1421,7 @@ #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/strings/grit/components_strings.h" - #include "components/tab_collections/public/tab_interface.h" + #include "components/tabs/public/tab_interface.h" #include "components/vector_icons/vector_icons.h" @@ -140,57 +139,6 @@ void ToastService::RegisterToasts( .Build()); @@ -1574,7 +1652,7 @@ std::move(callback), --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -122,7 +122,6 @@ base::span Chr +@@ -123,7 +123,6 @@ base::span Chr kChromeUISuggestInternalsHost, #endif kChromeUINTPTilesInternalsHost, @@ -1584,7 +1662,7 @@ kChromeUITabSearchHost, --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -2449,7 +2449,6 @@ if (!is_android) { +@@ -2523,7 +2523,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1592,7 +1670,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", -@@ -6771,7 +6770,6 @@ test("unit_tests") { +@@ -6871,7 +6870,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1600,6 +1678,166 @@ "//components/safe_browsing/content/browser/notification_content_detection", "//components/safe_browsing/content/browser/notification_content_detection:test_utils", "//components/safe_browsing/content/browser/password_protection", +--- a/components/device_signals/core/browser/browser_utils.cc ++++ b/components/device_signals/core/browser/browser_utils.cc +@@ -29,35 +29,6 @@ bool IsURLBlocked(const GURL& url, Polic + + namespace device_signals { + +-safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel( +- PrefService* profile_prefs) { +- DCHECK(profile_prefs); +- bool safe_browsing_enabled = +- profile_prefs->GetBoolean(prefs::kSafeBrowsingEnabled); +- bool safe_browsing_enhanced_enabled = +- profile_prefs->GetBoolean(prefs::kSafeBrowsingEnhanced); +- +- if (safe_browsing_enabled) { +- if (safe_browsing_enhanced_enabled) { +- return safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION; +- } else { +- return safe_browsing::SafeBrowsingState::STANDARD_PROTECTION; +- } +- } else { +- return safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING; +- } +-} +- +-std::optional +-GetPasswordProtectionWarningTrigger(PrefService* profile_prefs) { +- DCHECK(profile_prefs); +- if (!profile_prefs->HasPrefPath(prefs::kPasswordProtectionWarningTrigger)) { +- return std::nullopt; +- } +- return static_cast( +- profile_prefs->GetInteger(prefs::kPasswordProtectionWarningTrigger)); +-} +- + bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service) { + DCHECK(service); + return IsURLBlocked(GURL("https://remotedesktop.google.com"), service) || +--- a/components/device_signals/core/browser/browser_utils.h ++++ b/components/device_signals/core/browser/browser_utils.h +@@ -22,12 +22,6 @@ namespace device_signals { + + bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service); + +-std::optional +-GetPasswordProtectionWarningTrigger(PrefService* profile_prefs); +- +-safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel( +- PrefService* profile_prefs); +- + std::optional TryGetEnrollmentDomain( + policy::CloudPolicyManager* manager); + +--- a/components/device_signals/core/browser/signals_types.h ++++ b/components/device_signals/core/browser/signals_types.h +@@ -13,7 +13,6 @@ + #include "build/build_config.h" + #include "components/device_signals/core/common/common_types.h" + #include "components/enterprise/connectors/core/reporting_constants.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + + #if BUILDFLAG(IS_WIN) + #include "components/device_signals/core/common/win/win_types.h" +@@ -246,10 +245,7 @@ struct ProfileSignalsResponse : BaseSign + + bool built_in_dns_client_enabled; + bool chrome_remote_desktop_app_blocked; +- std::optional +- password_protection_warning_trigger = std::nullopt; + std::optional profile_enrollment_domain = std::nullopt; +- safe_browsing::SafeBrowsingState safe_browsing_protection_level; + bool site_isolation_enabled; + + // Enterprise cloud content analysis exclusive +--- a/components/enterprise/browser/reporting/chrome_profile_request_generator.cc ++++ b/components/enterprise/browser/reporting/chrome_profile_request_generator.cc +@@ -229,16 +229,10 @@ void ChromeProfileRequestGenerator::OnAg + profile_signals.built_in_dns_client_enabled); + profile_signals_report->set_chrome_remote_desktop_app_blocked( + profile_signals.chrome_remote_desktop_app_blocked); +- profile_signals_report->set_password_protection_warning_trigger( +- TranslatePasswordProtectionTrigger( +- profile_signals.password_protection_warning_trigger)); + profile_signals_report->set_profile_enrollment_domain( + profile_signals.profile_enrollment_domain.value_or("")); + profile_signals_report->set_realtime_url_check_mode( + TranslateRealtimeUrlCheckMode(profile_signals.realtime_url_check_mode)); +- profile_signals_report->set_safe_browsing_protection_level( +- TranslateSafeBrowsingLevel( +- profile_signals.safe_browsing_protection_level)); + profile_signals_report->set_site_isolation_enabled( + profile_signals.site_isolation_enabled); + profile_report->set_allocated_profile_signals_report( +--- a/components/enterprise/browser/reporting/report_util.cc ++++ b/components/enterprise/browser/reporting/report_util.cc +@@ -80,25 +80,6 @@ em::SettingValue TranslateSettingValue( + } + } + +-em::ProfileSignalsReport::PasswordProtectionTrigger +-TranslatePasswordProtectionTrigger( +- std::optional trigger) { +- if (trigger == std::nullopt) { +- return em::ProfileSignalsReport::POLICY_UNSET; +- } +- switch (trigger.value()) { +- case safe_browsing::PasswordProtectionTrigger::PASSWORD_PROTECTION_OFF: +- return em::ProfileSignalsReport::PASSWORD_PROTECTION_OFF; +- case safe_browsing::PasswordProtectionTrigger::PASSWORD_REUSE: +- return em::ProfileSignalsReport::PASSWORD_REUSE; +- case safe_browsing::PasswordProtectionTrigger::PHISHING_REUSE: +- return em::ProfileSignalsReport::PHISHING_REUSE; +- case safe_browsing::PasswordProtectionTrigger:: +- PASSWORD_PROTECTION_TRIGGER_MAX: +- NOTREACHED(); +- } +-} +- + em::ProfileSignalsReport::RealtimeUrlCheckMode TranslateRealtimeUrlCheckMode( + enterprise_connectors::EnterpriseRealTimeUrlCheckMode mode) { + switch (mode) { +@@ -111,18 +92,6 @@ em::ProfileSignalsReport::RealtimeUrlChe + } + } + +-em::ProfileSignalsReport::SafeBrowsingLevel TranslateSafeBrowsingLevel( +- safe_browsing::SafeBrowsingState level) { +- switch (level) { +- case safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING: +- return em::ProfileSignalsReport::NO_SAFE_BROWSING; +- case safe_browsing::SafeBrowsingState::STANDARD_PROTECTION: +- return em::ProfileSignalsReport::STANDARD_PROTECTION; +- case safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION: +- return em::ProfileSignalsReport::ENHANCED_PROTECTION; +- } +-} +- + #if BUILDFLAG(IS_WIN) + std::unique_ptr TranslateAvProduct( + device_signals::AvProduct av_product) { +--- a/components/enterprise/browser/reporting/report_util.h ++++ b/components/enterprise/browser/reporting/report_util.h +@@ -19,17 +19,10 @@ std::string ObfuscateFilePath(const std: + enterprise_management::SettingValue TranslateSettingValue( + device_signals::SettingValue setting_value); + +-enterprise_management::ProfileSignalsReport::PasswordProtectionTrigger +-TranslatePasswordProtectionTrigger( +- std::optional trigger); +- + enterprise_management::ProfileSignalsReport::RealtimeUrlCheckMode + TranslateRealtimeUrlCheckMode( + enterprise_connectors::EnterpriseRealTimeUrlCheckMode mode); + +-enterprise_management::ProfileSignalsReport::SafeBrowsingLevel +-TranslateSafeBrowsingLevel(safe_browsing::SafeBrowsingState level); +- + #if BUILDFLAG(IS_WIN) + std::unique_ptr TranslateAvProduct( + device_signals::AvProduct av_product); --- a/components/enterprise/buildflags/buildflags.gni +++ b/components/enterprise/buildflags/buildflags.gni @@ -10,11 +10,11 @@ declare_args() { @@ -1763,7 +2001,7 @@ void OhttpKeyService::Shutdown() { --- a/components/safe_browsing/core/browser/realtime/chrome_enterprise_url_lookup_service.cc +++ b/components/safe_browsing/core/browser/realtime/chrome_enterprise_url_lookup_service.cc -@@ -135,7 +135,7 @@ bool ChromeEnterpriseRealTimeUrlLookupSe +@@ -138,7 +138,7 @@ bool ChromeEnterpriseRealTimeUrlLookupSe bool ChromeEnterpriseRealTimeUrlLookupService::CanCheckSafeBrowsingDb() const { // Check database if safe browsing is enabled. @@ -1794,7 +2032,7 @@ void RealTimeUrlLookupService::MaybeFillReferringWebApk( --- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -614,17 +614,6 @@ std::unique_ptr RealTim +@@ -595,17 +595,6 @@ void RealTimeUrlLookupServiceBase::Start request->set_report_type(is_sampled_report ? RTLookupRequest::SAMPLED_REPORT : RTLookupRequest::FULL_REPORT); request->set_frame_type(RTLookupRequest::MAIN_FRAME); @@ -1809,9 +2047,9 @@ - std::move(referring_app_info_proto); - MaybeFillReferringWebApk(*referring_app_info, *request); - } - std::optional dm_token_string = GetDMTokenString(); - if (dm_token_string.has_value()) { - request->set_dm_token(dm_token_string.value()); + + std::string browser_dm_token = GetBrowserDMTokenString(); + if (!browser_dm_token.empty()) { --- a/components/safe_browsing/core/browser/safe_browsing_hats_delegate.h +++ b/components/safe_browsing/core/browser/safe_browsing_hats_delegate.h @@ -5,6 +5,8 @@ @@ -1952,7 +2190,7 @@ void SSLBlockingPageBase::PopulateEnhancedProtectionMessage( --- a/components/sync_preferences/common_syncable_prefs_database.cc +++ b/components/sync_preferences/common_syncable_prefs_database.cc -@@ -322,9 +322,6 @@ constexpr auto kCommonSyncablePrefsAllow +@@ -327,9 +327,6 @@ constexpr auto kCommonSyncablePrefsAllow {plus_addresses::prefs::kLastPlusAddressFillingTime, {syncable_prefs_ids::kLastPlusAddressFillingTime, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, @@ -2040,7 +2278,7 @@ void DidFileSkipQuarantine(base::File::Error result); --- a/extensions/browser/extension_registrar.cc +++ b/extensions/browser/extension_registrar.cc -@@ -747,103 +747,27 @@ void ExtensionRegistrar::UnblockAllExten +@@ -772,103 +772,27 @@ void ExtensionRegistrar::UnblockAllExten void ExtensionRegistrar::OnBlocklistStateRemoved( const std::string& extension_id) { @@ -2146,7 +2384,7 @@ void ExtensionRegistrar::OnUnpackedExtensionReloadFailed( --- a/extensions/browser/updater/update_service.cc +++ b/extensions/browser/updater/update_service.cc -@@ -132,13 +132,6 @@ void UpdateService::OnCrxStateChange(Upd +@@ -133,13 +133,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 ac388b8d..8d6ba7aa 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -52,7 +52,7 @@ #include "components/sync/service/sync_service.h" #include "components/sync/service/sync_user_settings.h" #include "content/public/browser/browser_context.h" -@@ -427,40 +426,5 @@ bool ChromeBrowsingDataLifetimeManager:: +@@ -440,40 +439,5 @@ bool ChromeBrowsingDataLifetimeManager:: return sync_disabled; } @@ -95,7 +95,7 @@ } --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -309,7 +309,6 @@ +@@ -308,7 +308,6 @@ #include "components/safe_browsing/core/browser/url_checker_delegate.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" @@ -105,7 +105,7 @@ #include "components/security_interstitials/content/ssl_error_handler.h" --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc -@@ -108,7 +108,6 @@ +@@ -109,7 +109,6 @@ #include "components/safe_browsing/content/common/file_type_policies_test_util.h" #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -135,14 +135,14 @@ #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 -@@ -51,7 +51,6 @@ - #include "components/prefs/pref_service.h" +@@ -54,7 +54,6 @@ #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" + #include "components/safe_browsing/core/browser/realtime/url_lookup_service_base.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/sessions/content/session_tab_helper.h" #include "components/url_matcher/url_matcher.h" #include "content/public/browser/web_contents.h" - #include "crypto/secure_hash.h" --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc @@ -357,8 +357,7 @@ std::string ConnectorsService::GetManage @@ -202,15 +202,15 @@ Profile::FromBrowserContext( --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc -@@ -121,12 +121,6 @@ void ContextInfoFetcher::Fetch(ContextIn - utils::GetChromeRemoteDesktopAppBlocked( +@@ -124,12 +124,6 @@ void ContextInfoFetcher::Fetch(ContextIn + device_signals::GetChromeRemoteDesktopAppBlocked( PolicyBlocklistFactory::GetForBrowserContext(browser_context_)); - Profile* profile = Profile::FromBrowserContext(browser_context_); - info.safe_browsing_protection_level = -- utils::GetSafeBrowsingProtectionLevel(profile->GetPrefs()); +- device_signals::GetSafeBrowsingProtectionLevel(profile->GetPrefs()); - info.password_protection_warning_trigger = -- utils::GetPasswordProtectionWarningTrigger(profile->GetPrefs()); +- device_signals::GetPasswordProtectionWarningTrigger(profile->GetPrefs()); - info.enterprise_profile_id = GetEnterpriseProfileId(profile); #if BUILDFLAG(IS_WIN) @@ -237,27 +237,6 @@ bool chrome_remote_desktop_app_blocked; device_signals::SettingValue os_firewall; std::vector system_dns_servers; ---- a/chrome/browser/enterprise/signals/signals_utils.cc -+++ b/chrome/browser/enterprise/signals/signals_utils.cc -@@ -10,7 +10,6 @@ - #include "components/policy/content/policy_blocklist_service.h" - #include "components/policy/core/browser/url_blocklist_manager.h" - #include "components/prefs/pref_service.h" --#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - - #if BUILDFLAG(IS_WIN) - #include "components/component_updater/pref_names.h" ---- a/chrome/browser/enterprise/signals/signals_utils.h -+++ b/chrome/browser/enterprise/signals/signals_utils.h -@@ -7,8 +7,6 @@ - - #include - --#include "components/safe_browsing/core/common/safe_browsing_prefs.h" -- - class PolicyBlocklistService; - class PrefService; - --- a/chrome/browser/enterprise/signin/oidc_authentication_signin_interceptor.cc +++ b/chrome/browser/enterprise/signin/oidc_authentication_signin_interceptor.cc @@ -49,7 +49,6 @@ @@ -472,17 +451,17 @@ blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly); --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc -@@ -40,7 +40,6 @@ - #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" +@@ -24,7 +24,6 @@ + #include "components/enterprise/connectors/core/reporting_constants.h" + #include "components/enterprise/connectors/core/reporting_service_settings.h" #include "components/prefs/pref_service.h" - #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - #include "components/signin/public/identity_manager/identity_manager.h" #include "components/url_matcher/url_matcher.h" #include "components/url_matcher/url_util.h" + #include "content/public/browser/browser_context.h" --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc -@@ -41,7 +41,6 @@ +@@ -43,7 +43,6 @@ #include "components/policy/core/common/cloud/mock_cloud_policy_client.h" #include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h" #include "components/safe_browsing/core/common/features.h" @@ -503,7 +482,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/supervised_user/core/common/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" -@@ -334,8 +332,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -336,8 +334,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kNumber; // Privacy page @@ -512,7 +491,7 @@ (*s_allowlist)[::prefs::kDnsOverHttpsMode] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kDnsOverHttpsTemplates] = settings_api::PrefType::kString; -@@ -358,16 +354,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -360,16 +356,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; // Security page @@ -531,10 +510,10 @@ (*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 -@@ -786,9 +786,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore +@@ -714,9 +714,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, GetReferrerChainForNonSafeBrowsingUser) { - PrefService* pref_service = browser()->profile()->GetPrefs(); + PrefService* pref_service = profile()->GetPrefs(); - EXPECT_TRUE(pref_service->GetBoolean(prefs::kSafeBrowsingEnabled)); - // Disable SafeBrowsing. - pref_service->SetBoolean(prefs::kSafeBrowsingEnabled, false); @@ -543,7 +522,7 @@ ASSERT_TRUE(OpenTestURL(page_url)); --- a/chrome/browser/extensions/extension_allowlist.cc +++ b/chrome/browser/extensions/extension_allowlist.cc -@@ -10,7 +10,6 @@ +@@ -11,7 +11,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h" #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" @@ -551,7 +530,7 @@ #include "extensions/browser/allowlist_state.h" #include "extensions/browser/extension_registrar.h" #include "extensions/browser/extension_registry.h" -@@ -77,10 +76,6 @@ ExtensionAllowlist::ExtensionAllowlist(P +@@ -74,10 +73,6 @@ ExtensionAllowlist::ExtensionAllowlist(P // Register to Enhanced Safe Browsing setting changes for allowlist // enforcements. pref_change_registrar_.Init(profile_->GetPrefs()); @@ -562,7 +541,7 @@ } ExtensionAllowlist::~ExtensionAllowlist() = default; -@@ -253,15 +248,8 @@ void ExtensionAllowlist::OnExtensionInst +@@ -247,15 +242,8 @@ void ExtensionAllowlist::OnExtensionInst } void ExtensionAllowlist::SetAllowlistEnforcementFields() { @@ -578,7 +557,7 @@ } // `ApplyEnforcement` can be called when an extension becomes not allowlisted or -@@ -412,15 +400,6 @@ void ExtensionAllowlist::NotifyExtension +@@ -406,15 +394,6 @@ void ExtensionAllowlist::NotifyExtension } void ExtensionAllowlist::ReportExtensionReEnabledEvent() { @@ -596,7 +575,7 @@ } // namespace extensions --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -77,7 +77,6 @@ +@@ -71,7 +71,6 @@ #include "chrome/common/url_constants.h" #include "components/crx_file/id_util.h" #include "components/policy/core/common/policy_pref_names.h" @@ -604,21 +583,9 @@ #include "components/supervised_user/core/browser/supervised_user_preferences.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" -@@ -349,10 +348,7 @@ void ExtensionService::Init() { - - LoadExtensionsFromCommandLineFlag(::switches::kDisableExtensionsExcept); - if (load_command_line_extensions) { -- if (safe_browsing::IsEnhancedProtectionEnabled(*profile_->GetPrefs())) { -- VLOG(1) << "--load-extension is not allowed for users opted into " -- << "Enhanced Safe Browsing, ignoring."; -- } else if (ShouldBlockCommandLineExtension(*profile_)) { -+ if (ShouldBlockCommandLineExtension(*profile_)) { - VLOG(1) - << "--load-extension is not allowed for users that have the policy " - << "have the policy ExtensionInstallTypeBlocklist::command_line, " --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc -@@ -32,7 +32,6 @@ +@@ -35,7 +35,6 @@ #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/webui_url_constants.h" @@ -626,7 +593,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" #include "extensions/browser/allowlist_state.h" -@@ -1157,19 +1156,6 @@ void InstalledLoader::RecordExtensionsMe +@@ -1148,19 +1147,6 @@ void InstalledLoader::RecordExtensionsMe base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled2", disabled_not_allowlisted_count); } @@ -678,7 +645,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/first_party_sets_handler.h" -@@ -1419,15 +1418,8 @@ void ProfileNetworkContextService::Confi +@@ -1413,15 +1412,8 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; @@ -693,7 +660,7 @@ - } network_context_params->ct_policy = GetCTPolicy(); - + cert_verifier_creation_params->ct_policy = GetCTPolicy(); --- a/chrome/browser/notifications/platform_notification_service_impl.cc +++ b/chrome/browser/notifications/platform_notification_service_impl.cc @@ -42,7 +42,6 @@ @@ -704,7 +671,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/platform_notification_context.h" #include "content/public/browser/storage_partition.h" -@@ -791,23 +790,5 @@ void PlatformNotificationServiceImpl::Lo +@@ -798,25 +797,7 @@ void PlatformNotificationServiceImpl::Lo bool PlatformNotificationServiceImpl:: AreSuspiciousNotificationsAllowlistedByUser(const GURL& origin) { @@ -728,6 +695,8 @@ - .FindBool(safe_browsing::kIsAllowlistedByUserKey) - .value_or(false); } + + void PlatformNotificationServiceImpl::DidUpdatePersistentMetadata( --- a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc +++ b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc @@ -15,7 +15,6 @@ @@ -777,7 +746,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -33,7 +33,6 @@ +@@ -34,7 +34,6 @@ #include "components/permissions/prediction_service/prediction_service_messages.pb.h" #include "components/permissions/request_type.h" #include "components/prefs/pref_service.h" @@ -848,7 +817,7 @@ } // namespace policy --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -121,8 +121,6 @@ +@@ -122,8 +122,6 @@ #include "components/privacy_sandbox/tracking_protection_prefs.h" #include "components/proxy_config/proxy_policy_handler.h" #include "components/safe_browsing/buildflags.h" @@ -857,7 +826,7 @@ #include "components/search_engines/enterprise/default_search_policy_handler.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/security_interstitials/core/https_only_mode_policy_handler.h" -@@ -131,7 +129,6 @@ +@@ -132,7 +130,6 @@ #include "components/sharing_message/buildflags.h" #include "components/sharing_message/pref_names.h" #include "components/signin/public/base/signin_buildflags.h" @@ -865,7 +834,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/service/sync_policy_handler.h" -@@ -321,9 +318,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -322,9 +319,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kForcePermissionPolicyUnloadDefaultEnabled, policy_prefs::kForcePermissionPolicyUnloadDefaultEnabled, base::Value::Type::BOOLEAN}, @@ -875,7 +844,7 @@ { key::kDomainReliabilityAllowed, domain_reliability::prefs::kDomainReliabilityAllowedByPolicy, base::Value::Type::BOOLEAN }, -@@ -357,15 +351,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -358,15 +352,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kOopPrintDriversAllowedByPolicy, base::Value::Type::BOOLEAN }, #endif @@ -891,7 +860,7 @@ { key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled, base::Value::Type::BOOLEAN }, -@@ -489,9 +474,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -487,9 +472,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdsSettingForIntrusiveAdsSites, prefs::kManagedDefaultAdsSetting, base::Value::Type::INTEGER }, @@ -901,7 +870,7 @@ { key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, base::Value::Type::BOOLEAN }, -@@ -720,15 +702,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -727,15 +709,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kPasswordDismissCompromisedAlertEnabled, password_manager::prefs::kPasswordDismissCompromisedAlertEnabled, base::Value::Type::BOOLEAN }, @@ -917,7 +886,7 @@ #if BUILDFLAG(ENABLE_PDF) { key::kPdfLocalFileAccessAllowedForDomains, prefs::kPdfLocalFileAccessAllowedForDomains, -@@ -897,9 +870,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -904,9 +877,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdditionalDnsQueryTypesEnabled, prefs::kAdditionalDnsQueryTypesEnabled, base::Value::Type::BOOLEAN }, @@ -927,7 +896,7 @@ { key::kForceGoogleSafeSearch, policy_prefs::kForceGoogleSafeSearch, base::Value::Type::BOOLEAN }, -@@ -961,9 +931,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -971,9 +941,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, @@ -937,17 +906,20 @@ #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -1930,9 +1897,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1940,12 +1907,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, - { key::kProfileSeparationDomainExceptionList, - prefs::kProfileSeparationDomainExceptionList, - base::Value::Type::LIST }, +- { key::kProfileSeparationSettings, +- prefs::kProfileSeparationSettings, +- base::Value::Type::INTEGER }, { key::kLiveTranslateEnabled, prefs::kLiveTranslateEnabled, base::Value::Type::BOOLEAN }, -@@ -1994,9 +1958,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2007,9 +1968,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kImportDialogAutofillFormData, base::Value::Type::BOOLEAN }, @@ -957,7 +929,7 @@ { key::kHardwareAccelerationModeEnabled, prefs::kHardwareAccelerationModeEnabled, base::Value::Type::BOOLEAN }, -@@ -2264,9 +2225,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2273,9 +2231,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGoogleSearchSidePanelEnabled, prefs::kGoogleSearchSidePanelEnabled, base::Value::Type::BOOLEAN }, @@ -967,15 +939,18 @@ #endif // BUILDFLAG(IS_ANDROID) { key::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, policy_prefs::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, -@@ -2801,21 +2759,7 @@ std::unique_ptrAddHandler(std::make_unique( -- std::make_unique(chrome_schema), -- std::make_unique(key::kProfileSeparationSettings, -- prefs::kProfileSeparationSettings, -- base::Value::Type::INTEGER))); +- handlers->AddHandler( +- std::make_unique( +- std::make_unique( +- chrome_schema), +- std::vector{ +- key::kProfileSeparationSettings, +- key::kProfileSeparationDataMigrationSettings, +- key::kProfileSeparationDomainExceptionList})); - handlers->AddHandler(std::make_unique( - std::make_unique( @@ -989,7 +964,7 @@ handlers->AddHandler(std::make_unique( key::kProfileReauthPrompt, enterprise_signin::prefs::kProfileReauthPrompt, static_cast(enterprise_signin::ProfileReauthPrompt::kDoNotPrompt), -@@ -2887,24 +2831,6 @@ std::unique_ptr> signin_legacy_policies; @@ -1016,15 +991,15 @@ std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -154,7 +154,6 @@ - #include "components/privacy_sandbox/tpcd_pref_names.h" +@@ -159,7 +159,6 @@ #include "components/proxy_config/pref_proxy_config_tracker_impl.h" + #include "components/regional_capabilities/regional_capabilities_prefs.h" #include "components/safe_browsing/buildflags.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/saved_tab_groups/public/pref_names.h" #include "components/search_engines/search_engine_choice/search_engine_choice_service.h" #include "components/search_engines/template_url_prepopulate_data.h" -@@ -166,7 +165,6 @@ +@@ -171,7 +170,6 @@ #include "components/sessions/core/session_id_generator.h" #include "components/sharing_message/sharing_sync_preference.h" #include "components/signin/core/browser/active_primary_accounts_metrics_recorder.h" @@ -1032,7 +1007,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_engagement/content/site_engagement_service.h" -@@ -1589,7 +1587,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1605,7 +1603,6 @@ void RegisterLocalState(PrefRegistrySimp PushMessagingServiceImpl::RegisterPrefs(registry); #endif RegisterScreenshotPrefs(registry); @@ -1040,7 +1015,7 @@ search_engines::SearchEngineChoiceService::RegisterLocalStatePrefs(registry); secure_origin_allowlist::RegisterPrefs(registry); segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs( -@@ -1922,7 +1919,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1943,7 +1940,6 @@ void RegisterProfilePrefs(user_prefs::Pr #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) safe_browsing::file_type::RegisterProfilePrefs(registry); #endif @@ -1058,7 +1033,7 @@ #include "components/safe_browsing/core/common/safebrowsing_switches.h" #include "components/sync/base/pref_names.h" #include "content/public/common/content_switches.h" -@@ -77,8 +76,6 @@ const CommandLinePrefStore::BooleanSwitc +@@ -81,8 +80,6 @@ const CommandLinePrefStore::BooleanSwitc {switches::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, true}, {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true}, @@ -1141,7 +1116,7 @@ EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); --- a/chrome/browser/profiles/gaia_info_update_service.cc +++ b/chrome/browser/profiles/gaia_info_update_service.cc -@@ -23,7 +23,6 @@ +@@ -22,7 +22,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/avatar_icon_util.h" #include "components/signin/public/base/consent_level.h" @@ -1169,7 +1144,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "google_apis/gaia/gaia_id.h" -@@ -517,7 +516,7 @@ bool ProfileAttributesEntry::IsUsingDefa +@@ -515,7 +514,7 @@ bool ProfileAttributesEntry::IsUsingDefa } bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const { @@ -1178,7 +1153,7 @@ } bool ProfileAttributesEntry::IsDasherlessManagement() const { -@@ -736,7 +735,6 @@ void ProfileAttributesEntry::SetLastDown +@@ -734,7 +733,6 @@ void ProfileAttributesEntry::SetLastDown } void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) { @@ -1235,7 +1210,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/signin/public/identity_manager/tribool.h" -@@ -1915,8 +1914,7 @@ void ProfileManager::AddProfileToStorage +@@ -1913,8 +1912,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1245,7 +1220,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -1965,14 +1963,13 @@ void ProfileManager::AddProfileToStorage +@@ -1963,14 +1961,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsForceEphemeralProfilesEnabled(profile); init_params.is_signed_in_with_credential_provider = @@ -1283,7 +1258,7 @@ namespace profiles { --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -897,7 +897,7 @@ +@@ -918,7 +918,7 @@ @@ -1305,7 +1280,7 @@ --- a/chrome/browser/resources/settings/privacy_page/security_page.html +++ b/chrome/browser/resources/settings/privacy_page/security_page.html -@@ -75,155 +75,6 @@ +@@ -71,126 +71,6 @@ pointer-events: auto; } @@ -1319,8 +1294,7 @@ - name="[[safeBrowsingSettingEnum_.ENHANCED]]" - pref="[[prefs.generated.safe_browsing]]" - label="$i18n{safeBrowsingEnhanced}" -- sub-label="[[getSafeBrowsingEnhancedSubLabel_( -- enableEsbAiStringUpdate_)]]" +- sub-label="$i18n{safeBrowsingEnhancedDescUpdated}" - indicator-aria-label="$i18n{controlledSettingPolicy}" - expand-aria-label="$i18n{safeBrowsingEnhancedExpandA11yLabel}" - on-expand-clicked="onEnhancedProtectionExpandButtonClicked_" @@ -1361,15 +1335,6 @@ - $i18n{safeBrowsingEnhancedWhenOnBulFour} - - -- - - -
@@ -1396,27 +1361,17 @@ -
- - -- - - -- +- - - - - - -- - - -

$i18n{secureConnectionsSectionTitle}

-@@ -392,11 +243,3 @@ +@@ -355,11 +235,3 @@ on-click="onAdvancedProtectionProgramLinkClick_" external> @@ -1475,7 +1421,7 @@ - --- a/chrome/browser/resources/settings/privacy_page/security_page.ts +++ b/chrome/browser/resources/settings/privacy_page/security_page.ts -@@ -317,17 +317,6 @@ export class SettingsSecurityPageElement +@@ -300,17 +300,6 @@ export class SettingsSecurityPageElement super.ready(); CrSettingsPrefs.initialized.then(() => { @@ -1493,7 +1439,7 @@ // The HTTPS-First Mode generated pref should never be set to // ENABLED_BALANCED if the feature flag is not enabled. if (!loadTimeData.getBoolean('enableHttpsFirstModeNewSettings')) { -@@ -337,10 +326,6 @@ export class SettingsSecurityPageElement +@@ -320,10 +309,6 @@ export class SettingsSecurityPageElement } }); @@ -1504,7 +1450,7 @@ // Initialize the last focus time on page load. this.lastFocusTime_ = HatsBrowserProxyImpl.getInstance().now(); } -@@ -460,8 +445,7 @@ export class SettingsSecurityPageElement +@@ -443,8 +428,7 @@ export class SettingsSecurityPageElement } private getDisabledExtendedSafeBrowsing_(): boolean { @@ -1513,7 +1459,27 @@ + return true; } - private getSafeBrowsingEnhancedSubLabel_(): string { + private getSafeBrowsingStandardSubLabel_(): string { +@@ -456,19 +440,6 @@ export class SettingsSecurityPageElement + + private getPasswordsLeakToggleSubLabel_(): string { + let subLabel = this.i18n('passwordsLeakDetectionGeneralDescription'); +- // If the backing password leak detection preference is enabled, but the +- // generated preference is off and user control is disabled, then additional +- // text explaining that the feature will be enabled if the user signs in is +- // added. +- if (this.prefs !== undefined) { +- const generatedPref = this.getPref('generated.password_leak_detection'); +- if (this.getPref('profile.password_manager_leak_detection').value && +- !generatedPref.value && generatedPref.userControlDisabled) { +- subLabel += +- ' ' + // Whitespace is a valid sentence separator w.r.t. i18n. +- this.i18n('passwordsLeakDetectionSignedOutEnabledDescription'); +- } +- } + return subLabel; + } + --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts @@ -56,7 +56,7 @@ function getCategoryItemMap(): MapHasPrefPath(prefs::kAdvancedProtectionLastRefreshInUs)) { - last_refreshed_ = base::Time::FromDeltaSinceWindowsEpoch(base::Microseconds( @@ -1546,7 +1512,7 @@ if (is_under_advanced_protection_) { ScheduleNextRefresh(); } -@@ -111,16 +108,7 @@ AdvancedProtectionStatusManagerDesktop:: +@@ -96,16 +93,7 @@ AdvancedProtectionStatusManagerDesktop:: ~AdvancedProtectionStatusManagerDesktop() = default; bool AdvancedProtectionStatusManagerDesktop::IsUnderAdvancedProtection() const { @@ -1563,7 +1529,7 @@ } void AdvancedProtectionStatusManagerDesktop:: -@@ -284,10 +272,6 @@ void AdvancedProtectionStatusManagerDesk +@@ -269,10 +257,6 @@ void AdvancedProtectionStatusManagerDesk } void AdvancedProtectionStatusManagerDesktop::UpdateLastRefreshTime() { @@ -1576,14 +1542,14 @@ bool AdvancedProtectionStatusManagerDesktop::IsUnconsentedPrimaryAccount( --- a/chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc +++ b/chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc -@@ -7,7 +7,6 @@ +@@ -8,7 +8,6 @@ #include "base/test/task_environment.h" #include "build/build_config.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/safebrowsing_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_test_environment.h" - #include "components/sync_preferences/testing_pref_service_syncable.h" --- a/chrome/browser/safe_browsing/android/services_delegate_android.h +++ b/chrome/browser/safe_browsing/android/services_delegate_android.h @@ -6,7 +6,6 @@ @@ -1596,7 +1562,7 @@ --- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc -@@ -68,7 +68,6 @@ +@@ -72,7 +72,6 @@ #include "components/safe_browsing/core/browser/verdict_cache_manager.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -1604,7 +1570,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" -@@ -1340,14 +1339,6 @@ bool ChromePasswordProtectionService::Ha +@@ -1381,14 +1380,6 @@ bool ChromePasswordProtectionService::Ha } void ChromePasswordProtectionService::OnWarningTriggerChanged() { @@ -1619,7 +1585,7 @@ // Clears captured enterprise password hashes or GSuite sync password hashes. password_manager::PasswordReuseManager* reuse_manager = GetPasswordReuseManager(); -@@ -1520,7 +1511,7 @@ PrefService* ChromePasswordProtectionSer +@@ -1561,7 +1552,7 @@ PrefService* ChromePasswordProtectionSer } bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() { @@ -1628,7 +1594,7 @@ } bool ChromePasswordProtectionService::IsExtendedReporting() { -@@ -1540,39 +1531,7 @@ bool ChromePasswordProtectionService::Is +@@ -1581,39 +1572,7 @@ bool ChromePasswordProtectionService::Is bool ChromePasswordProtectionService::IsPingingEnabled( LoginReputationClientRequest::TriggerType trigger_type, ReusedPasswordAccountType password_type) { @@ -1669,7 +1635,7 @@ } RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason( -@@ -1819,23 +1778,6 @@ MaybeCreateCommitDeferringCondition( +@@ -1860,23 +1819,6 @@ MaybeCreateCommitDeferringCondition( : nullptr; } @@ -1695,7 +1661,7 @@ if (!profile_) --- a/chrome/browser/safe_browsing/chrome_password_protection_service.h +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h -@@ -218,13 +218,6 @@ class ChromePasswordProtectionService : +@@ -219,13 +219,6 @@ class ChromePasswordProtectionService : bool UserClickedThroughSBInterstitial( PasswordProtectionRequest* request) override; @@ -1711,10 +1677,10 @@ // policy. --- a/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc -@@ -43,7 +43,6 @@ +@@ -40,7 +40,6 @@ + #include "components/safe_browsing/content/browser/password_protection/password_protection_request_content.h" #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h" #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" - #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_state/content/security_state_tab_helper.h" #include "components/security_state/core/security_state.h" @@ -2265,7 +2231,7 @@ PrefChangeRegistrar local_state_pref_registrar_; --- a/chrome/browser/signin/android/signin_manager_android.cc +++ b/chrome/browser/signin/android/signin_manager_android.cc -@@ -31,7 +31,6 @@ +@@ -33,7 +33,6 @@ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/policy/core/common/policy_switches.h" #include "components/prefs/pref_service.h" @@ -2273,7 +2239,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" -@@ -118,11 +117,6 @@ class ProfileDataRemover : public conten +@@ -125,11 +124,6 @@ class ProfileDataRemover : public conten // All the Profile data has been wiped. Clear the last signed in username // as well, so that the next signin doesn't trigger the account // change dialog. @@ -2285,7 +2251,7 @@ } origin_runner_->PostTask(FROM_HERE, std::move(callback_)); -@@ -159,11 +153,6 @@ SigninManagerAndroid::SigninManagerAndro +@@ -166,11 +160,6 @@ SigninManagerAndroid::SigninManagerAndro DCHECK(user_cloud_policy_manager_); DCHECK(user_policy_signin_service_); @@ -2297,7 +2263,7 @@ force_browser_signin_.Init(prefs::kForceBrowserSignin, g_browser_process->local_state()); -@@ -196,7 +185,7 @@ SigninManagerAndroid::ManagementCredenti +@@ -203,7 +192,7 @@ SigninManagerAndroid::ManagementCredenti SigninManagerAndroid::ManagementCredentials::~ManagementCredentials() = default; bool SigninManagerAndroid::IsSigninAllowed() const { @@ -2328,7 +2294,7 @@ #include "components/signin/public/base/signin_switches.h" #include "content/public/browser/network_service_instance.h" -@@ -120,7 +119,4 @@ BoundSessionCookieRefreshServiceFactory: +@@ -112,7 +111,4 @@ BoundSessionCookieRefreshServiceFactory: void BoundSessionCookieRefreshServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { BoundSessionParamsStorage::RegisterProfilePrefs(registry); @@ -2439,7 +2405,7 @@ } std::optional -@@ -1492,16 +1483,6 @@ void DiceWebSigninInterceptor:: +@@ -1490,16 +1481,6 @@ void DiceWebSigninInterceptor:: g_browser_process->browser_policy_connector(), g_browser_process->system_network_context_manager() ->GetSharedURLLoaderFactory()); @@ -2525,7 +2491,7 @@ IsValidUnconsentedPrimaryAccount(current_primary_account); --- a/chrome/browser/signin/signin_promo_util.cc +++ b/chrome/browser/signin/signin_promo_util.cc -@@ -11,7 +11,6 @@ +@@ -13,7 +13,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2533,7 +2499,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -165,84 +164,14 @@ namespace signin { +@@ -168,84 +167,14 @@ namespace signin { #if !BUILDFLAG(IS_ANDROID) bool ShouldShowSyncPromo(Profile& profile) { @@ -2618,15 +2584,13 @@ } bool ShouldShowExtensionSignInPromo(Profile& profile, -@@ -291,42 +220,7 @@ bool ShouldShowAddressSignInPromo(Profil +@@ -294,40 +223,7 @@ bool ShouldShowAddressSignInPromo(Profil } bool ShouldShowBookmarkSignInPromo(Profile& profile) { -#if BUILDFLAG(ENABLE_DICE_SUPPORT) - if (!base::FeatureList::IsEnabled( -- switches::kSyncEnableBookmarksInTransportMode) || -- !base::FeatureList::IsEnabled( -- switches::kSyncMinimizeDeletionsDuringBookmarkBatchUpload)) { +- switches::kSyncEnableBookmarksInTransportMode)) { - return false; - } - @@ -2815,7 +2779,7 @@ --- a/chrome/browser/ssl/ssl_browsertest.cc +++ b/chrome/browser/ssl/ssl_browsertest.cc -@@ -98,7 +98,6 @@ +@@ -99,7 +99,6 @@ #include "components/policy/policy_constants.h" #include "components/prefs/testing_pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2845,7 +2809,7 @@ #include "components/sync/service/sync_service.h" --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -91,7 +91,6 @@ +@@ -92,7 +92,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" @@ -2973,7 +2937,7 @@ --- a/chrome/browser/ui/safety_hub/menu_notification_service.cc +++ b/chrome/browser/ui/safety_hub/menu_notification_service.cc @@ -21,7 +21,6 @@ - #include "chrome/browser/ui/safety_hub/unused_site_permissions_service.h" + #include "chrome/browser/ui/safety_hub/safety_hub_service.h" #include "chrome/common/chrome_features.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" @@ -3073,8 +3037,8 @@ #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_prefs.h" - #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" + #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" @@ -322,15 +321,6 @@ void SigninViewController::SignoutOrReau &SigninViewController::SignoutOrReauthWithPromptWithUnsyncedDataTypes, weak_ptr_factory_.GetWeakPtr(), reauth_access_point, @@ -3089,9 +3053,9 @@ - return; - } // Dice users don't see the prompt, pass empty datatypes. - std::move(signout_prompt_with_datatypes).Run(syncer::DataTypeSet()); - } -@@ -673,9 +663,7 @@ void SigninViewController::SignoutOrReau + std::move(signout_prompt_with_datatypes) + .Run(absl::flat_hash_map()); +@@ -674,9 +664,7 @@ void SigninViewController::SignoutOrReau bool sign_out_immediately = unsynced_datatypes.empty() && needs_reauth; // Do not show the dialog to users with implicit signin. @@ -3147,15 +3111,15 @@ void SetFirstRunFinished(FirstRunService::FinishedReason reason) { --- a/chrome/browser/ui/toolbar/app_menu_model.cc +++ b/chrome/browser/ui/toolbar/app_menu_model.cc -@@ -110,7 +110,6 @@ +@@ -111,7 +111,6 @@ #include "components/profile_metrics/browser_profile_type.h" #include "components/saved_tab_groups/public/features.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/identity_manager.h" #include "components/strings/grit/components_strings.h" -@@ -607,51 +606,7 @@ int ProfileSubMenuModel::GetAndIncrement + #include "components/user_education/common/feature_promo/feature_promo_controller.h" +@@ -596,51 +595,7 @@ int ProfileSubMenuModel::GetAndIncrement } bool ProfileSubMenuModel::BuildSyncSection() { @@ -3229,7 +3193,7 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.cc +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.cc -@@ -50,7 +50,6 @@ +@@ -58,7 +58,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -3237,7 +3201,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -1625,18 +1624,6 @@ void AvatarToolbarButtonDelegate::OnErro +@@ -2020,18 +2019,6 @@ void AvatarToolbarButtonDelegate::OnErro const CoreAccountInfo& account_info, const GoogleServiceAuthError& error, signin_metrics::SourceForRefreshTokenOperation token_operation_source) { @@ -3266,129 +3230,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" -@@ -740,121 +739,6 @@ void ProfileMenuView::BuildAutofillButto - } - - void ProfileMenuView::BuildSyncInfo() { -- // TODO(crbug.com/370473765): Delete this function after -- // `switches::IsImprovedSigninUIOnDesktopEnabled()` is launched. -- CHECK(!switches::IsImprovedSigninUIOnDesktopEnabled()); -- -- Profile* profile = browser()->profile(); -- if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) { -- return; -- } -- -- if (!SyncServiceFactory::IsSyncAllowed(profile)) { -- return; -- } -- -- signin::IdentityManager* identity_manager = -- IdentityManagerFactory::GetForProfile(profile); -- bool is_sync_feature_enabled = -- identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync); -- // First, check for sync errors. They may exist even if sync-the-feature is -- // disabled and only sync-the-transport is running. -- const std::optional error = -- GetAvatarSyncErrorType(profile); -- if (error) { -- std::u16string error_description = GetAvatarSyncErrorDescription( -- *error, is_sync_feature_enabled, -- identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin) -- .email); -- BuildSyncInfoWithCallToAction( -- std::move(error_description), GetSyncErrorButtonText(*error), -- base::BindRepeating(&ProfileMenuView::OnSyncErrorButtonClicked, -- base::Unretained(this), *error), -- /*show_sync_badge=*/is_sync_feature_enabled); -- return; -- } -- -- // If there's no error and sync-the-feature is enabled, the text says -- // everything is fine and the button simply opens sync settings. -- if (is_sync_feature_enabled) { -- BuildSyncInfoWithoutCallToAction( -- l10n_util::GetStringUTF16(IDS_PROFILES_OPEN_SYNC_SETTINGS_BUTTON), -- base::BindRepeating(&ProfileMenuView::OnSyncSettingsButtonClicked, -- base::Unretained(this))); -- return; -- } -- -- // If there's no error and sync-the-feature is disabled, show a sync promo. -- // For a signed-in user, the promo just opens the "turn on sync" dialog. -- // For a web-only signed-in user in the UNO model, the promo signs the user on -- // Chrome and opens the "turn on sync" dialog. -- // For a signed-out user, it prompts for sign-in first. -- CoreAccountInfo account_info = -- identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin); -- AccountInfo account_info_for_promos = -- signin_ui_util::GetSingleAccountForPromos(identity_manager); -- std::u16string description; -- std::u16string button_text; -- ActionableItem button_type = ActionableItem::kSigninAccountButton; -- bool show_account_card = false; -- signin_metrics::AccessPoint access_point = -- signin_metrics::AccessPoint::kAvatarBubbleSignIn; -- -- signin_metrics::PromoAction promo_action = -- signin_metrics::PromoAction::PROMO_ACTION_NO_SIGNIN_PROMO; -- -- if (!account_info.IsEmpty()) { -- if (identity_manager->HasAccountWithRefreshTokenInPersistentErrorState( -- account_info.account_id)) { -- // Sign-in pending state. -- button_type = ActionableItem::kSigninReauthButton; -- description = -- l10n_util::GetStringUTF16(IDS_SIGNIN_PAUSED_USER_MENU_VERIFY_MESSAGE); -- button_text = -- l10n_util::GetStringUTF16(IDS_PROFILES_VERIFY_ACCOUNT_BUTTON); -- } else { -- // Signed-in not-syncing state. -- description = l10n_util::GetStringUTF16(IDS_PROFILES_DICE_SYNC_PROMO); -- button_text = l10n_util::GetStringUTF16(IDS_PROFILES_DICE_SIGNIN_BUTTON); -- } -- } else if (!account_info_for_promos.IsEmpty()) { -- // Web-only signed-in state. -- account_info = account_info_for_promos; -- access_point = -- signin_metrics::AccessPoint::kAvatarBubbleSignInWithSyncPromo; -- description = -- l10n_util::GetStringUTF16(IDS_PROFILE_MENU_SIGNIN_PROMO_DESCRIPTION); -- button_text = l10n_util::GetStringFUTF16( -- IDS_PROFILES_DICE_WEB_ONLY_SIGNIN_BUTTON, -- base::UTF8ToUTF16(!account_info_for_promos.given_name.empty() -- ? account_info_for_promos.given_name -- : account_info_for_promos.email)); -- button_type = ActionableItem::kEnableSyncForWebOnlyAccountButton; -- show_account_card = true; -- promo_action = signin_metrics::PromoAction::PROMO_ACTION_WITH_DEFAULT; -- } else { -- // Not signed in state. -- access_point = -- signin_metrics::AccessPoint::kAvatarBubbleSignInWithSyncPromo; -- description = -- l10n_util::GetStringUTF16(IDS_PROFILE_MENU_SIGNIN_PROMO_DESCRIPTION); -- button_text = -- l10n_util::GetStringUTF16(IDS_PROFILE_MENU_SIGNIN_PROMO_BUTTON); -- button_type = ActionableItem::kSigninButton; -- promo_action = signin_metrics::PromoAction:: -- PROMO_ACTION_NEW_ACCOUNT_NO_EXISTING_ACCOUNT; -- } -- signin_metrics::LogSignInOffered(access_point, promo_action); -- -- CHECK(!description.empty()); -- CHECK(!button_text.empty()); -- BuildSyncInfoWithCallToAction( -- description, button_text, -- base::BindRepeating(&ProfileMenuView::OnSigninButtonClicked, -- base::Unretained(this), account_info, button_type, -- access_point), -- /*show_sync_badge=*/false, -- show_account_card ? account_info_for_promos : AccountInfo()); - } - - ProfileMenuViewBase::IdentitySectionParams -@@ -940,15 +824,6 @@ ProfileMenuView::GetIdentitySectionParam +@@ -633,15 +632,6 @@ ProfileMenuView::GetIdentitySectionParam signin_metrics::AccessPoint::kAvatarBubbleSignIn; switch (signin_util::GetSignedInState(identity_manager)) { case signin_util::SignedInState::kSignedOut: @@ -3404,16 +3246,17 @@ break; case signin_util::SignedInState::kWebOnlySignedIn: { access_point = -@@ -1069,9 +944,6 @@ void ProfileMenuView::MaybeBuildChromeAc - int message_id = IDS_PROFILE_MENU_OPEN_ACCOUNT_SETTINGS; - const gfx::VectorIcon* icon = &vector_icons::kSettingsChromeRefreshIcon; - if (switches::IsImprovedSigninUIOnDesktopEnabled()) { -- if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) { -- should_show_settings_button = true; -- } - if (signin_util::GetSignedInState(identity_manager) == - signin_util::SignedInState::kSyncing) { - // Indicates clearly that Sync is ON. +@@ -760,9 +750,7 @@ void ProfileMenuView::MaybeBuildChromeAc + // Show the settings button when signed in to Chrome or to the web, or if + // signin is disallowed. + const bool should_show_settings_button = +- !identity_manager->GetExtendedAccountInfoForAccountsWithRefreshToken() +- .empty() || +- !profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed); ++ false; + if (!should_show_settings_button) { + return; + } --- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc @@ -85,7 +85,6 @@ @@ -3563,7 +3406,7 @@ // AppMenuView is a view that can contain label buttons. --- a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc +++ b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc -@@ -33,7 +33,6 @@ +@@ -35,7 +35,6 @@ #include "components/performance_manager/public/features.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" @@ -3571,7 +3414,7 @@ #include "components/safe_browsing/core/common/safebrowsing_referral_methods.h" #include "components/saved_tab_groups/public/features.h" #include "components/user_education/common/tutorial/tutorial_identifier.h" -@@ -94,13 +93,6 @@ void BrowserCommandHandler::CanExecuteCo +@@ -98,13 +97,6 @@ void BrowserCommandHandler::CanExecuteCo case Command::kOpenSafetyCheck: can_execute = !enterprise_util::IsBrowserManaged(profile_); break; @@ -3749,7 +3592,7 @@ #include "components/site_engagement/content/site_engagement_service.h" --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -88,7 +88,6 @@ +@@ -87,7 +87,6 @@ #include "components/regional_capabilities/regional_capabilities_service.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" @@ -3757,7 +3600,7 @@ #include "components/saved_tab_groups/public/features.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_switches.h" -@@ -3457,11 +3456,6 @@ void AddSiteSettingsStrings(content::Web +@@ -3476,11 +3475,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -3771,7 +3614,7 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -110,7 +110,6 @@ +@@ -114,7 +114,6 @@ #include "components/regional_capabilities/regional_capabilities_service.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" @@ -3779,7 +3622,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "content/public/browser/url_data_source.h" -@@ -312,9 +311,7 @@ SettingsUI::SettingsUI(content::WebUI* w +@@ -320,9 +319,7 @@ SettingsUI::SettingsUI(content::WebUI* w } #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -4075,7 +3918,7 @@ std::make_unique( --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc -@@ -56,7 +56,6 @@ +@@ -57,7 +57,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" @@ -4109,12 +3952,12 @@ #include "components/prefs/pref_service.h" #include "components/search_engines/keyword_web_data_service.h" -#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/webdata/token_web_data.h" #include "components/webdata_services/web_data_service_wrapper.h" -@@ -96,51 +95,7 @@ AutofillAccountStorageResult DetermineAu - return AutofillAccountStorageResult::kInMemory_FlagDisabled; - } + #include "content/public/browser/browser_task_traits.h" +@@ -89,51 +88,7 @@ enum class AutofillAccountStorageResult + AutofillAccountStorageResult DetermineAutofillAccountStorage( + PrefService* pref_service) { CHECK(pref_service); - // The interpretation of the pref mimics what PrimaryAccountManager's - // constructor does. @@ -4193,7 +4036,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/data_type.h" #include "components/sync/base/features.h" -@@ -290,13 +289,7 @@ void AddressDataManager::RemoveLocalProf +@@ -309,13 +308,7 @@ void AddressDataManager::RemoveLocalProf } bool AddressDataManager::IsEligibleForAddressAccountStorage() const { @@ -4207,7 +4050,7 @@ } bool AddressDataManager::IsCountryEligibleForAccountStorage( -@@ -581,35 +574,7 @@ bool AddressDataManager::IsAutofillUserS +@@ -600,35 +593,7 @@ bool AddressDataManager::IsAutofillUserS } bool AddressDataManager::IsAutofillSyncToggleAvailable() const { @@ -4312,7 +4155,7 @@ public_deps = [ --- a/components/collaboration/internal/collaboration_service_impl.cc +++ b/components/collaboration/internal/collaboration_service_impl.cc -@@ -16,7 +16,6 @@ +@@ -17,7 +17,6 @@ #include "components/data_sharing/public/group_data.h" #include "components/prefs/pref_service.h" #include "components/saved_tab_groups/public/tab_group_sync_service.h" @@ -4320,18 +4163,28 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/sync/base/collaboration_id.h" #include "components/sync/base/features.h" -@@ -287,11 +286,6 @@ SigninStatus CollaborationServiceImpl::G +@@ -346,11 +345,6 @@ SigninStatus CollaborationServiceImpl::G } CollaborationStatus CollaborationServiceImpl::GetCollaborationStatus() { - // Check if device policy allow signin. -- if (!profile_prefs_->GetBoolean(prefs::kSigninAllowed)) { +- if (!profile_prefs_->GetBoolean(::prefs::kSigninAllowed)) { - return CollaborationStatus::kDisabledForPolicy; - } - // Disable for automotive users. - if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_AUTOMOTIVE) { - return CollaborationStatus::kDisabled; + if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_AUTOMOTIVE && + !base::FeatureList::IsEnabled( +--- a/components/device_signals/core/browser/browser_utils.h ++++ b/components/device_signals/core/browser/browser_utils.h +@@ -9,7 +9,6 @@ + + #include "build/build_config.h" + #include "components/device_signals/core/common/common_types.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + + class PolicyBlocklistService; + class PrefService; --- a/components/feed/core/v2/feed_stream.cc +++ b/components/feed/core/v2/feed_stream.cc @@ -65,7 +65,6 @@ @@ -4435,7 +4288,7 @@ void LeakDetectionCheckImpl::OnAccessTokenRequestCompleted( --- a/components/password_manager/core/browser/leak_detection_delegate.cc +++ b/components/password_manager/core/browser/leak_detection_delegate.cc -@@ -24,7 +24,6 @@ +@@ -26,7 +26,6 @@ #include "components/password_manager/core/common/password_manager_features.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" @@ -4466,15 +4319,15 @@ --- a/components/password_manager/core/browser/password_reuse_manager_impl.cc +++ b/components/password_manager/core/browser/password_reuse_manager_impl.cc -@@ -24,7 +24,6 @@ +@@ -23,7 +23,6 @@ + #include "components/password_manager/core/browser/password_reuse_detector.h" #include "components/password_manager/core/browser/password_reuse_manager_signin_notifier.h" - #include "components/password_manager/core/common/password_manager_features.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/signin/public/base/consent_level.h" #include "google_apis/gaia/gaia_auth_util.h" -@@ -383,23 +382,6 @@ void PasswordReuseManagerImpl::ScheduleP +@@ -374,23 +373,6 @@ void PasswordReuseManagerImpl::ScheduleP } void PasswordReuseManagerImpl::ScheduleEnterprisePasswordURLUpdate() { @@ -4510,26 +4363,25 @@ namespace password_manager { --- a/components/password_manager/core/browser/password_sync_util.cc +++ b/components/password_manager/core/browser/password_sync_util.cc -@@ -11,7 +11,6 @@ +@@ -10,7 +10,6 @@ + #include "components/password_manager/core/browser/features/password_manager_features_util.h" #include "components/password_manager/core/browser/password_form.h" #include "components/password_manager/core/browser/password_manager_client.h" - #include "components/password_manager/core/common/password_manager_features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/sync/base/user_selectable_type.h" #include "components/sync/service/sync_user_settings.h" -@@ -74,11 +73,6 @@ bool IsGaiaCredentialPage(const std::str +@@ -73,9 +72,7 @@ bool IsGaiaCredentialPage(const std::str bool ShouldSaveEnterprisePasswordHash(const PasswordForm& form, const PrefService& prefs) { -- if (base::FeatureList::IsEnabled(features::kPasswordReuseDetectionEnabled)) { -- return safe_browsing::MatchesPasswordProtectionLoginURL(form.url, prefs) || -- safe_browsing::MatchesPasswordProtectionChangePasswordURL(form.url, -- prefs); -- } - return false; +- return safe_browsing::MatchesPasswordProtectionLoginURL(form.url, prefs) || +- safe_browsing::MatchesPasswordProtectionChangePasswordURL(form.url, +- prefs); ++ return false; } + bool HasChosenToSyncPasswords(const syncer::SyncService* sync_service) { --- a/components/password_manager/core/browser/store_metrics_reporter.cc +++ b/components/password_manager/core/browser/store_metrics_reporter.cc @@ -30,7 +30,6 @@ @@ -4540,7 +4392,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" -@@ -736,7 +735,7 @@ StoreMetricsReporter::StoreMetricsReport +@@ -755,7 +754,7 @@ StoreMetricsReporter::StoreMetricsReport is_account_storage_enabled_ = features_util::IsAccountStorageEnabled(prefs_, sync_service); @@ -4551,15 +4403,15 @@ // TODO(crbug.com/358998546): use PasswordManagerSettingsService here. --- a/components/password_manager/core/browser/sync_credentials_filter.cc +++ b/components/password_manager/core/browser/sync_credentials_filter.cc -@@ -13,7 +13,6 @@ +@@ -12,7 +12,6 @@ + #include "components/password_manager/core/browser/password_manager_util.h" #include "components/password_manager/core/browser/password_sync_util.h" - #include "components/password_manager/core/common/password_manager_features.h" #include "components/signin/public/base/consent_level.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "google_apis/gaia/gaia_auth_util.h" -@@ -30,48 +29,7 @@ bool SyncCredentialsFilter::ShouldSave(c +@@ -29,48 +28,7 @@ bool SyncCredentialsFilter::ShouldSave(c if (client_->IsOffTheRecord()) { return false; } @@ -4610,8 +4462,8 @@ bool SyncCredentialsFilter::ShouldSaveGaiaPasswordHash( --- a/components/password_manager/core/browser/sync_credentials_filter_unittest.cc +++ b/components/password_manager/core/browser/sync_credentials_filter_unittest.cc -@@ -34,7 +34,6 @@ - #include "components/password_manager/core/common/password_manager_features.h" +@@ -32,7 +32,6 @@ + #include "components/password_manager/core/browser/sync_username_test_base.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/testing_pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" @@ -4620,7 +4472,7 @@ #include "testing/gtest/include/gtest/gtest.h" --- a/components/safe_browsing/content/browser/base_blocking_page.cc +++ b/components/safe_browsing/content/browser/base_blocking_page.cc -@@ -15,7 +15,6 @@ +@@ -16,7 +16,6 @@ #include "components/safe_browsing/content/browser/content_unsafe_resource_util.h" #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h" #include "components/safe_browsing/core/common/features.h" @@ -4737,9 +4589,9 @@ #include "components/safe_browsing/core/browser/ping_manager.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/utils.h" #include "components/security_interstitials/content/security_interstitial_tab_helper.h" #include "components/security_interstitials/core/unsafe_resource.h" - #include "content/public/browser/browser_context.h" --- a/components/safe_browsing/content/browser/ui_manager_unittest.cc +++ b/components/safe_browsing/content/browser/ui_manager_unittest.cc @@ -17,7 +17,6 @@ @@ -4760,9 +4612,9 @@ #include "components/safe_browsing/core/common/web_ui_constants.h" #include "components/strings/grit/components_strings.h" #include "components/user_prefs/user_prefs.h" -@@ -1548,20 +1547,7 @@ std::string SerializeHitReport(const Hit +@@ -1529,20 +1528,7 @@ std::string SerializeHitReport(const Hit } - hit_report_dict.Set("threat_source", threat_source); + hit_report_dict.Set("threat_source", std::move(threat_source)); std::string extended_reporting_level; - switch (hit_report.extended_reporting_level) { - case ExtendedReportingLevel::SBER_LEVEL_OFF: @@ -4778,24 +4630,24 @@ - extended_reporting_level = "SBER_LEVEL_ENHANCED_PROTECTION"; - break; - } - hit_report_dict.Set("extended_reporting_level", extended_reporting_level); + hit_report_dict.Set("extended_reporting_level", + std::move(extended_reporting_level)); hit_report_dict.Set("is_enhanced_protection", - hit_report.is_enhanced_protection); -@@ -2417,18 +2403,13 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -2355,18 +2341,13 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); DCHECK(!args.empty()); - std::string callback_id = args[0].GetString(); -- ResolveJavascriptCallback(base::Value(callback_id), + const std::string& callback_id = args[0].GetString(); +- ResolveJavascriptCallback(callback_id, - safe_browsing::GetSafeBrowsingPreferencesList( - user_prefs::UserPrefs::Get(browser_context_))); -+ ResolveJavascriptCallback(base::Value(callback_id), base::Value::List()); ++ ResolveJavascriptCallback(callback_id, base::Value::List()); } void SafeBrowsingUIHandler::GetPolicies(const base::Value::List& args) { AllowJavascript(); DCHECK(!args.empty()); - std::string callback_id = args[0].GetString(); -- ResolveJavascriptCallback(base::Value(callback_id), + const std::string& callback_id = args[0].GetString(); +- ResolveJavascriptCallback(callback_id, - safe_browsing::GetSafeBrowsingPoliciesList( - user_prefs::UserPrefs::Get(browser_context_))); } @@ -4811,7 +4663,7 @@ #include "url/gurl.h" namespace safe_browsing { -@@ -48,7 +47,6 @@ struct HitReport { +@@ -60,7 +59,6 @@ struct HitReport { SBThreatType threat_type; ThreatSource threat_source; @@ -5047,7 +4899,7 @@ #include "components/sessions/core/session_id.h" #include "components/signin/public/identity_manager/account_info.h" #include "services/network/public/cpp/shared_url_loader_factory.h" -@@ -152,10 +151,6 @@ class PasswordProtectionServiceBase : pu +@@ -148,10 +147,6 @@ class PasswordProtectionServiceBase : pu // Returns if the warning UI is enabled. bool IsWarningEnabled(ReusedPasswordAccountType password_type); @@ -5153,7 +5005,7 @@ void RealTimeUrlLookupService::MaybeLogProtegoPingCookieHistograms( --- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -21,7 +21,6 @@ +@@ -23,7 +23,6 @@ #include "components/safe_browsing/core/browser/referrer_chain_provider.h" #include "components/safe_browsing/core/browser/verdict_cache_manager.h" #include "components/safe_browsing/core/common/features.h" @@ -6081,7 +5933,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -445,23 +444,6 @@ void SigninMetricsService::OnRefreshToke +@@ -451,23 +450,6 @@ void SigninMetricsService::OnRefreshToke #if BUILDFLAG(ENABLE_DICE_SUPPORT) void SigninMetricsService::RecordExplicitSigninMigrationStatus() { @@ -6494,7 +6346,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -216,192 +215,25 @@ PrimaryAccountManager::PrimaryAccountMan +@@ -216,194 +215,25 @@ PrimaryAccountManager::PrimaryAccountMan DCHECK(account_tracker_service_); ScopedPrefCommit scoped_pref_commit(client_->GetPrefs(), /*commit_on_destroy=*/false); @@ -6616,6 +6468,8 @@ - std::string()); - registry->RegisterStringPref(prefs::kGoogleServicesLastSignedInUsername, - std::string()); +- registry->RegisterStringPref(prefs::kGoogleServicesSecondLastSyncingGaiaId, +- std::string()); - registry->RegisterStringPref(prefs::kGoogleServicesAccountId, std::string()); - registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false); - registry->RegisterStringPref( @@ -6687,7 +6541,7 @@ } std::pair -@@ -429,46 +261,10 @@ PrimaryAccountManager::GetOrRestorePrima +@@ -431,46 +261,10 @@ PrimaryAccountManager::GetOrRestorePrima kEmptyAccountInfo_RestoreFailedNotSyncConsented); } @@ -6734,7 +6588,7 @@ } const PrimaryAccountManager::PrimaryAccount& -@@ -559,10 +355,9 @@ void PrimaryAccountManager::SetSyncPrima +@@ -561,10 +355,9 @@ void PrimaryAccountManager::SetSyncPrima #if DCHECK_IS_ON() { @@ -6747,10 +6601,20 @@ DCHECK(pref_account_id.empty() || !consented_to_sync || pref_account_id == account_info.account_id.ToString()) -@@ -577,10 +372,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. +@@ -575,20 +368,6 @@ void PrimaryAccountManager::SetSyncPrima + + SetPrimaryAccountInternal(account_info, /*consented_to_sync=*/true, + scoped_pref_commit); +- +- // Before `kGoogleServicesLastSyncingGaiaId` is updated, keep a copy of the +- // previous value, and store it in a separate pref. +- scoped_pref_commit.SetString( +- prefs::kGoogleServicesSecondLastSyncingGaiaId, +- client_->GetPrefs()->GetString(prefs::kGoogleServicesLastSyncingGaiaId)); +- +- // 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. - scoped_pref_commit.SetString(prefs::kGoogleServicesLastSyncingGaiaId, - account_info.gaia.ToString()); - scoped_pref_commit.SetString(prefs::kGoogleServicesLastSyncingUsername, @@ -6758,7 +6622,7 @@ } void PrimaryAccountManager::SetPrimaryAccountInternal( -@@ -592,22 +383,6 @@ void PrimaryAccountManager::SetPrimaryAc +@@ -600,22 +379,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)); @@ -6781,7 +6645,7 @@ } void PrimaryAccountManager::UpdatePrimaryAccountInfo() { -@@ -745,82 +520,6 @@ PrimaryAccountChangeEvent::State Primary +@@ -753,90 +516,6 @@ PrimaryAccountChangeEvent::State Primary void PrimaryAccountManager::ComputeExplicitBrowserSignin( const PrimaryAccountChangeEvent& event_details, ScopedPrefCommit& scoped_pref_commit) { @@ -6854,11 +6718,19 @@ - // If the user turns on sync, disable account storage for bookmarks. This - // way the user does not get duplicate data if they turn off sync (and - // choose to preserve their data locally) and then sign in again. +- // This is safe to remove with the deprecation of +- // `signin::ConsentLevel::kSync`. - if (event_details.GetEventTypeFor(signin::ConsentLevel::kSync) == - signin::PrimaryAccountChangeEvent::Type::kSet) { - auto current_gaia_id = event_details.GetCurrentState().primary_account.gaia; -- SigninPrefs(*client_->GetPrefs()) -- .SetBookmarksExplicitBrowserSignin(current_gaia_id, false); +- auto prefs = SigninPrefs(*client_->GetPrefs()); +- +- if (prefs.GetBookmarksExplicitBrowserSignin(current_gaia_id)) { +- base::UmaHistogramBoolean( +- "Signin.Bookmarks.SyncTurnedOnWithAccountStorageEnabled", true); +- } +- +- prefs.SetBookmarksExplicitBrowserSignin(current_gaia_id, false); - } -#endif } @@ -7026,15 +6898,15 @@ #include "components/signin/public/base/signin_switches.h" #include "google_apis/gaia/gaia_id.h" -@@ -91,8 +90,6 @@ SigninPrefs::~SigninPrefs() = default; +@@ -108,8 +107,6 @@ SigninPrefs::~SigninPrefs() = default; void SigninPrefs::RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterDictionaryPref(kSigninAccountPrefs); - registry->RegisterIntegerPref(prefs::kHistorySyncSuccessiveDeclineCount, 0); - registry->RegisterInt64Pref(prefs::kHistorySyncLastDeclinedTimestamp, 0); + registry->RegisterIntegerPref(kSyncPromoIdentityPillShownCount, 0); + registry->RegisterIntegerPref(kSyncPromoIdentityPillUsedCount, 0); } - - bool SigninPrefs::HasAccountPrefs(const GaiaId& gaia_id) const { --- a/components/signin/public/base/signin_switches.cc +++ b/components/signin/public/base/signin_switches.cc @@ -6,7 +6,6 @@ @@ -7045,7 +6917,7 @@ namespace switches { -@@ -78,11 +77,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti +@@ -111,11 +110,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti base::FEATURE_DISABLED_BY_DEFAULT); bool IsBoundSessionCredentialsEnabled(const PrefService* profile_prefs) { @@ -7057,7 +6929,7 @@ return base::FeatureList::IsEnabled(kEnableBoundSessionCredentials); } -@@ -109,11 +103,6 @@ BASE_FEATURE(kEnableChromeRefreshTokenBi +@@ -142,11 +136,6 @@ BASE_FEATURE(kEnableChromeRefreshTokenBi base::FEATURE_DISABLED_BY_DEFAULT); bool IsChromeRefreshTokenBindingEnabled(const PrefService* profile_prefs) { @@ -7159,7 +7031,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/account_pref_utils.h" #include "components/sync/base/features.h" -@@ -236,7 +234,7 @@ bool SyncPrefs::IsInitialSyncFeatureSetu +@@ -238,7 +236,7 @@ bool SyncPrefs::IsInitialSyncFeatureSetu } bool SyncPrefs::IsExplicitBrowserSignin() const { @@ -7168,7 +7040,7 @@ } #if !BUILDFLAG(IS_CHROMEOS) -@@ -290,27 +288,11 @@ UserSelectableTypeSet SyncPrefs::GetSele +@@ -308,27 +306,11 @@ UserSelectableTypeSet SyncPrefs::GetSele type == UserSelectableType::kAutofill) { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) type_enabled = true; @@ -7196,7 +7068,7 @@ #endif } else if (type == UserSelectableType::kReadingList) { // Consider kReadingList off by default until -@@ -323,16 +305,10 @@ UserSelectableTypeSet SyncPrefs::GetSele +@@ -341,16 +323,10 @@ UserSelectableTypeSet SyncPrefs::GetSele base::FeatureList::IsEnabled( kEnableBookmarksSelectedTypeOnSigninForTesting); } else if (type == UserSelectableType::kExtensions) { @@ -7213,7 +7085,7 @@ #endif } else { // All other types are always enabled by default. -@@ -1114,30 +1090,6 @@ void SyncPrefs::MaybeMigrateAutofillToPe +@@ -1127,30 +1103,6 @@ void SyncPrefs::MaybeMigrateAutofillToPe return; } pref_service->SetBoolean(kAutofillPerAccountPrefMigrationDone, true); @@ -7244,9 +7116,50 @@ } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) +--- a/components/sync/service/sync_service_impl.cc ++++ b/components/sync/service/sync_service_impl.cc +@@ -29,7 +29,6 @@ + #include "components/prefs/pref_service.h" + #include "components/signin/public/base/gaia_id_hash.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_info.h" + #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" +@@ -2255,30 +2254,9 @@ SyncServiceImpl::DeterminePreviouslySync + return PreviouslySyncingGaiaIdInfoForMetrics::kUnspecified; + } + +- // Depending on whether sync the feature is currently on or not, the gaia ID +- // corresponding to the previous user is stored in one pref or another. That's +- // because `kGoogleServicesLastSyncingGaiaId` is updated early, as soon as +- // the sync consent is granted, and before the notification reaches +- // SyncServiceImpl. +- const GaiaId previously_syncing_gaia_id = GaiaId( +- HasSyncConsent() ? sync_client_->GetPrefService()->GetString( +- prefs::kGoogleServicesSecondLastSyncingGaiaId) +- : sync_client_->GetPrefService()->GetString( +- prefs::kGoogleServicesLastSyncingGaiaId)); +- +- if (previously_syncing_gaia_id.empty()) { + // It is known that no previous gaia ID existed that turned sync on. + return PreviouslySyncingGaiaIdInfoForMetrics:: + kSyncFeatureNeverPreviouslyTurnedOn; +- } +- +- const GaiaId current_gaia_id = GetAccountInfo().gaia; +- +- return current_gaia_id == previously_syncing_gaia_id +- ? PreviouslySyncingGaiaIdInfoForMetrics:: +- kCurrentGaiaIdMatchesPreviousWithSyncFeatureOn +- : PreviouslySyncingGaiaIdInfoForMetrics:: +- kCurrentGaiaIdIfDiffersPreviousWithSyncFeatureOn; + } + + const GURL& SyncServiceImpl::GetSyncServiceUrlForDebugging() const { --- a/components/sync_preferences/common_syncable_prefs_database.cc +++ b/components/sync_preferences/common_syncable_prefs_database.cc -@@ -22,7 +22,6 @@ +@@ -24,7 +24,6 @@ #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/payments/core/payment_prefs.h" #include "components/plus_addresses/plus_address_prefs.h" @@ -7254,7 +7167,7 @@ #include "components/saved_tab_groups/public/pref_names.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/sharing_message/pref_names.h" -@@ -90,9 +89,7 @@ enum { +@@ -93,9 +92,7 @@ enum { // kSyncedLastTimePasswordCheckCompleted = 43, (deprecated) kWasAutoSignInFirstRunExperienceShown = 44, kCanMakePaymentEnabled = 45, @@ -7264,7 +7177,7 @@ kSyncedDefaultSearchProviderGUID = 49, kPrefForceTriggerTranslateCount = 50, // kPrefNeverPromptSitesDeprecated = 51, (deprecated) -@@ -227,16 +224,9 @@ constexpr auto kCommonSyncablePrefsAllow +@@ -232,16 +229,9 @@ constexpr auto kCommonSyncablePrefsAllow {payments::kCanMakePaymentEnabled, {syncable_prefs_ids::kCanMakePaymentEnabled, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, @@ -7283,7 +7196,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) --- a/content/browser/webid/federated_auth_request_impl.cc +++ b/content/browser/webid/federated_auth_request_impl.cc -@@ -553,31 +553,6 @@ FederatedAuthRequestImpl::~FederatedAuth +@@ -564,31 +564,6 @@ FederatedAuthRequestImpl::~FederatedAuth void FederatedAuthRequestImpl::Create( RenderFrameHost* host, mojo::PendingReceiver receiver) { diff --git a/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch b/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch index 1753f63b..4a771d8d 100644 --- a/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch +++ b/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch @@ -1,12 +1,13 @@ --- a/third_party/search_engines_data/resources/definitions/prepopulated_engines.json +++ b/third_party/search_engines_data/resources/definitions/prepopulated_engines.json -@@ -180,25 +180,11 @@ - // TODO(crbug.com/343792225): Identify a way to resolve this problem and implement - // necessary changes. +@@ -178,26 +178,11 @@ + }, + "google": { - "name": "Google", - "keyword": "google.com", - "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_alldp.ico", +- "base_builtin_resource_id": "IDR_SEARCH_ENGINE_GOOGLE", - "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:language}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}", - "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:clientCacheTimeToLive}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}", - "image_url": "{google:baseSearchByImageURL}upload", diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index 72e0e6d6..780773ad 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 -@@ -173,6 +173,7 @@ +@@ -174,6 +174,7 @@ #include "components/supervised_user/core/browser/supervised_user_preferences.h" #include "components/supervised_user/core/browser/supervised_user_service.h" #include "components/supervised_user/core/browser/supervised_user_url_filter.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" -@@ -2241,6 +2242,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -2242,6 +2243,7 @@ void RenderViewContextMenu::AppendPageIt } if (CanTranslate(/*menu_logging=*/true)) { 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 ca405c08..d72aa8f6 100644 --- a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch +++ b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch @@ -19,7 +19,7 @@ "//third_party/widevine/cdm:headers", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -181,6 +181,7 @@ +@@ -182,6 +182,7 @@ #include "components/translate/core/common/translate_util.h" #include "components/trusted_vault/features.h" #include "components/ui_devtools/switches.h" @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -294,6 +294,7 @@ source_set("browser") { +@@ -296,6 +296,7 @@ source_set("browser") { "//third_party/re2", "//third_party/snappy", "//third_party/sqlite", @@ -62,7 +62,7 @@ #include "components/viz/common/switches.h" #include "components/viz/host/gpu_client.h" #include "components/viz/host/host_frame_sink_manager.h" -@@ -3493,6 +3494,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3491,6 +3492,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLImageChromium, switches::kEnableWebGPUDeveloperFeatures, switches::kFileUrlPathAlias, @@ -91,7 +91,7 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -485,6 +486,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -490,6 +491,10 @@ void SetRuntimeFeaturesFromCommandLine(c true}, {wrf::EnableWebAudioBypassOutputBufferingOptOut, blink::switches::kWebAudioBypassOutputBufferingOptOut, true}, @@ -116,15 +116,15 @@ --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -42,6 +42,7 @@ - #include "base/metrics/histogram_functions.h" +@@ -43,6 +43,7 @@ + #include "base/metrics/histogram_macros.h" #include "base/not_fatal_until.h" #include "base/notreached.h" +#include "base/rand_util.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" - #include "base/trace_event/trace_event.h" -@@ -869,6 +870,11 @@ Document::Document(const DocumentInit& i + #include "base/timer/elapsed_timer.h" +@@ -889,6 +890,11 @@ Document::Document(const DocumentInit& i TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this), TRACE_EVENT_FLAG_FLOW_OUT); DCHECK(agent_); @@ -136,7 +136,7 @@ if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) && features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) { script_runner_delayer_->Activate(); -@@ -995,6 +1001,14 @@ const Position Document::PositionAdjuste +@@ -1015,6 +1021,14 @@ const Position Document::PositionAdjuste return Position::BeforeNode(*shadow_host); } @@ -153,7 +153,7 @@ selector_query_cache_ = MakeGarbageCollected(); --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -558,6 +558,10 @@ class CORE_EXPORT Document : public Cont +@@ -556,6 +556,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -164,7 +164,7 @@ V8VisibilityState visibilityState() const; String visibilityStateAsString() const; bool IsPageVisible() const; -@@ -2704,6 +2708,9 @@ class CORE_EXPORT Document : public Cont +@@ -2732,6 +2736,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 -@@ -2836,6 +2836,11 @@ DOMRectList* Element::getClientRects() { +@@ -2878,6 +2878,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads, *element_layout_object); @@ -188,7 +188,7 @@ return MakeGarbageCollected(quads); } -@@ -2863,6 +2868,9 @@ gfx::RectF Element::GetBoundingClientRec +@@ -2905,6 +2910,9 @@ gfx::RectF Element::GetBoundingClientRec DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -200,7 +200,7 @@ --- a/third_party/blink/renderer/core/dom/range.cc +++ b/third_party/blink/renderer/core/dom/range.cc -@@ -1634,6 +1634,12 @@ DOMRectList* Range::getClientRects() con +@@ -1648,6 +1648,12 @@ DOMRectList* Range::getClientRects() con Vector quads; GetBorderAndTextQuads(quads); @@ -213,7 +213,7 @@ return MakeGarbageCollected(quads); } -@@ -1641,7 +1647,11 @@ DOMRect* Range::getBoundingClientRect() +@@ -1655,7 +1661,11 @@ DOMRect* Range::getBoundingClientRect() // TODO(crbug.com/1499981): This should be removed once synchronized scrolling // impact is understood. SyncScrollAttemptHeuristic::DidAccessScrollOffset(); @@ -266,7 +266,7 @@ const TextDirection& direction, --- 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 -@@ -103,6 +103,9 @@ +@@ -109,6 +109,9 @@ // https://github.com/include-what-you-use/include-what-you-use/issues/1122 // IWYU pragma: no_include "base/numerics/clamped_math.h" @@ -274,9 +274,9 @@ +#include "third_party/blink/renderer/core/frame/local_dom_window.h" + namespace blink { + namespace { - constexpr char kDefaultFont[] = "10px sans-serif"; -@@ -1182,13 +1185,26 @@ TextMetrics* BaseRenderingContext2D::mea +@@ -1293,13 +1296,26 @@ TextMetrics* BaseRenderingContext2D::mea TextDirection direction = ToTextDirection(state.GetDirection(), host, computed_style); @@ -308,7 +308,7 @@ String BaseRenderingContext2D::lang() const { --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1784,6 +1784,7 @@ component("platform") { +@@ -1797,6 +1797,7 @@ component("platform") { "//components/paint_preview/common", "//components/search_engines:search_engine_utils", "//components/translate/core/language_detection:language_detection", @@ -343,7 +343,7 @@ #include "third_party/skia/include/core/SkSurface.h" --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2092,6 +2092,12 @@ +@@ -2176,6 +2176,12 @@ status: "stable", }, { diff --git a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch index b5107d2c..44b4f2e8 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 -@@ -3496,6 +3496,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3494,6 +3494,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 -@@ -490,6 +490,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -495,6 +495,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 -@@ -508,6 +508,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -615,6 +615,9 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -77,7 +77,7 @@ approach to change color components. return image_data; --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1729,7 +1729,9 @@ component("platform") { +@@ -1741,7 +1741,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -305,7 +305,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 -@@ -2098,6 +2098,9 @@ +@@ -2182,6 +2182,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 0a3b8c78..566404e6 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 -@@ -2205,6 +2205,7 @@ static_library("browser") { +@@ -2207,6 +2207,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -65,7 +65,7 @@ with limited CPU/memory resources and it is disabled by default. #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" -@@ -118,6 +120,7 @@ +@@ -119,6 +121,7 @@ #include "components/metrics/metrics_service.h" #include "components/metrics_services_manager/metrics_services_manager.h" #include "components/metrics_services_manager/metrics_services_manager_client.h" @@ -73,7 +73,7 @@ with limited CPU/memory resources and it is disabled by default. #include "components/network_time/network_time_tracker.h" #include "components/os_crypt/async/browser/os_crypt_async.h" #include "components/permissions/permissions_client.h" -@@ -151,6 +154,7 @@ +@@ -152,6 +155,7 @@ #include "extensions/common/constants.h" #include "media/media_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" @@ -81,7 +81,7 @@ with limited CPU/memory resources and it is disabled by default. #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/features.h" -@@ -417,6 +421,18 @@ void BrowserProcessImpl::Init() { +@@ -418,6 +422,18 @@ void BrowserProcessImpl::Init() { pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled, base::BindRepeating(&ApplyMetricsReportingPolicy)); @@ -102,7 +102,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2536,6 +2536,10 @@ const char kMantisFeatureKeyDescription[ +@@ -2603,6 +2603,10 @@ const char kMantisFeatureKeyDescription[ "Feature key to use the Mantis feature on ChromeOS."; #endif // BUILDFLAG(IS_CHROMEOS) @@ -115,7 +115,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 -@@ -1465,6 +1465,9 @@ extern const char kMantisFeatureKeyName[ +@@ -1506,6 +1506,9 @@ extern const char kMantisFeatureKeyName[ extern const char kMantisFeatureKeyDescription[]; #endif // IS_CHROMEOS diff --git a/patches/extra/debian/disable/google-api-warning.patch b/patches/extra/debian/disable/google-api-warning.patch index 46b76e08..0e43fdf4 100644 --- a/patches/extra/debian/disable/google-api-warning.patch +++ b/patches/extra/debian/disable/google-api-warning.patch @@ -3,7 +3,7 @@ author: Michael Gilbert --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc -@@ -156,10 +156,6 @@ void AddInfoBarsIfNecessary(Browser* bro +@@ -163,10 +163,6 @@ void AddInfoBarsIfNecessary(Browser* bro infobars::ContentInfoBarManager* infobar_manager = infobars::ContentInfoBarManager::FromWebContents(web_contents); diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 9428257b..76bd92c4 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 -@@ -1558,7 +1558,7 @@ void ChromeContentBrowserClient::Registe +@@ -1567,7 +1567,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -98,7 +98,7 @@ kAutofillPaymentCvcStorage, true, --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc -@@ -456,7 +456,7 @@ bool DoesBookmarkContainWords(const std: +@@ -457,7 +457,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 cd830b2d..63f1d839 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 -@@ -1578,11 +1578,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1583,11 +1583,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { diff --git a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch b/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch index 07131f88..0e4e35eb 100644 --- a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch +++ b/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch @@ -12,7 +12,7 @@ it as hidden as it was before? --- a/net/cert/x509_util.cc +++ b/net/cert/x509_util.cc -@@ -280,7 +280,7 @@ bool GetTLSServerEndPointChannelBinding( +@@ -281,7 +281,7 @@ bool GetTLSServerEndPointChannelBinding( } // RSA keys created by CreateKeyAndSelfSignedCert will be of this length. 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 e8a280eb..391f4fbc 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -142,6 +142,7 @@ +@@ -143,6 +143,7 @@ #include "chrome/browser/ui/unload_controller.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/contents_web_view.h" @@ -8,7 +8,7 @@ #include "chrome/browser/ui/views/status_bubble_views.h" #include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/browser/ui/web_applications/web_app_launch_utils.h" -@@ -586,6 +587,7 @@ Browser::Browser(const CreateParams& par +@@ -587,6 +588,7 @@ Browser::Browser(const CreateParams& par omit_from_session_restore_(params.omit_from_session_restore), should_trigger_session_restore_(params.should_trigger_session_restore), cancel_download_confirmation_state_(NOT_PROMPTED), @@ -16,7 +16,7 @@ override_bounds_(params.initial_bounds), initial_show_state_(params.initial_show_state), initial_workspace_(params.initial_workspace), -@@ -1049,20 +1051,22 @@ Browser::WarnBeforeClosingResult Browser +@@ -1050,20 +1052,22 @@ Browser::WarnBeforeClosingResult Browser return WarnBeforeClosingResult::kOkToClose; } @@ -52,7 +52,7 @@ } DCHECK(!warn_before_closing_callback_) -@@ -1100,6 +1104,7 @@ bool Browser::TryToCloseWindow( +@@ -1101,6 +1105,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = NOT_PROMPTED; @@ -60,7 +60,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -3408,6 +3413,58 @@ bool Browser::CanCloseWithInProgressDown +@@ -3447,6 +3452,58 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -119,7 +119,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -3433,6 +3490,22 @@ void Browser::InProgressDownloadResponse +@@ -3472,6 +3529,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -152,7 +152,7 @@ #include "chrome/browser/ui/signin/signin_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" -@@ -1216,12 +1217,17 @@ class Browser : public TabStripModelObse +@@ -1237,12 +1238,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -170,7 +170,7 @@ // Called when the user has decided whether to proceed or not with the browser // closure, in case the cookie migration notice was shown. |proceed_closing| // is true if the browser can be closed. -@@ -1394,6 +1400,8 @@ class Browser : public TabStripModelObse +@@ -1415,6 +1421,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 29caa72a..49f5040d 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 -@@ -934,10 +934,14 @@ bool HandleNewTabPageLocationOverride( +@@ -943,10 +943,14 @@ bool HandleNewTabPageLocationOverride( // Don't change the URL when incognito mode. if (profile->IsOffTheRecord()) diff --git a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch index b12a3ae9..a806f0c7 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc -@@ -642,5 +642,7 @@ bool BrowserFrame::RegenerateFrameOnThem +@@ -643,5 +643,7 @@ bool BrowserFrame::RegenerateFrameOnThem } bool BrowserFrame::IsIncognitoBrowser() const { 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 f6857848..76bbad03 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" -@@ -544,6 +545,15 @@ AutocompleteController::AutocompleteCont +@@ -546,6 +547,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-search-engine-collection.patch b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch index 713fb6f6..e6aa82ed 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 @@ -81,7 +81,7 @@ search_engine_choice_service_(search_engine_choice_service), prepopulate_data_resolver_(prepopulate_data_resolver), search_terms_data_(std::move(search_terms_data)), -@@ -592,8 +600,8 @@ bool TemplateURLService::CanAddAutogener +@@ -594,8 +602,8 @@ bool TemplateURLService::CanAddAutogener // that may interfere with search queries). An easy heuristic for this is // whether the user has a TemplateURL that has been manually modified (e.g., // renamed) connected to the same host. @@ -92,7 +92,7 @@ } bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy( -@@ -2316,6 +2324,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -2438,6 +2446,8 @@ SyncDataMap TemplateURLService::CreateGU } void TemplateURLService::Init() { @@ -101,7 +101,7 @@ if (client_) { client_->SetOwner(this); } -@@ -2498,6 +2508,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -2620,6 +2630,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -113,7 +113,7 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -895,6 +895,8 @@ class TemplateURLService final : public +@@ -901,6 +901,8 @@ class TemplateURLService final : public raw_ref prepopulate_data_resolver_; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch index f9209742..97f17579 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch @@ -8,7 +8,7 @@ #include "base/debug/alias.h" #include "base/functional/bind.h" #include "base/i18n/rtl.h" -@@ -726,6 +727,13 @@ void Tab::HideHover(TabStyle::HideHoverS +@@ -728,6 +729,13 @@ void Tab::HideHover(TabStyle::HideHoverS DeprecatedLayoutImmediately(); } @@ -34,7 +34,7 @@ void PaintChildren(const views::PaintInfo& info) override; --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -15,6 +15,7 @@ +@@ -17,6 +17,7 @@ #include #include @@ -42,7 +42,7 @@ #include "base/check.h" #include "base/compiler_specific.h" #include "base/containers/adapters.h" -@@ -1923,6 +1924,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -1946,6 +1947,8 @@ void TabStrip::OnMouseEventInTab(views:: } void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch index 1a7d259a..20b285dd 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -1487,7 +1487,8 @@ void BrowserCommandController::InitComma +@@ -1535,7 +1535,8 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, normal_window); @@ -12,7 +12,7 @@ command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE, --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -5069,6 +5069,7 @@ void BrowserView::AddedToWidget() { +@@ -5197,6 +5197,7 @@ void BrowserView::AddedToWidget() { toolbar_->Init(); @@ -51,7 +51,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -436,7 +436,8 @@ BASE_FEATURE(kTabstripComboButton, +@@ -538,7 +538,8 @@ BASE_FEATURE(kTabstripComboButton, base::FEATURE_DISABLED_BY_DEFAULT); bool IsTabSearchMoving() { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch index 935a8bd1..b67fd184 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/browser_features.cc +++ b/chrome/browser/browser_features.cc -@@ -351,4 +351,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur +@@ -349,4 +349,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur "RemovalOfIWAsFromTabCapture", base::FEATURE_ENABLED_BY_DEFAULT); @@ -26,7 +26,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h" #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" -@@ -147,6 +148,21 @@ class BrowsingDataRemoverObserver +@@ -148,6 +149,21 @@ class BrowsingDataRemoverObserver #endif }; @@ -48,7 +48,7 @@ uint64_t GetOriginTypeMask(const base::Value::List& data_types) { uint64_t result = 0; for (const auto& data_type : data_types) { -@@ -313,9 +329,10 @@ void ChromeBrowsingDataLifetimeManager:: +@@ -326,9 +342,10 @@ void ChromeBrowsingDataLifetimeManager:: const base::Value::List& data_types = profile_->GetPrefs()->GetList( browsing_data::prefs::kClearBrowsingDataOnExitList); @@ -61,7 +61,7 @@ profile_->GetPrefs()->SetBoolean( browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true); auto* remover = profile_->GetBrowsingDataRemover(); -@@ -326,8 +343,8 @@ void ChromeBrowsingDataLifetimeManager:: +@@ -339,8 +356,8 @@ void ChromeBrowsingDataLifetimeManager:: DCHECK(keep_browser_alive); #endif remover->RemoveAndReply(base::Time(), base::Time::Max(), diff --git a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch index a0bc9cc8..31dd5c06 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -8,7 +8,7 @@ #include "base/containers/adapters.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" -@@ -987,6 +988,10 @@ void TabStripModel::CloseAllTabsInGroup( +@@ -998,6 +999,10 @@ void TabStripModel::CloseAllTabsInGroup( void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) { CHECK(ContainsIndex(index)); @@ -19,7 +19,7 @@ CloseTabs({GetWebContentsAt(index)}, close_types); } -@@ -2276,9 +2281,13 @@ TabStripModel::GetGroupsDestroyedFromRem +@@ -2466,9 +2471,13 @@ TabStripModel::GetGroupsDestroyedFromRem void TabStripModel::ExecuteCloseTabsByIndices( base::RepeatingCallback()> get_indices_to_close, uint32_t close_types) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index 83d7ba6f..3b58ee3a 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 @@ -8,10 +8,10 @@ #include "base/auto_reset.h" +#include "base/command_line.h" + #include "build/build_config.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" - #include "chrome/browser/extensions/extension_management.h" -@@ -97,6 +98,14 @@ scoped_refptr +@@ -112,6 +113,14 @@ scoped_refptr return installer; } @@ -26,7 +26,7 @@ bool IsExtensionDownload(const DownloadItem& download_item) { if (download_item.GetTargetDisposition() == DownloadItem::TARGET_DISPOSITION_PROMPT) -@@ -105,7 +114,7 @@ bool IsExtensionDownload(const DownloadI +@@ -120,7 +129,7 @@ bool IsExtensionDownload(const DownloadI if (download_item.GetMimeType() == extensions::Extension::kMimeType || extensions::UserScript::IsURLUserScript(download_item.GetURL(), download_item.GetMimeType())) { @@ -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 -@@ -1238,10 +1238,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1236,10 +1236,12 @@ DownloadConfirmationReason DownloadTarge return DownloadConfirmationReason::SAVE_AS; #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -69,7 +69,7 @@ // Don't prompt for file types that are marked for opening automatically. --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -283,6 +283,13 @@ bool ExtensionManagement::IsInstallation +@@ -286,6 +286,13 @@ bool ExtensionManagement::IsInstallation bool ExtensionManagement::IsOffstoreInstallAllowed( const GURL& url, const GURL& referrer_url) const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch index eae6a11c..6f529fb5 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 -@@ -1208,6 +1208,8 @@ WindowOpenDisposition NavigationPolicyTo +@@ -1207,6 +1207,8 @@ WindowOpenDisposition NavigationPolicyTo case blink::kWebNavigationPolicyNewWindow: return WindowOpenDisposition::NEW_WINDOW; case blink::kWebNavigationPolicyNewPopup: diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch index 016f5c5c..d7680d69 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch @@ -19,9 +19,9 @@ +#include "base/command_line.h" #include "base/functional/bind.h" - #include "base/i18n/rtl.h" #include "base/metrics/histogram_macros.h" -@@ -194,7 +195,8 @@ void AppModalDialogManager::RunBeforeUnl + #include "base/strings/utf_string_conversions.h" +@@ -145,7 +146,8 @@ void AppModalDialogManager::RunBeforeUnl ChromeJavaScriptDialogExtraData* extra_data = &javascript_dialog_extra_data_[web_contents]; 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 793e75c9..5d9fed08 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 -@@ -202,7 +202,8 @@ class SSLClientSocketImpl::SSLContext { +@@ -203,7 +203,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 288eb107..a59e0d4a 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc -@@ -124,7 +124,8 @@ void AddInfoBarsIfNecessary(Browser* bro +@@ -131,7 +131,8 @@ void AddInfoBarsIfNecessary(Browser* bro } // Web apps should not display the session restore bubble (crbug.com/1264121) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch index 646aa497..2af14278 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 +@@ -545,6 +547,17 @@ void ExtensionsToolbarContainer::AnchorA widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView( anchor_view && anchor_view->GetVisible() ? anchor_view : GetExtensionsButton()); @@ -34,7 +34,7 @@ widget->Show(); } -@@ -942,6 +955,9 @@ void ExtensionsToolbarContainer::UpdateC +@@ -944,6 +957,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 8909ba61..05b5c6d5 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 -@@ -2220,6 +2220,10 @@ void BrowserView::ExitFullscreen() { +@@ -2265,6 +2265,10 @@ void BrowserView::ExitFullscreen() { void BrowserView::UpdateExclusiveAccessBubble( const ExclusiveAccessBubbleParams& params, ExclusiveAccessBubbleHideCallback first_hide_callback) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch index dbaee640..8c460dc4 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc -@@ -1156,7 +1156,11 @@ void Tab::UpdateIconVisibility() { +@@ -1178,7 +1178,11 @@ void Tab::UpdateIconVisibility() { // Close button is shown on active tabs regardless of the size. showing_close_button_ = true; #endif // BUILDFLAG(IS_CHROMEOS) @@ -12,7 +12,7 @@ showing_alert_indicator_ = has_alert_icon && alert_icon_width <= available_width; -@@ -1185,6 +1189,8 @@ void Tab::UpdateIconVisibility() { +@@ -1207,6 +1211,8 @@ void Tab::UpdateIconVisibility() { !controller_->IsLockedForOnTask() && #endif large_enough_for_close_button; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch index 4633f2bb..f50d97ac 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -462,6 +462,17 @@ void ToolbarView::Init() { +@@ -464,6 +464,17 @@ void ToolbarView::Init() { browser_->profile()->IsGuestSession() || browser_->profile()->IsRegularProfile(); #endif diff --git a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch index aa8daad6..3091bb61 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch @@ -86,7 +86,7 @@ // Feature declarations and associated constants (feature params, et cetera) --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3857,6 +3857,8 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3897,6 +3897,8 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -95,7 +95,7 @@ return WebGLAny(script_state, String(ContextGL()->GetString(GL_RENDERER))); } -@@ -3872,6 +3874,8 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3912,6 +3914,8 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_VENDOR)))); } diff --git a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch index 922b4096..c52107fc 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 -@@ -4446,10 +4446,12 @@ const FeatureEntry::FeatureVariation kEn +@@ -4619,10 +4619,12 @@ const FeatureEntry::FeatureVariation #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 bc6f9556..9ac8f0cc 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch @@ -27,7 +27,7 @@ #include "services/network/public/cpp/resource_request_body.h" #include "services/network/public/cpp/supports_loading_mode/supports_loading_mode_parser.h" #include "services/network/public/cpp/url_loader_completion_status.h" -@@ -385,10 +386,10 @@ void AddAdditionalRequestHeaders( +@@ -386,10 +387,10 @@ void AddAdditionalRequestHeaders( net::HttpRequestHeaders::kUserAgent, ComputeUserAgentValue(*headers, user_agent_override, browser_context)); @@ -44,7 +44,7 @@ if (NeedsHTTPOrigin(headers, method)) { --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -136,6 +136,7 @@ +@@ -135,6 +135,7 @@ #include "services/network/public/cpp/content_decoding_interceptor.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/not_implemented_url_loader_factory.h" @@ -52,7 +52,7 @@ #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" #include "services/network/public/mojom/fetch_api.mojom.h" #include "services/network/public/mojom/restricted_cookie_manager.mojom.h" -@@ -4656,10 +4657,13 @@ void RenderFrameImpl::FinalizeRequestInt +@@ -4666,10 +4667,13 @@ void RenderFrameImpl::FinalizeRequestInt request.SetHasUserGesture(frame_->HasTransientUserActivation()); @@ -72,7 +72,7 @@ void RenderFrameImpl::DidLoadResourceFromMemoryCache( --- a/services/network/network_service_network_delegate.cc +++ b/services/network/network_service_network_delegate.cc -@@ -30,6 +30,7 @@ +@@ -31,6 +31,7 @@ #include "services/network/network_service_proxy_delegate.h" #include "services/network/pending_callback_chain.h" #include "services/network/public/cpp/features.h" @@ -80,7 +80,7 @@ #include "services/network/url_loader.h" #include "url/gurl.h" -@@ -57,9 +58,14 @@ NetworkServiceNetworkDelegate::~NetworkS +@@ -68,9 +69,14 @@ NetworkServiceNetworkDelegate::~NetworkS void NetworkServiceNetworkDelegate::MaybeTruncateReferrer( net::URLRequest* const request, const GURL& effective_url) { @@ -261,7 +261,7 @@ std::vector> --- a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc +++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc -@@ -12,6 +12,7 @@ +@@ -13,6 +13,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" @@ -269,7 +269,7 @@ #include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/wrapper_shared_url_loader_factory.h" #include "third_party/blink/public/common/loader/loader_constants.h" -@@ -22,6 +23,7 @@ +@@ -23,6 +24,7 @@ #include "third_party/blink/public/platform/modules/service_worker/web_service_worker_provider_context.h" #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/resource_load_info_notifier_wrapper.h" @@ -277,7 +277,7 @@ #include "third_party/blink/public/platform/url_loader_throttle_provider.h" #include "third_party/blink/public/platform/weak_wrapper_resource_load_info_notifier.h" #include "third_party/blink/public/platform/web_security_origin.h" -@@ -342,10 +344,13 @@ void DedicatedOrSharedWorkerFetchContext +@@ -373,10 +375,13 @@ void DedicatedOrSharedWorkerFetchContext auto url_request_extra_data = base::MakeRefCounted(); request.SetURLRequestExtraData(std::move(url_request_extra_data)); diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index 66fcf206..8a9a7de0 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -13,6 +13,8 @@ +@@ -14,6 +14,8 @@ namespace net::features { @@ -35,7 +35,7 @@ // https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html. --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -152,11 +152,6 @@ const size_t kMaxHostLength = 4096; +@@ -153,11 +153,6 @@ const size_t kMaxHostLength = 4096; // cached. const int kIPv6ProbePeriodMs = 1000; @@ -47,7 +47,7 @@ // True if |hostname| ends with either ".local" or ".local.". bool ResemblesMulticastDNSName(std::string_view hostname) { return hostname.ends_with(".local") || hostname.ends_with(".local."); -@@ -1487,33 +1482,10 @@ int HostResolverManager::StartIPv6Reacha +@@ -1490,33 +1485,10 @@ int HostResolverManager::StartIPv6Reacha return OK; } diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index 76592422..93a51dc7 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -36,13 +36,13 @@ actionButtonText_: String, cancelButtonHidden_: Boolean, @@ -79,6 +81,7 @@ export class SettingsSearchEngineEditDia - private searchEngine_: string; - private keyword_: string; - private queryUrl_: string; -+ private suggestionsUrl_: string; - private dialogTitle_: string; - private actionButtonText_: string; - private cancelButtonHidden_: boolean; + declare private searchEngine_: string; + declare private keyword_: string; + declare private queryUrl_: string; ++ declare private suggestionsUrl_: string; + declare private dialogTitle_: string; + declare private actionButtonText_: string; + declare private cancelButtonHidden_: boolean; @@ -109,6 +112,7 @@ export class SettingsSearchEngineEditDia this.keyword_ = this.model.keyword; this.queryUrl_ = this.model.url; @@ -271,7 +271,7 @@ bool CanEdit(const TemplateURL* url) const; --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc -@@ -206,21 +206,25 @@ void TemplateURLTableModel::Remove(size_ +@@ -207,21 +207,25 @@ void TemplateURLTableModel::Remove(size_ void TemplateURLTableModel::Add(size_t index, const std::u16string& short_name, const std::u16string& keyword, @@ -302,7 +302,7 @@ DCHECK(index <= RowCount()); DCHECK(!url.empty()); TemplateURL* template_url = GetTemplateURL(index); -@@ -229,7 +233,8 @@ void TemplateURLTableModel::ModifyTempla +@@ -230,7 +234,8 @@ void TemplateURLTableModel::ModifyTempla DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url || template_url->SupportsReplacement( template_url_service_->search_terms_data())); @@ -342,7 +342,7 @@ // Dummy number used for indicating that a new search engine is added. const int kNewSearchEngineIndex = -1; -@@ -228,6 +229,8 @@ base::Value::Dict SearchEnginesHandler:: +@@ -255,6 +256,8 @@ base::Value::Dict SearchEnginesHandler:: Profile* profile = Profile::FromWebUI(web_ui()); dict.Set("url", template_url->url_ref().DisplayURL(UIThreadSearchTermsData())); @@ -351,7 +351,7 @@ dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) || (template_url->starter_pack_id() > 0))); GURL icon_url = template_url->favicon_url(); -@@ -403,12 +406,14 @@ void SearchEnginesHandler::HandleSearchE +@@ -414,12 +417,14 @@ void SearchEnginesHandler::HandleSearchE void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url, const std::u16string& title, const std::u16string& keyword, @@ -369,7 +369,7 @@ } edit_controller_.reset(); -@@ -438,6 +443,8 @@ bool SearchEnginesHandler::CheckFieldVal +@@ -449,6 +454,8 @@ bool SearchEnginesHandler::CheckFieldVal is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value)); } else if (field_name.compare(kQueryUrlField) == 0) { is_valid = edit_controller_->IsURLValid(field_value); @@ -378,7 +378,7 @@ } else { NOTREACHED(); } -@@ -460,18 +467,21 @@ void SearchEnginesHandler::HandleSearchE +@@ -471,18 +478,21 @@ void SearchEnginesHandler::HandleSearchE return; } @@ -448,7 +448,7 @@ syncer::kSeparateLocalAndAccountSearchEngines) --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -342,7 +342,8 @@ class TemplateURLService final : public +@@ -346,7 +346,8 @@ class TemplateURLService final : public void ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index 4ad99524..e0c0e2fb 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 -@@ -4442,7 +4442,13 @@ const FeatureEntry::FeatureVariation kEn +@@ -4615,7 +4615,13 @@ const FeatureEntry::FeatureVariation // calculate and verify checksum. // // When adding a new choice, add it to the end of the list. diff --git a/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch b/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch deleted file mode 100644 index 3f86d1ac..00000000 --- a/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- a/chrome/browser/media/webrtc/capture_policy_utils.cc -+++ b/chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -56,36 +56,7 @@ void IsMultiCaptureAllowedForAnyOriginOn - base::OnceCallback callback, - content::BrowserContext* context, - bool is_multi_capture_allowed_for_any_origin_on_main_profile) { -- // If the new MultiScreenCaptureAllowedForUrls policy permits access, exit -- // early. If not, check the legacy -- // GetDisplayMediaSetSelectAllScreensAllowedForUrls policy. -- if (is_multi_capture_allowed_for_any_origin_on_main_profile) { -- std::move(callback).Run(true); -- return; -- } -- -- // TODO(b/329064666): Remove the checks below once the pivot to IWAs is -- // complete. -- Profile* profile = Profile::FromBrowserContext(context); -- if (!profile) { - std::move(callback).Run(false); -- return; -- } -- -- HostContentSettingsMap* host_content_settings_map = -- HostContentSettingsMapFactory::GetForProfile(profile); -- if (!host_content_settings_map) { -- std::move(callback).Run(false); -- return; -- } -- ContentSettingsForOneType content_settings = -- host_content_settings_map->GetSettingsForOneType( -- ContentSettingsType::ALL_SCREEN_CAPTURE); -- std::move(callback).Run(std::ranges::any_of( -- content_settings, [](const ContentSettingPatternSource& source) { -- return source.GetContentSetting() == -- ContentSetting::CONTENT_SETTING_ALLOW; -- })); - } - - void CheckAllScreensMediaAllowedForIwaResultReceived( -@@ -257,43 +228,13 @@ void RegisterProfilePrefs(PrefRegistrySi - void CheckGetAllScreensMediaAllowedForAnyOrigin( - content::BrowserContext* context, - base::OnceCallback callback) { --#if BUILDFLAG(IS_CHROMEOS) -- if (crosapi::mojom::MultiCaptureService* multi_capture_service = -- GetMultiCaptureService()) { -- multi_capture_service->IsMultiCaptureAllowedForAnyOriginOnMainProfile( -- base::BindOnce( -- IsMultiCaptureAllowedForAnyOriginOnMainProfileResultReceived, -- std::move(callback), context)); -- } else { -- // If the multi capture service is not available with the required version, -- // fall back to the original flow using the deprecated policy. -- IsMultiCaptureAllowedForAnyOriginOnMainProfileResultReceived( -- std::move(callback), context, /*result=*/false); -- } --#else - std::move(callback).Run(false); --#endif // BUILDFLAG(IS_CHROMEOS) - } - - void CheckGetAllScreensMediaAllowed(content::BrowserContext* context, - const GURL& url, - base::OnceCallback callback) { --#if BUILDFLAG(IS_CHROMEOS) -- crosapi::mojom::MultiCaptureService* multi_capture_service = -- GetMultiCaptureService(); -- if (multi_capture_service) { -- multi_capture_service->IsMultiCaptureAllowed( -- url, base::BindOnce(&CheckAllScreensMediaAllowedForIwaResultReceived, -- std::move(callback), std::move(url), context)); -- } else { -- // If the multi capture service is not available with the required version, -- // fall back to the original flow using the deprecated policy. -- CheckAllScreensMediaAllowedForIwaResultReceived( -- std::move(callback), std::move(url), context, /*result=*/false); -- } --#else - std::move(callback).Run(false); --#endif // BUILDFLAG(IS_CHROMEOS) - } - - #if BUILDFLAG(ENABLE_SCREEN_CAPTURE) diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index 2b11c86e..b6eebe0c 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -142,7 +142,7 @@ } // namespace download --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -129,7 +129,6 @@ source_set("browser") { +@@ -131,7 +131,6 @@ source_set("browser") { "//components/performance_manager/scenario_api", "//components/power_monitor", "//components/services/filesystem:lib", diff --git a/patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch b/patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch index 8f5402e3..6268d51f 100644 --- a/patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch +++ b/patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch @@ -1,6 +1,6 @@ --- a/components/safe_browsing/core/common/features.cc +++ b/components/safe_browsing/core/common/features.cc -@@ -121,7 +121,7 @@ BASE_FEATURE(kDlpRegionalizedEndpoints, +@@ -133,7 +133,7 @@ BASE_FEATURE(kDlpRegionalizedEndpoints, BASE_FEATURE(kDownloadsPageReferrerUrl, "DownloadsPageReferrerUrl", diff --git a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch index 4591ba78..f41a3aa6 100644 --- a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch +++ b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch @@ -13,7 +13,7 @@ --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc -@@ -266,5 +266,5 @@ TemplateURLService* ChromeLocationBarMod +@@ -268,5 +268,5 @@ TemplateURLService* ChromeLocationBarMod // static void ChromeLocationBarModelDelegate::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { 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 5064a978..6e31bdd2 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 -@@ -2060,7 +2060,7 @@ BASE_FEATURE(kPrefetchFontLookupTables, +@@ -2089,7 +2089,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 320b7b60..27e46e63 100644 --- a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch +++ b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc -@@ -557,11 +557,6 @@ int GetContentRestrictions(const Browser +@@ -562,11 +562,6 @@ int GetContentRestrictions(const Browser CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(current_tab); content_restrictions = core_tab_helper->content_restrictions(); @@ -14,7 +14,7 @@ } return content_restrictions; } -@@ -1712,8 +1707,7 @@ bool CanSavePage(const Browser* browser) +@@ -1822,8 +1817,7 @@ bool CanSavePage(const Browser* browser) policy::DownloadRestriction::ALL_FILES) { return false; } diff --git a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch index 2fe00be3..12a2c8bc 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 @@ --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -2185,8 +2185,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2208,8 +2208,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { @@ -24,7 +24,7 @@ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); CHECK(clipboard) << "Clipboard instance is not available, cannot proceed with " -@@ -2197,7 +2195,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2220,7 +2218,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 03dc4959..bd449be2 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 -@@ -1013,6 +1013,7 @@ int ChromeBrowserMainParts::PreCreateThr +@@ -1018,6 +1018,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_configs.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -43,6 +43,7 @@ +@@ -44,6 +44,7 @@ #include "chrome/browser/ui/webui/signin_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" -@@ -250,6 +251,7 @@ void RegisterChromeWebUIConfigs() { +@@ -253,6 +254,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); @@ -175,7 +175,7 @@ +#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_ --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -71,6 +71,7 @@ bool IsSystemWebUIHost(std::string_view +@@ -72,6 +72,7 @@ bool IsSystemWebUIHost(std::string_view // These hosts will also be suggested by BuiltinProvider. base::span ChromeURLHosts() { static constexpr auto kChromeURLHosts = std::to_array({ diff --git a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch index aa662cfe..69a6868e 100644 --- a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch +++ b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch @@ -2,7 +2,7 @@ # --- a/components/omnibox/common/omnibox_features.cc +++ b/components/omnibox/common/omnibox_features.cc -@@ -326,7 +326,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor +@@ -320,7 +320,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor // Enables additional site search providers for the Site search Starter Pack. BASE_FEATURE(kStarterPackExpansion, "StarterPackExpansion", diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 9799163a..c51a57ad 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -17,6 +17,7 @@ # Google sign-in and Anonymized Data Collection sections # help bubble for the removed data collection section # Privacy guide section on the privacy page +# The password leak detection toggle on the security settings page # Advanced Protection Program link on the security settings page # the 'Learn more' link from the search engine entry on the settings page # Safety Check entry on the side menu on the settings page @@ -25,7 +26,6 @@ # the 'Vist Chrome Web Store' entry in the extensions section of the main menu # the side panel entry in All Bookmarks # the feedback entry in the third party cookie popup -# unneeded elements from the profile menu # the 'Learn more' link on crashed tabs # the Third-party sign-in site settings (FedCM) # non-functional AI options @@ -53,7 +53,7 @@ --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -1211,7 +1211,7 @@ +@@ -1216,7 +1216,7 @@ Active site @@ -62,7 +62,7 @@ Power -@@ -1235,7 +1235,7 @@ +@@ -1240,7 +1240,7 @@ Inactive tabs appearance @@ -71,7 +71,7 @@ Tab hover preview card appearance -@@ -1247,7 +1247,7 @@ +@@ -1252,7 +1252,7 @@ Performance issue alerts @@ -97,10 +97,18 @@ $i18n{noSearchResults} --- a/chrome/browser/resources/extensions/sidebar.html.ts +++ b/chrome/browser/resources/extensions/sidebar.html.ts -@@ -33,16 +33,6 @@ export function getHtml(this: Extensions +@@ -33,24 +33,6 @@ export function getHtml(this: Extensions +-
+- ${this.inDevMode ? html` +-
+- +- +-
+- `: ''} -
-
- @@ -124,7 +132,7 @@ import {CrLitElement} from 'chrome://resources/lit/v3_0/lit.rollup.js'; import type {PropertyValues} from 'chrome://resources/lit/v3_0/lit.rollup.js'; -@@ -111,13 +110,6 @@ export class ExtensionsSidebarElement ex +@@ -113,21 +112,6 @@ export class ExtensionsSidebarElement ex } } @@ -134,6 +142,14 @@ - attrs: ['target'], - substitutions: [loadTimeData.getString('getMoreExtensionsUrl')], - }); +- } +- +- protected computeDocsPromoText_(): TrustedHTML { +- return this.i18nAdvanced('sidebarDocsPromo', { +- tags: ['a'], +- attrs: ['target'], +- substitutions: [loadTimeData.getString('extensionsWhatsNewURL')], +- }); - } } @@ -177,7 +193,7 @@ @@ -254,7 +270,7 @@