diff --git a/chromium_version.txt b/chromium_version.txt index 91122565..56312530 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -138.0.7204.183 +139.0.7258.66 diff --git a/devutils/update_lists.py b/devutils/update_lists.py index e52f3874..002a926f 100755 --- a/devutils/update_lists.py +++ b/devutils/update_lists.py @@ -66,6 +66,8 @@ PRUNING_EXCLUDE_PATTERNS = [ 'third_party/node/node_modules/@rollup/wasm-node/dist/wasm-node/bindings_wasm_bg.wasm', # Exclusion for performance tracing 'third_party/perfetto/src/trace_processor/importers/proto/atoms.descriptor', + # Exclusion for jiff + 'third_party/rust/chromium_crates_io/vendor/jiff-tzdb-v0_1/concatenated-zoneinfo.dat', # Exclusions for safe file extensions '*.avif', '*.ttf', diff --git a/domain_substitution.list b/domain_substitution.list index d7d0d46a..162dd6ce 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -105,8 +105,6 @@ ash/system/camera/camera_effects_controller_unittest.cc ash/system/diagnostics/diagnostics_log_controller_unittest.cc ash/system/eche/eche_tray.cc ash/system/eche/eche_tray_unittest.cc -ash/system/federated/federated_client_manager_unittest.cc -ash/system/federated/federated_service_controller_impl_unittest.cc ash/system/focus_mode/focus_mode_controller.cc ash/system/focus_mode/focus_mode_countdown_view_unittest.cc ash/system/focus_mode/focus_mode_feature_pod_controller_unittest.cc @@ -247,9 +245,9 @@ base/allocator/partition_allocator/src/partition_alloc/address_space_randomizati base/allocator/partition_allocator/src/partition_alloc/bucket_lookup.h base/allocator/partition_allocator/src/partition_alloc/build_config.h base/allocator/partition_allocator/src/partition_alloc/in_slot_metadata.h -base/allocator/partition_allocator/src/partition_alloc/lightweight_quarantine.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.h base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_win.h base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h @@ -261,6 +259,7 @@ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand 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_base/win/windows_handle_util.h 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_tls.h @@ -272,11 +271,9 @@ base/allocator/partition_allocator/src/partition_alloc/tagging.h base/allocator/partition_allocator/src/partition_alloc/use_death_tests.h base/android/jni_android.cc base/android/jni_string.cc -base/android/library_loader/library_loader_hooks.h base/android/meminfo_dump_provider.cc base/android/requires_api.h base/android/resource_exclusions.gni -base/android/sys_utils.cc base/apple/foundation_util_unittest.mm base/apple/owned_objc.h base/apple/owned_objc_types.h @@ -320,8 +317,6 @@ base/memory/aligned_memory.cc base/memory/discardable_shared_memory.cc base/memory/raw_ptr_asan_service.cc base/memory/scoped_refptr.h -base/memory/shared_memory_mapping_unittest.cc -base/memory/shared_memory_security_policy.cc base/memory/weak_ptr.h base/message_loop/message_pump_android.h base/message_loop/message_pump_win.cc @@ -459,7 +454,6 @@ build/config/android/config.gni build/config/android/internal_rules.gni build/config/android/rules.gni build/config/arm.gni -build/config/c++/c++.gni build/config/chrome_build.gni build/config/chromeos/args.gni build/config/chromeos/rules.gni @@ -550,7 +544,7 @@ chrome/app/theme/PRESUBMIT.py chrome/browser/PRESUBMIT.py chrome/browser/about_flags.cc chrome/browser/accessibility/live_caption/live_caption_speech_recognition_host_browsertest.cc -chrome/browser/actor/tools/page_tool.cc +chrome/browser/actor/site_policy_browsertest.cc chrome/browser/ai/ai_data_keyed_service.cc chrome/browser/ai/ai_data_keyed_service_browsertest.cc chrome/browser/ai/ai_language_model.cc @@ -743,6 +737,7 @@ chrome/browser/ash/login/app_mode/kiosk_launch_controller_unittest.cc chrome/browser/ash/login/ash_hud_login_browsertest.cc chrome/browser/ash/login/demo_mode/demo_login_controller.cc chrome/browser/ash/login/demo_mode/demo_login_controller_unittest.cc +chrome/browser/ash/login/demo_mode/demo_mode_idle_handler.cc chrome/browser/ash/login/demo_mode/demo_mode_idle_handler_unittest.cc chrome/browser/ash/login/device_family_link_allowed_policy_browsertest.cc chrome/browser/ash/login/encryption_migration_browsertest.cc @@ -827,8 +822,8 @@ chrome/browser/ash/policy/remote_commands/device_command_fetch_support_packet_jo chrome/browser/ash/policy/reporting/metrics_reporting/network/https_latency_events_unittest.cc chrome/browser/ash/policy/skyvault/drive_skyvault_uploader_browsertest.cc chrome/browser/ash/policy/skyvault/migration_coordinator_browsertest.cc -chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc -chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc +chrome/browser/ash/policy/status_collector/child_status_collector_unittest.cc +chrome/browser/ash/policy/status_collector/device_status_collector_unittest.cc chrome/browser/ash/policy/status_collector/status_collector.h chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc chrome/browser/ash/policy/uploading/status_uploader_unittest.cc @@ -967,6 +962,7 @@ chrome/browser/download/save_page_browsertest.cc chrome/browser/engagement/important_sites_util_browsertest.cc chrome/browser/engagement/important_sites_util_unittest.cc chrome/browser/engagement/site_engagement_service_unittest.cc +chrome/browser/enterprise/client_certificates/client_certificates_browsertest.cc chrome/browser/enterprise/connectors/analysis/clipboard_request_handler_unittest.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_browsertest.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_unittest.cc @@ -1002,6 +998,7 @@ chrome/browser/enterprise/profile_management/profile_management_navigation_throt chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc chrome/browser/enterprise/reporting/extension_request/extension_request_notification_unittest.cc chrome/browser/enterprise/reporting/extension_request/extension_request_observer_unittest.cc +chrome/browser/enterprise/reporting/security_reporting_browsertest.cc chrome/browser/enterprise/signals/profile_signals_collector_browsertest.cc chrome/browser/enterprise/signin/enterprise_signin_service_browsertest.cc chrome/browser/enterprise/signin/token_managed_profile_creation_delegate_unittest.cc @@ -1088,6 +1085,7 @@ chrome/browser/extensions/extension_browsertest.cc chrome/browser/extensions/extension_context_menu_model_unittest.cc chrome/browser/extensions/extension_keybinding_apitest.cc chrome/browser/extensions/extension_loading_browsertest.cc +chrome/browser/extensions/extension_management.cc chrome/browser/extensions/extension_override_apitest.cc chrome/browser/extensions/extension_prefs_unittest.cc chrome/browser/extensions/extension_service_test_base.cc @@ -1154,6 +1152,7 @@ chrome/browser/glic/fre/glic_fre_controller.cc chrome/browser/glic/fre/glic_fre_controller_unittest.cc chrome/browser/glic/fre/glic_fre_page_handler.cc chrome/browser/glic/glic_metrics_unittest.cc +chrome/browser/glic/glic_user_status_browsertest.cc chrome/browser/glic/host/glic_cookie_synchronizer.cc chrome/browser/glic/host/glic_cookie_synchronizer_unittest.cc chrome/browser/glic/host/glic_page_handler.cc @@ -1220,7 +1219,6 @@ chrome/browser/metrics/family_link_user_metrics_provider_unittest.cc chrome/browser/metrics/family_user_metrics_provider_browsertest.cc chrome/browser/metrics/per_user_state_manager_chromeos_browsertest.cc chrome/browser/metrics/perf/perf_events_collector.cc -chrome/browser/metrics/testing/sync_metrics_test_utils.cc chrome/browser/metrics/usage_scenario/tab_usage_scenario_tracker.cc chrome/browser/metrics/usage_scenario/tab_usage_scenario_tracker_unittest.cc chrome/browser/metrics/variations/variations_http_headers_browsertest.cc @@ -1254,6 +1252,7 @@ chrome/browser/net/dns_probe_runner.h chrome/browser/net/errorpage_browsertest.cc chrome/browser/net/profile_network_context_service.cc chrome/browser/net/proxy_browsertest.cc +chrome/browser/net/qwac_web_contents_observer.cc chrome/browser/net/sandboxed_network_change_notifier_win_browsertest.cc chrome/browser/net/service_providers_win.cc chrome/browser/net/stub_resolver_config_reader_browsertest.cc @@ -1271,6 +1270,7 @@ chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.cc chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler_unittest.cc chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler.cc chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler_unittest.cc +chrome/browser/new_tab_page/new_tab_page_util_browsertest.cc chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc chrome/browser/new_tab_page/promos/promo_service_unittest.cc chrome/browser/no_best_effort_tasks_browsertest.cc @@ -1344,6 +1344,7 @@ chrome/browser/payments/journey_logger_browsertest.cc chrome/browser/payments/manifest_verifier_browsertest.cc chrome/browser/payments/payment_request_app_store_billing_browsertest.cc chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc +chrome/browser/performance_manager/mechanisms/termination_target_setter.h chrome/browser/performance_manager/policies/discard_eligibility_policy_unittest.cc chrome/browser/performance_manager/policies/report_page_processes_policy.cc chrome/browser/permissions/chrome_permission_manager_unittest.cc @@ -1400,11 +1401,13 @@ chrome/browser/preloading/prefetch/prefetch_service/chrome_prefetch_service_dele chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper_browsertest.cc chrome/browser/preloading/preview/preview_navigation_throttle.h chrome/browser/preloading/preview/preview_zoom_controller.h +chrome/browser/preloading/search_preload/search_preload_browsertest.cc chrome/browser/preloading/search_preload/search_preload_features.h chrome/browser/preloading/search_preload/search_preload_pipeline_manager.cc chrome/browser/printing/print_preview_dialog_controller_unittest.cc chrome/browser/privacy/secure_dns_bridge.cc chrome/browser/privacy_sandbox/PRESUBMIT.py +chrome/browser/privacy_sandbox/notice/desktop_entrypoint_handlers_browsertest.cc chrome/browser/privacy_sandbox/privacy_sandbox_activity_types_service.h chrome/browser/privacy_sandbox/privacy_sandbox_service_impl_unittest.cc chrome/browser/privacy_sandbox/privacy_sandbox_utils_unittest.cc @@ -1476,6 +1479,7 @@ chrome/browser/resources/ash/settings/os_settings_icons.html chrome/browser/resources/ash/settings/settings_shared.css chrome/browser/resources/bookmarks/command_manager.ts chrome/browser/resources/browsing_topics/browsing_topics_internals.html +chrome/browser/resources/certificate_manager/certificate_manager_icons.html chrome/browser/resources/chromeos/about_os_credits.html chrome/browser/resources/chromeos/accessibility/accessibility_common/mv2/dictation/macros/list_commands_macro.ts chrome/browser/resources/chromeos/accessibility/accessibility_common/mv2/facegaze/mouse_controller.ts @@ -1600,7 +1604,6 @@ chrome/browser/resources/settings/about_page/about_page.html chrome/browser/resources/settings/about_page/about_page.ts chrome/browser/resources/settings/appearance_page/appearance_page.ts chrome/browser/resources/settings/icons.html -chrome/browser/resources/settings/incompatible_applications_page/incompatible_application_item.ts chrome/browser/resources/settings/languages_page/edit_dictionary_page.ts chrome/browser/resources/settings/settings_shared.css chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts @@ -1732,14 +1735,15 @@ chrome/browser/storage/shared_storage_browsertest.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_test_bridge.cc chrome/browser/supervised_user/kids_profile_interactive_uitest.cc chrome/browser/supervised_user/linux_mac_windows/parent_access_dialog_result_observer_browsertest.cc chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl_browsertest.cc +chrome/browser/supervised_user/metrics_service_accessor_delegate.h 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.cc chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle_unittest.cc +chrome/browser/supervised_user/supervised_user_navigation_observer_android_browsertest.cc chrome/browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc chrome/browser/supervised_user/supervised_user_pending_state_navigation_browsertest.cc chrome/browser/supervised_user/supervised_user_service_browsertest.cc @@ -1747,20 +1751,21 @@ chrome/browser/supervised_user/supervised_user_test_util.cc chrome/browser/supervised_user/supervised_user_url_filter_extensions_unittest.cc chrome/browser/supervised_user/url_filter_interactive_uitest.cc chrome/browser/support_tool/ash/system_state_data_collector.cc +chrome/browser/sync/android/fake_server_helper_android.cc chrome/browser/sync/sessions/sync_sessions_router_tab_helper.h chrome/browser/sync/test/integration/cookie_helper.cc +chrome/browser/sync/test/integration/fake_sync_signin_delegate_android.cc +chrome/browser/sync/test/integration/fake_sync_signin_delegate_desktop.cc chrome/browser/sync/test/integration/password_manager_sync_test.cc chrome/browser/sync/test/integration/password_sharing_invitation_helper.cc chrome/browser/sync/test/integration/passwords_helper.cc -chrome/browser/sync/test/integration/select_type_and_migrate_local_data_items_when_active_sync_test.cc chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc -chrome/browser/sync/test/integration/single_client_common_sync_test.cc chrome/browser/sync/test/integration/single_client_custom_passphrase_sync_test.cc chrome/browser/sync/test/integration/single_client_extension_apps_sync_test.cc -chrome/browser/sync/test/integration/single_client_history_sync_test.cc +chrome/browser/sync/test/integration/single_client_nigori_sync_test.cc +chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc chrome/browser/sync/test/integration/single_client_send_tab_to_self_sync_test.cc -chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc chrome/browser/sync/test/integration/single_client_shared_tab_group_data_sync_test.cc chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc chrome/browser/sync/test/integration/single_client_wallet_credential_sync_test.cc @@ -1924,7 +1929,7 @@ chrome/browser/ui/signin/promos/signin_promo_tab_helper_browsertest.cc chrome/browser/ui/signin/signin_view_controller.cc chrome/browser/ui/signin/signin_view_controller_browsertest.cc chrome/browser/ui/signin/signin_view_controller_interactive_uitest.cc -chrome/browser/ui/singleton_tabs_unittest.cc +chrome/browser/ui/singleton_tabs_browsertest.cc chrome/browser/ui/startup/chrome_for_testing_infobar_delegate.cc chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.cc chrome/browser/ui/startup/first_run_service_unittest.cc @@ -1940,6 +1945,7 @@ chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data_unittes chrome/browser/ui/tabs/saved_tab_groups/instant_message_queue_processor_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/tab_group_sync_delegate_browsertest.cc +chrome/browser/ui/tabs/tab_strip_api/tab_strip_service_impl_browsertest.cc chrome/browser/ui/tabs/tab_strip_model_unittest.cc chrome/browser/ui/test/popup_browsertest.cc chrome/browser/ui/toolbar/app_menu_model_interactive_uitest.cc @@ -1965,10 +1971,11 @@ chrome/browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc chrome/browser/ui/views/bookmarks/bookmark_editor_view_browsertest.cc -chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc +chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_browsertest.cc chrome/browser/ui/views/bookmarks/bookmark_test_utils.cc chrome/browser/ui/views/bookmarks/saved_tab_groups/shared_tab_group_interactive_uitest.cc chrome/browser/ui/views/borealis/borealis_disallowed_dialog.cc +chrome/browser/ui/views/commerce/price_tracking_bubble_dialog_view_browsertest.cc chrome/browser/ui/views/commerce/price_tracking_bubble_dialog_view_unittest.cc chrome/browser/ui/views/commerce/price_tracking_email_dialog_view.cc chrome/browser/ui/views/commerce/price_tracking_icon_view_integration_test.cc @@ -1981,6 +1988,8 @@ chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.c chrome/browser/ui/views/file_system_access/file_system_access_usage_bubble_view_browsertest.cc chrome/browser/ui/views/frame/browser_root_view_browsertest.cc chrome/browser/ui/views/frame/browser_view.h +chrome/browser/ui/views/frame/multi_contents_drop_target_view_unittest.cc +chrome/browser/ui/views/frame/multi_contents_view_browsertest.cc chrome/browser/ui/views/frame/multi_contents_view_drop_target_controller_unittest.cc chrome/browser/ui/views/frame/webui_tab_strip_interactive_uitest.cc chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc @@ -2005,7 +2014,6 @@ chrome/browser/ui/views/page_info/page_info_history_controller.h chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc chrome/browser/ui/views/passwords/password_bubble_browsertest.cc chrome/browser/ui/views/passwords/password_bubble_interactive_uitest.cc -chrome/browser/ui/views/passwords/password_change/password_change_icon_views_interactive_ui_test.cc chrome/browser/ui/views/passwords/password_change/successful_password_change_view_unittest.cc chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc chrome/browser/ui/views/passwords/password_generation_popup_view_views_browsertest.cc @@ -2014,6 +2022,7 @@ chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc chrome/browser/ui/views/profiles/avatar_toolbar_button_browsertest.cc chrome/browser/ui/views/profiles/batch_upload_dialog_view_browsertest.cc chrome/browser/ui/views/profiles/batch_upload_dialog_view_pixel_browsertest.cc +chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view_browsertest.cc chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view_unittest.cc chrome/browser/ui/views/profiles/first_run_interactive_uitest.cc chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc @@ -2083,6 +2092,7 @@ chrome/browser/ui/webui/data_sharing/data_sharing_ui.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/extensions_zero_state_promo/extensions_zero_state_promo_interactive_uitest.cc chrome/browser/ui/webui/favicon_source_unittest.cc chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc chrome/browser/ui/webui/interstitials/interstitial_ui.cc @@ -2090,6 +2100,8 @@ chrome/browser/ui/webui/log_web_ui_url_unittest.cc chrome/browser/ui/webui/management/management_ui_handler_unittest.cc chrome/browser/ui/webui/media_router/cast_feedback_ui.cc chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc +chrome/browser/ui/webui/new_tab_footer/new_tab_footer_handler_browsertest.cc +chrome/browser/ui/webui/new_tab_page/composebox/composebox_handler_unittest.cc chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc @@ -2205,11 +2217,11 @@ chrome/browser/webauthn/enclave_manager_unittest.cc chrome/browser/webauthn/fake_magic_arch.h chrome/browser/webauthn/fake_recovery_key_store.h chrome/browser/webauthn/fake_security_domain_service.cc +chrome/browser/webauthn/test_util.h chrome/browser/webshare/win/fake_random_access_stream.cc chrome/browser/webshare/win/share_operation.cc chrome/browser/win/chrome_process_finder.cc chrome/browser/win/conflicts/enumerate_shell_extensions.cc -chrome/browser/win/conflicts/installed_applications.cc chrome/browser/win/jumplist.cc chrome/browser/win/jumplist_update_util_unittest.cc chrome/browser/win/parental_controls.cc @@ -2266,7 +2278,6 @@ chrome/common/extensions/sync_type_unittest.cc chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle_unittest.cc 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/request_header_integrity/request_header_integrity_url_loader_throttle_browsertest.cc @@ -2491,10 +2502,6 @@ chrome/test/variations/fixtures/cipd.py chrome/test/variations/fixtures/driver.py chrome/test/variations/fixtures/skia_gold.py chrome/test/variations/test_utils/downloader.py -chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp -chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h -chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp -chrome/third_party/mozilla_security_manager/nsNSSCertificate.h chrome/tools/build/PRESUBMIT.py chrome/tools/build/win/makecab.py chrome/tools/webforms_aggregator_tests.py @@ -2506,6 +2513,7 @@ chrome/updater/certificate_tag_unittest.cc chrome/updater/crash_reporter.cc chrome/updater/enterprise/win/google/build_group_policy_template_unittest.py chrome/updater/enterprise/win/google/public_apps.py +chrome/updater/event_logger_unittest.cc chrome/updater/fix_licenses.py chrome/updater/mac/launcher_main.c chrome/updater/mac/setup/ks_tickets.mm @@ -2920,12 +2928,12 @@ components/feedback/redaction_tool/redaction_tool_unittest.cc components/feedback/redaction_tool/url_parse.h components/fingerprinting_protection_filter/browser/fingerprinting_protection_web_contents_helper.cc components/fingerprinting_protection_filter/common/fingerprinting_protection_breakage_exception_unittest.cc -components/fingerprinting_protection_filter/common/fingerprinting_protection_filter_constants.h components/fullscreen_control_strings.grdp components/gcm_driver/gcm_account_mapper.cc components/gcm_driver/gcm_account_mapper_unittest.cc components/gcm_driver/gcm_client_impl.cc components/gcm_driver/gcm_client_impl_unittest.cc +components/gcm_driver/gcm_driver.cc components/global_media_controls/public/media_session_notification_item_unittest.cc components/global_media_controls/public/views/chapter_item_view_unittest.cc components/global_media_controls/public/views/media_item_ui_detailed_view_unittest.cc @@ -2933,6 +2941,7 @@ components/google/core/common/google_util.cc components/google/core/common/google_util_unittest.cc components/guest_view/browser/guest_view_base.h components/gwp_asan/client/extreme_lightweight_detector_malloc_shims.cc +components/gwp_asan/client/extreme_lightweight_detector_quarantine.h components/history/core/browser/browsing_history_service.cc components/history/core/browser/expire_history_backend_unittest.cc components/history/core/browser/history_backend.cc @@ -2998,7 +3007,7 @@ components/javascript_dialogs_strings.grdp components/keyed_service/core/keyed_service_base_factory.cc components/keyed_service/core/simple_keyed_service_factory.h components/lens/lens_features.cc -components/leveldb_proto/internal/leveldb_database.cc +components/leveldb_proto/internal/leveldb_proto_feature_list.cc components/live_caption/greedy_text_stabilizer.h components/live_caption/translation_dispatcher.cc components/login_dialog_strings.grdp @@ -3112,6 +3121,7 @@ components/omnibox/browser/omnibox_edit_model.h components/omnibox/browser/omnibox_edit_model_unittest.cc components/omnibox/browser/omnibox_field_trial.cc components/omnibox/browser/omnibox_field_trial.h +components/omnibox/browser/omnibox_text_util_unittest.cc 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 @@ -3134,29 +3144,31 @@ components/omnibox/browser/titled_url_match_utils_unittest.cc components/omnibox/browser/zero_suggest_cache_service_unittest.cc components/omnibox/browser/zero_suggest_provider_unittest.cc components/omnibox/browser/zero_suggest_verbatim_match_provider_unittest.cc +components/omnibox/composebox/composebox_query_controller.cc +components/omnibox/composebox/composebox_query_controller_unittest.cc components/omnibox/resources/omnibox_pedal_synonyms.grd components/omnibox_pedal_ui_strings.grdp components/omnibox_strings.grdp components/optimization_guide/content/browser/page_context_eligibility_unittest.cc -components/optimization_guide/core/hints_component_util_unittest.cc -components/optimization_guide/core/hints_manager_unittest.cc +components/optimization_guide/core/delivery/prediction_manager.cc +components/optimization_guide/core/delivery/prediction_manager_unittest.cc +components/optimization_guide/core/filters/hints_component_util_unittest.cc +components/optimization_guide/core/filters/optimization_filter_unittest.cc +components/optimization_guide/core/hints/hints_manager_unittest.cc +components/optimization_guide/core/hints/optimization_metadata_unittest.cc +components/optimization_guide/core/inference/model_handler_unittest.cc +components/optimization_guide/core/inference/tflite_model_executor_unittest.cc components/optimization_guide/core/model_execution/json_response_parser_unittest.cc components/optimization_guide/core/model_execution/model_execution_fetcher.cc components/optimization_guide/core/model_execution/model_execution_fetcher_unittest.cc components/optimization_guide/core/model_execution/model_execution_manager_unittest.cc components/optimization_guide/core/model_execution/on_device_model_adaptation_loader.cc components/optimization_guide/core/model_execution/on_device_model_adaptation_loader_unittest.cc -components/optimization_guide/core/model_handler_unittest.cc components/optimization_guide/core/model_quality/model_quality_logs_uploader_service.cc -components/optimization_guide/core/optimization_filter_unittest.cc components/optimization_guide/core/optimization_guide_constants.cc components/optimization_guide/core/optimization_guide_proto_util.cc components/optimization_guide/core/optimization_guide_util.h components/optimization_guide/core/optimization_guide_util_unittest.cc -components/optimization_guide/core/optimization_metadata_unittest.cc -components/optimization_guide/core/prediction_manager.cc -components/optimization_guide/core/prediction_manager_unittest.cc -components/optimization_guide/core/tflite_model_executor_unittest.cc components/optimization_guide/optimization_guide_internals/resources/optimization_guide_internals.ts components/optimization_guide/tools/gen_on_device_proto_descriptors.py components/origin_trials/browser/leveldb_persistence_provider_unittest.cc @@ -3310,10 +3322,10 @@ components/performance_manager/public/graph/process_node.h components/performance_manager/public/graph/worker_node.h components/permissions/android/permissions_android_strings.grd components/permissions/constants.cc +components/permissions/content_setting_permission_context_base_unittest.cc components/permissions/object_permission_context_base_unittest.cc components/permissions/pepc_initiated_permission_request_unittest.cc components/permissions/permission_context_base.cc -components/permissions/permission_context_base_unittest.cc components/permissions/permission_decision_auto_blocker_unittest.cc components/permissions/permission_indicators_tab_data_unittest.cc components/permissions/permission_manager_unittest.cc @@ -3410,6 +3422,8 @@ components/policy/test/data/pref_mapping/JavaScriptOptimizerBlockedForSites.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/LocalNetworkAccessAllowedForUrls.json +components/policy/test/data/pref_mapping/LocalNetworkAccessBlockedForUrls.json components/policy/test/data/pref_mapping/ManagedBookmarks.json components/policy/test/data/pref_mapping/MultiScreenCaptureAllowedForUrls.json components/policy/test/data/pref_mapping/NotificationsAllowedForUrls.json @@ -3665,10 +3679,6 @@ components/shared_highlighting/core/common/disabled_sites_unittest.cc components/shared_highlighting/core/common/fragment_directives_utils_unittest.cc components/shared_highlighting/core/common/shared_highlighting_metrics_unittest.cc components/shared_highlighting/ios/shared_highlighting_constants.mm -components/sharing_message/vapid_key_manager.h -components/sharing_message/web_push/json_web_token_util_unittest.cc -components/sharing_message/web_push/web_push_sender.cc -components/sharing_message/web_push/web_push_sender_unittest.cc components/signin/core/browser/account_management_type_metrics_recorder_unittest.cc components/signin/core/browser/account_reconcilor_unittest.cc components/signin/core/browser/chrome_connected_header_helper.cc @@ -3734,15 +3744,15 @@ components/supervised_user/core/browser/list_family_members_service_unittest.cc components/supervised_user/core/browser/parallel_fetch_manager_unittest.cc components/supervised_user/core/browser/proto_fetcher_status.h components/supervised_user/core/browser/proto_fetcher_unittest.cc +components/supervised_user/core/browser/supervised_user_metrics_service.h components/supervised_user/core/browser/supervised_user_service_unittest.cc components/supervised_user/core/browser/supervised_user_settings_service_unittest.cc -components/supervised_user/core/browser/supervised_user_sync_data_fake.h components/supervised_user/core/browser/supervised_user_url_filter.cc components/supervised_user/core/browser/supervised_user_url_filter.h components/supervised_user/core/browser/supervised_user_url_filter_unittest.cc components/supervised_user/core/browser/supervised_user_utils.cc components/supervised_user/core/common/supervised_user_constants.cc -components/supervised_user/core/common/supervised_user_constants.h +components/supervised_user/core/common/supervised_user_shared_constants.cc components/supervised_user/test_support/account_repository.h components/supervised_user/test_support/account_repository_unittest.cc components/supervised_user/test_support/family_link_settings_state_management.cc @@ -3789,6 +3799,7 @@ components/trusted_vault/recovery_key_store_certificate.h components/trusted_vault/recovery_key_store_connection_impl.cc components/trusted_vault/recovery_key_store_connection_unittest.cc components/trusted_vault/standalone_trusted_vault_server_constants.h +components/trusted_vault/test/recovery_key_store_certificate_test_util.h components/trusted_vault/trusted_vault_access_token_fetcher_frontend.cc components/trusted_vault/trusted_vault_access_token_fetcher_frontend_unittest.cc components/trusted_vault/trusted_vault_histograms.h @@ -3824,6 +3835,7 @@ components/url_matcher/url_util_unittest.cc components/url_pattern_index/PRESUBMIT.py components/url_pattern_index/url_pattern_index_unittest.cc components/url_pattern_index/url_pattern_unittest.cc +components/user_data_importer/utility/safari_data_import_manager.h components/user_education/webui/whats_new_registry.h components/user_manager/account_id_util_unittest.cc components/user_manager/known_user_unittest.cc @@ -3882,6 +3894,7 @@ content/app/content_main_runner_impl.cc content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm content/browser/accessibility/accessibility_action_browsertest.cc content/browser/accessibility/accessibility_auralinux_browsertest.cc +content/browser/accessibility/browser_accessibility_android.cc content/browser/accessibility/browser_accessibility_manager_android.cc content/browser/accessibility/hit_testing_browsertest.cc content/browser/android/battery_metrics.h @@ -3976,6 +3989,7 @@ content/browser/preloading/prefetch/prefetch_container.cc content/browser/preloading/prefetch/prefetch_container.h content/browser/preloading/prefetch/prefetch_container_unittest.cc content/browser/preloading/prefetch/prefetch_features.h +content/browser/preloading/prefetch/prefetch_handle_impl.cc content/browser/preloading/prefetch/prefetch_match_resolver.cc content/browser/preloading/prefetch/prefetch_params.cc content/browser/preloading/prefetch/prefetch_scheduler.cc @@ -4109,6 +4123,7 @@ content/public/common/content_switches.cc content/public/common/pseudonymization_util.h content/public/common/resource_request_body_android.cc content/public/test/blink_test_environment.cc +content/public/test/browser_fuzztest_support.h content/public/test/browser_test_utils.h content/public/test/permission_overrides_unittest.cc content/public/test/test_file_error_injector.h @@ -4117,11 +4132,6 @@ content/renderer/accessibility/annotations/ax_image_annotator.cc content/renderer/accessibility/annotations/ax_image_stopwords.h content/renderer/content_security_policy_util_fuzzer.cc content/renderer/media/media_factory.cc -content/renderer/pepper/message_channel.cc -content/renderer/pepper/pepper_media_device_manager.cc -content/renderer/pepper/pepper_plugin_registry.cc -content/renderer/pepper/pepper_url_loader_host.cc -content/renderer/pepper/pepper_url_request_unittest.cc content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.h content/renderer/render_frame_impl_browsertest.cc @@ -4252,7 +4262,6 @@ crypto/nss_util.cc crypto/rsa_private_key_unittest.cc crypto/secure_hash.h crypto/secure_util.h -crypto/sha2.h crypto/unexportable_key.h crypto/unexportable_key_unittest.cc crypto/unexportable_key_win.cc @@ -4845,6 +4854,7 @@ net/spdy/spdy_session.cc net/spdy/spdy_session_unittest.cc net/ssl/client_cert_store_win.cc net/ssl/openssl_ssl_util.cc +net/ssl/openssl_ssl_util.h net/ssl/ssl_key_logger.h net/ssl/ssl_platform_key_android.cc net/ssl/ssl_platform_key_win_unittest.cc @@ -4953,7 +4963,7 @@ remoting/base/compute_engine_service_client.h remoting/base/corp_auth_util.cc remoting/base/crash/crashpad_linux.cc remoting/base/crash/crashpad_win.cc -remoting/base/instance_identity_token_getter_unittest.cc +remoting/base/instance_identity_token_getter_impl_unittest.cc remoting/base/is_google_email.cc remoting/base/service_urls.cc remoting/base/session_policies.h @@ -4964,11 +4974,9 @@ remoting/host/evaluate_capability.cc remoting/host/ftl_echo_message_listener_unittest.cc remoting/host/ftl_host_change_notification_listener_unittest.cc remoting/host/host_config_unittest.cc -remoting/host/host_status_logger_unittest.cc remoting/host/it2me/com.google.chrome.remote_assistance-firefox.json.jinja2 remoting/host/it2me/it2me_confirmation_dialog_chromeos_unittest.cc remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc -remoting/host/it2me/it2me_constants.cc remoting/host/it2me/it2me_host_unittest.cc remoting/host/it2me/it2me_native_messaging_host_unittest.cc remoting/host/linux/input_injector_x11.cc @@ -4986,7 +4994,6 @@ remoting/host/webauthn/remote_webauthn_extension_notifier.cc remoting/host/win/etw_trace_controller.cc remoting/host/win/rdp_client_window.cc remoting/host/win/trust_util.cc -remoting/host/xmpp_register_support_host_request_unittest.cc remoting/protocol/authenticator_test_base.h remoting/protocol/fake_session.cc remoting/protocol/jingle_messages_unittest.cc @@ -4996,12 +5003,10 @@ remoting/protocol/socket_util.cc remoting/resources/remoting_strings.grd remoting/signaling/ftl_messaging_client.cc remoting/signaling/ftl_messaging_client_unittest.cc -remoting/signaling/remoting_log_to_server.cc remoting/signaling/signaling_address_unittest.cc remoting/signaling/signaling_id_util.cc remoting/signaling/signaling_id_util.h remoting/signaling/signaling_id_util_unittest.cc -remoting/signaling/xmpp_log_to_server_unittest.cc remoting/test/it2me_cli_host.cc remoting/test/session_authz_playground.cc remoting/test/test_oauth_token_getter.cc @@ -5111,7 +5116,7 @@ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.c services/resource_coordinator/public/cpp/memory_instrumentation/client_process_impl.h services/service_manager/public/cpp/manifest.h services/service_manager/service_process_launcher.cc -services/shape_detection/barcode_detection_impl_barhopper_unittest.cc +services/shape_detection/barcode_detection_impl_chrome_unittest.cc services/shape_detection/barcode_detection_impl_mac_unittest.mm services/shape_detection/text_detection_impl_mac_unittest.mm services/shape_detection/text_detection_impl_win_unittest.cc @@ -5571,6 +5576,7 @@ third_party/blink/renderer/core/dom/tree_walker.h third_party/blink/renderer/core/dom/tree_walker.idl third_party/blink/renderer/core/editing/commands/delete_selection_command.cc third_party/blink/renderer/core/editing/commands/editor_command.cc +third_party/blink/renderer/core/editing/commands/insert_text_command.cc third_party/blink/renderer/core/editing/commands/smart_replace_icu.cc third_party/blink/renderer/core/editing/commands/style_commands.cc third_party/blink/renderer/core/editing/dom_selection.cc @@ -5584,6 +5590,7 @@ third_party/blink/renderer/core/editing/spellcheck/cold_mode_spell_check_request third_party/blink/renderer/core/editing/spellcheck/hot_mode_spell_check_requester.h third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.h third_party/blink/renderer/core/editing/spellcheck/spell_checker_test.cc +third_party/blink/renderer/core/editing/visible_units.cc third_party/blink/renderer/core/editing/visible_units_line_test.cc third_party/blink/renderer/core/events/before_unload_event.cc third_party/blink/renderer/core/events/before_unload_event.h @@ -5595,8 +5602,6 @@ third_party/blink/renderer/core/events/keyboard_event.h third_party/blink/renderer/core/events/keyboard_event.idl third_party/blink/renderer/core/events/mouse_event.cc third_party/blink/renderer/core/events/mouse_event.h -third_party/blink/renderer/core/events/mutation_event.cc -third_party/blink/renderer/core/events/mutation_event.h third_party/blink/renderer/core/events/pointer_event.cc third_party/blink/renderer/core/events/touch_event.cc third_party/blink/renderer/core/events/touch_event_test.cc @@ -6021,6 +6026,7 @@ third_party/blink/renderer/platform/wtf/hash_table.h third_party/blink/renderer/platform/wtf/linked_hash_set.h third_party/blink/renderer/platform/wtf/stack_util.cc third_party/blink/renderer/platform/wtf/text/string_impl.h +third_party/blink/renderer/platform/wtf/text/wtf_string_test.cc third_party/blink/renderer/platform/wtf/thread_specific.h third_party/blink/renderer/platform/wtf/vector.h third_party/blink/renderer/platform/wtf/vector_test.cc @@ -7173,9 +7179,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/chromevox/third_party/closure-library/closure/bin/build/source.py -third_party/chromevox/third_party/closure-library/closure/bin/build/treescan.py -third_party/chromevox/third_party/closure-library/closure/goog/base.js third_party/cld_3/src/setup.py third_party/cld_3/src/src/script_span/getonescriptspan.cc third_party/cld_3/src/src/script_span/getonescriptspan.h @@ -7356,7 +7359,12 @@ 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 third_party/cros_system_api/dbus/shill/dbus-constants.h +third_party/crossbench/android_protoc/codegen/gen.py third_party/crossbench/chrome-extension-replay/devtools-recorder/crossbench.html +third_party/crossbench/config/benchmark/loadline2/google_docs_instrumentation.js +third_party/crossbench/config/benchmark/loadline2/google_search_phone_instrumentation.js +third_party/crossbench/config/benchmark/loadline2/google_search_tablet_instrumentation.js +third_party/crossbench/config/benchmark/loadline2/youtube_instrumentation.js third_party/crossbench/crossbench/action_runner/action/enums.py third_party/crossbench/crossbench/action_runner/action/position.py third_party/crossbench/crossbench/action_runner/action/text_input.py @@ -7364,6 +7372,7 @@ third_party/crossbench/crossbench/action_runner/default_bond_action_runner.py third_party/crossbench/crossbench/benchmarks/loading/config/login/google.py third_party/crossbench/crossbench/benchmarks/loading/loading_benchmark.py third_party/crossbench/crossbench/benchmarks/loading/page/live.py +third_party/crossbench/crossbench/benchmarks/powerline/powerline_benchmark.py third_party/crossbench/crossbench/bond/bond.py third_party/crossbench/crossbench/browsers/chrome/downloader.py third_party/crossbench/crossbench/browsers/chromium/applescript.py @@ -7394,6 +7403,7 @@ third_party/crossbench/tests/crossbench/probes/test_meminfo.py third_party/crossbench/tests/crossbench/probes/test_perfetto.py third_party/crossbench/tests/crossbench/probes/test_v8_rcs.py third_party/crossbench/tests/crossbench/test_env.py +third_party/crossbench/tests/crossbench/test_parse.py third_party/crossbench/tests/end2end/android/test_wpr_record_and_replay.py third_party/crossbench/tests/end2end/desktop/test_cli.py third_party/dav1d/BUILD.gn @@ -7406,6 +7416,7 @@ third_party/dawn/.vscode/tasks.json third_party/dawn/CMakeLists.txt third_party/dawn/generator/dawn_json_generator.py third_party/dawn/infra/specs/PRESUBMIT.py +third_party/dawn/src/dawn/common/SystemUtils.cpp third_party/dawn/src/dawn/dawn.json third_party/dawn/src/dawn/native/CommandAllocator.cpp third_party/dawn/src/dawn/native/CopyTextureForBrowserHelper.cpp @@ -7449,6 +7460,7 @@ third_party/dawn/src/dawn/partition_alloc/partition_alloc/pointers/raw_ptr_exclu third_party/dawn/src/dawn/partition_alloc/partition_alloc/pointers/raw_ref.h third_party/dawn/src/dawn/platform/metrics/HistogramMacros.h third_party/dawn/src/dawn/tests/PartitionAllocSupport.cpp +third_party/dawn/src/dawn/tests/end2end/BindingArrayTests.cpp third_party/dawn/src/dawn/tests/end2end/CompressedTextureFormatTests.cpp third_party/dawn/src/dawn/tests/end2end/DepthBiasTests.cpp third_party/dawn/src/dawn/tests/end2end/TextureViewTests.cpp @@ -7865,7 +7877,6 @@ third_party/devtools-frontend/src/extensions/cxx_debugging/third_party/lit-html/ third_party/devtools-frontend/src/front_end/core/common/ColorConverter.ts third_party/devtools-frontend/src/front_end/core/host/AidaClient.test.ts third_party/devtools-frontend/src/front_end/core/host/InspectorFrontendHost.ts -third_party/devtools-frontend/src/front_end/core/host/UserMetrics.ts third_party/devtools-frontend/src/front_end/core/i18n/i18n.test.ts third_party/devtools-frontend/src/front_end/core/i18n/locales/af.json third_party/devtools-frontend/src/front_end/core/i18n/locales/am.json @@ -9217,17 +9228,15 @@ third_party/devtools-frontend/src/scripts/eslint_rules/tests/no-imperative-dom-a third_party/devtools-frontend/src/scripts/hosted_mode/server.js third_party/devtools-frontend/src/scripts/tools/update_goldens.py third_party/devtools-frontend/src/test/conductor/resultsdb.ts -third_party/devtools-frontend/src/test/e2e/application/reporting-api_test.ts third_party/devtools-frontend/src/test/e2e/console/console-message-format_test.ts third_party/devtools-frontend/src/test/e2e/console/console-truncate-long-messages_test.ts -third_party/devtools-frontend/src/test/e2e/issues/heavy-ad-issues_test.ts -third_party/devtools-frontend/src/test/e2e/lighthouse/devtools-settings_test.ts third_party/devtools-frontend/src/test/e2e/lighthouse/navigation_test.ts third_party/devtools-frontend/src/test/e2e/lighthouse/snapshot_test.ts third_party/devtools-frontend/src/test/e2e/lighthouse/timespan_test.ts -third_party/devtools-frontend/src/test/e2e/rendering/Rendering_test.ts third_party/devtools-frontend/src/test/e2e/resources/console/primitives.html third_party/devtools-frontend/src/test/e2e/resources/elements/inactive-css-page.html +third_party/devtools-frontend/src/test/e2e_non_hosted/application/reporting-api_test.ts +third_party/devtools-frontend/src/test/e2e_non_hosted/lighthouse/devtools-settings_test.ts third_party/devtools-frontend/src/test/perf/report/report.ts third_party/devtools-frontend/src/third_party/blink/public/devtools_protocol/browser_protocol.json third_party/devtools-frontend/src/third_party/pyjson5/src/benchmarks/chromium.linux.json @@ -9281,6 +9290,7 @@ third_party/eigen3/src/Eigen/src/Core/DiagonalProduct.h third_party/eigen3/src/Eigen/src/Core/Dot.h third_party/eigen3/src/Eigen/src/Core/EigenBase.h third_party/eigen3/src/Eigen/src/Core/Fill.h +third_party/eigen3/src/Eigen/src/Core/FindCoeff.h third_party/eigen3/src/Eigen/src/Core/ForceAlignedAccess.h third_party/eigen3/src/Eigen/src/Core/Fuzzy.h third_party/eigen3/src/Eigen/src/Core/GeneralProduct.h @@ -9332,6 +9342,7 @@ third_party/eigen3/src/Eigen/src/Core/Visitor.h third_party/eigen3/src/Eigen/src/Core/arch/AVX/Complex.h third_party/eigen3/src/Eigen/src/Core/arch/AVX/MathFunctions.h third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h +third_party/eigen3/src/Eigen/src/Core/arch/AVX/Reductions.h third_party/eigen3/src/Eigen/src/Core/arch/AVX/TypeCasting.h third_party/eigen3/src/Eigen/src/Core/arch/AVX512/Complex.h third_party/eigen3/src/Eigen/src/Core/arch/AVX512/GemmKernel.h @@ -9339,6 +9350,7 @@ third_party/eigen3/src/Eigen/src/Core/arch/AVX512/MathFunctions.h third_party/eigen3/src/Eigen/src/Core/arch/AVX512/MathFunctionsFP16.h third_party/eigen3/src/Eigen/src/Core/arch/AVX512/PacketMath.h third_party/eigen3/src/Eigen/src/Core/arch/AVX512/PacketMathFP16.h +third_party/eigen3/src/Eigen/src/Core/arch/AVX512/Reductions.h third_party/eigen3/src/Eigen/src/Core/arch/AVX512/TrsmKernel.h third_party/eigen3/src/Eigen/src/Core/arch/AVX512/TypeCasting.h third_party/eigen3/src/Eigen/src/Core/arch/AVX512/TypeCastingFP16.h @@ -9373,6 +9385,7 @@ third_party/eigen3/src/Eigen/src/Core/arch/NEON/UnaryFunctors.h third_party/eigen3/src/Eigen/src/Core/arch/SSE/Complex.h third_party/eigen3/src/Eigen/src/Core/arch/SSE/MathFunctions.h third_party/eigen3/src/Eigen/src/Core/arch/SSE/PacketMath.h +third_party/eigen3/src/Eigen/src/Core/arch/SSE/Reductions.h third_party/eigen3/src/Eigen/src/Core/arch/SSE/TypeCasting.h third_party/eigen3/src/Eigen/src/Core/arch/SVE/MathFunctions.h third_party/eigen3/src/Eigen/src/Core/arch/SVE/PacketMath.h @@ -9854,10 +9867,11 @@ third_party/eigen3/src/unsupported/Eigen/src/BVH/KdBVH.h third_party/eigen3/src/unsupported/Eigen/src/Eigenvalues/ArpackSelfAdjointEigenSolver.h third_party/eigen3/src/unsupported/Eigen/src/EulerAngles/EulerAngles.h third_party/eigen3/src/unsupported/Eigen/src/EulerAngles/EulerSystem.h -third_party/eigen3/src/unsupported/Eigen/src/FFT/ei_fftw_impl.h -third_party/eigen3/src/unsupported/Eigen/src/FFT/ei_imklfft_impl.h -third_party/eigen3/src/unsupported/Eigen/src/FFT/ei_kissfft_impl.h -third_party/eigen3/src/unsupported/Eigen/src/FFT/ei_pocketfft_impl.h +third_party/eigen3/src/unsupported/Eigen/src/FFT/duccfft_impl.h +third_party/eigen3/src/unsupported/Eigen/src/FFT/fftw_impl.h +third_party/eigen3/src/unsupported/Eigen/src/FFT/imklfft_impl.h +third_party/eigen3/src/unsupported/Eigen/src/FFT/kissfft_impl.h +third_party/eigen3/src/unsupported/Eigen/src/FFT/pocketfft_impl.h third_party/eigen3/src/unsupported/Eigen/src/IterativeSolvers/BiCGSTABL.h third_party/eigen3/src/unsupported/Eigen/src/IterativeSolvers/DGMRES.h third_party/eigen3/src/unsupported/Eigen/src/IterativeSolvers/GMRES.h @@ -10016,6 +10030,7 @@ third_party/eigen3/src/unsupported/test/sparse_extra.cpp third_party/eigen3/src/unsupported/test/special_functions.cpp third_party/eigen3/src/unsupported/test/special_packetmath.cpp third_party/eigen3/src/unsupported/test/splines.cpp +third_party/enterprise_companion/fetch_lib.py third_party/expat/src/expat/CMakeLists.txt third_party/expat/src/expat/fuzz/xml_lpm_fuzzer.cpp third_party/expat/src/expat/lib/expat_external.h @@ -10442,7 +10457,6 @@ third_party/flatbuffers/src/src/idl_gen_csharp.cpp third_party/fontconfig/src/build-aux/fetch-testfonts.py third_party/fontconfig/src/src/fcfreetype.c third_party/fp16/src/third-party/eigen-half.h -third_party/freetype-testing/src/fuzzing/src/utils/utils.cpp third_party/freetype/include/freetype-custom/freetype/config/ftoption.h third_party/freetype/src/builds/windows/vc2010/index.html third_party/freetype/src/devel/ftoption.h @@ -11202,6 +11216,7 @@ third_party/icu/source/tools/toolutil/pkg_genc.cpp third_party/inspector_protocol/crdtp/cbor.cc third_party/inspector_protocol/crdtp/json.cc third_party/inspector_protocol/roll.py +third_party/ipcz/src/PRESUBMIT.py third_party/ipcz/src/reference_drivers/random.cc third_party/isimpledom/ISimpleDOMDocument.idl third_party/isimpledom/ISimpleDOMNode.idl @@ -11620,8 +11635,6 @@ third_party/minigbm/src/common.mk third_party/minigbm/src/gbm.h third_party/nasm/win/manifest.xml third_party/nearby/src/connections/implementation/endpoint_manager.cc -third_party/nearby/src/embedded/common/source/nearby_event.h -third_party/nearby/src/embedded/common/source/nearby_message_stream.h third_party/nearby/src/internal/crypto_cros/hmac_unittest.cc third_party/nearby/src/internal/crypto_cros/rsa_private_key_unittest.cc third_party/nearby/src/internal/crypto_cros/secure_util.h @@ -11649,7 +11662,6 @@ third_party/nearby/src/internal/platform/implementation/windows/bluetooth_classi third_party/nearby/src/internal/platform/implementation/windows/file_path.cc third_party/nearby/src/internal/platform/implementation/windows/generated/winrt/Windows.Foundation.h third_party/nearby/src/internal/platform/implementation/windows/http_loader_test.cc -third_party/nearby/src/internal/platform/implementation/windows/platform.cc third_party/nearby/src/internal/platform/implementation/windows/string_utils.cc third_party/nearby/src/internal/platform/implementation/windows/test_utils.cc third_party/nearby/src/internal/platform/implementation/windows/utils.h @@ -11712,14 +11724,12 @@ third_party/node/node_modules/@typescript-eslint/eslint-plugin/dist/rules/prefer 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 +third_party/node/node_modules/ansi-styles/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 -third_party/node/node_modules/clean-css/node_modules/source-map/lib/source-map-consumer.js -third_party/node/node_modules/clean-css/node_modules/source-map/package.json +third_party/node/node_modules/color-convert/package.json +third_party/node/node_modules/color-name/package.json third_party/node/node_modules/css-tree/data/patch.json third_party/node/node_modules/css-tree/lib/lexer/generic.js third_party/node/node_modules/css-tree/package.json @@ -11753,9 +11763,6 @@ third_party/node/node_modules/eslint-scope/lib/scope-manager.js third_party/node/node_modules/eslint-scope/lib/scope.js third_party/node/node_modules/eslint-scope/lib/variable.js third_party/node/node_modules/eslint/lib/rules/max-lines-per-function.js -third_party/node/node_modules/eslint/node_modules/ansi-styles/package.json -third_party/node/node_modules/eslint/node_modules/color-convert/package.json -third_party/node/node_modules/eslint/node_modules/color-name/package.json third_party/node/node_modules/eslint/node_modules/escape-string-regexp/package.json third_party/node/node_modules/eslint/node_modules/has-flag/package.json third_party/node/node_modules/eslint/node_modules/supports-color/package.json @@ -11779,9 +11786,6 @@ third_party/node/node_modules/fast-glob/out/utils/path.js third_party/node/node_modules/find-up/package.json third_party/node/node_modules/glob-parent/package.json third_party/node/node_modules/globals/package.json -third_party/node/node_modules/html-minifier/package.json -third_party/node/node_modules/html-minifier/src/htmlminifier.js -third_party/node/node_modules/html-minifier/src/htmlparser.js 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 @@ -11812,6 +11816,7 @@ third_party/node/node_modules/parent-module/package.json third_party/node/node_modules/parse-imports/package.json third_party/node/node_modules/path-exists/package.json third_party/node/node_modules/path-key/package.json +third_party/node/node_modules/postcss-selector-parser/package.json third_party/node/node_modules/resolve-from/package.json third_party/node/node_modules/shebang-command/package.json third_party/node/node_modules/shebang-regex/package.json @@ -13803,6 +13808,121 @@ third_party/re2/src/CMakeLists.txt third_party/re2/src/python/setup.py third_party/re2/src/re2/testing/re2_test.cc third_party/re2/src/util/pcre.h +third_party/readability/src/.prettierrc.js +third_party/readability/src/JSDOMParser.js +third_party/readability/src/Readability-readerable.js +third_party/readability/src/Readability.js +third_party/readability/src/test/test-pages/001/source.html +third_party/readability/src/test/test-pages/002/expected.html +third_party/readability/src/test/test-pages/002/source.html +third_party/readability/src/test/test-pages/aclu/expected.html +third_party/readability/src/test/test-pages/aclu/source.html +third_party/readability/src/test/test-pages/aktualne/source.html +third_party/readability/src/test/test-pages/ars-1/source.html +third_party/readability/src/test/test-pages/article-author-tag/expected.html +third_party/readability/src/test/test-pages/article-author-tag/source.html +third_party/readability/src/test/test-pages/bbc-1/source.html +third_party/readability/src/test/test-pages/blogger/source.html +third_party/readability/src/test/test-pages/breitbart/source.html +third_party/readability/src/test/test-pages/bug-1255978/source.html +third_party/readability/src/test/test-pages/buzzfeed-1/source.html +third_party/readability/src/test/test-pages/citylab-1/source.html +third_party/readability/src/test/test-pages/cnet-svg-classes/source.html +third_party/readability/src/test/test-pages/cnet/source.html +third_party/readability/src/test/test-pages/cnn/source.html +third_party/readability/src/test/test-pages/daringfireball-1/source.html +third_party/readability/src/test/test-pages/dropbox-blog/source.html +third_party/readability/src/test/test-pages/ehow-1/source.html +third_party/readability/src/test/test-pages/ehow-2/expected.html +third_party/readability/src/test/test-pages/ehow-2/source.html +third_party/readability/src/test/test-pages/embedded-videos/expected.html +third_party/readability/src/test/test-pages/embedded-videos/source.html +third_party/readability/src/test/test-pages/engadget/expected.html +third_party/readability/src/test/test-pages/engadget/source.html +third_party/readability/src/test/test-pages/firefox-nightly-blog/expected.html +third_party/readability/src/test/test-pages/firefox-nightly-blog/source.html +third_party/readability/src/test/test-pages/gitlab-blog/source.html +third_party/readability/src/test/test-pages/gmw/source.html +third_party/readability/src/test/test-pages/google-sre-book-1/source.html +third_party/readability/src/test/test-pages/guardian-1/source.html +third_party/readability/src/test/test-pages/heise/source.html +third_party/readability/src/test/test-pages/herald-sun-1/source.html +third_party/readability/src/test/test-pages/hukumusume/source.html +third_party/readability/src/test/test-pages/iab-1/source.html +third_party/readability/src/test/test-pages/ietf-1/expected.html +third_party/readability/src/test/test-pages/ietf-1/source.html +third_party/readability/src/test/test-pages/keep-images/expected.html +third_party/readability/src/test/test-pages/keep-images/source.html +third_party/readability/src/test/test-pages/keep-tabular-data/expected.html +third_party/readability/src/test/test-pages/keep-tabular-data/source.html +third_party/readability/src/test/test-pages/la-nacion/source.html +third_party/readability/src/test/test-pages/lazy-image-1/source.html +third_party/readability/src/test/test-pages/lazy-image-2/source.html +third_party/readability/src/test/test-pages/lemonde-1/source.html +third_party/readability/src/test/test-pages/liberation-1/source.html +third_party/readability/src/test/test-pages/lifehacker-post-comment-load/source.html +third_party/readability/src/test/test-pages/lifehacker-working/source.html +third_party/readability/src/test/test-pages/links-in-tables/expected.html +third_party/readability/src/test/test-pages/links-in-tables/source.html +third_party/readability/src/test/test-pages/lwn-1/source.html +third_party/readability/src/test/test-pages/medicalnewstoday/source.html +third_party/readability/src/test/test-pages/medium-1/expected.html +third_party/readability/src/test/test-pages/medium-1/source.html +third_party/readability/src/test/test-pages/medium-2/expected.html +third_party/readability/src/test/test-pages/medium-2/source.html +third_party/readability/src/test/test-pages/medium-3/source.html +third_party/readability/src/test/test-pages/mozilla-1/expected.html +third_party/readability/src/test/test-pages/mozilla-1/source.html +third_party/readability/src/test/test-pages/mozilla-2/expected.html +third_party/readability/src/test/test-pages/mozilla-2/source.html +third_party/readability/src/test/test-pages/msn/expected.html +third_party/readability/src/test/test-pages/msn/source.html +third_party/readability/src/test/test-pages/nytimes-1/source.html +third_party/readability/src/test/test-pages/nytimes-2/source.html +third_party/readability/src/test/test-pages/nytimes-3/expected.html +third_party/readability/src/test/test-pages/nytimes-3/source.html +third_party/readability/src/test/test-pages/nytimes-4/source.html +third_party/readability/src/test/test-pages/nytimes-5/source.html +third_party/readability/src/test/test-pages/pixnet/expected.html +third_party/readability/src/test/test-pages/pixnet/source.html +third_party/readability/src/test/test-pages/quanta-1/source.html +third_party/readability/src/test/test-pages/royal-road/source.html +third_party/readability/src/test/test-pages/salon-1/source.html +third_party/readability/src/test/test-pages/schema-org-context-object/source.html +third_party/readability/src/test/test-pages/seattletimes-1/source.html +third_party/readability/src/test/test-pages/simplyfound-1/source.html +third_party/readability/src/test/test-pages/spiceworks/source.html +third_party/readability/src/test/test-pages/telegraph/source.html +third_party/readability/src/test/test-pages/theverge/source.html +third_party/readability/src/test/test-pages/tmz-1/source.html +third_party/readability/src/test/test-pages/toc-missing/source.html +third_party/readability/src/test/test-pages/topicseed-1/source.html +third_party/readability/src/test/test-pages/tumblr/source.html +third_party/readability/src/test/test-pages/v8-blog/expected.html +third_party/readability/src/test/test-pages/v8-blog/source.html +third_party/readability/src/test/test-pages/videos-1/expected.html +third_party/readability/src/test/test-pages/videos-1/source.html +third_party/readability/src/test/test-pages/videos-2/expected.html +third_party/readability/src/test/test-pages/videos-2/source.html +third_party/readability/src/test/test-pages/wapo-1/source.html +third_party/readability/src/test/test-pages/wapo-2/source.html +third_party/readability/src/test/test-pages/webmd-1/source.html +third_party/readability/src/test/test-pages/webmd-2/source.html +third_party/readability/src/test/test-pages/wikia/source.html +third_party/readability/src/test/test-pages/wikipedia-2/expected.html +third_party/readability/src/test/test-pages/wikipedia-2/source.html +third_party/readability/src/test/test-pages/wikipedia-3/expected.html +third_party/readability/src/test/test-pages/wikipedia-3/source.html +third_party/readability/src/test/test-pages/wikipedia-4/expected.html +third_party/readability/src/test/test-pages/wikipedia-4/source.html +third_party/readability/src/test/test-pages/wikipedia/expected.html +third_party/readability/src/test/test-pages/wikipedia/source.html +third_party/readability/src/test/test-pages/wordpress/source.html +third_party/readability/src/test/test-pages/yahoo-1/expected.html +third_party/readability/src/test/test-pages/yahoo-1/source.html +third_party/readability/src/test/test-pages/yahoo-2/source.html +third_party/readability/src/test/test-pages/yahoo-3/source.html +third_party/readability/src/test/test-pages/yahoo-4/source.html third_party/rust/PRESUBMIT.py third_party/rust/adler2/v2/BUILD.gn third_party/rust/anyhow/v1/BUILD.gn @@ -13811,17 +13931,20 @@ third_party/rust/bytemuck/v1/BUILD.gn third_party/rust/bytemuck_derive/v1/BUILD.gn third_party/rust/chromium_crates_io/PRESUBMIT.py third_party/rust/chromium_crates_io/crate_utils.py +third_party/rust/chromium_crates_io/vendor/combine-v4/benches/http-requests.txt third_party/rust/chromium_crates_io/vendor/cxx-v1/.bcr/metadata.template.json +third_party/rust/combine/v4/BUILD.gn third_party/rust/cxx/v1/BUILD.gn third_party/rust/cxxbridge_cmd/v1/BUILD.gn third_party/rust/cxxbridge_flags/v1/BUILD.gn third_party/rust/cxxbridge_macro/v1/BUILD.gn -third_party/rust/diplomat/v0_11/BUILD.gn -third_party/rust/diplomat_core/v0_11/BUILD.gn -third_party/rust/diplomat_runtime/v0_11/BUILD.gn +third_party/rust/diplomat/v0_12/BUILD.gn +third_party/rust/diplomat_core/v0_12/BUILD.gn +third_party/rust/diplomat_runtime/v0_12/BUILD.gn third_party/rust/foldhash/v0_1/BUILD.gn third_party/rust/hashbrown/v0_15/BUILD.gn third_party/rust/itoa/v1/BUILD.gn +third_party/rust/jiff_tzdb/v0_1/BUILD.gn third_party/rust/lazy_static/v1/BUILD.gn third_party/rust/memchr/v2/BUILD.gn third_party/rust/miniz_oxide/v0_8/BUILD.gn @@ -13846,14 +13969,14 @@ third_party/rust/strum_macros/v0_27/BUILD.gn third_party/rust/syn/v2/BUILD.gn third_party/rust/termcolor/v1/BUILD.gn third_party/rust/unicode_ident/v1/BUILD.gn -third_party/rust/unicode_width/v0_1/BUILD.gn +third_party/rust/unicode_width/v0_2/BUILD.gn third_party/rust/winapi_util/v0_1/BUILD.gn third_party/rust/yoke/v0_8/BUILD.gn third_party/rust/yoke_derive/v0_8/BUILD.gn third_party/rust/zerofrom/v0_1/BUILD.gn third_party/rust/zerofrom_derive/v0_1/BUILD.gn third_party/rust/zerovec_derive/v0_11/BUILD.gn -third_party/rust/zip/v3/BUILD.gn +third_party/rust/zip/v4/BUILD.gn third_party/s2cellid/src/s2/_fpcontractoff.h third_party/s2cellid/src/s2/r1interval.h third_party/s2cellid/src/s2/r2.h @@ -13988,6 +14111,8 @@ third_party/skia/modules/pathkit/chaining.js third_party/skia/modules/pathkit/helper.js third_party/skia/modules/pathkit/npm-asmjs/package.json third_party/skia/modules/pathkit/npm-wasm/package.json +third_party/skia/modules/pathops/src/SkOpAngle.cpp +third_party/skia/modules/pathops/src/SkPathOpsOp.cpp third_party/skia/modules/skottie/src/effects/SkSLEffect.cpp third_party/skia/modules/skottie/src/layers/TextLayer.cpp third_party/skia/modules/skunicode/BUILD.gn @@ -14039,8 +14164,6 @@ 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 -third_party/skia/src/pathops/SkPathOpsOp.cpp third_party/skia/src/pdf/SkPDFFont.cpp third_party/skia/src/ports/SkFontHost_FreeType.cpp third_party/skia/src/ports/SkFontHost_FreeType_common.cpp @@ -14077,6 +14200,7 @@ third_party/skia/tests/RecordingXfermodeTest.cpp third_party/skia/tests/RegionTest.cpp third_party/skia/tests/SkXmpTest.cpp third_party/skia/tests/StringTest.cpp +third_party/skia/tests/TriangulatingPathRendererTests.cpp third_party/skia/tests/TypefaceTest.cpp third_party/skia/third_party/etc1/etc1.cpp third_party/skia/third_party/etc1/etc1.h @@ -14576,16 +14700,15 @@ third_party/wayland-protocols/gtk/tests/testheightforwidth.c third_party/wayland/src/egl/wayland-egl-backend.h third_party/wayland/src/egl/wayland-egl.c third_party/wayland/src/src/wayland-shm.c -third_party/webdriver/pylib/selenium/webdriver/chrome/service.py -third_party/webdriver/pylib/selenium/webdriver/chrome/webdriver.py -third_party/webdriver/pylib/selenium/webdriver/edge/service.py -third_party/webdriver/pylib/selenium/webdriver/edge/webdriver.py third_party/webdriver/pylib/selenium/webdriver/firefox/firefox_profile.py third_party/webdriver/pylib/test/selenium/webdriver/common/alerts_tests.py +third_party/webdriver/pylib/test/selenium/webdriver/common/clear_tests.py +third_party/webdriver/pylib/test/selenium/webdriver/common/driver_element_finding_tests.py third_party/webdriver/pylib/test/selenium/webdriver/common/example2.py -third_party/webdriver/pylib/test/selenium/webdriver/common/select_class_tests.py +third_party/webdriver/pylib/test/selenium/webdriver/common/executing_async_javascript_tests.py third_party/webdriver/pylib/test/selenium/webdriver/common/typing_tests.py third_party/webdriver/pylib/test/selenium/webdriver/common/webdriverwait_tests.py +third_party/webdriver/pylib/test/selenium/webdriver/firefox/firefox_sizing_tests.py third_party/webgpu-cts/src/src/webgpu/api/operation/command_buffer/queries/occlusionQuery.spec.ts third_party/webgpu-cts/src/src/webgpu/api/operation/render_pipeline/sample_mask.spec.ts third_party/webgpu-cts/src/src/webgpu/api/operation/rendering/depth_bias.spec.ts @@ -14695,7 +14818,6 @@ third_party/webrtc/rtc_base/openssl_adapter.cc third_party/webrtc/rtc_base/physical_socket_server.cc third_party/webrtc/rtc_base/physical_socket_server_unittest.cc third_party/webrtc/rtc_base/platform_thread_types.cc -third_party/webrtc/rtc_base/ssl_stream_adapter_unittest.cc third_party/webrtc/rtc_base/strong_alias.h third_party/webrtc/rtc_base/strong_alias_unittest.cc third_party/webrtc/rtc_base/system/arch.h @@ -14742,7 +14864,6 @@ third_party/webrtc/video/render/video_render_frames.cc third_party/webrtc/video/rtp_video_stream_receiver2.h third_party/webrtc/video/video_send_stream_tests.cc third_party/webrtc/webrtc.gni -third_party/webrtc_overrides/BUILD.gn third_party/webxr_test_pages/bucket_latest.html third_party/webxr_test_pages/update_bucket.py third_party/webxr_test_pages/webxr-samples/attribution.html @@ -14890,6 +15011,7 @@ tools/android/dependency_analysis/js/src/package_view.html tools/android/dependency_analysis/js/src/target_view.html tools/android/dependency_analysis/upload_html_viewer.py tools/android/generate_java_test/generate_java_test.py +tools/android/logcat_filtering/index.html tools/android/memtrack_helper/memtrack_helper.c tools/android/modularization/convenience/touch_resources.py tools/android/native_lib_memory/PRESUBMIT.py @@ -14954,7 +15076,9 @@ tools/clang/scripts/update.py tools/clang/spanify/Spanifier.cpp tools/clang/spanify/evaluate_patches.py tools/clang/spanify/extract_edits.py +tools/clang/spanify/gnconfigs.py tools/clang/spanify/list-required-pragma.py +tools/clang/spanify/remove-unneeded-pragmas.py tools/clang/spanify/tests/cycle-expected.cc tools/clang/spanify/tests/cycle-original.cc tools/clang/translation_unit/test_translation_unit.py @@ -15078,6 +15202,8 @@ tools/metrics/histograms/merge_xml_test.py tools/metrics/histograms/metadata/accessibility/enums.xml tools/metrics/histograms/metadata/accessibility/histograms.xml tools/metrics/histograms/metadata/account_manager/histograms.xml +tools/metrics/histograms/metadata/actor/enums.xml +tools/metrics/histograms/metadata/actor/histograms.xml tools/metrics/histograms/metadata/ai/enums.xml tools/metrics/histograms/metadata/ai/histograms.xml tools/metrics/histograms/metadata/android/enums.xml @@ -15267,6 +15393,7 @@ tools/metrics/histograms/metadata/performance_manager/enums.xml tools/metrics/histograms/metadata/performance_manager/histograms.xml tools/metrics/histograms/metadata/permissions/enums.xml tools/metrics/histograms/metadata/permissions/histograms.xml +tools/metrics/histograms/metadata/persistent_cache/histograms.xml tools/metrics/histograms/metadata/phonehub/enums.xml tools/metrics/histograms/metadata/phonehub/histograms.xml tools/metrics/histograms/metadata/platform/enums.xml @@ -15789,7 +15916,6 @@ ui/views/view_unittest.cc ui/views/widget/desktop_aura/desktop_native_widget_aura.cc ui/views/win/hwnd_message_handler.cc ui/views/window/non_client_view.cc -ui/webui/resources/cr_components/certificate_manager/certificate_manager_v2_icons.html ui/webui/resources/cr_components/cr_shortcut_input/cr_shortcut_input.ts ui/webui/resources/cr_components/help_bubble/help_bubble_icons.html ui/webui/resources/cr_elements/icons.html.ts diff --git a/flags.gn b/flags.gn index 8629b90b..59f19c88 100644 --- a/flags.gn +++ b/flags.gn @@ -4,7 +4,6 @@ clang_use_chrome_plugins=false disable_fieldtrial_testing_config=true enable_hangout_services_extension=false enable_mdns=false -enable_nacl=false enable_remoting=false enable_reporting=false enable_service_discovery=false diff --git a/patches/core/bromite/disable-fetching-field-trials.patch b/patches/core/bromite/disable-fetching-field-trials.patch index 73a8b6cd..57010ece 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 -@@ -224,22 +224,7 @@ bool GetInstanceManipulations(const net: +@@ -223,22 +223,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 ca2ff3a0..b89a1efe 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 -@@ -3752,8 +3752,6 @@ static_library("browser") { +@@ -3797,8 +3797,6 @@ static_library("browser") { "download/download_auto_open_policy_handler.cc", "download/download_auto_open_policy_handler.h", "download/download_commands.cc", @@ -11,7 +11,7 @@ "download/download_dir_util.cc", --- a/chrome/browser/chrome_content_browser_client_navigation_throttles.cc +++ b/chrome/browser/chrome_content_browser_client_navigation_throttles.cc -@@ -391,10 +391,6 @@ void CreateAndAddChromeThrottlesForNavig +@@ -388,10 +388,6 @@ void CreateAndAddChromeThrottlesForNavig registry.AddThrottle(std::make_unique( registry, handle.GetWebContents()->GetBrowserContext())); @@ -24,7 +24,7 @@ base::BindOnce(&IsInHostedApp), --- a/chrome/browser/component_updater/file_type_policies_component_installer.cc +++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc -@@ -38,21 +38,6 @@ const uint8_t kFileTypePoliciesPublicKey +@@ -36,21 +36,6 @@ const uint8_t kFileTypePoliciesPublicKey const char kFileTypePoliciesManifestName[] = "File Type Policies"; void LoadFileTypesFromDisk(const base::FilePath& pb_path) { @@ -48,7 +48,7 @@ } // namespace --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -128,7 +128,7 @@ class DownloadItemModelData : public bas +@@ -129,7 +129,7 @@ class DownloadItemModelData : public bas // Danger level of the file determined based on the file type and whether // there was a user action associated with the download. @@ -57,7 +57,7 @@ // Whether the download is currently being revived. bool is_being_revived_ = false; -@@ -512,13 +512,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -513,13 +513,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -97,7 +97,7 @@ @@ -1430,44 +1426,7 @@ void DownloadsAcceptDangerFunction::Prom return; } - RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); + RecordApiFunctions(DownloadsFunctionName::kDownloadsFunctionAcceptDanger); - // DownloadDangerPrompt displays a modal dialog using native widgets that the - // user must either accept or cancel. It cannot be scripted. - DownloadDangerPrompt* prompt = DownloadDangerPrompt::Create( @@ -180,7 +180,7 @@ class DownloadsShowFunction : public ExtensionFunction { --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -702,18 +702,6 @@ void WebstorePrivateBeginInstallWithMani +@@ -703,18 +703,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -251,9 +251,9 @@ ] + } - # Note: is_android is not equivalent to safe_browsing_mode == 2. - # Sources and dependencies added to this block must not depend on anything -@@ -579,6 +581,7 @@ static_library("advanced_protection") { + if (enable_extensions) { + deps += [ "//chrome/browser/ui/web_applications" ] +@@ -598,6 +600,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -261,7 +261,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -598,6 +601,7 @@ source_set("metrics_collector") { +@@ -617,6 +620,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] 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 a7ca65fe..b31047d5 100644 --- a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch +++ b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch @@ -1,6 +1,6 @@ --- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc +++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc -@@ -924,93 +924,6 @@ std::tuple AutofillCr +@@ -938,93 +938,6 @@ std::tuple AutofillCr } bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) { diff --git a/patches/core/inox-patchset/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index 0abc033d..b4f52649 100644 --- a/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -24,13 +24,13 @@ #if BUILDFLAG(IS_CHROMEOS) --- a/chrome/browser/extensions/external_component_loader.cc +++ b/chrome/browser/extensions/external_component_loader.cc -@@ -37,9 +37,6 @@ ExternalComponentLoader::~ExternalCompon - +@@ -38,9 +38,6 @@ ExternalComponentLoader::~ExternalCompon void ExternalComponentLoader::StartLoading() { auto prefs = base::Value::Dict(); --#if BUILDFLAG(GOOGLE_CHROME_BRANDING) + // Skip in-app payments app on Android. crbug.com/409396604 +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && !BUILDFLAG(IS_ANDROID) - AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs); --#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) +-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) && !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_CHROMEOS) { diff --git a/patches/core/inox-patchset/0015-disable-update-pings.patch b/patches/core/inox-patchset/0015-disable-update-pings.patch index 8cbdbb3b..10010b82 100644 --- a/patches/core/inox-patchset/0015-disable-update-pings.patch +++ b/patches/core/inox-patchset/0015-disable-update-pings.patch @@ -1,6 +1,6 @@ --- a/chrome/updater/configurator.cc +++ b/chrome/updater/configurator.cc -@@ -133,7 +133,7 @@ base::TimeDelta Configurator::UpdateDela +@@ -147,7 +147,7 @@ base::TimeDelta Configurator::UpdateDela std::vector Configurator::UpdateUrl() const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); diff --git a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index b43ee567..9d2887bf 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 @@ -167,7 +167,7 @@ by default. DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr; --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -@@ -273,7 +273,7 @@ GURL SpellcheckHunspellDictionary::GetDi +@@ -274,7 +274,7 @@ GURL SpellcheckHunspellDictionary::GetDi DCHECK(!bdict_file.empty()); static const char kDownloadServerUrl[] = @@ -189,7 +189,7 @@ by default. --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -@@ -75,17 +75,17 @@ namespace { +@@ -76,17 +76,17 @@ namespace { // The URL for the the Learn More page shown on incognito new tab. const char kLearnMoreIncognitoUrl[] = #if BUILDFLAG(IS_CHROMEOS) 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 47e9dc6b..d295266b 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 -@@ -342,6 +342,10 @@ void ClientSideDetectionService::StartCl +@@ -340,6 +340,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); -@@ -424,6 +428,7 @@ void ClientSideDetectionService::StartCl +@@ -421,6 +425,7 @@ void ClientSideDetectionService::StartCl base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent, base::Unretained(WebUIInfoSingleton::GetInstance()), std::move(request), access_token)); diff --git a/patches/core/ungoogled-chromium/block-requests.patch b/patches/core/ungoogled-chromium/block-requests.patch index 35db9e4c..1ecf231e 100644 --- a/patches/core/ungoogled-chromium/block-requests.patch +++ b/patches/core/ungoogled-chromium/block-requests.patch @@ -18,7 +18,7 @@ // Note: If there is an ongoing request, abandon it. It's possible that --- a/chrome/browser/new_tab_page/promos/promo_service.cc +++ b/chrome/browser/new_tab_page/promos/promo_service.cc -@@ -175,6 +175,7 @@ PromoService::PromoService( +@@ -176,6 +176,7 @@ PromoService::PromoService( PromoService::~PromoService() = default; void PromoService::Refresh() { @@ -28,7 +28,7 @@ // via the feature params. --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -@@ -280,6 +280,7 @@ GURL SpellcheckHunspellDictionary::GetDi +@@ -281,6 +281,7 @@ GURL SpellcheckHunspellDictionary::GetDi } void SpellcheckHunspellDictionary::DownloadDictionary(GURL url) { @@ -51,7 +51,7 @@ base::OnceCallback result_callback) { --- a/components/affiliations/core/browser/hash_affiliation_fetcher.h +++ b/components/affiliations/core/browser/hash_affiliation_fetcher.h -@@ -39,6 +39,8 @@ class HashAffiliationFetcher : public Af +@@ -40,6 +40,8 @@ class HashAffiliationFetcher : public Af const std::vector& facet_uris, RequestInfo request_info, base::OnceCallback result_callback) override; @@ -72,14 +72,16 @@ if (state_ == REQUESTING) { --- a/components/themes/ntp_background_service.cc +++ b/components/themes/ntp_background_service.cc -@@ -88,6 +88,7 @@ void NtpBackgroundService::Shutdown() { - } - - void NtpBackgroundService::FetchCollectionInfo() { -+ return; +@@ -90,9 +90,7 @@ void NtpBackgroundService::Shutdown() { + void NtpBackgroundService::FetchCollectionInfo( + const std::string& filtering_label) { // If a request is currently in progress, drop the new request. - if (collections_loader_ != nullptr) { +- if (collections_loader_ != nullptr) { return; +- } + collection_error_info_.ClearError(); + + net::NetworkTrafficAnnotationTag traffic_annotation = --- a/components/update_client/update_checker.cc +++ b/components/update_client/update_checker.cc @@ -104,6 +104,7 @@ void UpdateCheckerImpl::CheckForUpdates( diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index 8fd47182..34195079 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetI +@@ -72,6 +72,7 @@ ChromeAutocompleteSchemeClassifier::GetI if (base::IsStringASCII(scheme) && (ProfileIOData::IsHandledProtocol(scheme) || base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) || @@ -47,7 +47,7 @@ std::u16string real_url(text.substr(after_scheme_and_colon)); --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -607,6 +607,10 @@ GURL FixupURLInternal(const std::string& +@@ -602,6 +602,10 @@ GURL FixupURLInternal(const std::string& } } @@ -70,7 +70,7 @@ // other origins, so we should not treat them as web safe. Remove callers of --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1101,6 +1101,8 @@ component("net") { +@@ -1108,6 +1108,8 @@ component("net") { "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", "url_request/storage_access_status_cache.h", @@ -204,7 +204,7 @@ inline constexpr char kUuidInPackageScheme[] = "uuid-in-package"; --- a/url/url_util.cc +++ b/url/url_util.cc -@@ -84,6 +84,7 @@ struct SchemeRegistry { +@@ -85,6 +85,7 @@ struct SchemeRegistry { kWssScheme, kDataScheme, kAboutScheme, @@ -212,7 +212,7 @@ }; // Schemes that normal pages cannot link to or access (i.e., with the same -@@ -98,6 +99,7 @@ struct SchemeRegistry { +@@ -99,6 +100,7 @@ struct SchemeRegistry { kAboutScheme, kJavaScriptScheme, kDataScheme, diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index 47cc3750..2cc5e565 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 -@@ -2636,24 +2636,6 @@ void ChromeContentBrowserClient::AppendE +@@ -2693,24 +2693,6 @@ void ChromeContentBrowserClient::AppendE command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -44,7 +44,7 @@ const base::FilePath& exe_path, --- a/components/gwp_asan/client/gwp_asan.cc +++ b/components/gwp_asan/client/gwp_asan.cc -@@ -340,6 +340,11 @@ GWP_ASAN_EXPORT std::optional GetAllocatorSettings( diff --git a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch index 48d3cb8d..af4e0503 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 -@@ -291,7 +291,7 @@ bool DomDistillerViewerSource::ShouldSer +@@ -295,7 +295,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 3ba9a2e0..a95c299e 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -565,7 +565,7 @@ bool IsProbablyGoogleSearchUrl(const GURL& url) { --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -621,10 +621,7 @@ std::u16string TemplateURLRef::SearchTer +@@ -615,10 +615,7 @@ std::u16string TemplateURLRef::SearchTer bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); @@ -681,7 +681,7 @@ } // namespace variations --- a/content/browser/preloading/prefetch/prefetch_container.cc +++ b/content/browser/preloading/prefetch/prefetch_container.cc -@@ -970,7 +970,7 @@ void PrefetchContainer::AddRedirectHop(c +@@ -988,7 +988,7 @@ void PrefetchContainer::AddRedirectHop(c // some which are added by throttles). These aren't yet supported for // prefetch, including browsing topics and client hints. net::HttpRequestHeaders updated_headers; @@ -692,7 +692,7 @@ --- a/net/base/url_util.cc +++ b/net/base/url_util.cc -@@ -537,28 +537,6 @@ bool HasGoogleHost(const GURL& url) { +@@ -536,28 +536,6 @@ bool HasGoogleHost(const GURL& url) { } bool IsGoogleHost(std::string_view host) { diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index 2102b929..7caad77c 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 -@@ -369,7 +369,6 @@ if (!is_android && !is_mac) { +@@ -368,7 +368,6 @@ if (!is_android && !is_mac) { } data_deps += [ @@ -15,7 +15,7 @@ "//components/webapps/isolated_web_apps/preload:component", "//third_party/widevine/cdm", ] -@@ -1204,7 +1203,6 @@ if (is_win) { +@@ -1177,7 +1176,6 @@ if (is_win) { ":optimization_guide_library", ":swiftshader_binaries", ":widevine_cdm_library", @@ -25,7 +25,7 @@ --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn -@@ -97,11 +97,6 @@ group("resources") { +@@ -98,11 +98,6 @@ group("resources") { ] } diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch index 04425c1a..1b4484db 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -1,6 +1,6 @@ --- a/components/browsing_data/content/browsing_data_model.cc +++ b/components/browsing_data/content/browsing_data_model.cc -@@ -992,12 +992,6 @@ void BrowsingDataModel::PopulateFromDisk +@@ -991,12 +991,6 @@ void BrowsingDataModel::PopulateFromDisk base::FeatureList::IsEnabled(network::features::kSharedStorageAPI); bool is_shared_dictionary_enabled = base::FeatureList::IsEnabled( network::features::kCompressionDictionaryTransportBackend); @@ -13,7 +13,7 @@ base::RepeatingClosure completion = base::BindRepeating([](const base::OnceClosure&) {}, -@@ -1034,27 +1028,7 @@ void BrowsingDataModel::PopulateFromDisk +@@ -1033,27 +1027,7 @@ void BrowsingDataModel::PopulateFromDisk base::BindOnce(&OnSharedDictionaryUsageLoaded, this, completion)); } @@ -178,7 +178,7 @@ void AdAuctionServiceImpl::JoinInterestGroup( --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc -@@ -1469,38 +1469,7 @@ void StoragePartitionImpl::Initialize( +@@ -1485,38 +1485,7 @@ void StoragePartitionImpl::Initialize( bucket_manager_ = std::make_unique(this); @@ -217,7 +217,7 @@ GeneratedCodeCacheSettings settings = GetContentClient()->browser()->GetGeneratedCodeCacheSettings( -@@ -1529,8 +1498,6 @@ void StoragePartitionImpl::Initialize( +@@ -1545,8 +1514,6 @@ void StoragePartitionImpl::Initialize( font_access_manager_ = FontAccessManager::Create(); @@ -226,7 +226,7 @@ #if BUILDFLAG(ENABLE_LIBRARY_CDMS) if (is_in_memory()) { -@@ -1554,11 +1521,6 @@ void StoragePartitionImpl::Initialize( +@@ -1570,11 +1537,6 @@ void StoragePartitionImpl::Initialize( std::make_unique(this); } @@ -237,10 +237,10 @@ - } } - void StoragePartitionImpl::OnStorageServiceDisconnected() { + void StoragePartitionImpl::ResetSessionStorageConnections() { --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4107,12 +4107,6 @@ void WebContentsImpl::Init(const WebCont +@@ -4127,12 +4127,6 @@ void WebContentsImpl::Init(const WebCont DateTimeChooser::CreateDateTimeChooser(this); #endif diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index 3543d088..78475a1f 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 -@@ -678,12 +678,6 @@ std::vector ChromeContentBr +@@ -677,12 +677,6 @@ std::vector ChromeContentBr GetOriginsRequiringDedicatedProcess() { std::vector list; @@ -177,7 +177,7 @@ fetch->oauth2_attempt_count++; --- a/extensions/common/extension_urls.cc +++ b/extensions/common/extension_urls.cc -@@ -74,8 +74,6 @@ GURL AppendUtmSource(const GURL& url, st +@@ -77,8 +77,6 @@ GURL AppendUtmSource(const GURL& url, st GURL GetWebstoreExtensionsCategoryURL() { GURL base_url = GetNewWebstoreLaunchURL(); diff --git a/patches/core/ungoogled-chromium/extensions-manifestv2.patch b/patches/core/ungoogled-chromium/extensions-manifestv2.patch index babf7a0f..15c37534 100644 --- a/patches/core/ungoogled-chromium/extensions-manifestv2.patch +++ b/patches/core/ungoogled-chromium/extensions-manifestv2.patch @@ -1,26 +1,28 @@ ---- a/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc -+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc -@@ -54,17 +54,6 @@ void ExtensionInfoGenerator::FillExtensi - info.controlled_info.emplace(); - info.controlled_info->text = - l10n_util::GetStringUTF8(IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE); -- } else { -- // Create Safety Hub information for any non-enterprise extension. -- developer::SafetyCheckWarningReason warning_reason = -- ExtensionSafetyCheckUtils::GetSafetyCheckWarningReason(extension, -- profile); -- if (warning_reason != developer::SafetyCheckWarningReason::kNone) { -- info.safety_check_warning_reason = warning_reason; -- info.safety_check_text = -- ExtensionSafetyCheckUtils::GetSafetyCheckWarningStrings( -- warning_reason, state); -- } +--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc ++++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +@@ -865,19 +865,6 @@ void ExtensionInfoGenerator::FillExtensi + toolbar_actions_model->IsActionPinned(extension.id()); } - // Pinned to toolbar. +- // MV2 deprecation. +- ManifestV2ExperimentManager* mv2_experiment_manager = +- ManifestV2ExperimentManager::Get(profile); +- CHECK(mv2_experiment_manager); +- info.is_affected_by_mv2_deprecation = +- mv2_experiment_manager->IsExtensionAffected(extension); +- info.did_acknowledge_mv2_deprecation_notice = +- mv2_experiment_manager->DidUserAcknowledgeNotice(extension.id()); +- if (info.web_store_url.length() > 0) { +- info.recommendations_url = +- extension_urls::GetNewWebstoreItemRecommendationsUrl(extension.id()) +- .spec(); +- } + + // Whether the extension can be uploaded as an account extension. + // `CanUploadAsAccountExtension` should already check for the feature flag --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -322,31 +322,7 @@ bool ExtensionManagement::IsAllowedManif +@@ -355,31 +355,7 @@ bool ExtensionManagement::IsAllowedManif int manifest_version, const std::string& extension_id, Manifest::Type manifest_type) { @@ -52,7 +54,7 @@ } bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) { -@@ -367,26 +343,8 @@ bool ExtensionManagement::IsExemptFromMV +@@ -400,26 +376,8 @@ bool ExtensionManagement::IsExemptFromMV return false; } @@ -126,15 +128,15 @@ // Returns true if the given `stage` is one in which extension enablement should --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -490,7 +490,7 @@ content::WebUIDataSource* CreateAndAddEx +@@ -482,7 +482,7 @@ content::WebUIDataSource* CreateAndAddEx extensions_features::kExtensionsMenuAccessControlWithPermittedSites)); source->AddBoolean( "safetyHubThreeDotDetails", - base::FeatureList::IsEnabled(features::kSafetyHubThreeDotDetails)); + false); - #if BUILDFLAG(IS_ANDROID) - source->AddResourcePath("images/product_logo.png", + // MV2 deprecation. + auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile); --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc @@ -104,13 +104,6 @@ bool IsManifestSupported(int manifest_ve 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 73acb9d1..d4eb4dbb 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 -@@ -370,7 +370,6 @@ if (!is_android && !is_mac) { +@@ -369,7 +369,6 @@ if (!is_android && !is_mac) { data_deps += [ "//chrome/browser/resources/media/mei_preload:component", @@ -11,7 +11,7 @@ "//components/webapps/isolated_web_apps/preload:component", "//third_party/widevine/cdm", ] -@@ -934,8 +933,6 @@ if (is_win) { +@@ -933,8 +932,6 @@ if (is_win) { bundle_data("chrome_framework_resources") { sources = [ @@ -20,7 +20,7 @@ # This image is used to badge the lock icon in the # authentication dialogs, such as those used for installation # from disk image and Keystone promotion (if so enabled). It -@@ -1208,7 +1205,6 @@ if (is_win) { +@@ -1181,7 +1178,6 @@ if (is_win) { ":swiftshader_binaries", ":widevine_cdm_library", "//chrome/browser/resources/media/mei_preload:component_bundle", @@ -30,7 +30,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -775,10 +775,6 @@ static_library("browser") { +@@ -796,10 +796,6 @@ static_library("browser") { "navigation_predictor/navigation_predictor_metrics_document_data.h", "navigation_predictor/navigation_predictor_preconnect_client.cc", "navigation_predictor/navigation_predictor_preconnect_client.h", @@ -41,7 +41,7 @@ "navigation_predictor/search_engine_preconnector_keyed_service_factory.cc", "navigation_predictor/search_engine_preconnector_keyed_service_factory.h", "net/cert_verifier_service_time_updater.cc", -@@ -3618,10 +3614,6 @@ static_library("browser") { +@@ -3665,10 +3661,6 @@ static_library("browser") { } else { #!is_android sources += [ @@ -52,16 +52,16 @@ "accessibility/caption_bubble_context_browser.h", "accessibility/embedded_a11y_extension_loader.cc", "accessibility/embedded_a11y_extension_loader.h", -@@ -4329,8 +4321,6 @@ static_library("browser") { +@@ -4386,8 +4378,6 @@ static_library("browser") { "//chrome/app:command_ids", "//chrome/app/theme:chrome_unscaled_resources_grit", "//chrome/app/vector_icons", - "//chrome/browser/accessibility/tree_fixing:prefs", - "//chrome/browser/accessibility/tree_fixing:service", "//chrome/browser/actor", + "//chrome/browser/actor:impl", "//chrome/browser/apps/app_service", - "//chrome/browser/apps/link_capturing", -@@ -4350,10 +4340,6 @@ static_library("browser") { +@@ -4408,10 +4398,6 @@ static_library("browser") { "//chrome/browser/metrics/desktop_session_duration", "//chrome/browser/new_tab_page/chrome_colors", "//chrome/browser/policy:path_parser", @@ -72,7 +72,7 @@ "//chrome/browser/search/background", "//chrome/browser/sharing_hub", "//chrome/browser/smart_card", -@@ -4512,9 +4498,6 @@ static_library("browser") { +@@ -4573,9 +4559,6 @@ static_library("browser") { "//components/webauthn/core/browser", "//components/webauthn/core/browser:passkey_model", "//services/device/public/cpp/hid", @@ -82,7 +82,7 @@ "//third_party/crashpad/crashpad/client:common", "//third_party/zxcvbn-cpp", "//ui/views", -@@ -4630,8 +4613,6 @@ static_library("browser") { +@@ -4695,8 +4678,6 @@ static_library("browser") { sources += [ "accessibility/soda_installer_impl.cc", "accessibility/soda_installer_impl.h", @@ -91,7 +91,7 @@ "device_identity/device_oauth2_token_store_desktop.cc", "device_identity/device_oauth2_token_store_desktop.h", "device_notifications/device_status_icon_renderer.cc", -@@ -4670,8 +4651,6 @@ static_library("browser") { +@@ -4735,8 +4716,6 @@ static_library("browser") { "profiles/profile_activity_metrics_recorder.h", "profiles/profile_list_desktop.cc", "profiles/profile_list_desktop.h", @@ -100,7 +100,7 @@ "signin/force_signin_verifier.cc", "signin/force_signin_verifier.h", "signin/signin_manager.cc", -@@ -5471,7 +5450,6 @@ static_library("browser") { +@@ -5541,7 +5520,6 @@ static_library("browser") { "//chrome/browser/policy:system_features_disable_list", "//chrome/browser/push_notification:push_notification", "//chrome/browser/resources:app_icon_resources", @@ -108,7 +108,7 @@ "//chrome/browser/sharesheet", "//chrome/browser/support_tool/ash", "//chrome/browser/ui/ash/accelerator", -@@ -5738,7 +5716,6 @@ static_library("browser") { +@@ -5808,7 +5786,6 @@ static_library("browser") { "//remoting/host/chromeos:browser_interop", "//remoting/host/chromeos:features", "//services/device/public/cpp/geolocation", @@ -116,22 +116,9 @@ "//third_party/nearby:rpc_resources_proto", "//third_party/nearby:wire_format_proto", "//ui/chromeos", -@@ -7993,12 +7970,6 @@ static_library("browser") { - } - - if (enable_pdf) { -- sources += [ -- "accessibility/pdf_ocr_controller.cc", -- "accessibility/pdf_ocr_controller.h", -- "accessibility/pdf_ocr_controller_factory.cc", -- "accessibility/pdf_ocr_controller_factory.h", -- ] - deps += [ - "//chrome/browser/pdf", - "//chrome/browser/pdf:pdf_pref_names", --- a/chrome/browser/accessibility/tree_fixing/BUILD.gn +++ b/chrome/browser/accessibility/tree_fixing/BUILD.gn -@@ -64,11 +64,9 @@ source_set("internal") { +@@ -63,11 +63,9 @@ source_set("internal") { deps = [ "//base", "//chrome/browser/profiles:profile", @@ -192,7 +179,7 @@ std::unique_ptr platform_part_; --- a/chrome/browser/chrome_browser_interface_binders.cc +++ b/chrome/browser/chrome_browser_interface_binders.cc -@@ -81,8 +81,6 @@ +@@ -83,8 +83,6 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) @@ -201,7 +188,7 @@ #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #endif -@@ -362,27 +360,6 @@ void BindMediaFoundationPreferences( +@@ -364,27 +362,6 @@ void BindMediaFoundationPreferences( } #endif // BUILDFLAG(IS_WIN) @@ -229,7 +216,7 @@ void BindModelBroker( content::RenderFrameHost* frame_host, -@@ -532,11 +509,6 @@ void PopulateChromeFrameBinders( +@@ -560,11 +537,6 @@ void PopulateChromeFrameBinders( base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed)); } @@ -243,7 +230,7 @@ #if BUILDFLAG(IS_WIN) --- a/chrome/browser/component_updater/registration.cc +++ b/chrome/browser/component_updater/registration.cc -@@ -72,8 +72,6 @@ +@@ -66,8 +66,6 @@ #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.h" @@ -252,7 +239,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID) -@@ -239,9 +237,6 @@ void RegisterComponentsForUpdate() { +@@ -229,9 +227,6 @@ void RegisterComponentsForUpdate() { RegisterAutofillStatesComponent(cus, g_browser_process->local_state()); @@ -388,7 +375,7 @@ "prediction_service_request.cc", --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -250,30 +250,6 @@ void PredictionBasedPermissionUiSelector +@@ -249,30 +249,6 @@ void PredictionBasedPermissionUiSelector if (snapshot.drawsNothing()) { VLOG(1) << "[PermissionsAIv3] The page's snapshot is empty"; } else { @@ -444,9 +431,9 @@ VLOG(1) << "[PermissionsAIv1] The page's content is too short or empty"; --- a/chrome/browser/prefs/BUILD.gn +++ b/chrome/browser/prefs/BUILD.gn -@@ -286,7 +286,6 @@ source_set("impl") { - } else { +@@ -293,7 +293,6 @@ source_set("impl") { deps += [ + "//chrome/browser/contextual_cueing", "//chrome/browser/promos:utils", - "//chrome/browser/screen_ai:prefs", "//chrome/browser/search/background", @@ -454,7 +441,7 @@ "//chrome/browser/search_engines", --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1842,9 +1842,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1915,9 +1915,6 @@ void RegisterLocalState(PrefRegistrySimp DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry); #endif @@ -466,7 +453,7 @@ PlatformAuthPolicyObserver::RegisterPrefs(registry); --- a/chrome/browser/profiles/BUILD.gn +++ b/chrome/browser/profiles/BUILD.gn -@@ -305,7 +305,6 @@ source_set("profiles_extra_parts_impl") +@@ -309,7 +309,6 @@ source_set("profiles_extra_parts_impl") ] } else { deps += [ @@ -474,7 +461,7 @@ "//chrome/browser/apps/app_service", "//chrome/browser/autofill", "//chrome/browser/contextual_cueing", -@@ -313,7 +312,6 @@ source_set("profiles_extra_parts_impl") +@@ -317,7 +316,6 @@ source_set("profiles_extra_parts_impl") "//chrome/browser/feedback", "//chrome/browser/hid", "//chrome/browser/media/router/discovery/access_code:access_code_sink_service", @@ -492,7 +479,7 @@ #include "chrome/browser/navigation_predictor/search_engine_preconnector.h" #include "chrome/browser/navigation_predictor/search_engine_preconnector_keyed_service_factory.h" #include "chrome/browser/net/dns_probe_service_factory.h" -@@ -332,7 +331,6 @@ +@@ -334,7 +333,6 @@ #include "chrome/browser/prefs/persistent_renderer_prefs_manager_factory.h" #include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h" #include "chrome/browser/profile_resetter/reset_report_uploader_factory.h" @@ -500,7 +487,7 @@ #include "chrome/browser/search/background/ntp_background_service_factory.h" #include "chrome/browser/search/background/ntp_custom_background_service_factory.h" #include "chrome/browser/search/instant_service_factory.h" -@@ -1039,7 +1037,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1046,7 +1044,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) net::ServerCertificateDatabaseServiceFactory::GetInstance(); #endif @@ -508,7 +495,7 @@ #if BUILDFLAG(IS_CHROMEOS) NearbySharingServiceFactory::GetInstance(); if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) { -@@ -1091,9 +1088,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1098,9 +1095,6 @@ void ChromeBrowserMainExtraPartsProfiles OneTimePermissionsTrackerFactory::GetInstance(); #endif OpenerHeuristicServiceFactory::GetInstance(); @@ -518,7 +505,7 @@ OptimizationGuideKeyedServiceFactory::GetInstance(); OriginKeyedPermissionActionServiceFactory::GetInstance(); OriginTrialsFactory::GetInstance(); -@@ -1168,13 +1162,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1175,13 +1169,6 @@ void ChromeBrowserMainExtraPartsProfiles policy::UserPolicySigninServiceFactory::GetInstance(); #endif PolicyBlocklistFactory::GetInstance(); @@ -532,21 +519,18 @@ PredictionServiceFactory::GetInstance(); predictors::AutocompleteActionPredictorFactory::GetInstance(); predictors::LoadingPredictorFactory::GetInstance(); -@@ -1261,13 +1248,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1270,10 +1257,6 @@ void ChromeBrowserMainExtraPartsProfiles #else SafetyHubMenuNotificationServiceFactory::GetInstance(); SafetyHubHatsServiceFactory::GetInstance(); - if (features::IsMainNodeAnnotationsEnabled()) { - screen_ai::AXMainNodeAnnotatorControllerFactory::GetInstance(); - } --#if BUILDFLAG(ENABLE_PDF) -- screen_ai::PdfOcrControllerFactory::GetInstance(); --#endif - screen_ai::ScreenAIServiceRouterFactory::EnsureFactoryBuilt(); #endif #if BUILDFLAG(IS_CHROMEOS) if (ash::features::IsScannerEnabled()) { -@@ -1378,7 +1358,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1387,7 +1370,6 @@ void ChromeBrowserMainExtraPartsProfiles TrackingProtectionSettingsFactory::GetInstance(); translate::TranslateRankerFactory::GetInstance(); #if !BUILDFLAG(IS_ANDROID) @@ -570,25 +554,12 @@ // System Profile. --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -845,24 +845,6 @@ void ProfileImpl::DoFinalInit(CreateMode +@@ -853,11 +853,6 @@ void ProfileImpl::DoFinalInit(CreateMode // The password settings service needs to start listening to settings // changes from Google Mobile Services, as early as possible. PasswordManagerSettingsServiceFactory::GetForProfile(this); -#else - --#if BUILDFLAG(ENABLE_PDF) -- bool pcf_ocr_may_be_needed = true; --#if BUILDFLAG(IS_CHROMEOS) -- // `PdfOcrControllerFactory` is not needed in the not-signed-in profile of -- // ChromeOS as no user navigation to PDFs is possible there. -- pcf_ocr_may_be_needed = IsSignedIn(); --#endif -- // Create the PDF OCR controller so that it can self-activate as needed. -- if (pcf_ocr_may_be_needed) { -- screen_ai::PdfOcrControllerFactory::GetForProfile(this); -- } --#endif // BUILDFLAG(ENABLE_PDF) -- - if (features::IsMainNodeAnnotationsEnabled()) { - screen_ai::AXMainNodeAnnotatorControllerFactory::GetForProfile(this); - } @@ -597,7 +568,7 @@ // The announcement notification service might not be available for some --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -50,7 +50,6 @@ +@@ -51,7 +51,6 @@ #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" @@ -605,7 +576,7 @@ #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/delete_profile_helper.h" #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h" -@@ -1509,9 +1508,6 @@ void ProfileManager::DoFinalInitForServi +@@ -1493,9 +1492,6 @@ void ProfileManager::DoFinalInitForServi // Ensure NavigationPredictorKeyedService is started. NavigationPredictorKeyedServiceFactory::GetForProfile(profile); @@ -617,7 +588,7 @@ #if BUILDFLAG(IS_ANDROID) --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn -@@ -100,7 +100,6 @@ group("resources") { +@@ -101,7 +101,6 @@ group("resources") { if (is_mac) { public_deps += [ "//chrome/browser/resources/media/mei_preload:component", @@ -627,7 +598,7 @@ --- a/chrome/browser/resources/pdf/pdf_viewer.html +++ b/chrome/browser/resources/pdf/pdf_viewer.html -@@ -100,10 +100,6 @@ import {AnnotationMode} from './constant +@@ -107,10 +107,6 @@ import {AnnotationMode} from './constant ` : ''} @@ -640,7 +611,7 @@ ${this.showErrorDialog ? html` --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1657,8 +1657,6 @@ static_library("ui") { +@@ -1631,8 +1631,6 @@ static_library("ui") { "//chrome/browser/regional_capabilities", "//chrome/browser/safe_browsing", "//chrome/browser/safe_browsing:advanced_protection", @@ -649,7 +620,7 @@ "//chrome/browser/smart_card:smart_card", "//chrome/browser/tab_group_sync:utils", "//chrome/browser/themes", -@@ -2370,7 +2368,6 @@ static_library("ui") { +@@ -2348,7 +2346,6 @@ static_library("ui") { "//chrome/browser/policy:onc", "//chrome/browser/policy:system_features_disable_list", "//chrome/browser/push_notification:push_notification", @@ -677,17 +648,29 @@ "//chrome/common", --- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc +++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc -@@ -97,10 +97,4 @@ void ChromePDFDocumentHelperClient::SetP +@@ -95,12 +95,3 @@ void ChromePDFDocumentHelperClient::SetP + } + } - void ChromePDFDocumentHelperClient::OnSearchifyStarted( - content::WebContents* contents) { +-void ChromePDFDocumentHelperClient::OnSearchifyStarted( +- content::WebContents* contents) { - // TODO(crbug.com/360803943): Add test. - // Show the promo only when ScreenAI component is available and OCR can be - // done. - if (screen_ai::ScreenAIInstallState::GetInstance()->IsComponentAvailable()) { - MaybeShowFeaturePromo(contents); - } - } +-} +--- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h ++++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h +@@ -24,7 +24,6 @@ class ChromePDFDocumentHelperClient : pu + void OnSaveURL(content::WebContents* contents) override; + void SetPluginCanSave(content::RenderFrameHost* render_frame_host, + bool can_save) override; +- void OnSearchifyStarted(content::WebContents* contents) override; + }; + + #endif // CHROME_BROWSER_UI_PDF_CHROME_PDF_DOCUMENT_HELPER_CLIENT_H_ --- a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc +++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc @@ -35,11 +35,6 @@ void AccessibilityMainHandler::RegisterM @@ -793,7 +776,7 @@ #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/ui/browser.h" -@@ -369,24 +367,6 @@ ReadAnythingUntrustedPageHandler::ReadAn +@@ -370,14 +368,6 @@ ReadAnythingUntrustedPageHandler::ReadAn prefs_lang = language::ExtractBaseLanguage(prefs_lang); SetDefaultLanguageCode(prefs_lang); @@ -804,33 +787,10 @@ - base::BindOnce( - &ReadAnythingUntrustedPageHandler::OnScreenAIServiceInitialized, - weak_factory_.GetWeakPtr())); --#if BUILDFLAG(ENABLE_PDF) -- // PDF searchify feature adds OCR text to images while loading the PDF, so -- // warming up the OCR service is not needed. -- if (!base::FeatureList::IsEnabled(chrome_pdf::features::kPdfSearchify)) { -- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(profile_) -- ->GetServiceStateAsync( -- screen_ai::ScreenAIServiceRouter::Service::kOCR, -- base::DoNothing()); -- } --#endif // BUILDFLAG(ENABLE_PDF) - } // Enable accessibility for the top level render frame and all descendants. // This causes AXTreeSerializer to reset and send accessibility events of -@@ -856,12 +836,6 @@ void ReadAnythingUntrustedPageHandler::S - weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode); - } - } -- // PDF searchify feature adds OCR text to images while loading the PDF, so -- // activating PDF OCR is not needed. -- if (use_screen_ai_service_ && -- !base::FeatureList::IsEnabled(chrome_pdf::features::kPdfSearchify)) { -- screen_ai::PdfOcrControllerFactory::GetForProfile(profile_)->Activate(); -- } - #endif // BUILDFLAG(ENABLE_PDF) - } - --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -373,18 +373,6 @@ static_library("renderer") { @@ -862,15 +822,15 @@ ] --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc -@@ -69,7 +69,6 @@ +@@ -70,7 +70,6 @@ #include "url/gurl.h" #if !BUILDFLAG(IS_ANDROID) -#include "chrome/renderer/accessibility/read_anything/read_anything_app_controller.h" + #include "chrome/renderer/actor/journal.h" #include "chrome/renderer/actor/tool_executor.h" #include "chrome/renderer/searchbox/searchbox_extension.h" - #endif // !BUILDFLAG(IS_ANDROID) -@@ -318,21 +317,6 @@ void ChromeRenderFrameObserver::DidCommi +@@ -323,21 +322,6 @@ void ChromeRenderFrameObserver::DidCommi } void ChromeRenderFrameObserver::DidClearWindowObject() { @@ -894,7 +854,7 @@ void ChromeRenderFrameObserver::DidMeaningfulLayout( --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -2275,9 +2275,6 @@ if (!is_android) { +@@ -2334,9 +2334,6 @@ if (!is_android) { "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/safe_browsing:advanced_protection", "//chrome/browser/safe_browsing:verdict_cache_manager_factory", @@ -904,17 +864,16 @@ "//chrome/browser/search", "//chrome/browser/search_engines", "//chrome/browser/segmentation_platform:test_utils", -@@ -2699,9 +2696,6 @@ if (!is_android) { - "//services/network/public/proto:sct_audit_report_proto", +@@ -2755,8 +2752,6 @@ if (!is_android) { "//services/preferences/public/cpp", "//services/preferences/public/cpp/tracked", -- "//services/screen_ai:test_support", + "//services/preferences/tracked:features", - "//services/screen_ai/public/cpp:utilities", - "//services/screen_ai/public/mojom", "//services/service_manager/public/cpp", "//services/strings", "//services/test/echo/public/mojom", -@@ -8265,7 +8259,6 @@ test("unit_tests") { +@@ -8405,7 +8400,6 @@ test("unit_tests") { # # TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above? deps += [ @@ -922,7 +881,7 @@ "//chrome:packed_resources_integrity_header", "//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps/app_service", -@@ -8299,7 +8292,6 @@ test("unit_tests") { +@@ -8439,7 +8433,6 @@ test("unit_tests") { "//chrome/browser/profile_resetter:fake_profile_resetter", "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/resources/new_tab_page_instant:resources_grit", @@ -930,14 +889,6 @@ "//chrome/browser/search/background", "//chrome/browser/search/background:constants", "//chrome/browser/search_engine_choice:unit_tests", -@@ -8414,7 +8406,6 @@ test("unit_tests") { - "//components/webapps/browser", - "//services/metrics/public/cpp:ukm_builders", - "//services/network:test_support", -- "//services/screen_ai:test_support", - "//third_party/crashpad/crashpad/util", - "//third_party/libaddressinput", - "//third_party/lzma_sdk/google:unit_tests", --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn @@ -408,7 +408,7 @@ source_set("lib") { @@ -1003,7 +954,7 @@ #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE) --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -600,7 +600,6 @@ test("components_unittests") { +@@ -607,7 +607,6 @@ test("components_unittests") { "//components/media_router/common/providers/cast/channel:unit_tests", "//components/page_info:unit_tests", "//components/permissions:unit_tests", @@ -1013,7 +964,7 @@ "//components/safety_check:unit_tests", --- a/components/omnibox/browser/autocomplete_classifier.cc +++ b/components/omnibox/browser/autocomplete_classifier.cc -@@ -126,8 +126,6 @@ void AutocompleteClassifier::Classify( +@@ -127,8 +127,6 @@ void AutocompleteClassifier::Classify( metrics::OmniboxEventProto::PageClassification page_classification, AutocompleteMatch* match, GURL* alternate_nav_url) { @@ -1022,95 +973,6 @@ DCHECK(!inside_classify_); base::AutoReset reset(&inside_classify_, true); AutocompleteInput input(text, page_classification, *scheme_classifier_); ---- a/components/pdf/renderer/pdf_accessibility_tree.cc -+++ b/components/pdf/renderer/pdf_accessibility_tree.cc -@@ -537,20 +537,6 @@ void PdfAccessibilityTree::SetAccessibil - std::move(chars), std::move(page_objects))); - } - --void PdfAccessibilityTree::OnHasSearchifyText() { -- // TODO(crbug.com/360803943): Look into if `render_frame()` can be null, why -- // it is assumed to be not null in `SetOcrCompleteStatus()`, and create a -- // better distinction between `render_frame()` and `render_frame_`. -- // TODO(accessibility): remove this dependency. -- content::RenderAccessibility* render_accessibility = -- render_frame() ? render_frame()->GetRenderAccessibility() : nullptr; -- bool screen_reader_mode = -- (render_accessibility && render_accessibility->GetAXMode().has_mode( -- ui::AXMode::kExtendedProperties)); -- base::UmaHistogramBoolean( -- "Accessibility.ScreenAI.Searchify.ScreenReaderModeEnabled", -- screen_reader_mode); --} - - void PdfAccessibilityTree::DoSetAccessibilityPageInfo( - const chrome_pdf::AccessibilityPageInfo& page_info, ---- a/components/pdf/renderer/pdf_accessibility_tree_builder.cc -+++ b/components/pdf/renderer/pdf_accessibility_tree_builder.cc -@@ -11,7 +11,6 @@ - #include "base/containers/fixed_flat_map.h" - #include "base/i18n/break_iterator.h" - #include "base/strings/utf_string_conversion_utils.h" --#include "components/pdf/renderer/pdf_ocr_helper.h" - #include "components/strings/grit/components_strings.h" - #include "pdf/accessibility_structs.h" - #include "pdf/pdf_features.h" -@@ -994,8 +993,6 @@ ui::AXNodeData* PdfAccessibilityTreeBuil - wrapper_node->relative_bounds.bounds = gfx::RectF(position, gfx::SizeF(1, 1)); - - ui::AXNodeData* text_node = CreateStaticTextNode(); -- text_node->SetNameChecked(l10n_util::GetStringUTF8( -- start ? IDS_PDF_OCR_RESULT_BEGIN : IDS_PDF_OCR_RESULT_END)); - text_node->relative_bounds.bounds = wrapper_node->relative_bounds.bounds; - wrapper_node->child_ids.push_back(text_node->id); - return wrapper_node; ---- a/components/pdf/renderer/pdf_view_web_plugin_client.cc -+++ b/components/pdf/renderer/pdf_view_web_plugin_client.cc -@@ -203,44 +203,6 @@ PdfViewWebPluginClient::CreateAssociated - return GetFrame()->CreateAssociatedURLLoader(options); - } - --void PdfViewWebPluginClient::GetOcrMaxImageDimension( -- base::OnceCallback callback) { -- ConnectOcrIfNeeded(); -- return screen_ai_annotator_->GetMaxImageDimension(std::move(callback)); --} -- --void PdfViewWebPluginClient::PerformOcr( -- const SkBitmap& image, -- base::OnceCallback callback) { -- ConnectOcrIfNeeded(); -- screen_ai_annotator_->PerformOcrAndReturnAnnotation(image, -- std::move(callback)); --} -- --void PdfViewWebPluginClient::SetOcrDisconnectedCallback( -- base::RepeatingClosure callback) { -- ocr_disconnect_callback_ = std::move(callback); --} -- --void PdfViewWebPluginClient::OnOcrDisconnected() { -- screen_ai_annotator_.reset(); -- CHECK(ocr_disconnect_callback_); -- ocr_disconnect_callback_.Run(); --} -- --void PdfViewWebPluginClient::ConnectOcrIfNeeded() { -- CHECK(base::FeatureList::IsEnabled(ax::mojom::features::kScreenAIOCREnabled)); -- -- if (!screen_ai_annotator_.is_bound()) { -- render_frame_->GetBrowserInterfaceBroker().GetInterface( -- screen_ai_annotator_.BindNewPipeAndPassReceiver()); -- screen_ai_annotator_->SetClientType( -- screen_ai::mojom::OcrClientType::kPdfViewer); -- screen_ai_annotator_.set_disconnect_handler( -- base::BindOnce(&PdfViewWebPluginClient::OnOcrDisconnected, -- weak_factory_.GetWeakPtr())); -- } --} - - void PdfViewWebPluginClient::UpdateTextInputState() { - // `widget` is null in Print Preview. --- a/components/pdf/renderer/pdf_view_web_plugin_client.h +++ b/components/pdf/renderer/pdf_view_web_plugin_client.h @@ -12,7 +12,6 @@ @@ -1121,27 +983,7 @@ namespace blink { class WebLocalFrame; -@@ -87,19 +86,10 @@ class PdfViewWebPluginClient : public ch - chrome_pdf::PdfAccessibilityImageFetcher* image_fetcher, - blink::WebPluginContainer* plugin_element, - bool print_preview) override; -- void GetOcrMaxImageDimension( -- base::OnceCallback callback) override; -- void PerformOcr( -- const SkBitmap& image, -- base::OnceCallback callback) -- override; -- void SetOcrDisconnectedCallback(base::RepeatingClosure callback) override; - - private: - blink::WebLocalFrame* GetFrame() const; - -- void OnOcrDisconnected(); -- void ConnectOcrIfNeeded(); - - const raw_ptr render_frame_; - -@@ -108,8 +98,6 @@ class PdfViewWebPluginClient : public ch +@@ -110,8 +109,6 @@ class PdfViewWebPluginClient : public ch raw_ptr plugin_container_; @@ -1174,74 +1016,6 @@ if (v8_use_external_startup_data) { public_deps += [ "//v8" ] if (use_v8_context_snapshot) { ---- a/pdf/accessibility.cc -+++ b/pdf/accessibility.cc -@@ -46,7 +46,6 @@ void GetAccessibilityInfo(PDFiumEngine* - page_info.page_index = page_index; - page_info.bounds = page->rect(); - page_info.char_count = char_count; -- page_info.is_searchified = page->IsPageSearchified(); - page->GetTextAndImageInfo(text_runs, chars, page_objects.images); - page_info.text_run_count = text_runs.size(); - page_objects.links = page->GetLinkInfo(text_runs); ---- a/pdf/pdf_view_web_plugin.cc -+++ b/pdf/pdf_view_web_plugin.cc -@@ -1378,14 +1378,6 @@ void PdfViewWebPlugin::DocumentLoadCompl - if (accessibility_state_ == AccessibilityState::kPending) - LoadAccessibility(); - -- // To avoid delaying page load for searchify, start searchify after document -- // load is completed. -- // Maximum image dimension is asked once and stored for the next usages, so -- // `BindOnce` is sufficient. -- client_->SetOcrDisconnectedCallback(engine_->GetOcrDisconnectHandler()); -- engine_->StartSearchify( -- base::BindOnce(&Client::GetOcrMaxImageDimension, client_->GetWeakPtr()), -- base::BindRepeating(&Client::PerformOcr, client_->GetWeakPtr())); - - if (!full_frame_) - return; -@@ -2482,7 +2474,7 @@ void PdfViewWebPlugin::EnableAccessibili - - SkBitmap PdfViewWebPlugin::GetImageForOcr(int32_t page_index, - int32_t page_object_index) { -- return engine_->GetImageForOcr(page_index, page_object_index); -+ return SkBitmap(); - } - - void PdfViewWebPlugin::HandleAccessibilityAction( -@@ -3001,19 +2993,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce - return; - } - -- // Wait for the page to be loaded and searchified before getting accessibility -- // page info. -- // Ensure page is loaded so that it can schedule a searchify operation if -- // needed. -- engine_->GetPage(page_index)->GetPage(); -- if (engine_->PageNeedsSearchify(page_index)) { -- base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask( -- FROM_HERE, -- base::BindOnce(&PdfViewWebPlugin::PrepareAndSetAccessibilityPageInfo, -- weak_factory_.GetWeakPtr(), page_index), -- kAccessibilityPageDelay * 10); -- return; -- } - - ++next_accessibility_page_index_; - ---- a/pdf/pdfium/pdfium_engine.cc -+++ b/pdf/pdfium/pdfium_engine.cc -@@ -2674,8 +2674,7 @@ SkBitmap PDFiumEngine::GetImageForOcr(in - // This function is not used after launch of PDF Searchify. Default OCR - // expected resolution is used to avoid unnecessary update of the call chain. - // TODO(crbug.com/360803943): Remove this function and call chain. -- return pages_[page_index]->GetImageForOcr(image_index, -- /*max_image_dimension=*/2048); -+ return SkBitmap(); - } - - bool PDFiumEngine::GetPrintScaling() { --- a/services/passage_embeddings/passage_embeddings_service.cc +++ b/services/passage_embeddings/passage_embeddings_service.cc @@ -23,7 +23,6 @@ PassageEmbeddingsService::~PassageEmbedd diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index 36450a76..db63af9a 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch @@ -2,8 +2,8 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -613,8 +613,6 @@ static_library("browser") { - "infobars/simple_alert_infobar_creator.h", +@@ -634,8 +634,6 @@ static_library("browser") { + "idle/idle_detection_permission_context.h", "interstitials/chrome_settings_page_helper.cc", "interstitials/chrome_settings_page_helper.h", - "interstitials/enterprise_util.cc", @@ -11,7 +11,7 @@ "invalidation/profile_invalidation_provider_factory.cc", "invalidation/profile_invalidation_provider_factory.h", "k_anonymity_service/k_anonymity_service_client.cc", -@@ -2346,7 +2344,6 @@ static_library("browser") { +@@ -2385,7 +2383,6 @@ static_library("browser") { "//components/resources", "//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser:safe_browsing_service", @@ -19,7 +19,7 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/content/common/proto:download_file_types_proto", -@@ -3956,10 +3953,6 @@ static_library("browser") { +@@ -4001,10 +3998,6 @@ static_library("browser") { "new_tab_page/modules/modules_switches.h", "new_tab_page/modules/new_tab_page_modules.cc", "new_tab_page/modules/new_tab_page_modules.h", @@ -30,7 +30,7 @@ "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.cc", "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h", "new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc", -@@ -8621,7 +8614,6 @@ static_library("browser_generated_files" +@@ -8699,7 +8692,6 @@ static_library("browser_generated_files" "//chrome/browser/new_tab_page/chrome_colors:generate_chrome_colors_info", "//chrome/browser/new_tab_page/chrome_colors:generate_colors_info", "//chrome/browser/new_tab_page/modules/file_suggestion:mojo_bindings", @@ -38,7 +38,7 @@ "//chrome/browser/new_tab_page/modules/v2/authentication:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings", -@@ -9116,8 +9108,6 @@ static_library("test_support") { +@@ -9187,8 +9179,6 @@ static_library("test_support") { "//components/reporting/util:status", "//components/reporting/util:status_macros", "//components/reporting/util:task_runner_context", @@ -74,7 +74,7 @@ // Launch a HaTS survey. Note this needs to come before the command is --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -171,7 +171,6 @@ using content::DownloadManager; +@@ -172,7 +172,6 @@ using content::DownloadManager; using download::DownloadItem; using download::DownloadPathReservationTracker; using download::PathValidationResult; @@ -82,7 +82,7 @@ using ConnectionType = net::NetworkChangeNotifier::ConnectionType; #if BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION) -@@ -1873,7 +1872,6 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -1876,7 +1875,6 @@ void ChromeDownloadManagerDelegate::OnDo DownloadItemModel model(item); model.DetermineAndSetShouldPreferOpeningInBrowser( target_info.target_path, target_info.is_filetype_handled_safely); @@ -90,7 +90,7 @@ } if (ShouldBlockFile(item, target_info.danger_type)) { MaybeReportDangerousDownloadBlocked( -@@ -1954,49 +1952,20 @@ bool ChromeDownloadManagerDelegate::IsOp +@@ -1957,49 +1955,20 @@ bool ChromeDownloadManagerDelegate::IsOp bool ChromeDownloadManagerDelegate::ShouldBlockFile( download::DownloadItem* item, download::DownloadDangerType danger_type) const { @@ -515,7 +515,7 @@ std::string RealtimeReportingClient::GetProfileIdentifier() { --- a/chrome/browser/enterprise/connectors/reporting/telomere_reporting_context.cc +++ b/chrome/browser/enterprise/connectors/reporting/telomere_reporting_context.cc -@@ -176,19 +176,6 @@ TelomereReportingContext* TelomereReport +@@ -177,19 +177,6 @@ TelomereReportingContext* TelomereReport } RealtimeReportingClient* TelomereReportingContext::GetReportingClient() const { @@ -537,7 +537,7 @@ --- a/chrome/browser/enterprise/data_controls/reporting_service.cc +++ b/chrome/browser/enterprise/data_controls/reporting_service.cc -@@ -163,10 +163,6 @@ void ReportingService::ReportPaste( +@@ -182,10 +182,6 @@ void ReportingService::ReportPaste( const content::ClipboardEndpoint& destination, const content::ClipboardMetadata& metadata, const Verdict& verdict) { @@ -548,7 +548,7 @@ } void ReportingService::ReportPasteWarningBypassed( -@@ -174,29 +170,17 @@ void ReportingService::ReportPasteWarnin +@@ -193,29 +189,17 @@ void ReportingService::ReportPasteWarnin const content::ClipboardEndpoint& destination, const content::ClipboardMetadata& metadata, const Verdict& verdict) { @@ -578,7 +578,7 @@ } void ReportingService::ReportCopyOrPaste( -@@ -206,45 +190,6 @@ void ReportingService::ReportCopyOrPaste +@@ -225,45 +209,6 @@ void ReportingService::ReportCopyOrPaste const Verdict& verdict, const std::string& trigger, enterprise_connectors::EventResult event_result) { @@ -624,7 +624,7 @@ } // -------------------------------------- -@@ -274,7 +219,6 @@ ReportingServiceFactory::ReportingServic +@@ -293,7 +238,6 @@ ReportingServiceFactory::ReportingServic .WithSystem(ProfileSelection::kNone) .WithAshInternals(ProfileSelection::kNone) .Build()) { @@ -634,7 +634,7 @@ ReportingServiceFactory::~ReportingServiceFactory() = default; --- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc +++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc -@@ -193,9 +193,7 @@ void LogVerdictSource( +@@ -195,9 +195,7 @@ void LogVerdictSource( bool IsScreenshotAllowedByDataControls(content::BrowserContext* context, const GURL& url) { @@ -665,22 +665,22 @@ bool site_isolation_enabled; --- a/chrome/browser/enterprise/signals/profile_signals_collector.cc +++ b/chrome/browser/enterprise/signals/profile_signals_collector.cc -@@ -45,13 +45,7 @@ ProfileSignalsCollector::ProfileSignalsC - policy_blocklist_service_( +@@ -48,14 +48,8 @@ ProfileSignalsCollector::ProfileSignalsC PolicyBlocklistFactory::GetForBrowserContext(profile)), profile_prefs_(profile->GetPrefs()), -- policy_manager_(profile->GetCloudPolicyManager()), + policy_manager_(profile->GetCloudPolicyManager()), - connectors_service_( - enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext( -- profile)) { +- profile)), + profile_id_service_( + enterprise::ProfileIdServiceFactory::GetForProfile(profile)) { -#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) -- DCHECK(connectors_service_); +- CHECK(connectors_service_); -#endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) -+ policy_manager_(profile->GetCloudPolicyManager()) { - DCHECK(policy_blocklist_service_); + CHECK(policy_blocklist_service_); + CHECK(profile_id_service_); } - -@@ -68,12 +62,8 @@ void ProfileSignalsCollector::GetProfile +@@ -73,12 +67,8 @@ void ProfileSignalsCollector::GetProfile signal_response.chrome_remote_desktop_app_blocked = device_signals::GetChromeRemoteDesktopAppBlocked( policy_blocklist_service_); @@ -692,12 +692,12 @@ - device_signals::GetSafeBrowsingProtectionLevel(profile_prefs_); signal_response.site_isolation_enabled = device_signals::GetSiteIsolationEnabled(); - #if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) + signal_response.profile_id = profile_id_service_->GetProfileId(); --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -348,8 +348,6 @@ source_set("extensions") { - "management/management_util.h", - "manifest_check_level.h", +@@ -400,8 +400,6 @@ source_set("extensions") { + "mv2_deprecation_impact_checker.cc", + "mv2_deprecation_impact_checker.h", "mv2_experiment_stage.h", - "omaha_attributes_handler.cc", - "omaha_attributes_handler.h", @@ -723,6 +723,17 @@ info.browser_version = std::move(signals.browser_version); info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled; info.enterprise_profile_id = signals.enterprise_profile_id; +--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc ++++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc +@@ -375,8 +375,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil + settings_api::PrefType::kBoolean; + (*s_allowlist)[::kGeneratedHttpsFirstModePref] = + settings_api::PrefType::kNumber; +- (*s_allowlist)[::prefs::kSecuritySettingsBundle] = +- settings_api::PrefType::kNumber; + (*s_allowlist)[::safe_browsing::kGeneratedSecuritySettingsBundlePref] = + settings_api::PrefType::kNumber; + --- a/chrome/browser/extensions/blocklist.cc +++ b/chrome/browser/extensions/blocklist.cc @@ -190,21 +190,8 @@ Blocklist* Blocklist::Get(content::Brows @@ -749,7 +760,7 @@ void Blocklist::GetMalwareIDs(const std::set& ids, --- a/chrome/browser/extensions/chrome_extension_system.cc +++ b/chrome/browser/extensions/chrome_extension_system.cc -@@ -463,8 +463,6 @@ void ChromeExtensionSystem::InstallUpdat +@@ -461,8 +461,6 @@ void ChromeExtensionSystem::InstallUpdat void ChromeExtensionSystem::PerformActionBasedOnOmahaAttributes( const std::string& extension_id, const base::Value::Dict& attributes) { @@ -768,17 +779,29 @@ } ExtensionAllowlistFactory::~ExtensionAllowlistFactory() = default; +--- a/chrome/browser/extensions/extension_safety_check_utils.cc ++++ b/chrome/browser/extensions/extension_safety_check_utils.cc +@@ -262,9 +262,6 @@ developer::SafetyCheckWarningReason GetS + top_warning_reason = + developer::SafetyCheckWarningReason::kNoPrivacyPractice; + +- } else if (SafetyCheckShouldShowOffstoreExtension(extension, profile, +- cws_info)) { +- top_warning_reason = developer::SafetyCheckWarningReason::kOffstore; + } + } + --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -54,7 +54,6 @@ - #include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h" - #include "chrome/browser/extensions/install_verifier.h" +@@ -56,7 +56,6 @@ #include "chrome/browser/extensions/installed_loader.h" + #include "chrome/browser/extensions/manifest_v2_experiment_manager.h" + #include "chrome/browser/extensions/mv2_experiment_stage.h" -#include "chrome/browser/extensions/omaha_attributes_handler.h" #include "chrome/browser/extensions/permissions/permissions_updater.h" #include "chrome/browser/extensions/profile_util.h" #include "chrome/browser/extensions/unpacked_installer.h" -@@ -215,9 +214,6 @@ ExtensionService::ExtensionService( +@@ -212,9 +211,6 @@ ExtensionService::ExtensionService( extension_telemetry_service_verdict_handler_(extension_prefs, registry_, extension_registrar_), @@ -788,7 +811,7 @@ force_installed_tracker_(registry_, profile_), force_installed_metrics_(registry_, profile_, &force_installed_tracker_), corrupted_extension_reinstaller_( -@@ -404,11 +400,6 @@ void ExtensionService::LoadExtensionsFro +@@ -402,11 +398,6 @@ void ExtensionService::LoadExtensionsFro << "--load-extension is not allowed in Google Chrome, ignoring."; return; } @@ -800,7 +823,7 @@ if (ShouldBlockCommandLineExtension(*profile_)) { // TODO(crbug.com/401529219): Deprecate this restriction once // --load-extension removal on Chrome builds is fully launched. -@@ -456,17 +447,6 @@ void ExtensionService::LoadSigninProfile +@@ -461,17 +452,6 @@ void ExtensionService::LoadSigninProfile } #endif @@ -839,7 +862,7 @@ // Performs action based on verdicts received from the Extension Telemetry // server. Currently, these verdicts are limited to off-store extensions. void PerformActionBasedOnExtensionTelemetryServiceVerdicts( -@@ -374,8 +369,6 @@ class ExtensionService : public Extensio +@@ -384,8 +379,6 @@ class ExtensionService : public Extensio ExtensionTelemetryServiceVerdictHandler extension_telemetry_service_verdict_handler_; @@ -901,7 +924,7 @@ } --- a/chrome/browser/notifications/persistent_notification_handler.cc +++ b/chrome/browser/notifications/persistent_notification_handler.cc -@@ -307,16 +307,6 @@ void PersistentNotificationHandler::Disa +@@ -308,16 +308,6 @@ void PersistentNotificationHandler::Disa NotificationPermissionContext::UpdatePermission(profile, origin, CONTENT_SETTING_BLOCK); #endif @@ -918,7 +941,7 @@ } void PersistentNotificationHandler::OpenSettings(Profile* profile, -@@ -355,42 +345,6 @@ void PersistentNotificationHandler::OnMa +@@ -356,42 +346,6 @@ void PersistentNotificationHandler::OnMa Profile* profile, bool did_show_warning, bool did_user_unsubscribe) { @@ -963,7 +986,7 @@ #if BUILDFLAG(ENABLE_BACKGROUND_MODE) --- a/chrome/browser/notifications/platform_notification_service_impl.cc +++ b/chrome/browser/notifications/platform_notification_service_impl.cc -@@ -775,38 +775,8 @@ void PlatformNotificationServiceImpl::Up +@@ -778,38 +778,8 @@ void PlatformNotificationServiceImpl::Up std::unique_ptr persistent_metadata, bool should_show_warning, std::optional serialized_content_detection_metadata) { @@ -1089,7 +1112,7 @@ --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -597,68 +597,6 @@ bool PredictionBasedPermissionUiSelector +@@ -596,62 +596,6 @@ bool PredictionBasedPermissionUiSelector PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse( permissions::RequestType request_type) { @@ -1125,13 +1148,7 @@ - if (use_server_side) { - // Aiv3 takes priority over Aiv1 if both are enabled. -#if BUILDFLAG(BUILD_WITH_TFLITE_LIB) -- if (request_type == permissions::RequestType::kNotifications && -- base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv3)) { -- return PredictionSource::kOnDeviceAiv3AndServerSideModel; -- } -- if (request_type == permissions::RequestType::kGeolocation && -- base::FeatureList::IsEnabled( -- permissions::features::kPermissionsAIv3Geolocation)) { +- if (base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv3)) { - return PredictionSource::kOnDeviceAiv3AndServerSideModel; - } -#endif // BUILDFLAG(BUILD_WITH_TFLITE_LIB) @@ -1160,7 +1177,7 @@ --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -2494,8 +2494,6 @@ std::unique_ptrAddHandler( std::make_unique( chrome_schema)); @@ -1171,7 +1188,7 @@ std::make_unique(key::kURLBlocklist)); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -284,7 +284,6 @@ +@@ -287,7 +287,6 @@ #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h" #include "chrome/browser/new_tab_page/modules/file_suggestion/drive_service.h" #include "chrome/browser/new_tab_page/modules/file_suggestion/microsoft_files_page_handler.h" @@ -1179,7 +1196,7 @@ #include "chrome/browser/new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h" #include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h" #include "chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.h" -@@ -2089,7 +2088,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -2164,7 +2163,6 @@ void RegisterProfilePrefs(user_prefs::Pr NewTabFooterUI::RegisterProfilePrefs(registry); NewTabPageHandler::RegisterProfilePrefs(registry); NewTabPageUI::RegisterProfilePrefs(registry); @@ -1189,7 +1206,7 @@ promos_utils::RegisterProfilePrefs(registry); --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -867,9 +867,7 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -874,9 +874,7 @@ void ChromeBrowserMainExtraPartsProfiles enterprise_connectors::TelomereEventRouterFactory::GetInstance(); } #endif @@ -1201,7 +1218,17 @@ enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn -@@ -94,13 +94,6 @@ static_library("safe_browsing") { +@@ -76,9 +76,6 @@ static_library("safe_browsing") { + ] + } + +- if (enable_extensions) { +- deps += [ "//chrome/browser/ui/web_applications" ] +- } + + # Note: is_android is not equivalent to safe_browsing_mode == 2. + # Sources and dependencies added to this block must not depend on anything +@@ -98,13 +95,6 @@ static_library("safe_browsing") { allow_circular_includes_from += [ "//chrome/browser/ash/file_manager" ] } @@ -1217,7 +1244,7 @@ # "Safe Browsing Basic" files used for safe browsing in full mode --- a/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc -@@ -71,10 +71,6 @@ void FileOpeningJob::ProcessNextTask(bas +@@ -72,10 +72,6 @@ void FileOpeningJob::ProcessNextTask(bas if (tasks_[i].taken.exchange(true, std::memory_order_relaxed)) continue; @@ -1249,6 +1276,63 @@ // Indicates if this task has been taken and is owned by a thread. std::atomic_bool taken{false}; }; +--- a/chrome/browser/safe_browsing/generated_security_settings_bundle_pref.cc ++++ b/chrome/browser/safe_browsing/generated_security_settings_bundle_pref.cc +@@ -8,7 +8,6 @@ + #include "chrome/browser/profiles/profile.h" + #include "chrome/common/extensions/api/settings_private.h" + #include "components/prefs/pref_service.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + + namespace settings_api = extensions::api::settings_private; + +@@ -21,28 +20,10 @@ GeneratedSecuritySettingsBundlePref::Gen + Profile* profile) + : profile_(profile) { + user_prefs_registrar_.Init(profile->GetPrefs()); +- user_prefs_registrar_.Add( +- prefs::kSecuritySettingsBundle, +- base::BindRepeating(&GeneratedSecuritySettingsBundlePref:: +- OnSecuritySettingsBundlePreferencesChanged, +- base::Unretained(this))); + } + + extensions::settings_private::SetPrefResult + GeneratedSecuritySettingsBundlePref::SetPref(const base::Value* value) { +- if (!value->is_int()) { +- return extensions::settings_private::SetPrefResult::PREF_TYPE_MISMATCH; +- } +- +- auto selection = static_cast(value->GetInt()); +- +- if (selection != static_cast(SecuritySettingsBundleSetting::STANDARD) && +- selection != static_cast(SecuritySettingsBundleSetting::ENHANCED)) { +- return extensions::settings_private::SetPrefResult::PREF_TYPE_MISMATCH; +- } +- // Update Security Settings Bundle preference to match selection. +- profile_->GetPrefs()->SetInteger(prefs::kSecuritySettingsBundle, selection); +- + return extensions::settings_private::SetPrefResult::SUCCESS; + } + +@@ -52,17 +33,8 @@ GeneratedSecuritySettingsBundlePref::Get + pref_object.key = kGeneratedSecuritySettingsBundlePref; + pref_object.type = extensions::api::settings_private::PrefType::kNumber; + +- auto security_settings_bundle_enabled = +- profile_->GetPrefs()->GetInteger(prefs::kSecuritySettingsBundle); +- +- if (security_settings_bundle_enabled == +- static_cast(SecuritySettingsBundleSetting::ENHANCED)) { +- pref_object.value = +- base::Value(static_cast(SecuritySettingsBundleSetting::ENHANCED)); +- } else { + pref_object.value = + base::Value(static_cast(SecuritySettingsBundleSetting::STANDARD)); +- } + + return pref_object; + } --- a/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc +++ b/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc @@ -17,15 +17,6 @@ SafeBrowsingMetricsProvider::~SafeBrowsi @@ -1366,7 +1450,7 @@ // certificate. So, when users click proceed on an interstitial, move the tab --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -4535,8 +4535,6 @@ static_library("ui") { +@@ -4466,8 +4466,6 @@ static_library("ui") { "views/safe_browsing/prompt_for_scanning_modal_dialog.h", "views/safe_browsing/tailored_security_desktop_dialog_manager.cc", "views/safe_browsing/tailored_security_desktop_dialog_manager.h", @@ -1385,29 +1469,26 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "revoked_permissions_service.h" -@@ -409,34 +408,6 @@ RevokedPermissionsService::RevokedPermis +@@ -406,31 +405,6 @@ RevokedPermissionsService::RevokedPermis base::Unretained(this))); #endif // BUILDFLAG(IS_ANDROID) -- if (base::FeatureList::IsEnabled( -- safe_browsing::kSafetyHubAbusiveNotificationRevocation)) { -- abusive_notification_manager_ = -- std::make_unique( +- abusive_notification_manager_ = +- std::make_unique( -#if BUILDFLAG(SAFE_BROWSING_AVAILABLE) -- g_browser_process->safe_browsing_service() -- ? g_browser_process->safe_browsing_service()->database_manager() -- : nullptr, +- g_browser_process->safe_browsing_service() +- ? g_browser_process->safe_browsing_service()->database_manager() +- : nullptr, -#else -- nullptr, +- nullptr, -#endif -- hcsm()); +- hcsm(), pref_change_registrar_->prefs()); - -- pref_change_registrar_->Add( -- prefs::kSafeBrowsingEnabled, -- base::BindRepeating(&RevokedPermissionsService:: -- OnPermissionsAutorevocationControlChanged, -- base::Unretained(this))); -- } +- pref_change_registrar_->Add( +- prefs::kSafeBrowsingEnabled, +- base::BindRepeating( +- &RevokedPermissionsService::OnPermissionsAutorevocationControlChanged, +- base::Unretained(this))); - - if (base::FeatureList::IsEnabled( - features::kSafetyHubDisruptiveNotificationRevocation)) { @@ -1420,13 +1501,11 @@ bool migration_completed = pref_change_registrar_->prefs()->GetBoolean( safety_hub_prefs::kUnusedSitePermissionsRevocationMigrationCompleted); -@@ -1204,9 +1175,7 @@ bool RevokedPermissionsService::IsUnused +@@ -1198,7 +1172,7 @@ bool RevokedPermissionsService::IsUnused } bool RevokedPermissionsService::IsAbusiveNotificationAutoRevocationEnabled() { -- return base::FeatureList::IsEnabled( -- safe_browsing::kSafetyHubAbusiveNotificationRevocation) && -- safe_browsing::IsSafeBrowsingEnabled(*pref_change_registrar_->prefs()); +- return safe_browsing::IsSafeBrowsingEnabled(*pref_change_registrar_->prefs()); + return false; } @@ -1451,7 +1530,7 @@ #include "components/strings/grit/components_strings.h" #include "components/tabs/public/tab_interface.h" #include "components/vector_icons/vector_icons.h" -@@ -146,57 +145,6 @@ void ToastService::RegisterToasts( +@@ -144,57 +143,6 @@ void ToastService::RegisterToasts( .Build()); } @@ -1522,7 +1601,7 @@ std::unique_ptr CreateWebContentsViewDelegate( --- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.mm +++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.mm -@@ -89,7 +89,7 @@ bool ChromeWebContentsViewDelegateViewsM +@@ -103,7 +103,7 @@ bool ChromeWebContentsViewDelegateViewsM void ChromeWebContentsViewDelegateViewsMac::OnPerformingDrop( const content::DropData& drop_data, DropCompletionCallback callback) { @@ -1680,7 +1759,7 @@ std::move(callback), --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -123,7 +123,6 @@ base::span Chr +@@ -124,7 +124,6 @@ base::span Chr kChromeUISuggestInternalsHost, #endif kChromeUINTPTilesInternalsHost, @@ -1690,7 +1769,7 @@ kChromeUITabSearchHost, --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -2558,7 +2558,6 @@ if (!is_android) { +@@ -2614,7 +2614,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1698,7 +1777,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", -@@ -6921,7 +6920,6 @@ test("unit_tests") { +@@ -7065,7 +7064,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1778,19 +1857,21 @@ std::optional profile_enrollment_domain = std::nullopt; - safe_browsing::SafeBrowsingState safe_browsing_protection_level; bool site_isolation_enabled; + std::optional profile_id = std::nullopt; - // Enterprise cloud content analysis exclusives --- a/components/enterprise/browser/reporting/chrome_profile_request_generator.cc +++ b/components/enterprise/browser/reporting/chrome_profile_request_generator.cc -@@ -229,16 +229,10 @@ void ChromeProfileRequestGenerator::OnAg +@@ -245,18 +245,12 @@ void ChromeProfileRequestGenerator::OnAg profile_signals.built_in_dns_client_enabled); profile_signals_report->set_chrome_remote_desktop_app_blocked( profile_signals.chrome_remote_desktop_app_blocked); - profile_signals_report->set_password_protection_warning_trigger( - TranslatePasswordProtectionTrigger( - profile_signals.password_protection_warning_trigger)); - profile_signals_report->set_profile_enrollment_domain( - profile_signals.profile_enrollment_domain.value_or("")); + if (profile_signals.profile_enrollment_domain) { + profile_signals_report->set_profile_enrollment_domain( + profile_signals.profile_enrollment_domain.value()); + } profile_signals_report->set_realtime_url_check_mode( TranslateRealtimeUrlCheckMode(profile_signals.realtime_url_check_mode)); - profile_signals_report->set_safe_browsing_protection_level( @@ -1884,7 +1965,7 @@ enterprise_data_controls = --- a/components/enterprise/connectors/core/reporting_service_settings.cc +++ b/components/enterprise/connectors/core/reporting_service_settings.cc -@@ -44,16 +44,6 @@ ReportingServiceSettings::ReportingServi +@@ -45,16 +45,6 @@ ReportingServiceSettings::ReportingServi else DVLOG(1) << "Enabled event name list contains a non string value!"; } @@ -1919,7 +2000,7 @@ } // namespace password_manager --- a/components/safe_browsing/content/common/safe_browsing.mojom +++ b/components/safe_browsing/content/common/safe_browsing.mojom -@@ -146,7 +146,6 @@ interface PhishingDetector { +@@ -168,7 +168,6 @@ interface PhishingDetector { // Interface for setting a phishing model. This is scoped to an entire // RenderProcess. @@ -2040,7 +2121,7 @@ bool ChromeEnterpriseRealTimeUrlLookupService:: --- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc -@@ -284,17 +284,6 @@ void RealTimeUrlLookupService::MaybeLogP +@@ -244,17 +244,6 @@ void RealTimeUrlLookupService::MaybeLogP bool request_had_cookie, bool was_first_request, bool sent_with_token) { @@ -2060,7 +2141,7 @@ void RealTimeUrlLookupService::MaybeFillReferringWebApk( --- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -593,17 +593,6 @@ void RealTimeUrlLookupServiceBase::Start +@@ -645,17 +645,6 @@ void RealTimeUrlLookupServiceBase::Start request->set_report_type(is_sampled_report ? RTLookupRequest::SAMPLED_REPORT : RTLookupRequest::FULL_REPORT); request->set_frame_type(RTLookupRequest::MAIN_FRAME); @@ -2155,7 +2236,7 @@ raw_ptr identity_manager_; --- a/components/safe_browsing/core/browser/verdict_cache_manager.cc +++ b/components/safe_browsing/core/browser/verdict_cache_manager.cc -@@ -447,16 +447,6 @@ VerdictCacheManager::VerdictCacheManager +@@ -459,16 +459,6 @@ VerdictCacheManager::VerdictCacheManager // pref_service can be null in tests. if (pref_service) { pref_change_registrar_.Init(pref_service); @@ -2218,7 +2299,7 @@ void SSLBlockingPageBase::PopulateEnhancedProtectionMessage( --- a/components/sync_preferences/common_syncable_prefs_database.cc +++ b/components/sync_preferences/common_syncable_prefs_database.cc -@@ -327,9 +327,6 @@ constexpr auto kCommonSyncablePrefsAllow +@@ -328,9 +328,6 @@ constexpr auto kCommonSyncablePrefsAllow {plus_addresses::prefs::kLastPlusAddressFillingTime, {syncable_prefs_ids::kLastPlusAddressFillingTime, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, @@ -2306,7 +2387,7 @@ void DidFileSkipQuarantine(base::File::Error result); --- a/extensions/browser/extension_registrar.cc +++ b/extensions/browser/extension_registrar.cc -@@ -772,103 +772,27 @@ void ExtensionRegistrar::UnblockAllExten +@@ -777,103 +777,27 @@ void ExtensionRegistrar::UnblockAllExten void ExtensionRegistrar::OnBlocklistStateRemoved( const std::string& extension_id) { diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 217f11c8..4028c02c 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -95,7 +95,7 @@ } --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -281,7 +281,6 @@ +@@ -284,7 +284,6 @@ #include "components/safe_browsing/core/browser/url_checker_delegate.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" @@ -115,7 +115,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/download/download_ui_model.cc +++ b/chrome/browser/download/download_ui_model.cc -@@ -30,7 +30,6 @@ +@@ -31,7 +31,6 @@ #include "components/enterprise/common/proto/connectors.pb.h" #include "components/google/core/common/google_util.h" #include "components/safe_browsing/buildflags.h" @@ -361,7 +361,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -67,7 +66,7 @@ const char* const kExtensionsIdentityAPI +@@ -73,7 +72,7 @@ const char* const kExtensionsIdentityAPI "extensions_identity_api"; bool IsBrowserSigninAllowed(Profile* profile) { @@ -417,7 +417,7 @@ --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc -@@ -33,7 +33,6 @@ +@@ -31,7 +31,6 @@ #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_features.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" @@ -425,7 +425,7 @@ #include "components/translate/core/browser/translate_pref_names.h" #include "content/public/test/browser_test.h" #include "content/public/test/test_devtools_protocol_client.h" -@@ -92,7 +91,6 @@ class ExtensionPreferenceApiTest +@@ -91,7 +90,6 @@ class ExtensionPreferenceApiTest prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); EXPECT_TRUE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); @@ -433,7 +433,7 @@ EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); VerifyPrefValueAndControlledState(prefs::kPrivacySandboxM1TopicsEnabled, base::Value(false), -@@ -130,7 +128,6 @@ class ExtensionPreferenceApiTest +@@ -129,7 +127,6 @@ class ExtensionPreferenceApiTest prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); EXPECT_FALSE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); @@ -441,7 +441,7 @@ EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); VerifyPrefValueAndControlledState(prefs::kPrivacySandboxM1TopicsEnabled, base::Value(true), -@@ -216,7 +213,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen +@@ -225,7 +222,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen prefetch::prefs::kNetworkPredictionOptions, static_cast(prefetch::NetworkPredictionOptions::kDisabled)); prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false); @@ -451,7 +451,7 @@ blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly); --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc -@@ -25,7 +25,6 @@ +@@ -26,7 +26,6 @@ #include "components/enterprise/connectors/core/reporting_service_settings.h" #include "components/enterprise/connectors/core/reporting_utils.h" #include "components/prefs/pref_service.h" @@ -471,7 +471,7 @@ #include "extensions/browser/test_event_router.h" --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -58,10 +58,8 @@ +@@ -59,10 +59,8 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/privacy_sandbox/tracking_protection_prefs.h" #include "components/proxy_config/proxy_config_pref_names.h" @@ -482,7 +482,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/supervised_user/core/common/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" -@@ -336,8 +334,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -337,8 +335,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kNumber; // Privacy page @@ -491,7 +491,7 @@ (*s_allowlist)[::prefs::kDnsOverHttpsMode] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kDnsOverHttpsTemplates] = settings_api::PrefType::kString; -@@ -360,16 +356,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -361,16 +357,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; // Security page @@ -575,7 +575,7 @@ } // namespace extensions --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -71,7 +71,6 @@ +@@ -73,7 +73,6 @@ #include "chrome/common/url_constants.h" #include "components/crx_file/id_util.h" #include "components/policy/core/common/policy_pref_names.h" @@ -593,7 +593,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" #include "extensions/browser/allowlist_state.h" -@@ -1148,19 +1147,6 @@ void InstalledLoader::RecordExtensionsMe +@@ -1146,19 +1145,6 @@ void InstalledLoader::RecordExtensionsMe base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled2", disabled_not_allowlisted_count); } @@ -637,7 +637,7 @@ {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -71,7 +71,6 @@ +@@ -72,7 +72,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" @@ -645,7 +645,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/first_party_sets_handler.h" -@@ -1413,15 +1412,8 @@ void ProfileNetworkContextService::Confi +@@ -1434,15 +1433,8 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; @@ -663,7 +663,7 @@ cert_verifier_creation_params->ct_policy = GetCTPolicy(); --- a/chrome/browser/notifications/platform_notification_service_impl.cc +++ b/chrome/browser/notifications/platform_notification_service_impl.cc -@@ -42,7 +42,6 @@ +@@ -44,7 +44,6 @@ #include "components/prefs/pref_service.h" #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/browser/notification_content_detection/notification_content_detection_constants.h" @@ -671,7 +671,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/platform_notification_context.h" #include "content/public/browser/storage_partition.h" -@@ -800,25 +799,7 @@ void PlatformNotificationServiceImpl::Lo +@@ -803,25 +802,7 @@ void PlatformNotificationServiceImpl::Lo bool PlatformNotificationServiceImpl:: AreSuspiciousNotificationsAllowlistedByUser(const GURL& origin) { @@ -824,7 +824,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/service/sync_policy_handler.h" -@@ -289,9 +286,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -293,9 +290,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kForcePermissionPolicyUnloadDefaultEnabled, policy_prefs::kForcePermissionPolicyUnloadDefaultEnabled, base::Value::Type::BOOLEAN}, @@ -834,7 +834,7 @@ { key::kDomainReliabilityAllowed, domain_reliability::prefs::kDomainReliabilityAllowedByPolicy, base::Value::Type::BOOLEAN }, -@@ -325,15 +319,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -329,15 +323,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kOopPrintDriversAllowedByPolicy, base::Value::Type::BOOLEAN }, #endif @@ -850,7 +850,7 @@ { key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled, base::Value::Type::BOOLEAN }, -@@ -463,9 +448,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -467,9 +452,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdsSettingForIntrusiveAdsSites, prefs::kManagedDefaultAdsSetting, base::Value::Type::INTEGER }, @@ -860,7 +860,7 @@ { key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, base::Value::Type::BOOLEAN }, -@@ -703,15 +685,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -712,15 +694,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kPasswordDismissCompromisedAlertEnabled, password_manager::prefs::kPasswordDismissCompromisedAlertEnabled, base::Value::Type::BOOLEAN }, @@ -876,7 +876,7 @@ #if BUILDFLAG(ENABLE_PDF) { key::kPdfLocalFileAccessAllowedForDomains, prefs::kPdfLocalFileAccessAllowedForDomains, -@@ -877,9 +850,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -883,9 +856,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdditionalDnsQueryTypesEnabled, prefs::kAdditionalDnsQueryTypesEnabled, base::Value::Type::BOOLEAN }, @@ -886,7 +886,7 @@ { key::kForceGoogleSafeSearch, policy_prefs::kForceGoogleSafeSearch, base::Value::Type::BOOLEAN }, -@@ -943,9 +913,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -949,9 +919,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, @@ -896,7 +896,7 @@ { key::kPasswordManagerBlocklist, policy_prefs::kPasswordManagerBlocklist, base::Value::Type::LIST }, -@@ -1918,12 +1885,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1927,12 +1894,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, @@ -909,7 +909,7 @@ { key::kLiveTranslateEnabled, prefs::kLiveTranslateEnabled, base::Value::Type::BOOLEAN }, -@@ -1985,9 +1946,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1994,9 +1955,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kImportDialogAutofillFormData, base::Value::Type::BOOLEAN }, @@ -919,7 +919,7 @@ { key::kHardwareAccelerationModeEnabled, prefs::kHardwareAccelerationModeEnabled, base::Value::Type::BOOLEAN }, -@@ -2257,9 +2215,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2264,9 +2222,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGoogleSearchSidePanelEnabled, prefs::kGoogleSearchSidePanelEnabled, base::Value::Type::BOOLEAN }, @@ -929,7 +929,7 @@ #endif // BUILDFLAG(IS_ANDROID) { key::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, policy_prefs::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, -@@ -2802,24 +2757,7 @@ std::unique_ptrAddHandler(std::make_unique( key::kProfileReauthPrompt, enterprise_signin::prefs::kProfileReauthPrompt, static_cast(enterprise_signin::ProfileReauthPrompt::kDoNotPrompt), -@@ -2891,24 +2829,6 @@ std::unique_ptr> signin_legacy_policies; @@ -981,7 +981,7 @@ std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -161,7 +161,6 @@ +@@ -163,7 +163,6 @@ #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "components/regional_capabilities/regional_capabilities_prefs.h" #include "components/safe_browsing/buildflags.h" @@ -989,7 +989,7 @@ #include "components/saved_tab_groups/public/pref_names.h" #include "components/search_engines/search_engine_choice/search_engine_choice_service.h" #include "components/search_engines/template_url_prepopulate_data.h" -@@ -173,7 +172,6 @@ +@@ -175,7 +174,6 @@ #include "components/sessions/core/session_id_generator.h" #include "components/sharing_message/sharing_sync_preference.h" #include "components/signin/core/browser/active_primary_accounts_metrics_recorder.h" @@ -997,7 +997,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_engagement/content/site_engagement_service.h" -@@ -1641,7 +1639,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1718,7 +1716,6 @@ void RegisterLocalState(PrefRegistrySimp PushMessagingServiceImpl::RegisterPrefs(registry); #endif RegisterScreenshotPrefs(registry); @@ -1005,7 +1005,7 @@ search_engines::SearchEngineChoiceService::RegisterLocalStatePrefs(registry); secure_origin_allowlist::RegisterPrefs(registry); segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs( -@@ -1978,7 +1975,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -2052,7 +2049,6 @@ void RegisterProfilePrefs(user_prefs::Pr #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) safe_browsing::file_type::RegisterProfilePrefs(registry); #endif @@ -1023,7 +1023,7 @@ #include "components/safe_browsing/core/common/safebrowsing_switches.h" #include "components/sync/base/pref_names.h" #include "content/public/common/content_switches.h" -@@ -81,8 +80,6 @@ const CommandLinePrefStore::BooleanSwitc +@@ -84,8 +83,6 @@ const CommandLinePrefStore::BooleanSwitc {switches::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, true}, {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true}, @@ -1045,7 +1045,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/supervised_user/core/browser/supervised_user_pref_store.h" #include "components/sync/base/data_type.h" -@@ -132,9 +130,6 @@ const auto kTrackedPrefs = std::to_array +@@ -130,9 +128,6 @@ const auto kTrackedPrefs = std::to_array {5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT, PrefTrackingStrategy::SPLIT, ValueType::IMPERSONAL}, #endif @@ -1055,7 +1055,7 @@ {7, prefs::kSearchProviderOverrides, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, #if !BUILDFLAG(IS_ANDROID) -@@ -158,10 +153,6 @@ const auto kTrackedPrefs = std::to_array +@@ -156,19 +151,12 @@ const auto kTrackedPrefs = std::to_array PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, // kSyncRemainingRollbackTries is deprecated and will be removed a few // releases after M50. @@ -1065,8 +1065,7 @@ - PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL}, {29, prefs::kMediaStorageIdSalt, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, - #if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -173,9 +164,6 @@ const auto kTrackedPrefs = std::to_array + #if BUILDFLAG(IS_WIN) {32, prefs::kMediaCdmOriginData, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, #endif // BUILDFLAG(IS_WIN) @@ -1126,15 +1125,15 @@ #include "components/signin/public/identity_manager/account_info.h" --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc -@@ -27,7 +27,6 @@ +@@ -28,7 +28,6 @@ #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" #include "components/profile_metrics/state.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 "google_apis/gaia/gaia_id.h" -@@ -515,7 +514,7 @@ bool ProfileAttributesEntry::IsUsingDefa + #include "components/signin/public/identity_manager/signin_constants.h" +@@ -519,7 +518,7 @@ bool ProfileAttributesEntry::IsUsingDefa } bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const { @@ -1143,7 +1142,7 @@ } bool ProfileAttributesEntry::IsDasherlessManagement() const { -@@ -734,7 +733,6 @@ void ProfileAttributesEntry::SetLastDown +@@ -764,7 +763,6 @@ void ProfileAttributesEntry::SetLastDown } void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) { @@ -1153,7 +1152,7 @@ void ProfileAttributesEntry::SetDasherlessManagement(bool value) { --- a/chrome/browser/profiles/profile_attributes_storage.cc +++ b/chrome/browser/profiles/profile_attributes_storage.cc -@@ -41,7 +41,6 @@ +@@ -43,7 +43,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/profile_metrics/state.h" #include "components/signin/public/base/persistent_repeating_timer.h" @@ -1161,7 +1160,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "content/public/browser/browser_task_traits.h" -@@ -390,9 +389,7 @@ void ProfileAttributesStorage::AddProfil +@@ -392,9 +391,7 @@ void ProfileAttributesStorage::AddProfil params.profile_name, /*include_check_for_legacy_profile_name*/ false)) // Assume newly created profiles use a default avatar. @@ -1174,7 +1173,7 @@ info.Set(ProfileAttributesEntry::kAccountIdKey, --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -157,7 +157,6 @@ +@@ -158,7 +158,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" @@ -1182,7 +1181,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_isolation/site_isolation_policy.h" #include "components/spellcheck/spellcheck_buildflags.h" -@@ -1107,7 +1106,6 @@ void ProfileImpl::OnLocaleReady(CreateMo +@@ -1115,7 +1114,6 @@ void ProfileImpl::OnLocaleReady(CreateMo CHECK(!ProfilePasswordStoreFactory::HasStore(this)); CHECK(!AccountPasswordStoreFactory::HasStore(this)); CHECK(!ReadingListModelFactory::HasModel(this)); @@ -1192,7 +1191,7 @@ // On Android StartupData creates proto database provider for the profile --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -93,7 +93,6 @@ +@@ -94,7 +94,6 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -1200,7 +1199,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/signin/public/identity_manager/tribool.h" -@@ -1916,8 +1915,7 @@ void ProfileManager::AddProfileToStorage +@@ -1900,8 +1899,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1210,7 +1209,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -1966,14 +1964,13 @@ void ProfileManager::AddProfileToStorage +@@ -1950,14 +1948,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsForceEphemeralProfilesEnabled(profile); init_params.is_signed_in_with_credential_provider = @@ -1238,7 +1237,7 @@ #include "components/webui/flags/pref_service_flags_storage.h" --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc -@@ -45,7 +45,6 @@ +@@ -48,7 +48,6 @@ #include #include "chrome/browser/profiles/gaia_info_update_service.h" #include "chrome/browser/profiles/gaia_info_update_service_factory.h" @@ -1248,7 +1247,7 @@ namespace profiles { --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -668,7 +668,7 @@ +@@ -662,7 +662,7 @@ @@ -1259,7 +1258,7 @@

$i18n{secureConnectionsSectionTitle}

-@@ -305,11 +185,3 @@ +@@ -296,11 +176,3 @@ on-click="onAdvancedProtectionProgramLinkClick_" external> @@ -1411,7 +1410,7 @@ - --- a/chrome/browser/resources/settings/privacy_page/security_page.ts +++ b/chrome/browser/resources/settings/privacy_page/security_page.ts -@@ -274,17 +274,6 @@ export class SettingsSecurityPageElement +@@ -270,17 +270,6 @@ export class SettingsSecurityPageElement super.ready(); CrSettingsPrefs.initialized.then(() => { @@ -1429,7 +1428,7 @@ // The HTTPS-First Mode generated pref should never be set to // ENABLED_BALANCED if the feature flag is not enabled. if (!loadTimeData.getBoolean('enableHttpsFirstModeNewSettings')) { -@@ -294,10 +283,6 @@ export class SettingsSecurityPageElement +@@ -290,10 +279,6 @@ export class SettingsSecurityPageElement } }); @@ -1439,8 +1438,8 @@ - // Initialize the last focus time on page load. this.lastFocusTime_ = HatsBrowserProxyImpl.getInstance().now(); - } -@@ -417,8 +402,7 @@ export class SettingsSecurityPageElement + +@@ -431,8 +416,7 @@ export class SettingsSecurityPageElement } private getDisabledExtendedSafeBrowsing_(): boolean { @@ -1450,7 +1449,7 @@ } private getSafeBrowsingStandardSubLabel_(): string { -@@ -430,19 +414,6 @@ export class SettingsSecurityPageElement +@@ -444,19 +428,6 @@ export class SettingsSecurityPageElement private getPasswordsLeakToggleSubLabel_(): string { let subLabel = this.i18n('passwordsLeakDetectionGeneralDescription'); @@ -1700,7 +1699,7 @@ #include "content/public/browser/browser_context.h" --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc -@@ -23,7 +23,6 @@ +@@ -24,7 +24,6 @@ #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/content/common/file_type_policies.h" #include "components/safe_browsing/core/common/features.h" @@ -2027,7 +2026,7 @@ // Get current enabled status. Must be called on IO thread. bool enabled() const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); -@@ -381,10 +371,6 @@ class SafeBrowsingServiceImpl : public S +@@ -385,10 +375,6 @@ class SafeBrowsingServiceImpl : public S std::unique_ptr proxy_config_monitor_; @@ -2095,7 +2094,7 @@ #include "content/public/browser/web_contents.h" --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -23,7 +23,6 @@ +@@ -24,7 +24,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/signin_buildflags.h" @@ -2103,7 +2102,7 @@ #include "google_apis/google_api_keys.h" #if BUILDFLAG(IS_CHROMEOS) -@@ -93,21 +92,6 @@ AccountConsistencyModeManager::AccountCo +@@ -94,21 +93,6 @@ AccountConsistencyModeManager::AccountCo ->GetProfileAttributesStorage() .GetProfileAttributesWithPath(profile_->GetPath()) : nullptr; @@ -2125,7 +2124,7 @@ #endif account_consistency_ = ComputeAccountConsistencyMethod(profile_); -@@ -120,7 +104,6 @@ AccountConsistencyModeManager::~AccountC +@@ -121,7 +105,6 @@ AccountConsistencyModeManager::~AccountC // static void AccountConsistencyModeManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { @@ -2133,7 +2132,7 @@ } // static -@@ -202,13 +185,9 @@ AccountConsistencyModeManager::ComputeAc +@@ -203,13 +186,9 @@ AccountConsistencyModeManager::ComputeAc #if BUILDFLAG(ENABLE_MIRROR) return AccountConsistencyMethod::kMirror; #elif BUILDFLAG(ENABLE_DICE_SUPPORT) @@ -2357,7 +2356,7 @@ #include "components/user_manager/user.h" --- a/chrome/browser/signin/dice_browsertest.cc +++ b/chrome/browser/signin/dice_browsertest.cc -@@ -75,7 +75,6 @@ +@@ -78,7 +78,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" @@ -2385,7 +2384,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_capabilities.h" -@@ -458,16 +457,8 @@ void DiceWebSigninInterceptor::RegisterP +@@ -459,16 +458,8 @@ void DiceWebSigninInterceptor::RegisterP registry->RegisterBooleanPref(prefs::kSigninInterceptionEnabled, true); registry->RegisterStringPref(prefs::kManagedAccountsSigninRestriction, std::string()); @@ -2402,7 +2401,7 @@ } std::optional -@@ -1490,16 +1481,6 @@ void DiceWebSigninInterceptor:: +@@ -1495,16 +1486,6 @@ void DiceWebSigninInterceptor:: g_browser_process->browser_policy_connector(), g_browser_process->system_network_context_manager() ->GetSharedURLLoaderFactory()); @@ -2440,7 +2439,7 @@ } --- a/chrome/browser/signin/mirror_browsertest.cc +++ b/chrome/browser/signin/mirror_browsertest.cc -@@ -32,7 +32,6 @@ +@@ -33,7 +33,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/core/browser/dice_header_helper.h" #include "components/signin/core/browser/signin_header_helper.h" @@ -2637,15 +2636,15 @@ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" --- a/chrome/browser/signin/signin_util.cc +++ b/chrome/browser/signin/signin_util.cc -@@ -31,7 +31,6 @@ +@@ -32,7 +32,6 @@ #include "components/policy/core/browser/signin/profile_separation_policies.h" #include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_reconcilor.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/accounts_mutator.h" - #include "content/public/browser/storage_partition.h" -@@ -69,8 +68,7 @@ ScopedForceSigninSetterForTesting::~Scop + #include "components/sync/base/user_selectable_type.h" +@@ -73,8 +72,7 @@ ScopedForceSigninSetterForTesting::~Scop CookiesMover::CookiesMover(base::WeakPtr source_profile, base::WeakPtr destination_profile, base::OnceCallback callback) @@ -2655,7 +2654,7 @@ source_profile_(std::move(source_profile)), destination_profile_(std::move(destination_profile)), callback_(std::move(callback)) { -@@ -80,25 +78,7 @@ CookiesMover::CookiesMover(base::WeakPtr +@@ -84,25 +82,7 @@ CookiesMover::CookiesMover(base::WeakPtr CookiesMover::~CookiesMover() = default; void CookiesMover::StartMovingCookies() { @@ -2681,7 +2680,7 @@ } void CookiesMover::OnCookiesReceived( -@@ -238,16 +218,7 @@ bool ProfileSeparationAllowsKeepingUnman +@@ -242,16 +222,7 @@ bool ProfileSeparationAllowsKeepingUnman bool IsAccountExemptedFromEnterpriseProfileSeparation( Profile* profile, const std::string& email) { @@ -2799,7 +2798,7 @@ #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" --- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc -@@ -46,7 +46,6 @@ +@@ -47,7 +47,6 @@ #include "components/autofill/core/common/autofill_features.h" #include "components/autofill/core/common/autofill_payments_features.h" #include "components/signin/public/base/signin_buildflags.h" @@ -2839,7 +2838,7 @@ --- a/chrome/browser/ui/extensions/extension_installed_bubble_model.cc +++ b/chrome/browser/ui/extensions/extension_installed_bubble_model.cc -@@ -15,7 +15,6 @@ +@@ -14,7 +14,6 @@ #include "chrome/grit/branded_strings.h" #include "chrome/grit/generated_resources.h" #include "components/prefs/pref_service.h" @@ -3031,7 +3030,7 @@ } --- a/chrome/browser/ui/signin/signin_view_controller.cc +++ b/chrome/browser/ui/signin/signin_view_controller.cc -@@ -29,7 +29,6 @@ +@@ -31,7 +31,6 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -3039,14 +3038,14 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -325,15 +324,6 @@ void SigninViewController::SignoutOrReau +@@ -352,15 +351,6 @@ void SigninViewController::SignoutOrReau &SigninViewController::SignoutOrReauthWithPromptWithUnsyncedDataTypes, weak_ptr_factory_.GetWeakPtr(), reauth_access_point, profile_signout_source, token_signout_source); - // Fetch the unsynced datatypes, as this is required to decide whether the - // confirmation prompt is needed. - if (sync_service && -- profile->GetPrefs()->GetBoolean(prefs::kExplicitBrowserSignin)) { +- profile_->GetPrefs()->GetBoolean(prefs::kExplicitBrowserSignin)) { - sync_service->GetTypesWithUnsyncedData( - syncer::TypesRequiringUnsyncedDataCheckOnSignout(), - std::move(signout_prompt_with_datatypes)); @@ -3055,15 +3054,15 @@ // Dice users don't see the prompt, pass empty datatypes. std::move(signout_prompt_with_datatypes) .Run(absl::flat_hash_map()); -@@ -687,9 +677,7 @@ void SigninViewController::SignoutOrReau +@@ -720,9 +710,7 @@ void SigninViewController::SignoutOrReau bool sign_out_immediately = unsynced_datatypes.empty() && needs_reauth; // Do not show the dialog to users with implicit signin. -- if (!profile->GetPrefs()->GetBoolean(prefs::kExplicitBrowserSignin)) { +- if (!profile_->GetPrefs()->GetBoolean(prefs::kExplicitBrowserSignin)) { sign_out_immediately = true; - } - if (ShowAccountExtensionsOnSignout(profile)) { + if (ShowAccountExtensionsOnSignout(profile_)) { sign_out_immediately = false; --- a/chrome/browser/ui/startup/first_run_service.cc +++ b/chrome/browser/ui/startup/first_run_service.cc @@ -3111,7 +3110,7 @@ void SetFirstRunFinished(FirstRunService::FinishedReason reason) { --- a/chrome/browser/ui/toolbar/app_menu_model.cc +++ b/chrome/browser/ui/toolbar/app_menu_model.cc -@@ -111,7 +111,6 @@ +@@ -110,7 +110,6 @@ #include "components/profile_metrics/browser_profile_type.h" #include "components/saved_tab_groups/public/features.h" #include "components/signin/public/base/signin_metrics.h" @@ -3119,7 +3118,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" #include "components/user_education/common/feature_promo/feature_promo_controller.h" -@@ -596,51 +595,7 @@ int ProfileSubMenuModel::GetAndIncrement +@@ -595,51 +594,7 @@ int ProfileSubMenuModel::GetAndIncrement } bool ProfileSubMenuModel::BuildSyncSection() { @@ -3193,7 +3192,7 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.cc +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.cc -@@ -59,7 +59,6 @@ +@@ -60,7 +60,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -3201,7 +3200,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -2116,18 +2115,6 @@ void AvatarToolbarButtonDelegate::OnErro +@@ -2053,18 +2052,6 @@ void AvatarToolbarButtonDelegate::OnErro const CoreAccountInfo& account_info, const GoogleServiceAuthError& error, signin_metrics::SourceForRefreshTokenOperation token_operation_source) { @@ -3222,7 +3221,7 @@ // static --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -71,7 +71,6 @@ +@@ -75,7 +75,6 @@ #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -3230,11 +3229,11 @@ #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" -@@ -693,19 +692,6 @@ ProfileMenuView::GetIdentitySectionParam +@@ -663,19 +662,6 @@ ProfileMenuView::GetIdentitySectionParam signin_metrics::AccessPoint::kAvatarBubbleSignIn; switch (signin_util::GetSignedInState(identity_manager)) { case signin_util::SignedInState::kSignedOut: -- if (profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) { +- if (profile().GetPrefs()->GetBoolean(prefs::kSigninAllowed)) { - button_type = ActionableItem::kSigninButton; - access_point = - signin_metrics::AccessPoint::kAvatarBubbleSignInWithSyncPromo; @@ -3250,20 +3249,20 @@ break; case signin_util::SignedInState::kWebOnlySignedIn: { access_point = -@@ -850,9 +836,7 @@ void ProfileMenuView::MaybeBuildChromeAc +@@ -854,9 +840,7 @@ void ProfileMenuView::MaybeBuildChromeAc // Show the settings button when signed in to Chrome or to the web, or if // signin is disallowed. const bool should_show_settings_button = - !identity_manager->GetExtendedAccountInfoForAccountsWithRefreshToken() - .empty() || -- !profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed); +- !profile().GetPrefs()->GetBoolean(prefs::kSigninAllowed); + false; if (!should_show_settings_button) { return; } --- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc -@@ -85,7 +85,6 @@ +@@ -88,7 +88,6 @@ #include "components/policy/core/common/management/scoped_management_service_override_for_testing.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" @@ -3463,14 +3462,14 @@ #include "content/public/browser/download_item_utils.h" --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc -@@ -63,7 +63,6 @@ +@@ -54,7 +54,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" --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc @@ -46,7 +46,6 @@ @@ -3496,7 +3495,7 @@ CHECK(local_test_provider); -#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) -- std::string profile_separation_policy_response = args[2].GetString(); +- const std::string& profile_separation_policy_response = args[2].GetString(); - Profile::FromWebUI(web_ui())->GetPrefs()->ClearPref( - prefs::kUserCloudSigninPolicyResponseFromPolicyTestPage); - Profile::FromWebUI(web_ui())->GetPrefs()->SetDefaultPrefValue( @@ -3555,7 +3554,7 @@ #endif // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_ --- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc +++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc -@@ -23,7 +23,6 @@ +@@ -24,7 +24,6 @@ #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -3565,7 +3564,7 @@ #include "components/user_prefs/user_prefs.h" --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -55,7 +55,6 @@ +@@ -57,7 +57,6 @@ #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -3573,7 +3572,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -404,10 +403,6 @@ void PeopleHandler::OnJavascriptAllowed( +@@ -406,10 +405,6 @@ void PeopleHandler::OnJavascriptAllowed( PrefService* prefs = profile_->GetPrefs(); profile_pref_registrar_ = std::make_unique(); profile_pref_registrar_->Init(prefs); @@ -3603,8 +3602,8 @@ -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/saved_tab_groups/public/features.h" #include "components/signin/public/base/signin_buildflags.h" - #include "components/signin/public/base/signin_switches.h" -@@ -3453,11 +3452,6 @@ void AddSiteSettingsStrings(content::Web + #include "components/strings/grit/components_branded_strings.h" +@@ -3497,11 +3496,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -3618,7 +3617,7 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -116,7 +116,6 @@ +@@ -117,7 +117,6 @@ #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" #include "components/search_engines/template_url_service.h" @@ -3626,9 +3625,9 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "content/public/browser/url_data_source.h" -@@ -298,9 +297,7 @@ SettingsUI::SettingsUI(content::WebUI* w - } - #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) +@@ -279,9 +278,7 @@ SettingsUI::SettingsUI(content::WebUI* w + AddSettingsPageUIHandler(std::make_unique()); + #endif - html_source->AddBoolean("signinAllowed", !profile->IsGuestSession() && - profile->GetPrefs()->GetBoolean( @@ -3676,7 +3675,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/signin_constants.h" #include "components/strings/grit/components_strings.h" -@@ -485,23 +484,6 @@ base::Value::Dict ManagedUserProfileNoti +@@ -490,23 +489,6 @@ base::Value::Dict ManagedUserProfileNoti dict.Set("email", base::UTF16ToUTF8(email_)); dict.Set("accountName", account_info.full_name); @@ -3709,8 +3708,8 @@ -#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" -@@ -359,8 +358,7 @@ void ManagedUserProfileNoticeUI::Initial + #include "components/signin/public/identity_manager/tribool.h" +@@ -360,8 +359,7 @@ void ManagedUserProfileNoticeUI::Initial // Change the text so that the "(Recommended)" label is not shown when the // admin has set merging data as the default option. bool profile_separation_data_migration_settings_optout = @@ -3855,8 +3854,8 @@ } --- a/chrome/browser/ui/webui/signin/signout_confirmation/signout_confirmation_handler.cc +++ b/chrome/browser/ui/webui/signin/signout_confirmation/signout_confirmation_handler.cc -@@ -11,7 +11,6 @@ - #include "chrome/browser/ui/browser.h" +@@ -13,7 +13,6 @@ + #include "chrome/browser/ui/signin/signin_view_controller.h" #include "chrome/grit/branded_strings.h" #include "chrome/grit/generated_resources.h" -#include "components/signin/public/base/signin_pref_names.h" @@ -3873,7 +3872,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/accounts_mutator.h" -@@ -271,8 +270,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). @@ -3885,7 +3884,7 @@ 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 -@@ -38,7 +38,6 @@ +@@ -40,7 +40,6 @@ #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/policy/core/common/policy_utils.h" @@ -3893,7 +3892,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "third_party/skia/include/core/SkColor.h" -@@ -247,26 +246,6 @@ void TurnSyncOnHelperDelegateImpl::OnPro +@@ -257,26 +256,6 @@ void TurnSyncOnHelperDelegateImpl::OnPro return; } @@ -3918,8 +3917,8 @@ - return; - } - browser_->signin_view_controller()->ShowModalManagedUserNoticeDialog( - std::make_unique( + browser_->GetFeatures() + .signin_view_controller() --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc @@ -57,7 +57,6 @@ @@ -3928,8 +3927,8 @@ #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" + #include "components/signin/public/identity_manager/account_capabilities_test_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" - #include "components/signin/public/identity_manager/identity_test_environment.h" --- a/chrome/browser/unified_consent/unified_consent_service_factory.cc +++ b/chrome/browser/unified_consent/unified_consent_service_factory.cc @@ -13,7 +13,6 @@ @@ -4040,7 +4039,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/data_type.h" #include "components/sync/base/features.h" -@@ -309,13 +308,7 @@ void AddressDataManager::RemoveLocalProf +@@ -290,13 +289,7 @@ void AddressDataManager::RemoveLocalProf } bool AddressDataManager::IsEligibleForAddressAccountStorage() const { @@ -4054,7 +4053,7 @@ } void AddressDataManager::MigrateProfileToAccount( -@@ -589,35 +582,7 @@ bool AddressDataManager::IsAutofillUserS +@@ -570,35 +563,7 @@ bool AddressDataManager::IsAutofillUserS } bool AddressDataManager::IsAutofillSyncToggleAvailable() const { @@ -4137,7 +4136,7 @@ public_deps = [ --- a/components/collaboration/internal/collaboration_service_impl.cc +++ b/components/collaboration/internal/collaboration_service_impl.cc -@@ -19,7 +19,6 @@ +@@ -20,7 +20,6 @@ #include "components/prefs/pref_service.h" #include "components/saved_tab_groups/public/tab_group_sync_service.h" #include "components/signin/public/base/consent_level.h" @@ -4145,7 +4144,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/sync/base/collaboration_id.h" #include "components/sync/base/features.h" -@@ -64,10 +63,6 @@ CollaborationServiceImpl::CollaborationS +@@ -68,10 +67,6 @@ CollaborationServiceImpl::CollaborationS prefs::kSharedTabGroupsManagedAccountSetting, base::BindRepeating(&CollaborationServiceImpl::RefreshServiceStatus, base::Unretained(this))); @@ -4156,7 +4155,7 @@ } CollaborationServiceImpl::~CollaborationServiceImpl() { -@@ -372,32 +367,13 @@ SigninStatus CollaborationServiceImpl::G +@@ -410,151 +405,13 @@ SigninStatus CollaborationServiceImpl::G DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); SigninStatus status = SigninStatus::kNotSignedIn; @@ -4174,21 +4173,140 @@ - } else if (!profile_prefs_->GetBoolean(::prefs::kSigninAllowed)) { status = SigninStatus::kSigninDisabled; - } +- +-#if BUILDFLAG(IS_IOS) +- BrowserSigninMode policy_mode = static_cast( +- local_prefs_->GetInteger(::prefs::kBrowserSigninPolicy)); +- if (policy_mode == BrowserSigninMode::kDisabled) { +- status = SigninStatus::kSigninDisabled; +- } +-#endif return status; } CollaborationStatus CollaborationServiceImpl::GetCollaborationStatus() { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); +- DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); +- if (!base::FeatureList::IsEnabled( +- data_sharing::features::kDataSharingFeature) && +- !base::FeatureList::IsEnabled( +- data_sharing::features::kDataSharingJoinOnly)) { +- return CollaborationStatus::kDisabled; +- } +- +- // Check if version out-of-date turn off shared tab groups data types and show +- // update chrome ui. +- if (base::FeatureList::IsEnabled( +- data_sharing::features::kSharedDataTypesKillSwitch)) { +- return base::FeatureList::IsEnabled( +- data_sharing::features::kDataSharingEnableUpdateChromeUI) +- ? CollaborationStatus::kVersionOutOfDateShowUpdateChromeUi +- : CollaborationStatus::kVersionOutOfDate; +- } +- - // Check if device policy allow signin. +-#if BUILDFLAG(IS_IOS) +- BrowserSigninMode policy_mode = static_cast( +- local_prefs_->GetInteger(::prefs::kBrowserSigninPolicy)); +- if (policy_mode == BrowserSigninMode::kDisabled) { +- return CollaborationStatus::kDisabledForPolicy; +- } +-#else - if (!profile_prefs_->GetBoolean(::prefs::kSigninAllowed) && - profile_prefs_->IsManagedPreference(::prefs::kSigninAllowed)) { - return CollaborationStatus::kDisabledForPolicy; - } +-#endif - - // Disable for automotive users. - if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_AUTOMOTIVE && - !base::FeatureList::IsEnabled( +- // Check if device policy allow sync. +- if (current_status_.sync_status == SyncStatus::kSyncDisabledByEnterprise) { +- return CollaborationStatus::kDisabledForPolicy; +- } +- +- // Disable for automotive users. +- if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_AUTOMOTIVE && +- !base::FeatureList::IsEnabled( +- data_sharing::features::kCollaborationAutomotive)) { + return CollaborationStatus::kDisabled; +- } +- +- // TODO(haileywang): Support collaboration status updates. +- CollaborationStatus status = CollaborationStatus::kDisabled; +- if (base::FeatureList::IsEnabled( +- data_sharing::features::kDataSharingFeature)) { +- status = CollaborationStatus::kEnabledCreateAndJoin; +- } else if (base::FeatureList::IsEnabled( +- data_sharing::features::kDataSharingJoinOnly)) { +- status = CollaborationStatus::kAllowedToJoin; +- } +- +- if (current_status_.signin_status == SigninStatus::kNotSignedIn) { +- return status; +- } +- +- CoreAccountInfo account = +- identity_manager_->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin); +- if (!signin::AccountManagedStatusFinder::MayBeEnterpriseUserBasedOnEmail( +- account.email)) { +- return status; +- } +- +- // Enterprise account handling. +- if (!account_managed_status_finder_) { +- account_managed_status_finder_ = +- std::make_unique( +- identity_manager_, account, +- base::BindOnce(&CollaborationServiceImpl::RefreshServiceStatus, +- weak_ptr_factory_.GetWeakPtr()), +- base::Seconds(5)); +- } +- +- // Enterprise V2: Check enterprise policy to allow/disallow collaboration +- // feature. +- if (base::FeatureList::IsEnabled( +- data_sharing::features::kCollaborationEntrepriseV2)) { +- switch (account_managed_status_finder_->GetOutcome()) { +- case Outcome::kConsumerGmail: +- case Outcome::kConsumerWellKnown: +- case Outcome::kConsumerNotWellKnown: +- break; +- default: +- if (profile_prefs_->GetInteger( +- collaboration::prefs::kSharedTabGroupsManagedAccountSetting) == +- static_cast( +- prefs::SharedTabGroupsManagedAccountSetting::kDisabled)) { +- return CollaborationStatus::kDisabledForPolicy; +- } +- } +- +- return status; +- } +- +- // Enterprise V1: Figure out if collaboration feature is disabled by account +- // policy. This early check allows to not disable collaboration feature when +- // the user need to refresh their account (refresh tokens unavailable). +- switch (account_managed_status_finder_->GetOutcome()) { +- case Outcome::kPending: +- status = CollaborationStatus::kDisabledPending; +- break; +- case Outcome::kError: +- case Outcome::kTimeout: +- status = CollaborationStatus::kDisabled; +- break; +- case Outcome::kEnterpriseGoogleDotCom: +- case Outcome::kEnterprise: +- status = CollaborationStatus::kDisabledForPolicy; +- break; +- case Outcome::kConsumerGmail: +- case Outcome::kConsumerWellKnown: +- case Outcome::kConsumerNotWellKnown: +- break; +- } +- +- return status; + } + + void CollaborationServiceImpl::RefreshServiceStatus() { --- a/components/device_signals/core/browser/browser_utils.h +++ b/components/device_signals/core/browser/browser_utils.h @@ -9,7 +9,6 @@ @@ -4592,7 +4710,7 @@ #include "components/security_interstitials/core/base_safe_browsing_error_ui.h" --- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc +++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc -@@ -41,7 +41,6 @@ +@@ -42,7 +42,6 @@ #include "components/safe_browsing/core/common/proto/realtimeapi.to_value.h" #include "components/safe_browsing/core/common/proto/safebrowsingv5.pb.h" #include "components/safe_browsing/core/common/proto/safebrowsingv5.to_value.h" @@ -4600,7 +4718,7 @@ #include "components/safe_browsing/core/common/web_ui_constants.h" #include "components/strings/grit/components_strings.h" #include "components/user_prefs/user_prefs.h" -@@ -884,20 +883,7 @@ std::string SerializeHitReport(const Hit +@@ -885,20 +884,7 @@ std::string SerializeHitReport(const Hit } hit_report_dict.Set("threat_source", std::move(threat_source)); std::string extended_reporting_level; @@ -4621,7 +4739,7 @@ hit_report_dict.Set("extended_reporting_level", std::move(extended_reporting_level)); hit_report_dict.Set("is_enhanced_protection", -@@ -1190,18 +1176,13 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -1191,18 +1177,13 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); DCHECK(!args.empty()); const std::string& callback_id = args[0].GetString(); @@ -4643,15 +4761,15 @@ void SafeBrowsingUIHandler::GetCookie(const base::Value::List& args) { --- a/components/safe_browsing/core/browser/db/hit_report.h +++ b/components/safe_browsing/core/browser/db/hit_report.h -@@ -8,7 +8,6 @@ - #define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_DB_HIT_REPORT_H_ +@@ -10,7 +10,6 @@ + #include - #include "components/safe_browsing/core/browser/db/util.h" + #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "url/gurl.h" namespace safe_browsing { -@@ -60,7 +59,6 @@ struct HitReport { +@@ -62,7 +61,6 @@ struct HitReport { SBThreatType threat_type; ThreatSource threat_source; @@ -4698,7 +4816,7 @@ list_infos_(GetListInfos()), task_runner_(task_runner_for_tests ? task_runner_for_tests -@@ -1184,8 +1181,7 @@ void V4LocalDatabaseManager::SetupUpdate +@@ -1187,8 +1184,7 @@ void V4LocalDatabaseManager::SetupUpdate weak_factory_.GetWeakPtr()); v4_update_protocol_manager_ = std::make_unique( @@ -4879,7 +4997,7 @@ --- a/components/safe_browsing/core/browser/password_protection/password_protection_service_base.h +++ b/components/safe_browsing/core/browser/password_protection/password_protection_service_base.h -@@ -28,7 +28,6 @@ +@@ -29,7 +29,6 @@ #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -4887,7 +5005,7 @@ #include "components/sessions/core/session_id.h" #include "components/signin/public/identity_manager/account_info.h" #include "services/network/public/cpp/shared_url_loader_factory.h" -@@ -148,10 +147,6 @@ class PasswordProtectionServiceBase : pu +@@ -149,10 +148,6 @@ class PasswordProtectionServiceBase : pu // Returns if the warning UI is enabled. bool IsWarningEnabled(ReusedPasswordAccountType password_type); @@ -4900,7 +5018,7 @@ // policy. --- a/components/safe_browsing/core/browser/ping_manager.cc +++ b/components/safe_browsing/core/browser/ping_manager.cc -@@ -498,7 +498,7 @@ GURL PingManager::SafeBrowsingHitUrl( +@@ -499,7 +499,7 @@ GURL PingManager::SafeBrowsingHitUrl( hit_report->threat_type == SB_THREAT_TYPE_URL_BINARY_MALWARE || hit_report->threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING); std::string url = @@ -4955,7 +5073,7 @@ #include "components/safe_browsing/core/common/utils.h" #include "components/unified_consent/pref_names.h" #include "net/base/ip_address.h" -@@ -142,8 +141,7 @@ bool RealTimeUrlLookupService::CanSendPa +@@ -103,8 +102,7 @@ bool RealTimeUrlLookupService::CanSendPa } bool RealTimeUrlLookupService::CanIncludeSubframeUrlInReferrerChain() const { @@ -4965,7 +5083,7 @@ } bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const { -@@ -160,9 +158,7 @@ bool RealTimeUrlLookupService::CanCheckS +@@ -121,9 +119,7 @@ bool RealTimeUrlLookupService::CanCheckS } bool RealTimeUrlLookupService::CanSendRTSampleRequest() const { @@ -4976,7 +5094,7 @@ } std::string RealTimeUrlLookupService::GetUserEmail() const { -@@ -270,14 +266,6 @@ RealTimeUrlLookupService::GetMinAllowedT +@@ -230,14 +226,6 @@ RealTimeUrlLookupService::GetMinAllowedT void RealTimeUrlLookupService::MaybeLogLastProtegoPingTimeToPrefs( bool sent_with_token) { @@ -5622,10 +5740,10 @@ #include "components/security_interstitials/core/metrics_helper.h" --- a/components/security_interstitials/content/mitm_software_blocking_page.cc +++ b/components/security_interstitials/content/mitm_software_blocking_page.cc -@@ -6,7 +6,6 @@ - +@@ -7,7 +7,6 @@ #include + #include "base/strings/string_number_conversions.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/security_interstitial_controller_client.h" #include "components/security_interstitials/content/security_interstitial_page.h" @@ -5765,36 +5883,39 @@ #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" + #include "components/signin/public/identity_manager/tribool.h" #include "google_apis/gaia/gaia_auth_util.h" - #include "google_apis/gaia/google_service_auth_error.h" -@@ -68,26 +67,12 @@ AccountInvestigator::~AccountInvestigato +@@ -64,28 +63,18 @@ AccountInvestigator::AccountInvestigator + PrefService* pref_service, + signin::IdentityManager* identity_manager) + : pref_service_(pref_service), +- identity_manager_(identity_manager), +- timer_(pref_service, +- prefs::kGaiaCookiePeriodicReportTime, +- kPeriodicReportingInterval, +- base::BindRepeating(&AccountInvestigator::TryPeriodicReport, +- base::Unretained(this))) {} ++ identity_manager_(identity_manager) {} + + AccountInvestigator::~AccountInvestigator() = default; // static void AccountInvestigator::RegisterPrefs(PrefRegistrySimple* registry) { - registry->RegisterStringPref(prefs::kGaiaCookieHash, std::string()); - registry->RegisterDoublePref(prefs::kGaiaCookieChangedTime, 0); -- registry->RegisterDoublePref(prefs::kGaiaCookiePeriodicReportTime, 0); +- registry->RegisterTimePref(prefs::kGaiaCookiePeriodicReportTime, +- base::Time()); } void AccountInvestigator::Initialize() { identity_manager_->AddObserver(this); previously_authenticated_ = - identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSync); -- -- // TODO(crbug.com/40715763): Refactor to use signin::PersistentRepeatingTimer -- // instead. -- Time previous = Time::FromSecondsSinceUnixEpoch( -- pref_service_->GetDouble(prefs::kGaiaCookiePeriodicReportTime)); -- if (previous.is_null()) { -- previous = Time::Now(); -- } -- const base::TimeDelta delay = -- CalculatePeriodicDelay(previous, Time::Now(), kPeriodicReportingInterval); -- timer_.Start(FROM_HERE, delay, this, &AccountInvestigator::TryPeriodicReport); + identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSignin); +- timer_.Start(); } void AccountInvestigator::Shutdown() { -@@ -114,7 +99,7 @@ void AccountInvestigator::OnAccountsInCo +@@ -111,7 +100,7 @@ void AccountInvestigator::OnAccountsInCo // a valid cached ListAccounts response ready for us. Or even both of these // could be simultaneously happening, although this should be extremely // infrequent. @@ -5803,7 +5924,7 @@ const std::string new_hash( HashAccounts(signed_in_accounts, signed_out_accounts)); const bool currently_authenticated = -@@ -122,9 +107,6 @@ void AccountInvestigator::OnAccountsInCo +@@ -119,9 +108,6 @@ void AccountInvestigator::OnAccountsInCo if (old_hash != new_hash) { SharedCookieJarReport(signed_in_accounts, signed_out_accounts, Time::Now(), ReportingType::ON_CHANGE); @@ -5813,18 +5934,7 @@ } else if (currently_authenticated && !previously_authenticated_) { SignedInAccountRelationReport(signed_in_accounts, signed_out_accounts, ReportingType::ON_CHANGE); -@@ -246,10 +228,6 @@ void AccountInvestigator::DoPeriodicRepo - } - - periodic_pending_ = false; -- pref_service_->SetDouble(prefs::kGaiaCookiePeriodicReportTime, -- Time::Now().InSecondsFSinceUnixEpoch()); -- timer_.Start(FROM_HERE, kPeriodicReportingInterval, this, -- &AccountInvestigator::TryPeriodicReport); - } - - void AccountInvestigator::SharedCookieJarReport( -@@ -257,8 +235,7 @@ void AccountInvestigator::SharedCookieJa +@@ -251,8 +237,7 @@ void AccountInvestigator::SharedCookieJa const std::vector& signed_out_accounts, const Time now, const ReportingType type) { @@ -5834,6 +5944,17 @@ base::TimeDelta stable_age; if (!last_changed.is_null()) { stable_age = std::max(now - last_changed, base::TimeDelta()); +--- a/components/signin/core/browser/account_investigator.h ++++ b/components/signin/core/browser/account_investigator.h +@@ -119,8 +119,6 @@ class AccountInvestigator : public Keyed + raw_ptr pref_service_; + raw_ptr identity_manager_; + +- // Handles invoking our periodic logic at the right time. +- signin::PersistentRepeatingTimer timer_; + + // If the GaiaCookieManagerService hasn't already cached the cookie data, it + // will not be able to return enough information for us to always perform --- a/components/signin/core/browser/account_investigator_unittest.cc +++ b/components/signin/core/browser/account_investigator_unittest.cc @@ -13,7 +13,6 @@ @@ -5841,9 +5962,9 @@ #include "components/prefs/pref_registry_simple.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/identity_manager/account_capabilities_test_mutator.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "components/signin/public/identity_manager/identity_test_environment.h" - #include "components/sync_preferences/testing_pref_service_syncable.h" --- a/components/signin/core/browser/account_reconcilor.cc +++ b/components/signin/core/browser/account_reconcilor.cc @@ -31,7 +31,6 @@ @@ -5921,7 +6042,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -458,23 +457,6 @@ void SigninMetricsService::OnRefreshToke +@@ -455,23 +454,6 @@ void SigninMetricsService::OnRefreshToke #if BUILDFLAG(ENABLE_DICE_SUPPORT) void SigninMetricsService::RecordExplicitSigninMigrationStatus() { @@ -6306,7 +6427,7 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc +++ b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc -@@ -27,7 +27,6 @@ +@@ -28,7 +28,6 @@ #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" @@ -6316,7 +6437,7 @@ #include "components/signin/public/webdata/token_service_table.h" --- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc +++ b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc -@@ -31,7 +31,6 @@ +@@ -32,7 +32,6 @@ #include "components/signin/public/base/account_consistency_method.h" #include "components/signin/public/base/device_id_helper.h" #include "components/signin/public/base/signin_metrics.h" @@ -6618,7 +6739,7 @@ } void PrimaryAccountManager::UpdatePrimaryAccountInfo() { -@@ -738,90 +516,6 @@ PrimaryAccountChangeEvent::State Primary +@@ -738,108 +516,6 @@ PrimaryAccountChangeEvent::State Primary void PrimaryAccountManager::ComputeExplicitBrowserSignin( const PrimaryAccountChangeEvent& event_details, ScopedPrefCommit& scoped_pref_commit) { @@ -6635,55 +6756,73 @@ - CHECK(event_details.GetSetPrimaryAccountAccessPoint().has_value()); - signin_metrics::AccessPoint access_point = - event_details.GetSetPrimaryAccountAccessPoint().value(); +- GaiaId current_gaia_id = +- event_details.GetCurrentState().primary_account.gaia; - -- if (access_point == signin_metrics::AccessPoint::kUnknown || -- access_point == signin_metrics::AccessPoint::kWebSignin) { +- bool is_implicit_signin = +- access_point == signin_metrics::AccessPoint::kUnknown || +- access_point == signin_metrics::AccessPoint::kWebSignin; +-#if BUILDFLAG(ENABLE_DICE_SUPPORT) +- if (base::FeatureList::IsEnabled( +- switches::kWebSigninLeadsToImplicitlySignedInState)) { +- // To allow easier testing, consider the following access points as +- // implicit sign-in. +- is_implicit_signin = +- is_implicit_signin || +- access_point == +- signin_metrics::AccessPoint::kChromeSigninInterceptBubble || +- access_point == +- signin_metrics::AccessPoint::kSigninChoiceRemembered; +- } +-#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) +- if (is_implicit_signin) { - scoped_pref_commit.ClearPref( - kExplicitBrowserSigninWithoutFeatureEnabled); -#if BUILDFLAG(ENABLE_DICE_SUPPORT) - scoped_pref_commit.ClearPref(prefs::kExplicitBrowserSignin); -#endif -- } else { -- // All others access points are explicit sign ins except the Web -- // Signin event. +- // Reset explicit sign-in prefs for the relevant data types. - scoped_pref_commit.SetBoolean( -- kExplicitBrowserSigninWithoutFeatureEnabled, true); +- prefs::kPrefsThemesSearchEnginesAccountStorageEnabled, false); +- SigninPrefs(*client_->GetPrefs()) +- .SetExtensionsExplicitBrowserSignin(current_gaia_id, false); +- SigninPrefs(*client_->GetPrefs()) +- .SetBookmarksExplicitBrowserSignin(current_gaia_id, false); +- break; +- } +- // All others access points are explicit sign ins except the Web +- // Signin event. +- scoped_pref_commit.SetBoolean(kExplicitBrowserSigninWithoutFeatureEnabled, +- true); -#if BUILDFLAG(ENABLE_DICE_SUPPORT) -- scoped_pref_commit.SetBoolean(prefs::kExplicitBrowserSignin, true); +- scoped_pref_commit.SetBoolean(prefs::kExplicitBrowserSignin, true); -#endif -- if (base::FeatureList::IsEnabled( -- switches::kEnablePreferencesAccountStorage)) { -- scoped_pref_commit.SetBoolean( -- prefs::kPrefsThemesSearchEnginesAccountStorageEnabled, true); -- } -- if (access_point == -- signin_metrics::AccessPoint::kExtensionInstallBubble && -- switches::IsExtensionsExplicitBrowserSigninEnabled()) { -- // Record an explicit signin for extensions for this account only. -- auto current_gaia_id = -- event_details.GetCurrentState().primary_account.gaia; +- if (base::FeatureList::IsEnabled( +- switches::kEnablePreferencesAccountStorage)) { +- scoped_pref_commit.SetBoolean( +- prefs::kPrefsThemesSearchEnginesAccountStorageEnabled, true); +- } +- if (access_point == +- signin_metrics::AccessPoint::kExtensionInstallBubble && +- switches::IsExtensionsExplicitBrowserSigninEnabled()) { +- // Record an opt in for the extensions explicit signin feature and use +- // the existing pref to determine if it's a new or existing opt in. +- bool is_new_opt_in = +- !SigninPrefs(*client_->GetPrefs()) +- .GetExtensionsExplicitBrowserSignin(current_gaia_id); +- base::UmaHistogramBoolean( +- "Signin.Extensions.ExplicitSigninFromExtensionInstallBubble", +- is_new_opt_in); - -- // Record an opt in for the extensions explicit signin feature and use -- // the existing pref to determine if it's a new or existing opt in. -- bool is_new_opt_in = -- !SigninPrefs(*client_->GetPrefs()) -- .GetExtensionsExplicitBrowserSignin(current_gaia_id); -- base::UmaHistogramBoolean( -- "Signin.Extensions.ExplicitSigninFromExtensionInstallBubble", -- is_new_opt_in); -- -- SigninPrefs(*client_->GetPrefs()) -- .SetExtensionsExplicitBrowserSignin(current_gaia_id, true); -- } -- if (access_point == signin_metrics::AccessPoint::kBookmarkBubble && -- base::FeatureList::IsEnabled( -- switches::kSyncEnableBookmarksInTransportMode)) { -- // Record an explicit signin for bookmarks for this account only. -- auto current_gaia_id = -- event_details.GetCurrentState().primary_account.gaia; -- SigninPrefs(*client_->GetPrefs()) -- .SetBookmarksExplicitBrowserSignin(current_gaia_id, true); -- } +- SigninPrefs(*client_->GetPrefs()) +- .SetExtensionsExplicitBrowserSignin(current_gaia_id, true); +- } +- if (access_point == signin_metrics::AccessPoint::kBookmarkBubble && +- base::FeatureList::IsEnabled( +- switches::kSyncEnableBookmarksInTransportMode)) { +- // Record an explicit signin for bookmarks for this account only. +- SigninPrefs(*client_->GetPrefs()) +- .SetBookmarksExplicitBrowserSignin(current_gaia_id, true); - } - } - @@ -6765,8 +6904,8 @@ #include "components/signin/internal/identity_manager/profile_oauth2_token_service_observer.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/test_signin_client.h" + #include "components/signin/public/identity_manager/account_capabilities_test_mutator.h" #include "components/signin/public/identity_manager/account_info.h" - #include "components/sync_preferences/testing_pref_service_syncable.h" --- a/components/signin/public/base/BUILD.gn +++ b/components/signin/public/base/BUILD.gn @@ -170,8 +170,6 @@ component("signin_switches") { @@ -6890,7 +7029,7 @@ namespace switches { -@@ -114,11 +113,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti +@@ -128,11 +127,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti base::FEATURE_DISABLED_BY_DEFAULT); bool IsBoundSessionCredentialsEnabled(const PrefService* profile_prefs) { @@ -6902,7 +7041,7 @@ return base::FeatureList::IsEnabled(kEnableBoundSessionCredentials); } -@@ -145,11 +139,6 @@ BASE_FEATURE(kEnableChromeRefreshTokenBi +@@ -159,11 +153,6 @@ BASE_FEATURE(kEnableChromeRefreshTokenBi base::FEATURE_DISABLED_BY_DEFAULT); bool IsChromeRefreshTokenBindingEnabled(const PrefService* profile_prefs) { @@ -7004,57 +7143,16 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/account_pref_utils.h" #include "components/sync/base/features.h" -@@ -228,7 +226,7 @@ bool SyncPrefs::IsInitialSyncFeatureSetu - } - - bool SyncPrefs::IsExplicitBrowserSignin() const { +@@ -235,7 +233,7 @@ bool SyncPrefs::IsExplicitBrowserSignin( + #else + // On desktop `prefs::kExplicitBrowserSignin` determines whether the sign-in + // is explicit or implicit. - return pref_service_->GetBoolean(::prefs::kExplicitBrowserSignin); + return false; + #endif } - #if !BUILDFLAG(IS_CHROMEOS) -@@ -298,40 +296,18 @@ UserSelectableTypeSet SyncPrefs::GetSele - type == UserSelectableType::kAutofill) { - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) - type_enabled = true; --#else -- // kPasswords and kAutofill are only on by default if there was an -- // explicit sign in recorded. -- // Otherwise: -- // - kPasswords requires a dedicated opt-in. -- // - kAutofill cannot be enabled. -- // Note: If this changes, also update the migration logic in -- // MigrateGlobalDataTypePrefsToAccount(). -- type_enabled = -- pref_service_->GetBoolean(::prefs::kExplicitBrowserSignin); - #endif - } else if (type == UserSelectableType::kBookmarks || - type == UserSelectableType::kReadingList) { - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) - type_enabled = - base::FeatureList::IsEnabled(kReplaceSyncPromosWithSignInPromos); --#else -- // Bookmarks and Reading List require a specific explicit sign in. -- type_enabled = SigninPrefs(*pref_service_) -- .GetBookmarksExplicitBrowserSignin(gaia_id) || -- base::FeatureList::IsEnabled( -- kEnableBookmarksSelectedTypeOnSigninForTesting); - #endif - } else if (type == UserSelectableType::kExtensions) { -- // Extensions require a specific explicit sign in. -- type_enabled = SigninPrefs(*pref_service_) -- .GetExtensionsExplicitBrowserSignin(gaia_id); - } else if (type == UserSelectableType::kPreferences || - type == UserSelectableType::kThemes) { - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) - type_enabled = true; --#else -- type_enabled = pref_service_->GetBoolean( -- ::prefs::kPrefsThemesSearchEnginesAccountStorageEnabled); - #endif - } else { - // All other types are always enabled by default. -@@ -1102,30 +1078,6 @@ void SyncPrefs::MaybeMigrateAutofillToPe +@@ -1066,30 +1064,6 @@ void SyncPrefs::MaybeMigrateAutofillToPe return; } pref_service->SetBoolean(kAutofillPerAccountPrefMigrationDone, true); @@ -7085,6 +7183,30 @@ } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) +@@ -1141,21 +1115,15 @@ bool SyncPrefs::IsTypeSelectedByDefaultI + // Before kReplaceSyncPromosWithSignInPromos, Bookmarks and Reading List + // require a specific explicit sign in (relevant for desktop only). + return base::FeatureList::IsEnabled(kReplaceSyncPromosWithSignInPromos) || +- SigninPrefs(*pref_service_) +- .GetBookmarksExplicitBrowserSignin(gaia_id) || + base::FeatureList::IsEnabled( + kEnableBookmarksSelectedTypeOnSigninForTesting); + case UserSelectableType::kPreferences: + case UserSelectableType::kThemes: +- return base::FeatureList::IsEnabled(kReplaceSyncPromosWithSignInPromos) || +- pref_service_->GetBoolean( +- ::prefs::kPrefsThemesSearchEnginesAccountStorageEnabled); ++ return false; + case UserSelectableType::kExtensions: + // Before kReplaceSyncPromosWithSignInPromos, Extensions require a + // specific explicit sign in. +- return base::FeatureList::IsEnabled(kReplaceSyncPromosWithSignInPromos) || +- SigninPrefs(*pref_service_) +- .GetExtensionsExplicitBrowserSignin(gaia_id); ++ return false; + case UserSelectableType::kApps: + case UserSelectableType::kProductComparison: + case UserSelectableType::kCookies: --- a/components/sync/service/sync_service_impl.cc +++ b/components/sync/service/sync_service_impl.cc @@ -29,7 +29,6 @@ @@ -7095,7 +7217,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" -@@ -2249,30 +2248,9 @@ SyncServiceImpl::DeterminePreviouslySync +@@ -2242,30 +2241,9 @@ SyncServiceImpl::DeterminePreviouslySync return PreviouslySyncingGaiaIdInfoForMetrics::kUnspecified; } @@ -7146,7 +7268,7 @@ kSyncedDefaultSearchProviderGUID = 49, kPrefForceTriggerTranslateCount = 50, // kPrefNeverPromptSitesDeprecated = 51, (deprecated) -@@ -232,16 +229,9 @@ constexpr auto kCommonSyncablePrefsAllow +@@ -235,16 +232,9 @@ constexpr auto kCommonSyncablePrefsAllow {payments::kCanMakePaymentEnabled, {syncable_prefs_ids::kCanMakePaymentEnabled, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index 2d4337d5..cb0c9f83 100644 --- a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch +++ b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch @@ -9,7 +9,7 @@ #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" -@@ -2281,6 +2282,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -2154,6 +2155,7 @@ void RenderViewContextMenu::AppendPageIt } if (CanTranslate(/*menu_logging=*/true)) { diff --git a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch index 1dd430d8..5a8930dd 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 -@@ -2564,6 +2564,7 @@ static_library("browser") { +@@ -2602,6 +2602,7 @@ static_library("browser") { "//third_party/libyuv", "//third_party/metrics_proto", "//third_party/re2", @@ -19,7 +19,7 @@ "//third_party/widevine/cdm:headers", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -182,6 +182,7 @@ +@@ -184,6 +184,7 @@ #include "components/translate/core/common/translate_util.h" #include "components/trusted_vault/features.h" #include "components/ui_devtools/switches.h" @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -296,6 +296,7 @@ source_set("browser") { +@@ -295,6 +295,7 @@ source_set("browser") { "//third_party/re2", "//third_party/snappy", "//third_party/sqlite", @@ -54,7 +54,7 @@ "//tools/v8_context_snapshot:buildflags", --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -80,6 +80,7 @@ +@@ -81,6 +81,7 @@ #include "components/services/storage/public/cpp/quota_error_or.h" #include "components/services/storage/public/mojom/cache_storage_control.mojom.h" #include "components/tracing/common/tracing_switches.h" @@ -62,7 +62,7 @@ #include "components/viz/common/switches.h" #include "components/viz/host/gpu_client.h" #include "components/viz/host/host_frame_sink_manager.h" -@@ -3507,6 +3508,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3517,6 +3518,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLImageChromium, switches::kEnableWebGPUDeveloperFeatures, switches::kFileUrlPathAlias, @@ -70,7 +70,7 @@ + switches::kFingerprintingCanvasMeasureTextNoise, switches::kForceDeviceScaleFactor, switches::kForceDisplayColorProfile, - switches::kForceGpuMemAvailableMb, + switches::kForceHighContrast, --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn @@ -110,6 +110,7 @@ target(link_target_type, "child") { @@ -83,7 +83,7 @@ "//ui/events/blink", --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -40,6 +40,7 @@ +@@ -41,6 +41,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" @@ -124,7 +124,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" -@@ -890,6 +891,11 @@ Document::Document(const DocumentInit& i +@@ -984,6 +985,11 @@ Document::Document(const DocumentInit& i TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this), TRACE_EVENT_FLAG_FLOW_OUT); DCHECK(agent_); @@ -136,7 +136,7 @@ if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) && features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) { script_runner_delayer_->Activate(); -@@ -1020,6 +1026,14 @@ const Position Document::PositionAdjuste +@@ -1114,6 +1120,14 @@ const Position Document::PositionAdjuste return Position::BeforeNode(*shadow_host); } @@ -153,7 +153,7 @@ selector_query_cache_ = MakeGarbageCollected(); --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -558,6 +558,10 @@ class CORE_EXPORT Document : public Cont +@@ -582,6 +582,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -164,7 +164,7 @@ V8VisibilityState visibilityState() const; String visibilityStateAsString() const; bool IsPageVisible() const; -@@ -2747,6 +2751,9 @@ class CORE_EXPORT Document : public Cont +@@ -2780,6 +2784,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -176,7 +176,7 @@ --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2959,6 +2959,11 @@ DOMRectList* Element::getClientRects() { +@@ -3016,6 +3016,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads, *element_layout_object); @@ -188,7 +188,7 @@ return MakeGarbageCollected(quads); } -@@ -2986,6 +2991,9 @@ gfx::RectF Element::GetBoundingClientRec +@@ -3043,6 +3048,9 @@ gfx::RectF Element::GetBoundingClientRec DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -200,7 +200,7 @@ --- a/third_party/blink/renderer/core/dom/range.cc +++ b/third_party/blink/renderer/core/dom/range.cc -@@ -1648,6 +1648,12 @@ DOMRectList* Range::getClientRects() con +@@ -1646,6 +1646,12 @@ DOMRectList* Range::getClientRects() con Vector quads; GetBorderAndTextQuads(quads); @@ -213,7 +213,7 @@ return MakeGarbageCollected(quads); } -@@ -1655,7 +1661,11 @@ DOMRect* Range::getBoundingClientRect() +@@ -1653,7 +1659,11 @@ DOMRect* Range::getBoundingClientRect() // TODO(crbug.com/1499981): This should be removed once synchronized scrolling // impact is understood. SyncScrollAttemptHeuristic::DidAccessScrollOffset(); @@ -276,7 +276,7 @@ namespace blink { namespace { -@@ -1276,13 +1279,26 @@ TextMetrics* BaseRenderingContext2D::mea +@@ -1246,13 +1249,26 @@ TextMetrics* BaseRenderingContext2D::mea TextDirection direction = ToTextDirection(state.GetDirection(), host, computed_style); @@ -308,7 +308,7 @@ String BaseRenderingContext2D::lang() const { --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1793,6 +1793,7 @@ component("platform") { +@@ -1792,6 +1792,7 @@ component("platform") { "//components/paint_preview/common", "//components/search_engines:search_engine_utils", "//components/translate/core/language_detection:language_detection", @@ -339,11 +339,11 @@ #include "third_party/blink/renderer/platform/image-encoders/image_encoder_utils.h" +#include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "third_party/blink/renderer/platform/wtf/text/base64.h" + #include "third_party/blink/renderer/platform/wtf/text/strcat.h" #include "third_party/skia/include/core/SkImage.h" - #include "third_party/skia/include/core/SkSurface.h" --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2254,6 +2254,12 @@ +@@ -2310,6 +2310,12 @@ status: "stable", }, { diff --git a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch index 13184712..3626ec53 100644 --- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch +++ b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch @@ -34,14 +34,14 @@ 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 -@@ -3510,6 +3510,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3520,6 +3520,7 @@ void RenderProcessHostImpl::PropagateBro switches::kFileUrlPathAlias, switches::kFingerprintingClientRectsNoise, switches::kFingerprintingCanvasMeasureTextNoise, + switches::kFingerprintingCanvasImageDataNoise, switches::kForceDeviceScaleFactor, switches::kForceDisplayColorProfile, - switches::kForceGpuMemAvailableMb, + switches::kForceHighContrast, --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc @@ -492,6 +492,8 @@ void SetRuntimeFeaturesFromCommandLine(c @@ -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 -@@ -599,6 +599,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -555,6 +555,9 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -77,7 +77,7 @@ approach to change color components. return image_data; --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1737,7 +1737,9 @@ component("platform") { +@@ -1736,7 +1736,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -314,7 +314,7 @@ approach to change color components. SkJpegEncoder::Options options; --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2260,6 +2260,9 @@ +@@ -2316,6 +2316,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 6b521ce4..5ddc89b6 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 -@@ -2241,6 +2241,7 @@ static_library("browser") { +@@ -2279,6 +2279,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -102,7 +102,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2632,6 +2632,10 @@ const char kMantisFeatureKeyDescription[ +@@ -2774,6 +2774,10 @@ const char kMantisFeatureKeyDescription[ "Feature key to use the Mantis feature on ChromeOS."; #endif // BUILDFLAG(IS_CHROMEOS) @@ -115,7 +115,7 @@ with limited CPU/memory resources and it is disabled by default. const char kMediaRouterCastAllowAllIPsDescription[] = --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1528,6 +1528,9 @@ extern const char kMantisFeatureKeyName[ +@@ -1608,6 +1608,9 @@ extern const char kMantisFeatureKeyName[ extern const char kMantisFeatureKeyDescription[]; #endif // IS_CHROMEOS diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index a62125df..3e86bfcf 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/extensions/background_mode_manager.cc +++ b/chrome/browser/background/extensions/background_mode_manager.cc -@@ -364,7 +364,7 @@ BackgroundModeManager::~BackgroundModeMa +@@ -350,7 +350,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 -@@ -1407,7 +1407,7 @@ void ChromeContentBrowserClient::Registe +@@ -1418,7 +1418,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 -@@ -529,7 +529,7 @@ void ProfileNetworkContextService::Confi +@@ -535,7 +535,7 @@ void ProfileNetworkContextService::Confi void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled, 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 a98598c0..5b8d66a5 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 -@@ -1568,11 +1568,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1582,11 +1582,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/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch b/patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch index 419d2565..8e207eb2 100644 --- a/patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch +++ b/patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch @@ -11,7 +11,7 @@ very interesting in themselves. Force them to be stored. --- a/third_party/blink/common/mime_util/mime_util.cc +++ b/third_party/blink/common/mime_util/mime_util.cc -@@ -87,6 +87,7 @@ constexpr auto kUnsupportedTextTypes = +@@ -88,6 +88,7 @@ constexpr auto kUnsupportedTextTypes = "text/x-csv", "text/x-vcf", "text/rtf", diff --git a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch b/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch index 0e4e35eb..17e449ed 100644 --- a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch +++ b/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch @@ -12,7 +12,7 @@ it as hidden as it was before? --- a/net/cert/x509_util.cc +++ b/net/cert/x509_util.cc -@@ -281,7 +281,7 @@ bool GetTLSServerEndPointChannelBinding( +@@ -282,7 +282,7 @@ bool GetTLSServerEndPointChannelBinding( } // RSA keys created by CreateKeyAndSelfSignedCert will be of this length. diff --git a/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch b/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch index 9a4fbb64..18cdd556 100644 --- a/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch +++ b/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch @@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily. --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc -@@ -283,7 +283,7 @@ void DownloadPrefs::RegisterProfilePrefs +@@ -284,7 +284,7 @@ void DownloadPrefs::RegisterProfilePrefs user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kPromptForDownload, diff --git a/patches/extra/iridium-browser/updater-disable-auto-update.patch b/patches/extra/iridium-browser/updater-disable-auto-update.patch index 317985e9..68ddaa90 100644 --- a/patches/extra/iridium-browser/updater-disable-auto-update.patch +++ b/patches/extra/iridium-browser/updater-disable-auto-update.patch @@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome. --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm -@@ -1072,7 +1072,7 @@ class AppControllerNativeThemeObserver : +@@ -1075,7 +1075,7 @@ class AppControllerNativeThemeObserver : CFStringRef checkInterval = CFSTR("checkInterval"); CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app); if (!plist) { diff --git a/patches/extra/ungoogled-chromium/add-credits.patch b/patches/extra/ungoogled-chromium/add-credits.patch index 47c2711b..36f91c81 100644 --- a/patches/extra/ungoogled-chromium/add-credits.patch +++ b/patches/extra/ungoogled-chromium/add-credits.patch @@ -7,36 +7,6 @@ + {{opensource_project}} source code is available in + the repository.
---- a/tools/licenses/licenses.py -+++ b/tools/licenses/licenses.py -@@ -1015,6 +1015,16 @@ def GenerateCredits(file_template_file, - entries.append( - MetadataToTemplateEntry(chromium_license_metadata, entry_template)) - -+ ugc_license_metadata = { -+ 'Name': 'ungoogled-chromium', -+ 'URL': 'https://github.com/ungoogled-software/ungoogled-chromium', -+ 'Shipped': 'yes', -+ 'License File': [os.path.join(_REPOSITORY_ROOT, 'third_party', 'ungoogled-chromium', 'LICENSE')], -+ } -+ -+ entries.append( -+ MetadataToTemplateEntry(ugc_license_metadata, entry_template)) -+ - entries_by_name = {} - for path in third_party_dirs: - try: -@@ -1059,8 +1069,8 @@ def GenerateCredits(file_template_file, - reciprocal_template = codecs.open(reciprocal_template_file, - encoding='utf-8').read() - reciprocal_contents = EvaluateTemplate(reciprocal_template, { -- 'opensource_project': 'Chromium', -- 'opensource_link': 'https://source.chromium.org/chromium' -+ 'opensource_project': 'ungoogled-chromium', -+ 'opensource_link': 'https://github.com/ungoogled-software/ungoogled-chromium' - }, - escape=False) - --- /dev/null +++ b/third_party/ungoogled-chromium/LICENSE @@ -0,0 +1,29 @@ @@ -69,3 +39,33 @@ +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--- a/tools/licenses/licenses.py ++++ b/tools/licenses/licenses.py +@@ -1015,6 +1015,16 @@ def GenerateCredits(file_template_file, + entries.append( + MetadataToTemplateEntry(chromium_license_metadata, entry_template)) + ++ ugc_license_metadata = { ++ 'Name': 'ungoogled-chromium', ++ 'URL': 'https://github.com/ungoogled-software/ungoogled-chromium', ++ 'Shipped': 'yes', ++ 'License File': [os.path.join(_REPOSITORY_ROOT, 'third_party', 'ungoogled-chromium', 'LICENSE')], ++ } ++ ++ entries.append( ++ MetadataToTemplateEntry(ugc_license_metadata, entry_template)) ++ + entries_by_name = {} + for path in third_party_dirs: + try: +@@ -1059,8 +1069,8 @@ def GenerateCredits(file_template_file, + reciprocal_template = codecs.open(reciprocal_template_file, + encoding='utf-8').read() + reciprocal_contents = EvaluateTemplate(reciprocal_template, { +- 'opensource_project': 'Chromium', +- 'opensource_link': 'https://source.chromium.org/chromium' ++ 'opensource_project': 'ungoogled-chromium', ++ 'opensource_link': 'https://github.com/ungoogled-software/ungoogled-chromium' + }, + escape=False) + diff --git a/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch b/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch index afff9888..08243d3f 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -3824,6 +3824,10 @@ void Browser::UpdateBookmarkBarState(Boo +@@ -3825,6 +3825,10 @@ void Browser::UpdateBookmarkBarState(Boo } bool Browser::ShouldShowBookmarkBar() const { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch index b5660fa1..c2fc44da 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -143,6 +143,7 @@ +@@ -140,6 +140,7 @@ #include "chrome/browser/ui/unload_controller.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/contents_web_view.h" @@ -8,7 +8,7 @@ #include "chrome/browser/ui/views/status_bubble_views.h" #include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/browser/ui/web_applications/web_app_launch_utils.h" -@@ -640,6 +641,7 @@ Browser::Browser(const CreateParams& par +@@ -658,6 +659,7 @@ Browser::Browser(const CreateParams& par omit_from_session_restore_(params.omit_from_session_restore), should_trigger_session_restore_(params.should_trigger_session_restore), cancel_download_confirmation_state_(NOT_PROMPTED), @@ -16,7 +16,7 @@ override_bounds_(params.initial_bounds), initial_show_state_(params.initial_show_state), initial_workspace_(params.initial_workspace), -@@ -1102,20 +1104,22 @@ Browser::WarnBeforeClosingResult Browser +@@ -1073,20 +1075,22 @@ Browser::WarnBeforeClosingResult Browser return WarnBeforeClosingResult::kOkToClose; } @@ -52,7 +52,7 @@ } DCHECK(!warn_before_closing_callback_) -@@ -1153,6 +1157,7 @@ bool Browser::TryToCloseWindow( +@@ -1124,6 +1128,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = NOT_PROMPTED; @@ -60,7 +60,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -3542,6 +3547,58 @@ bool Browser::CanCloseWithInProgressDown +@@ -3543,6 +3548,58 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -119,7 +119,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -3567,6 +3624,22 @@ void Browser::InProgressDownloadResponse +@@ -3568,6 +3625,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -144,15 +144,15 @@ void Browser::CookieMigrationNoticeResponse(bool proceed_closing) { --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h -@@ -31,6 +31,7 @@ - #include "chrome/browser/ui/browser_navigator_params.h" +@@ -32,6 +32,7 @@ #include "chrome/browser/ui/browser_window/public/browser_window_interface.h" + #include "chrome/browser/ui/browser_window/public/desktop_browser_window_capabilities_delegate.h" #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" +#include "chrome/browser/ui/simple_message_box.h" - #include "chrome/browser/ui/signin/signin_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" -@@ -1237,12 +1238,17 @@ class Browser : public TabStripModelObse + #include "chrome/browser/ui/unload_controller.h" +@@ -1204,12 +1205,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -170,7 +170,7 @@ // Called when the user has decided whether to proceed or not with the browser // closure, in case the cookie migration notice was shown. |proceed_closing| // is true if the browser can be closed. -@@ -1413,6 +1419,8 @@ class Browser : public TabStripModelObse +@@ -1389,6 +1395,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 893df90a..7dfb0622 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -821,11 +821,15 @@ bool HandleNewTabPageLocationOverride( +@@ -833,11 +833,15 @@ bool HandleNewTabPageLocationOverride( // Don't change the URL when incognito mode. if (profile->IsOffTheRecord()) { @@ -29,7 +29,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/webui/flags/flags_state.cc +++ b/components/webui/flags/flags_state.cc -@@ -233,6 +233,7 @@ std::string GetCombinedOriginListValue(c +@@ -234,6 +234,7 @@ std::string GetCombinedOriginListValue(c command_line.GetSwitchValueASCII(command_line_switch); const std::string new_value = flags_storage.GetOriginListFlag(internal_entry_name); @@ -37,7 +37,7 @@ return CombineAndSanitizeOriginLists(existing_value, new_value); } -@@ -483,6 +484,7 @@ void FlagsState::SetOriginListFlag(const +@@ -484,6 +485,7 @@ void FlagsState::SetOriginListFlag(const const std::string& value, FlagsStorage* flags_storage) { const std::string new_value = diff --git a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch index 0742af6c..1bab25a4 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch @@ -22,7 +22,7 @@ // --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h -@@ -20,6 +20,8 @@ +@@ -22,6 +22,8 @@ namespace blink { namespace features { @@ -33,15 +33,15 @@ // --- a/third_party/blink/renderer/core/editing/selection_controller.cc +++ b/third_party/blink/renderer/core/editing/selection_controller.cc -@@ -30,6 +30,7 @@ - #include "third_party/blink/renderer/core/editing/selection_controller.h" +@@ -31,6 +31,7 @@ #include "base/auto_reset.h" + #include "base/trace_event/trace_event.h" +#include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/input/web_menu_source_type.h" #include "third_party/blink/public/platform/web_input_event_result.h" #include "third_party/blink/renderer/core/annotation/annotation_agent_impl.h" -@@ -1436,10 +1437,14 @@ FrameSelection& SelectionController::Sel +@@ -1437,10 +1438,14 @@ FrameSelection& SelectionController::Sel } bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) { @@ -66,7 +66,7 @@ #include "third_party/blink/public/platform/web_input_event_result.h" #include "third_party/blink/renderer/bindings/core/v8/v8_drag_event_init.h" #include "third_party/blink/renderer/bindings/core/v8/v8_pointer_event_init.h" -@@ -656,8 +657,14 @@ WebInputEventResult MouseEventManager::H +@@ -632,8 +633,14 @@ WebInputEventResult MouseEventManager::H bool single_click = event.Event().click_count <= 1; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch index 56ac976d..a07e0bc7 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc -@@ -643,5 +643,7 @@ bool BrowserFrame::RegenerateFrameOnThem +@@ -707,5 +707,7 @@ bool BrowserFrame::RegenerateFrameOnThem } bool BrowserFrame::IsIncognitoBrowser() const { @@ -10,7 +10,7 @@ } --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -@@ -59,6 +59,7 @@ +@@ -60,6 +60,7 @@ #include "ui/base/webui/jstemplate_builder.h" #include "ui/base/webui/web_ui_util.h" #include "ui/color/color_provider.h" @@ -18,7 +18,7 @@ #include "ui/gfx/color_utils.h" #include "ui/native_theme/native_theme.h" -@@ -467,7 +468,9 @@ void NTPResourceCache::CreateNewTabIncog +@@ -468,7 +469,9 @@ void NTPResourceCache::CreateNewTabIncog profile_->GetPrefs()->GetString(prefs::kCurrentThemeID); // Colors. diff --git a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch index 0f37b6d3..c560b4bf 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch @@ -41,7 +41,7 @@ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/functional/bind.h" -@@ -568,6 +569,15 @@ AutocompleteController::AutocompleteCont +@@ -569,6 +570,15 @@ AutocompleteController::AutocompleteCont steady_state_omnibox_position_( metrics::OmniboxEventProto::UNKNOWN_POSITION) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); @@ -71,15 +71,15 @@ client()->GetHistoryService(); --- a/components/omnibox/browser/search_provider.cc +++ b/components/omnibox/browser/search_provider.cc -@@ -12,6 +12,7 @@ - #include +@@ -15,6 +15,7 @@ + #include #include "base/base64.h" +#include "base/command_line.h" #include "base/feature_list.h" #include "base/functional/bind.h" #include "base/functional/callback.h" -@@ -628,6 +629,9 @@ void SearchProvider::Run(bool query_is_p +@@ -631,6 +632,9 @@ void SearchProvider::Run(bool query_is_p } void SearchProvider::DoHistoryQuery(bool minimal_changes) { @@ -100,7 +100,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/i18n/char_iterator.h" -@@ -655,6 +657,8 @@ GURL FixupURLInternal(const std::string& +@@ -648,6 +650,8 @@ GURL FixupURLInternal(const std::string& FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url); if (chrome_url && !parts.host.is_valid()) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch index 66f18ddf..811bfdbe 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -545,7 +545,9 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -544,7 +544,9 @@ void TabHelpers::AttachTabHelpers(WebCon profile, web_contents); #endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE) SafetyTipWebContentsObserver::CreateForWebContents(web_contents); @@ -25,7 +25,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc -@@ -253,14 +253,16 @@ void ChromeRenderFrameObserver::DidFinis +@@ -258,14 +258,16 @@ void ChromeRenderFrameObserver::DidFinis if (frame->Parent() || frame->IsInFencedFrameTree()) return; @@ -60,7 +60,7 @@ #include "base/containers/contains.h" #include "base/containers/fixed_flat_map.h" #include "base/containers/flat_map.h" -@@ -346,6 +347,12 @@ bool ShouldCommitUpdateToAccount( +@@ -370,6 +371,12 @@ bool ShouldCommitUpdateToAccount( return account_data_changed; } @@ -73,7 +73,7 @@ } // namespace // TemplateURLService::LessWithPrefix ----------------------------------------- -@@ -526,6 +533,7 @@ TemplateURLService::TemplateURLService( +@@ -550,6 +557,7 @@ TemplateURLService::TemplateURLService( std::unique_ptr client, const base::RepeatingClosure& dsp_change_callback) : prefs_(prefs), @@ -81,7 +81,7 @@ search_engine_choice_service_(search_engine_choice_service), prepopulate_data_resolver_(prepopulate_data_resolver), search_terms_data_(std::move(search_terms_data)), -@@ -631,8 +639,8 @@ bool TemplateURLService::CanAddAutogener +@@ -655,8 +663,8 @@ bool TemplateURLService::CanAddAutogener // that may interfere with search queries). An easy heuristic for this is // whether the user has a TemplateURL that has been manually modified (e.g., // renamed) connected to the same host. @@ -92,7 +92,7 @@ } bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy( -@@ -2441,6 +2449,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -2480,6 +2488,8 @@ SyncDataMap TemplateURLService::CreateGU } void TemplateURLService::Init() { @@ -101,7 +101,7 @@ if (client_) { client_->SetOwner(this); } -@@ -2623,6 +2633,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -2662,6 +2672,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -113,7 +113,7 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -911,6 +911,8 @@ class TemplateURLService final : public +@@ -908,6 +908,8 @@ class TemplateURLService final : public raw_ref prepopulate_data_resolver_; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch index aa702cec..f6365ac0 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" -@@ -728,6 +729,13 @@ void Tab::HideHover(TabStyle::HideHoverS +@@ -741,6 +742,13 @@ void Tab::HideHover(TabStyle::HideHoverS DeprecatedLayoutImmediately(); } @@ -24,7 +24,7 @@ // BrowserView::GetAccessibleTabLabel to get the updated accessible name. --- a/chrome/browser/ui/views/tabs/tab.h +++ b/chrome/browser/ui/views/tabs/tab.h -@@ -93,6 +93,7 @@ class Tab : public gfx::AnimationDelegat +@@ -98,6 +98,7 @@ class Tab : public gfx::AnimationDelegat void OnMouseEntered(const ui::MouseEvent& event) override; void OnMouseExited(const ui::MouseEvent& event) override; void OnGestureEvent(ui::GestureEvent* event) override; @@ -42,7 +42,7 @@ #include "base/check.h" #include "base/compiler_specific.h" #include "base/containers/adapters.h" -@@ -1936,6 +1937,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -1960,6 +1961,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 4d62c1c3..5ecad3ea 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 -@@ -1555,7 +1555,8 @@ void BrowserCommandController::InitComma +@@ -1558,7 +1558,8 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, normal_window); @@ -12,7 +12,7 @@ command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE, --- a/chrome/browser/ui/ui_features.cc +++ b/chrome/browser/ui/ui_features.cc -@@ -458,6 +458,10 @@ static std::string GetCountryCode() { +@@ -388,6 +388,10 @@ static std::string GetCountryCode() { } bool IsTabSearchMoving() { @@ -25,7 +25,7 @@ base::FeatureList::IsEnabled( --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -5283,6 +5283,7 @@ void BrowserView::AddedToWidget() { +@@ -5272,6 +5272,7 @@ void BrowserView::AddedToWidget() { toolbar_->Init(); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch b/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch index 4e61f500..b3c4d78f 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/webui/flags/flags_state.cc +++ b/components/webui/flags/flags_state.cc -@@ -234,6 +234,7 @@ std::string GetCombinedOriginListValue(c +@@ -235,6 +235,7 @@ std::string GetCombinedOriginListValue(c const std::string new_value = flags_storage.GetOriginListFlag(internal_entry_name); if (command_line_switch == "custom-ntp") return existing_value.empty() ? new_value : existing_value; @@ -19,7 +19,7 @@ return CombineAndSanitizeOriginLists(existing_value, new_value); } -@@ -485,6 +486,7 @@ void FlagsState::SetOriginListFlag(const +@@ -486,6 +487,7 @@ void FlagsState::SetOriginListFlag(const FlagsStorage* flags_storage) { const std::string new_value = internal_name == "custom-ntp" ? value : 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 962d9b79..7adb2b61 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -8,7 +8,7 @@ #include "base/containers/adapters.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" -@@ -1161,6 +1162,10 @@ void TabStripModel::CloseAllTabsInGroup( +@@ -1165,6 +1166,10 @@ void TabStripModel::CloseAllTabsInGroup( void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) { CHECK(ContainsIndex(index)); @@ -19,7 +19,7 @@ CloseTabs({GetWebContentsAt(index)}, close_types); } -@@ -2789,9 +2794,13 @@ TabStripModel::GetGroupsDestroyedFromRem +@@ -2827,9 +2832,13 @@ TabStripModel::GetGroupsDestroyedFromRem void TabStripModel::ExecuteCloseTabsByIndices( base::RepeatingCallback()> get_indices_to_close, uint32_t close_types) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index eb2e4c72..f4fcec26 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch @@ -8,10 +8,10 @@ #include "base/auto_reset.h" +#include "base/command_line.h" + #include "base/notimplemented.h" #include "build/build_config.h" #include "chrome/browser/extensions/crx_installer.h" - #include "chrome/browser/extensions/extension_install_prompt.h" -@@ -113,6 +114,14 @@ scoped_refptr +@@ -114,6 +115,14 @@ scoped_refptr return installer; } @@ -26,7 +26,7 @@ bool IsExtensionDownload(const DownloadItem& download_item) { if (download_item.GetTargetDisposition() == DownloadItem::TARGET_DISPOSITION_PROMPT) -@@ -121,7 +130,7 @@ bool IsExtensionDownload(const DownloadI +@@ -122,7 +131,7 @@ bool IsExtensionDownload(const DownloadI if (download_item.GetMimeType() == extensions::Extension::kMimeType || extensions::UserScript::IsURLUserScript(download_item.GetURL(), download_item.GetMimeType())) { @@ -69,7 +69,7 @@ // Don't prompt for file types that are marked for opening automatically. --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -286,6 +286,13 @@ bool ExtensionManagement::IsInstallation +@@ -319,6 +319,13 @@ bool ExtensionManagement::IsInstallation bool ExtensionManagement::IsOffstoreInstallAllowed( const GURL& url, const GURL& referrer_url) const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch index f6478277..b1a2de4e 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/net/socket/ssl_client_socket_impl.cc +++ b/net/socket/ssl_client_socket_impl.cc -@@ -198,7 +198,8 @@ class SSLClientSocketImpl::SSLContext { +@@ -199,7 +199,8 @@ class SSLClientSocketImpl::SSLContext { SSL_CTX_sess_set_new_cb(ssl_ctx_.get(), NewSessionCallback); SSL_CTX_set_timeout(ssl_ctx_.get(), 1 * 60 * 60 /* one hour */); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch index 7c45c9f9..ff2f717b 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 @@ -34,7 +34,7 @@ widget->Show(); } -@@ -943,6 +956,9 @@ void ExtensionsToolbarContainer::UpdateC +@@ -958,6 +971,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 aff91a32..8281a00a 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 -@@ -2370,6 +2370,10 @@ void BrowserView::ExitFullscreen() { +@@ -2238,6 +2238,10 @@ void BrowserView::ExitFullscreen() { void BrowserView::UpdateExclusiveAccessBubble( const ExclusiveAccessBubbleParams& params, ExclusiveAccessBubbleHideCallback first_hide_callback) { @@ -13,7 +13,7 @@ platform_util::IsBrowserLockedFullscreen(browser_.get()); --- a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc +++ b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc -@@ -72,6 +72,10 @@ bool IsExitUiEnabled() { +@@ -73,6 +73,10 @@ bool IsExitUiEnabled() { // menu and controls reveal when the cursor is moved to the top. return false; #else diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch index 576e108c..d61cf24f 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 -@@ -1174,7 +1174,11 @@ void Tab::UpdateIconVisibility() { +@@ -1139,7 +1139,11 @@ void Tab::UpdateIconVisibility() { // Close button is shown on active tabs regardless of the size. showing_close_button_ = true; #endif // BUILDFLAG(IS_CHROMEOS) @@ -12,7 +12,7 @@ showing_alert_indicator_ = has_alert_icon && alert_icon_width <= available_width; -@@ -1203,6 +1207,8 @@ void Tab::UpdateIconVisibility() { +@@ -1168,6 +1172,8 @@ void Tab::UpdateIconVisibility() { !controller_->IsLockedForOnTask() && #endif large_enough_for_close_button; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-increase-incognito-storage-quota.patch b/patches/extra/ungoogled-chromium/add-flag-to-increase-incognito-storage-quota.patch index 368cccb4..84882cd3 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-increase-incognito-storage-quota.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-increase-incognito-storage-quota.patch @@ -40,9 +40,9 @@ +#include "base/feature_list.h" #include "base/functional/bind.h" + #include "base/logging.h" #include "base/no_destructor.h" - #include "base/numerics/safe_conversions.h" -@@ -55,7 +56,8 @@ std::optional CalculateNo +@@ -56,7 +57,8 @@ std::optional CalculateNo base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, base::BlockingType::MAY_BLOCK); @@ -52,7 +52,7 @@ return CalculateIncognitoDynamicSettings( device_info_helper->AmountOfPhysicalMemory()); } -@@ -116,7 +118,9 @@ std::optional CalculateNo +@@ -117,7 +119,9 @@ std::optional CalculateNo QuotaSettings settings; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch b/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch index 37e30ec5..c72321e4 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc -@@ -160,6 +160,8 @@ const std::string& GetWindowsPlatformVer +@@ -164,6 +164,8 @@ const std::string& GetWindowsPlatformVer // TODO(crbug.com/1330890): Remove this method along with policy. bool ShouldReduceUserAgentMinorVersion( UserAgentReductionEnterprisePolicyState user_agent_reduction) { @@ -20,7 +20,7 @@ return ((user_agent_reduction != UserAgentReductionEnterprisePolicyState::kForceDisabled && base::FeatureList::IsEnabled( -@@ -183,6 +185,8 @@ bool ShouldReduceUserAgentMinorVersion( +@@ -187,6 +189,8 @@ bool ShouldReduceUserAgentMinorVersion( // sending unified platform for the user agent string. bool ShouldSendUserAgentUnifiedPlatform( UserAgentReductionEnterprisePolicyState user_agent_reduction) { @@ -29,7 +29,7 @@ #if BUILDFLAG(IS_ANDROID) return ShouldReduceUserAgentMinorVersion(user_agent_reduction) && base::FeatureList::IsEnabled( -@@ -612,6 +616,8 @@ blink::UserAgentMetadata GetUserAgentMet +@@ -616,6 +620,8 @@ blink::UserAgentMetadata GetUserAgentMet blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service, bool only_low_entropy_ch) { @@ -50,7 +50,7 @@ // Feature definitions and associated constants (feature params, et cetera) --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h -@@ -21,6 +21,7 @@ namespace blink { +@@ -23,6 +23,7 @@ namespace blink { namespace features { BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableLinkDrag); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch index d2c41b73..2e192ea4 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch @@ -41,7 +41,7 @@ // Feature definitions and associated constants (feature params, et cetera) --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h -@@ -22,6 +22,7 @@ namespace features { +@@ -24,6 +24,7 @@ namespace features { BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableLinkDrag); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kReducedSystemInfo); @@ -78,7 +78,7 @@ #include "third_party/blink/public/common/switches.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h" #include "third_party/blink/public/mojom/loader/request_context_frame_type.mojom-blink.h" -@@ -504,6 +505,8 @@ void FrameFetchContext::ModifyRequestFor +@@ -528,6 +529,8 @@ void FrameFetchContext::ModifyRequestFor void FrameFetchContext::AddClientHintsIfNecessary( const std::optional resource_width, ResourceRequest& request) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch index 4bf3dfae..266b4c1a 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch @@ -72,7 +72,7 @@ // Feature definitions and associated constants (feature params, et cetera) --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h -@@ -23,6 +23,11 @@ namespace features { +@@ -25,6 +25,11 @@ namespace features { BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableLinkDrag); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kReducedSystemInfo); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kRemoveClientHints); @@ -86,7 +86,7 @@ // Feature declarations and associated constants (feature params, et cetera) --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3915,6 +3915,8 @@ ScriptValue WebGLRenderingContextBase::g +@@ -4052,6 +4052,8 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -95,7 +95,7 @@ return WebGLAny(script_state, String(ContextGL()->GetString(GL_RENDERER))); } -@@ -3930,6 +3932,8 @@ ScriptValue WebGLRenderingContextBase::g +@@ -4067,6 +4069,8 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_VENDOR)))); } diff --git a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch index c46719e8..00c9c257 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 -@@ -4732,10 +4732,12 @@ const FeatureEntry::FeatureVariation kHi +@@ -4862,10 +4862,12 @@ const FeatureEntry::Choice kDataSharingV #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 ec1ffc8f..0d01b6d3 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch @@ -19,7 +19,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -168,6 +168,7 @@ +@@ -170,6 +170,7 @@ #include "services/network/public/cpp/permissions_policy/fenced_frame_permissions_policies.h" #include "services/network/public/cpp/permissions_policy/permissions_policy_declaration.h" #include "services/network/public/cpp/permissions_policy/permissions_policy_features.h" @@ -27,7 +27,7 @@ #include "services/network/public/cpp/resource_request_body.h" #include "services/network/public/cpp/supports_loading_mode/supports_loading_mode_parser.h" #include "services/network/public/cpp/url_loader_completion_status.h" -@@ -388,10 +389,10 @@ void AddAdditionalRequestHeaders( +@@ -390,10 +391,10 @@ void AddAdditionalRequestHeaders( net::HttpRequestHeaders::kUserAgent, ComputeUserAgentValue(*headers, user_agent_override, browser_context)); @@ -52,7 +52,7 @@ #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" #include "services/network/public/mojom/fetch_api.mojom.h" #include "services/network/public/mojom/restricted_cookie_manager.mojom.h" -@@ -4664,10 +4665,13 @@ void RenderFrameImpl::FinalizeRequestInt +@@ -4702,10 +4703,13 @@ void RenderFrameImpl::FinalizeRequestInt request.SetHasUserGesture(frame_->HasTransientUserActivation()); @@ -72,7 +72,7 @@ void RenderFrameImpl::DidLoadResourceFromMemoryCache( --- a/services/network/network_service_network_delegate.cc +++ b/services/network/network_service_network_delegate.cc -@@ -31,6 +31,7 @@ +@@ -32,6 +32,7 @@ #include "services/network/network_service_proxy_delegate.h" #include "services/network/pending_callback_chain.h" #include "services/network/public/cpp/features.h" @@ -80,7 +80,7 @@ #include "services/network/url_loader.h" #include "url/gurl.h" -@@ -68,9 +69,14 @@ NetworkServiceNetworkDelegate::~NetworkS +@@ -69,9 +70,14 @@ NetworkServiceNetworkDelegate::~NetworkS void NetworkServiceNetworkDelegate::MaybeTruncateReferrer( net::URLRequest* const request, const GURL& effective_url) { @@ -259,8 +259,8 @@ } std::vector> ---- a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc -+++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc +--- a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_global_scope_context_impl.cc ++++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_global_scope_context_impl.cc @@ -13,6 +13,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" @@ -269,7 +269,7 @@ #include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/wrapper_shared_url_loader_factory.h" #include "third_party/blink/public/common/loader/loader_constants.h" -@@ -23,6 +24,7 @@ +@@ -24,6 +25,7 @@ #include "third_party/blink/public/platform/modules/service_worker/web_service_worker_provider_context.h" #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/resource_load_info_notifier_wrapper.h" @@ -277,7 +277,7 @@ #include "third_party/blink/public/platform/url_loader_throttle_provider.h" #include "third_party/blink/public/platform/weak_wrapper_resource_load_info_notifier.h" #include "third_party/blink/public/platform/web_security_origin.h" -@@ -373,10 +375,13 @@ void DedicatedOrSharedWorkerFetchContext +@@ -381,10 +383,13 @@ void DedicatedOrSharedWorkerGlobalScopeC auto url_request_extra_data = base::MakeRefCounted(); request.SetURLRequestExtraData(std::move(url_request_extra_data)); diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index 2a72a34e..4fafb353 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -47,7 +47,7 @@ // True if |hostname| ends with either ".local" or ".local.". bool ResemblesMulticastDNSName(std::string_view hostname) { return hostname.ends_with(".local") || hostname.ends_with(".local."); -@@ -1489,33 +1484,10 @@ int HostResolverManager::StartIPv6Reacha +@@ -1497,33 +1492,10 @@ int HostResolverManager::StartIPv6Reacha return OK; } diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index 873c332c..7b37c248 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html +++ b/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html -@@ -22,6 +22,13 @@ +@@ -37,6 +37,13 @@ error-message="$i18n{notValid}" value="{{queryUrl_}}" on-focus="validate_" on-input="validate_"> @@ -19,7 +19,7 @@ GetDefaultSearchProvider() != template_url || template_url->SupportsReplacement( template_url_service_->search_terms_data())); @@ -428,7 +428,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -998,7 +998,8 @@ void TemplateURLService::IncrementUsageC +@@ -1028,7 +1028,8 @@ void TemplateURLService::IncrementUsageC void TemplateURLService::ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -438,10 +438,10 @@ DCHECK(!IsCreatedByExtension(url)); DCHECK(!keyword.empty()); DCHECK(!search_url.empty()); -@@ -1013,6 +1014,7 @@ void TemplateURLService::ResetTemplateUR - data.safe_for_autoreplace = false; +@@ -1052,6 +1053,7 @@ void TemplateURLService::ResetTemplateUR data.last_modified = clock_->Now(); data.is_active = TemplateURLData::ActiveStatus::kTrue; + data.policy_origin = TemplateURLData::PolicyOrigin::kNoPolicy; + data.suggestions_url = suggestions_url; Update(url, base::FeatureList::IsEnabled( diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index 96d2c776..930e6d92 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 -@@ -4728,7 +4728,13 @@ const FeatureEntry::FeatureVariation kHi +@@ -4858,7 +4858,13 @@ const FeatureEntry::Choice kDataSharingV // 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-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index 64f1b2bd..fec43291 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -275,7 +275,7 @@ #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_platform_file.h" -@@ -93,12 +92,6 @@ class PepperFileIOHost final : public pp +@@ -92,12 +91,6 @@ class PepperFileIOHost final : public pp const base::FilePath& path, base::File::Error error_code); diff --git a/patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch b/patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch index 6268d51f..07e6afab 100644 --- a/patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch +++ b/patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch @@ -1,6 +1,6 @@ --- a/components/safe_browsing/core/common/features.cc +++ b/components/safe_browsing/core/common/features.cc -@@ -133,7 +133,7 @@ BASE_FEATURE(kDlpRegionalizedEndpoints, +@@ -127,7 +127,7 @@ BASE_FEATURE(kDlpRegionalizedEndpoints, BASE_FEATURE(kDownloadsPageReferrerUrl, "DownloadsPageReferrerUrl", diff --git a/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch b/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch index 17ac769e..fe104877 100644 --- a/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch +++ b/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch @@ -7,5 +7,5 @@ - base::FEATURE_ENABLED_BY_DEFAULT); + base::FEATURE_DISABLED_BY_DEFAULT); - BASE_FEATURE(kRemoteOptimizationGuideFetchingAnonymousDataConsent, - "OptimizationHintsFetchingAnonymousDataConsent", + // Enables the prediction of optimization targets. + BASE_FEATURE(kOptimizationTargetPrediction, 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 991fe244..89465940 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 -@@ -2099,7 +2099,7 @@ BASE_FEATURE(kPrefetchFontLookupTables, +@@ -2068,7 +2068,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 9721632f..b190f88a 100644 --- a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch +++ b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch @@ -14,7 +14,7 @@ } return content_restrictions; } -@@ -1917,8 +1912,7 @@ bool CanSavePage(const Browser* browser) +@@ -1919,8 +1914,7 @@ bool CanSavePage(const Browser* browser) policy::DownloadRestriction::ALL_FILES) { return false; } diff --git a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch index 305320fa..bd79c77f 100644 --- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch +++ b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch @@ -15,7 +15,7 @@ --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -2198,8 +2198,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2222,8 +2222,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { @@ -24,7 +24,7 @@ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); CHECK(clipboard) << "Clipboard instance is not available, cannot proceed with " -@@ -2210,7 +2208,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2234,7 +2232,6 @@ void TabStrip::NewTabButtonPressed(const if (!clipboard_text.empty()) { controller_->CreateNewTabWithLocation(clipboard_text); } diff --git a/patches/extra/ungoogled-chromium/first-run-page.patch b/patches/extra/ungoogled-chromium/first-run-page.patch index 82cf1411..fa443e38 100644 --- a/patches/extra/ungoogled-chromium/first-run-page.patch +++ b/patches/extra/ungoogled-chromium/first-run-page.patch @@ -1,13 +1,13 @@ --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1003,6 +1003,7 @@ int ChromeBrowserMainParts::PreCreateThr +@@ -1005,6 +1005,7 @@ int ChromeBrowserMainParts::PreCreateThr if (first_run::IsChromeFirstRun()) { if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) && !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) { + browser_creator_->AddFirstRunTabs({GURL("chrome://ungoogled-first-run")}); browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } - + } --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc @@ -46,6 +46,7 @@ @@ -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" -@@ -262,6 +263,7 @@ void RegisterChromeWebUIConfigs() { +@@ -258,6 +259,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); @@ -182,4 +182,4 @@ + "ungoogled-first-run", kChromeUIAboutHost, kChromeUIAccessibilityHost, - #if !BUILDFLAG(IS_ANDROID) + kChromeUIActorInternalsHost, diff --git a/patches/extra/ungoogled-chromium/keep-expired-flags.patch b/patches/extra/ungoogled-chromium/keep-expired-flags.patch index edd0911b..3a7aca81 100644 --- a/patches/extra/ungoogled-chromium/keep-expired-flags.patch +++ b/patches/extra/ungoogled-chromium/keep-expired-flags.patch @@ -1,6 +1,6 @@ --- a/components/webui/flags/flags_state.cc +++ b/components/webui/flags/flags_state.cc -@@ -30,6 +30,7 @@ +@@ -31,6 +31,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" @@ -8,7 +8,7 @@ #include "components/variations/field_trial_config/field_trial_util.h" #include "components/variations/variations_associated_data.h" #include "components/variations/variations_switches.h" -@@ -685,14 +686,19 @@ void FlagsState::GetFlagFeatureEntries( +@@ -686,14 +687,19 @@ void FlagsState::GetFlagFeatureEntries( int current_platform = GetCurrentPlatform(); for (const FeatureEntry& entry : feature_entries_) { @@ -29,7 +29,7 @@ base::Value::List supported_platforms; AddOsStrings(entry.supported_platforms, &supported_platforms); -@@ -1101,7 +1107,9 @@ bool FlagsState::IsSupportedFeature(cons +@@ -1102,7 +1108,9 @@ bool FlagsState::IsSupportedFeature(cons continue; } if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry)) { diff --git a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch index de44ac4c..ab286803 100644 --- a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch +++ b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch @@ -2,7 +2,7 @@ # --- a/components/omnibox/common/omnibox_features.cc +++ b/components/omnibox/common/omnibox_features.cc -@@ -313,7 +313,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor +@@ -306,7 +306,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor // Enables additional site search providers for the Site search Starter Pack. BASE_FEATURE(kStarterPackExpansion, "StarterPackExpansion", diff --git a/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch b/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch index d2afa6c6..d76c8046 100644 --- a/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch +++ b/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -69,7 +69,6 @@ const char* const kBadFlags[] = { +@@ -68,7 +68,6 @@ const char* const kBadFlags[] = { // These flags disable sandbox-related security. sandbox::policy::switches::kDisableGpuSandbox, sandbox::policy::switches::kDisableSeccompFilterSandbox, diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 31b2208b..6e0dff0e 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -53,7 +53,7 @@ --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -965,7 +965,7 @@ +@@ -1009,7 +1009,7 @@ Active site @@ -62,7 +62,7 @@ Power -@@ -989,7 +989,7 @@ +@@ -1033,7 +1033,7 @@ Inactive tabs appearance @@ -71,7 +71,7 @@ Tab hover preview card appearance -@@ -1001,7 +1001,7 @@ +@@ -1045,7 +1045,7 @@ Performance issue alerts @@ -156,20 +156,20 @@ declare global { --- a/chrome/browser/resources/history/side_bar.html +++ b/chrome/browser/resources/history/side_bar.html -@@ -88,13 +88,6 @@ - $i18n{historyMenuItem} - - -- -- -- $i18n{openTabsMenuItem} -- -- - --