diff --git a/chromium_version.txt b/chromium_version.txt index 687c1e5b..f1af500f 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -119.0.6045.199 +120.0.6099.62 diff --git a/domain_substitution.list b/domain_substitution.list index a701553d..83bb7b1f 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -34,6 +34,7 @@ ash/ambient/ambient_controller_unittest.cc ash/ambient/backdrop/ambient_backend_controller_impl.cc ash/ambient/managed/screensaver_image_downloader.cc ash/ambient/metrics/ambient_metrics.cc +ash/api/tasks/tasks_types.h ash/app_list/PRESUBMIT.py ash/app_list/app_list_controller_impl_unittest.cc ash/app_list/app_list_feature_usage_metrics_unittest.cc @@ -69,7 +70,7 @@ ash/glanceables/classroom/glanceables_classroom_item_view_unittest.cc ash/glanceables/classroom/glanceables_classroom_types.h ash/glanceables/glanceables_pixeltest.cc ash/glanceables/tasks/glanceables_task_view.cc -ash/glanceables/tasks/glanceables_tasks_types.h +ash/glanceables/tasks/glanceables_tasks_view.cc ash/login/ui/auth_icon_view.cc ash/login/ui/login_remove_account_dialog_unittest.cc ash/metrics/login_unlock_throughput_recorder.h @@ -110,6 +111,8 @@ ash/system/federated/federated_client_manager_unittest.cc ash/system/federated/federated_service_controller_impl_unittest.cc ash/system/human_presence/snooping_protection_controller_unittest.cc ash/system/input_device_settings/input_device_settings_metrics_manager_unittest.cc +ash/system/input_device_settings/input_device_settings_notification_controller.cc +ash/system/input_device_settings/input_device_settings_notification_controller_unittest.cc ash/system/message_center/ash_notification_view_unittest.cc ash/system/message_center/message_center_test_util.cc ash/system/message_center/notification_grouping_controller_unittest.cc @@ -120,7 +123,7 @@ ash/system/phonehub/phone_hub_ui_controller_unittest.cc ash/system/power/power_event_observer_unittest.cc ash/system/privacy_hub/privacy_hub_notification_controller.cc ash/system/status_area_widget_unittest.cc -ash/system/time/calendar_event_list_item_view_jelly_unittest.cc +ash/system/time/calendar_event_list_item_view_unittest.cc ash/system/time/calendar_up_next_pixeltest.cc ash/system/time/calendar_up_next_view_unittest.cc ash/system/unified/classroom_bubble_base_view.cc @@ -148,7 +151,6 @@ ash/webui/camera_app_ui/resources/js/geometry.ts ash/webui/camera_app_ui/resources/js/i18n_string.ts ash/webui/camera_app_ui/resources/js/lib/analytics.js ash/webui/camera_app_ui/resources/js/metrics.ts -ash/webui/camera_app_ui/resources/js/sound.ts ash/webui/camera_app_ui/resources/js/untrusted_ga_helper.ts ash/webui/camera_app_ui/resources/js/views/camera_intent.ts ash/webui/camera_app_ui/resources/js/views/document_fix_mode.ts @@ -204,25 +206,25 @@ ash/wm/screen_pinning_controller.h base/BUILD.gn base/PRESUBMIT.py base/allocator/partition_alloc_support.cc -base/allocator/partition_allocator/address_space_randomization.h -base/allocator/partition_allocator/oom.cc -base/allocator/partition_allocator/oom.h -base/allocator/partition_allocator/page_allocator_internals_win.h -base/allocator/partition_allocator/partition_alloc_base/logging.h -base/allocator/partition_allocator/partition_alloc_base/memory/scoped_refptr.h -base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc -base/allocator/partition_allocator/partition_alloc_base/rand_util_win.cc -base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_win_for_testing.cc -base/allocator/partition_allocator/partition_alloc_base/time/time.h -base/allocator/partition_allocator/partition_alloc_base/time/time_win.cc -base/allocator/partition_allocator/partition_alloc_config.h -base/allocator/partition_allocator/partition_alloc_unittest.cc -base/allocator/partition_allocator/partition_ref_count.h -base/allocator/partition_allocator/partition_tls.h -base/allocator/partition_allocator/pointers/raw_ptr.h -base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc -base/allocator/partition_allocator/starscan/stack/asm/x64/push_registers_asm.cc -base/allocator/partition_allocator/starscan/stack/stack.cc +base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h +base/allocator/partition_allocator/src/partition_alloc/oom.cc +base/allocator/partition_allocator/src/partition_alloc/oom.h +base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_win.h +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 +base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_win.cc +base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_win_for_testing.cc +base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time.h +base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/time/time_win.cc +base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h +base/allocator/partition_allocator/src/partition_alloc/partition_alloc_unittest.cc +base/allocator/partition_allocator/src/partition_alloc/partition_ref_count.h +base/allocator/partition_allocator/src/partition_alloc/partition_tls.h +base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr.h +base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc +base/allocator/partition_allocator/src/partition_alloc/starscan/stack/asm/x64/push_registers_asm.cc +base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc base/android/android_image_reader_abi.h base/android/library_loader/library_loader_hooks.h base/android/meminfo_dump_provider.cc @@ -283,6 +285,7 @@ base/profiler/metadata_recorder.h base/rand_util_win.cc base/strings/pattern_unittest.cc base/strings/string_number_conversions_unittest.cc +base/strings/string_piece_unittest.cc base/synchronization/lock.h base/system/sys_info.h base/task/sequence_manager/sequence_manager_impl.cc @@ -307,7 +310,6 @@ base/third_party/symbolize/symbolize.cc base/threading/platform_thread.h base/threading/platform_thread_unittest.cc base/threading/platform_thread_win.cc -base/time/time.h base/time/time_delta_from_string.cc base/time/time_delta_from_string_unittest.cc base/time/time_win.cc @@ -336,6 +338,7 @@ build/android/BUILD.gn build/android/PRESUBMIT.py build/android/apk_operations.py build/android/dump_apk_resource_strings.py +build/android/fast_local_dev_server.py build/android/gradle/generate_gradle.py build/android/gyp/assert_static_initializers.py build/android/gyp/bundletool.py @@ -343,7 +346,6 @@ build/android/gyp/compile_java.py build/android/gyp/create_java_binary_script.py build/android/gyp/lint.py build/android/gyp/merge_manifest.py -build/android/gyp/proguard.py build/android/gyp/util/build_utils.py build/android/gyp/util/diff_utils.py build/android/gyp/util/protoresources.py @@ -409,6 +411,7 @@ build/rust/std/rules/BUILD.gn build/sanitizers/lsan_suppressions.cc build/sanitizers/tsan_suppressions.cc build/skia_gold_common/PRESUBMIT.py +build/toolchain/check_rewrapper_cfg.py build/toolchain/cros_toolchain.gni build/toolchain/gcc_toolchain.gni build/toolchain/goma.gni @@ -489,6 +492,7 @@ chrome/browser/android/webapk/webapk_helpers_unittest.cc chrome/browser/android/webapk/webapk_installer.cc chrome/browser/apps/almanac_api_client/almanac_api_util.cc chrome/browser/apps/almanac_api_client/almanac_api_util_unittest.cc +chrome/browser/apps/almanac_api_client/almanac_icon_cache.cc chrome/browser/apps/almanac_api_client/device_info_manager.cc chrome/browser/apps/almanac_api_client/proto_file_manager_unittest.cc chrome/browser/apps/app_deduplication_service/app_deduplication_server_connector.cc @@ -502,6 +506,8 @@ chrome/browser/apps/app_preload_service/app_preload_service_browsertest.cc chrome/browser/apps/app_preload_service/preload_app_definition_unittest.cc chrome/browser/apps/app_preload_service/web_app_preload_installer_browsertest.cc chrome/browser/apps/app_service/app_icon/app_icon_loader.cc +chrome/browser/apps/app_service/app_install/app_install_almanac_connector.cc +chrome/browser/apps/app_service/app_install/app_install_almanac_connector_unittest.cc chrome/browser/apps/app_service/app_service_proxy_lacros_unittest.cc chrome/browser/apps/app_service/app_service_proxy_unittest.cc chrome/browser/apps/app_service/intent_util_unittest.cc @@ -530,13 +536,11 @@ chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller_un chrome/browser/ash/android_sms/android_sms_urls.cc chrome/browser/ash/android_sms/android_sms_urls.h chrome/browser/ash/app_list/app_context_menu_unittest.cc -chrome/browser/ash/app_list/app_list_client_impl.cc chrome/browser/ash/app_list/app_list_sort_browsertest.cc chrome/browser/ash/app_list/app_list_test_util.cc chrome/browser/ash/app_list/app_service/app_service_app_model_builder_unittest.cc chrome/browser/ash/app_list/arc/arc_usb_host_permission_browsertest.cc chrome/browser/ash/app_list/chrome_app_list_model_updater_browsertest.cc -chrome/browser/ash/app_list/launcher_search_iph_browsertest.cc chrome/browser/ash/app_list/search/arc/arc_recommend_apps_fetcher_impl_unittest.cc chrome/browser/ash/app_list/search/arc/recommend_apps_fetcher_impl.cc chrome/browser/ash/app_list/search/common/string_util.cc @@ -552,6 +556,7 @@ chrome/browser/ash/app_restore/arc_ghost_window_view_unittest.cc chrome/browser/ash/app_restore/full_restore_service_unittest.cc chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc chrome/browser/ash/apps/apk_web_app_installer_unittest.cc +chrome/browser/ash/arc/adbd/arc_adbd_monitor_bridge_unittest.cc chrome/browser/ash/arc/arc_util_unittest.cc chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc @@ -596,12 +601,13 @@ chrome/browser/ash/crosapi/local_printer_ash_unittest.cc chrome/browser/ash/crosapi/network_settings_translation_unittest.cc chrome/browser/ash/crostini/crostini_installer.h chrome/browser/ash/crostini/crostini_simple_types.h -chrome/browser/ash/crostini/crostini_util.cc -chrome/browser/ash/customization/customization_document.cc +chrome/browser/ash/crostini/crostini_util.h +chrome/browser/ash/customization/customization_document.h chrome/browser/ash/dbus/proxy_resolution_service_provider.h chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc chrome/browser/ash/drive/drivefs_test_support.cc +chrome/browser/ash/drive/file_system_util_unittest.cc chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.cc chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.h chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_impl.cc @@ -618,6 +624,7 @@ chrome/browser/ash/file_manager/file_manager_string_util.cc chrome/browser/ash/file_manager/file_manager_test_util.h chrome/browser/ash/file_manager/file_tasks.h chrome/browser/ash/file_manager/file_tasks_browsertest.cc +chrome/browser/ash/file_manager/open_with_browser_browsertest.cc chrome/browser/ash/file_manager/path_util_unittest.cc chrome/browser/ash/file_suggest/item_suggest_cache.h chrome/browser/ash/file_suggest/item_suggest_cache_unittest.cc @@ -628,6 +635,8 @@ chrome/browser/ash/input_method/assistive_input_denylist.cc chrome/browser/ash/input_method/assistive_input_denylist_unittest.cc chrome/browser/ash/input_method/assistive_suggester_client_filter.cc chrome/browser/ash/input_method/assistive_suggester_client_filter_unittest.cc +chrome/browser/ash/input_method/editor_feedback_unittest.cc +chrome/browser/ash/input_method/editor_switch_unittest.cc chrome/browser/ash/input_method/input_method_settings.cc chrome/browser/ash/input_method/input_method_settings_unittest.cc chrome/browser/ash/input_method/ui/candidate_window_view.cc @@ -640,6 +649,7 @@ chrome/browser/ash/login/encryption_migration_browsertest.cc chrome/browser/ash/login/existing_user_controller_browsertest.cc chrome/browser/ash/login/hats_unlock_survey_trigger_unittest.cc chrome/browser/ash/login/help_app_launcher.h +chrome/browser/ash/login/lock/lock_screen_integration_test.cc chrome/browser/ash/login/login_browsertest.cc chrome/browser/ash/login/login_ui_browsertest.cc chrome/browser/ash/login/login_ui_keyboard_browsertest.cc @@ -753,7 +763,6 @@ chrome/browser/autocomplete/tab_matcher_desktop_unittest.cc chrome/browser/autofill/android/save_update_address_profile_prompt_controller_unittest.cc chrome/browser/autofill/autofill_browsertest.cc chrome/browser/autofill/autofill_captured_sites_interactive_uitest.cc -chrome/browser/autofill/autofill_gstatic_reader.cc chrome/browser/autofill/autofill_interactive_uitest.cc chrome/browser/autofill/autofill_offer_notification_infobar_delegate_mobile_unittest.cc chrome/browser/autofill/autofill_server_browsertest.cc @@ -824,6 +833,9 @@ chrome/browser/companion/core/utils_unittest.cc chrome/browser/companion/visual_search/visual_search_suggestions_service.cc chrome/browser/complex_tasks/task_tab_helper_unittest.cc chrome/browser/component_updater/recovery_component_installer.cc +chrome/browser/compose/chrome_compose_client_unittest.cc +chrome/browser/compose/compose_enabling_unittest.cc +chrome/browser/compose/compose_session.cc chrome/browser/content_settings/content_settings_default_provider_unittest.cc chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc chrome/browser/content_settings/content_settings_policy_provider_unittest.cc @@ -959,7 +971,6 @@ chrome/browser/extensions/chrome_extension_browser_constants.cc chrome/browser/extensions/chrome_extension_function_details.cc chrome/browser/extensions/component_extensions_allowlist/allowlist.h chrome/browser/extensions/content_script_apitest.cc -chrome/browser/extensions/content_script_tracker_browsertest.cc chrome/browser/extensions/convert_user_script_unittest.cc chrome/browser/extensions/corb_and_cors_extension_browsertest.cc chrome/browser/extensions/crx_installer_browsertest.cc @@ -997,6 +1008,7 @@ chrome/browser/extensions/permissions_updater.cc chrome/browser/extensions/permissions_updater_unittest.cc chrome/browser/extensions/policy_handlers_unittest.cc chrome/browser/extensions/process_management_browsertest.cc +chrome/browser/extensions/script_injection_tracker_browsertest.cc chrome/browser/extensions/scripting_permissions_modifier.h chrome/browser/extensions/scripting_permissions_modifier_unittest.cc chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc @@ -1060,12 +1072,6 @@ chrome/browser/long_screenshots/long_screenshots_tab_service_unittest.cc chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc chrome/browser/lookalikes/safety_tip_message_delegate_android_unittest.cc -chrome/browser/manta/orca_provider.cc -chrome/browser/manta/orca_provider.h -chrome/browser/manta/orca_provider_unittest.cc -chrome/browser/manta/snapper_provider.cc -chrome/browser/manta/snapper_provider.h -chrome/browser/manta/snapper_provider_unittest.cc chrome/browser/media/history/media_history_keyed_service_unittest.cc chrome/browser/media/history/media_history_store_unittest.cc chrome/browser/media/media_engagement_contents_observer_unittest.cc @@ -1152,11 +1158,11 @@ chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc chrome/browser/new_tab_page/promos/promo_service_unittest.cc chrome/browser/no_best_effort_tasks_browsertest.cc chrome/browser/notifications/chrome_ash_message_center_client_unittest.cc +chrome/browser/notifications/mac/notification_platform_bridge_mac_unittest.cc chrome/browser/notifications/notification_channels_provider_android_unittest.cc chrome/browser/notifications/notification_permission_context.h chrome/browser/notifications/notification_permission_context_unittest.cc chrome/browser/notifications/notification_platform_bridge_linux_unittest.cc -chrome/browser/notifications/notification_platform_bridge_mac_unittest.cc chrome/browser/notifications/notification_platform_bridge_win_unittest.cc chrome/browser/notifications/platform_notification_service_unittest.cc chrome/browser/notifications/win/notification_template_builder.cc @@ -1186,11 +1192,13 @@ chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_obse chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer_unittest.cc chrome/browser/password_check/android/password_check_manager_unittest.cc +chrome/browser/password_manager/android/built_in_backend_to_android_backend_migrator_unittest.cc chrome/browser/password_manager/android/chromesync_status_code.h chrome/browser/password_manager/android/password_manager_settings_service_android_impl_unittest.cc chrome/browser/password_manager/android/password_settings_updater_android_bridge_helper_impl_unittest.cc chrome/browser/password_manager/android/password_store_android_backend_bridge_helper_impl_unittest.cc chrome/browser/password_manager/android/password_store_android_backend_unittest.cc +chrome/browser/password_manager/android/password_store_backend_migration_decorator_unittest.cc chrome/browser/password_manager/chrome_password_manager_client_unittest.cc chrome/browser/password_manager/password_manager_browsertest.cc chrome/browser/password_manager/password_manager_signin_intercept_test_helper.cc @@ -1202,7 +1210,9 @@ chrome/browser/payments/payment_handler_just_in_time_installation_browsertest.cc chrome/browser/payments/payment_request_app_store_billing_browsertest.cc chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc chrome/browser/pdf/pdf_extension_test.cc +chrome/browser/performance_manager/metrics/cpu_probe/cpu_probe_win.cc chrome/browser/performance_manager/policies/page_discarding_helper_unittest.cc +chrome/browser/performance_manager/policies/report_page_processes_policy.cc chrome/browser/permissions/chrome_permission_manager_unittest.cc chrome/browser/permissions/chrome_permission_request_manager_unittest.cc chrome/browser/permissions/notifications_engagement_service_unittest.cc @@ -1216,7 +1226,7 @@ chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc chrome/browser/policy/extension_policy_browsertest.cc chrome/browser/policy/messaging_layer/upload/dm_server_uploader.h chrome/browser/policy/messaging_layer/upload/file_upload_impl.cc -chrome/browser/policy/policy_extension_controlling_proxy_browsertest.cc +chrome/browser/policy/policy_extension_controlling_proxy_lacros_browsertest.cc chrome/browser/policy/policy_prefs_browsertest.cc chrome/browser/policy/safe_search_policy_test.cc chrome/browser/policy/safe_search_policy_test.h @@ -1283,7 +1293,7 @@ chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc chrome/browser/renderer_host/chrome_navigation_ui_data.h chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc chrome/browser/resources/PRESUBMIT.py -chrome/browser/resources/about_sys/about_sys.ts +chrome/browser/resources/about_sys/log_entry.ts chrome/browser/resources/accessibility/chromevox_helper_manifest.json.jinja2 chrome/browser/resources/accessibility/embedded_a11y_helper/service_worker.ts chrome/browser/resources/accessibility/embedded_a11y_helper_manifest.json.jinja2 @@ -1304,6 +1314,7 @@ chrome/browser/resources/ash/settings/os_people_page/account_manager_settings_ca chrome/browser/resources/ash/settings/os_people_page/account_manager_subpage.ts chrome/browser/resources/ash/settings/os_people_page/add_user_dialog.ts chrome/browser/resources/ash/settings/os_people_page/os_people_page.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/command_manager.ts @@ -1312,9 +1323,9 @@ chrome/browser/resources/chromeos/about_os_credits.html chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/macros/list_commands_macro.js chrome/browser/resources/chromeos/accessibility/chromevox/background/background_test.js chrome/browser/resources/chromeos/accessibility/chromevox/background/braille/braille_input_handler_test.js -chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js chrome/browser/resources/chromeos/accessibility/chromevox/background/download_handler.js chrome/browser/resources/chromeos/accessibility/chromevox/background/editing/editable_text_base_test.js +chrome/browser/resources/chromeos/accessibility/chromevox/background/input/command_handler.js chrome/browser/resources/chromeos/accessibility/chromevox/common/locale_output_helper_test.js chrome/browser/resources/chromeos/accessibility/chromevox/common/spannable_test.js chrome/browser/resources/chromeos/accessibility/chromevox/panel/tutorial_test.js @@ -1344,9 +1355,11 @@ chrome/browser/resources/chromeos/arc_support/bubble.js chrome/browser/resources/chromeos/arc_support/playstore.js chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js +chrome/browser/resources/chromeos/borealis_installer/borealis_installer_icons.html +chrome/browser/resources/chromeos/borealis_installer/error_dialog.ts chrome/browser/resources/chromeos/echo/manifest.json -chrome/browser/resources/chromeos/edu_coexistence/edu_coexistence_controller.js -chrome/browser/resources/chromeos/edu_coexistence/edu_coexistence_ui.js +chrome/browser/resources/chromeos/edu_coexistence/edu_coexistence_controller.ts +chrome/browser/resources/chromeos/edu_coexistence/edu_coexistence_ui.ts chrome/browser/resources/chromeos/emoji_picker/emoji_button.ts chrome/browser/resources/chromeos/emoji_picker/emoji_picker_api_proxy.ts chrome/browser/resources/chromeos/emoji_picker/icons.html @@ -1398,6 +1411,7 @@ chrome/browser/resources/new_tab_page/transparency.ts chrome/browser/resources/new_tab_page/voice_search_overlay.ts chrome/browser/resources/omnibox/omnibox.html chrome/browser/resources/omnibox/omnibox_output.ts +chrome/browser/resources/omnibox/omnibox_util.ts chrome/browser/resources/pdf/elements/icons.html chrome/browser/resources/pdf/ink/drawing_canvas.d.ts chrome/browser/resources/print_preview/data/destination_store.ts @@ -1450,6 +1464,7 @@ chrome/browser/search/background/ntp_background_service.cc chrome/browser/search/background/ntp_backgrounds.cc chrome/browser/search/background/ntp_custom_background_service.cc chrome/browser/search/search.h +chrome/browser/search_engine_choice/search_engine_choice_browsertest.cc chrome/browser/search_engines/template_url_parser_unittest.cc chrome/browser/search_engines/template_url_service_sync_unittest.cc chrome/browser/search_engines/template_url_service_test_util.cc @@ -1480,6 +1495,7 @@ chrome/browser/signin/account_id_from_account_info_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_cookie_observer_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_cookie_refresh_service_impl_unittest.cc +chrome/browser/signin/bound_session_credentials/bound_session_params_util_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_registration_fetcher_impl.cc @@ -1505,6 +1521,7 @@ chrome/browser/signin/signin_manager_unittest.cc chrome/browser/signin/signin_profile_attributes_updater.h chrome/browser/signin/signin_promo_unittest.cc chrome/browser/signin/signin_ui_util.cc +chrome/browser/signin/signin_ui_util_unittest.cc chrome/browser/signin/signin_util_unittest.cc chrome/browser/signin/signin_util_win_browsertest.cc chrome/browser/signin/token_managed_profile_creator_unittest.cc @@ -1522,7 +1539,7 @@ chrome/browser/storage_access_api/storage_access_grant_permission_context.cc chrome/browser/subresource_filter/subresource_filter_browsertest.cc chrome/browser/subresource_filter/subresource_filter_fenced_frame_browsertest.cc chrome/browser/supervised_user/android/java/res/drawable/ic_family_link.xml -chrome/browser/supervised_user/android/supervised_user_settings_service_bridge.cc +chrome/browser/supervised_user/android/supervised_user_settings_test_bridge.cc chrome/browser/supervised_user/supervised_user_browser_utils.cc chrome/browser/supervised_user/supervised_user_browser_utils_unittest.cc chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle_unittest.cc @@ -1571,7 +1588,6 @@ chrome/browser/translate/translate_manager_browsertest.cc chrome/browser/translate/translate_manager_render_view_host_android_unittest.cc chrome/browser/translate/translate_manager_render_view_host_unittest.cc chrome/browser/trusted_vault/trusted_vault_encryption_keys_tab_helper_browsertest.cc -chrome/browser/ui/android/page_insights/page_insights_swaa_checker.cc chrome/browser/ui/android/strings/android_chrome_strings.grd chrome/browser/ui/ash/ambient/ambient_client_impl.cc chrome/browser/ui/ash/ambient/ambient_client_impl_unittest.cc @@ -1601,6 +1617,7 @@ chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller.cc chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc chrome/browser/ui/ash/system_tray_client_impl.cc chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc +chrome/browser/ui/autofill/address_editor_controller_unittest.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/offer_notification_controller_android_browsertest.cc @@ -1712,7 +1729,6 @@ 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/eye_dropper/eye_dropper_view.cc chrome/browser/ui/views/file_system_access/file_system_access_permission_dialog_browsertest.cc chrome/browser/ui/views/file_system_access/file_system_access_usage_bubble_view_browsertest.cc chrome/browser/ui/views/frame/browser_root_view_browsertest.cc @@ -1725,6 +1741,7 @@ chrome/browser/ui/views/lens/lens_side_panel_navigation_helper.cc chrome/browser/ui/views/lens/lens_side_panel_navigation_helper_unittest.cc chrome/browser/ui/views/location_bar/selected_keyword_view.h chrome/browser/ui/views/network_profile_bubble_view.cc +chrome/browser/ui/views/omnibox/omnibox_popup_view_views_browsertest.cc chrome/browser/ui/views/omnibox/omnibox_result_view_unittest.cc chrome/browser/ui/views/omnibox/omnibox_view_views.cc chrome/browser/ui/views/omnibox/omnibox_view_views.h @@ -1765,7 +1782,6 @@ chrome/browser/ui/views/site_data/page_specific_site_data_dialog_unittest.cc chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc -chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc chrome/browser/ui/views/web_apps/force_installed_preinstalled_deprecated_app_dialog_view.cc chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_browsertest.cc chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop_browsertest.cc @@ -1799,10 +1815,15 @@ chrome/browser/ui/webui/ash/notification_tester/notification_tester_handler.cc chrome/browser/ui/webui/ash/parent_access/parent_access_ui_handler_impl.cc chrome/browser/ui/webui/ash/parent_access/parent_access_ui_handler_impl_unittest.cc chrome/browser/ui/webui/ash/settings/pages/a11y/accessibility_handler_browsertest.cc -chrome/browser/ui/webui/ash/sync/os_sync_handler_unittest.cc +chrome/browser/ui/webui/ash/settings/pages/multidevice/multidevice_handler_unittest.cc +chrome/browser/ui/webui/ash/settings/pages/people/os_sync_handler_unittest.cc +chrome/browser/ui/webui/ash/settings/pages/people/parental_controls_handler.cc +chrome/browser/ui/webui/ash/settings/pages/power/power_section.cc +chrome/browser/ui/webui/ash/settings/services/metrics/per_session_settings_user_action_tracker_unittest.cc +chrome/browser/ui/webui/ash/settings/services/metrics/settings_user_action_tracker_unittest.cc chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc chrome/browser/ui/webui/components/components_handler.cc -chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc +chrome/browser/ui/webui/devtools/devtools_ui_data_source_unittest.cc chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc chrome/browser/ui/webui/favicon_source_unittest.cc @@ -1830,11 +1851,6 @@ chrome/browser/ui/webui/profile_info_watcher.h chrome/browser/ui/webui/sanitized_image_source.cc chrome/browser/ui/webui/sanitized_image_source_unittest.cc chrome/browser/ui/webui/settings/about_handler_unittest.cc -chrome/browser/ui/webui/settings/ash/multidevice_handler_unittest.cc -chrome/browser/ui/webui/settings/ash/parental_controls_handler.cc -chrome/browser/ui/webui/settings/ash/per_session_settings_user_action_tracker_unittest.cc -chrome/browser/ui/webui/settings/ash/power_section.cc -chrome/browser/ui/webui/settings/ash/settings_user_action_tracker_unittest.cc chrome/browser/ui/webui/settings/on_startup_handler_unittest.cc chrome/browser/ui/webui/settings/people_handler_unittest.cc chrome/browser/ui/webui/settings/profile_info_handler_unittest.cc @@ -1849,6 +1865,8 @@ chrome/browser/ui/webui/settings/site_settings_helper_unittest.cc chrome/browser/ui/webui/side_panel/companion/companion_side_panel_untrusted_ui.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 +chrome/browser/ui/webui/side_panel/customize_chrome/wallpaper_search/wallpaper_search_handler_unittest.cc chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_ui.cc chrome/browser/ui/webui/side_panel/reading_list/reading_list_page_handler_unittest.cc chrome/browser/ui/webui/side_panel/user_notes/user_notes_page_handler_unittest.cc @@ -1959,6 +1977,7 @@ 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 +chrome/common/extensions/api/reading_list.idl chrome/common/extensions/api/scripting.idl chrome/common/extensions/api/tabs.json chrome/common/extensions/api/tts.json @@ -1986,7 +2005,6 @@ chrome/common/importer/firefox_importer_utils.cc chrome/common/net/x509_certificate_model_nss_unittest.cc chrome/common/net/x509_certificate_model_unittest.cc chrome/common/pref_names.h -chrome/common/url_constants.cc chrome/common/url_constants.h chrome/common/win/delay_load_failure_hook.cc chrome/credential_provider/extension/os_service_manager.h @@ -2083,6 +2101,7 @@ chrome/installer/util/work_item.h chrome/notification_helper/notification_activator.h chrome/notification_helper/notification_helper.cc chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc +chrome/renderer/accessibility/read_anything_app_model_browsertest.cc chrome/renderer/app_categorizer_unittest.cc chrome/renderer/autofill/autofill_renderer_browsertest.cc chrome/renderer/autofill/form_autofill_browsertest.cc @@ -2109,16 +2128,20 @@ chrome/services/file_util/public/cpp/sandboxed_document_analyzer_unittest.cc chrome/services/mac_notifications/mac_notification_service_ns.mm chrome/services/mac_notifications/mac_notification_service_ns_unittest.mm chrome/services/mac_notifications/mac_notification_service_un_unittest.mm +chrome/services/sharing/nearby/nearby_connections_unittest.cc chrome/services/sharing/nearby/nearby_presence_unittest.cc chrome/services/sharing/nearby/quick_start_decoder/quick_start_decoder_unittest.cc chrome/services/util_win/av_products.cc chrome/test/base/android/android_browser_test.h +chrome/test/base/ash/js2gtest.js +chrome/test/base/chromeos/crosier/chromeos_integration_login_mixin.cc +chrome/test/base/chromeos/crosier/chromeos_integration_login_mixin.h chrome/test/base/chromeos/crosier/demo_integration_test.cc +chrome/test/base/chromeos/crosier/helper/reset_dut.py chrome/test/base/chromeos/test_chrome_main.cc chrome/test/base/fake_gaia_mixin.cc chrome/test/base/fake_gaia_mixin.h chrome/test/base/in_process_browser_test_browsertest.cc -chrome/test/base/js2gtest.js chrome/test/chromedriver/capabilities_unittest.cc chrome/test/chromedriver/chrome/chrome_desktop_impl.cc chrome/test/chromedriver/chrome/chrome_finder.cc @@ -2155,6 +2178,7 @@ chrome/test/enterprise/e2e/policy/force_google_safe_search/force_google_safe_sea chrome/test/enterprise/e2e/policy/fullscreen_allowed/fullscreen_allowed.py chrome/test/enterprise/e2e/policy/homepage/homepage.py chrome/test/enterprise/e2e/policy/install_extension.py +chrome/test/enterprise/e2e/policy/mergelist/mergelist.py chrome/test/enterprise/e2e/policy/password_manager_enabled/password_manager_enabled.py chrome/test/enterprise/e2e/policy/popups_allowed/popups_allowed.py chrome/test/enterprise/e2e/policy/restore_on_startup/restore_on_startup.py @@ -2166,6 +2190,7 @@ chrome/test/enterprise/e2e/policy/url_blocklist/url_blocklist.py chrome/test/enterprise/e2e/policy/user_data_dir/user_data_dir.py chrome/test/enterprise/e2e/policy/webprotect_file_download/webprotect_file_download_webdriver.py chrome/test/enterprise/e2e/policy/youtube_restrict/youtube_restrict.py +chrome/test/fuzzing/in_process_fuzzer.h chrome/test/interaction/interactive_browser_test_interactive_uitest.cc chrome/test/mini_installer/PRESUBMIT.py chrome/test/mini_installer/create_zip.py @@ -2174,6 +2199,7 @@ chrome/test/mini_installer/update_lastrun.py chrome/test/nacl/nacl_browsertest_util.h chrome/test/payments/payment_request_platform_browsertest_base.h chrome/test/supervised_user/api_mock_setup_mixin.cc +chrome/test/supervised_user/family_member.cc chrome/test/supervised_user/supervision_mixin.cc chrome/test/supervised_user/supervision_mixin.h chrome/test/variations/fixtures/cipd.py @@ -2239,10 +2265,13 @@ chromecast/public/output_restrictions.h chromeos/BUILD.gn chromeos/ash/components/attestation/attestation_flow_adaptive_unittest.cc chromeos/ash/components/attestation/attestation_flow_integrated_unittest.cc +chromeos/ash/components/carrier_lock/fcm_topic_subscriber_unittest.cc chromeos/ash/components/carrier_lock/provisioning_config_fetcher_impl.cc chromeos/ash/components/carrier_lock/provisioning_config_fetcher_unittest.cc chromeos/ash/components/carrier_lock/psm_claim_verifier_impl.cc chromeos/ash/components/carrier_lock/psm_claim_verifier_unittest.cc +chromeos/ash/components/carrier_lock/topic_subscription_request.cc +chromeos/ash/components/carrier_lock/topic_subscription_request_unittest.cc chromeos/ash/components/chaps_util/chaps_util_impl.cc chromeos/ash/components/cryptohome/userdataauth_util.cc chromeos/ash/components/dbus/arc/arc_obb_mounter_client.h @@ -2250,8 +2279,6 @@ chromeos/ash/components/dbus/biod/fake_biod_client_unittest.cc chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h chromeos/ash/components/dbus/dlcservice/dlcservice_client.h chromeos/ash/components/dbus/rmad/fake_rmad_client.cc -chromeos/ash/components/device_activity/device_activity_client_unittest.cc -chromeos/ash/components/device_activity/device_activity_controller.cc chromeos/ash/components/drivefs/drivefs_http_client_unittest.cc chromeos/ash/components/geolocation/simple_geolocation_provider.cc chromeos/ash/components/local_search_service/content_extraction_utils_unittest.cc @@ -2265,6 +2292,7 @@ chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_i chromeos/ash/components/nearby/presence/credentials/nearby_presence_credential_manager_impl_unittest.cc chromeos/ash/components/nearby/presence/credentials/nearby_presence_server_client_impl.cc chromeos/ash/components/nearby/presence/credentials/nearby_presence_server_client_impl_unittest.cc +chromeos/ash/components/nearby/presence/nearby_presence_service_impl_unittest.cc chromeos/ash/components/network/geolocation_handler.cc chromeos/ash/components/network/network_cert_loader.cc chromeos/ash/components/network/network_util.h @@ -2367,6 +2395,7 @@ components/autofill/core/browser/metrics/autofill_metrics_test_base.cc components/autofill/core/browser/metrics/autofill_metrics_unittest.cc components/autofill/core/browser/metrics/quality_metrics_unittest.cc components/autofill/core/browser/metrics/shadow_prediction_metrics_unittest.cc +components/autofill/core/browser/ml_model/autofill_ml_prediction_model_handler_unittest.cc components/autofill/core/browser/payments/autofill_offer_manager_unittest.cc components/autofill/core/browser/payments/constants.h components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc @@ -2453,7 +2482,6 @@ components/content_settings/core/browser/content_settings_uma_util.cc components/content_settings/core/common/content_settings_pattern.cc components/content_settings/core/common/content_settings_pattern_parser_unittest.cc components/content_settings/core/common/content_settings_pattern_unittest.cc -components/content_settings/core/common/content_settings_utils_unittest.cc components/content_settings/renderer/content_settings_agent_impl.cc components/contextual_search/core/browser/contextual_search_context.h components/contextual_search/core/browser/contextual_search_delegate_impl_unittest.cc @@ -2475,6 +2503,7 @@ components/cronet/native/perftest/perf_test.cc components/cronet/tools/cr_cronet.py components/cronet/tools/generate_javadoc.py components/custom_handlers/protocol_handler_registry_unittest.cc +components/desks_storage/core/admin_template_service_unittests.cc components/desks_storage/core/desk_model_wrapper_unittests.cc components/desks_storage/core/desk_sync_bridge_unittest.cc components/desks_storage/core/desk_template_conversion.cc @@ -2503,12 +2532,14 @@ components/embedder_support/android/BUILD.gn components/endpoint_fetcher/endpoint_fetcher_unittest.cc components/enterprise/data_controls/attributes_condition_unittest.cc components/enterprise/data_controls/data_controls_policy_handler_unittest.cc +components/enterprise/data_controls/rule_unittest.cc components/error_page/common/localized_error.cc components/error_page_strings.grdp components/exo/data_offer_unittest.cc components/exo/drag_drop_operation_unittest.cc components/exo/seat_unittest.cc components/exo/ui_lock_controller.h +components/eye_dropper/eye_dropper_view.cc components/favicon/content/content_favicon_driver_unittest.cc components/favicon/core/fallback_url_util_unittest.cc components/favicon/core/favicon_backend.cc @@ -2536,7 +2567,7 @@ components/feedback/feedback_uploader.cc components/feedback/feedback_uploader_dispatch_unittest.cc components/feedback/redaction_tool/url_parse.h components/flags_ui/flags_test_helpers.cc -components/flags_ui/resources/flags.html +components/flags_ui/resources/app.html components/gcm_driver/gcm_account_mapper.cc components/gcm_driver/gcm_account_mapper_unittest.cc components/gcm_driver/gcm_client_impl.cc @@ -2603,6 +2634,11 @@ components/lookalikes/core/lookalike_url_util.cc components/lookalikes/core/lookalike_url_util.h components/lookalikes/core/lookalike_url_util_unittest.cc components/management_strings.grdp +components/manta/manta_service_callbacks.cc +components/manta/orca_provider.cc +components/manta/orca_provider_unittest.cc +components/manta/snapper_provider.cc +components/manta/snapper_provider_unittest.cc components/media_router/browser/android/flinging_controller_bridge.cc components/media_router/browser/media_router_dialog_controller_unittest.cc components/media_router/browser/media_router_metrics_unittest.cc @@ -2649,6 +2685,7 @@ components/offline_pages/core/model/get_pages_task_unittest.cc components/omnibox/PRESUBMIT.py components/omnibox/browser/autocomplete_controller.cc components/omnibox/browser/autocomplete_controller.h +components/omnibox/browser/autocomplete_controller_unittest.cc components/omnibox/browser/autocomplete_input.cc components/omnibox/browser/autocomplete_match.h components/omnibox/browser/autocomplete_match_type_unittest.cc @@ -2680,6 +2717,7 @@ components/omnibox/browser/omnibox_field_trial.h components/omnibox/browser/omnibox_view_unittest.cc components/omnibox/browser/on_device_head_provider_unittest.cc components/omnibox/browser/on_device_tail_model_service_unittest.cc +components/omnibox/browser/query_tile_provider_unittest.cc components/omnibox/browser/remote_suggestions_service_unittest.cc components/omnibox/browser/scored_history_match.cc components/omnibox/browser/scored_history_match_unittest.cc @@ -2758,7 +2796,6 @@ components/password_manager/core/browser/affiliation/affiliation_utils.h components/password_manager/core/browser/affiliation/affiliation_utils_unittest.cc components/password_manager/core/browser/affiliation/hash_affiliation_fetcher.cc components/password_manager/core/browser/affiliation/hash_affiliation_fetcher_unittest.cc -components/password_manager/core/browser/built_in_backend_to_android_backend_migrator_unittest.cc components/password_manager/core/browser/credential_manager_impl_unittest.cc components/password_manager/core/browser/credential_manager_logger_unittest.cc components/password_manager/core/browser/credential_manager_pending_request_task_unittest.cc @@ -2771,6 +2808,7 @@ components/password_manager/core/browser/form_parsing/form_data_parser_unittest. components/password_manager/core/browser/form_parsing/fuzzer/form_data_producer.h components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.cc components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc +components/password_manager/core/browser/get_logins_with_affiliations_request_handler_unittest.cc components/password_manager/core/browser/hash_password_manager.cc components/password_manager/core/browser/hash_password_manager_unittest.cc components/password_manager/core/browser/import/csv_password.h @@ -2811,7 +2849,6 @@ components/password_manager/core/browser/password_reuse_detector.cc components/password_manager/core/browser/password_reuse_detector_unittest.cc components/password_manager/core/browser/password_reuse_manager_impl_unittest.cc components/password_manager/core/browser/password_save_manager_impl_unittest.cc -components/password_manager/core/browser/password_store_backend_migration_decorator_unittest.cc components/password_manager/core/browser/password_store_unittest.cc components/password_manager/core/browser/password_sync_util.cc components/password_manager/core/browser/password_sync_util.h @@ -2917,6 +2954,86 @@ components/policy/core/common/scoped_critical_policy_section.cc components/policy/core/common/values_util.h components/policy/resources/policy_templates.py components/policy/test/data/policy_test_cases.json +components/policy/test/data/pref_mapping/AllHttpAuthSchemesAllowedForOrigins.json +components/policy/test/data/pref_mapping/AllowedDomainsForApps.json +components/policy/test/data/pref_mapping/AppLaunchAutomation.json +components/policy/test/data/pref_mapping/AudioCaptureAllowedUrls.json +components/policy/test/data/pref_mapping/AutoOpenAllowedForURLs.json +components/policy/test/data/pref_mapping/BrowserSwitcherUrlGreylist.json +components/policy/test/data/pref_mapping/BrowserSwitcherUrlList.json +components/policy/test/data/pref_mapping/ClipboardAllowedForUrls.json +components/policy/test/data/pref_mapping/ClipboardBlockedForUrls.json +components/policy/test/data/pref_mapping/CookiesAllowedForUrls.json +components/policy/test/data/pref_mapping/CookiesBlockedForUrls.json +components/policy/test/data/pref_mapping/CookiesSessionOnlyForUrls.json +components/policy/test/data/pref_mapping/DataControlsRules.json +components/policy/test/data/pref_mapping/DataLeakPreventionRulesList.json +components/policy/test/data/pref_mapping/DefaultHandlersForFileExtensions.json +components/policy/test/data/pref_mapping/DeskAPIThirdPartyAllowlist.json +components/policy/test/data/pref_mapping/DeviceAttributesAllowedForOrigins.json +components/policy/test/data/pref_mapping/DeviceAuthenticationURLAllowlist.json +components/policy/test/data/pref_mapping/DeviceAuthenticationURLBlocklist.json +components/policy/test/data/pref_mapping/DeviceLoginScreenExtensions.json +components/policy/test/data/pref_mapping/DeviceLoginScreenWebHidAllowDevicesForUrls.json +components/policy/test/data/pref_mapping/DeviceLoginScreenWebUsbAllowDevicesForUrls.json +components/policy/test/data/pref_mapping/DisabledSchemes.json +components/policy/test/data/pref_mapping/ExtensionInstallForcelist.json +components/policy/test/data/pref_mapping/ExtensionOAuthRedirectUrls.json +components/policy/test/data/pref_mapping/ExtensionSettings.json +components/policy/test/data/pref_mapping/FileSystemReadBlockedForUrls.json +components/policy/test/data/pref_mapping/FileSystemWriteBlockedForUrls.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 +components/policy/test/data/pref_mapping/InsecureContentAllowedForUrls.json +components/policy/test/data/pref_mapping/InsecureContentBlockedForUrls.json +components/policy/test/data/pref_mapping/InsecurePrivateNetworkRequestsAllowedForUrls.json +components/policy/test/data/pref_mapping/JavaScriptAllowedForUrls.json +components/policy/test/data/pref_mapping/JavaScriptBlockedForUrls.json +components/policy/test/data/pref_mapping/JavaScriptJitAllowedForSites.json +components/policy/test/data/pref_mapping/JavaScriptJitBlockedForSites.json +components/policy/test/data/pref_mapping/LegacySameSiteCookieBehaviorEnabledForDomainList.json +components/policy/test/data/pref_mapping/LocalFontsAllowedForUrls.json +components/policy/test/data/pref_mapping/LocalFontsBlockedForUrls.json +components/policy/test/data/pref_mapping/ManagedBookmarks.json +components/policy/test/data/pref_mapping/MidiAllowedForUrls.json +components/policy/test/data/pref_mapping/MidiBlockedForUrls.json +components/policy/test/data/pref_mapping/NotificationsAllowedForUrls.json +components/policy/test/data/pref_mapping/NotificationsBlockedForUrls.json +components/policy/test/data/pref_mapping/PdfLocalFileAccessAllowedForDomains.json +components/policy/test/data/pref_mapping/PerAppTimeLimitsAllowlist.json +components/policy/test/data/pref_mapping/PinnedLauncherApps.json +components/policy/test/data/pref_mapping/PopupsAllowedForUrls.json +components/policy/test/data/pref_mapping/PopupsBlockedForUrls.json +components/policy/test/data/pref_mapping/ReportWebsiteActivityAllowlist.json +components/policy/test/data/pref_mapping/ReportWebsiteTelemetryAllowlist.json +components/policy/test/data/pref_mapping/RestoreOnStartupURLs.json +components/policy/test/data/pref_mapping/RestrictSigninToPattern.json +components/policy/test/data/pref_mapping/SafeBrowsingAllowlistDomains.json +components/policy/test/data/pref_mapping/SameOriginTabCaptureAllowedByOrigins.json +components/policy/test/data/pref_mapping/ScreenCaptureAllowedByOrigins.json +components/policy/test/data/pref_mapping/SensorsAllowedForUrls.json +components/policy/test/data/pref_mapping/SensorsBlockedForUrls.json +components/policy/test/data/pref_mapping/SerialAllowAllPortsForUrls.json +components/policy/test/data/pref_mapping/SerialAllowUsbDevicesForUrls.json +components/policy/test/data/pref_mapping/SerialBlockedForUrls.json +components/policy/test/data/pref_mapping/TabCaptureAllowedByOrigins.json +components/policy/test/data/pref_mapping/ThirdPartyStoragePartitioningBlockedForOrigins.json +components/policy/test/data/pref_mapping/URLAllowlist.json +components/policy/test/data/pref_mapping/URLBlocklist.json +components/policy/test/data/pref_mapping/VideoCaptureAllowedUrls.json +components/policy/test/data/pref_mapping/WebHidAllowAllDevicesForUrls.json +components/policy/test/data/pref_mapping/WebHidAllowDevicesForUrls.json +components/policy/test/data/pref_mapping/WebHidAllowDevicesWithHidUsagesForUrls.json +components/policy/test/data/pref_mapping/WebHidBlockedForUrls.json +components/policy/test/data/pref_mapping/WebUsbAllowDevicesForUrls.json +components/policy/test/data/pref_mapping/WebUsbBlockedForUrls.json +components/policy/test/data/pref_mapping/WindowCaptureAllowedByOrigins.json +components/policy/test/data/pref_mapping/WindowManagementAllowedForUrls.json +components/policy/test/data/pref_mapping/WindowManagementBlockedForUrls.json +components/policy/test/data/pref_mapping/WindowPlacementAllowedForUrls.json +components/policy/test/data/pref_mapping/WindowPlacementBlockedForUrls.json components/policy/test_support/fake_dmserver.h components/policy/test_support/fake_dmserver_unittest.cc components/policy/test_support/request_handler_for_policy.cc @@ -2947,7 +3064,6 @@ components/prefs/pref_change_registrar.cc components/prefs/pref_change_registrar_unittest.cc components/prefs/pref_service_unittest.cc components/printing/renderer/print_render_frame_helper.cc -components/privacy_sandbox/privacy_sandbox_settings_impl_unittest.cc components/privacy_sandbox_strings.grdp components/protocol_handler_strings.grdp components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc @@ -2956,6 +3072,7 @@ components/query_tiles/test/fake_tile_service.cc components/quirks/quirks_client.cc components/reading_list/core/offline_url_utils_unittest.cc components/remote_cocoa/app_shim/select_file_dialog_bridge.mm +components/reporting/PRESUBMIT.py components/reporting/storage/storage_queue_unittest.cc components/resources/PRESUBMIT.py components/resources/terms/terms_am.html @@ -3090,6 +3207,8 @@ components/services/app_service/public/cpp/app_capability_access_cache_wrapper_u components/services/app_service/public/cpp/app_launch_util.h components/services/app_service/public/cpp/app_registry_cache_unittest.cc components/services/app_service/public/cpp/app_registry_cache_wrapper_unittest.cc +components/services/app_service/public/cpp/app_storage/app_storage_file_handler_unittest.cc +components/services/app_service/public/cpp/app_storage/app_storage_unittest.cc components/services/app_service/public/cpp/app_update_unittest.cc components/services/app_service/public/cpp/capability_access_update_unittest.cc components/services/app_service/public/cpp/intent.h @@ -3187,7 +3306,6 @@ components/sync/engine/net/http_bridge_unittest.cc components/sync/protocol/proto_value_conversions_unittest.cc components/sync/service/resources/about.ts components/sync/service/sync_prefs.cc -components/sync/service/sync_service_impl.cc components/sync/service/sync_service_impl_startup_unittest.cc components/sync/service/sync_service_impl_unittest.cc components/sync/service/sync_session_durations_metrics_recorder_unittest.cc @@ -3303,7 +3421,7 @@ content/browser/background_fetch/background_fetch_cross_origin_filter_unittest.c content/browser/background_fetch/background_fetch_service_impl.cc content/browser/background_fetch/background_fetch_service_unittest.cc content/browser/blob_storage/blob_url_browsertest.cc -content/browser/blob_storage/file_backed_blob_factory_impl_unittest.cc +content/browser/blob_storage/file_backed_blob_factory_frame_impl_unittest.cc content/browser/browser_url_handler_impl.cc content/browser/browsing_data/browsing_data_filter_builder_impl.cc content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc @@ -3338,19 +3456,20 @@ content/browser/hid/hid_service_unittest.cc content/browser/idle/idle_manager_unittest.cc content/browser/indexed_db/indexed_db_backing_store.cc content/browser/indexed_db/indexed_db_backing_store_unittest.cc +content/browser/indexed_db/indexed_db_context_impl.h content/browser/indexed_db/indexed_db_context_unittest.cc content/browser/indexed_db/indexed_db_reporting.cc content/browser/installedapp/installed_app_provider_impl_win.cc content/browser/interest_group/ad_auction_url_loader_interceptor_unittest.cc content/browser/interest_group/auction_runner_unittest.cc content/browser/interest_group/bidding_and_auction_server_key_fetcher.cc +content/browser/interest_group/bidding_and_auction_server_key_fetcher.h content/browser/interest_group/interest_group_update_manager.cc content/browser/loader/file_url_loader_factory_unittest.cc content/browser/loader/keep_alive_url_loader.cc content/browser/loader/keep_alive_url_loader.h content/browser/loader/keep_alive_url_loader_service.cc content/browser/loader/keep_alive_url_loader_service.h -content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/prefetch_browsertest.cc content/browser/media/audio_stream_monitor_unittest.cc content/browser/media/capture/frame_test_util.cc @@ -3456,7 +3575,6 @@ content/browser/zygote_host/zygote_host_impl_linux.cc content/child/runtime_features.cc content/common/features.cc content/common/service_worker/race_network_request_url_loader_client.cc -content/common/webid/identity_url_loader_throttle_unittest.cc content/common/zygote/zygote_communication_linux.h content/public/android/java/res/values/strings.xml content/public/browser/bluetooth_delegate.h @@ -3488,7 +3606,6 @@ content/public/test/test_file_error_injector.h content/renderer/PRESUBMIT.py content/renderer/accessibility/ax_image_annotator.cc content/renderer/accessibility/ax_image_stopwords.h -content/renderer/accessibility/render_accessibility_impl.cc content/renderer/content_security_policy_util_fuzzer.cc content/renderer/media/media_factory.cc content/renderer/pepper/message_channel.cc @@ -3568,7 +3685,7 @@ device/fido/aoa/android_accessory_discovery.cc device/fido/aoa/android_accessory_discovery.h device/fido/attestation_statement_formats.cc device/fido/discoverable_credential_metadata.h -device/fido/enclave/enclave_http_client.cc +device/fido/enclave/enclave_websocket_client.cc device/fido/features.h device/fido/fido_constants.h device/fido/fido_strings.grd @@ -3611,13 +3728,13 @@ extensions/browser/api/web_request/web_request_permissions.cc extensions/browser/api/web_request/web_request_permissions_unittest.cc extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc extensions/browser/browser_frame_context_data_unittest.cc -extensions/browser/content_script_tracker.cc extensions/browser/event_listener_map.h extensions/browser/event_listener_map_unittest.cc extensions/browser/event_router_unittest.cc extensions/browser/extension_prefs_observer.h extensions/browser/image_sanitizer.cc extensions/browser/permissions_manager.h +extensions/browser/script_injection_tracker.cc extensions/browser/suggest_permission_util.cc extensions/browser/updater/extension_downloader.cc extensions/browser/updater/extension_downloader_test_helper.cc @@ -3658,7 +3775,7 @@ extensions/common/extension_set_unittest.cc extensions/common/extension_urls.cc extensions/common/extension_urls.h extensions/common/file_util_unittest.cc -extensions/common/manifest_constants.cc +extensions/common/manifest_constants.h extensions/common/manifest_handlers/content_capabilities_manifest_unittest.cc extensions/common/manifest_handlers/csp_info_unittest.cc extensions/common/manifest_handlers/externally_connectable_unittest.cc @@ -3692,6 +3809,7 @@ extensions/strings/extensions_strings.grd extensions/test/extension_background_page_waiter.h fuchsia_web/webengine/browser/frame_impl_browsertest.cc fuchsia_web/webengine/test/data/play_video.html +gin/gin_features.cc gin/thread_isolation.cc gin/v8_initializer.cc google_apis/calendar/calendar_api_requests.cc @@ -3789,6 +3907,7 @@ headless/test/dom_tree_extraction_expected_nodes.txt headless/test/headless_compositor_browsertest.cc infra/config/PRESUBMIT.py infra/config/scripts/PRESUBMIT.py +infra/config/scripts/sync-pyl-files.py ios/PRESUBMIT.py ios/build/bots/scripts/PRESUBMIT.py ios/build/bots/scripts/plugin/PRESUBMIT.py @@ -3815,29 +3934,29 @@ ios/chrome/browser/credential_provider/model/credential_provider_service_unittes ios/chrome/browser/download/ar_quick_look_tab_helper_unittest.mm ios/chrome/browser/flags/about_flags.mm ios/chrome/browser/history/history_tab_helper_unittest.mm -ios/chrome/browser/link_to_text/link_to_text_java_script_feature_unittest.mm +ios/chrome/browser/link_to_text/model/link_to_text_java_script_feature_unittest.mm ios/chrome/browser/metrics/ios_family_link_user_metrics_provider_unittest.mm ios/chrome/browser/metrics/tab_usage_recorder_browser_agent_unittest.mm ios/chrome/browser/net/retryable_url_fetcher_unittest.mm ios/chrome/browser/ntp/browser_policy_new_tab_page_rewriter_unittest.mm ios/chrome/browser/omaha/omaha_service.mm ios/chrome/browser/optimization_guide/optimization_guide_validation_tab_helper_unittest.mm -ios/chrome/browser/passwords/password_controller_js_unittest.mm -ios/chrome/browser/passwords/password_controller_unittest.mm +ios/chrome/browser/passwords/model/password_controller_js_unittest.mm +ios/chrome/browser/passwords/model/password_controller_unittest.mm ios/chrome/browser/policy/cloud/user_policy_signin_service_unittest.mm ios/chrome/browser/policy/new_tab_page_location_policy_handler_unittest.cc ios/chrome/browser/policy/reporting/profile_report_generator_ios_unittest.mm ios/chrome/browser/policy/restrict_accounts_policy_handler_unittest.cc -ios/chrome/browser/prerender/prerender_service_impl_unittest.mm -ios/chrome/browser/safe_browsing/safe_browsing_client_impl_unittest.mm -ios/chrome/browser/safe_browsing/tailored_security/tailored_security_tab_helper_unittest.mm -ios/chrome/browser/safety_check/ios_chrome_safety_check_manager_unittest.mm -ios/chrome/browser/search_engines/extension_search_engine_data_updater_unittest.mm -ios/chrome/browser/search_engines/resources/search_engine.ts -ios/chrome/browser/search_engines/search_engine_js_unittest.mm -ios/chrome/browser/search_engines/search_engine_tab_helper.h -ios/chrome/browser/search_engines/search_engine_tab_helper.mm -ios/chrome/browser/shared/coordinator/scene/scene_controller.mm +ios/chrome/browser/prerender/model/prerender_service_impl_unittest.mm +ios/chrome/browser/reading_list/model/reading_list_browser_agent_unittest.mm +ios/chrome/browser/safe_browsing/model/safe_browsing_client_impl_unittest.mm +ios/chrome/browser/safe_browsing/model/tailored_security/tailored_security_tab_helper_unittest.mm +ios/chrome/browser/safety_check/model/ios_chrome_safety_check_manager_unittest.mm +ios/chrome/browser/search_engines/model/extension_search_engine_data_updater_unittest.mm +ios/chrome/browser/search_engines/model/resources/search_engine.ts +ios/chrome/browser/search_engines/model/search_engine_js_unittest.mm +ios/chrome/browser/search_engines/model/search_engine_tab_helper.h +ios/chrome/browser/search_engines/model/search_engine_tab_helper.mm ios/chrome/browser/shared/model/url/chrome_url_constants.cc ios/chrome/browser/shared/model/web_state_list/order_controller_source_from_web_state_list_unittest.mm ios/chrome/browser/shared/model/web_state_list/web_state_list_unittest.mm @@ -3852,8 +3971,8 @@ ios/chrome/browser/signin/gaia_auth_fetcher_ios_unittest.mm ios/chrome/browser/signin/pattern_account_restriction_unittest.mm ios/chrome/browser/signin/system_identity_manager.h ios/chrome/browser/signin/user_approved_account_list_manager_unittest.mm -ios/chrome/browser/ssl/ios_ssl_error_handler_unittest.mm -ios/chrome/browser/supervised_user/supervised_user_url_filter_tab_helper_unittest.mm +ios/chrome/browser/ssl/model/ios_ssl_error_handler_unittest.mm +ios/chrome/browser/supervised_user/model/supervised_user_url_filter_tab_helper_unittest.mm ios/chrome/browser/ui/authentication/signin/add_account_signin/add_account_signin_manager_unittest.mm ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/advanced_settings_signin_mediator_unittest.mm ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator_unittest.mm @@ -3918,10 +4037,15 @@ ios/chrome/browser/ui/settings/password/password_exporter_unittest.mm ios/chrome/browser/ui/settings/password/password_issues/password_issues_table_view_controller_unittest.mm ios/chrome/browser/ui/settings/password/password_manager_egtest.mm ios/chrome/browser/ui/settings/password/password_manager_view_controller_unittest.mm +ios/chrome/browser/ui/settings/password/password_sharing/family_picker_coordinator_unittest.mm ios/chrome/browser/ui/settings/password/password_sharing/family_picker_view_controller_unittest.mm +ios/chrome/browser/ui/settings/password/password_sharing/family_promo_coordinator_unittest.mm ios/chrome/browser/ui/settings/password/password_sharing/password_picker_view_controller_unittest.mm ios/chrome/browser/ui/settings/password/password_sharing/password_sharing_constants.mm ios/chrome/browser/ui/settings/password/password_sharing/password_sharing_egtest.mm +ios/chrome/browser/ui/settings/password/password_sharing/password_sharing_first_run_coordinator_unittest.mm +ios/chrome/browser/ui/settings/password/password_sharing/sharing_status_coordinator_unittest.mm +ios/chrome/browser/ui/settings/password/password_sharing/sharing_status_mediator_unittest.mm ios/chrome/browser/ui/settings/password/passwords_mediator_unittest.mm ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm ios/chrome/browser/ui/settings/settings_app_interface.mm @@ -3941,7 +4065,7 @@ ios/chrome/browser/ui/toolbar/adaptive_toolbar_mediator_unittest.mm ios/chrome/browser/ui/webui/interstitials/interstitial_ui_util.mm ios/chrome/browser/ui/whats_new/data_source/resources/calendar_event.json ios/chrome/browser/ui/whats_new/data_source/resources/calendar_event_darkmode.json -ios/chrome/browser/url_loading/image_search_param_generator_unittest.mm +ios/chrome/browser/url_loading/model/image_search_param_generator_unittest.mm ios/chrome/browser/web/chrome_web_client_unittest.mm ios/chrome/browser/web/font_size/font_size_tab_helper_unittest.mm ios/chrome/browser/web_state_list/web_usage_enabler/web_usage_enabler_browser_agent_unittest.mm @@ -3950,6 +4074,13 @@ ios/chrome/common/string_util_unittest.mm ios/chrome/common/x_callback_url_unittest.cc ios/chrome/credential_provider_extension/strings/ios_credential_provider_extension_strings.grd ios/chrome/test/data/policy/policy_test_cases.json +ios/chrome/test/data/policy/pref_mapping/ManagedBookmarks.json +ios/chrome/test/data/policy/pref_mapping/NewTabPageLocation.json +ios/chrome/test/data/policy/pref_mapping/PopupsAllowedForUrls.json +ios/chrome/test/data/policy/pref_mapping/PopupsBlockedForUrls.json +ios/chrome/test/data/policy/pref_mapping/RestrictAccountsToPatterns.json +ios/chrome/test/data/policy/pref_mapping/URLAllowlist.json +ios/chrome/test/data/policy/pref_mapping/URLBlocklist.json ios/chrome/test/earl_grey/chrome_earl_grey_ui.h ios/chrome/test/earl_grey/device_check_egtest.mm ios/chrome/test/providers/omaha/test_omaha.cc @@ -3969,6 +4100,7 @@ ios/showcase/omnibox_popup/fake_autocomplete_suggestion.mm ios/testing/PRESUBMIT.py ios/testing/data/http_server_files/opensearch.xml ios/testing/data/http_server_files/simple_login_form.html +ios/testing/data/http_server_files/simple_login_form_empty.html ios/testing/data/http_server_files/simple_signup_form.html ios/testing/data/http_server_files/window_open.html ios/web/browsing_data/browsing_data_removing_util_unittest.mm @@ -4624,17 +4756,14 @@ net/third_party/mozilla_win/cert/win_util.h net/third_party/nss/ssl/cmpcert.cc net/third_party/nss/ssl/cmpcert.h net/third_party/quiche/BUILD.gn +net/third_party/quiche/src/quiche/blind_sign_auth/blind_sign_auth.cc net/third_party/quiche/src/quiche/common/platform/api/quiche_hostname_utils_test.cc net/third_party/quiche/src/quiche/quic/core/crypto/client_proof_source_test.cc net/third_party/quiche/src/quiche/quic/core/crypto/quic_crypto_client_config.h net/third_party/quiche/src/quiche/quic/core/crypto/quic_crypto_client_config_test.cc net/third_party/quiche/src/quiche/quic/core/crypto/tls_server_connection.h -net/third_party/quiche/src/quiche/quic/core/http/quic_client_promised_info_test.cc -net/third_party/quiche/src/quiche/quic/core/http/quic_client_push_promise_index_test.cc -net/third_party/quiche/src/quiche/quic/core/http/quic_spdy_client_session_test.cc net/third_party/quiche/src/quiche/quic/core/http/quic_spdy_server_stream_base_test.cc net/third_party/quiche/src/quiche/quic/core/http/quic_spdy_stream_test.cc -net/third_party/quiche/src/quiche/quic/core/http/spdy_server_push_utils_test.cc net/third_party/quiche/src/quiche/quic/core/http/spdy_utils_test.cc net/third_party/quiche/src/quiche/quic/core/quic_crypto_stream.h net/third_party/quiche/src/quiche/quic/core/quic_dispatcher_test.cc @@ -4653,6 +4782,7 @@ net/tools/testserver/testserver.py.vpython3 net/tools/transport_security_state_generator/transport_security_state_generator.cc net/url_request/url_request_context_builder.cc net/url_request/url_request_context_builder_unittest.cc +net/url_request/url_request_http_job_unittest.cc net/url_request/url_request_job_unittest.cc net/url_request/url_request_throttler_unittest.cc net/url_request/url_request_unittest.cc @@ -4717,6 +4847,8 @@ printing/printing_context.h printing/test/PRESUBMIT.py remoting/android/java/res/layout/host_offline.xml remoting/android/java/res/layout/host_online.xml +remoting/base/corp_service_client.cc +remoting/base/is_google_email.cc remoting/base/service_urls.cc remoting/client/notification/gstatic_json_fetcher.cc remoting/client/notification/json_fetcher.h @@ -4742,13 +4874,11 @@ remoting/host/linux/remoting_user_session.cc remoting/host/policy_watcher_unittest.cc remoting/host/remote_open_url/remote_open_url_client_unittest.cc remoting/host/remote_open_url/remote_open_url_message_handler_unittest.cc -remoting/host/remoting_me2me_host.cc remoting/host/remoting_register_support_host_request.cc remoting/host/sas_injector_win.cc remoting/host/setup/com.google.chrome.remote_desktop-firefox.json.jinja2 remoting/host/setup/start_host_main.cc remoting/host/touch_injector_win.cc -remoting/host/usage_stats_consent_linux.cc remoting/host/webauthn/remote_webauthn_extension_notifier.cc remoting/host/win/etw_trace_controller.cc remoting/host/win/rdp_client_window.cc @@ -5159,6 +5289,7 @@ third_party/angle/extensions/EGL_ANGLE_window_fixed_size.txt third_party/angle/extensions/EGL_CHROMIUM_create_context_bind_generates_resource.txt third_party/angle/extensions/EGL_CHROMIUM_sync_control.txt third_party/angle/extensions/EGL_EXT_device_query.txt +third_party/angle/gni/angle.gni third_party/angle/include/CL/cl_platform.h third_party/angle/include/GLSLANG/ShaderLang.h third_party/angle/include/GLSLANG/ShaderVars.h @@ -5217,6 +5348,7 @@ third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp third_party/angle/src/libANGLE/renderer/renderer_utils.cpp third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.cpp third_party/angle/src/libANGLE/renderer/vulkan/ContextVk.h +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 @@ -5234,7 +5366,6 @@ third_party/angle/src/libANGLE/validationES.cpp third_party/angle/src/libGLESv2/egl_stubs.cpp third_party/angle/src/libGLESv2/global_state.cpp third_party/angle/src/program_serialize_data_version.py -third_party/angle/src/tests/deqp_support/deqp_egl_test_expectations.txt third_party/angle/src/tests/egl_tests/EGLContextSharingTest.cpp third_party/angle/src/tests/egl_tests/EGLIOSurfaceClientBufferTest.cpp third_party/angle/src/tests/egl_tests/EGLSurfaceTest.cpp @@ -5244,6 +5375,7 @@ third_party/angle/src/tests/gl_tests/GLSLTest.cpp third_party/angle/src/tests/gl_tests/ImageTest.cpp third_party/angle/src/tests/gl_tests/MipmapTest.cpp third_party/angle/src/tests/gl_tests/OcclusionQueriesTest.cpp +third_party/angle/src/tests/gl_tests/ProgramPipelineTest.cpp third_party/angle/src/tests/gl_tests/RobustResourceInitTest.cpp third_party/angle/src/tests/gl_tests/SRGBTextureTest.cpp third_party/angle/src/tests/gl_tests/TextureTest.cpp @@ -5272,6 +5404,7 @@ third_party/angle/third_party/rapidjson/src/test/unittest/valuetest.cpp third_party/angle/util/android/AndroidWindow.cpp third_party/angle/util/capture/frame_capture_test_utils.cpp third_party/angle/util/windows/third_party/StackWalker/src/StackWalker.cpp +third_party/anonymous_tokens/src/anonymous_tokens/cpp/privacy_pass/token_encodings_test.cc third_party/anonymous_tokens/src/anonymous_tokens/cpp/shared/proto_utils.h third_party/ashmem/ashmem-dev.c third_party/axe-core/axe.js @@ -5599,6 +5732,7 @@ third_party/blink/renderer/core/frame/web_frame_widget_impl.cc third_party/blink/renderer/core/frame/web_local_frame_impl.cc third_party/blink/renderer/core/frame/web_remote_frame_impl.cc third_party/blink/renderer/core/fullscreen/fullscreen.cc +third_party/blink/renderer/core/fullscreen/fullscreen_request_type.h third_party/blink/renderer/core/html/anchor_element_metrics_test.cc third_party/blink/renderer/core/html/custom/element_internals.idl third_party/blink/renderer/core/html/custom/validity_state_flags.idl @@ -5621,7 +5755,6 @@ 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 third_party/blink/renderer/core/html/html_anchor_element.cc -third_party/blink/renderer/core/html/html_anchor_element.h third_party/blink/renderer/core/html/html_anchor_element.idl third_party/blink/renderer/core/html/html_anchor_element_test.cc third_party/blink/renderer/core/html/html_area_element.idl @@ -5668,6 +5801,11 @@ 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/hit_test_cache.h third_party/blink/renderer/core/layout/hit_test_location.h +third_party/blink/renderer/core/layout/inline/inline_items_builder.h +third_party/blink/renderer/core/layout/inline/offset_mapping.h +third_party/blink/renderer/core/layout/inline/offset_mapping_builder.h +third_party/blink/renderer/core/layout/inline/score_line_breaker.cc +third_party/blink/renderer/core/layout/inline/score_line_breaker.h third_party/blink/renderer/core/layout/layout_block.cc third_party/blink/renderer/core/layout/layout_block.h third_party/blink/renderer/core/layout/layout_block_flow.h @@ -5683,21 +5821,16 @@ third_party/blink/renderer/core/layout/layout_image_resource_style_image.cc third_party/blink/renderer/core/layout/layout_image_resource_style_image.h third_party/blink/renderer/core/layout/layout_multi_column_flow_thread.h third_party/blink/renderer/core/layout/layout_object.h -third_party/blink/renderer/core/layout/layout_table_section_test.cc third_party/blink/renderer/core/layout/layout_text.cc third_party/blink/renderer/core/layout/layout_theme_default.h third_party/blink/renderer/core/layout/layout_view.h third_party/blink/renderer/core/layout/map_coordinates_test.cc -third_party/blink/renderer/core/layout/ng/inline/ng_inline_items_builder.h -third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.h -third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping_builder.h -third_party/blink/renderer/core/layout/ng/inline/ng_score_line_breaker.cc -third_party/blink/renderer/core/layout/ng/inline/ng_score_line_breaker.h third_party/blink/renderer/core/layout/ng/ng_block_node.cc third_party/blink/renderer/core/layout/ng/ng_length_utils.cc third_party/blink/renderer/core/layout/scroll_anchor_test.cc third_party/blink/renderer/core/layout/svg/layout_svg_path.cc third_party/blink/renderer/core/layout/svg/layout_svg_shape.cc +third_party/blink/renderer/core/layout/table/layout_table_section_test.cc third_party/blink/renderer/core/loader/frame_load_request.h third_party/blink/renderer/core/loader/frame_loader.cc third_party/blink/renderer/core/loader/http_equiv.cc @@ -5838,6 +5971,7 @@ third_party/blink/renderer/modules/payments/on_payment_response_test.cc third_party/blink/renderer/modules/payments/payment_request.cc third_party/blink/renderer/modules/payments/payment_request_optional_total_test.cc third_party/blink/renderer/modules/payments/payment_response_test.cc +third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.idl third_party/blink/renderer/modules/presentation/presentation_connection_available_event.h third_party/blink/renderer/modules/scheduler/scheduler.idl @@ -5877,6 +6011,7 @@ third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data.cc third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data.h third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data_test.cc third_party/blink/renderer/platform/fonts/script_run_iterator.cc +third_party/blink/renderer/platform/fonts/shaping/han_kerning.cc third_party/blink/renderer/platform/fonts/shaping/han_kerning.h third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc third_party/blink/renderer/platform/fonts/shaping/shape_result.cc @@ -5926,6 +6061,7 @@ third_party/blink/renderer/platform/loader/fetch/resource_load_scheduler.cc third_party/blink/renderer/platform/loader/fetch/resource_loader.cc third_party/blink/renderer/platform/loader/fetch/resource_request.h third_party/blink/renderer/platform/loader/fetch/resource_response.h +third_party/blink/renderer/platform/loader/fetch/url_loader/background_url_loader.h third_party/blink/renderer/platform/loader/fetch/url_loader/navigation_body_loader_unittest.cc third_party/blink/renderer/platform/loader/fetch/url_loader/resource_request_sender_unittest.cc third_party/blink/renderer/platform/mojo/kurl_security_origin_test.cc @@ -6089,6 +6225,7 @@ third_party/breakpad/breakpad/src/tools/python/filter_syms.py third_party/breakpad/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc third_party/breakpad/breakpad/src/tools/windows/converter/ms_symbol_server_converter.h third_party/breakpad/breakpad/src/tools/windows/converter_exe/converter.cc +third_party/cardboard/src_overrides/sdk/qrcode/android/qr_code.cc third_party/catapult/PRESUBMIT.py third_party/catapult/catapult_build/appengine_deploy.py third_party/catapult/catapult_build/js_checks.py @@ -6193,6 +6330,7 @@ third_party/catapult/dashboard/dashboard/models/alert_group_workflow.py third_party/catapult/dashboard/dashboard/models/alert_group_workflow_test.py third_party/catapult/dashboard/dashboard/models/anomaly_test.py third_party/catapult/dashboard/dashboard/models/graph_data.py +third_party/catapult/dashboard/dashboard/models/graph_data_test.py third_party/catapult/dashboard/dashboard/models/histogram_test.py third_party/catapult/dashboard/dashboard/models/internal_only_model_test.py third_party/catapult/dashboard/dashboard/pinpoint/dispatcher.py @@ -6249,8 +6387,6 @@ third_party/catapult/dashboard/dashboard/sheriff_config/tests/config-discovery.j third_party/catapult/dashboard/dashboard/sheriff_config/tests/test_luci_config_cases.py third_party/catapult/dashboard/dashboard/sheriff_config/tests/test_service_cases.py third_party/catapult/dashboard/dashboard/sheriff_config_client.py -third_party/catapult/dashboard/dashboard/skia_perf_upload.py -third_party/catapult/dashboard/dashboard/skia_perf_upload_test.py third_party/catapult/dashboard/dashboard/static/alerts.html third_party/catapult/dashboard/dashboard/static/group_report.html third_party/catapult/dashboard/dashboard/static/report.html @@ -7445,7 +7581,6 @@ third_party/catapult/tracing/tracing_build/merge_traces.py third_party/catapult/tracing/tracing_examples/string_convert.js third_party/catapult/web_page_replay_go/PRESUBMIT.py third_party/ced/src/compact_enc_det/compact_enc_det_unittest.cc -third_party/chaijs/chai.js third_party/chromevox/third_party/closure-library/closure/bin/build/depstree.py third_party/chromevox/third_party/closure-library/closure/bin/build/source.py third_party/chromevox/third_party/closure-library/closure/bin/build/treescan.py @@ -7592,7 +7727,6 @@ third_party/crashpad/crashpad/util/win/safe_terminate_process.h third_party/crashpad/crashpad/util/win/safe_terminate_process_test.cc third_party/crashpad/crashpad/util/win/xp_compat.h third_party/crashpad/update.py -third_party/cros-components/src/sidenav/sidenav.ts third_party/cros-components/src/textfield/textfield.ts third_party/cros-components/src/tooltip/tooltip.ts third_party/cros_system_api/dbus/bluetooth/dbus-constants.h @@ -8142,6 +8276,7 @@ third_party/devtools-frontend/src/front_end/integration_test_runner.html third_party/devtools-frontend/src/front_end/models/bindings/ResourceUtils.ts third_party/devtools-frontend/src/front_end/models/extensions/ExtensionServer.ts third_party/devtools-frontend/src/front_end/models/issues_manager/ContentSecurityPolicyIssue.ts +third_party/devtools-frontend/src/front_end/models/issues_manager/CookieDeprecationMetadataIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/CookieIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/CorsIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/DeprecationIssue.ts @@ -8175,9 +8310,9 @@ third_party/devtools-frontend/src/front_end/panels/css_overview/components/CSSOv third_party/devtools-frontend/src/front_end/panels/elements/CSSRuleValidator.ts third_party/devtools-frontend/src/front_end/panels/emulation/DeviceModeToolbar.ts third_party/devtools-frontend/src/front_end/panels/emulation/emulation-meta.ts -third_party/devtools-frontend/src/front_end/panels/explain/ExplainPopover.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedCookiesView.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedDirectivesView.ts +third_party/devtools-frontend/src/front_end/panels/issues/AffectedMetadataAllowedSitesView.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedTrackingSitesView.ts third_party/devtools-frontend/src/front_end/panels/lighthouse/LighthouseController.ts third_party/devtools-frontend/src/front_end/panels/network/NetworkConfigView.ts @@ -8220,6 +8355,36 @@ third_party/devtools-frontend/src/front_end/third_party/codemirror/package/mode/ third_party/devtools-frontend/src/front_end/third_party/codemirror/package/package.json third_party/devtools-frontend/src/front_end/third_party/codemirror/package/src/measurement/position_measurement.js third_party/devtools-frontend/src/front_end/third_party/codemirror/package/theme/mdn-like.css +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/allowlist_bypasses/angular.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/allowlist_bypasses/flash.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/allowlist_bypasses/json/angular.json +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/allowlist_bypasses/json/flash.json +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/allowlist_bypasses/json/jsonp.json +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/allowlist_bypasses/jsonp.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/checks/parser_checks.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/checks/parser_checks_test.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/checks/security_checks.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/checks/security_checks_test.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/checks/strictcsp_checks.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/checks/strictcsp_checks_test.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/csp.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/csp_test.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/dist/allowlist_bypasses/angular.js +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/dist/allowlist_bypasses/flash.js +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/dist/allowlist_bypasses/jsonp.js +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/dist/checks/security_checks_test.js +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/dist/lighthouse/lighthouse_checks_test.js +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/dist/utils_test.js +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/evaluator.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/evaluator_test.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/finding.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/finding_test.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/lighthouse/lighthouse_checks_test.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/package.json +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/parser.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/parser_test.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/utils.ts +third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/utils_test.ts third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/package.json third_party/devtools-frontend/src/front_end/third_party/lighthouse/lighthouse-dt-bundle.js third_party/devtools-frontend/src/front_end/third_party/lighthouse/locales/ar-XB.json @@ -8358,7 +8523,6 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/ap third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/api/Target.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/cdp/FirefoxTargetManager.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/cdp/Input.ts -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/cdp/NetworkManager.test.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/cdp/PredefinedNetworkConditions.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/cdp/Tracing.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/cdp/WebWorker.ts @@ -8387,11 +8551,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/generator/node_modules/source-map/dist/source-map.debug.js -third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/dist/source-map.js -third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/lib/base64-vlq.js -third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/lib/source-map-consumer.js -third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/package.json third_party/devtools-frontend/src/node_modules/@babel/runtime/package.json third_party/devtools-frontend/src/node_modules/@colors/colors/lib/colors.js third_party/devtools-frontend/src/node_modules/@colors/colors/lib/styles.js @@ -8516,6 +8675,7 @@ third_party/devtools-frontend/src/node_modules/chai/lib/chai/utils/isNaN.js third_party/devtools-frontend/src/node_modules/chai/package.json third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/domains/input/ActionDispatcher.js third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/domains/input/InputSource.js +third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/domains/network/networkRequest.js third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/utils/uuid.js third_party/devtools-frontend/src/node_modules/clone-regexp/index.d.ts third_party/devtools-frontend/src/node_modules/clone-regexp/package.json @@ -8968,7 +9128,6 @@ third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/Page.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/Target.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/FirefoxTargetManager.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/Input.ts -third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/NetworkManager.test.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/PredefinedNetworkConditions.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/Tracing.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/WebWorker.ts @@ -9205,6 +9364,7 @@ third_party/devtools-frontend/src/test/unittests/front_end/core/i18n/i18n_test.t third_party/devtools-frontend/src/test/unittests/front_end/core/platform/StringUtilities_test.ts third_party/devtools-frontend/src/test/unittests/front_end/core/root/Runtime_test.ts third_party/devtools-frontend/src/test/unittests/front_end/core/sdk/CookieModel_test.ts +third_party/devtools-frontend/src/test/unittests/front_end/models/extensions/ExtensionServer_test.ts third_party/devtools-frontend/src/test/unittests/front_end/models/extensions/HostUrlPattern_test.ts third_party/devtools-frontend/src/test/unittests/front_end/models/persistence/NetworkPersistenceManager_test.ts third_party/devtools-frontend/src/test/unittests/front_end/models/persistence/PersistenceImpl_test.ts @@ -9213,6 +9373,7 @@ third_party/devtools-frontend/src/test/unittests/front_end/models/trace/handlers third_party/devtools-frontend/src/test/unittests/front_end/models/trace/handlers/NetworkRequestsHandler_test.ts third_party/devtools-frontend/src/test/unittests/front_end/models/trace/helpers/Trace_test.ts third_party/devtools-frontend/src/test/unittests/front_end/panels/application/ReportingApiReportsView_test.ts +third_party/devtools-frontend/src/test/unittests/front_end/panels/console/ErrorStackParser_test.ts third_party/devtools-frontend/src/test/unittests/front_end/panels/elements/components/CSSPropertyDocsView_test.ts third_party/devtools-frontend/src/test/unittests/front_end/panels/network/components/RequestHeadersView_test.ts third_party/devtools-frontend/src/test/unittests/front_end/panels/settings/components/SyncSection_test.ts @@ -9930,6 +10091,7 @@ third_party/eigen3/src/unsupported/test/cxx11_tensor_move.cpp third_party/eigen3/src/unsupported/test/cxx11_tensor_notification.cpp third_party/eigen3/src/unsupported/test/cxx11_tensor_of_complex.cpp third_party/eigen3/src/unsupported/test/cxx11_tensor_of_const_values.cpp +third_party/eigen3/src/unsupported/test/cxx11_tensor_of_float16_sycl.cpp third_party/eigen3/src/unsupported/test/cxx11_tensor_of_strings.cpp third_party/eigen3/src/unsupported/test/cxx11_tensor_padding.cpp third_party/eigen3/src/unsupported/test/cxx11_tensor_padding_sycl.cpp @@ -10093,7 +10255,6 @@ third_party/ffmpeg/libavcodec/canopus.h third_party/ffmpeg/libavcodec/chomp_bsf.c third_party/ffmpeg/libavcodec/cook_parser.c third_party/ffmpeg/libavcodec/cpia.c -third_party/ffmpeg/libavcodec/dct.c third_party/ffmpeg/libavcodec/dct.h third_party/ffmpeg/libavcodec/dds.c third_party/ffmpeg/libavcodec/dirac.c @@ -10130,6 +10291,10 @@ third_party/ffmpeg/libavcodec/jpeg2000dsp.h third_party/ffmpeg/libavcodec/jpeg2000dwt.c third_party/ffmpeg/libavcodec/jpeg2000htdec.c third_party/ffmpeg/libavcodec/jpeg2000htdec.h +third_party/ffmpeg/libavcodec/jpegxl.h +third_party/ffmpeg/libavcodec/jpegxl_parse.c +third_party/ffmpeg/libavcodec/jpegxl_parse.h +third_party/ffmpeg/libavcodec/jpegxl_parser.c third_party/ffmpeg/libavcodec/lagarith.c third_party/ffmpeg/libavcodec/lagarithrac.c third_party/ffmpeg/libavcodec/lagarithrac.h @@ -10233,6 +10398,7 @@ third_party/ffmpeg/libavfilter/audio.c third_party/ffmpeg/libavfilter/audio.h third_party/ffmpeg/libavfilter/avf_showcqt.c third_party/ffmpeg/libavfilter/avf_showcqt.h +third_party/ffmpeg/libavfilter/bwdifdsp.c third_party/ffmpeg/libavfilter/colorspace.c third_party/ffmpeg/libavfilter/colorspace.h third_party/ffmpeg/libavfilter/colorspacedsp.c @@ -10292,8 +10458,7 @@ third_party/ffmpeg/libavformat/hevc.h third_party/ffmpeg/libavformat/hevcdec.c third_party/ffmpeg/libavformat/iff.c third_party/ffmpeg/libavformat/ivfdec.c -third_party/ffmpeg/libavformat/jpegxl_probe.c -third_party/ffmpeg/libavformat/jpegxl_probe.h +third_party/ffmpeg/libavformat/jpegxl_parse.c third_party/ffmpeg/libavformat/libsmbclient.c third_party/ffmpeg/libavformat/libssh.c third_party/ffmpeg/libavformat/matroskaenc.c @@ -11096,6 +11261,7 @@ third_party/libc++/src/src/print.cpp third_party/libc++/src/src/tz.cpp third_party/libc++/src/test/libcxx/containers/sequences/deque/asan_turning_off.pass.cpp third_party/libc++/src/test/libcxx/containers/sequences/vector/asan_turning_off.pass.cpp +third_party/libc++/src/utils/ci/BOT_OWNERS.txt third_party/libc++abi/src/CREDITS.TXT third_party/libdrm/src/android/gralloc_handle.h third_party/libdrm/src/etnaviv/etnaviv_bo.c @@ -11189,6 +11355,7 @@ third_party/libvpx/source/libvpx/tools/intersect-diffs.py third_party/libvpx/source/libvpx/tools/wrap-commit-msg.py third_party/libvpx/source/libvpx/vp9/encoder/vp9_block.h third_party/libvpx/source/libvpx/vpx_dsp/x86/convolve.h +third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c third_party/libvpx/source/libvpx/vpx_util/vpx_thread.c third_party/libvpx/source/libvpx/vpx_util/vpx_thread.h third_party/libwebp/src/Android.mk @@ -11374,22 +11541,22 @@ third_party/material_web_components/components-chromium/node_modules/@lit/reacti third_party/material_web_components/components-chromium/node_modules/@lit/reactive-element/decorators/query-async.d.ts third_party/material_web_components/components-chromium/node_modules/@lit/reactive-element/decorators/query.d.ts third_party/material_web_components/components-chromium/node_modules/@lit/reactive-element/reactive-element.d.ts -third_party/material_web_components/components-chromium/node_modules/@material/web/checkbox/lib/checkbox.d.ts -third_party/material_web_components/components-chromium/node_modules/@material/web/checkbox/lib/checkbox.js +third_party/material_web_components/components-chromium/node_modules/@material/web/checkbox/internal/checkbox.d.ts +third_party/material_web_components/components-chromium/node_modules/@material/web/checkbox/internal/checkbox.js +third_party/material_web_components/components-chromium/node_modules/@material/web/dialog/internal/dialog.d.ts +third_party/material_web_components/components-chromium/node_modules/@material/web/dialog/internal/dialog.js third_party/material_web_components/components-chromium/node_modules/@material/web/internal/controller/events.d.ts third_party/material_web_components/components-chromium/node_modules/@material/web/internal/controller/events.js -third_party/material_web_components/components-chromium/node_modules/@material/web/menu/lib/menu.d.ts -third_party/material_web_components/components-chromium/node_modules/@material/web/menu/lib/menu.js -third_party/material_web_components/components-chromium/node_modules/@material/web/switch/lib/switch.d.ts -third_party/material_web_components/components-chromium/node_modules/@material/web/switch/lib/switch.js -third_party/material_web_components/components-chromium/node_modules/@material/web/textfield/lib/text-field.d.ts -third_party/material_web_components/components-chromium/node_modules/@material/web/textfield/lib/text-field.js +third_party/material_web_components/components-chromium/node_modules/@material/web/menu/internal/menu.d.ts +third_party/material_web_components/components-chromium/node_modules/@material/web/menu/internal/menu.js +third_party/material_web_components/components-chromium/node_modules/@material/web/select/internal/select.d.ts +third_party/material_web_components/components-chromium/node_modules/@material/web/select/internal/select.js +third_party/material_web_components/components-chromium/node_modules/@material/web/switch/internal/switch.d.ts +third_party/material_web_components/components-chromium/node_modules/@material/web/switch/internal/switch.js +third_party/material_web_components/components-chromium/node_modules/@material/web/textfield/internal/text-field.d.ts +third_party/material_web_components/components-chromium/node_modules/@material/web/textfield/internal/text-field.js third_party/material_web_components/components-chromium/node_modules/lit-html/directives/async-append.d.ts third_party/material_web_components/components-chromium/node_modules/lit-html/directives/async-replace.d.ts -third_party/material_web_components/components-chromium/node_modules/safevalues/builders/html_sanitizer/sanitizer_table/sanitizer_table.d.ts -third_party/material_web_components/components-chromium/node_modules/safevalues/builders/html_sanitizer/sanitizer_table/sanitizer_table.js -third_party/material_web_components/components-chromium/node_modules/safevalues/dom/globals/url.js -third_party/material_web_components/components-chromium/node_modules/safevalues/package.json third_party/material_web_components/package.json third_party/mediapipe/src/mediapipe/calculators/core/bypass_calculator.cc third_party/mediapipe/src/mediapipe/calculators/image/opencv_image_encoder_calculator.cc @@ -11409,7 +11576,6 @@ 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/mocha/mocha.js 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 @@ -11482,14 +11648,6 @@ third_party/node/node_modules/@types/dom-speech-recognition/index.d.ts third_party/node/node_modules/@types/dom-webcodecs/index.d.ts third_party/node/node_modules/@types/google.analytics/index.d.ts third_party/node/node_modules/@types/offscreencanvas/index.d.ts -third_party/node/node_modules/@typescript-eslint/utils/node_modules/eslint-scope/lib/definition.js -third_party/node/node_modules/@typescript-eslint/utils/node_modules/eslint-scope/lib/index.js -third_party/node/node_modules/@typescript-eslint/utils/node_modules/eslint-scope/lib/pattern-visitor.js -third_party/node/node_modules/@typescript-eslint/utils/node_modules/eslint-scope/lib/reference.js -third_party/node/node_modules/@typescript-eslint/utils/node_modules/eslint-scope/lib/referencer.js -third_party/node/node_modules/@typescript-eslint/utils/node_modules/eslint-scope/lib/scope-manager.js -third_party/node/node_modules/@typescript-eslint/utils/node_modules/eslint-scope/lib/scope.js -third_party/node/node_modules/@typescript-eslint/utils/node_modules/eslint-scope/lib/variable.js third_party/node/node_modules/acorn/dist/acorn.js third_party/node/node_modules/acorn/package.json third_party/node/node_modules/ajv/dist/ajv.bundle.js @@ -11497,7 +11655,10 @@ third_party/node/node_modules/ansi-regex/package.json third_party/node/node_modules/ansi-styles/package.json third_party/node/node_modules/array-union/package.json third_party/node/node_modules/babel-eslint/package.json +third_party/node/node_modules/builtin-modules/package.json third_party/node/node_modules/callsites/package.json +third_party/node/node_modules/chai/chai.js +third_party/node/node_modules/chai/package.json third_party/node/node_modules/clean-css/lib/options/compatibility.js third_party/node/node_modules/clean-css/node_modules/source-map/dist/source-map.js third_party/node/node_modules/clean-css/node_modules/source-map/lib/base64-vlq.js @@ -11533,6 +11694,7 @@ third_party/node/node_modules/doctrine/package.json third_party/node/node_modules/domutils/lib/esm/stringify.js third_party/node/node_modules/domutils/lib/stringify.js third_party/node/node_modules/escape-string-regexp/package.json +third_party/node/node_modules/eslint-plugin-jsdoc/dist/tagNames.js third_party/node/node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp/package.json third_party/node/node_modules/eslint-scope/lib/definition.js third_party/node/node_modules/eslint-scope/lib/index.js @@ -11596,6 +11758,7 @@ third_party/node/node_modules/import-fresh/package.json third_party/node/node_modules/imurmurhash/imurmurhash.js third_party/node/node_modules/imurmurhash/imurmurhash.min.js third_party/node/node_modules/imurmurhash/package.json +third_party/node/node_modules/is-builtin-module/package.json third_party/node/node_modules/is-path-inside/package.json third_party/node/node_modules/js-yaml/package.json third_party/node/node_modules/locate-path/package.json @@ -11609,6 +11772,7 @@ third_party/node/node_modules/mdn-data/css/selectors.schema.json third_party/node/node_modules/mdn-data/css/types.json third_party/node/node_modules/mdn-data/css/types.schema.json third_party/node/node_modules/mdn-data/package.json +third_party/node/node_modules/mocha/mocha.js third_party/node/node_modules/p-limit/package.json third_party/node/node_modules/p-locate/package.json third_party/node/node_modules/parent-module/package.json @@ -11673,10 +11837,14 @@ third_party/node/node_modules/terser/lib/utils/index.js third_party/node/node_modules/terser/package.json third_party/node/node_modules/to-fast-properties/package.json third_party/node/node_modules/type-fest/package.json +third_party/node/node_modules/typescript/lib/lib.dom.d.ts +third_party/node/node_modules/typescript/lib/lib.dom.iterable.d.ts third_party/node/node_modules/typescript/lib/lib.es2020.bigint.d.ts third_party/node/node_modules/typescript/lib/lib.es2020.intl.d.ts third_party/node/node_modules/typescript/lib/lib.es2021.intl.d.ts third_party/node/node_modules/typescript/lib/lib.es2022.intl.d.ts +third_party/node/node_modules/typescript/lib/lib.webworker.d.ts +third_party/node/node_modules/typescript/lib/lib.webworker.iterable.d.ts third_party/node/node_modules/typescript/lib/tsc.js third_party/node/node_modules/typescript/lib/tsserver.js third_party/node/node_modules/typescript/lib/typescript.js @@ -12252,7 +12420,6 @@ third_party/ots/src/src/vdmx.cc third_party/ots/src/src/vhea.cc third_party/ots/src/src/vorg.cc third_party/pdfium/PRESUBMIT.py -third_party/pdfium/build_overrides/BUILDCONFIG.gn third_party/pdfium/core/fpdfapi/cmaps/fpdf_cmaps.cpp third_party/pdfium/core/fpdfapi/edit/cpdf_contentstream_write_utils.cpp third_party/pdfium/core/fpdftext/cpdf_linkextract_unittest.cpp @@ -12338,9 +12505,11 @@ third_party/perfetto/src/trace_processor/importers/ftrace/thread_state_tracker.c third_party/perfetto/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.h third_party/perfetto/src/trace_processor/importers/fuchsia/fuchsia_trace_utils.h third_party/perfetto/src/trace_processor/importers/ninja/ninja_log_parser.cc +third_party/perfetto/src/trace_processor/importers/proto/heap_graph_tracker_unittest.cc third_party/perfetto/src/trace_processor/importers/proto/system_probes_parser.cc third_party/perfetto/src/trace_processor/metrics/sql/android/unsymbolized_frames.sql third_party/perfetto/src/trace_processor/metrics/sql/chrome/rail_modes.sql +third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/chrome/page_loads.sql third_party/perfetto/src/traceconv/trace_to_hprof.cc third_party/perfetto/src/traced/probes/android_log/android_log_data_source.cc third_party/perfetto/test/cts/AndroidTest.xml @@ -13230,9 +13399,6 @@ third_party/skia/gm/stringart.cpp third_party/skia/gm/strokerect.cpp third_party/skia/gm/strokes.cpp third_party/skia/gm/stroketext.cpp -third_party/skia/gm/surface_manager/RasterSurfaceManager.cpp -third_party/skia/gm/surface_manager/SurfaceManager.cpp -third_party/skia/gm/vias/SimpleVias.cpp third_party/skia/gn/gn_to_bp.py third_party/skia/gn/skia/BUILD.gn third_party/skia/include/ports/SkImageGeneratorWIC.h @@ -13347,8 +13513,10 @@ third_party/skia/src/gpu/ganesh/effects/GrDisableColorXP.cpp third_party/skia/src/gpu/ganesh/gl/GrGLCaps.cpp third_party/skia/src/gpu/ganesh/gl/GrGLCaps.h third_party/skia/src/gpu/ganesh/gl/GrGLGpu.cpp +third_party/skia/src/gpu/ganesh/vk/GrVkCaps.cpp third_party/skia/src/gpu/graphite/dawn/DawnCommandBuffer.cpp third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.cpp +third_party/skia/src/gpu/graphite/render/PerEdgeAAQuadRenderStep.cpp third_party/skia/src/gpu/tessellate/Tessellation.cpp third_party/skia/src/opts/SkRasterPipeline_opts.h third_party/skia/src/pathops/SkOpAngle.cpp @@ -13423,6 +13591,13 @@ third_party/skia/tools/skpbench/_hardware_pixel_c.py third_party/skia/tools/skpbench/sheet.py third_party/skia/tools/skqp/src/skqp.cpp third_party/skia/tools/skqp/src/skqp_GpuTestProcs.cpp +third_party/skia/tools/testrunners/benchmark/BazelBenchmarkTestRunner.cpp +third_party/skia/tools/testrunners/benchmark/target/BenchmarkTarget.h +third_party/skia/tools/testrunners/benchmark/target/GaneshBenchmarkTarget.cpp +third_party/skia/tools/testrunners/benchmark/target/RasterBenchmarkTarget.cpp +third_party/skia/tools/testrunners/common/surface_manager/RasterSurfaceManager.cpp +third_party/skia/tools/testrunners/common/surface_manager/SurfaceManager.cpp +third_party/skia/tools/testrunners/gm/vias/SimpleVias.cpp third_party/skia/tools/viewer/ClockSlide.cpp third_party/skia/tools/viewer/PathSlide.cpp third_party/skia/tools/viewer/StringArtSlide.cpp @@ -13472,6 +13647,7 @@ third_party/sqlite/src/amalgamation/shell/shell.c third_party/sqlite/src/amalgamation/sqlite3.c third_party/sqlite/src/amalgamation_dev/shell/shell.c third_party/sqlite/src/amalgamation_dev/sqlite3.c +third_party/sqlite/src/ext/jni/src/c/sqlite3-jni.c third_party/sqlite/src/ext/misc/zipfile.c third_party/sqlite/src/ext/wasm/api/sqlite3-opfs-async-proxy.js third_party/sqlite/src/ext/wasm/api/sqlite3-worker1-promiser.c-pp.js @@ -13677,8 +13853,10 @@ third_party/tflite/src/third_party/xla/third_party/tsl/tsl/platform/windows/env. third_party/tflite/src/third_party/xla/third_party/tsl/tsl/platform/windows/stacktrace.cc third_party/tflite/src/third_party/xla/third_party/tsl/tsl/platform/windows/stacktrace_handler.cc third_party/tflite/src/third_party/xla/xla/mlir_hlo/mhlo/transforms/chlo_legalize_to_hlo/chlo_legalize_to_hlo.cc +third_party/tflite/src/third_party/xla/xla/pjrt/pjrt_api.cc third_party/tflite/src/third_party/xla/xla/service/gpu/fusions/transpose.h third_party/tflite/src/third_party/xla/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc +third_party/tflite/src/third_party/xla/xla/service/gpu/runtime/custom_call_registry.h third_party/tflite/src/third_party/xla/xla/service/hlo_graph_dumper.cc third_party/tflite/src/third_party/xla/xla/service/hlo_verifier.cc third_party/tflite_support/src/tensorflow_lite_support/c/task/processor/category.h @@ -13709,11 +13887,13 @@ third_party/vulkan-deps/vulkan-loader/src/loader/log.c third_party/vulkan-deps/vulkan-loader/src/loader/log.h third_party/vulkan-deps/vulkan-loader/src/loader/stack_allocation.h third_party/vulkan-deps/vulkan-loader/src/loader/wsi.c +third_party/vulkan-deps/vulkan-loader/src/scripts/gn/gn.py third_party/vulkan-deps/vulkan-loader/src/scripts/helper_file_generator.py -third_party/vulkan-deps/vulkan-tools/src/cmake/Copyright_cmake.txt third_party/vulkan-deps/vulkan-tools/src/cube/cube.c third_party/vulkan-deps/vulkan-tools/src/cube/gettime.h third_party/vulkan-deps/vulkan-tools/src/icd/generated/vk_typemap_helper.h +third_party/vulkan-deps/vulkan-tools/src/scripts/android.py +third_party/vulkan-deps/vulkan-tools/src/scripts/gn/gn.py third_party/vulkan-deps/vulkan-tools/src/scripts/mock_icd_generator.py third_party/vulkan-deps/vulkan-tools/src/scripts/vulkan_tools_helper_file_generator.py third_party/vulkan-deps/vulkan-tools/src/windows-runtime-installer/VulkanRT-License.txt @@ -14321,7 +14501,6 @@ third_party/wpt_tools/wpt/websockets/handlers/send-backpressure_wsh.py 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/generate_build_gn.py third_party/xnnpack/src/CMakeLists.txt third_party/zlib/deflate.c third_party/zlib/google/compression_utils_portable.cc @@ -14682,6 +14861,7 @@ tools/metrics/histograms/metadata/sb_client/histograms.xml tools/metrics/histograms/metadata/scanning/histograms.xml tools/metrics/histograms/metadata/scheduler/histograms.xml tools/metrics/histograms/metadata/search/histograms.xml +tools/metrics/histograms/metadata/security/enums.xml tools/metrics/histograms/metadata/security/histograms.xml tools/metrics/histograms/metadata/segmentation_platform/histograms.xml tools/metrics/histograms/metadata/service/histograms.xml @@ -14707,6 +14887,7 @@ tools/metrics/histograms/metadata/uma/enums.xml tools/metrics/histograms/metadata/uma/histograms.xml tools/metrics/histograms/metadata/update_engine/histograms.xml tools/metrics/histograms/metadata/v8/histograms.xml +tools/metrics/histograms/metadata/variations/enums.xml tools/metrics/histograms/metadata/variations/histograms.xml tools/metrics/histograms/metadata/views/histograms.xml tools/metrics/histograms/metadata/virtualization/histograms.xml @@ -14721,6 +14902,7 @@ tools/metrics/histograms/metadata/xr/histograms.xml tools/metrics/histograms/name_expansion_metadata.py tools/metrics/histograms/populate_enums.py tools/metrics/histograms/pretty_print_test.py +tools/metrics/histograms/split_enums.py tools/metrics/histograms/split_xml.py tools/metrics/histograms/test_data/components/histograms.xml tools/metrics/histograms/test_data/histograms.xml @@ -15109,6 +15291,7 @@ ui/base/win/event_creation_utils.cc ui/base/win/win_cursor.cc ui/chromeos/file_manager_strings.grdp ui/color/PRESUBMIT.py +ui/color/color_provider_key.h ui/display/display_switches.cc ui/display/display_transform.cc ui/display/mac/display_link_mac.cc @@ -15135,8 +15318,7 @@ ui/file_manager/file_manager/background/js/volume_manager_unittest.js ui/file_manager/file_manager/common/js/files_app_entry_types.js ui/file_manager/file_manager/common/js/mock_chrome.js ui/file_manager/file_manager/common/js/trash.ts -ui/file_manager/file_manager/common/js/util.js -ui/file_manager/file_manager/externs/volume_info.js +ui/file_manager/file_manager/externs/volume_info.d.ts ui/file_manager/file_manager/foreground/elements/icons.html ui/file_manager/file_manager/foreground/js/file_manager_commands.js ui/file_manager/file_manager/foreground/js/file_transfer_controller.ts @@ -15156,10 +15338,11 @@ ui/gfx/color_analysis.h ui/gfx/color_transform.cc ui/gfx/font.h ui/gfx/font_fallback_win.h -ui/gfx/font_names_testing.cc +ui/gfx/font_names_testing.h ui/gfx/geometry/matrix44.cc ui/gfx/icon_util.cc ui/gfx/icon_util.h +ui/gfx/linux/gbm_util.h ui/gfx/render_text.cc ui/gfx/render_text_unittest.cc ui/gfx/text_elider_unittest.cc @@ -15189,6 +15372,7 @@ ui/resources/PRESUBMIT.py ui/resources/README.txt ui/resources/resource_check/ico_files.py ui/resources/resource_check/resource_scale_factors.py +ui/shell_dialogs/auto_close_dialog_event_handler_win.cc ui/shell_dialogs/select_file_dialog.h ui/shell_dialogs/selected_file_info.h ui/strings/ui_strings.grd diff --git a/patches/core/bromite/disable-fetching-field-trials.patch b/patches/core/bromite/disable-fetching-field-trials.patch index c2e38d5e..7fa6ef61 100644 --- a/patches/core/bromite/disable-fetching-field-trials.patch +++ b/patches/core/bromite/disable-fetching-field-trials.patch @@ -51,7 +51,7 @@ Subject: Disable fetching of all field trials /** --- a/components/variations/service/variations_service.cc +++ b/components/variations/service/variations_service.cc -@@ -220,17 +220,7 @@ bool GetInstanceManipulations(const net: +@@ -221,17 +221,7 @@ bool GetInstanceManipulations(const net: // Variations seed fetching is only enabled in official Chrome builds, if a URL // is specified on the command line, and for testing. bool IsFetchingEnabled() { diff --git a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch index 825386a9..5196e96c 100644 --- a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch +++ b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2359,7 +2359,6 @@ static_library("browser") { +@@ -2388,7 +2388,6 @@ static_library("browser") { "//components/reporting/util:task_runner_context", "//components/resources", "//components/safe_browsing/content/browser", @@ -8,7 +8,7 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", -@@ -3776,8 +3775,6 @@ static_library("browser") { +@@ -3809,8 +3808,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -30,7 +30,7 @@ namespace subresource_filter { class RulesetService; } -@@ -215,9 +211,6 @@ class BrowserProcess { +@@ -219,9 +215,6 @@ class BrowserProcess { // on this platform (or this is a unit test). virtual StatusTray* status_tray() = 0; @@ -42,7 +42,7 @@ virtual subresource_filter::RulesetService* --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -72,7 +72,6 @@ +@@ -71,7 +71,6 @@ #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h" @@ -50,7 +50,7 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/site_isolation/prefs_observer.h" #include "chrome/browser/ssl/secure_origin_prefs_observer.h" -@@ -437,8 +436,6 @@ void BrowserProcessImpl::StartTearDown() +@@ -436,8 +435,6 @@ void BrowserProcessImpl::StartTearDown() #endif metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -59,7 +59,7 @@ network_time_tracker_.reset(); #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1080,14 +1077,6 @@ StatusTray* BrowserProcessImpl::status_t +@@ -1084,14 +1081,6 @@ StatusTray* BrowserProcessImpl::status_t return status_tray_.get(); } @@ -74,7 +74,7 @@ subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1321,26 +1310,6 @@ void BrowserProcessImpl::CreateBackgroun +@@ -1336,26 +1325,6 @@ void BrowserProcessImpl::CreateBackgroun #endif } @@ -103,7 +103,7 @@ created_subresource_filter_ruleset_service_ = true; --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -191,7 +191,6 @@ class BrowserProcessImpl : public Browse +@@ -195,7 +195,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr manager) override; #endif StatusTray* status_tray() override; @@ -111,7 +111,7 @@ subresource_filter::RulesetService* subresource_filter_ruleset_service() override; -@@ -349,9 +348,6 @@ class BrowserProcessImpl : public Browse +@@ -355,9 +354,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr background_mode_manager_; #endif @@ -123,7 +123,7 @@ subresource_filter_ruleset_service_; --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -67,7 +67,6 @@ +@@ -66,7 +66,6 @@ #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h" #include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h" #include "chrome/browser/profiles/profile.h" @@ -131,7 +131,7 @@ #include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/share/share_history.h" -@@ -628,10 +627,6 @@ void ChromeBrowsingDataRemoverDelegate:: +@@ -627,10 +626,6 @@ void ChromeBrowsingDataRemoverDelegate:: base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -144,7 +144,7 @@ browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_, --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1070,34 +1070,6 @@ void SetApplicationLocaleOnIOThread(cons +@@ -1063,34 +1063,6 @@ void SetApplicationLocaleOnIOThread(cons GetIOThreadApplicationLocale() = locale; } @@ -179,7 +179,7 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) AppLoadedInTabSource ClassifyAppLoadedInTabSource( -@@ -5168,14 +5140,9 @@ ChromeContentBrowserClient::CreateThrott +@@ -5201,14 +5173,9 @@ ChromeContentBrowserClient::CreateThrott throttles.push_back(std::make_unique( handle, handle->GetWebContents()->GetBrowserContext())); @@ -195,7 +195,7 @@ base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp), base::BindOnce( &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps))); -@@ -5221,16 +5188,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -5254,16 +5221,6 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -212,7 +212,7 @@ if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) { throttles.push_back( std::make_unique( -@@ -5504,8 +5461,6 @@ void ChromeContentBrowserClient::Overrid +@@ -5542,8 +5499,6 @@ void ChromeContentBrowserClient::Overrid void ChromeContentBrowserClient::InitOnUIThread() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -260,7 +260,7 @@ if (download_manager_) { download_manager_->AddObserver(this); } -@@ -871,17 +864,6 @@ void ChromeDownloadManagerDelegate::Choo +@@ -875,17 +868,6 @@ void ChromeDownloadManagerDelegate::Choo void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( base::FilePath* filename, const GURL& source_url) { @@ -298,7 +298,7 @@ is_being_revived_(false) {} #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -530,13 +530,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -534,13 +534,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -315,7 +315,7 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -716,9 +716,6 @@ bool DownloadItemModel::IsCommandEnabled +@@ -717,9 +717,6 @@ bool DownloadItemModel::IsCommandEnabled // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -343,7 +343,7 @@ } } -@@ -460,10 +453,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c +@@ -449,10 +442,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension( const base::FilePath& file_name) { base::FilePath::StringType extension = file_name.Extension(); @@ -370,7 +370,7 @@ // If no mime type or explicitly specified a name, don't replace file // extension. if (sniffed_mime_type.empty() || !suggested_filename.empty()) -@@ -1274,30 +1267,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1272,30 +1265,7 @@ DownloadFileType::DangerLevel DownloadTa download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; @@ -412,7 +412,7 @@ #include "chrome/browser/download/download_file_icon_extractor.h" #include "chrome/browser/download/download_open_prompt.h" #include "chrome/browser/download/download_prefs.h" -@@ -1364,9 +1363,6 @@ DownloadsAcceptDangerFunction::Downloads +@@ -1368,9 +1367,6 @@ DownloadsAcceptDangerFunction::Downloads DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} @@ -422,7 +422,7 @@ ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() { absl::optional params = downloads::AcceptDanger::Params::Create(args()); -@@ -1404,42 +1400,7 @@ void DownloadsAcceptDangerFunction::Prom +@@ -1408,42 +1404,7 @@ void DownloadsAcceptDangerFunction::Prom return; } RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); @@ -705,7 +705,7 @@ #include "chrome/browser/sessions/exit_type_service.h" #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" -@@ -641,17 +640,6 @@ void ProfileImpl::LoadPrefsForNormalStar +@@ -646,17 +645,6 @@ void ProfileImpl::LoadPrefsForNormalStar mojo::PendingRemote pref_validation_delegate; @@ -753,7 +753,7 @@ if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode -@@ -494,6 +496,7 @@ static_library("advanced_protection") { +@@ -495,6 +497,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -761,7 +761,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -513,6 +516,7 @@ source_set("metrics_collector") { +@@ -514,6 +517,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -866,7 +866,7 @@ --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -4952,7 +4952,6 @@ static_library("ui") { +@@ -5032,7 +5032,6 @@ static_library("ui") { "views/download/bubble/download_dialog_view.h", "views/download/bubble/download_toolbar_button_view.cc", "views/download/bubble/download_toolbar_button_view.h", @@ -876,7 +876,7 @@ "views/download/download_item_view.cc", --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -454,22 +454,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -471,22 +471,6 @@ void TabHelpers::AttachTabHelpers(WebCon // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); diff --git a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch index 0017c7ab..68adc81d 100644 --- a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch +++ b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch @@ -1,6 +1,6 @@ --- a/components/autofill/core/browser/autofill_download_manager.cc +++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -769,95 +769,6 @@ std::tuple AutofillDo +@@ -758,95 +758,6 @@ std::tuple AutofillDo } bool AutofillDownloadManager::StartRequest(FormRequestData request_data) { diff --git a/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch b/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch index 70cb2f99..4f4b0f06 100644 --- a/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch +++ b/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch @@ -1,6 +1,6 @@ --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -158,10 +158,10 @@ const unsigned kMinimumTTLSeconds = kCac +@@ -159,10 +159,10 @@ const unsigned kMinimumTTLSeconds = kCac // cached. const int kIPv6ProbePeriodMs = 1000; diff --git a/patches/core/inox-patchset/0021-disable-rlz.patch b/patches/core/inox-patchset/0021-disable-rlz.patch index db468304..3a0cb2c6 100644 --- a/patches/core/inox-patchset/0021-disable-rlz.patch +++ b/patches/core/inox-patchset/0021-disable-rlz.patch @@ -2,7 +2,7 @@ --- a/BUILD.gn +++ b/BUILD.gn -@@ -449,14 +449,6 @@ group("gn_all") { +@@ -447,14 +447,6 @@ group("gn_all") { deps += [ "//chromeos:chromeos_unittests" ] } diff --git a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index 4bd55221..2bfea212 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 @@ -68,7 +68,7 @@ by default. --- a/build/apple/tweak_info_plist.py +++ b/build/apple/tweak_info_plist.py -@@ -194,7 +194,7 @@ def _AddKeystoneKeys(plist, bundle_ident +@@ -212,7 +212,7 @@ def _AddKeystoneKeys(plist, bundle_ident also requires the |bundle_identifier| argument (com.example.product).""" plist['KSVersion'] = plist['CFBundleShortVersionString'] plist['KSProductID'] = bundle_identifier @@ -77,17 +77,17 @@ by default. _RemoveKeys(plist, 'KSChannelID') if base_tag != '': ---- a/chrome/browser/ash/customization/customization_document.cc -+++ b/chrome/browser/ash/customization/customization_document.cc -@@ -202,7 +202,7 @@ std::string ReadFileInBackground(const b +--- a/chrome/browser/ash/customization/customization_document.h ++++ b/chrome/browser/ash/customization/customization_document.h +@@ -155,7 +155,7 @@ class ServicesCustomizationDocument : pu - // Template URL where to fetch OEM services customization manifest from. - const char ServicesCustomizationDocument::kManifestUrl[] = -- "https://ssl.gstatic.com/chrome/chromeos-customization/%s.json"; -+ "trk:151:https://ssl.gstatic.com/chrome/chromeos-customization/%s.json"; + // Template URL where to fetch OEM services customization manifest from. + static constexpr char kManifestUrl[] = +- "https://ssl.gstatic.com/chrome/chromeos-customization/%s.json"; ++ "trk:151:https://ssl.gstatic.com/chrome/chromeos-customization/%s.json"; - // A custom extensions::ExternalLoader that the ServicesCustomizationDocument - // creates and uses to publish OEM default apps to the extensions system. + // Return true if the customization was applied. Customization is applied only + // once per machine. --- a/chrome/browser/extensions/install_signer.cc +++ b/chrome/browser/extensions/install_signer.cc @@ -63,7 +63,7 @@ const int kSignatureFormatVersion = 2; @@ -112,7 +112,7 @@ by default. scoped_refptr task_runner) --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -499,7 +499,7 @@ void WebRtcLogUploader::UploadCompressed +@@ -500,7 +500,7 @@ void WebRtcLogUploader::UploadCompressed } })"); @@ -315,7 +315,7 @@ by default. "https://history.google.com/history/api/lookup?client=audio"; --- a/components/safe_browsing/content/browser/client_side_detection_service.cc +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc -@@ -71,7 +71,7 @@ const int ClientSideDetectionService::kN +@@ -69,7 +69,7 @@ const int ClientSideDetectionService::kN const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30; const char ClientSideDetectionService::kClientReportPhishingUrl[] = 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 234307e0..aa87ef3e 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 -@@ -239,6 +239,10 @@ void ClientSideDetectionService::StartCl +@@ -241,6 +241,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); -@@ -325,6 +329,7 @@ void ClientSideDetectionService::StartCl +@@ -327,6 +331,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-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index ecb2c513..bc9bb1bc 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -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 -@@ -1040,6 +1040,8 @@ component("net") { +@@ -1042,6 +1042,8 @@ component("net") { "url_request/report_sender.h", "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index f718890d..57949bc2 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 -@@ -2596,7 +2596,8 @@ void ChromeContentBrowserClient::AppendE +@@ -2594,7 +2594,8 @@ void ChromeContentBrowserClient::AppendE command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -43,7 +43,7 @@ const char* process_type) { --- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc +++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc -@@ -747,8 +747,6 @@ void CrashpadClient::CrashWithoutDump(co +@@ -748,8 +748,6 @@ void CrashpadClient::CrashWithoutDump(co // static void CrashpadClient::SetFirstChanceExceptionHandler( FirstChanceHandler handler) { diff --git a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch index 94c20a8d..c5560800 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 -@@ -301,7 +301,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 0230a245..dffeb7ad 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -510,7 +510,7 @@ bool IsGoogleHostname(const GURL& url) { --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -561,11 +561,7 @@ std::u16string TemplateURLRef::SearchTer +@@ -562,11 +562,7 @@ std::u16string TemplateURLRef::SearchTer bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index 3541397c..98075bfa 100644 --- a/patches/core/ungoogled-chromium/disable-mei-preload.patch +++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch @@ -7,7 +7,7 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -382,7 +382,6 @@ if (!is_android && !is_mac) { +@@ -384,7 +384,6 @@ if (!is_android && !is_mac) { } data_deps += [ @@ -15,11 +15,11 @@ "//third_party/widevine/cdm", ] if (invoker.collect_inputs_only) { -@@ -1248,7 +1247,6 @@ if (is_win) { +@@ -1258,7 +1257,6 @@ if (is_win) { ":optimization_guide_library", ":swiftshader_library", ":widevine_cdm_library", - "//chrome/browser/resources/media/mei_preload:component_bundle", ] - if (is_chrome_branded) { + if (enable_ml_internal) { diff --git a/patches/core/ungoogled-chromium/disable-network-time-tracker.patch b/patches/core/ungoogled-chromium/disable-network-time-tracker.patch index dd3f0b3c..39f889c4 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 -@@ -289,7 +289,7 @@ void NetworkTimeTracker::UpdateNetworkTi +@@ -294,7 +294,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 dbca1350..51c80cfd 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -7,8 +7,8 @@ - base::FEATURE_ENABLED_BY_DEFAULT); + base::FEATURE_DISABLED_BY_DEFAULT); - BASE_FEATURE(kAttributionReportingNullAggregatableReports, - "AttributionReportingNullAggregatableReports", + BASE_FEATURE(kAttributionReportingTriggerConfig, + "AttributionReportingTriggerConfig", --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc +++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc @@ -12,7 +12,7 @@ namespace privacy_sandbox { @@ -22,7 +22,7 @@ registry->RegisterBooleanPref(prefs::kPrivacySandboxM1ConsentDecisionMade, --- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc +++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc -@@ -120,7 +120,7 @@ std::set GetTopi +@@ -121,7 +121,7 @@ std::set GetTopi // static bool PrivacySandboxSettingsImpl::IsAllowed(Status status) { @@ -31,7 +31,7 @@ } // static -@@ -728,20 +728,7 @@ bool PrivacySandboxSettingsImpl::IsPriva +@@ -753,20 +753,7 @@ bool PrivacySandboxSettingsImpl::IsPriva } bool PrivacySandboxSettingsImpl::IsPrivacySandboxEnabled() const { @@ -53,7 +53,7 @@ } void PrivacySandboxSettingsImpl::SetAllPrivacySandboxAllowedForTesting() { -@@ -766,11 +753,10 @@ void PrivacySandboxSettingsImpl::SetTopi +@@ -791,11 +778,10 @@ void PrivacySandboxSettingsImpl::SetTopi } void PrivacySandboxSettingsImpl::SetPrivacySandboxEnabled(bool enabled) { @@ -66,7 +66,7 @@ } bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const { -@@ -857,11 +843,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa +@@ -882,11 +868,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa return Status::kIncognitoProfile; } diff --git a/patches/core/ungoogled-chromium/disable-web-environment-integrity.patch b/patches/core/ungoogled-chromium/disable-web-environment-integrity.patch index 39578c8d..4b51dd6a 100644 --- a/patches/core/ungoogled-chromium/disable-web-environment-integrity.patch +++ b/patches/core/ungoogled-chromium/disable-web-environment-integrity.patch @@ -10,7 +10,7 @@ "//components/keyed_service/content", --- a/chrome/android/chrome_test_java_sources.gni +++ b/chrome/android/chrome_test_java_sources.gni -@@ -195,7 +195,6 @@ chrome_test_java_sources = [ +@@ -194,7 +194,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/download/OMADownloadHandlerTest.java", "javatests/src/org/chromium/chrome/browser/download/ServicificationDownloadTest.java", "javatests/src/org/chromium/chrome/browser/download/dialogs/DownloadDialogIncognitoTest.java", @@ -20,7 +20,7 @@ "javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTest.java", --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3511,7 +3511,6 @@ static_library("browser") { +@@ -3556,7 +3556,6 @@ static_library("browser") { "//components/embedder_support/android:util", "//components/embedder_support/android:web_contents_delegate", "//components/endpoint_fetcher:endpoint_fetcher", @@ -30,7 +30,7 @@ "//components/favicon/core:database", --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -597,7 +597,6 @@ test("components_unittests") { +@@ -601,7 +601,6 @@ test("components_unittests") { "//components/embedder_support/android:native_java_unittests_java", "//components/embedder_support/android/metrics:test_support_java", "//components/embedder_support/android/metrics:unit_tests", @@ -68,7 +68,7 @@ void AndroidEnvironmentIntegrityService::OnGetHandle( --- a/content/browser/browser_interface_binders.cc +++ b/content/browser/browser_interface_binders.cc -@@ -130,7 +130,6 @@ +@@ -129,7 +129,6 @@ #include "third_party/blink/public/mojom/cookie_store/cookie_store.mojom.h" #include "third_party/blink/public/mojom/credentialmanagement/credential_manager.mojom.h" #include "third_party/blink/public/mojom/device/device.mojom.h" @@ -76,7 +76,7 @@ #include "third_party/blink/public/mojom/feature_observer/feature_observer.mojom.h" #include "third_party/blink/public/mojom/file/file_utilities.mojom.h" #include "third_party/blink/public/mojom/file_system_access/file_system_access_manager.mojom.h" -@@ -1141,10 +1140,6 @@ void PopulateBinderMapWithContext( +@@ -1150,10 +1149,6 @@ void PopulateBinderMapWithContext( map->Add( base::BindRepeating(&BrowsingTopicsDocumentHost::CreateMojoService)); } @@ -84,9 +84,9 @@ - map->Add(base::BindRepeating( - &EmptyBinderForFrame)); - } - if (base::FeatureList::IsEnabled( - features::kCookieDeprecationFacilitatedTesting)) { - map->Add( + #if !BUILDFLAG(IS_ANDROID) + map->Add( + base::BindRepeating(&DirectSocketsServiceImpl::CreateForFrame)); --- a/third_party/blink/public/mojom/BUILD.gn +++ b/third_party/blink/public/mojom/BUILD.gn @@ -66,7 +66,6 @@ mojom("mojom_platform") { @@ -99,7 +99,7 @@ "fenced_frame/fenced_frame_config.mojom", --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -1921,8 +1921,6 @@ generated_interface_sources_in_modules = +@@ -1936,8 +1936,6 @@ generated_interface_sources_in_modules = "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_entry.h", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_entry_sync.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_entry_sync.h", @@ -121,7 +121,7 @@ "//third_party/blink/renderer/modules/eyedropper/color_selection_options.idl", --- a/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc +++ b/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc -@@ -550,10 +550,6 @@ bool OriginTrialContext::CanEnableTrialF +@@ -553,10 +553,6 @@ bool OriginTrialContext::CanEnableTrialF return base::FeatureList::IsEnabled(features::kComputePressure); } @@ -134,7 +134,7 @@ --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn -@@ -90,7 +90,6 @@ component("modules") { +@@ -91,7 +91,6 @@ component("modules") { "//third_party/blink/renderer/modules/donottrack", "//third_party/blink/renderer/modules/encoding", "//third_party/blink/renderer/modules/encryptedmedia", @@ -144,7 +144,7 @@ "//third_party/blink/renderer/modules/eyedropper", --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -4180,17 +4180,6 @@ +@@ -4290,17 +4290,6 @@ base_feature: "none", }, { diff --git a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch index da19a1ee..e8257976 100644 --- a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch +++ b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -128,30 +128,13 @@ void WebRtcLogUploader::OnLoggingStopped +@@ -128,31 +128,13 @@ void WebRtcLogUploader::OnLoggingStopped DCHECK(meta_data.get()); DCHECK(!upload_done_data.paths.directory.empty()); @@ -13,7 +13,8 @@ if (base::PathExists(upload_done_data.paths.directory)) { webrtc_logging::DeleteOldWebRtcLogFiles(upload_done_data.paths.directory); - -- local_log_id = base::NumberToString(base::Time::Now().ToDoubleT()); +- local_log_id = +- base::NumberToString(base::Time::Now().InSecondsFSinceUnixEpoch()); - base::FilePath log_file_path = - upload_done_data.paths.directory.AppendASCII(local_log_id) - .AddExtension(FILE_PATH_LITERAL(".gz")); @@ -34,7 +35,7 @@ } else { main_task_runner_->PostTask( FROM_HERE, -@@ -168,28 +151,7 @@ void WebRtcLogUploader::PrepareMultipart +@@ -169,28 +151,7 @@ void WebRtcLogUploader::PrepareMultipart DCHECK(!compressed_log.empty()); DCHECK(meta_data.get()); @@ -64,7 +65,7 @@ } void WebRtcLogUploader::UploadStoredLog( -@@ -255,50 +217,6 @@ void WebRtcLogUploader::LoggingStoppedDo +@@ -256,50 +217,6 @@ void WebRtcLogUploader::LoggingStoppedDo DCHECK(log_buffer.get()); DCHECK(!log_paths.directory.empty()); diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index 9af114a3..ab42c9ab 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 -@@ -654,12 +654,6 @@ std::vector ChromeContentBr +@@ -655,12 +655,6 @@ std::vector ChromeContentBr GetOriginsRequiringDedicatedProcess() { std::vector list; diff --git a/patches/core/ungoogled-chromium/doh-changes.patch b/patches/core/ungoogled-chromium/doh-changes.patch index 0afdb08c..14f97035 100644 --- a/patches/core/ungoogled-chromium/doh-changes.patch +++ b/patches/core/ungoogled-chromium/doh-changes.patch @@ -1,6 +1,6 @@ --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -370,12 +370,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm +@@ -365,12 +365,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm // Enable DNS over HTTPS (DoH). BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", @@ -48,7 +48,7 @@ DohProviderIij, base::FEATURE_ENABLED_BY_DEFAULT), --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -96,12 +96,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso +@@ -97,12 +97,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode. BASE_FEATURE(kDnsOverHttpsUpgrade, "DnsOverHttpsUpgrade", diff --git a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch index 97b43cfe..8f394862 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -3,7 +3,7 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -944,8 +944,6 @@ if (is_win) { +@@ -946,8 +946,6 @@ if (is_win) { bundle_data("chrome_framework_resources") { sources = [ @@ -14,14 +14,10 @@ # from disk image and Keystone promotion (if so enabled). It --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -868,14 +868,6 @@ static_library("browser") { +@@ -879,10 +879,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", -- "navigation_predictor/preloading_model_executor.cc", -- "navigation_predictor/preloading_model_executor.h", -- "navigation_predictor/preloading_model_handler.cc", -- "navigation_predictor/preloading_model_handler.h", - "navigation_predictor/preloading_model_keyed_service.cc", - "navigation_predictor/preloading_model_keyed_service.h", - "navigation_predictor/preloading_model_keyed_service_factory.cc", @@ -128,7 +124,7 @@ void NavigationPredictor::SetModelScoreCallbackForTesting( --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -91,7 +91,6 @@ +@@ -92,7 +92,6 @@ #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h" #include "chrome/browser/metrics/variations/google_groups_updater_service_factory.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" @@ -136,7 +132,7 @@ #include "chrome/browser/net/dns_probe_service_factory.h" #include "chrome/browser/net/profile_network_context_service_factory.h" #include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h" -@@ -850,7 +849,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -871,7 +870,6 @@ void ChromeBrowserMainExtraPartsProfiles #endif ModelTypeStoreServiceFactory::GetInstance(); NavigationPredictorKeyedServiceFactory::GetInstance(); @@ -154,7 +150,7 @@ #include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/delete_profile_helper.h" -@@ -1554,9 +1553,6 @@ void ProfileManager::DoFinalInitForServi +@@ -1553,9 +1552,6 @@ void ProfileManager::DoFinalInitForServi // Ensure NavigationPredictorKeyedService is started. NavigationPredictorKeyedServiceFactory::GetForProfile(profile); @@ -164,9 +160,61 @@ IdentityManagerFactory::GetForProfile(profile)->OnNetworkInitialized(); AccountReconcilorFactory::GetForProfile(profile); +--- a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc ++++ b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc +@@ -39,7 +39,6 @@ + #include "components/omnibox/browser/autocomplete_match.h" + #include "components/omnibox/browser/autocomplete_provider.h" + #include "components/omnibox/browser/autocomplete_result.h" +-#include "components/omnibox/browser/autocomplete_scoring_model_service.h" + #include "components/omnibox/browser/omnibox_field_trial.h" + #include "components/search_engines/template_url.h" + #include "content/public/browser/web_ui.h" +@@ -500,31 +499,12 @@ void OmniboxPageHandler::StartOmniboxQue + } + + void OmniboxPageHandler::GetMlModelVersion(GetMlModelVersionCallback callback) { +- if (auto* service = GetMlService()) { +- auto version = service->GetModelVersion(); +- if (version == -1) { +- service->AddOnModelUpdatedCallback( +- base::BindOnce(&OmniboxPageHandler::GetMlModelVersion, +- weak_factory_.GetWeakPtr(), std::move(callback))); +- } else { +- std::move(callback).Run(version); +- } +- } else { + std::move(callback).Run(-1); +- } + } + + void OmniboxPageHandler::StartMl(mojom::SignalsPtr mojom_signals, + StartMlCallback callback) { +- if (auto* service = GetMlService()) { +- AutocompleteMatch::ScoringSignals signals = +- mojo::ConvertTo(mojom_signals); +- std::vector result = +- service->BatchScoreAutocompleteUrlMatchesSync({&signals}, {""}); +- std::move(callback).Run(result.size() ? *std::get<0>(result[0]) : -1); +- } else { + std::move(callback).Run(-1); +- } + } + + std::unique_ptr OmniboxPageHandler::CreateController( +@@ -549,8 +529,5 @@ OmniboxPageHandler::GetAutocompleteContr + } + + AutocompleteScoringModelService* OmniboxPageHandler::GetMlService() { +- return OmniboxFieldTrial::IsMlSyncBatchUrlScoringEnabled() +- ? AutocompleteScoringModelServiceFactory::GetInstance() +- ->GetForProfile(profile_) +- : nullptr; ++ return nullptr; + } --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn -@@ -389,7 +389,7 @@ source_set("lib") { +@@ -399,7 +399,7 @@ source_set("lib") { } } @@ -185,9 +233,30 @@ } python_library("fixtures") { +--- a/components/omnibox/browser/autocomplete_classifier.cc ++++ b/components/omnibox/browser/autocomplete_classifier.cc +@@ -95,8 +95,6 @@ void AutocompleteClassifier::Classify( + metrics::OmniboxEventProto::PageClassification page_classification, + AutocompleteMatch* match, + GURL* alternate_nav_url) { +- TRACE_EVENT1("omnibox", "AutocompleteClassifier::Classify", "text", +- base::UTF16ToUTF8(text)); + DCHECK(!inside_classify_); + base::AutoReset reset(&inside_classify_, true); + AutocompleteInput input(text, page_classification, *scheme_classifier_); +--- a/components/omnibox/browser/autocomplete_controller.cc ++++ b/components/omnibox/browser/autocomplete_controller.cc +@@ -45,7 +45,6 @@ + #include "components/omnibox/browser/autocomplete_input.h" + #include "components/omnibox/browser/autocomplete_match_type.h" + #include "components/omnibox/browser/autocomplete_provider.h" +-#include "components/omnibox/browser/autocomplete_scoring_model_service.h" + #include "components/omnibox/browser/autocomplete_scoring_signals_annotator.h" + #include "components/omnibox/browser/bookmark_provider.h" + #include "components/omnibox/browser/bookmark_scoring_signals_annotator.h" --- a/components/update_client/BUILD.gn +++ b/components/update_client/BUILD.gn -@@ -312,8 +312,6 @@ source_set("unit_tests") { +@@ -326,8 +326,6 @@ source_set("unit_tests") { "//third_party/puffin:libpuffpatch", "//third_party/re2", ] @@ -198,7 +267,7 @@ fuzzer_test("update_client_protocol_serializer_fuzzer") { --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -737,10 +737,6 @@ if (is_apple) { +@@ -735,10 +735,6 @@ if (is_apple) { deps = [ "//third_party/icu:icudata" ] } diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index 40c641f4..2c5fe429 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 -@@ -629,8 +629,6 @@ static_library("browser") { +@@ -640,8 +640,6 @@ static_library("browser") { "internal_auth.h", "interstitials/chrome_settings_page_helper.cc", "interstitials/chrome_settings_page_helper.h", @@ -11,7 +11,7 @@ "invalidation/profile_invalidation_provider_factory.cc", "invalidation/profile_invalidation_provider_factory.h", "ip_protection/ip_protection_config_http.cc", -@@ -3792,9 +3790,6 @@ static_library("browser") { +@@ -3829,9 +3827,6 @@ static_library("browser") { "enterprise/connectors/analysis/analysis_service_settings.h", "enterprise/connectors/analysis/analysis_settings.cc", "enterprise/connectors/analysis/analysis_settings.h", @@ -21,7 +21,7 @@ "enterprise/connectors/analysis/content_analysis_dialog.cc", "enterprise/connectors/analysis/content_analysis_dialog.h", "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc", -@@ -4108,10 +4103,6 @@ static_library("browser") { +@@ -4138,10 +4133,6 @@ static_library("browser") { "new_tab_page/modules/recipes/recipes_service_factory.h", "new_tab_page/modules/recipes/time_format_util.cc", "new_tab_page/modules/recipes/time_format_util.h", @@ -32,7 +32,7 @@ "new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.cc", "new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.h", "new_tab_page/new_tab_page_util.cc", -@@ -4591,7 +4582,6 @@ static_library("browser") { +@@ -4615,7 +4606,6 @@ static_library("browser") { "//chrome/browser/new_tab_page/modules/history_clusters/discount:mojo_bindings", "//chrome/browser/new_tab_page/modules/photos:mojo_bindings", "//chrome/browser/new_tab_page/modules/recipes:mojo_bindings", @@ -40,7 +40,7 @@ "//chrome/browser/new_tab_page/modules/v2/history_clusters:mojo_bindings", "//chrome/browser/policy:path_parser", "//chrome/browser/profile_resetter:profile_reset_report_proto", -@@ -6367,10 +6357,6 @@ static_library("browser") { +@@ -6409,10 +6399,6 @@ static_library("browser") { sources += [ "enterprise/chrome_browser_main_extra_parts_enterprise.cc", "enterprise/chrome_browser_main_extra_parts_enterprise.h", @@ -51,7 +51,7 @@ "enterprise/connectors/device_trust/attestation/browser/attestation_switches.cc", "enterprise/connectors/device_trust/attestation/browser/attestation_switches.h", "enterprise/connectors/device_trust/attestation/browser/attester.h", -@@ -7901,9 +7887,14 @@ static_library("browser") { +@@ -7949,9 +7935,14 @@ static_library("browser") { "//components/safe_browsing/content/browser:safe_browsing_blocking_page", "//components/safe_browsing/content/browser/download:download_stats", "//components/safe_browsing/content/common:file_type_policies", @@ -69,7 +69,7 @@ sources += [ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5189,11 +5189,13 @@ ChromeContentBrowserClient::CreateThrott +@@ -5222,11 +5222,13 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -83,7 +83,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: -@@ -6979,26 +6981,7 @@ ChromeContentBrowserClient::GetSafeBrows +@@ -7017,26 +7019,7 @@ ChromeContentBrowserClient::GetSafeBrows ? content::BrowserThread::UI : content::BrowserThread::IO); @@ -111,7 +111,7 @@ } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -7019,11 +7002,6 @@ ChromeContentBrowserClient::GetUrlLookup +@@ -7057,11 +7040,6 @@ ChromeContentBrowserClient::GetUrlLookup GetForProfile(profile); } #endif @@ -141,7 +141,7 @@ #include "content/public/browser/download_item_utils.h" #include "content/public/browser/download_manager.h" -@@ -268,21 +266,11 @@ void DownloadBubbleUIController::Process +@@ -267,21 +265,11 @@ void DownloadBubbleUIController::Process switch (command) { case DownloadCommands::KEEP: case DownloadCommands::DISCARD: @@ -189,7 +189,7 @@ return should_open; } -@@ -1546,7 +1536,6 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -1558,7 +1548,6 @@ void ChromeDownloadManagerDelegate::OnDo DownloadItemModel model(item); model.DetermineAndSetShouldPreferOpeningInBrowser( target_info->target_path, target_info->is_filetype_handled_safely); @@ -197,7 +197,7 @@ } if (ShouldBlockFile(item, target_info->danger_type)) { MaybeReportDangerousDownloadBlocked( -@@ -1625,59 +1614,6 @@ bool ChromeDownloadManagerDelegate::IsOp +@@ -1637,59 +1626,6 @@ bool ChromeDownloadManagerDelegate::IsOp bool ChromeDownloadManagerDelegate::ShouldBlockFile( download::DownloadItem* item, download::DownloadDangerType danger_type) const { @@ -257,7 +257,7 @@ return false; } -@@ -1692,7 +1628,6 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1704,7 +1640,6 @@ void ChromeDownloadManagerDelegate::Mayb service->MaybeSendDangerousDownloadOpenedReport(download, show_download_in_folder); } @@ -265,7 +265,7 @@ if (!download->GetAutoOpened()) { download::DownloadContent download_content = download::DownloadContentFromMimeType(download->GetMimeType(), false); -@@ -1700,6 +1635,7 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1712,6 +1647,7 @@ void ChromeDownloadManagerDelegate::Mayb download->GetDangerType(), download_content, base::Time::Now(), download->GetEndTime(), show_download_in_folder); } @@ -273,7 +273,7 @@ } void ChromeDownloadManagerDelegate::CheckDownloadAllowed( -@@ -1757,8 +1693,7 @@ void ChromeDownloadManagerDelegate::Chec +@@ -1769,8 +1705,7 @@ void ChromeDownloadManagerDelegate::Chec DCHECK(download_item); DCHECK(download_item->IsSavePackageDownload()); @@ -285,7 +285,7 @@ --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -918,80 +918,10 @@ void DownloadItemModel::ExecuteCommand(D +@@ -913,80 +913,10 @@ void DownloadItemModel::ExecuteCommand(D DownloadItemModel::BubbleUIInfo DownloadItemModel::GetBubbleUIInfoForTailoredWarning() const { @@ -299,7 +299,7 @@ - TailoredVerdict::SUSPICIOUS_ARCHIVE) { - return DownloadUIModel::BubbleUIInfo::SuspiciousUiPattern( - l10n_util::GetStringUTF16( -- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_MALWARE), +- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_ARCHIVE_MALWARE), - l10n_util::GetStringUTF16( - IDS_DOWNLOAD_BUBBLE_CONTINUE_SUSPICIOUS_FILE)); - } @@ -404,7 +404,7 @@ danger_level_ = GetDangerLevel( visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER); if (danger_level_ != DownloadFileType::NOT_DANGEROUS && -@@ -1272,6 +1274,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1270,6 +1272,7 @@ DownloadFileType::DangerLevel DownloadTa absl::optional DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { @@ -412,7 +412,7 @@ safe_browsing::SafeBrowsingMetricsCollector* metrics_collector = safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( GetProfile()); -@@ -1280,6 +1283,9 @@ DownloadTargetDeterminer::GetLastDownloa +@@ -1278,6 +1281,9 @@ DownloadTargetDeterminer::GetLastDownloa safe_browsing::SafeBrowsingMetricsCollector:: EventType::DANGEROUS_DOWNLOAD_BYPASS) : absl::nullopt; @@ -434,7 +434,7 @@ #include "components/enterprise/common/proto/connectors.pb.h" --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc -@@ -82,7 +82,7 @@ absl::optional ContentAnalysisDown +@@ -90,7 +90,7 @@ absl::optional ContentAnalysisDown } bool ContentAnalysisDownloadsDelegate::BypassRequiresJustification() const { @@ -498,14 +498,15 @@ void FilesRequestHandler::OnGotFileInfo( std::unique_ptr request, size_t index, -@@ -259,14 +219,6 @@ void FilesRequestHandler::OnGotFileInfo( +@@ -259,15 +219,6 @@ void FilesRequestHandler::OnGotFileInfo( void FilesRequestHandler::FinishRequestEarly( std::unique_ptr request, safe_browsing::BinaryUploadService::Result result) { - // We add the request here in case we never actually uploaded anything, so it - // wasn't added in OnGetRequestData - safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanRequests( -- request->per_profile_request(), request->content_analysis_request()); +- request->per_profile_request(), /*access_token*/ "", +- request->content_analysis_request()); - safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanResponses( - /*token=*/"", safe_browsing::BinaryUploadService::ResultToString(result), - enterprise_connectors::ContentAnalysisResponse()); @@ -528,7 +529,7 @@ void OnGotFileInfo( --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -443,19 +443,6 @@ absl::optional ConnectorsSe +@@ -454,19 +454,6 @@ absl::optional ConnectorsSe return absl::nullopt; } @@ -610,7 +611,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 -@@ -496,8 +496,7 @@ void RealtimeReportingClient::ReportEven +@@ -507,8 +507,7 @@ void RealtimeReportingClient::ReportEven } std::string RealtimeReportingClient::GetProfileUserName() const { @@ -747,7 +748,7 @@ } // namespace utils --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -302,10 +302,6 @@ static_library("extensions") { +@@ -304,10 +304,6 @@ static_library("extensions") { "api/runtime/chrome_runtime_api_delegate.h", "api/safe_browsing_private/safe_browsing_private_api.cc", "api/safe_browsing_private/safe_browsing_private_api.h", @@ -769,7 +770,7 @@ "pending_extension_info.cc", --- a/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc +++ b/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -110,7 +110,6 @@ void EnsureApiBrowserContextKeyedService +@@ -114,7 +114,6 @@ void EnsureApiBrowserContextKeyedService extensions::PreferenceAPI::GetFactoryInstance(); extensions::ProcessesAPI::GetFactoryInstance(); extensions::ReadingListEventRouter::GetFactoryInstance(); @@ -779,7 +780,7 @@ extensions::SettingsOverridesAPI::GetFactoryInstance(); --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc -@@ -303,19 +303,6 @@ void CookiesGetFunction::GetCookieListCa +@@ -301,19 +301,6 @@ void CookiesGetFunction::GetCookieListCa } void CookiesGetFunction::NotifyExtensionTelemetry() { @@ -799,7 +800,7 @@ } CookiesGetAllFunction::CookiesGetAllFunction() { -@@ -408,24 +395,6 @@ void CookiesGetAllFunction::GetCookieLis +@@ -406,24 +393,6 @@ void CookiesGetAllFunction::GetCookieLis } void CookiesGetAllFunction::NotifyExtensionTelemetry() { @@ -896,7 +897,7 @@ void Blocklist::GetMalwareIDs(const std::set& ids, --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc -@@ -731,81 +731,23 @@ void ChromeExtensionsBrowserClient::Noti +@@ -734,81 +734,23 @@ void ChromeExtensionsBrowserClient::Noti content::BrowserContext* context, const ExtensionId& extension_id, const std::string& code) const { @@ -979,7 +980,7 @@ } // static -@@ -975,7 +917,6 @@ void ChromeExtensionsBrowserClient::GetW +@@ -978,7 +920,6 @@ void ChromeExtensionsBrowserClient::GetW void ChromeExtensionsBrowserClient::CreatePasswordReuseDetectionManager( content::WebContents* web_contents) const { @@ -989,7 +990,7 @@ media_device_salt::MediaDeviceSaltService* --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -52,7 +52,6 @@ +@@ -51,7 +51,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" @@ -997,7 +998,7 @@ #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/browser/extensions/profile_util.h" -@@ -221,7 +220,6 @@ void ExtensionService::BlocklistExtensio +@@ -235,7 +234,6 @@ void ExtensionService::BlocklistExtensio blocklist_prefs::SetSafeBrowsingExtensionBlocklistState( extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE, extension_prefs_); @@ -1005,7 +1006,7 @@ } bool ExtensionService::OnExternalExtensionUpdateUrlFound( -@@ -389,9 +387,6 @@ ExtensionService::ExtensionService( +@@ -403,9 +401,6 @@ ExtensionService::ExtensionService( safe_browsing_verdict_handler_(extension_prefs, ExtensionRegistry::Get(profile), this), @@ -1015,7 +1016,7 @@ extension_telemetry_service_verdict_handler_( extension_prefs, ExtensionRegistry::Get(profile), -@@ -919,17 +914,6 @@ bool ExtensionService::IsExtensionEnable +@@ -938,17 +933,6 @@ bool ExtensionService::IsExtensionEnable return extension_registrar_.IsExtensionEnabled(extension_id); } @@ -1033,7 +1034,7 @@ void ExtensionService::PerformActionBasedOnExtensionTelemetryServiceVerdicts( const Blocklist::BlocklistStateMap& blocklist_state_map) { DCHECK_CURRENTLY_ON(BrowserThread::UI); -@@ -939,89 +923,6 @@ void ExtensionService::PerformActionBase +@@ -958,89 +942,6 @@ void ExtensionService::PerformActionBase error_controller_->ShowErrorIfNeeded(); } @@ -1185,7 +1186,7 @@ --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc -@@ -448,8 +448,6 @@ void ExtensionSystemImpl::InstallUpdate( +@@ -451,8 +451,6 @@ void ExtensionSystemImpl::InstallUpdate( void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes( const std::string& extension_id, const base::Value::Dict& attributes) { @@ -1247,7 +1248,7 @@ } --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -34,7 +34,6 @@ +@@ -33,7 +33,6 @@ #include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h" #include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h" #include "chrome/browser/profiles/profile.h" @@ -1255,7 +1256,7 @@ #include "chrome/browser/ui/file_system_access_dialogs.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pdf_util.h" -@@ -411,86 +410,6 @@ bool ShouldBlockAccessToPath(const base: +@@ -409,87 +408,6 @@ bool ShouldBlockAccessToPath(const base: return true; } @@ -1330,6 +1331,7 @@ - case Result::SENSITIVE_CONTENT_BLOCK: - case Result::DEEP_SCANNED_SAFE: - case Result::PROMPT_FOR_SCANNING: +- case Result::PROMPT_FOR_LOCAL_PASSWORD_SCANNING: - case Result::DEEP_SCANNED_FAILED: - NOTREACHED(); - return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult:: @@ -1342,7 +1344,7 @@ std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey : base::StrCat({kCustomLastPickedDirectoryKey, "-", id}); -@@ -510,13 +429,7 @@ std::string_view GetGrantKeyFromGrantTyp +@@ -509,13 +427,7 @@ std::string_view GetGrantKeyFromGrantTyp bool FileHasDangerousExtension(const url::Origin& origin, const base::FilePath& path, Profile* profile) { @@ -1357,7 +1359,7 @@ } } // namespace -@@ -1494,29 +1407,6 @@ void ChromeFileSystemAccessPermissionCon +@@ -1511,29 +1423,6 @@ void ChromeFileSystemAccessPermissionCon std::move(callback)); } @@ -1389,7 +1391,7 @@ const base::FilePath& path, --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h -@@ -138,10 +138,6 @@ class ChromeFileSystemAccessPermissionCo +@@ -152,10 +152,6 @@ class ChromeFileSystemAccessPermissionCo UserAction user_action, content::GlobalRenderFrameHostId frame_id, base::OnceCallback callback) override; @@ -1410,7 +1412,7 @@ #include "components/url_formatter/elide_url.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/desktop_media_id.h" -@@ -124,6 +125,7 @@ void DisplayMediaAccessHandler::HandleRe +@@ -122,6 +123,7 @@ void DisplayMediaAccessHandler::HandleRe return; } @@ -1418,7 +1420,7 @@ // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Show the warning -@@ -139,6 +141,7 @@ void DisplayMediaAccessHandler::HandleRe +@@ -137,6 +139,7 @@ void DisplayMediaAccessHandler::HandleRe observer->OnDesktopCaptureRequest(); return; } @@ -1445,14 +1447,14 @@ --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc @@ -34,7 +34,6 @@ - #include "chrome/browser/password_manager/password_store_factory.h" + #include "chrome/browser/password_manager/profile_password_store_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/safe_browsing/chrome_password_protection_service.h" #include "chrome/browser/safe_browsing/user_interaction_observer.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/sync/sync_service_factory.h" -@@ -863,6 +862,7 @@ autofill::LanguageCode ChromePasswordMan +@@ -865,6 +864,7 @@ autofill::LanguageCode ChromePasswordMan return autofill::LanguageCode(); } @@ -1460,7 +1462,7 @@ safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { return safe_browsing::ChromePasswordProtectionService:: -@@ -882,6 +882,7 @@ void ChromePasswordManagerClient::CheckS +@@ -884,6 +884,7 @@ void ChromePasswordManagerClient::CheckS } } #endif // defined(ON_FOCUS_PING_ENABLED) @@ -1468,7 +1470,7 @@ #if !BUILDFLAG(IS_ANDROID) void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent( -@@ -889,28 +890,10 @@ void ChromePasswordManagerClient::MaybeR +@@ -891,28 +892,10 @@ void ChromePasswordManagerClient::MaybeR bool is_federated, const url::Origin& federated_origin, const std::u16string& login_user_name) const { @@ -1497,7 +1499,7 @@ } #endif -@@ -1498,6 +1481,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1509,6 +1492,7 @@ bool ChromePasswordManagerClient::IsPass is_enabled = false; } @@ -1505,7 +1507,7 @@ // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Disable password -@@ -1508,6 +1492,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1519,6 +1503,7 @@ bool ChromePasswordManagerClient::IsPass observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -1515,7 +1517,7 @@ password_manager::BrowserSavePasswordProgressLogger logger( --- a/chrome/browser/password_manager/chrome_password_manager_client.h +++ b/chrome/browser/password_manager/chrome_password_manager_client.h -@@ -229,6 +229,7 @@ class ChromePasswordManagerClient +@@ -230,6 +230,7 @@ class ChromePasswordManagerClient void AnnotateNavigationEntry(bool has_password_field) override; autofill::LanguageCode GetPageLanguage() const override; @@ -1523,7 +1525,7 @@ safe_browsing::PasswordProtectionService* GetPasswordProtectionService() const override; -@@ -236,6 +237,7 @@ class ChromePasswordManagerClient +@@ -237,6 +238,7 @@ class ChromePasswordManagerClient void CheckSafeBrowsingReputation(const GURL& form_action, const GURL& frame_url) override; #endif @@ -1647,7 +1649,7 @@ --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -335,50 +335,5 @@ bool PredictionBasedPermissionUiSelector +@@ -335,49 +335,5 @@ bool PredictionBasedPermissionUiSelector PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse( permissions::RequestType request_type) { @@ -1657,12 +1659,11 @@ - const bool is_notification_cpss_enabled = - profile_->GetPrefs()->GetBoolean(prefs::kEnableNotificationCPSS) && - (base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) || -- base::FeatureList::IsEnabled( -- permissions::features::kPermissionQuietChip)); +- permissions::PermissionUtil::DoesPlatformSupportChip()); - - const bool is_geolocation_cpss_enabled = - profile_->GetPrefs()->GetBoolean(prefs::kEnableGeolocationCPSS) && -- base::FeatureList::IsEnabled(permissions::features::kPermissionQuietChip); +- permissions::PermissionUtil::DoesPlatformSupportChip(); - - if (request_type == permissions::RequestType::kNotifications && - !is_notification_cpss_enabled) { @@ -1708,7 +1709,7 @@ #include "components/safe_browsing/content/common/file_type_policies_prefs.h" #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" #include "components/safe_browsing/core/common/safe_browsing_prefs.h" -@@ -2095,8 +2096,6 @@ std::unique_ptrAddHandler( std::make_unique( chrome_schema)); @@ -1717,7 +1718,7 @@ handlers->AddHandler(std::make_unique()); handlers->AddHandler( std::make_unique(key::kURLBlocklist)); -@@ -2179,20 +2178,6 @@ std::unique_ptrGetDownloadItem()); +- download::DownloadDangerType danger_type = model_->GetDangerType(); +- TailoredVerdict tailored_verdict = safe_browsing::DownloadProtectionService:: +- GetDownloadProtectionTailoredVerdict(model_->GetDownloadItem()); +- +- // Suspicious archives +- if (danger_type == download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT && +- tailored_verdict.tailored_verdict_type() == +- TailoredVerdict::SUSPICIOUS_ARCHIVE) { +- PopulateSuspiciousUiPattern(); +- return; +- } +- +- // Cookie theft +- if (danger_type == +- download::DOWNLOAD_DANGER_TYPE_DANGEROUS_ACCOUNT_COMPROMISE && +- tailored_verdict.tailored_verdict_type() == +- TailoredVerdict::COOKIE_THEFT) { +- PopulateDangerousUiPattern(); +- return; +- } +- +- NOTREACHED(); + } + + void DownloadBubbleRowViewInfo::PopulateForFileTypeWarningNoSafeBrowsing() { --- a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc +++ b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc @@ -16,6 +16,7 @@ @@ -2037,9 +2078,9 @@ void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() { --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -347,7 +347,6 @@ void TabHelpers::AttachTabHelpers(WebCon - chrome::ChainedBackNavigationTracker::CreateForWebContents(web_contents); - chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents); +@@ -362,7 +362,6 @@ void TabHelpers::AttachTabHelpers(WebCon + ChromeComposeClient::CreateForWebContents(web_contents); + #endif ChromePasswordManagerClient::CreateForWebContents(web_contents); - ChromePasswordReuseDetectionManagerClient::CreateForWebContents(web_contents); CreateSubresourceFilterWebContentsHelper(web_contents); @@ -2053,9 +2094,9 @@ #include "chrome/browser/download/download_item_warning_data.h" -#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h" #include "chrome/browser/ui/browser.h" - #include "chrome/browser/ui/views/download/bubble/download_bubble_partial_view.h" - #include "chrome/browser/ui/views/download/bubble/download_bubble_primary_view.h" -@@ -140,10 +139,6 @@ void DownloadBubbleContentsView::AddSecu + #include "chrome/browser/ui/browser_element_identifiers.h" + #include "chrome/browser/ui/download/download_bubble_info.h" +@@ -149,10 +148,6 @@ void DownloadBubbleContentsView::AddSecu void DownloadBubbleContentsView::ProcessDeepScanPress( const ContentId& id, base::optional_ref password) { @@ -2103,7 +2144,7 @@ open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) || prompt_to_scan || allow_open_during_deep_scan); -@@ -1276,7 +1277,9 @@ void DownloadItemView::ShowContextMenuIm +@@ -1277,7 +1278,9 @@ void DownloadItemView::ShowContextMenuIm } void DownloadItemView::OpenDownloadDuringAsyncScanning() { @@ -2243,6 +2284,68 @@ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) { AddThreatProtectionPermission(kManagementScreenCaptureEvent, +--- a/chrome/browser/ui/webui/settings/hats_handler.cc ++++ b/chrome/browser/ui/webui/settings/hats_handler.cc +@@ -85,41 +85,6 @@ void HatsHandler::RegisterMessages() { + void HatsHandler::HandleSecurityPageInteractionOccurred( + const base::Value::List& args) { + AllowJavascript(); +- +- // There are 2 argument in the input list. +- // The first one is the SecurityPageInteraction that triggered the survey. +- // The second one is the safe browsing setting the user was on. +- CHECK_EQ(2U, args.size()); +- +- Profile* profile = Profile::FromWebUI(web_ui()); +- +- // Enterprise users consideration. +- // If the admin disabled the survey, the survey will not be requested. +- if (!safe_browsing::IsSafeBrowsingSurveysEnabled(*profile->GetPrefs())) { +- return; +- } +- +- // Request HaTS survey. +- HatsService* hats_service = HatsServiceFactory::GetForProfile( +- profile, /* create_if_necessary = */ true); +- +- // The HaTS service may not be available for the profile, for example if it +- // is a guest profile. +- if (!hats_service) { +- return; +- } +- +- // Generate the Product Specific bits data from |profile| and |args|. +- SurveyStringData product_specific_string_data = +- GetSecurityPageProductSpecificStringData(profile, args); +- +- hats_service->LaunchDelayedSurveyForWebContents( +- kHatsSurveyTriggerSettingsSecurity, web_ui()->GetWebContents(), +- features::kHappinessTrackingSurveysForSecurityPageTime.Get() +- .InMilliseconds(), +- /*product_specific_bits_data=*/{}, +- /*product_specific_string_data=*/product_specific_string_data, +- /*require_same_origin=*/true); + } + + /** +@@ -180,17 +145,7 @@ SurveyStringData HatsHandler::GetSecurit + } + } + +- bool safe_browsing_enabled = +- profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled); +- bool safe_browsing_enhanced_enabled = +- profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnhanced); +- if (safe_browsing_enhanced_enabled) { +- safe_browsing_setting_current = "enhanced_protection"; +- } else if (safe_browsing_enabled) { +- safe_browsing_setting_current = "standard_protection"; +- } else { + safe_browsing_setting_current = "no_protection"; +- } + + std::string client_channel = + std::string(version_info::GetChannelString(chrome::GetChannel())); --- a/chrome/browser/webshare/share_service_impl.cc +++ b/chrome/browser/webshare/share_service_impl.cc @@ -17,7 +17,9 @@ @@ -2287,7 +2390,7 @@ std::move(callback), --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1721,7 +1721,6 @@ if (!is_android) { +@@ -1811,7 +1811,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2295,7 +2398,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", -@@ -6679,7 +6678,6 @@ test("unit_tests") { +@@ -6792,7 +6791,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2303,7 +2406,7 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:mock_password_protection", "//components/safe_browsing/content/browser/web_ui", -@@ -9848,9 +9846,6 @@ test("unit_tests") { +@@ -10008,9 +10006,6 @@ test("unit_tests") { ] } @@ -2344,7 +2447,7 @@ # These two flags are equivalent, but `enable_print_content_analysis` still --- a/components/password_manager/content/browser/content_password_manager_driver.cc +++ b/components/password_manager/content/browser/content_password_manager_driver.cc -@@ -484,7 +484,7 @@ void ContentPasswordManagerDriver::Check +@@ -496,7 +496,7 @@ void ContentPasswordManagerDriver::Check if (!password_manager::bad_message::CheckFrameNotPrerendering( render_frame_host_)) return; @@ -2355,7 +2458,7 @@ } --- a/components/password_manager/core/browser/password_manager_client.h +++ b/components/password_manager/core/browser/password_manager_client.h -@@ -398,11 +398,14 @@ class PasswordManagerClient { +@@ -399,11 +399,14 @@ class PasswordManagerClient { // Returns the current best guess as to the page's display language. virtual autofill::LanguageCode GetPageLanguage() const; @@ -2516,7 +2619,7 @@ } --- a/components/safe_browsing/core/browser/verdict_cache_manager.cc +++ b/components/safe_browsing/core/browser/verdict_cache_manager.cc -@@ -455,16 +455,6 @@ VerdictCacheManager::VerdictCacheManager +@@ -441,16 +441,6 @@ VerdictCacheManager::VerdictCacheManager // pref_service can be null in tests. if (pref_service) { pref_change_registrar_.Init(pref_service); @@ -2689,7 +2792,7 @@ --- a/extensions/browser/updater/update_service.cc +++ b/extensions/browser/updater/update_service.cc -@@ -127,13 +127,6 @@ void UpdateService::OnCrxStateChange(Upd +@@ -128,13 +128,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 0e4d5b0d..e3b70d06 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -4,7 +4,7 @@ --- a/android_webview/browser/aw_browser_context.cc +++ b/android_webview/browser/aw_browser_context.cc -@@ -64,7 +64,6 @@ +@@ -63,7 +63,6 @@ #include "components/prefs/pref_service_factory.h" #include "components/prefs/segregated_pref_store.h" #include "components/profile_metrics/browser_profile_type.h" @@ -144,7 +144,7 @@ #include "components/sync/service/sync_service.h" #include "components/sync/service/sync_user_settings.h" #include "content/public/browser/browser_context.h" -@@ -430,35 +429,5 @@ bool ChromeBrowsingDataLifetimeManager:: +@@ -428,35 +427,5 @@ bool ChromeBrowsingDataLifetimeManager:: return sync_disabled; } @@ -182,7 +182,7 @@ } --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -272,7 +272,6 @@ +@@ -274,7 +274,6 @@ #include "components/safe_browsing/core/browser/realtime/url_lookup_service.h" #include "components/safe_browsing/core/browser/url_checker_delegate.h" #include "components/safe_browsing/core/common/features.h" @@ -192,7 +192,7 @@ #include "components/security_interstitials/content/ssl_error_handler.h" --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc -@@ -105,7 +105,6 @@ +@@ -104,7 +104,6 @@ #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -202,7 +202,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -823,13 +823,6 @@ void DownloadItemModel::ExecuteCommand(D +@@ -821,13 +821,6 @@ void DownloadItemModel::ExecuteCommand(D #if BUILDFLAG(FULL_SAFE_BROWSING) CompleteSafeBrowsingScan(); #endif @@ -216,7 +216,7 @@ [[fallthrough]]; case DownloadCommands::KEEP: #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -896,21 +889,9 @@ void DownloadItemModel::ExecuteCommand(D +@@ -891,21 +884,9 @@ void DownloadItemModel::ExecuteCommand(D DownloadUIModel::ExecuteCommand(download_commands, command); break; case DownloadCommands::DEEP_SCAN: { @@ -248,7 +248,7 @@ #include "components/safe_browsing/core/common/safebrowsing_referral_methods.h" #include "components/vector_icons/vector_icons.h" #include "net/base/mime_util.h" -@@ -952,15 +951,6 @@ DownloadUIModel::BubbleUIInfo DownloadUI +@@ -953,15 +952,6 @@ DownloadUIModel::BubbleUIInfo DownloadUI : views::kInfoIcon, kColorDownloadItemIconDangerous); case download::DOWNLOAD_DANGER_TYPE_SENSITIVE_CONTENT_BLOCK: { @@ -264,7 +264,7 @@ return DownloadUIModel::BubbleUIInfo() .AddSubpageSummary(l10n_util::GetStringUTF16( IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_SENSITIVE_CONTENT_BLOCK)) -@@ -968,7 +958,6 @@ DownloadUIModel::BubbleUIInfo DownloadUI +@@ -969,7 +959,6 @@ DownloadUIModel::BubbleUIInfo DownloadUI ? views::kInfoChromeRefreshIcon : views::kInfoIcon, kColorDownloadItemIconDangerous); @@ -272,7 +272,7 @@ } case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE: case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT: -@@ -1105,37 +1094,6 @@ DownloadUIModel::GetBubbleUIInfoForInPro +@@ -1107,37 +1096,6 @@ DownloadUIModel::GetBubbleUIInfoForInPro break; } @@ -332,7 +332,7 @@ #include "crypto/secure_hash.h" --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -43,7 +43,6 @@ +@@ -42,7 +42,6 @@ #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h" #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/policy/core/common/policy_types.h" @@ -340,7 +340,7 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/user_prefs/user_prefs.h" -@@ -373,8 +372,7 @@ std::string ConnectorsService::GetManage +@@ -384,8 +383,7 @@ std::string ConnectorsService::GetManage absl::optional scope = absl::nullopt; for (const char* scope_pref : @@ -350,7 +350,7 @@ ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED), ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY), ConnectorScopePref(AnalysisConnector::PRINT), -@@ -426,20 +424,6 @@ std::string ConnectorsService::GetManage +@@ -437,20 +435,6 @@ std::string ConnectorsService::GetManage absl::optional ConnectorsService::GetDMTokenForRealTimeUrlCheck() const { @@ -602,15 +602,15 @@ did_just_control_pref) { --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc -@@ -31,7 +31,6 @@ +@@ -30,7 +30,6 @@ #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/translate/core/browser/translate_pref_names.h" - #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test.h" -@@ -88,7 +87,6 @@ class ExtensionPreferenceApiTest + #include "content/public/test/test_devtools_protocol_client.h" +@@ -86,7 +85,6 @@ class ExtensionPreferenceApiTest prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); EXPECT_TRUE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); @@ -618,7 +618,7 @@ EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); VerifyPrefValueAndControlledState(prefs::kPrivacySandboxM1TopicsEnabled, base::Value(false), -@@ -123,7 +121,6 @@ class ExtensionPreferenceApiTest +@@ -121,7 +119,6 @@ class ExtensionPreferenceApiTest prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); EXPECT_FALSE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); @@ -626,7 +626,7 @@ EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); VerifyPrefValueAndControlledState(prefs::kPrivacySandboxM1TopicsEnabled, base::Value(true), -@@ -205,7 +202,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen +@@ -203,7 +200,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen prefetch::prefs::kNetworkPredictionOptions, static_cast(prefetch::NetworkPredictionOptions::kDisabled)); prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false); @@ -667,7 +667,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/supervised_user/core/common/features.h" #include "components/supervised_user/core/common/pref_names.h" -@@ -298,8 +296,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -300,8 +298,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil #endif // Privacy page @@ -676,7 +676,7 @@ (*s_allowlist)[::prefs::kDnsOverHttpsMode] = settings_api::PrefType::PREF_TYPE_STRING; (*s_allowlist)[::prefs::kDnsOverHttpsTemplates] = -@@ -330,16 +326,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -332,16 +328,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::PREF_TYPE_BOOLEAN; // Security page @@ -695,7 +695,7 @@ (*s_allowlist)[::kGeneratedHttpsFirstModePref] = --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc -@@ -686,9 +686,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore +@@ -631,9 +631,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, GetReferrerChainForNonSafeBrowsingUser) { PrefService* pref_service = browser()->profile()->GetPrefs(); @@ -761,26 +761,25 @@ --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -75,7 +75,6 @@ - #include "chrome/common/url_constants.h" #include "components/crx_file/id_util.h" #include "components/favicon_base/favicon_url_parser.h" + #include "components/policy/core/common/policy_pref_names.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/supervised_user/core/common/buildflags.h" #include "content/public/browser/browser_thread.h" - #include "content/public/browser/notification_service.h" -@@ -532,12 +531,7 @@ void ExtensionService::Init() { + #include "content/public/browser/render_process_host.h" +@@ -546,10 +545,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 { - LoadExtensionsFromCommandLineFlag(switches::kLoadExtension); -- } - } - EnabledReloadableExtensions(); - MaybeFinishShutdownDelayed(); +- } 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 @@ -30,7 +30,6 @@ @@ -835,7 +834,7 @@ {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -55,7 +55,6 @@ +@@ -58,7 +58,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" @@ -843,7 +842,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/first_party_sets_handler.h" -@@ -958,15 +957,8 @@ void ProfileNetworkContextService::Confi +@@ -910,15 +909,8 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; @@ -1043,10 +1042,10 @@ { key::kDomainReliabilityAllowed, domain_reliability::prefs::kDomainReliabilityAllowedByPolicy, base::Value::Type::BOOLEAN }, -@@ -294,12 +288,6 @@ const PolicyToPreferenceMapEntry kSimple - prefs::kPrintingEnabled, +@@ -305,12 +299,6 @@ const PolicyToPreferenceMapEntry kSimple + prefs::kOopPrintDriversAllowedByPolicy, base::Value::Type::BOOLEAN }, - #endif // BUILDFLAG(ENABLE_PRINTING) + #endif - { key::kSafeBrowsingEnabled, - prefs::kSafeBrowsingEnabled, - base::Value::Type::BOOLEAN }, @@ -1056,7 +1055,7 @@ { key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled, base::Value::Type::BOOLEAN }, -@@ -397,9 +385,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -408,9 +396,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdsSettingForIntrusiveAdsSites, prefs::kManagedDefaultAdsSetting, base::Value::Type::INTEGER }, @@ -1066,7 +1065,7 @@ { key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, base::Value::Type::BOOLEAN }, -@@ -599,15 +584,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -610,15 +595,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kPasswordDismissCompromisedAlertEnabled, password_manager::prefs::kPasswordDismissCompromisedAlertEnabled, base::Value::Type::BOOLEAN }, @@ -1082,7 +1081,7 @@ #if BUILDFLAG(ENABLE_PDF) { key::kPdfLocalFileAccessAllowedForDomains, prefs::kPdfLocalFileAccessAllowedForDomains, -@@ -654,9 +630,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -665,9 +641,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRestoreOnStartupURLs, prefs::kURLsToRestoreOnStartup, base::Value::Type::LIST }, @@ -1092,7 +1091,7 @@ { key::kSameOriginTabCaptureAllowedByOrigins, prefs::kSameOriginTabCaptureAllowedByOrigins, base::Value::Type::LIST }, -@@ -771,9 +744,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -782,9 +755,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdditionalDnsQueryTypesEnabled, prefs::kAdditionalDnsQueryTypesEnabled, base::Value::Type::BOOLEAN }, @@ -1102,7 +1101,7 @@ { key::kForceGoogleSafeSearch, policy_prefs::kForceGoogleSafeSearch, base::Value::Type::BOOLEAN }, -@@ -821,9 +791,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -832,9 +802,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, @@ -1112,7 +1111,7 @@ #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ -@@ -1624,9 +1591,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1650,9 +1617,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, @@ -1122,7 +1121,7 @@ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ || BUILDFLAG(IS_FUCHSIA) -@@ -1687,9 +1651,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1713,9 +1677,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kImportDialogAutofillFormData, base::Value::Type::BOOLEAN }, @@ -1132,9 +1131,9 @@ { key::kHardwareAccelerationModeEnabled, prefs::kHardwareAccelerationModeEnabled, base::Value::Type::BOOLEAN }, -@@ -1831,15 +1792,6 @@ const PolicyToPreferenceMapEntry kSimple - { key::kKioskTroubleshootingToolsEnabled, - prefs::kKioskTroubleshootingToolsEnabled, +@@ -1860,15 +1821,6 @@ const PolicyToPreferenceMapEntry kSimple + { key::kRemoteAccessHostAllowEnterpriseRemoteSupportConnections, + prefs::kRemoteAccessHostAllowEnterpriseRemoteSupportConnections, base::Value::Type::BOOLEAN }, - { key::kRealTimeDownloadProtectionRequestAllowed, - prefs::kRealTimeDownloadProtectionRequestAllowedByPolicy, @@ -1148,7 +1147,7 @@ #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) -@@ -1998,9 +1950,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2027,9 +1979,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGoogleSearchSidePanelEnabled, prefs::kGoogleSearchSidePanelEnabled, base::Value::Type::BOOLEAN }, @@ -1158,7 +1157,7 @@ #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) { key::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, policy_prefs::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, -@@ -2171,12 +2120,6 @@ std::unique_ptrAddHandler( std::make_unique()); -@@ -2366,18 +2309,7 @@ std::unique_ptrAddHandler(std::make_unique( -- key::kProfileSeparationSettings, +- handlers->AddHandler(std::make_unique( +- std::make_unique( +- key::kEnterpriseProfileCreationKeepBrowsingData, +- prefs::kEnterpriseProfileCreationKeepBrowsingData, +- base::Value::Type::BOOLEAN), - std::make_unique( - key::kProfileSeparationDataMigrationSettings, - prefs::kProfileSeparationDataMigrationSettings, @@ -1190,7 +1192,7 @@ handlers->AddHandler(std::make_unique( key::kProfileReauthPrompt, enterprise_signin::prefs::kProfileReauthPrompt, static_cast(enterprise_signin::ProfileReauthPrompt::kDoNotPrompt), -@@ -2417,24 +2349,6 @@ std::unique_ptr> signin_legacy_policies; @@ -1233,7 +1235,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_engagement/content/site_engagement_service.h" #include "components/subresource_filter/content/browser/ruleset_service.h" -@@ -1415,7 +1413,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1413,7 +1411,6 @@ void RegisterLocalState(PrefRegistrySimp PushMessagingServiceImpl::RegisterPrefs(registry); #endif RegisterScreenshotPrefs(registry); @@ -1241,7 +1243,7 @@ secure_origin_allowlist::RegisterPrefs(registry); segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs( registry); -@@ -1686,8 +1683,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1694,8 +1691,6 @@ void RegisterProfilePrefs(user_prefs::Pr PushMessagingAppIdentifier::RegisterProfilePrefs(registry); QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); @@ -1250,7 +1252,7 @@ SearchPrefetchService::RegisterProfilePrefs(registry); blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs( registry); -@@ -2279,20 +2274,6 @@ void MigrateObsoleteProfilePrefs(PrefSer +@@ -2260,20 +2255,6 @@ void MigrateObsoleteProfilePrefs(PrefSer #endif // BUILDFLAG(IS_ANDROID) profile_prefs->ClearPref(kOriginTrialPrefKey); @@ -1360,14 +1362,14 @@ EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); --- a/chrome/browser/profiles/gaia_info_update_service.cc +++ b/chrome/browser/profiles/gaia_info_update_service.cc -@@ -19,7 +19,6 @@ +@@ -18,7 +18,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/avatar_icon_util.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/accounts_in_cookie_jar_info.h" - #include "content/public/browser/notification_details.h" + #include "content/public/browser/storage_partition.h" --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc @@ -28,7 +28,6 @@ @@ -1388,7 +1390,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/supervised_user/core/common/buildflags.h" #include "third_party/abseil-cpp/absl/types/optional.h" -@@ -479,7 +478,7 @@ bool ProfileAttributesEntry::IsUsingDefa +@@ -473,7 +472,7 @@ bool ProfileAttributesEntry::IsUsingDefa } bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const { @@ -1397,7 +1399,7 @@ } size_t ProfileAttributesEntry::GetAvatarIconIndex() const { -@@ -667,7 +666,6 @@ void ProfileAttributesEntry::SetLastDown +@@ -661,7 +660,6 @@ void ProfileAttributesEntry::SetLastDown } void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) { @@ -1415,7 +1417,7 @@ #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" -@@ -419,9 +418,7 @@ void ProfileAttributesStorage::AddProfil +@@ -405,9 +404,7 @@ void ProfileAttributesStorage::AddProfil params.profile_name, /*include_check_for_legacy_profile_name*/ false)) // Assume newly created profiles use a default avatar. @@ -1428,7 +1430,7 @@ info.Set(ProfileAttributesEntry::kAccountIdKey, --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -147,7 +147,6 @@ +@@ -148,7 +148,6 @@ #include "components/profile_metrics/browser_profile_type.h" #include "components/safe_search_api/safe_search_util.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" @@ -1446,7 +1448,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/supervised_user/core/common/buildflags.h" -@@ -1983,8 +1982,7 @@ void ProfileManager::AddProfileToStorage +@@ -1982,8 +1981,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1456,7 +1458,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -2041,14 +2039,13 @@ void ProfileManager::AddProfileToStorage +@@ -2033,14 +2031,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsForceEphemeralProfilesEnabled(profile); init_params.is_signed_in_with_credential_provider = @@ -1494,7 +1496,7 @@ #if BUILDFLAG(IS_CHROMEOS_LACROS) --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -844,7 +844,7 @@ +@@ -847,7 +847,7 @@ @@ -1505,7 +1507,7 @@ @@ -1838,7 +1840,7 @@ #include "components/variations/variations_params_manager.h" --- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc -@@ -67,7 +67,6 @@ +@@ -68,7 +68,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" @@ -1846,7 +1848,7 @@ #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "components/safe_browsing/core/common/utils.h" #include "components/security_interstitials/content/unsafe_resource_util.h" -@@ -1239,14 +1238,6 @@ bool ChromePasswordProtectionService::Ha +@@ -1235,14 +1234,6 @@ bool ChromePasswordProtectionService::Ha } void ChromePasswordProtectionService::OnWarningTriggerChanged() { @@ -1861,7 +1863,7 @@ // Clears captured enterprise password hashes or GSuite sync password hashes. password_manager::PasswordReuseManager* reuse_manager = GetPasswordReuseManager(); -@@ -1416,7 +1407,7 @@ PrefService* ChromePasswordProtectionSer +@@ -1412,7 +1403,7 @@ PrefService* ChromePasswordProtectionSer } bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() { @@ -1870,7 +1872,7 @@ } bool ChromePasswordProtectionService::IsExtendedReporting() { -@@ -1436,39 +1427,7 @@ bool ChromePasswordProtectionService::Is +@@ -1432,39 +1423,7 @@ bool ChromePasswordProtectionService::Is bool ChromePasswordProtectionService::IsPingingEnabled( LoginReputationClientRequest::TriggerType trigger_type, ReusedPasswordAccountType password_type) { @@ -1911,7 +1913,7 @@ } RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason( -@@ -1693,23 +1652,6 @@ MaybeCreateCommitDeferringCondition( +@@ -1689,23 +1648,6 @@ MaybeCreateCommitDeferringCondition( : nullptr; } @@ -2388,7 +2390,7 @@ #include "google_apis/google_api_keys.h" #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -99,14 +98,6 @@ AccountConsistencyModeManager::AccountCo +@@ -103,14 +102,6 @@ AccountConsistencyModeManager::AccountCo ->GetProfileAttributesStorage() .GetProfileAttributesWithPath(profile_->GetPath()) : nullptr; @@ -2403,7 +2405,7 @@ #endif account_consistency_ = ComputeAccountConsistencyMethod(profile_); -@@ -119,7 +110,6 @@ AccountConsistencyModeManager::~AccountC +@@ -123,7 +114,6 @@ AccountConsistencyModeManager::~AccountC // static void AccountConsistencyModeManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { @@ -2411,7 +2413,7 @@ } // static -@@ -201,16 +191,7 @@ AccountConsistencyModeManager::ComputeAc +@@ -205,16 +195,7 @@ AccountConsistencyModeManager::ComputeAc return AccountConsistencyMethod::kMirror; #endif @@ -2476,14 +2478,14 @@ #endif --- a/chrome/browser/signin/chrome_signin_client.cc +++ b/chrome/browser/signin/chrome_signin_client.cc -@@ -39,7 +39,6 @@ - #include "components/signin/core/browser/cookie_settings_util.h" +@@ -46,7 +46,6 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_client.h" + #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/identity_manager.h" - #include "components/signin/public/identity_manager/scope_set.h" + #include "components/signin/public/identity_manager/primary_account_change_event.h" --- a/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc +++ b/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc @@ -19,7 +19,6 @@ @@ -2516,15 +2518,15 @@ #include "content/public/browser/storage_partition.h" --- a/chrome/browser/signin/dice_web_signin_interceptor.cc +++ b/chrome/browser/signin/dice_web_signin_interceptor.cc -@@ -57,7 +57,6 @@ - #include "components/prefs/pref_service.h" +@@ -63,7 +63,6 @@ #include "components/prefs/scoped_user_pref_update.h" + #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/accounts_mutator.h" - #include "components/signin/public/identity_manager/identity_manager.h" -@@ -119,14 +118,8 @@ void DiceWebSigninInterceptor::RegisterP +@@ -245,16 +244,8 @@ void DiceWebSigninInterceptor::RegisterP registry->RegisterBooleanPref(prefs::kSigninInterceptionEnabled, true); registry->RegisterStringPref(prefs::kManagedAccountsSigninRestriction, std::string()); @@ -2536,9 +2538,23 @@ - registry->RegisterIntegerPref(prefs::kProfileSeparationDataMigrationSettings, - 1); - registry->RegisterListPref(prefs::kProfileSeparationDomainExceptionList); +- registry->RegisterStringPref( +- prefs::kUserCloudSigninPolicyResponseFromPolicyTestPage, std::string()); } absl::optional +@@ -1093,11 +1084,6 @@ void DiceWebSigninInterceptor:: + g_browser_process->browser_policy_connector(), + g_browser_process->system_network_context_manager() + ->GetSharedURLLoaderFactory()); +- account_level_signin_restriction_policy_fetcher_ +- ->GetManagedAccountsSigninRestriction( +- identity_manager_, account_info.account_id, std::move(callback), +- std::make_unique(profile_->GetPrefs()->GetString( +- prefs::kUserCloudSigninPolicyResponseFromPolicyTestPage))); + } + + void DiceWebSigninInterceptor:: --- a/chrome/browser/signin/header_modification_delegate_impl.cc +++ b/chrome/browser/signin/header_modification_delegate_impl.cc @@ -14,7 +14,6 @@ @@ -2916,14 +2932,14 @@ #include "content/public/browser/navigation_controller.h" --- a/chrome/browser/ui/browser_command_controller_unittest.cc +++ b/chrome/browser/ui/browser_command_controller_unittest.cc -@@ -30,7 +30,6 @@ - #include "chrome/test/base/testing_profile_manager.h" +@@ -33,7 +33,6 @@ + #include "components/bookmarks/browser/bookmark_model.h" #include "components/performance_manager/public/features.h" #include "components/policy/core/common/policy_pref_names.h" -#include "components/signin/public/base/signin_pref_names.h" #include "content/public/common/input/native_web_keyboard_event.h" + #include "content/public/test/web_contents_tester.h" #include "ui/events/keycodes/dom/dom_code.h" - #include "ui/events/keycodes/keyboard_codes.h" --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc @@ -74,7 +74,6 @@ @@ -3010,6 +3026,65 @@ product_specific_data["Is mainpage UI"] = false; product_specific_data["Is downloads page UI"] = false; product_specific_data["Is download prompt UI"] = false; +--- a/chrome/browser/ui/safety_hub/menu_notification_service.cc ++++ b/chrome/browser/ui/safety_hub/menu_notification_service.cc +@@ -20,7 +20,6 @@ + #include "chrome/browser/ui/safety_hub/safety_hub_service.h" + #include "chrome/browser/ui/safety_hub/unused_site_permissions_service.h" + #include "components/prefs/pref_service.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + + namespace { + SafetyHubModuleInfoElement::SafetyHubModuleInfoElement() = default; +@@ -83,15 +82,6 @@ SafetyHubMenuNotificationService::Safety + base::BindRepeating(&PasswordStatusCheckService::GetCachedResult, + base::Unretained(password_check_service)), + stored_notifications); +- +- // Listen for changes to the Safe Browsing pref to accommodate the trigger +- // logic. +- registrar_.Init(pref_service); +- registrar_.Add( +- prefs::kSafeBrowsingEnabled, +- base::BindRepeating( +- &SafetyHubMenuNotificationService::OnSafeBrowsingPrefUpdate, +- base::Unretained(this))); + } + + SafetyHubMenuNotificationService::~SafetyHubMenuNotificationService() { +--- a/chrome/browser/ui/safety_hub/safe_browsing_result.cc ++++ b/chrome/browser/ui/safety_hub/safe_browsing_result.cc +@@ -11,7 +11,6 @@ + #include "chrome/browser/ui/safety_hub/safety_hub_service.h" + #include "chrome/browser/ui/webui/settings/safety_hub_handler.h" + #include "chrome/grit/generated_resources.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "ui/base/l10n/l10n_util.h" + + SafetyHubSafeBrowsingResult::SafetyHubSafeBrowsingResult( +@@ -28,22 +27,6 @@ SafetyHubSafeBrowsingResult::~SafetyHubS + // static + absl::optional> + SafetyHubSafeBrowsingResult::GetResult(const PrefService* pref_service) { +- if (safe_browsing::IsEnhancedProtectionEnabled(*pref_service)) { +- return std::make_unique( +- SafeBrowsingState::kEnabledEnhanced); +- } +- if (safe_browsing::IsSafeBrowsingEnabled(*pref_service)) { +- return std::make_unique( +- SafeBrowsingState::kEnabledStandard); +- } +- if (safe_browsing::IsSafeBrowsingPolicyManaged(*pref_service)) { +- return std::make_unique( +- SafeBrowsingState::kDisabledByAdmin); +- } +- if (safe_browsing::IsSafeBrowsingExtensionControlled(*pref_service)) { +- return std::make_unique( +- SafeBrowsingState::kDisabledByExtension); +- } + return std::make_unique( + SafeBrowsingState::kDisabledByUser); + } --- a/chrome/browser/ui/startup/first_run_service.cc +++ b/chrome/browser/ui/startup/first_run_service.cc @@ -33,7 +33,6 @@ @@ -3071,7 +3146,7 @@ void SetFirstRunFinished(FirstRunService::FinishedReason reason) { --- a/chrome/browser/ui/toolbar/app_menu_model.cc +++ b/chrome/browser/ui/toolbar/app_menu_model.cc -@@ -88,7 +88,6 @@ +@@ -90,7 +90,6 @@ #include "components/prefs/pref_service.h" #include "components/profile_metrics/browser_profile_type.h" #include "components/signin/public/base/signin_metrics.h" @@ -3079,7 +3154,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" #include "components/vector_icons/vector_icons.h" -@@ -410,61 +409,7 @@ int ProfileSubMenuModel::GetAndIncrement +@@ -414,61 +413,7 @@ int ProfileSubMenuModel::GetAndIncrement } bool ProfileSubMenuModel::BuildSyncSection() { @@ -3158,10 +3233,10 @@ #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/public/base/consent_level.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" + #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" - #include "components/strings/grit/components_strings.h" - #include "components/vector_icons/vector_icons.h" -@@ -559,7 +558,6 @@ void ProfileMenuView::BuildAutofillButto +@@ -586,7 +585,6 @@ void ProfileMenuView::BuildAutofillButto void ProfileMenuView::BuildSyncInfo() { Profile* profile = browser()->profile(); @@ -3278,15 +3353,15 @@ #include "content/public/browser/download_manager.h" --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc -@@ -44,7 +44,6 @@ +@@ -46,7 +46,6 @@ #include "components/page_image_service/image_service.h" #include "components/page_image_service/image_service_handler.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" - #include "content/public/browser/web_ui.h" -@@ -124,8 +123,6 @@ content::WebUIDataSource* CreateAndAddHi +@@ -150,8 +149,6 @@ content::WebUIDataSource* CreateAndAddHi source->AddBoolean("allowDeletingHistory", allow_deleting_history); source->AddBoolean("isGuestSession", profile->IsGuestSession()); @@ -3305,6 +3380,41 @@ #include "components/strings/grit/components_strings.h" #include "components/supervised_user/core/common/pref_names.h" #include "content/public/browser/storage_partition.h" +--- a/chrome/browser/ui/webui/policy/policy_ui_handler.cc ++++ b/chrome/browser/ui/webui/policy/policy_ui_handler.cc +@@ -73,7 +73,6 @@ + #include "components/policy/proto/device_management_backend.pb.h" + #include "components/prefs/pref_change_registrar.h" + #include "components/prefs/pref_service.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/strings/grit/components_strings.h" + #include "content/public/browser/browser_task_traits.h" + #include "content/public/browser/browser_thread.h" +@@ -291,13 +290,6 @@ void PolicyUIHandler::HandleSetLocalTest + + CHECK(local_test_provider); + +-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) +- std::string profile_separation_policy_response = args[2].GetString(); +- Profile::FromWebUI(web_ui())->GetPrefs()->SetString( +- prefs::kUserCloudSigninPolicyResponseFromPolicyTestPage, +- profile_separation_policy_response); +-#endif +- + Profile::FromWebUI(web_ui()) + ->GetProfilePolicyConnector() + ->UseLocalTestPolicyProvider(); +@@ -309,10 +301,6 @@ void PolicyUIHandler::HandleSetLocalTest + + void PolicyUIHandler::HandleRevertLocalTestPolicies( + const base::Value::List& args) { +-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) +- Profile::FromWebUI(web_ui())->GetPrefs()->ClearPref( +- prefs::kUserCloudSigninPolicyResponseFromPolicyTestPage); +-#endif + Profile::FromWebUI(web_ui()) + ->GetProfilePolicyConnector() + ->RevertUseLocalTestPolicyProvider(); --- a/chrome/browser/ui/webui/profile_info_watcher.cc +++ b/chrome/browser/ui/webui/profile_info_watcher.cc @@ -12,7 +12,6 @@ @@ -3357,7 +3467,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -312,10 +311,6 @@ void PeopleHandler::RegisterMessages() { +@@ -316,10 +315,6 @@ void PeopleHandler::RegisterMessages() { void PeopleHandler::OnJavascriptAllowed() { PrefService* prefs = profile_->GetPrefs(); profile_pref_registrar_.Init(prefs); @@ -3380,7 +3490,7 @@ #include "content/public/browser/storage_partition.h" --- a/chrome/browser/ui/webui/settings/safety_hub_handler.cc +++ b/chrome/browser/ui/webui/settings/safety_hub_handler.cc -@@ -36,7 +36,6 @@ +@@ -39,7 +39,6 @@ #include "components/content_settings/core/common/features.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/permissions/constants.h" @@ -3388,10 +3498,11 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_engagement/content/site_engagement_service.h" -@@ -102,14 +101,6 @@ GetUnusedSitePermissionsFromDict( +@@ -107,15 +106,6 @@ GetUnusedSitePermissionsFromDict( // Returns the state of Safe Browsing setting. SafeBrowsingState GetSafeBrowsingState(PrefService* pref_service) { +- // TODO(crbug.com/1443466): Use SafeBrowsingResult from Safety Hub instead. - if (safe_browsing::IsEnhancedProtectionEnabled(*pref_service)) - return SafeBrowsingState::kEnabledEnhanced; - if (safe_browsing::IsSafeBrowsingEnabled(*pref_service)) @@ -3413,7 +3524,7 @@ #include "components/services/screen_ai/buildflags/buildflags.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/strings/grit/components_branded_strings.h" -@@ -3295,11 +3294,6 @@ void AddSiteSettingsStrings(content::Web +@@ -3342,11 +3341,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -3427,15 +3538,15 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -92,7 +92,6 @@ - #include "components/privacy_sandbox/tracking_protection_settings.h" +@@ -97,7 +97,6 @@ #include "components/safe_browsing/core/browser/hashprefix_realtime/hash_realtime_utils.h" #include "components/safe_browsing/core/common/features.h" + #include "components/search_engines/search_engine_choice_utils.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "content/public/browser/url_data_source.h" - #include "content/public/browser/web_contents.h" -@@ -293,9 +292,7 @@ SettingsUI::SettingsUI(content::WebUI* w +@@ -299,9 +298,7 @@ SettingsUI::SettingsUI(content::WebUI* w } #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -3472,6 +3583,40 @@ } bool SigninDelegateImpl::IsSignedIn() { +--- a/chrome/browser/ui/webui/signin/enterprise_profile_welcome_handler.cc ++++ b/chrome/browser/ui/webui/signin/enterprise_profile_welcome_handler.cc +@@ -32,7 +32,6 @@ + #include "chrome/grit/generated_resources.h" + #include "components/policy/core/browser/signin/profile_separation_policies.h" + #include "components/prefs/pref_service.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/identity_manager/account_info.h" + #include "components/strings/grit/components_strings.h" + #include "content/public/browser/web_contents.h" +@@ -320,23 +319,6 @@ base::Value::Dict EnterpriseProfileWelco + profile_creation_required_by_policy_ + ? IDS_ENTERPRISE_PROFILE_WELCOME_CREATE_PROFILE_BUTTON + : IDS_WELCOME_SIGNIN_VIEW_SIGNIN)); +-#if !BUILDFLAG(IS_CHROMEOS) +- // We apply the checkLinkDataCheckboxByDefault to true value only if the +- // link data checkbox is visible and the policy +- // ProfileSeparationDataMigrationSettings is set to its OPTOUT value (2) +- // or the legacy policy EnterpriseProfileCreationKeepBrowsingData is set +- // to True. +- bool profile_separation_data_migration_settings_optout = +- Profile::FromWebUI(web_ui())->GetPrefs()->GetInteger( +- prefs::kProfileSeparationDataMigrationSettings) == 2; +- bool check_link_Data_checkbox_by_default_from_legacy_policy = +- g_browser_process->local_state()->GetBoolean( +- prefs::kEnterpriseProfileCreationKeepBrowsingData); +- dict.Set("checkLinkDataCheckboxByDefault", +- show_link_data_option_ && +- (profile_separation_data_migration_settings_optout || +- check_link_Data_checkbox_by_default_from_legacy_policy)); +-#endif + break; + } + --- a/chrome/browser/ui/webui/signin/inline_login_handler.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc @@ -28,7 +28,6 @@ @@ -3541,7 +3686,7 @@ return SigninUIError::Other(email); if (!ChromeSigninClient::ProfileAllowsSigninCookies(profile)) -@@ -99,8 +98,7 @@ SigninUIError CanOfferSignin(Profile* pr +@@ -103,8 +102,7 @@ SigninUIError CanOfferSignin(Profile* pr // With force sign in enabled, cross account sign in is not allowed. if (signin_util::IsForceSigninEnabled() && IsCrossAccountError(profile, gaia_id)) { @@ -3551,7 +3696,7 @@ return SigninUIError::ProfileWasUsedByAnotherAccount(email, last_email); } } -@@ -110,7 +108,5 @@ SigninUIError CanOfferSignin(Profile* pr +@@ -114,7 +112,5 @@ SigninUIError CanOfferSignin(Profile* pr bool IsCrossAccountError(Profile* profile, const std::string& gaia_id) { DCHECK(!gaia_id.empty()); @@ -3562,7 +3707,7 @@ } --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc -@@ -43,7 +43,6 @@ +@@ -45,7 +45,6 @@ #include "components/policy/core/common/management/management_service.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/signin_metrics.h" @@ -3570,7 +3715,7 @@ #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -267,8 +266,7 @@ void TurnSyncOnHelper::TurnSyncOnInterna +@@ -272,8 +271,7 @@ void TurnSyncOnHelper::TurnSyncOnInterna // last authenticated account of the current profile, then Chrome will show a // confirmation dialog before starting sync. // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754). @@ -3580,6 +3725,39 @@ delegate_->ShowMergeSyncDataConfirmation( last_email, account_info_.email, base::BindOnce(&TurnSyncOnHelper::OnMergeAccountConfirmation, +--- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc ++++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc +@@ -33,7 +33,6 @@ + #include "chrome/common/url_constants.h" + #include "components/policy/core/browser/signin/profile_separation_policies.h" + #include "components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "google_apis/gaia/gaia_auth_util.h" + #include "third_party/abseil-cpp/absl/types/optional.h" + #include "third_party/skia/include/core/SkColor.h" +@@ -220,22 +219,6 @@ void TurnSyncOnHelperDelegateImpl::OnPro + std::move(callback).Run(signin::SIGNIN_CHOICE_CANCEL); + return; + } +-#if !BUILDFLAG(IS_CHROMEOS_LACROS) +- if (prompt_for_new_profile) { +- account_level_signin_restriction_policy_fetcher_ +- ->GetManagedAccountsSigninRestriction( +- IdentityManagerFactory::GetForProfile(browser_->profile()), +- account_info.account_id, +- base::BindOnce(&TurnSyncOnHelperDelegateImpl:: +- OnProfileSigninRestrictionsFetched, +- weak_ptr_factory_.GetWeakPtr(), account_info, +- std::move(callback)), +- std::make_unique( +- browser_->profile()->GetPrefs()->GetString( +- prefs::kUserCloudSigninPolicyResponseFromPolicyTestPage))); +- return; +- } +-#endif + DCHECK(!prompt_for_new_profile); + browser_->signin_view_controller()->ShowModalEnterpriseConfirmationDialog( + account_info, /*profile_creation_required_by_policy=*/false, --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc @@ -53,7 +53,6 @@ @@ -3669,7 +3847,7 @@ --- a/components/feed/core/v2/public/feed_service.cc +++ b/components/feed/core/v2/public/feed_service.cc -@@ -31,7 +31,6 @@ +@@ -32,7 +32,6 @@ #include "components/history/core/browser/history_types.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" @@ -3677,7 +3855,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "net/base/network_change_notifier.h" #include "services/network/public/cpp/shared_url_loader_factory.h" -@@ -166,7 +165,7 @@ class FeedService::StreamDelegateImpl : +@@ -172,7 +171,7 @@ class FeedService::StreamDelegateImpl : // Returns if signin is allowed on Android. Return true on other platform so // behavior is unchanged there. bool IsSigninAllowed() override { @@ -3696,23 +3874,22 @@ #include "base/ranges/algorithm.h" #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" #include "third_party/re2/src/re2/re2.h" ---- a/components/password_manager/core/browser/leak_detection_delegate.cc -+++ b/components/password_manager/core/browser/leak_detection_delegate.cc -@@ -19,7 +19,6 @@ - #include "components/password_manager/core/common/password_manager_features.h" +--- a/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc ++++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc +@@ -18,7 +18,6 @@ + #include "components/password_manager/core/browser/leak_detection/single_lookup_response.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - #include "services/network/public/cpp/shared_url_loader_factory.h" - - namespace password_manager { -@@ -160,28 +159,7 @@ void LeakDetectionDelegate::OnError(Leak - - bool CanStartLeakCheck(const PrefService& prefs, - PasswordManagerClient* client) { + #include "components/signin/public/identity_manager/access_token_fetcher.h" + #include "components/signin/public/identity_manager/access_token_info.h" + #include "components/signin/public/identity_manager/identity_manager.h" +@@ -227,30 +226,7 @@ void LeakDetectionCheckImpl::Start(LeakD + bool LeakDetectionCheck::CanStartLeakCheck( + const PrefService& prefs, + std::unique_ptr logger) { - const bool is_leak_protection_on = -- prefs.GetBoolean(password_manager::prefs::kPasswordLeakDetectionEnabled); -- +- prefs.GetBoolean(prefs::kPasswordLeakDetectionEnabled); - // Leak detection can only start if: - // 1. The user has not opted out and Safe Browsing is turned on, or - // 2. The user is an enhanced protection user @@ -3720,22 +3897,34 @@ - safe_browsing::GetSafeBrowsingState(prefs); - switch (sb_state) { - case safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING: -- LogString(client, Logger::STRING_LEAK_DETECTION_DISABLED_SAFE_BROWSING); -- return false; +- if (logger) { +- logger->LogMessage(autofill::SavePasswordProgressLogger:: +- STRING_LEAK_DETECTION_DISABLED_SAFE_BROWSING); +- } + return false; - case safe_browsing::SafeBrowsingState::STANDARD_PROTECTION: -- if (!is_leak_protection_on) -- LogString(client, Logger::STRING_LEAK_DETECTION_DISABLED_FEATURE); +- if (!is_leak_protection_on && logger) { +- logger->LogMessage(autofill::SavePasswordProgressLogger:: +- STRING_LEAK_DETECTION_DISABLED_FEATURE); +- } - return is_leak_protection_on; - case safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION: - // feature is on. -- break; +- return true; - } -- -- return true; -+ return false; } - } // namespace password_manager + void LeakDetectionCheckImpl::OnAccessTokenRequestCompleted( +--- a/components/password_manager/core/browser/leak_detection_delegate.cc ++++ b/components/password_manager/core/browser/leak_detection_delegate.cc +@@ -20,7 +20,6 @@ + #include "components/password_manager/core/common/password_manager_features.h" + #include "components/password_manager/core/common/password_manager_pref_names.h" + #include "components/prefs/pref_service.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "services/network/public/cpp/shared_url_loader_factory.h" + + namespace password_manager { --- a/components/password_manager/core/browser/password_reuse_detector.cc +++ b/components/password_manager/core/browser/password_reuse_detector.cc @@ -17,7 +17,6 @@ @@ -3791,7 +3980,7 @@ void PasswordReuseManagerImpl::RequestLoginsFromStores() { --- a/components/password_manager/core/browser/password_store.cc +++ b/components/password_manager/core/browser/password_store.cc -@@ -37,7 +37,6 @@ +@@ -36,7 +36,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" @@ -3809,7 +3998,7 @@ #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" -@@ -95,11 +94,6 @@ bool IsGaiaCredentialPage(const std::str +@@ -96,11 +95,6 @@ bool IsGaiaCredentialPage(const std::str bool ShouldSaveEnterprisePasswordHash(const PasswordForm& form, const PrefService& prefs) { @@ -3937,7 +4126,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc +++ b/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc -@@ -20,7 +20,6 @@ +@@ -21,7 +21,6 @@ #include "components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager_util.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/core/common/features.h" @@ -3945,7 +4134,7 @@ #include "components/safe_browsing/core/common/utils.h" #include "components/sessions/content/session_tab_helper.h" #include "content/public/browser/browser_context.h" -@@ -390,7 +389,7 @@ GURL SafeBrowsingNavigationObserverManag +@@ -391,7 +390,7 @@ GURL SafeBrowsingNavigationObserverManag bool SafeBrowsingNavigationObserverManager::IsEnabledAndReady( PrefService* prefs, bool has_safe_browsing_service) { @@ -3999,10 +4188,12 @@ --- a/components/safe_browsing/content/browser/triggers/trigger_throttler.cc +++ b/components/safe_browsing/content/browser/triggers/trigger_throttler.cc -@@ -147,28 +147,6 @@ void TriggerThrottler::LoadTriggerEvents +@@ -145,30 +145,6 @@ void TriggerThrottler::CleanupOldEvents( + + void TriggerThrottler::LoadTriggerEventsFromPref() { trigger_events_.clear(); - if (!local_state_prefs_) - return; +- if (!local_state_prefs_) +- return; - - const base::Value::Dict& event_dict = - local_state_prefs_->GetDict(prefs::kSafeBrowsingTriggerEventTimestamps); @@ -4022,13 +4213,13 @@ - for (const auto& timestamp : trigger_pair.second.GetList()) { - if (timestamp.is_double()) - trigger_events_[trigger_type].push_back( -- base::Time::FromDoubleT(timestamp.GetDouble())); +- base::Time::FromSecondsSinceUnixEpoch(timestamp.GetDouble())); - } - } } void TriggerThrottler::WriteTriggerEventsToPref() { -@@ -185,9 +163,6 @@ void TriggerThrottler::WriteTriggerEvent +@@ -185,9 +161,6 @@ void TriggerThrottler::WriteTriggerEvent trigger_dict.Set(base::NumberToString(static_cast(trigger_item.first)), std::move(timestamps)); } @@ -4070,7 +4261,7 @@ #include "components/security_interstitials/content/unsafe_resource_util.h" --- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc +++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc -@@ -37,7 +37,6 @@ +@@ -38,7 +38,6 @@ #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" #include "components/safe_browsing/core/common/proto/safebrowsingv5.pb.h" @@ -4078,7 +4269,7 @@ #include "content/public/browser/global_routing_id.h" #include "services/network/public/mojom/cookie_manager.mojom.h" #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -1716,17 +1715,7 @@ std::string SerializeHitReport(const Hit +@@ -1735,17 +1734,7 @@ std::string SerializeHitReport(const Hit } hit_report_dict.Set("threat_source", threat_source); std::string extended_reporting_level; @@ -4096,7 +4287,7 @@ hit_report_dict.Set("extended_reporting_level", extended_reporting_level); hit_report_dict.Set("is_enhanced_protection", hit_report.is_enhanced_protection); -@@ -2773,18 +2762,13 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -2798,18 +2787,13 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); DCHECK(!args.empty()); std::string callback_id = args[0].GetString(); @@ -4126,7 +4317,7 @@ #include "url/gurl.h" namespace safe_browsing { -@@ -52,7 +51,6 @@ struct HitReport { +@@ -54,7 +53,6 @@ struct HitReport { // NOTE(vakh): Unused at the moment, but may be used later. std::string population_id; @@ -4240,7 +4431,7 @@ // information in the full hash request. --- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc +++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc -@@ -90,7 +90,6 @@ void SetSbV4UrlPrefixForTesting(const ch +@@ -89,7 +89,6 @@ void SetSbV4UrlPrefixForTesting(const ch std::string GetReportUrl(const V4ProtocolConfig& config, const std::string& method, @@ -4248,7 +4439,7 @@ const bool is_enhanced_protection) { std::string url = base::StringPrintf( "%s/%s?client=%s&appver=%s&pver=4.0", kSbReportsURLPrefix, method.c_str(), -@@ -100,8 +99,6 @@ std::string GetReportUrl(const V4Protoco +@@ -99,8 +98,6 @@ std::string GetReportUrl(const V4Protoco base::StringAppendF(&url, "&key=%s", base::EscapeQueryParamValue(api_key, true).c_str()); } @@ -4574,7 +4765,7 @@ unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged, base::Unretained(this))); -@@ -140,8 +135,7 @@ bool RealTimeUrlLookupService::CanSendPa +@@ -141,8 +136,7 @@ bool RealTimeUrlLookupService::CanSendPa } bool RealTimeUrlLookupService::CanCheckSubresourceURL() const { @@ -4584,7 +4775,7 @@ } bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const { -@@ -158,9 +152,7 @@ bool RealTimeUrlLookupService::CanCheckS +@@ -159,9 +153,7 @@ bool RealTimeUrlLookupService::CanCheckS } bool RealTimeUrlLookupService::CanSendRTSampleRequest() const { @@ -4595,7 +4786,7 @@ } void RealTimeUrlLookupService::Shutdown() { -@@ -237,14 +229,6 @@ double RealTimeUrlLookupService::GetMinA +@@ -238,14 +230,6 @@ double RealTimeUrlLookupService::GetMinA void RealTimeUrlLookupService::MaybeLogLastProtegoPingTimeToPrefs( bool sent_with_token) { @@ -4802,7 +4993,7 @@ } void SafeBrowsingMetricsCollector::AddBypassEventToPref( -@@ -266,15 +141,7 @@ absl::optional +@@ -269,15 +144,7 @@ absl::optional SafeBrowsingMetricsCollector::GetLatestEventTimestamp( EventTypeFilter event_type_filter) { // Events are not logged when Safe Browsing is disabled. @@ -4818,7 +5009,7 @@ } absl::optional -@@ -286,45 +153,15 @@ SafeBrowsingMetricsCollector::GetLatestS +@@ -289,45 +156,15 @@ SafeBrowsingMetricsCollector::GetLatestS void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref( UserState user_state, EventType event_type) { @@ -4865,7 +5056,7 @@ } absl::optional -@@ -452,23 +289,6 @@ int SafeBrowsingMetricsCollector::GetEve +@@ -455,23 +292,6 @@ int SafeBrowsingMetricsCollector::GetEve }); } @@ -5251,7 +5442,7 @@ #include "components/safe_browsing/core/common/safebrowsing_referral_methods.h" #include "components/security_interstitials/content/settings_page_helper.h" #include "components/security_interstitials/core/metrics_helper.h" -@@ -118,11 +117,6 @@ SecurityInterstitialControllerClient::Ge +@@ -114,11 +113,6 @@ SecurityInterstitialControllerClient::Ge return prefs_; } @@ -5284,7 +5475,7 @@ #include "components/security_interstitials/content/security_interstitial_controller_client.h" #include "components/security_interstitials/core/common_string_util.h" #include "content/public/browser/page_navigator.h" -@@ -32,13 +31,6 @@ SecurityInterstitialPage::SecurityInters +@@ -31,13 +30,6 @@ SecurityInterstitialPage::SecurityInters on_show_extended_reporting_pref_exists_(false), on_show_extended_reporting_pref_value_(false), controller_(std::move(controller)) { @@ -5298,7 +5489,7 @@ SetUpMetrics(); } -@@ -86,15 +78,8 @@ SecurityInterstitialControllerClient* Se +@@ -85,15 +77,8 @@ SecurityInterstitialControllerClient* Se } void SecurityInterstitialPage::SetUpMetrics() { @@ -5350,15 +5541,15 @@ // Link to the help center. --- a/components/send_tab_to_self/entry_point_display_reason.cc +++ b/components/send_tab_to_self/entry_point_display_reason.cc -@@ -9,7 +9,6 @@ - #include "components/send_tab_to_self/features.h" +@@ -8,7 +8,6 @@ + #include "components/prefs/pref_service.h" #include "components/send_tab_to_self/send_tab_to_self_model.h" #include "components/send_tab_to_self/send_tab_to_self_sync_service.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/sync/service/sync_service.h" #include "components/sync/service/sync_user_settings.h" -@@ -21,15 +20,7 @@ namespace { +@@ -20,15 +19,7 @@ namespace { bool ShouldOfferSignin(syncer::SyncService* sync_service, PrefService* pref_service) { @@ -5400,7 +5591,7 @@ - - // TODO(crbug.com/1121923): Refactor to use signin::PersistentRepeatingTimer - // instead. -- Time previous = Time::FromDoubleT( +- Time previous = Time::FromSecondsSinceUnixEpoch( - pref_service_->GetDouble(prefs::kGaiaCookiePeriodicReportTime)); - if (previous.is_null()) - previous = Time::Now(); @@ -5425,7 +5616,7 @@ ReportingType::ON_CHANGE); - pref_service_->SetString(prefs::kGaiaCookieHash, new_hash); - pref_service_->SetDouble(prefs::kGaiaCookieChangedTime, -- Time::Now().ToDoubleT()); +- Time::Now().InSecondsFSinceUnixEpoch()); } else if (currently_authenticated && !previously_authenticated_) { SignedInAccountRelationReport(signed_in_accounts, signed_out_accounts, ReportingType::ON_CHANGE); @@ -5434,7 +5625,7 @@ periodic_pending_ = false; - pref_service_->SetDouble(prefs::kGaiaCookiePeriodicReportTime, -- Time::Now().ToDoubleT()); +- Time::Now().InSecondsFSinceUnixEpoch()); - timer_.Start(FROM_HERE, kPeriodicReportingInterval, this, - &AccountInvestigator::TryPeriodicReport); } @@ -5444,7 +5635,7 @@ const std::vector& signed_out_accounts, const Time now, const ReportingType type) { -- const Time last_changed = Time::FromDoubleT( +- const Time last_changed = Time::FromSecondsSinceUnixEpoch( - pref_service_->GetDouble(prefs::kGaiaCookieChangedTime)); + const Time last_changed = Time::Now(); base::TimeDelta stable_age; @@ -5750,7 +5941,7 @@ #include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h" #include "google_apis/credentials_mode.h" #include "google_apis/gaia/gaia_constants.h" -@@ -438,9 +437,7 @@ GaiaCookieManagerService::GaiaCookieMana +@@ -437,9 +436,7 @@ GaiaCookieManagerService::GaiaCookieMana listAccountsUnexpectedServerResponseRetried_(false), external_cc_result_fetched_(false), list_accounts_stale_(true) { @@ -5761,7 +5952,7 @@ if (!gaia_cookie_last_list_accounts_data.empty()) { if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data, -@@ -464,8 +461,6 @@ GaiaCookieManagerService::~GaiaCookieMan +@@ -463,8 +460,6 @@ GaiaCookieManagerService::~GaiaCookieMan // static void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) { @@ -5770,7 +5961,7 @@ } void GaiaCookieManagerService::InitCookieListener() { -@@ -728,16 +723,12 @@ void GaiaCookieManagerService::OnListAcc +@@ -727,16 +722,12 @@ void GaiaCookieManagerService::OnListAcc &signed_out_accounts_)) { listed_accounts_.clear(); signed_out_accounts_.clear(); @@ -5819,15 +6010,15 @@ #include "components/signin/public/webdata/token_web_data.h" --- a/components/signin/internal/identity_manager/primary_account_manager.cc +++ b/components/signin/internal/identity_manager/primary_account_manager.cc -@@ -23,7 +23,6 @@ +@@ -24,7 +24,6 @@ #include "components/signin/public/base/account_consistency_method.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" - #include "third_party/abseil-cpp/absl/types/variant.h" - -@@ -139,24 +138,10 @@ PrimaryAccountManager::~PrimaryAccountMa + #include "components/signin/public/identity_manager/account_info.h" + #include "google_apis/gaia/core_account_id.h" +@@ -174,68 +173,13 @@ PrimaryAccountManager::~PrimaryAccountMa // static void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { @@ -5851,64 +6042,127 @@ - std::string()); } - void PrimaryAccountManager::Initialize(PrefService* local_state) { -@@ -164,27 +149,9 @@ void PrimaryAccountManager::Initialize(P - DCHECK(!IsInitialized()); - initialized_ = true; - + void PrimaryAccountManager::PrepareToLoadPrefs() { +- // Check this method is only called before loading the primary account. +- CHECK(!IsInitialized()); +- +- PrefService* prefs = client_->GetPrefs(); +- - // If the user is clearing the token service from the command line, then - // clear their login info also (not valid to be logged in without any - // tokens). - base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); - ScopedPrefCommit scoped_pref_commit(client_->GetPrefs(), - /*commit_on_destroy*/ false); -- if (cmd_line->HasSwitch(switches::kClearTokenService)) -- SetPrimaryAccountInternal(CoreAccountInfo(), false, scoped_pref_commit); +- if (cmd_line->HasSwitch(switches::kClearTokenService)) { +- prefs->SetString(prefs::kGoogleServicesAccountId, ""); +- prefs->SetBoolean(prefs::kGoogleServicesConsentedToSync, false); +- } - - std::string pref_account_id = -- client_->GetPrefs()->GetString(prefs::kGoogleServicesAccountId); +- prefs->GetString(prefs::kGoogleServicesAccountId); - - // Initial value for the kGoogleServicesConsentedToSync preference if it is - // missing. - const PrefService::Preference* consented_pref = -- client_->GetPrefs()->FindPreference( -- prefs::kGoogleServicesConsentedToSync); +- prefs->FindPreference(prefs::kGoogleServicesConsentedToSync); - if (consented_pref->IsDefaultValue()) { -- client_->GetPrefs()->SetBoolean(prefs::kGoogleServicesConsentedToSync, -- !pref_account_id.empty()); +- prefs->SetBoolean(prefs::kGoogleServicesConsentedToSync, +- !pref_account_id.empty()); - } -+ std::string pref_account_id; +- +-#if BUILDFLAG(IS_CHROMEOS_ASH) +- // Migrate primary account ID from email to Gaia ID if needed. +- if (!pref_account_id.empty()) { +- if (account_tracker_service_->GetMigrationState() == +- AccountTrackerService::MIGRATION_IN_PROGRESS) { +- CoreAccountInfo account_info = +- account_tracker_service_->FindAccountInfoByEmail(pref_account_id); +- // |account_info.gaia| could be empty if |account_id| is already gaia id. +- if (!account_info.gaia.empty()) { +- pref_account_id = account_info.gaia; +- prefs->SetString(prefs::kGoogleServicesAccountId, account_info.gaia); +- } +- } +- } +-#endif + } - #if BUILDFLAG(IS_CHROMEOS_ASH) - if (!pref_account_id.empty()) { -@@ -195,15 +162,13 @@ void PrimaryAccountManager::Initialize(P - // |account_info.gaia| could be empty if |account_id| is already gaia id. - if (!account_info.gaia.empty()) { - pref_account_id = account_info.gaia; -- client_->GetPrefs()->SetString(prefs::kGoogleServicesAccountId, -- account_info.gaia); - } - } + std::pair +@@ -263,46 +207,10 @@ PrimaryAccountManager::GetOrRestorePrima + kEmptyAccountInfo_RestoreFailedNotSyncConsented); } - #endif - bool consented = -- client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync); +- PrefService* prefs = client_->GetPrefs(); +- std::string last_syncing_gaia_id = +- prefs->GetString(prefs::kGoogleServicesLastSyncingGaiaId); +- if (last_syncing_gaia_id.empty()) { +- return std::make_pair(CoreAccountInfo(), +- InitializeAccountInfoState:: +- kEmptyAccountInfo_RestoreFailedNoLastSyncGaiaId); +- } +- std::string last_syncing_email = +- prefs->GetString(prefs::kGoogleServicesLastSyncingUsername); +- if (last_syncing_email.empty()) { +- return std::make_pair(CoreAccountInfo(), +- InitializeAccountInfoState:: +- kEmptyAccountInfo_RestoreFailedNoLastSyncEmail); +- } +- +- if (account_id != account_tracker_service_->PickAccountIdForAccount( +- last_syncing_gaia_id, last_syncing_email)) { +- return std::make_pair( +- CoreAccountInfo(), +- InitializeAccountInfoState:: +- kEmptyAccountInfo_RestoreFailedAccountIdDontMatch); +- } +- +- if (base::FeatureList::IsEnabled(kRestorePrimaryAccountInfo)) { +- CHECK_EQ(account_id, +- account_tracker_service_->SeedAccountInfo( +- last_syncing_gaia_id, last_syncing_email, +- signin_metrics::AccessPoint:: +- ACCESS_POINT_RESTORE_PRIMARY_ACCOUNT_ON_PROFILE_LOAD)); +- +- return std::make_pair(account_tracker_service_->GetAccountInfo(account_id), +- InitializeAccountInfoState:: +- kEmptyAccountInfo_RestoreSuccessFromLastSyncInfo); +- } else { + return std::make_pair( + CoreAccountInfo(), + InitializeAccountInfoState:: + kEmptyAccountInfo_RestoreFailedAsRestoreFeatureIsDisabled); +- } + } + + void PrimaryAccountManager::Initialize() { +@@ -312,11 +220,9 @@ void PrimaryAccountManager::Initialize() + // Prepare prefs before loading them. + PrepareToLoadPrefs(); + +- PrefService* prefs = client_->GetPrefs(); +- std::string pref_account_id = +- prefs->GetString(prefs::kGoogleServicesAccountId); ++ std::string pref_account_id; + bool pref_consented_to_sync = +- prefs->GetBoolean(prefs::kGoogleServicesConsentedToSync); + false; - CoreAccountId account_id = CoreAccountId::FromString(pref_account_id); - CoreAccountInfo account_info = - account_tracker_service_->GetAccountInfo(account_id); -@@ -287,8 +252,7 @@ void PrimaryAccountManager::SetSyncPrima + LogPrimaryAccountPrefsOnInitialize(pref_account_id, pref_consented_to_sync); - #if DCHECK_IS_ON() - { -- std::string pref_account_id = -- client_->GetPrefs()->GetString(prefs::kGoogleServicesAccountId); -+ std::string pref_account_id; - bool consented_to_sync = - client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync); - -@@ -309,10 +273,6 @@ void PrimaryAccountManager::SetSyncPrima + ScopedPrefCommit scoped_pref_commit(client_->GetPrefs(), +@@ -334,13 +240,6 @@ void PrimaryAccountManager::Initialize() + if (pref_consented_to_sync && !account_info.IsEmpty()) { + SetPrimaryAccountInternal(account_info, /*consented_to_sync=*/true, + scoped_pref_commit); +- +- // Ensure that the last syncing account data is consistent with the +- // primary account. +- scoped_pref_commit.SetString(prefs::kGoogleServicesLastSyncingGaiaId, +- account_info.gaia); +- scoped_pref_commit.SetString(prefs::kGoogleServicesLastSyncingUsername, +- account_info.email); + } else { + SetPrimaryAccountInternal(account_info, /*consented_to_sync=*/false, + scoped_pref_commit); +@@ -442,30 +341,12 @@ 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. @@ -5919,23 +6173,27 @@ } void PrimaryAccountManager::SetPrimaryAccountInternal( -@@ -322,15 +282,6 @@ void PrimaryAccountManager::SetPrimaryAc - primary_account_info_ = account_info; - - const std::string& account_id = primary_account_info_.account_id.ToString(); + const CoreAccountInfo& account_info, + bool consented_to_sync, + ScopedPrefCommit& scoped_pref_commit) { +- primary_account_info_ = account_info; +- +- const std::string& account_id = primary_account_info_.account_id.ToString(); - if (account_id.empty()) { - DCHECK(!consented_to_sync); +- consented_to_sync_ = false; - scoped_pref_commit.SetString(prefs::kGoogleServicesAccountId, ""); - scoped_pref_commit.SetBoolean(prefs::kGoogleServicesConsentedToSync, false); - } else { +- consented_to_sync_ = consented_to_sync; - scoped_pref_commit.SetString(prefs::kGoogleServicesAccountId, account_id); - scoped_pref_commit.SetBoolean(prefs::kGoogleServicesConsentedToSync, -- consented_to_sync); +- consented_to_sync_); - } } void PrimaryAccountManager::RecordHadPreviousSyncAccount() const { -@@ -340,7 +291,7 @@ void PrimaryAccountManager::RecordHadPre +@@ -475,7 +356,7 @@ void PrimaryAccountManager::RecordHadPre } const std::string& last_gaia_id_with_sync_enabled = @@ -5944,16 +6202,6 @@ const bool existed_primary_account_with_sync = !last_gaia_id_with_sync_enabled.empty(); -@@ -358,8 +309,7 @@ void PrimaryAccountManager::RecordHadPre - - bool PrimaryAccountManager::HasPrimaryAccount( - signin::ConsentLevel consent_level) const { -- bool consented_pref = -- client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync); -+ bool consented_pref = false; - if (primary_account_info().account_id.empty()) { - DCHECK(!consented_pref); - return false; --- a/components/signin/internal/identity_manager/primary_account_manager_unittest.cc +++ b/components/signin/internal/identity_manager/primary_account_manager_unittest.cc @@ -28,7 +28,6 @@ @@ -5963,7 +6211,7 @@ -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/base/test_signin_client.h" - #include "components/sync_preferences/testing_pref_service_syncable.h" + #include "components/signin/public/identity_manager/account_info.h" --- a/components/signin/internal/identity_manager/primary_account_mutator_impl.cc +++ b/components/signin/internal/identity_manager/primary_account_mutator_impl.cc @@ -15,7 +15,6 @@ @@ -5993,7 +6241,7 @@ #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_access_token_consumer.h" -@@ -137,8 +136,6 @@ bool ProfileOAuth2TokenService::HasRefre +@@ -132,8 +131,6 @@ bool ProfileOAuth2TokenService::HasRefre // static void ProfileOAuth2TokenService::RegisterProfilePrefs( PrefRegistrySimple* registry) { @@ -6171,7 +6419,7 @@ }; } // namespace -@@ -137,13 +128,6 @@ void SupervisedUserPrefStore::OnNewSetti +@@ -142,13 +133,6 @@ void SupervisedUserPrefStore::OnNewSetti safe_search_api::YOUTUBE_RESTRICT_MODERATE); #endif prefs_->SetBoolean(policy::policy_prefs::kHideWebStoreIcon, false); @@ -6205,25 +6453,26 @@ kSyncedDefaultSearchProviderGUID = 49, kPrefForceTriggerTranslateCount = 50, // kPrefNeverPromptSitesDeprecated = 51, (deprecated) -@@ -251,15 +248,9 @@ const auto& SyncablePreferences() { - {payments::kCanMakePaymentEnabled, - {syncable_prefs_ids::kCanMakePaymentEnabled, syncer::PREFERENCES, - false, MergeBehavior::kNone}}, -- {prefs::kAccountTailoredSecurityUpdateTimestamp, -- {syncable_prefs_ids::kAccountTailoredSecurityUpdateTimestamp, -- syncer::PRIORITY_PREFERENCES, false, MergeBehavior::kNone}}, - {prefs::kCookieControlsMode, - {syncable_prefs_ids::kCookieControlsMode, syncer::PREFERENCES, - false, MergeBehavior::kNone}}, -- {prefs::kSafeBrowsingEnabled, -- {syncable_prefs_ids::kSafeBrowsingEnabled, syncer::PREFERENCES, -- false, MergeBehavior::kNone}}, +@@ -262,16 +259,9 @@ const auto& SyncablePreferences() { + {payments::kCanMakePaymentEnabled, + {syncable_prefs_ids::kCanMakePaymentEnabled, syncer::PREFERENCES, + PrefSensitivity::kNone, MergeBehavior::kNone}}, +- {prefs::kAccountTailoredSecurityUpdateTimestamp, +- {syncable_prefs_ids::kAccountTailoredSecurityUpdateTimestamp, +- syncer::PRIORITY_PREFERENCES, PrefSensitivity::kNone, +- MergeBehavior::kNone}}, + {prefs::kCookieControlsMode, + {syncable_prefs_ids::kCookieControlsMode, syncer::PREFERENCES, + PrefSensitivity::kNone, MergeBehavior::kNone}}, +- {prefs::kSafeBrowsingEnabled, +- {syncable_prefs_ids::kSafeBrowsingEnabled, syncer::PREFERENCES, +- PrefSensitivity::kNone, MergeBehavior::kNone}}, // TODO(crbug.com/1434910): Maybe move to chrome_syncable_prefs_database.cc, // see bug. #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -108216,7 +108216,6 @@ Full version information for the fingerp +@@ -109451,7 +109451,6 @@ Full version information for the fingerp @@ -6231,7 +6480,7 @@ -@@ -108231,10 +108230,7 @@ Full version information for the fingerp +@@ -109466,10 +109465,7 @@ Full version information for the fingerp diff --git a/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch b/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch index 8c6f23f1..45ae2a29 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 @@ -6,7 +6,7 @@ "google": { - "name": "Google", - "keyword": "google.com", -- "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico", +- "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_alldp.ico", - "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}", - "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google: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 542e3598..974e773c 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 -@@ -163,6 +163,7 @@ +@@ -165,6 +165,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/strings/grit/components_strings.h" #include "components/supervised_user/core/common/buildflags.h" @@ -9,7 +9,7 @@ #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" -@@ -2031,6 +2032,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -2044,6 +2045,7 @@ void RenderViewContextMenu::AppendPageIt menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); if (CanTranslate(/*menu_logging=*/true)) { @@ -88,7 +88,7 @@ translate_event->set_ranker_version(GetModelVersion()); --- a/components/translate/core/browser/translate_script.cc +++ b/components/translate/core/browser/translate_script.cc -@@ -136,8 +136,13 @@ void TranslateScript::OnScriptFetchCompl +@@ -137,8 +137,13 @@ void TranslateScript::OnScriptFetchCompl server_params.c_str()); GURL security_origin = translate::GetTranslateSecurityOrigin(); diff --git a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch index 04034944..d23fec91 100644 --- a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch +++ b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch @@ -9,7 +9,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2539,6 +2539,7 @@ static_library("browser") { +@@ -2575,6 +2575,7 @@ static_library("browser") { "//third_party/libyuv", "//third_party/metrics_proto", "//third_party/re2", @@ -19,14 +19,14 @@ "//third_party/widevine/cdm:headers", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -162,6 +162,7 @@ - #include "components/translate/core/browser/translate_ranker_impl.h" +@@ -167,6 +167,7 @@ #include "components/translate/core/common/translate_util.h" + #include "components/trusted_vault/features.h" #include "components/ui_devtools/switches.h" +#include "components/ungoogled/ungoogled_switches.h" - #include "components/variations/service/google_groups_updater_service.h" #include "components/variations/variations_switches.h" #include "components/version_info/version_info.h" + #include "components/viz/common/features.h" --- a/chrome/browser/bromite_flag_entries.h +++ b/chrome/browser/bromite_flag_entries.h @@ -4,4 +4,12 @@ @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -245,6 +245,7 @@ source_set("browser") { +@@ -247,6 +247,7 @@ source_set("browser") { "//third_party/libyuv", "//third_party/re2", "//third_party/sqlite", @@ -54,15 +54,15 @@ "//third_party/zlib/google:zip", --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -76,6 +76,7 @@ +@@ -77,6 +77,7 @@ #include "components/services/storage/public/cpp/quota_error_or.h" #include "components/services/storage/public/mojom/cache_storage_control.mojom.h" #include "components/tracing/common/tracing_switches.h" +#include "components/ungoogled/ungoogled_switches.h" #include "components/viz/common/switches.h" #include "components/viz/host/gpu_client.h" - #include "content/browser/attribution_reporting/attribution_manager.h" -@@ -3346,6 +3347,8 @@ void RenderProcessHostImpl::PropagateBro + #include "content/browser/bad_message.h" +@@ -3420,6 +3421,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLImageChromium, switches::kEnableWebGPUDeveloperFeatures, switches::kFileUrlPathAlias, @@ -73,7 +73,7 @@ switches::kForceGpuMemAvailableMb, --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn -@@ -102,6 +102,7 @@ target(link_target_type, "child") { +@@ -103,6 +103,7 @@ target(link_target_type, "child") { "//third_party/blink/public/common:buildflags", "//third_party/blink/public/strings", "//third_party/ced", @@ -83,7 +83,7 @@ "//ui/events/blink", --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -39,6 +39,7 @@ +@@ -40,6 +40,7 @@ #include "third_party/blink/public/common/loader/referrer_utils.h" #include "third_party/blink/public/common/switches.h" #include "third_party/blink/public/platform/web_runtime_features.h" @@ -91,7 +91,7 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -465,6 +466,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -475,6 +476,10 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kEnableWebGPUDeveloperFeatures, true}, {wrf::EnableDirectSockets, switches::kEnableIsolatedWebAppsInRenderer, true}, @@ -104,9 +104,9 @@ for (const auto& mapping : switchToFeatureMapping) { --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -68,6 +68,9 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe - static void EnableOverlayScrollbars(bool); +@@ -69,6 +69,9 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe static void EnableFluentScrollbars(bool); + static void EnableFluentOverlayScrollbars(bool); + static void EnableFingerprintingClientRectsNoise(bool); + static void EnableFingerprintingCanvasMeasureTextNoise(bool); @@ -139,7 +139,7 @@ SelectorQueryCache& Document::GetSelectorQueryCache() { if (!selector_query_cache_) selector_query_cache_ = std::make_unique(); -@@ -2295,6 +2304,15 @@ void Document::UpdateStyleAndLayoutTreeF +@@ -2318,6 +2327,15 @@ void Document::UpdateStyleAndLayoutTreeF #if DCHECK_IS_ON() AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */); #endif @@ -157,7 +157,7 @@ void Document::InvalidateStyleAndLayoutForFontUpdates() { --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -532,6 +532,10 @@ class CORE_EXPORT Document : public Cont +@@ -511,6 +511,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -168,7 +168,7 @@ AtomicString visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -2427,6 +2431,9 @@ class CORE_EXPORT Document : public Cont +@@ -2413,6 +2417,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -180,7 +180,7 @@ --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2144,6 +2144,11 @@ DOMRectList* Element::getClientRects() { +@@ -2123,6 +2123,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads, *element_layout_object); @@ -192,7 +192,7 @@ return MakeGarbageCollected(quads); } -@@ -2171,6 +2176,9 @@ gfx::RectF Element::GetBoundingClientRec +@@ -2150,6 +2155,9 @@ gfx::RectF Element::GetBoundingClientRec DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -229,7 +229,7 @@ // TODO(editing-dev): We should make --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc -@@ -68,6 +68,24 @@ TextMetrics::TextMetrics(const Font& fon +@@ -69,6 +69,24 @@ TextMetrics::TextMetrics(const Font& fon Update(font, direction, baseline, align, text); } @@ -267,7 +267,7 @@ const TextDirection&, --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -53,6 +53,9 @@ +@@ -56,6 +56,9 @@ #include "ui/gfx/geometry/quad_f.h" #include "ui/gfx/geometry/skia_conversions.h" @@ -277,7 +277,7 @@ namespace blink { BASE_FEATURE(kDisableCanvasOverdrawOptimization, -@@ -2864,9 +2867,22 @@ TextMetrics* BaseRenderingContext2D::mea +@@ -2892,9 +2895,22 @@ TextMetrics* BaseRenderingContext2D::mea TextDirection direction = ToTextDirection(GetState().GetDirection(), canvas); @@ -303,7 +303,7 @@ void BaseRenderingContext2D::SnapshotStateForFilter() { --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1693,6 +1693,7 @@ component("platform") { +@@ -1702,6 +1702,7 @@ component("platform") { "//cc/mojo_embedder", "//components/paint_preview/common", "//components/search_engines:search_engine_utils", @@ -313,10 +313,10 @@ "//components/webrtc:net_address_utils", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -65,4 +65,12 @@ void WebRuntimeFeatures::EnableFluentScr - ScrollbarThemeSettings::SetFluentScrollbarsEnabled(enable); +@@ -68,4 +68,12 @@ void WebRuntimeFeatures::EnableFluentScr + void WebRuntimeFeatures::EnableFluentOverlayScrollbars(bool enable) { + RuntimeEnabledFeatures::SetFluentOverlayScrollbarsEnabled(enable); } - +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) { + RuntimeEnabledFeatures::SetFingerprintingClientRectsNoiseEnabled(enable); +} @@ -328,7 +328,7 @@ } // namespace blink --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1817,6 +1817,12 @@ +@@ -1887,6 +1887,12 @@ origin_trial_feature_name: "Focusgroup", }, { 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 cffb1733..35804f02 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 -@@ -3349,6 +3349,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3423,6 +3423,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 -@@ -470,6 +470,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -480,6 +480,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -55,7 +55,7 @@ approach to change color components. for (const auto& mapping : switchToFeatureMapping) { --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -70,6 +70,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe +@@ -71,6 +71,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe static void EnableFingerprintingClientRectsNoise(bool); static void EnableFingerprintingCanvasMeasureTextNoise(bool); @@ -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 -@@ -45,6 +45,7 @@ +@@ -48,6 +48,7 @@ #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/graphics/graphics_context.h" #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" @@ -73,7 +73,7 @@ approach to change color components. #include "third_party/blink/renderer/platform/graphics/stroke_data.h" #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" -@@ -2190,6 +2191,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -2211,6 +2212,9 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -85,7 +85,7 @@ approach to change color components. return image_data; --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1648,7 +1648,9 @@ component("platform") { +@@ -1657,7 +1657,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -98,7 +98,7 @@ approach to change color components. "//third_party/blink/renderer/platform/blob", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -73,4 +73,8 @@ void WebRuntimeFeatures::EnableFingerpri +@@ -76,4 +76,8 @@ void WebRuntimeFeatures::EnableFingerpri RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable); } @@ -322,7 +322,7 @@ approach to change color components. // Methods overridden by all sub-classes --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1823,6 +1823,9 @@ +@@ -1893,6 +1893,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 474f1a45..62e42a64 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 -@@ -2258,6 +2258,7 @@ static_library("browser") { +@@ -2295,6 +2295,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -63,15 +63,15 @@ 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" -@@ -104,6 +106,7 @@ +@@ -103,6 +105,7 @@ #include "components/metrics/metrics_service.h" #include "components/metrics_services_manager/metrics_services_manager.h" #include "components/metrics_services_manager/metrics_services_manager_client.h" +#include "components/network_session_configurator/common/network_switches.h" #include "components/network_time/network_time_tracker.h" + #include "components/os_crypt/async/browser/os_crypt_async.h" #include "components/permissions/permissions_client.h" - #include "components/policy/core/common/policy_service.h" -@@ -135,6 +138,7 @@ +@@ -134,6 +137,7 @@ #include "media/media_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "net/log/net_log.h" @@ -79,7 +79,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" -@@ -368,6 +372,18 @@ void BrowserProcessImpl::Init() { +@@ -367,6 +371,18 @@ void BrowserProcessImpl::Init() { pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled, base::BindRepeating(&ApplyMetricsReportingPolicy)); @@ -100,7 +100,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2226,6 +2226,10 @@ const char kUnthrottledNestedTimeoutDesc +@@ -2194,6 +2194,10 @@ const char kUnthrottledNestedTimeoutDesc "websites abusing the API will still eventually have their setTimeouts " "clamped."; @@ -113,7 +113,7 @@ with limited CPU/memory resources and it is disabled by default. const char kMediaRouterCastAllowAllIPsDescription[] = --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1261,6 +1261,9 @@ extern const char kUndoAutofillDescripti +@@ -1252,6 +1252,9 @@ extern const char kUndoAutofillDescripti extern const char kUnthrottledNestedTimeoutName[]; extern const char kUnthrottledNestedTimeoutDescription[]; diff --git a/patches/extra/debian/disable/google-api-warning.patch b/patches/extra/debian/disable/google-api-warning.patch index 97f40511..ca9115f4 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 -@@ -139,9 +139,6 @@ void AddInfoBarsIfNecessary(Browser* bro +@@ -146,9 +146,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 648adfb3..29f5c571 100644 --- a/patches/extra/inox-patchset/0006-modify-default-prefs.patch +++ b/patches/extra/inox-patchset/0006-modify-default-prefs.patch @@ -1,7 +1,7 @@ --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc -@@ -359,7 +359,7 @@ BackgroundModeManager::~BackgroundModeMa +@@ -358,7 +358,7 @@ BackgroundModeManager::~BackgroundModeMa // static void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { @@ -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 -@@ -1579,7 +1579,7 @@ void ChromeContentBrowserClient::Registe +@@ -1572,7 +1572,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -23,7 +23,7 @@ // used for mapping the command-line flags). --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -410,7 +410,7 @@ void ProfileNetworkContextService::Updat +@@ -363,7 +363,7 @@ void ProfileNetworkContextService::Updat void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled, @@ -87,8 +87,8 @@ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterIntegerPref( prefs::kAutofillLastVersionDeduped, 0, -@@ -156,7 +156,7 @@ void RegisterProfilePrefs(user_prefs::Pr - prefs::kAutofillLastVersionDisusedAddressesDeleted, 0, +@@ -153,7 +153,7 @@ void RegisterProfilePrefs(user_prefs::Pr + prefs::kAutofillHasSeenIban, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref( - prefs::kAutofillCreditCardEnabled, true, @@ -98,7 +98,7 @@ prefs::kAutofillPaymentCvcStorage, true, --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc -@@ -483,7 +483,7 @@ bool DoesBookmarkContainWords(const std: +@@ -480,7 +480,7 @@ bool DoesBookmarkContainWords(const std: void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -109,7 +109,7 @@ registry->RegisterBooleanPref( --- a/components/content_settings/core/browser/cookie_settings.cc +++ b/components/content_settings/core/browser/cookie_settings.cc -@@ -74,7 +74,7 @@ void CookieSettings::RegisterProfilePref +@@ -81,7 +81,7 @@ void CookieSettings::RegisterProfilePref user_prefs::PrefRegistrySyncable* registry) { registry->RegisterIntegerPref( prefs::kCookieControlsMode, diff --git a/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch b/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch index 7aa28479..2d6424d0 100644 --- a/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch +++ b/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/startup/startup_tab_provider.cc +++ b/chrome/browser/ui/startup/startup_tab_provider.cc -@@ -146,7 +146,7 @@ bool IsChromeControlledNtpUrl(const GURL +@@ -138,7 +138,7 @@ bool IsChromeControlledNtpUrl(const GURL StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const { // Chrome OS has its own welcome flow provided by OOBE. 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 5be76b55..fc6cdc4d 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 -@@ -1645,11 +1645,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1597,11 +1597,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { diff --git a/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch b/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch index d2cfe5fb..1347689b 100644 --- a/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch +++ b/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch @@ -10,7 +10,7 @@ Out with all those tracking cookies! --- a/chrome/browser/resources/settings/privacy_page/cookies_page.html +++ b/chrome/browser/resources/settings/privacy_page/cookies_page.html -@@ -328,6 +328,7 @@ +@@ -344,6 +344,7 @@ @@ -18,7 +18,7 @@ Out with all those tracking cookies! on-settings-boolean-control-change="onClearOnExitChange_"> 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 f62e8721..6ea09d1c 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -9,7 +9,7 @@ #include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/browser/ui/web_applications/web_app_launch_utils.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" -@@ -475,6 +477,7 @@ Browser::Browser(const CreateParams& par +@@ -474,6 +476,7 @@ Browser::Browser(const CreateParams& par omit_from_session_restore_(params.omit_from_session_restore), should_trigger_session_restore_(params.should_trigger_session_restore), cancel_download_confirmation_state_(NOT_PROMPTED), @@ -17,7 +17,7 @@ override_bounds_(params.initial_bounds), initial_show_state_(params.initial_show_state), initial_workspace_(params.initial_workspace), -@@ -859,6 +862,7 @@ Browser::WarnBeforeClosingResult Browser +@@ -858,6 +861,7 @@ Browser::WarnBeforeClosingResult Browser // true or there are no pending downloads we need to prompt about) then // there's no need to warn. if (force_skip_warning_user_on_close_ || CanCloseWithInProgressDownloads()) @@ -25,7 +25,7 @@ return WarnBeforeClosingResult::kOkToClose; DCHECK(!warn_before_closing_callback_) -@@ -893,6 +897,7 @@ bool Browser::TryToCloseWindow( +@@ -892,6 +896,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = NOT_PROMPTED; @@ -33,7 +33,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -2878,6 +2883,62 @@ bool Browser::CanCloseWithInProgressDown +@@ -2922,6 +2927,62 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -96,7 +96,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -2896,6 +2957,22 @@ void Browser::InProgressDownloadResponse +@@ -2940,6 +3001,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -129,7 +129,7 @@ #include "chrome/browser/ui/signin/signin_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/unload_controller.h" -@@ -1099,12 +1100,17 @@ class Browser : public TabStripModelObse +@@ -1108,12 +1109,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -147,7 +147,7 @@ // Called when all warnings have completed when attempting to close the // browser directly (e.g. via hotkey, close button, terminate signal, etc.) // Used as a WarnBeforeClosingCallback by ShouldCloseWindow(). -@@ -1275,6 +1281,8 @@ class Browser : public TabStripModelObse +@@ -1284,6 +1290,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 c9d9600a..69428d77 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 -@@ -891,10 +891,14 @@ bool HandleNewTabPageLocationOverride( +@@ -884,10 +884,14 @@ bool HandleNewTabPageLocationOverride( // Don't change the URL when incognito mode. if (profile->IsOffTheRecord()) 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 b35909d9..fdbea657 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 @@ -33,7 +33,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc -@@ -18,6 +18,7 @@ +@@ -20,6 +20,7 @@ #include "base/barrier_callback.h" #include "base/check_op.h" #include "base/containers/contains.h" @@ -41,7 +41,7 @@ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/functional/bind.h" -@@ -306,6 +307,15 @@ AutocompleteController::AutocompleteCont +@@ -334,6 +335,15 @@ AutocompleteController::AutocompleteCont steady_state_omnibox_position_( metrics::OmniboxEventProto::UNKNOWN_POSITION) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); @@ -79,7 +79,7 @@ #include "base/feature_list.h" #include "base/functional/bind.h" #include "base/functional/callback.h" -@@ -649,6 +650,9 @@ void SearchProvider::Run(bool query_is_p +@@ -650,6 +651,9 @@ void SearchProvider::Run(bool query_is_p } void SearchProvider::DoHistoryQuery(bool minimal_changes) { 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 09dea67c..e715c3e7 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 @@ -80,7 +80,7 @@ } bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy( -@@ -1622,6 +1630,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -1634,6 +1642,8 @@ SyncDataMap TemplateURLService::CreateGU void TemplateURLService::Init(const Initializer* initializers, int num_initializers) { @@ -89,7 +89,7 @@ if (client_) client_->SetOwner(this); -@@ -1773,6 +1783,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -1785,6 +1795,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -101,7 +101,7 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -761,6 +761,8 @@ class TemplateURLService : public WebDat +@@ -768,6 +768,8 @@ class TemplateURLService : public WebDat // ---------- Browser state related members --------------------------------- raw_ptr prefs_ = nullptr; 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 e1422cab..8c6ca1bc 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" -@@ -684,6 +685,8 @@ void Tab::OnGestureEvent(ui::GestureEven +@@ -685,6 +686,8 @@ void Tab::OnGestureEvent(ui::GestureEven } std::u16string Tab::GetTooltipText(const gfx::Point& p) const { @@ -27,7 +27,7 @@ #include "base/compiler_specific.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" -@@ -1648,6 +1649,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -1669,6 +1670,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 65f95796..77e283ef 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 -@@ -1369,7 +1369,8 @@ void BrowserCommandController::InitComma +@@ -1392,7 +1392,8 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, normal_window); @@ -48,7 +48,7 @@ + if (browser && browser->is_type_normal() && + !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) { tab_search_container = std::make_unique( - tab_strip_, render_tab_search_before_tab_strip_); + tab_strip_->controller(), render_tab_search_before_tab_strip_, this); tab_search_container->SetProperty(views::kCrossAxisAlignmentKey, --- a/chrome/browser/ungoogled_flag_entries.h +++ b/chrome/browser/ungoogled_flag_entries.h 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 dcf66b6f..ea9bc5db 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 @@ -54,17 +54,6 @@ BrowsingDataRemoverObserver::Create( remover, /*filterable_deletion=*/true, profile_, keep_browser_alive)); ---- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc -+++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc -@@ -46,6 +46,8 @@ std::unique_ptr - ChromeBrowsingDataLifetimeManagerFactory::BuildServiceInstanceForBrowserContext( - content::BrowserContext* context) const { - if (!base::FeatureList::IsEnabled( -+ browsing_data::features::kClearDataOnExit) && -+ !base::FeatureList::IsEnabled( - browsing_data::features::kEnableBrowsingDataLifetimeManager)) - return nullptr; - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) --- a/chrome/browser/ungoogled_flag_entries.h +++ b/chrome/browser/ungoogled_flag_entries.h @@ -56,4 +56,8 @@ 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 6ada0b92..5f79703b 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -8,7 +8,7 @@ #include "base/containers/adapters.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" -@@ -1893,6 +1894,10 @@ void TabStripModel::CloseTabs(base::span +@@ -1910,6 +1911,10 @@ void TabStripModel::CloseTabs(base::span return; } diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index bda9d9fd..d4469145 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 +#include "base/command_line.h" - #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" -@@ -102,6 +103,14 @@ scoped_refptr + #include "chrome/browser/extensions/extension_management.h" +@@ -101,6 +102,14 @@ scoped_refptr return installer; } @@ -26,7 +26,7 @@ bool IsExtensionDownload(const DownloadItem& download_item) { if (download_item.GetTargetDisposition() == DownloadItem::TARGET_DISPOSITION_PROMPT) -@@ -110,7 +119,7 @@ bool IsExtensionDownload(const DownloadI +@@ -109,7 +118,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 -@@ -1189,10 +1189,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1187,10 +1187,12 @@ DownloadConfirmationReason DownloadTarge return DownloadConfirmationReason::SAVE_AS; #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch index 764ac349..00d32dd3 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 -@@ -1180,6 +1180,8 @@ WindowOpenDisposition NavigationPolicyTo +@@ -1193,6 +1193,8 @@ WindowOpenDisposition NavigationPolicyTo case blink::kWebNavigationPolicyNewWindow: return WindowOpenDisposition::NEW_WINDOW; case blink::kWebNavigationPolicyNewPopup: 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 f09e3bcf..69d2c9c8 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 -@@ -110,7 +110,8 @@ void AddInfoBarsIfNecessary(Browser* bro +@@ -117,7 +117,8 @@ void AddInfoBarsIfNecessary(Browser* bro return; // 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 4a2e8fda..09ee8b03 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 "components/feature_engagement/public/event_constants.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension_features.h" -@@ -364,6 +366,17 @@ void ExtensionsToolbarContainer::AnchorA +@@ -367,6 +369,17 @@ void ExtensionsToolbarContainer::AnchorA widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView( anchor_view && anchor_view->GetVisible() ? anchor_view : GetExtensionsButton()); @@ -34,7 +34,7 @@ widget->Show(); } -@@ -908,6 +921,9 @@ void ExtensionsToolbarContainer::UpdateC +@@ -913,6 +926,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 e9d34a55..49799ebc 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 -@@ -1868,6 +1868,10 @@ void BrowserView::UpdateExclusiveAccessE +@@ -1901,6 +1901,10 @@ void BrowserView::UpdateExclusiveAccessE ExclusiveAccessBubbleHideCallback bubble_first_hide_callback, bool notify_download, bool force_update) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch index a5aae4e1..b56979c3 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch @@ -1,15 +1,15 @@ --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -375,7 +375,8 @@ void ToolbarView::Init() { +@@ -446,7 +446,8 @@ void ToolbarView::Init() { + send_tab_to_self_button_ = + container_view_->AddChildView(std::move(send_tab_to_self_button)); - std::unique_ptr side_panel_button; - std::unique_ptr side_panel_toolbar_container; -- if (browser_view_->unified_side_panel()) { -+ if (browser_view_->unified_side_panel() && +- if (!base::FeatureList::IsEnabled(features::kSidePanelPinning)) { ++ if (!base::FeatureList::IsEnabled(features::kSidePanelPinning) && + !base::CommandLine::ForCurrentProcess()->HasSwitch("hide-sidepanel-button")) { - if (base::FeatureList::IsEnabled(features::kSidePanelPinning)) { - // TODO(b:299463334): Use the new SidePanelContainer which supports - // ActionItems + if (companion::IsCompanionFeatureEnabled()) { + side_panel_container_ = container_view_->AddChildView( + std::make_unique(browser_view_)); --- a/chrome/browser/ungoogled_flag_entries.h +++ b/chrome/browser/ungoogled_flag_entries.h @@ -100,4 +100,8 @@ 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 d5dae984..5d6a3b8f 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 -@@ -1041,7 +1041,11 @@ void Tab::UpdateIconVisibility() { +@@ -1042,7 +1042,11 @@ void Tab::UpdateIconVisibility() { if (IsActive()) { // Close button is shown on active tabs regardless of the size. showing_close_button_ = true; @@ -12,7 +12,7 @@ showing_alert_indicator_ = has_alert_icon && alert_icon_width <= available_width; -@@ -1062,6 +1066,8 @@ void Tab::UpdateIconVisibility() { +@@ -1063,6 +1067,8 @@ void Tab::UpdateIconVisibility() { available_width -= favicon_width; showing_close_button_ = large_enough_for_close_button; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch index cac89d3b..9415360b 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,8 +1,8 @@ --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -469,6 +469,17 @@ void ToolbarView::Init() { +@@ -470,6 +470,17 @@ void ToolbarView::Init() { #elif BUILDFLAG(IS_CHROMEOS_LACROS) - show_avatar_toolbar_button = !profiles::IsManagedGuestSession(); + show_avatar_toolbar_button = !chromeos::IsManagedGuestSession(); #endif + + const std::string sab_value = base::CommandLine::ForCurrentProcess()-> @@ -17,7 +17,7 @@ + avatar_->SetVisible(show_avatar_toolbar_button); - if (base::FeatureList::IsEnabled(features::kResponsiveToolbar)) { + #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) --- a/chrome/browser/ungoogled_flag_choices.h +++ b/chrome/browser/ungoogled_flag_choices.h @@ -13,4 +13,16 @@ const FeatureEntry::Choice kExtensionHan 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 9d99aa66..f1707280 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 -@@ -4091,10 +4091,12 @@ const FeatureEntry::FeatureVariation kWe +@@ -4060,10 +4060,12 @@ const flags_ui::FeatureEntry::FeatureVar #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 c1283d6b..1a9b2b21 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch @@ -28,17 +28,17 @@ "search/instant_mojom_traits.h", "search/instant_types.cc", "search/instant_types.h", -@@ -261,6 +263,7 @@ static_library("common_lib") { +@@ -260,6 +262,7 @@ static_library("common_lib") { "//components/no_state_prefetch/common", "//components/no_state_prefetch/common:mojo_bindings", "//components/page_load_metrics/common:common", + "//services/network/public/mojom", ] - if (enable_supervised_users) { + if (is_android || enable_library_cdms) { --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -981,6 +981,14 @@ BASE_FEATURE(kNewFilesPolicyUX, +@@ -999,6 +999,14 @@ BASE_FEATURE(kNewFilesPolicyUX, // referrers instead of their ordinary behavior. BASE_FEATURE(kNoReferrers, "NoReferrers", base::FEATURE_DISABLED_BY_DEFAULT); @@ -55,7 +55,7 @@ // on-screen until dismissed, they are instead shown for a very long time. --- a/chrome/common/chrome_features.h +++ b/chrome/common/chrome_features.h -@@ -561,6 +561,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX); +@@ -576,6 +576,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers); @@ -152,7 +152,7 @@ +#endif // CHROME_COMMON_REFERRER_SANITIZER_H_ --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn -@@ -341,8 +341,7 @@ source_set("lib") { +@@ -350,8 +350,7 @@ source_set("lib") { "//base/third_party/dynamic_annotations", "//build:branding_buildflags", "//build:chromeos_buildflags", @@ -173,7 +173,7 @@ disallowed_extension_deps_ = [ # Components should largely not depend on //extensions. Since // extensions # is not a component target and is linked with //chrome, depending on most -@@ -804,7 +804,7 @@ test("components_unittests") { +@@ -810,7 +810,7 @@ test("components_unittests") { # On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -182,7 +182,7 @@ assert_no_deps = [ "//chrome/*" ] assert_no_deps += disallowed_extension_deps_ } -@@ -1090,7 +1090,7 @@ if (use_blink) { +@@ -1098,7 +1098,7 @@ if (use_blink) { # dependency. On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -201,7 +201,7 @@ #include "content/browser/blob_storage/chrome_blob_storage_context.h" #include "content/browser/browsing_topics/header_util.h" #include "content/browser/child_process_security_policy_impl.h" -@@ -388,10 +389,10 @@ void AddAdditionalRequestHeaders( +@@ -389,10 +390,10 @@ void AddAdditionalRequestHeaders( net::HttpRequestHeaders::kUserAgent, ComputeUserAgentValue(*headers, user_agent_override, browser_context)); @@ -226,7 +226,7 @@ #include "content/common/associated_interfaces.mojom.h" #include "content/common/content_navigation_policy.h" #include "content/common/content_switches_internal.h" -@@ -4305,10 +4306,13 @@ void RenderFrameImpl::WillSendRequestInt +@@ -4420,10 +4421,13 @@ void RenderFrameImpl::WillSendRequestInt request.SetHasUserGesture(frame_->HasTransientUserActivation()); @@ -246,7 +246,7 @@ void RenderFrameImpl::DidLoadResourceFromMemoryCache( --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -279,6 +279,7 @@ static_library("content_shell_lib") { +@@ -282,6 +282,7 @@ static_library("content_shell_lib") { "//base/third_party/dynamic_annotations", "//build:chromeos_buildflags", "//cc/base", diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index 4569cca7..1859465a 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -35,7 +35,7 @@ // https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html. --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -158,11 +158,6 @@ const unsigned kMinimumTTLSeconds = kCac +@@ -159,11 +159,6 @@ const unsigned kMinimumTTLSeconds = kCac // cached. const int kIPv6ProbePeriodMs = 1000; diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index 99685f37..3ad9c894 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -90,7 +90,7 @@ } --- a/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts +++ b/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts -@@ -31,6 +31,7 @@ export interface SearchEngine { +@@ -32,6 +32,7 @@ export interface SearchEngine { name: string; shouldConfirmDeletion: boolean; url: string; @@ -98,7 +98,7 @@ urlLocked: boolean; } -@@ -73,7 +74,7 @@ export interface SearchEnginesBrowserPro +@@ -94,7 +95,7 @@ export interface SearchEnginesBrowserPro searchEngineEditCancelled(): void; searchEngineEditCompleted( @@ -107,7 +107,7 @@ getSearchEnginesList(): Promise; -@@ -114,11 +115,12 @@ export class SearchEnginesBrowserProxyIm +@@ -136,11 +137,12 @@ export class SearchEnginesBrowserProxyIm } searchEngineEditCompleted( @@ -333,7 +333,7 @@ void ReloadIcon(size_t index); --- a/chrome/browser/ui/webui/settings/search_engines_handler.cc +++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc -@@ -42,6 +42,7 @@ namespace { +@@ -46,6 +46,7 @@ namespace { const char kSearchEngineField[] = "searchEngine"; const char kKeywordField[] = "keyword"; const char kQueryUrlField[] = "queryUrl"; @@ -341,7 +341,7 @@ // Dummy number used for indicating that a new search engine is added. const int kNewSearchEngineIndex = -1; -@@ -218,6 +219,8 @@ base::Value::Dict SearchEnginesHandler:: +@@ -221,6 +222,8 @@ base::Value::Dict SearchEnginesHandler:: Profile* profile = Profile::FromWebUI(web_ui()); dict.Set("url", template_url->url_ref().DisplayURL(UIThreadSearchTermsData())); @@ -350,7 +350,7 @@ dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) || (template_url->starter_pack_id() > 0))); GURL icon_url = template_url->favicon_url(); -@@ -325,12 +328,14 @@ void SearchEnginesHandler::HandleSearchE +@@ -357,12 +360,14 @@ void SearchEnginesHandler::HandleSearchE void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url, const std::u16string& title, const std::u16string& keyword, @@ -368,7 +368,7 @@ edit_controller_.reset(); } -@@ -358,6 +363,8 @@ bool SearchEnginesHandler::CheckFieldVal +@@ -390,6 +395,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); @@ -377,7 +377,7 @@ else NOTREACHED(); -@@ -377,18 +384,21 @@ void SearchEnginesHandler::HandleSearchE +@@ -409,18 +416,21 @@ void SearchEnginesHandler::HandleSearchE if (!edit_controller_.get()) return; @@ -414,7 +414,7 @@ // SettingsPageUIHandler implementation. void RegisterMessages() override; -@@ -73,8 +74,8 @@ class SearchEnginesHandler : public Sett +@@ -75,8 +76,8 @@ class SearchEnginesHandler : public Sett // to WebUI. Called from WebUI. void HandleValidateSearchEngineInput(const base::Value::List& args); @@ -427,7 +427,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -629,7 +629,8 @@ void TemplateURLService::IncrementUsageC +@@ -636,7 +636,8 @@ void TemplateURLService::IncrementUsageC void TemplateURLService::ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -437,7 +437,7 @@ DCHECK(!IsCreatedByExtension(url)); DCHECK(!keyword.empty()); DCHECK(!search_url.empty()); -@@ -644,6 +645,7 @@ void TemplateURLService::ResetTemplateUR +@@ -651,6 +652,7 @@ void TemplateURLService::ResetTemplateUR data.safe_for_autoreplace = false; data.last_modified = clock_->Now(); data.is_active = TemplateURLData::ActiveStatus::kTrue; diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index 64ed2b99..b7428f56 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 -@@ -4087,7 +4087,13 @@ const FeatureEntry::FeatureVariation kWe +@@ -4056,7 +4056,13 @@ const flags_ui::FeatureEntry::FeatureVar // 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 index 9af04031..00d637d2 100644 --- a/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch +++ b/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/media/webrtc/capture_policy_utils.cc +++ b/chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -139,69 +139,12 @@ void RegisterProfilePrefs(PrefRegistrySi +@@ -140,69 +140,12 @@ void RegisterProfilePrefs(PrefRegistrySi } bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) { diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index bdcaee96..fc24ed2a 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 -@@ -93,7 +93,6 @@ source_set("browser") { +@@ -95,7 +95,6 @@ source_set("browser") { "//components/payments/mojom", "//components/power_monitor", "//components/services/filesystem:lib", diff --git a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch index c43668c6..1fb0744b 100644 --- a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch @@ -3,7 +3,7 @@ --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3822,8 +3822,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3816,8 +3816,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -13,7 +13,7 @@ } SynthesizeGLError( GL_INVALID_ENUM, "getParameter", -@@ -3837,8 +3836,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3831,8 +3830,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_VENDOR)))); } diff --git a/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch b/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch index ec7d1aff..404d138a 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 -@@ -1351,7 +1351,7 @@ BASE_FEATURE(kPrefetchFontLookupTables, +@@ -1406,7 +1406,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 29821c1e..2c2c0d07 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,18 +2,19 @@ --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc -@@ -524,10 +524,6 @@ int GetContentRestrictions(const Browser +@@ -532,11 +532,6 @@ int GetContentRestrictions(const Browser CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(current_tab); content_restrictions = core_tab_helper->content_restrictions(); - NavigationEntry* last_committed_entry = - current_tab->GetController().GetLastCommittedEntry(); -- if (!content::IsSavableURL(last_committed_entry->GetURL())) +- if (!content::IsSavableURL(last_committed_entry->GetURL())) { - content_restrictions |= CONTENT_RESTRICTION_SAVE; +- } } return content_restrictions; } -@@ -1614,8 +1610,7 @@ bool CanSavePage(const Browser* browser) +@@ -1648,8 +1643,7 @@ bool CanSavePage(const Browser* browser) DownloadPrefs::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 af54e10f..f8665dce 100644 --- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch +++ b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch @@ -15,7 +15,7 @@ reserved_grab_handle_space_ = --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -1862,8 +1862,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -1902,8 +1902,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { @@ -24,7 +24,7 @@ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); CHECK(clipboard); std::u16string clipboard_text; -@@ -1871,7 +1869,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -1911,7 +1909,6 @@ void TabStrip::NewTabButtonPressed(const /* data_dst = */ nullptr, &clipboard_text); if (!clipboard_text.empty()) controller_->CreateNewTabWithLocation(clipboard_text); diff --git a/patches/extra/ungoogled-chromium/first-run-page.patch b/patches/extra/ungoogled-chromium/first-run-page.patch index 9073330f..49459046 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 -@@ -1037,6 +1037,7 @@ int ChromeBrowserMainParts::PreCreateThr +@@ -1038,6 +1038,7 @@ int ChromeBrowserMainParts::PreCreateThr if (first_run::IsChromeFirstRun()) { if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) && !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) { @@ -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" -@@ -889,6 +890,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc +@@ -891,6 +892,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc } #endif @@ -174,7 +174,7 @@ +#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_ --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -666,6 +666,7 @@ const char kExtensionConfigureCommandsSu +@@ -680,6 +680,7 @@ const char kExtensionConfigureCommandsSu // Add hosts here to be included in chrome://chrome-urls (about:about). // These hosts will also be suggested by BuiltinProvider. const char* const kChromeHostURLs[] = { diff --git a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch index 2f78dc14..35ed9b2c 100644 --- a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch +++ b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch @@ -1,10 +1,6 @@ ## template_url_prepopulate_data.cc # Adds DDG to the default search engines. # -## util.cc -# Only snyc the prepoulated search engines when initializing the database. -# Prevents search engines from being overridden in future updates. -# --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc @@ -59,6 +59,7 @@ constexpr EngineAndTier engines_default[ @@ -15,14 +11,3 @@ }; // Note, the below entries are sorted by country code, not the name in comment. ---- a/components/search_engines/util.cc -+++ b/components/search_engines/util.cc -@@ -524,7 +524,7 @@ void GetSearchProvidersUsingLoadedEngine - - const int prepopulate_resource_keyword_version = - TemplateURLPrepopulateData::GetDataVersion(prefs); -- if (*resource_keyword_version < prepopulate_resource_keyword_version) { -+ if (*resource_keyword_version == 0) { - MergeEnginesFromPrepopulateData(service, &prepopulated_urls, template_urls, - default_search_provider, - removed_keyword_guids); diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 5a052728..55f52a06 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -291,18 +291,18 @@ - --- a/chrome/browser/resources/settings/search_page/search_page.html +++ b/chrome/browser/resources/settings/search_page/search_page.html -@@ -12,11 +12,6 @@ -
-
- $i18n{searchExplanation} -- -- $i18n{learnMore} -- -
-