From 4ee8b57c6e2c285ab80ce9f2a0d70e6e2844cb6b Mon Sep 17 00:00:00 2001 From: Blaise Date: Tue, 20 Jul 2021 10:43:27 -0500 Subject: [PATCH] Update to Chromium 92.0.4515.107 --- chromium_version.txt | 2 +- domain_substitution.list | 330 ++++++----- .../fix-crash-in-ThemeService.patch | 41 -- ...01-fix-building-without-safebrowsing.patch | 93 ++- ...03-disable-autofill-download-manager.patch | 2 +- .../0005-disable-default-extensions.patch | 8 +- .../0009-disable-google-ipv6-probes.patch | 2 +- .../core/inox-patchset/0021-disable-rlz.patch | 2 +- ...refixes-to-possibly-evil-connections.patch | 52 +- ..._browsing-disable-incident-reporting.patch | 2 +- ...sable-reporting-of-safebrowsing-over.patch | 6 +- .../ungoogled-chromium/block-requests.patch | 6 +- .../block-trk-and-subdomains.patch | 24 +- .../disable-crash-reporter.patch | 14 +- .../disable-domain-reliability.patch | 4 +- .../ungoogled-chromium/disable-floc.patch | 22 +- .../disable-fonts-googleapis-references.patch | 4 +- .../core/ungoogled-chromium/disable-gcm.patch | 6 +- .../disable-google-host-detection.patch | 41 +- .../disable-mei-preload.patch | 4 +- .../disable-privacy-sandbox.patch | 33 ++ .../ungoogled-chromium/disable-signin.patch | 2 +- .../disable-untraceable-urls.patch | 4 +- .../disable-webstore-urls.patch | 8 +- .../fix-building-with-prunned-binaries.patch | 33 +- ...-building-without-enabling-reporting.patch | 24 +- ...ix-building-without-one-click-signin.patch | 19 +- .../fix-building-without-safebrowsing.patch | 549 +++++++++++++++--- .../remove-unused-preferences-fields.patch | 374 ++++++------ .../toggle-translation-via-switch.patch | 16 +- ...g-flags-client-rects-and-measuretext.patch | 54 +- ...ngerprinting-canvas-image-data-noise.patch | 24 +- .../flag-max-connections-per-host.patch | 8 +- .../debian/disable/google-api-warning.patch | 4 +- .../extra/debian/disable/welcome-page.patch | 2 +- .../0006-modify-default-prefs.patch | 12 +- .../0013-disable-missing-key-warning.patch | 16 +- ...ble-profile-auto-import-on-first-run.patch | 2 +- .../prefs-only-keep-cookies-until-exit.patch | 2 +- .../updater-disable-auto-update.patch | 2 +- .../add-flag-for-pdf-plugin-name.patch | 12 +- ...dd-flag-for-search-engine-collection.patch | 12 +- .../add-flag-to-clear-data-on-exit.patch | 6 +- ...d-flag-to-close-window-with-last-tab.patch | 2 +- ...g-to-configure-extension-downloading.patch | 6 +- .../add-flag-to-convert-popups-to-tabs.patch | 2 +- ...-to-disable-local-history-expiration.patch | 2 +- ...add-flag-to-force-punycode-hostnames.patch | 2 +- .../add-flag-to-hide-crashed-bubble.patch | 2 +- .../add-flag-to-scroll-tabs.patch | 6 +- .../add-flag-to-show-avatar-button.patch | 2 +- .../add-flag-to-stack-tabs.patch | 2 +- .../add-ipv6-probing-option.patch | 8 +- .../add-suggestions-url-field.patch | 6 +- .../add-ungoogled-flag-headers.patch | 2 +- .../disable-download-quarantine.patch | 10 +- .../disable-formatting-in-omnibox.patch | 2 +- .../disable-webgl-renderer-info.patch | 4 +- ...ble-default-prefetch-privacy-changes.patch | 2 +- .../enable-page-saving-on-more-pages.patch | 6 +- .../enable-paste-and-go-new-tab-button.patch | 4 +- .../remove-uneeded-ui.patch | 28 +- patches/series | 2 +- pruning.list | 490 ++++++++++------ 64 files changed, 1482 insertions(+), 991 deletions(-) delete mode 100644 patches/core/chromium-upstream/fix-crash-in-ThemeService.patch create mode 100644 patches/core/ungoogled-chromium/disable-privacy-sandbox.patch diff --git a/chromium_version.txt b/chromium_version.txt index 927b654d..49fb4fc6 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -91.0.4472.164 +92.0.4515.107 diff --git a/domain_substitution.list b/domain_substitution.list index 254ad9a8..620f1d5c 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -3,7 +3,6 @@ PRESUBMIT.py PRESUBMIT_test.py android_webview/browser/aw_browser_context.cc android_webview/browser/aw_content_browser_client.h -android_webview/browser/aw_contents_io_thread_client.cc android_webview/browser/aw_permission_manager_unittest.cc android_webview/browser/aw_settings.cc android_webview/browser/network_service/aw_web_resource_request.h @@ -24,6 +23,7 @@ android_webview/tools/generate_flag_labels.py android_webview/tools/record_netlog.py android_webview/tools/remove_preinstalled_webview.py android_webview/tools/update_cts.py +ash/accelerators/accelerator_controller_impl.cc ash/accessibility/accessibility_controller_impl.cc ash/ambient/ambient_controller_unittest.cc ash/app_list/PRESUBMIT.py @@ -58,6 +58,8 @@ base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc base/allocator/partition_allocator/address_space_randomization.h base/allocator/partition_allocator/partition_alloc_unittest.cc base/allocator/partition_allocator/partition_tls.h +base/allocator/partition_allocator/starscan/stack/asm/x64/push_registers_asm.cc +base/allocator/partition_allocator/starscan/stack/stack.cc base/android/android_image_reader_abi.h base/android/jni_generator/PRESUBMIT.py base/android/jni_generator/jni_generator.py @@ -75,6 +77,7 @@ base/debug/debugger_posix.cc base/debug/stack_trace_fuchsia.cc base/debug/stack_trace_posix.cc base/debug/stack_trace_win.cc +base/feature_list.cc base/file_version_info.h base/files/file_enumerator_posix.cc base/files/file_path.cc @@ -89,6 +92,7 @@ base/i18n/rtl_unittest.cc base/i18n/timezone_unittest.cc base/ios/device_util.mm base/lazy_instance_helpers.h +base/location.cc base/logging.cc base/logging.h base/mac/close_nocancel.cc @@ -107,7 +111,6 @@ base/metrics/user_metrics.h base/native_library_win.cc base/notreached.cc base/observer_list_unittest.cc -base/optional.h base/process/launch.h base/process/launch_posix.cc base/process/memory.cc @@ -147,7 +150,8 @@ base/threading/platform_thread_unittest.cc base/threading/platform_thread_win.cc base/time/time.cc base/time/time.h -base/time/time_unittest.cc +base/time/time_delta_from_string.cc +base/time/time_delta_from_string_unittest.cc base/time/time_win.cc base/trace_event/cfi_backtrace_android_unittest.cc base/trace_event/heap_profiler_allocation_context.h @@ -257,8 +261,10 @@ cc/trees/layer_tree_host_impl.cc chrome/BUILD.gn chrome/PRESUBMIT.py chrome/android/BUILD.gn +chrome/android/expectations/lint-baseline.xml chrome/android/expectations/lint-suppressions.xml chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd +chrome/android/java/res/layout/autofill_save_address_profile_prompt.xml chrome/android/java/res/values-sw600dp/values.xml chrome/android/java/res/values/dimens.xml chrome/android/java/res/values/strings.xml @@ -281,6 +287,7 @@ chrome/app/google_chrome_strings.grd chrome/app/resources/locale_settings.grd chrome/app/theme/PRESUBMIT.py chrome/browser/about_flags.cc +chrome/browser/accessibility/live_caption_speech_recognition_host_browsertest.cc chrome/browser/android/contextualsearch/contextual_search_context.h chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc chrome/browser/android/customtabs/custom_tabs_browsertest.cc @@ -308,6 +315,7 @@ chrome/browser/android/vr/PRESUBMIT.py chrome/browser/android/webapk/webapk_icon_hasher_unittest.cc chrome/browser/apps/app_service/app_icon_factory.cc chrome/browser/apps/app_service/app_service_metrics.cc +chrome/browser/apps/app_service/webapk/webapk_install_task.cc chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc chrome/browser/apps/guest_view/web_view_browsertest.cc chrome/browser/apps/intent_helper/intent_picker_auto_display_service_unittest.cc @@ -345,11 +353,23 @@ chrome/browser/ash/attestation/tpm_challenge_key_subtle_unittest.cc chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc chrome/browser/ash/bluetooth/debug_logs_manager_unittest.cc chrome/browser/ash/cert_provisioning/cert_provisioning_test_helpers.cc +chrome/browser/ash/child_accounts/child_user_service.cc +chrome/browser/ash/child_accounts/family_user_device_metrics_browsertest.cc chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc +chrome/browser/ash/child_accounts/secondary_account_consent_logger_unittest.cc +chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html chrome/browser/ash/crosapi/browser_util_unittest.cc +chrome/browser/ash/crostini/crostini_installer.h +chrome/browser/ash/crostini/crostini_simple_types.h +chrome/browser/ash/crostini/crostini_util.cc +chrome/browser/ash/customization/customization_document.cc chrome/browser/ash/drive/drivefs_test_support.cc +chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h +chrome/browser/ash/hats/hats_dialog.cc +chrome/browser/ash/kerberos/kerberos_credentials_manager_test.cc chrome/browser/ash/login/app_mode/kiosk_browsertest.cc chrome/browser/ash/login/app_mode/kiosk_launch_controller_browsertest.cc +chrome/browser/ash/login/ash_hud_login_browsertest.cc chrome/browser/ash/login/device_family_link_allowed_policy_browsertest.cc chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc chrome/browser/ash/login/easy_unlock/easy_unlock_screenlock_state_handler_unittest.cc @@ -372,7 +392,7 @@ chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl_unittest.cc chrome/browser/ash/login/screens/user_selection_screen_browsertest.cc chrome/browser/ash/login/session/user_session_manager.cc -chrome/browser/ash/login/session_login_browsertest.cc +chrome/browser/ash/login/shill_profile_loading_browsertest.cc chrome/browser/ash/login/signin/device_id_browsertest.cc chrome/browser/ash/login/signin/oauth2_browsertest.cc chrome/browser/ash/login/test/fake_gaia_mixin.cc @@ -382,13 +402,19 @@ chrome/browser/ash/login/test/login_manager_mixin.cc chrome/browser/ash/login/test/login_manager_mixin.h chrome/browser/ash/login/ui/captive_portal_view.cc chrome/browser/ash/login/users/multi_profile_user_controller_unittest.cc +chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc chrome/browser/ash/plugin_vm/plugin_vm_installer_unittest.cc chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc chrome/browser/ash/plugin_vm/plugin_vm_util.cc chrome/browser/ash/plugin_vm/plugin_vm_util_unittest.cc +chrome/browser/ash/release_notes/release_notes_notification_unittest.cc +chrome/browser/ash/release_notes/release_notes_storage_unittest.cc chrome/browser/ash/scanning/chrome_scanning_app_delegate_unittest.cc chrome/browser/ash/settings/cros_settings_unittest.cc chrome/browser/ash/settings/device_settings_provider_unittest.cc +chrome/browser/ash/sync/turn_sync_on_helper_unittest.cc +chrome/browser/ash/web_applications/help_app/help_app_discover_tab_notification_unittest.cc +chrome/browser/ash/web_applications/help_app/help_app_notification_controller_unittest.cc chrome/browser/autocomplete/autocomplete_browsertest.cc chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier_unittest.cc @@ -424,7 +450,10 @@ chrome/browser/browsing_data/counters/history_counter_browsertest.cc chrome/browser/browsing_data/counters/passwords_counter_browsertest.cc chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc chrome/browser/browsing_data/counters/site_settings_counter_unittest.cc +chrome/browser/browsing_data/third_party_data_remover_browsertest.cc chrome/browser/buildflags.gni +chrome/browser/cart/cart_discount_fetcher.cc +chrome/browser/cart/cart_discount_link_fetcher.cc chrome/browser/cart/cart_service.cc chrome/browser/cart/resources/cart_domain_cart_url_mapping.json chrome/browser/cart/resources/cart_domain_name_mapping.json @@ -437,15 +466,7 @@ chrome/browser/chrome_navigation_browsertest.cc chrome/browser/chrome_web_platform_security_metrics_browsertest.cc chrome/browser/chromeos/android_sms/android_sms_urls.cc chrome/browser/chromeos/android_sms/android_sms_urls.h -chrome/browser/chromeos/child_accounts/child_user_service.cc -chrome/browser/chromeos/child_accounts/family_user_device_metrics_browsertest.cc -chrome/browser/chromeos/child_accounts/secondary_account_consent_logger_unittest.cc -chrome/browser/chromeos/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html chrome/browser/chromeos/chrome_content_browser_client_chromeos_part_unittest.cc -chrome/browser/chromeos/crostini/crostini_installer.h -chrome/browser/chromeos/crostini/crostini_simple_types.h -chrome/browser/chromeos/crostini/crostini_util.cc -chrome/browser/chromeos/customization/customization_document.cc chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h chrome/browser/chromeos/dbus/proxy_resolution_service_provider_browsertest.cc chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc @@ -460,17 +481,13 @@ chrome/browser/chromeos/file_manager/file_browser_handlers.h chrome/browser/chromeos/file_manager/file_manager_string_util.cc chrome/browser/chromeos/file_manager/file_tasks.h chrome/browser/chromeos/file_manager/path_util_unittest.cc -chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h chrome/browser/chromeos/first_run/drive_first_run_controller.cc chrome/browser/chromeos/full_restore/full_restore_service_unittest.cc -chrome/browser/chromeos/hats/hats_dialog.cc chrome/browser/chromeos/input_method/assistive_suggester.cc -chrome/browser/chromeos/kerberos/kerberos_credentials_manager_test.cc chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.cc chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine.cc chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc -chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.cc chrome/browser/chromeos/net/network_diagnostics/http_request_manager.h chrome/browser/chromeos/net/network_diagnostics/http_request_manager_unittest.cc chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_unittest.cc @@ -507,11 +524,8 @@ chrome/browser/chromeos/power/ml/smart_dim/ml_agent_unittest.cc chrome/browser/chromeos/printing/specifics_translation_unittest.cc chrome/browser/chromeos/printing/synced_printers_manager_unittest.cc chrome/browser/chromeos/proxy_config_service_impl_unittest.cc -chrome/browser/chromeos/release_notes/release_notes_notification_unittest.cc -chrome/browser/chromeos/release_notes/release_notes_storage_unittest.cc chrome/browser/chromeos/scheduler_configuration_manager.h chrome/browser/chromeos/smb_client/smb_service_helper.h -chrome/browser/chromeos/sync/turn_sync_on_helper_unittest.cc chrome/browser/chromeos/system_token_cert_db_initializer.h chrome/browser/chromeos/tpm_firmware_update.h chrome/browser/chromeos/u2f_notification.cc @@ -551,6 +565,7 @@ chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertes chrome/browser/enterprise/connectors/connectors_manager_unittest.cc chrome/browser/enterprise/connectors/connectors_service.cc chrome/browser/enterprise/connectors/connectors_service_unittest.cc +chrome/browser/enterprise/connectors/device_trust/google_keys.cc chrome/browser/enterprise/connectors/file_system/box_api_call_flow.cc chrome/browser/enterprise/connectors/file_system/box_api_call_flow_unittest.cc chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc @@ -699,6 +714,7 @@ chrome/browser/importer/ie_importer_browsertest_win.cc chrome/browser/importer/profile_writer_unittest.cc chrome/browser/installable/installable_manager_browsertest.cc chrome/browser/lacros/lacros_chrome_service_delegate_impl.cc +chrome/browser/lacros/lacros_startup_infobar_delegate.cc chrome/browser/lifetime/switch_utils_unittest.cc chrome/browser/local_discovery/service_discovery_client_mac.mm chrome/browser/login_detection/password_store_sites_browsertest.cc @@ -718,6 +734,7 @@ chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc chrome/browser/media/router/providers/cast/cast_media_route_provider.cc chrome/browser/media/router/providers/cast/cast_media_route_provider_unittest.cc +chrome/browser/media/router/providers/dial/dial_activity_manager_unittest.cc chrome/browser/media/router/providers/dial/dial_media_route_provider.cc chrome/browser/media/router/providers/dial/dial_media_route_provider_unittest.cc chrome/browser/media/webrtc/display_media_access_handler_unittest.cc @@ -747,7 +764,11 @@ chrome/browser/nearby_sharing/local_device_data/nearby_share_device_data_updater chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl_unittest.cc chrome/browser/nearby_sharing/nearby_notification_manager_unittest.cc chrome/browser/nearby_sharing/nearby_share_profile_info_provider_impl_unittest.cc +chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc +chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher_unittest.cc chrome/browser/nearby_sharing/sharesheet/nearby_share_action_unittest.cc +chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc +chrome/browser/nearby_sharing/tachyon_ice_config_fetcher_unittest.cc chrome/browser/nearby_sharing/text_attachment_unittest.cc chrome/browser/net/cert_verify_proc_browsertest.cc chrome/browser/net/dns_over_https_browsertest.cc @@ -884,6 +905,7 @@ chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc chrome/browser/renderer_host/chrome_navigation_ui_data.h chrome/browser/reputation/local_heuristics.cc chrome/browser/reputation/local_heuristics_unittest.cc +chrome/browser/reputation/safety_tip_message_delegate_unittest.cc chrome/browser/reputation/url_elision_policy_unittest.cc chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc chrome/browser/resource_coordinator/tab_manager_web_contents_data_unittest.cc @@ -897,6 +919,7 @@ chrome/browser/resources/chromeos/accessibility/chromevox/background/background_ chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js chrome/browser/resources/chromeos/accessibility/chromevox/background/output/locale_output_helper_test.js chrome/browser/resources/chromeos/accessibility/chromevox/braille/braille_input_handler_test.js +chrome/browser/resources/chromeos/accessibility/chromevox/common/editable_text_base_test.js chrome/browser/resources/chromeos/accessibility/chromevox/common/spannable_test.js chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css chrome/browser/resources/chromeos/accessibility/chromevox/panel/tutorial_test.js @@ -967,19 +990,7 @@ chrome/browser/resources/internals/query_tiles/query_tiles_internals.html chrome/browser/resources/internals/query_tiles/query_tiles_internals.js chrome/browser/resources/media/mei_preload/manifest.json chrome/browser/resources/media/webrtc_logs.js -chrome/browser/resources/media_router/extension/src/externs.js -chrome/browser/resources/media_router/extension/src/manager/provider_manager_test.js -chrome/browser/resources/media_router/extension/src/mirror_services/mirror_activity_test.js -chrome/browser/resources/media_router/extension/src/mirror_services/mirror_session_test.js -chrome/browser/resources/media_router/extension/src/mirror_services/stream_capture/mirror_media_stream.js -chrome/browser/resources/media_router/extension/src/presentation.js -chrome/browser/resources/media_router/extension/src/providers/test/test_provider_test.js -chrome/browser/resources/media_router/extension/src/utils/logger_test.js -chrome/browser/resources/media_router/extension/src/utils/media_source_utils.js -chrome/browser/resources/media_router/extension/src/utils/media_source_utils_test.js -chrome/browser/resources/media_router/extension/src/utils/platform_utils.js -chrome/browser/resources/media_router/extension/src/utils/xhr_manager_test.js -chrome/browser/resources/media_router/extension/src/webrtc/peer_connection.js +chrome/browser/resources/media_router/cast_feedback_ui.js chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.js chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html chrome/browser/resources/nearby_share/shared/nearby_shared_share_type_icons.html @@ -1077,13 +1088,11 @@ chrome/browser/sessions/session_service.h chrome/browser/sessions/session_service_base.cc chrome/browser/sessions/session_service_unittest.cc chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc -chrome/browser/sharing/shared_clipboard/feature_flags.cc +chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc chrome/browser/sharing/vapid_key_manager.h chrome/browser/sharing/web_push/json_web_token_util_unittest.cc chrome/browser/sharing/web_push/web_push_sender.cc chrome/browser/sharing/web_push/web_push_sender_unittest.cc -chrome/browser/sharing/webrtc/ice_config_fetcher.cc -chrome/browser/sharing/webrtc/ice_config_fetcher_unittest.cc chrome/browser/shell_integration_linux_unittest.cc chrome/browser/signin/account_id_from_account_info_unittest.cc chrome/browser/signin/chrome_signin_helper_unittest.cc @@ -1178,6 +1187,7 @@ chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl_unittest.cc chrome/browser/ui/app_list/search/assistant_search_provider_unittest.cc chrome/browser/ui/app_list/search/files/item_suggest_cache.cc chrome/browser/ui/app_list/search/files/item_suggest_cache.h +chrome/browser/ui/app_list/search/files/item_suggest_cache_unittest.cc chrome/browser/ui/app_list/search/omnibox_provider.cc chrome/browser/ui/app_list/search/search_result_ranker/app_launch_event_logger_unittest.cc chrome/browser/ui/app_list/search/search_result_ranker/ranking_item_util_unittest.cc @@ -1191,11 +1201,9 @@ chrome/browser/ui/ash/assistant/conversation_starters_client_impl.cc chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc chrome/browser/ui/ash/chrome_shell_delegate.cc chrome/browser/ui/ash/in_session_auth_dialog_client.cc -chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc chrome/browser/ui/ash/quick_answers/quick_answers_browser_client_impl.cc -chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_browsertest.cc -chrome/browser/ui/ash/system_tray_client_browsertest.cc -chrome/browser/ui/autofill/payments/offer_notification_infobar_controller_impl_browsertest.cc +chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc +chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h chrome/browser/ui/bookmarks/bookmark_browsertest.cc @@ -1267,7 +1275,10 @@ chrome/browser/ui/toolbar/media_router_contextual_menu.cc chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc chrome/browser/ui/views/autofill/payments/local_card_migration_browsertest.cc +chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_test_base.cc chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc +chrome/browser/ui/views/autofill/payments/virtual_card_manual_fallback_bubble_views_interactive_uitest.cc +chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc 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 @@ -1281,7 +1292,7 @@ chrome/browser/ui/views/hats/hats_next_web_dialog.cc chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc chrome/browser/ui/views/location_bar/selected_keyword_view.h -chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc +chrome/browser/ui/views/media_router/media_router_dialog_controller_views_browsertest.cc chrome/browser/ui/views/network_profile_bubble_view.cc chrome/browser/ui/views/omnibox/omnibox_result_view_unittest.cc chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -1333,8 +1344,8 @@ chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc chrome/browser/ui/webui/interstitials/interstitial_ui.cc chrome/browser/ui/webui/log_web_ui_url_unittest.cc chrome/browser/ui/webui/management/management_ui_handler_unittest.cc +chrome/browser/ui/webui/media_router/cast_feedback_ui.cc chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc -chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc chrome/browser/ui/webui/ntp/new_tab_ui.cc chrome/browser/ui/webui/ntp/ntp_resource_cache.cc chrome/browser/ui/webui/policy/policy_ui_browsertest.cc @@ -1380,16 +1391,19 @@ chrome/browser/web_applications/components/web_app_icon_downloader_unittest.cc chrome/browser/web_applications/components/web_app_id_constants.cc chrome/browser/web_applications/components/web_app_install_utils_unittest.cc chrome/browser/web_applications/extensions/bookmark_app_util_unittest.cc -chrome/browser/web_applications/external_web_app_manager_unittest.cc -chrome/browser/web_applications/external_web_app_migration_browsertest.cc +chrome/browser/web_applications/preinstalled_web_app_manager_unittest.cc +chrome/browser/web_applications/preinstalled_web_app_migration_browsertest.cc chrome/browser/web_applications/preinstalled_web_apps/gmail.cc chrome/browser/web_applications/preinstalled_web_apps/google_calendar.cc +chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc chrome/browser/web_applications/preinstalled_web_apps/google_drive.cc +chrome/browser/web_applications/preinstalled_web_apps/google_meet.cc chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc chrome/browser/web_applications/preinstalled_web_apps/google_slides.cc chrome/browser/web_applications/preinstalled_web_apps/youtube.cc chrome/browser/web_applications/preinstalled_web_apps_browsertest.cc +chrome/browser/web_applications/system_web_apps/system_web_app_types.h chrome/browser/web_applications/web_app_install_task.cc chrome/browser/web_applications/web_app_installation_utils_unittest.cc chrome/browser/web_applications/web_app_mover_unittest.cc @@ -1416,7 +1430,7 @@ chrome/chrome_cleaner/engines/common/registry_util.h chrome/chrome_cleaner/engines/controllers/elevating_facade.cc chrome/chrome_cleaner/executables/chrome_cleaner_main.cc chrome/chrome_cleaner/http/http_agent_impl.cc -chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc_unittest.cc +chrome/chrome_cleaner/ipc/chrome_prompt_test_util.cc chrome/chrome_cleaner/ipc/sandbox.cc chrome/chrome_cleaner/logging/cleaner_logging_service.cc chrome/chrome_cleaner/logging/dummy_api_keys.cc @@ -1435,6 +1449,7 @@ chrome/chrome_cleaner/parsers/shortcut_parser/target/lnk_parser_unittest.cc chrome/chrome_cleaner/pup_data/pup_data.h chrome/chrome_cleaner/strings/string_util_unittest.cc chrome/chrome_cleaner/test/child_process_logger.cc +chrome/chrome_cleaner/test/cleaner_test.cc chrome/chrome_cleaner/test/reboot_deletion_helper.cc chrome/chrome_cleaner/test/test_extensions.h chrome/chrome_cleaner/zip_archiver/test_zip_archiver_util.cc @@ -1575,7 +1590,6 @@ chrome/installer/setup/eula/oem_vi.html chrome/installer/setup/eula/oem_zh-CN.html chrome/installer/setup/eula/oem_zh-TW.html chrome/installer/setup/google_chrome_behaviors.cc -chrome/installer/setup/install_worker.cc chrome/installer/setup/uninstall.cc chrome/installer/util/delete_after_reboot_helper.cc chrome/installer/util/delete_after_reboot_helper.h @@ -1601,6 +1615,7 @@ chrome/renderer/extensions/extension_hooks_delegate_unittest.cc chrome/renderer/media/flash_embed_rewrite.cc chrome/renderer/media/flash_embed_rewrite_unittest.cc chrome/renderer/resources/cart/cart_domain_cart_url_regex.json +chrome/renderer/resources/cart/skip_add_to_cart_request_domain_mapping.json chrome/renderer/resources/extensions/identity_custom_bindings.js chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc chrome/renderer/searchbox/searchbox.h @@ -1717,7 +1732,7 @@ chromecast/common/extensions_api/tabs.json chromecast/common/extensions_api/windows.json chromecast/crash/linux/minidump_uploader.cc chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.h -chromecast/net/connectivity_checker_impl.cc +chromecast/net/connectivity_checker_impl.h chromecast/net/net_switches.cc chromecast/public/bluetooth/gatt.h chromecast/public/output_restrictions.h @@ -1734,11 +1749,13 @@ chromeos/components/camera_app_ui/resources/js/views/camera_intent.js chromeos/components/camera_app_ui/resources/strings/camera_strings.grd chromeos/components/diagnostics_ui/resources/routine_section.js chromeos/components/drivefs/drivefs_auth.cc +chromeos/components/help_app_ui/help_app_untrusted_ui.cc chromeos/components/local_search_service/content_extraction_utils_unittest.cc chromeos/components/media_app_ui/media_app_guest_ui.cc chromeos/components/media_app_ui/resources/js/launch.js chromeos/components/multidevice/remote_device_test_util.cc chromeos/components/multidevice/stub_multidevice_util.cc +chromeos/components/personalization_app/untrusted_personalization_app_ui_config.cc chromeos/components/phonehub/notification.h chromeos/components/phonehub/url_constants.cc chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager_unittest.cc @@ -1823,8 +1840,8 @@ components/autofill/core/browser/autofill_download_manager.cc components/autofill/core/browser/autofill_download_manager_unittest.cc components/autofill/core/browser/autofill_experiments.cc components/autofill/core/browser/autofill_experiments_unittest.cc -components/autofill/core/browser/autofill_manager_unittest.cc components/autofill/core/browser/autofill_metrics_unittest.cc +components/autofill/core/browser/browser_autofill_manager_unittest.cc components/autofill/core/browser/data_model/test_data_creator.cc components/autofill/core/browser/form_data_importer_unittest.cc components/autofill/core/browser/form_parsing/address_field.cc @@ -1870,6 +1887,7 @@ components/autofill_assistant/browser/field_formatter_unittest.cc components/autofill_assistant/browser/script_parameters_unittest.cc components/autofill_assistant/browser/service/server_url_fetcher.cc components/autofill_assistant/browser/service/server_url_fetcher_unittest.cc +components/autofill_assistant/browser/starter_unittest.cc components/autofill_assistant/browser/trigger_scripts/trigger_script_coordinator_unittest.cc components/autofill_assistant/browser/user_data_util_unittest.cc components/autofill_assistant/browser/user_model_unittest.cc @@ -1891,6 +1909,7 @@ components/browsing_data/core/history_notice_utils.cc components/captive_portal/content/captive_portal_service.h components/captive_portal/content/captive_portal_tab_helper.h components/captive_portal/core/captive_portal_detector.cc +components/cast_channel/BUILD.gn components/cast_channel/enum_table.h components/certificate_transparency/chrome_ct_policy_enforcer.cc components/certificate_transparency/chrome_require_ct_delegate.h @@ -2013,8 +2032,9 @@ components/history/core/browser/web_history_service_unittest.cc components/history/core/common/thumbnail_score.h components/history/core/test/fake_web_history_service.cc components/history/metrics/domain_diversity_reporter_unittest.cc -components/history_clusters/core/memories_service_unittest.cc +components/history_clusters/core/history_clusters_service_unittest.cc components/image_fetcher/ios/webp_decoder.h +components/infobars/content/content_infobar_manager.cc components/invalidation/impl/per_user_topic_subscription_manager.cc components/invalidation/impl/per_user_topic_subscription_manager_unittest.cc components/javascript_dialogs/tab_modal_dialog_manager.cc @@ -2051,7 +2071,7 @@ components/network_session_configurator/common/network_switch_list.h components/network_time/network_time_test_utils.cc components/network_time/network_time_tracker.cc components/no_state_prefetch/browser/no_state_prefetch_manager.cc -components/no_state_prefetch/browser/prerender_util_unittest.cc +components/no_state_prefetch/browser/no_state_prefetch_utils_unittest.cc components/ntp_snippets/features.cc components/ntp_snippets/features_unittest.cc components/ntp_snippets/ntp_snippets_constants.cc @@ -2117,10 +2137,10 @@ components/omnibox/browser/zero_suggest_verbatim_match_provider_unittest.cc components/omnibox/resources/omnibox_pedal_concepts.json components/omnibox/resources/omnibox_pedal_concepts_en-GB.json components/omnibox/resources/omnibox_pedal_concepts_en.json -components/optimization_guide/content/browser/optimization_target_model_executor_unittest.cc components/optimization_guide/content/browser/page_content_annotations_model_manager.cc components/optimization_guide/content/browser/page_content_annotations_model_manager_unittest.cc components/optimization_guide/core/hints_component_util_unittest.cc +components/optimization_guide/core/model_executor_unittest.cc components/optimization_guide/core/optimization_filter_unittest.cc components/optimization_guide/core/optimization_guide_constants.cc components/optimization_guide/core/optimization_guide_util.h @@ -2131,6 +2151,7 @@ components/page_load_metrics/browser/metrics_web_contents_observer.cc components/page_load_metrics/browser/metrics_web_contents_observer_unittest.cc components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer_unittest.cc +components/page_load_metrics/browser/observers/back_forward_cache_page_load_metrics_observer_unittest.cc components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc components/page_load_metrics/browser/observers/page_load_metrics_observer_content_test_harness.cc @@ -2255,7 +2276,7 @@ components/performance_manager/public/graph/frame_node.h components/performance_manager/public/graph/policies/tab_loading_frame_navigation_policy.h components/performance_manager/public/graph/process_node.h components/performance_manager/public/graph/worker_node.h -components/permissions/chooser_context_base_unittest.cc +components/permissions/object_permission_context_base_unittest.cc components/permissions/permission_context_base.cc components/permissions/permission_context_base_unittest.cc components/permissions/permission_decision_auto_blocker_unittest.cc @@ -2416,6 +2437,7 @@ components/security_interstitials/core/controller_client.cc components/security_interstitials/core/safe_browsing_loud_error_ui.cc components/security_interstitials/core/urls.cc components/security_state/core/security_state.h +components/segmentation_platform/internal/execution/segmentation_model_executor_unittest.cc components/send_tab_to_self/send_tab_to_self_bridge_unittest.cc components/send_tab_to_self/target_device_info_unittest.cc components/services/app_service/app_service_impl_unittest.cc @@ -2493,6 +2515,7 @@ components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend.cc components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend_unittest.cc components/sync/trusted_vault/trusted_vault_request_unittest.cc components/sync_bookmarks/PRESUBMIT.py +components/sync_device_info/device_info.cc components/sync_preferences/pref_service_syncable_unittest.cc components/sync_sessions/PRESUBMIT.py components/sync_sessions/session_sync_bridge.h @@ -2530,6 +2553,7 @@ components/url_matcher/url_matcher_unittest.cc components/url_pattern_index/PRESUBMIT.py components/url_pattern_index/url_pattern_index_unittest.cc components/url_pattern_index/url_pattern_unittest.cc +components/user_manager/known_user_unittest.cc components/user_manager/user.h components/user_manager/user_type.h components/variations/entropy_provider.h @@ -2544,6 +2568,7 @@ components/variations/variations_murmur_hash.h components/variations/variations_url_constants.cc components/visitedlink/test/visitedlink_perftest.cc components/visitedlink/test/visitedlink_unittest.cc +components/viz/common/switches.cc components/viz/service/display/output_surface.h components/viz/test/data/render_pass_data/readme.txt components/webapps/browser/android/java/res/values/dimens.xml @@ -2624,14 +2649,13 @@ content/browser/permissions/permission_controller_impl_unittest.cc content/browser/plugin_service_impl_browsertest.cc content/browser/portal/portal_navigation_throttle.cc content/browser/push_messaging/push_messaging_manager.cc -content/browser/renderer_host/back_forward_cache_metrics.cc content/browser/renderer_host/compositor_impl_android.cc content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc content/browser/renderer_host/dwrite_font_proxy_impl_win.cc -content/browser/renderer_host/form_submission_throttle_unittest.cc content/browser/renderer_host/frame_tree_unittest.cc content/browser/renderer_host/input/touch_action_filter.h content/browser/renderer_host/legacy_render_widget_host_win.cc +content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc content/browser/renderer_host/mixed_content_navigation_throttle_unittest.cc content/browser/renderer_host/navigation_controller_impl.cc content/browser/renderer_host/navigation_controller_impl.h @@ -2658,7 +2682,6 @@ content/browser/renderer_host/text_input_client_mac.h content/browser/renderer_host/virtual_keyboard_controller_win.h content/browser/resources/PRESUBMIT.py content/browser/resources/gpu/info_view.js -content/browser/resources/media/media_internals.html content/browser/sandbox_ipc_linux.h content/browser/screen_orientation/screen_orientation_provider_unittest.cc content/browser/serial/serial_unittest.cc @@ -2689,10 +2712,10 @@ content/browser/web_package/web_bundle_utils.h content/browser/webauth/authenticator_common.cc content/browser/webauth/authenticator_impl_unittest.cc content/browser/webauth/authenticator_mojom_traits_unittest.cc +content/browser/webrtc/resources/webrtc_internals.js content/browser/zygote_host/zygote_host_impl_linux.cc content/child/runtime_features.cc content/common/zygote/zygote_communication_linux.h -content/public/PRESUBMIT.py content/public/android/java/res/values/strings.xml content/public/browser/back_forward_cache.h content/public/browser/browser_main_parts.h @@ -2808,6 +2831,7 @@ extensions/browser/api/feedback_private/feedback_private_api.cc extensions/browser/api/web_request/web_request_permissions.cc extensions/browser/api/web_request/web_request_permissions_unittest.cc extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc +extensions/browser/content_script_tracker.cc extensions/browser/event_listener_map.h extensions/browser/event_listener_map_unittest.cc extensions/browser/event_router_unittest.cc @@ -2836,6 +2860,7 @@ extensions/common/api/sockets_tcp.idl extensions/common/api/sockets_tcp_server.idl extensions/common/api/sockets_udp.idl extensions/common/api/web_accessible_resources.idl +extensions/common/content_script_injection_url_getter.cc extensions/common/csp_validator.cc extensions/common/csp_validator.h extensions/common/csp_validator_unittest.cc @@ -2857,6 +2882,7 @@ extensions/common/manifest_handlers/externally_connectable_unittest.cc extensions/common/manifest_handlers/oauth2_manifest_unittest.cc extensions/common/manifest_handlers/replacement_apps_unittest.cc extensions/common/message_bundle.h +extensions/common/mojom/permission_set_mojom_traits_unittest.cc extensions/common/mojom/url_pattern_set_mojom_traits_unittest.cc extensions/common/permissions/PRESUBMIT.py extensions/common/permissions/api_permission.h @@ -2879,6 +2905,7 @@ extensions/renderer/script_context.cc extensions/shell/browser/shell_prefs.cc extensions/strings/extensions_strings.grd fuchsia/engine/browser/frame_impl_browsertest.cc +fuchsia/engine/test/data/play_video.html gin/v8_initializer.cc google_apis/drive/base_requests.cc google_apis/drive/drive_api_parser.cc @@ -2945,6 +2972,7 @@ gpu/config/PRESUBMIT.py gpu/config/gpu_control_list_format.txt gpu/config/gpu_info_collector_win.cc gpu/ipc/common/PRESUBMIT.py +gpu/ipc/service/gpu_memory_buffer_factory_dxgi.cc gpu/vulkan/PRESUBMIT.py headless/app/headless_shell_switches.cc headless/lib/browser/protocol/headless_handler.cc @@ -2960,7 +2988,6 @@ ios/PRESUBMIT.py ios/README.txt ios/build/bots/scripts/PRESUBMIT.py ios/build/bots/scripts/result_sink_util.py -ios/build/bots/scripts/run.py ios/build/bots/scripts/standard_json_util.py ios/build/bots/scripts/xcode_util.py ios/build/chrome_build.gni @@ -2984,7 +3011,6 @@ ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_helper.mm ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_helper_unittest.mm ios/chrome/browser/flags/about_flags.mm ios/chrome/browser/flags/ios_chrome_flag_descriptions.h -ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm ios/chrome/browser/history/history_tab_helper_unittest.mm ios/chrome/browser/metrics/tab_usage_recorder_browser_agent_unittest.mm ios/chrome/browser/net/cookie_util_unittest.mm @@ -2992,6 +3018,7 @@ ios/chrome/browser/net/retryable_url_fetcher_unittest.mm ios/chrome/browser/omaha/omaha_service.mm ios/chrome/browser/passwords/password_controller_js_unittest.mm ios/chrome/browser/passwords/password_controller_unittest.mm +ios/chrome/browser/policy/policy_watcher_browser_agent_unittest.mm ios/chrome/browser/policy/reporting/profile_report_generator_ios_unittest.mm ios/chrome/browser/prerender/prerender_service_impl_unittest.mm ios/chrome/browser/search_engines/resources/search_engine.js @@ -2999,7 +3026,6 @@ ios/chrome/browser/search_engines/search_engine_js_unittest.mm ios/chrome/browser/search_engines/search_engine_tab_helper.h ios/chrome/browser/search_engines/search_engine_tab_helper.mm ios/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.mm -ios/chrome/browser/signin/authentication_service.h ios/chrome/browser/signin/gaia_auth_fetcher_ios_unittest.mm ios/chrome/browser/ssl/ios_ssl_error_handler_unittest.mm ios/chrome/browser/u2f/u2f_controller.mm @@ -3016,7 +3042,9 @@ ios/chrome/browser/ui/authentication/signin/add_account_signin/add_account_signi ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/advanced_settings_signin_mediator_unittest.mm ios/chrome/browser/ui/authentication/signin/user_signin/user_signin_mediator_unittest.mm ios/chrome/browser/ui/authentication/signin_earl_grey_app_interface.mm +ios/chrome/browser/ui/authentication/signout_action_sheet_coordinator_unittest.mm ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/identity_chooser_coordinator_unittest.mm +ios/chrome/browser/ui/authentication/unified_consent/unified_consent_mediator_unittest.mm ios/chrome/browser/ui/autofill/manual_fill/form_observer_helper_unittest.mm ios/chrome/browser/ui/autofill/save_card_infobar_egtest.mm ios/chrome/browser/ui/bookmarks/bookmark_earl_grey.mm @@ -3025,8 +3053,8 @@ ios/chrome/browser/ui/bookmarks/bookmarks_egtest.mm ios/chrome/browser/ui/browser_container/browser_container_coordinator_unittest.mm ios/chrome/browser/ui/browser_view/browser_view_controller_helper_unittest.mm ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_item_unittest.mm -ios/chrome/browser/ui/content_suggestions/content_suggestions_app_interface.mm ios/chrome/browser/ui/content_suggestions/content_suggestions_egtest.mm +ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interface.mm ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm ios/chrome/browser/ui/content_suggestions/ntp_home_mediator_unittest.mm ios/chrome/browser/ui/dialogs/nsurl_protection_space_util_unittest.mm @@ -3045,10 +3073,12 @@ ios/chrome/browser/ui/reading_list/reading_list_mediator_unittest.mm ios/chrome/browser/ui/settings/cells/search_engine_item.h ios/chrome/browser/ui/settings/cells/search_engine_item_unittest.mm ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_egtest.mm +ios/chrome/browser/ui/settings/google_services/manage_sync_settings_mediator_unittest.mm ios/chrome/browser/ui/settings/import_data_table_view_controller_unittest.mm ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller_unittest.mm ios/chrome/browser/ui/settings/password/password_exporter_unittest.mm ios/chrome/browser/ui/settings/password/password_issues_table_view_controller_unittest.mm +ios/chrome/browser/ui/settings/password/passwords_mediator_unittest.mm ios/chrome/browser/ui/settings/password/passwords_table_view_controller_unittest.mm ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm ios/chrome/browser/ui/settings/settings_app_interface.mm @@ -3107,11 +3137,14 @@ ios/web/navigation/history_state_operations_inttest.mm ios/web/navigation/navigation_manager_impl.mm ios/web/navigation/navigation_manager_util_unittest.mm ios/web/net/cookies/crw_wk_http_cookie_store_unittest.mm +ios/web/public/init/web_main_parts.h +ios/web/public/navigation/navigation_manager.h ios/web/shell/test/earl_grey/shell_earl_grey.h -ios/web/text_fragments/crw_text_fragments_handler_unittest.mm +ios/web/text_fragments/text_fragments_manager_impl_unittest.mm ios/web/web_state/js/resources/base.js ios/web/web_state/js/resources/plugin_placeholder.js ios/web/web_state/ui/crw_web_controller_unittest.mm +ios/web/web_state/ui/wk_content_rule_list_util.mm ios/web/web_state/web_state_context_menu_bridge_unittest.mm ios/web/web_state/web_state_unittest.mm ios/web/web_view/wk_security_origin_util_unittest.mm @@ -3132,6 +3165,7 @@ ios/web_view/public/cwv_identity.h ios/web_view/public/cwv_translation_language.h ios/web_view/public/cwv_web_view.h ipc/ipc_channel.h +ipc/ipc_message.cc jingle/notifier/base/gaia_token_pre_xmpp_auth.cc jingle/notifier/base/notifier_options_util.cc jingle/notifier/communicator/single_login_attempt.cc @@ -3155,7 +3189,7 @@ media/base/status.h media/base/test_random.h media/base/video_codecs.h media/base/win/dxgi_device_manager.cc -media/base/win/mf_cdm_proxy.h +media/base/win/media_foundation_cdm_proxy.h media/base/win/mf_helpers.h media/base/win/mf_initializer.cc media/capture/content/smooth_event_sampler_unittest.cc @@ -3176,7 +3210,7 @@ media/filters/decrypting_audio_decoder.h media/filters/decrypting_video_decoder.h media/filters/source_buffer_stream_unittest.cc media/filters/video_cadence_estimator.h -media/fuchsia/common/sysmem_buffer_writer_queue.cc +media/fuchsia/common/vmo_buffer_writer_queue.cc media/gpu/android/android_video_encode_accelerator.h media/gpu/chromeos/libyuv_image_processor_backend.cc media/gpu/test/video_encoder/video_encoder_test_environment.cc @@ -3370,6 +3404,8 @@ native_client/toolchain_revisions/nacl_x86_newlib_raw.json native_client/toolchain_revisions/pnacl_newlib.json native_client/toolchain_revisions/pnacl_newlib_raw.json native_client/toolchain_revisions/pnacl_translator.json +native_client/toolchain_revisions/saigo_newlib.json +native_client/toolchain_revisions/saigo_newlib_raw.json native_client/tools/Makefile native_client/tools/code_hygiene.py native_client/tools/command_tester.py @@ -3710,6 +3746,7 @@ net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp net/third_party/mozilla_security_manager/nsPKCS12Blob.h net/third_party/nss/ssl/cmpcert.cc net/third_party/nss/ssl/cmpcert.h +net/third_party/quiche/src/http2/core/priority_write_scheduler.h net/third_party/quiche/src/quic/core/crypto/crypto_utils.cc net/third_party/quiche/src/quic/core/crypto/quic_crypto_client_config.h net/third_party/quiche/src/quic/core/crypto/quic_crypto_client_config_test.cc @@ -3730,10 +3767,8 @@ net/third_party/quiche/src/quic/platform/api/quic_hostname_utils_test.cc net/third_party/quiche/src/quic/tools/quic_client_bin.cc net/third_party/quiche/src/quic/tools/quic_memory_cache_backend.cc net/third_party/quiche/src/quic/tools/quic_memory_cache_backend_test.cc -net/third_party/quiche/src/quic/tools/quic_simple_server_session_test.cc net/third_party/quiche/src/quic/tools/quic_simple_server_stream_test.cc net/third_party/quiche/src/quic/tools/quic_toy_client.cc -net/third_party/quiche/src/spdy/core/priority_write_scheduler.h net/third_party/quiche/src/spdy/core/spdy_protocol.h net/tools/print_certificates.py net/tools/quic/quic_http_proxy_backend_test.cc @@ -3923,6 +3958,7 @@ services/network/public/cpp/cross_origin_read_blocking_unittest.cc services/network/public/cpp/features.cc services/network/public/cpp/is_potentially_trustworthy.cc services/network/public/cpp/network_switches.cc +services/network/sct_auditing/sct_auditing_cache.cc services/network/trust_tokens/trust_token_client_data_canonicalization.h services/network/trust_tokens/trust_token_key_commitment_parser.h services/network/trust_tokens/trust_token_key_commitments.h @@ -4010,6 +4046,7 @@ third_party/Python-Markdown/markdown/extensions/smarty.py third_party/abseil-cpp/absl/abseil.podspec.gen.py third_party/abseil-cpp/absl/base/config.h third_party/abseil-cpp/absl/base/internal/direct_mmap.h +third_party/abseil-cpp/absl/base/internal/sysinfo.cc third_party/abseil-cpp/absl/base/internal/sysinfo_test.cc third_party/abseil-cpp/absl/hash/internal/city.h third_party/abseil-cpp/absl/random/internal/platform.h @@ -4178,6 +4215,7 @@ third_party/angle/extensions/EGL_ANGLE_flexible_surface_compatibility.txt third_party/angle/extensions/EGL_ANGLE_ggp_stream_descriptor.txt third_party/angle/extensions/EGL_ANGLE_iosurface_client_buffer.txt third_party/angle/extensions/EGL_ANGLE_keyed_mutex.txt +third_party/angle/extensions/EGL_ANGLE_metal_texture_client_buffer.txt third_party/angle/extensions/EGL_ANGLE_platform_angle_d3d_luid.txt third_party/angle/extensions/EGL_ANGLE_power_preference.txt third_party/angle/extensions/EGL_ANGLE_program_cache_control.txt @@ -4193,7 +4231,11 @@ third_party/angle/extensions/EGL_EXT_device_query.txt third_party/angle/include/CL/cl_platform.h third_party/angle/include/GLSLANG/ShaderVars.h third_party/angle/include/platform/FeaturesVk.h -third_party/angle/infra/gn_isolate_map.pyl +third_party/angle/infra/specs/PRESUBMIT.py +third_party/angle/infra/specs/gn_isolate_map.pyl +third_party/angle/samples/torus_lighting/TorusLightingES1.cpp +third_party/angle/samples/torus_lighting/TorusLightingES2.cpp +third_party/angle/samples/torus_lighting/torus.h third_party/angle/scripts/bootstrap.py third_party/angle/scripts/export_targets.py third_party/angle/scripts/generate_stats.py @@ -4244,6 +4286,7 @@ third_party/angle/src/libANGLE/renderer/vulkan/UtilsVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/ffx_a.h third_party/angle/src/libANGLE/renderer/vulkan/vk_cache_utils.h +third_party/angle/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp third_party/angle/src/libANGLE/renderer/vulkan/vk_format_utils.h third_party/angle/src/libANGLE/validationEGL.cpp third_party/angle/src/libANGLE/validationES.cpp @@ -4293,7 +4336,12 @@ third_party/angle/third_party/libjpeg.gni third_party/angle/third_party/rapidjson/src/bin/data/readme.txt third_party/angle/third_party/rapidjson/src/include/rapidjson/document.h third_party/angle/third_party/rapidjson/src/test/unittest/valuetest.cpp +third_party/angle/tools/perf/core/results_dashboard.py +third_party/angle/tools/perf/core/results_merger.py +third_party/angle/tools/perf/generate_legacy_perf_dashboard_json.py +third_party/angle/tools/perf/process_perf_results.py third_party/angle/util/android/AndroidWindow.cpp +third_party/angle/util/frame_capture_test_utils.h third_party/angle/util/windows/third_party/StackWalker/src/StackWalker.cpp third_party/apple_apsl/cssmapplePriv.h third_party/ashmem/ashmem-dev.c @@ -4325,6 +4373,7 @@ third_party/blink/perf_tests/owp_storage/resources/idb-load-docs-runner.html third_party/blink/perf_tests/owp_storage/resources/idb-load-docs-shared.js third_party/blink/perf_tests/parser/css-parser-yui.html third_party/blink/perf_tests/parser/resources/html5.html +third_party/blink/perf_tests/sanitizer-api/resources/chrome_code_search.txt third_party/blink/perf_tests/speedometer/resources/flightjs-example-app/app/data.js third_party/blink/perf_tests/speedometer/resources/flightjs-example-app/components/es5-shim/component.json third_party/blink/perf_tests/speedometer/resources/flightjs-example-app/components/es5-shim/es5-sham.js @@ -4390,6 +4439,7 @@ third_party/blink/perf_tests/speedometer/resources/todomvc/vanilla-examples/vani third_party/blink/perf_tests/sun_spider/tests/sunspider-0.9.1/string-base64.js third_party/blink/perf_tests/sun_spider/tests/sunspider-0.9/string-base64.js third_party/blink/perf_tests/sun_spider/tests/sunspider-1.0/string-base64.js +third_party/blink/public/common/custom_handlers/protocol_handler_utils.h third_party/blink/public/common/frame/payment_request_token.h third_party/blink/public/common/frame/user_activation_state.h third_party/blink/public/common/input/web_keyboard_event.h @@ -4645,6 +4695,7 @@ third_party/blink/renderer/core/html/html_table_section_element.idl third_party/blink/renderer/core/html/media/autoplay_policy.cc third_party/blink/renderer/core/html/media/html_media_element.cc third_party/blink/renderer/core/html/portal/html_portal_element.cc +third_party/blink/renderer/core/html/subresource_redirect_test.cc third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/inspector/devtools_session.h third_party/blink/renderer/core/intersection_observer/intersection_observer_controller.h @@ -4687,6 +4738,7 @@ third_party/blink/renderer/core/layout/ng/inline/ng_inline_items_builder.h third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.h third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping_builder.h third_party/blink/renderer/core/layout/ng/ng_block_node.cc +third_party/blink/renderer/core/layout/ng/ng_length_utils.cc third_party/blink/renderer/core/layout/scroll_anchor_test.cc third_party/blink/renderer/core/layout/svg/layout_svg_path.cc third_party/blink/renderer/core/layout/svg/layout_svg_shape.cc @@ -4709,6 +4761,7 @@ third_party/blink/renderer/core/loader/resource/script_resource.h third_party/blink/renderer/core/loader/resource/xsl_style_sheet_resource.cc third_party/blink/renderer/core/loader/resource/xsl_style_sheet_resource.h third_party/blink/renderer/core/loader/subresource_filter.cc +third_party/blink/renderer/core/loader/subresource_redirect_util.cc third_party/blink/renderer/core/page/print_context_test.cc third_party/blink/renderer/core/page/scrolling/element_fragment_anchor_test.cc third_party/blink/renderer/core/page/scrolling/scroll_state.idl @@ -4797,8 +4850,10 @@ third_party/blink/renderer/core/xml/xslt_processor.idl third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc third_party/blink/renderer/modules/accessibility/ax_layout_object.cc third_party/blink/renderer/modules/accessibility/ax_object.cc +third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc third_party/blink/renderer/modules/bluetooth/bluetooth_error.cc +third_party/blink/renderer/modules/canvas/canvas2d/canvas_filter_operation_resolver.cc third_party/blink/renderer/modules/clipboard/clipboard_promise.cc third_party/blink/renderer/modules/credentialmanager/credentials_container.cc third_party/blink/renderer/modules/crypto/crypto_histograms.h @@ -4816,6 +4871,7 @@ third_party/blink/renderer/modules/geolocation/geolocation.h third_party/blink/renderer/modules/indexeddb/idb_value_wrapping.cc third_party/blink/renderer/modules/manifest/fuzzer_seed_corpus/play_app_url_manifest.json third_party/blink/renderer/modules/media_capabilities/media_capabilities.cc +third_party/blink/renderer/modules/mediastream/media_devices_test.cc third_party/blink/renderer/modules/mediastream/media_stream_video_renderer_sink.h third_party/blink/renderer/modules/payments/android_pay_method_data.idl third_party/blink/renderer/modules/payments/on_payment_response_test.cc @@ -4837,6 +4893,8 @@ third_party/blink/renderer/modules/scheduler/task_signal.idl third_party/blink/renderer/modules/scheduler/window_scheduler.idl third_party/blink/renderer/modules/service_worker/service_worker_content_settings_proxy.cc third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc +third_party/blink/renderer/modules/storage/cached_storage_area.h +third_party/blink/renderer/modules/storage/storage_area.cc third_party/blink/renderer/modules/vibration/navigator_vibration.idl third_party/blink/renderer/modules/vibration/vibration_controller.cc third_party/blink/renderer/modules/webaudio/audio_context.cc @@ -4848,11 +4906,12 @@ third_party/blink/renderer/modules/webgpu/gpu_swap_chain.cc third_party/blink/renderer/modules/webmidi/navigator_web_midi.cc third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc third_party/blink/renderer/modules/websockets/websocket_stream.h -third_party/blink/renderer/modules/webtransport/quic_transport_test.cc +third_party/blink/renderer/modules/webtransport/web_transport_test.cc third_party/blink/renderer/modules/xr/xr_session.h third_party/blink/renderer/modules/xr/xr_system.cc third_party/blink/renderer/platform/PRESUBMIT.py third_party/blink/renderer/platform/animation/timing_function.h +third_party/blink/renderer/platform/bindings/parkable_string.cc third_party/blink/renderer/platform/exported/web_crypto_algorithm.cc third_party/blink/renderer/platform/fonts/bitmap_glyphs_block_list.cc third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc @@ -5204,6 +5263,8 @@ third_party/catapult/dashboard/dashboard/pinpoint/models/job.py third_party/catapult/dashboard/dashboard/pinpoint/models/job_test.py third_party/catapult/dashboard/dashboard/pinpoint/models/quest/find_isolate_test.py third_party/catapult/dashboard/dashboard/pinpoint/models/quest/run_telemetry_test.py +third_party/catapult/dashboard/dashboard/pinpoint/models/quest/run_test.py +third_party/catapult/dashboard/dashboard/pinpoint/models/quest/run_test_test.py third_party/catapult/dashboard/dashboard/pinpoint/models/results2.py third_party/catapult/dashboard/dashboard/pinpoint/models/results2_test.py third_party/catapult/dashboard/dashboard/pinpoint/test.py @@ -6188,6 +6249,7 @@ third_party/catapult/tracing/tracing/ui/extras/chrome/codesearch.html third_party/catapult/tracing/tracing/ui/extras/drive/comments_side_panel_test.html third_party/catapult/tracing/tracing/ui/extras/drive/index.html third_party/catapult/tracing/tracing/ui/extras/v8/runtime_call_stats_table.html +third_party/catapult/tracing/tracing/ui/timeline_view.html third_party/catapult/tracing/tracing/value/chart_json_converter_test.html third_party/catapult/tracing/tracing/value/histogram.py third_party/catapult/tracing/tracing/value/histogram_importer.html @@ -6301,6 +6363,7 @@ third_party/crashpad/crashpad/snapshot/win/pe_image_reader.cc third_party/crashpad/crashpad/snapshot/win/pe_image_resource_reader.cc third_party/crashpad/crashpad/snapshot/win/process_reader_win.cc third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc +third_party/crashpad/crashpad/third_party/googletest/BUILD.gn third_party/crashpad/crashpad/third_party/zlib/BUILD.gn third_party/crashpad/crashpad/tools/generate_dump.cc third_party/crashpad/crashpad/util/file/file_io.h @@ -6342,7 +6405,6 @@ third_party/dawn/src/dawn_native/Adapter.cpp third_party/dawn/src/dawn_native/BUILD.gn third_party/dawn/src/dawn_native/CommandAllocator.cpp third_party/dawn/src/dawn_native/CommandAllocator.h -third_party/dawn/src/dawn_native/CommandValidation.cpp third_party/dawn/src/dawn_native/Device.cpp third_party/dawn/src/dawn_native/Extensions.cpp third_party/dawn/src/dawn_native/Format.cpp @@ -6352,7 +6414,6 @@ third_party/dawn/src/dawn_native/Sampler.h third_party/dawn/src/dawn_native/ShaderModule.cpp third_party/dawn/src/dawn_native/Subresource.cpp third_party/dawn/src/dawn_native/SubresourceStorage.h -third_party/dawn/src/dawn_native/Surface.cpp third_party/dawn/src/dawn_native/SwapChain.cpp third_party/dawn/src/dawn_native/Texture.cpp third_party/dawn/src/dawn_native/Texture.h @@ -6365,6 +6426,7 @@ third_party/dawn/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.cpp third_party/dawn/src/dawn_native/d3d12/ResourceAllocatorManagerD3D12.h third_party/dawn/src/dawn_native/d3d12/SamplerD3D12.cpp third_party/dawn/src/dawn_native/d3d12/ShaderModuleD3D12.cpp +third_party/dawn/src/dawn_native/d3d12/SwapChainD3D12.cpp third_party/dawn/src/dawn_native/d3d12/TextureD3D12.cpp third_party/dawn/src/dawn_native/dawn_platform.h third_party/dawn/src/dawn_native/metal/BufferMTL.mm @@ -6403,14 +6465,23 @@ third_party/dawn/src/tests/end2end/TextureViewTests.cpp third_party/dawn/src/tests/end2end/VertexFormatTests.cpp third_party/dawn/src/tests/end2end/VertexStateTests.cpp third_party/dawn/src/tests/perf_tests/DawnPerfTestPlatform.h +third_party/dawn/src/tests/perf_tests/ShaderRobustnessPerf.cpp third_party/dawn/src/tests/unittests/validation/ComputeValidationTests.cpp third_party/dawn/src/tests/unittests/validation/CopyCommandsValidationTests.cpp third_party/dawn/src/tests/unittests/validation/RenderPassDescriptorValidationTests.cpp third_party/dawn/src/tests/unittests/validation/ValidationTest.cpp +third_party/dawn/src/tests/unittests/validation/VertexBufferValidationTests.cpp third_party/dawn/src/tests/white_box/VulkanImageWrappingTestsDmaBuf.cpp third_party/dawn/src/utils/TerribleCommandBuffer.cpp third_party/dawn/src/utils/TestUtils.cpp third_party/dawn/src/utils/WindowsDebugLogger.cpp +third_party/dawn/third_party/tint/.vscode/tasks.json +third_party/dawn/third_party/tint/PRESUBMIT.py +third_party/dawn/third_party/tint/src/reader/spirv/function.cc +third_party/dawn/third_party/tint/src/reader/spirv/function_cfg_test.cc +third_party/dawn/third_party/tint/src/reader/spirv/parser_impl.cc +third_party/dawn/third_party/tint/src/writer/hlsl/generator_impl.cc +third_party/dawn/third_party/tint/src/writer/msl/generator_impl.cc third_party/depot_tools/PRESUBMIT.py third_party/depot_tools/auth.py third_party/depot_tools/autoninja.py @@ -6743,6 +6814,7 @@ third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json +third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/with_experiments.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.py third_party/depot_tools/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -6831,18 +6903,12 @@ third_party/depot_tools/watchlists.py third_party/depot_tools/win32imports.py third_party/depot_tools/win_toolchain/get_toolchain_if_necessary.py third_party/devtools-frontend/src/PRESUBMIT.py +third_party/devtools-frontend/src/front_end/core/i18n/locales/de.json third_party/devtools-frontend/src/front_end/core/i18n/locales/en-US.json -third_party/devtools-frontend/src/front_end/core/sdk/CSSMetadata.js -third_party/devtools-frontend/src/front_end/core/sdk/Cookie.js -third_party/devtools-frontend/src/front_end/core/sdk/NetworkLog.js -third_party/devtools-frontend/src/front_end/core/sdk/NetworkManager.js -third_party/devtools-frontend/src/front_end/dagre_layout/dagre.js +third_party/devtools-frontend/src/front_end/core/i18n/locales/zh.json third_party/devtools-frontend/src/front_end/devtools_compatibility.js third_party/devtools-frontend/src/front_end/entrypoint_template.html -third_party/devtools-frontend/src/front_end/inspector_main/RenderingOptions.js third_party/devtools-frontend/src/front_end/integration_test_runner.html -third_party/devtools-frontend/src/front_end/panels/emulation/DeviceModeToolbar.js -third_party/devtools-frontend/src/front_end/theme_support/theme_support_impl.js third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/package.json third_party/devtools-frontend/src/front_end/third_party/acorn/package/dist/acorn.js third_party/devtools-frontend/src/front_end/third_party/acorn/package/package.json @@ -6855,7 +6921,6 @@ third_party/devtools-frontend/src/front_end/third_party/codemirror/package/mode/ third_party/devtools-frontend/src/front_end/third_party/codemirror/package/package.json third_party/devtools-frontend/src/front_end/third_party/codemirror/package/src/measurement/position_measurement.js third_party/devtools-frontend/src/front_end/third_party/codemirror/package/theme/mdn-like.css -third_party/devtools-frontend/src/front_end/third_party/fabricjs/fabric.js third_party/devtools-frontend/src/front_end/third_party/i18n/i18n-bundle.js third_party/devtools-frontend/src/front_end/third_party/i18n/lib/i18n.js third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/package.json @@ -6909,7 +6974,11 @@ third_party/devtools-frontend/src/front_end/third_party/lighthouse/locales/zh-HK third_party/devtools-frontend/src/front_end/third_party/lighthouse/locales/zh-TW.json third_party/devtools-frontend/src/front_end/third_party/lighthouse/locales/zh.json third_party/devtools-frontend/src/front_end/third_party/lighthouse/report-assets/report-generator.js +third_party/devtools-frontend/src/front_end/third_party/lighthouse/report-assets/report.css third_party/devtools-frontend/src/front_end/third_party/lighthouse/report-assets/report.js +third_party/devtools-frontend/src/front_end/third_party/lit-html/package/development/directives/async-append.js +third_party/devtools-frontend/src/front_end/third_party/lit-html/package/development/directives/async-replace.js +third_party/devtools-frontend/src/front_end/third_party/lit-html/package/development/directives/style-map.js third_party/devtools-frontend/src/front_end/third_party/lit-html/package/lib/template.js third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/package.json third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/Connection.js @@ -6945,10 +7014,7 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/es third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/Puppeteer.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/install.js third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/package.json -third_party/devtools-frontend/src/front_end/ui/legacy/SearchableView.js -third_party/devtools-frontend/src/front_end/ui/legacy/UIUtils.js third_party/devtools-frontend/src/front_end/ui/legacy/themeColors.css -third_party/devtools-frontend/src/front_end/ui/legacy/utils/append-style.js third_party/devtools-frontend/src/node_modules/@babel/code-frame/package.json third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/dist/source-map.debug.js third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/dist/source-map.js @@ -7147,7 +7213,6 @@ third_party/devtools-frontend/src/node_modules/find-up/package.json third_party/devtools-frontend/src/node_modules/flat/package.json third_party/devtools-frontend/src/node_modules/follow-redirects/package.json third_party/devtools-frontend/src/node_modules/fs-extra/package.json -third_party/devtools-frontend/src/node_modules/fsevents/package.json third_party/devtools-frontend/src/node_modules/function-bind/package.json third_party/devtools-frontend/src/node_modules/gensync/package.json third_party/devtools-frontend/src/node_modules/get-intrinsic/package.json @@ -7173,7 +7238,6 @@ third_party/devtools-frontend/src/node_modules/imurmurhash/imurmurhash.js third_party/devtools-frontend/src/node_modules/imurmurhash/imurmurhash.min.js third_party/devtools-frontend/src/node_modules/imurmurhash/package.json third_party/devtools-frontend/src/node_modules/indent-string/package.json -third_party/devtools-frontend/src/node_modules/indexes-of/package.json third_party/devtools-frontend/src/node_modules/is-alphabetical/package.json third_party/devtools-frontend/src/node_modules/is-alphanumerical/package.json third_party/devtools-frontend/src/node_modules/is-binary-path/package.json @@ -7188,6 +7252,7 @@ third_party/devtools-frontend/src/node_modules/is-regexp/package.json third_party/devtools-frontend/src/node_modules/is-string/package.json third_party/devtools-frontend/src/node_modules/is-symbol/package.json third_party/devtools-frontend/src/node_modules/is-typedarray/package.json +third_party/devtools-frontend/src/node_modules/is-unicode-supported/package.json third_party/devtools-frontend/src/node_modules/isbinaryfile/package.json third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/has-flag/package.json third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/package.json @@ -7211,7 +7276,9 @@ third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debu third_party/devtools-frontend/src/node_modules/license-checker/package.json third_party/devtools-frontend/src/node_modules/load-json-file/package.json third_party/devtools-frontend/src/node_modules/locate-path/package.json +third_party/devtools-frontend/src/node_modules/lodash.clonedeep/package.json third_party/devtools-frontend/src/node_modules/lodash.get/package.json +third_party/devtools-frontend/src/node_modules/lodash.truncate/package.json third_party/devtools-frontend/src/node_modules/lodash/_compareMultiple.js third_party/devtools-frontend/src/node_modules/lodash/_setData.js third_party/devtools-frontend/src/node_modules/lodash/lodash.js @@ -7412,6 +7479,7 @@ third_party/devtools-frontend/src/node_modules/strip-bom/package.json third_party/devtools-frontend/src/node_modules/strip-indent/package.json third_party/devtools-frontend/src/node_modules/strip-json-comments/package.json third_party/devtools-frontend/src/node_modules/stylelint/lib/reference/keywordSets.js +third_party/devtools-frontend/src/node_modules/stylelint/lib/utils/isNonNegativeInteger.js third_party/devtools-frontend/src/node_modules/stylelint/lib/utils/isStandardSyntaxValue.js third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/package.json @@ -7419,6 +7487,7 @@ third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-conv third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/package.json +third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/package.json @@ -9099,6 +9168,7 @@ third_party/harfbuzz-ng/src/src/hb.hh third_party/harfbuzz-ng/src/test/api/hb-test.h third_party/harfbuzz-ng/src/test/api/test-draw.c third_party/harfbuzz-ng/src/test/api/test-ot-tag.c +third_party/highway/src/hwy/ops/wasm_128-inl.h third_party/hunspell/src/hunspell/affentry.cxx third_party/hunspell/src/hunspell/affentry.hxx third_party/hunspell/src/hunspell/affixmgr.cxx @@ -9209,7 +9279,6 @@ third_party/libaom/BUILD.gn third_party/libaom/source/libaom/aom_ports/msvc.h third_party/libaom/source/libaom/aom_util/aom_thread.c third_party/libaom/source/libaom/aom_util/aom_thread.h -third_party/libaom/source/libaom/av1/av1_cx_iface.c third_party/libaom/source/libaom/av1/common/av1_common_int.h third_party/libaom/source/libaom/av1/common/x86/av1_inv_txfm_ssse3.c third_party/libaom/source/libaom/av1/encoder/bitstream.c @@ -9247,6 +9316,7 @@ third_party/libaom/source/libaom/tools/inspect-cli.js third_party/libaom/source/libaom/tools/intersect-diffs.py third_party/libaom/source/libaom/tools/wrap-commit-msg.py third_party/libavif/src/src/codec_aom.c +third_party/libavif/src/src/reformat_libyuv.c third_party/libdrm/src/android/gralloc_handle.h third_party/libdrm/src/etnaviv/etnaviv_bo.c third_party/libdrm/src/etnaviv/etnaviv_bo_cache.c @@ -9525,7 +9595,7 @@ third_party/llvm/clang/www/analyzer/open_projects.html third_party/llvm/clang/www/analyzer/potential_checkers.html third_party/llvm/clang/www/related.html third_party/llvm/compiler-rt/CODE_OWNERS.TXT -third_party/llvm/compiler-rt/lib/asan/asan_blacklist.txt +third_party/llvm/compiler-rt/lib/asan/asan_ignorelist.txt third_party/llvm/compiler-rt/lib/asan/asan_malloc_win.cpp third_party/llvm/compiler-rt/lib/asan/asan_win.cpp third_party/llvm/compiler-rt/lib/fuzzer/FuzzerSHA1.cpp @@ -9576,7 +9646,7 @@ third_party/llvm/compiler-rt/test/asan/TestCases/Windows/operator_array_new_with third_party/llvm/compiler-rt/test/asan/TestCases/Windows/seh.cpp third_party/llvm/compiler-rt/test/asan/TestCases/atexit_stats.cpp third_party/llvm/compiler-rt/test/asan/TestCases/contiguous_container.cpp -third_party/llvm/compiler-rt/test/asan/TestCases/default_blacklist.cpp +third_party/llvm/compiler-rt/test/asan/TestCases/default_ignorelist.cpp third_party/llvm/compiler-rt/test/asan/TestCases/heap-overflow-large.cpp third_party/llvm/compiler-rt/test/asan/TestCases/initialization-bug.cpp third_party/llvm/compiler-rt/test/asan/TestCases/log-path_test.cpp @@ -9592,6 +9662,7 @@ third_party/llvm/compiler-rt/test/sanitizer_common/TestCases/Linux/allow_user_se third_party/llvm/compiler-rt/test/tsan/ignore_lib6.cpp third_party/llvm/compiler-rt/test/tsan/mmap_stress.cpp third_party/llvm/compiler-rt/test/tsan/pthread_atfork_deadlock2.c +third_party/llvm/compiler-rt/test/tsan/pthread_atfork_deadlock3.c third_party/llvm/compiler-rt/test/tsan/pthread_key.cpp third_party/llvm/compiler-rt/test/ubsan/TestCases/Misc/log-path_test.cpp third_party/llvm/debuginfo-tests/dexter/dex/debugger/visualstudio/VisualStudio.py @@ -9682,55 +9753,12 @@ third_party/llvm/llvm/utils/gn/build/toolchain/compiler.gni third_party/llvm/llvm/utils/gn/get.py third_party/llvm/llvm/utils/gn/gn.py third_party/llvm/llvm/utils/lit/lit/TestRunner.py -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-actions.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-cardinalities.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-matchers.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-nice-strict.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-more-actions.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-more-matchers.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/gmock.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h -third_party/llvm/llvm/utils/unittest/googlemock/include/gmock/internal/gmock-port.h -third_party/llvm/llvm/utils/unittest/googlemock/src/gmock-all.cc -third_party/llvm/llvm/utils/unittest/googlemock/src/gmock-cardinalities.cc -third_party/llvm/llvm/utils/unittest/googlemock/src/gmock-internal-utils.cc -third_party/llvm/llvm/utils/unittest/googlemock/src/gmock-matchers.cc -third_party/llvm/llvm/utils/unittest/googlemock/src/gmock-spec-builders.cc -third_party/llvm/llvm/utils/unittest/googlemock/src/gmock.cc -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-death-test.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-message.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-printers.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-spi.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-test-part.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/gtest.h third_party/llvm/llvm/utils/unittest/googletest/include/gtest/gtest_pred_impl.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/gtest_prod.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-filepath.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util-generated.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h third_party/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-string.h -third_party/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-tuple.h third_party/llvm/llvm/utils/unittest/googletest/include/gtest/internal/gtest-type-util.h -third_party/llvm/llvm/utils/unittest/googletest/src/gtest-all.cc third_party/llvm/llvm/utils/unittest/googletest/src/gtest-death-test.cc -third_party/llvm/llvm/utils/unittest/googletest/src/gtest-filepath.cc -third_party/llvm/llvm/utils/unittest/googletest/src/gtest-internal-inl.h -third_party/llvm/llvm/utils/unittest/googletest/src/gtest-port.cc -third_party/llvm/llvm/utils/unittest/googletest/src/gtest-printers.cc -third_party/llvm/llvm/utils/unittest/googletest/src/gtest-test-part.cc -third_party/llvm/llvm/utils/unittest/googletest/src/gtest-typed-test.cc third_party/llvm/llvm/utils/unittest/googletest/src/gtest.cc +third_party/llvm/mlir/utils/vscode/.vscode/launch.json third_party/llvm/openmp/CREDITS.txt third_party/llvm/openmp/runtime/src/kmp_i18n.cpp third_party/llvm/openmp/runtime/src/z_Windows_NT_util.cpp @@ -9748,6 +9776,14 @@ third_party/lottie/lottie_worker.js third_party/mako/doc/_static/doctools.js third_party/mako/doc/_static/jquery-3.5.1.js third_party/mako/test/templates/internationalization.html +third_party/material_web_components/components-chromium/node_modules/@material/dom/dist/mdc.dom.js +third_party/material_web_components/components-chromium/node_modules/@material/dom/events.js +third_party/material_web_components/components-chromium/node_modules/@material/dom/ponyfill.js +third_party/material_web_components/components-chromium/node_modules/@material/ripple/dist/mdc.ripple.js +third_party/material_web_components/components-chromium/node_modules/@material/ripple/foundation.js +third_party/material_web_components/components-chromium/node_modules/lit-element/lib/decorators.js +third_party/material_web_components/components-chromium/node_modules/lit-html/lib/template.js +third_party/material_web_components/package.json third_party/metrics_proto/PRESUBMIT.py third_party/minigbm/src/common.mk third_party/minigbm/src/gbm.h @@ -10111,6 +10147,10 @@ third_party/openscreen/src/cast/common/certificate/cast_cert_validator_internal. third_party/openscreen/src/cast/common/discovery/e2e_test/tests.cc third_party/openscreen/src/cast/standalone_sender/receiver_chooser.cc third_party/openscreen/src/cast/standalone_sender/streaming_vp8_encoder.h +third_party/openscreen/src/cast/streaming/constants.h +third_party/openscreen/src/cast/streaming/receiver_message.h +third_party/openscreen/src/cast/streaming/receiver_session.cc +third_party/openscreen/src/cast/streaming/receiver_session.h third_party/openscreen/src/cast/streaming/remoting_capabilities.h third_party/openscreen/src/cast/streaming/rtp_defines.h third_party/openscreen/src/cast/streaming/sender_session.h @@ -10121,6 +10161,7 @@ third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph.h third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance.h third_party/openscreen/src/platform/base/udp_packet.cc third_party/openscreen/src/platform/impl/tls_connection_posix.cc +third_party/openscreen/src/test/test_main.cc third_party/openscreen/src/testing/libfuzzer/BUILD.gn third_party/openscreen/src/third_party/mozilla/LICENSE.txt third_party/openscreen/src/third_party/mozilla/url_parse.cc @@ -11024,6 +11065,7 @@ third_party/s2cellid/src/s2/s2point.h third_party/shaderc/src/libshaderc_util/include/libshaderc_util/universal_unistd.h third_party/shell-encryption/BUILD.gn third_party/simplejson/ordered_dict.py +third_party/skia/BUILD.gn third_party/skia/PRESUBMIT.py third_party/skia/RELEASE_NOTES.txt third_party/skia/bench/DashBench.cpp @@ -11057,6 +11099,7 @@ third_party/skia/gm/strokerect.cpp third_party/skia/gm/strokes.cpp third_party/skia/gm/stroketext.cpp third_party/skia/gn/skia/BUILD.gn +third_party/skia/include/core/SkSpan.h third_party/skia/include/ports/SkImageGeneratorWIC.h third_party/skia/include/ports/SkTypeface_mac.h third_party/skia/infra/bots/assets/android_ndk_darwin/create.py @@ -11067,8 +11110,6 @@ third_party/skia/infra/bots/assets/asset_utils_test.py third_party/skia/infra/bots/assets/clang_linux/create.py third_party/skia/infra/bots/assets/clang_win/create.py third_party/skia/infra/bots/assets/gcloud_linux/create.py -third_party/skia/infra/bots/assets/go/create.py -third_party/skia/infra/bots/assets/go_win/create.py third_party/skia/infra/bots/assets/procdump_win/create.py third_party/skia/infra/bots/cfg.json third_party/skia/infra/bots/check_deps.py @@ -11177,7 +11218,7 @@ third_party/skia/src/gpu/geometry/GrPathUtils.cpp third_party/skia/src/gpu/gl/GrGLCaps.cpp third_party/skia/src/gpu/gl/GrGLCaps.h third_party/skia/src/gpu/gl/GrGLGpu.cpp -third_party/skia/src/gpu/tessellate/GrStrokeTessellateShader.cpp +third_party/skia/src/gpu/tessellate/GrStrokeTessellationShaderImpl.cpp third_party/skia/src/images/SkWebpEncoder.cpp third_party/skia/src/pathops/SkOpAngle.cpp third_party/skia/src/pathops/SkPathOpsOp.cpp @@ -11546,13 +11587,6 @@ third_party/tflite/src/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint third_party/tflite/src/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatMatProductAVX2.h third_party/tflite/src/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatMatProductNEON.h third_party/tflite/src/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatVecProduct.h -third_party/tint/src/.vscode/tasks.json -third_party/tint/src/PRESUBMIT.py -third_party/tint/src/src/reader/spirv/function.cc -third_party/tint/src/src/reader/spirv/function_cfg_test.cc -third_party/tint/src/src/reader/spirv/parser_impl.cc -third_party/tint/src/src/writer/hlsl/generator_impl.cc -third_party/tint/src/src/writer/msl/generator_impl.cc third_party/tlslite/tests/tlstest.py third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp third_party/vulkan-deps/spirv-cross/src/spirv_hlsl.cpp @@ -11578,6 +11612,7 @@ third_party/vulkan-deps/vulkan-tools/src/scripts/mock_icd_generator.py third_party/vulkan-deps/vulkan-tools/src/scripts/vulkan_tools_helper_file_generator.py third_party/vulkan-deps/vulkan-tools/src/windows-runtime-installer/VulkanRT-License.txt third_party/vulkan-deps/vulkan-validation-layers/src/cmake/Copyright_cmake.txt +third_party/vulkan-deps/vulkan-validation-layers/src/layers/base_node.h third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_validation.cpp third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_validation.h third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_validation_error_enums.h @@ -12333,13 +12368,14 @@ tools/metrics/histograms/histograms_xml/browser/histograms.xml tools/metrics/histograms/histograms_xml/chrome/histograms.xml tools/metrics/histograms/histograms_xml/chromeos/histograms.xml tools/metrics/histograms/histograms_xml/cloud/histograms.xml +tools/metrics/histograms/histograms_xml/commerce/histograms.xml tools/metrics/histograms/histograms_xml/compositing/histograms.xml tools/metrics/histograms/histograms_xml/content/histograms.xml tools/metrics/histograms/histograms_xml/cookie/histograms.xml tools/metrics/histograms/histograms_xml/cras/histograms.xml tools/metrics/histograms/histograms_xml/cros/histograms.xml +tools/metrics/histograms/histograms_xml/cross_device/histograms.xml tools/metrics/histograms/histograms_xml/crostini/histograms.xml -tools/metrics/histograms/histograms_xml/crypt/histograms.xml tools/metrics/histograms/histograms_xml/cryptohome/histograms.xml tools/metrics/histograms/histograms_xml/custom_tabs/histograms.xml tools/metrics/histograms/histograms_xml/data_reduction_proxy/histograms.xml @@ -12366,7 +12402,6 @@ tools/metrics/histograms/histograms_xml/holding_space/histograms.xml tools/metrics/histograms/histograms_xml/image/histograms.xml tools/metrics/histograms/histograms_xml/input/histograms.xml tools/metrics/histograms/histograms_xml/installer/histograms.xml -tools/metrics/histograms/histograms_xml/instant/histograms.xml tools/metrics/histograms/histograms_xml/interstitial/histograms.xml tools/metrics/histograms/histograms_xml/invalidation/histograms.xml tools/metrics/histograms/histograms_xml/ios/histograms.xml @@ -12375,7 +12410,6 @@ tools/metrics/histograms/histograms_xml/login/histograms.xml tools/metrics/histograms/histograms_xml/media/histograms.xml tools/metrics/histograms/histograms_xml/memory/histograms.xml tools/metrics/histograms/histograms_xml/mobile/histograms.xml -tools/metrics/histograms/histograms_xml/multi_device/histograms.xml tools/metrics/histograms/histograms_xml/na_cl/histograms.xml tools/metrics/histograms/histograms_xml/navigation/histograms.xml tools/metrics/histograms/histograms_xml/nearby/histograms.xml @@ -12418,7 +12452,6 @@ tools/metrics/histograms/histograms_xml/settings/histograms.xml tools/metrics/histograms/histograms_xml/sharing/histograms.xml tools/metrics/histograms/histograms_xml/signin/histograms.xml tools/metrics/histograms/histograms_xml/simple/histograms.xml -tools/metrics/histograms/histograms_xml/smart/histograms.xml tools/metrics/histograms/histograms_xml/software/histograms.xml tools/metrics/histograms/histograms_xml/stability/histograms.xml tools/metrics/histograms/histograms_xml/startup/histograms.xml @@ -12950,7 +12983,7 @@ ui/base/cocoa/base_view.mm ui/base/cocoa/constrained_window/constrained_window_animation.mm ui/base/cocoa/tool_tip_base_view.mm ui/base/cocoa/underlay_opengl_hosting_window.mm -ui/base/dragdrop/os_exchange_data_provider_x11_unittest.cc +ui/base/cursor/win/win_cursor.cc ui/base/dragdrop/os_exchange_data_unittest.cc ui/base/dragdrop/os_exchange_data_win_unittest.cc ui/base/ime/PRESUBMIT.py @@ -12968,6 +13001,7 @@ ui/base/test/skia_gold_matching_algorithm.h ui/base/ui_base_features.h ui/base/win/event_creation_utils.cc ui/base/win/lock_state.cc +ui/compositor/layer_owner.cc ui/display/display_transform.cc ui/events/android/motion_event_android_unittest.cc ui/events/blink/blink_event_util.cc @@ -12992,14 +13026,12 @@ ui/file_manager/file_manager/background/js/volume_manager_unittest.m.js ui/file_manager/file_manager/common/js/files_app_entry_types.js ui/file_manager/file_manager/common/js/mock_chrome.js ui/file_manager/file_manager/common/js/util.js -ui/file_manager/file_manager/cws_widget/cws_widget_container.js ui/file_manager/file_manager/externs/chrome_cast.js ui/file_manager/file_manager/externs/chrome_file_browser_handler.js ui/file_manager/file_manager/externs/volume_info.js ui/file_manager/file_manager/foreground/elements/icons.html ui/file_manager/file_manager/foreground/js/file_manager_commands.js ui/file_manager/file_manager/foreground/js/ui/file_tap_handler.js -ui/file_manager/file_manager/foreground/js/web_store_utils.js ui/file_manager/file_manager/manifest.json ui/file_manager/gallery/manifest.json ui/file_manager/image_loader/piex/Makefile @@ -13030,6 +13062,7 @@ ui/latency/latency_info.h ui/native_theme/native_theme_win.h ui/ozone/ozone.gni ui/ozone/platform/wayland/host/shell_popup_wrapper.cc +ui/platform_window/x11/test/os_exchange_data_provider_x11_unittest.cc ui/platform_window/x11/x11_window.cc ui/resources/PRESUBMIT.py ui/resources/resource_check/ico_files.py @@ -13109,14 +13142,13 @@ v8/src/diagnostics/unwinding-info-win64.cc v8/src/diagnostics/unwinding-info-win64.h v8/src/handles/handles.h v8/src/heap/base/asm/x64/push_registers_asm.cc +v8/src/heap/code-range.cc v8/src/heap/factory.cc -v8/src/heap/memory-allocator.cc v8/src/init/v8.cc v8/src/inspector/v8-console.h v8/src/inspector/v8-regex.cc v8/src/libplatform/tracing/recorder-win.cc v8/src/libsampler/sampler.cc -v8/src/objects/intl-objects.cc v8/src/objects/js-array-buffer.h v8/src/objects/js-number-format.cc v8/src/objects/map.h @@ -13143,11 +13175,13 @@ v8/src/wasm/baseline/arm/liftoff-assembler-arm.h v8/src/wasm/baseline/arm64/liftoff-assembler-arm64.h v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h v8/src/wasm/baseline/x64/liftoff-assembler-x64.h +v8/src/wasm/memory-protection-key.cc v8/src/wasm/module-compiler.cc v8/src/wasm/wasm-code-manager.cc v8/src/wasm/wasm-feature-flags.h v8/src/wasm/wasm-opcodes.cc v8/testing/gtest/BUILD.gn +v8/third_party/googletest/BUILD.gn v8/third_party/inspector_protocol/crdtp/cbor.cc v8/third_party/inspector_protocol/crdtp/json.cc v8/third_party/inspector_protocol/crdtp/serializer_traits_test.cc diff --git a/patches/core/chromium-upstream/fix-crash-in-ThemeService.patch b/patches/core/chromium-upstream/fix-crash-in-ThemeService.patch deleted file mode 100644 index 14628419..00000000 --- a/patches/core/chromium-upstream/fix-crash-in-ThemeService.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c2d0133f47afb59b4ce64e42215d1d053f15250a Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Tue, 13 Apr 2021 23:21:42 +0000 -Subject: [PATCH] fix crash in ThemeService - -ThemeSyncableService and ThemeService are owned by each other. On -destruction of ThemeService, ThemeSyncableService gets destructed as -well, but calls RemoveObserver of partly destructed ThemeService object. -To avoid already destructed |observers_| list, move it before -|theme_syncable_service_| definition. - -Bug: 1190561 -Change-Id: I4dc2c990d589071d97b7fa737afef54463c84751 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2821311 -Commit-Queue: Peter Kasting -Reviewed-by: Peter Kasting -Cr-Commit-Position: refs/heads/master@{#872164} ---- - ---- a/chrome/browser/themes/theme_service.h -+++ b/chrome/browser/themes/theme_service.h -@@ -299,6 +299,10 @@ class ThemeService : public KeyedService - // The number of infobars currently displayed. - int number_of_reinstallers_ = 0; - -+ // Declared before |theme_syncable_service_|, because ThemeSyncableService -+ // removes itself from the |observers_| list on destruction. -+ base::ObserverList observers_; -+ - std::unique_ptr theme_syncable_service_; - - #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -320,8 +324,6 @@ class ThemeService : public KeyedService - ScopedObserver - native_theme_observer_{this}; - -- base::ObserverList observers_; -- - base::WeakPtrFactory weak_ptr_factory_{this}; - - DISALLOW_COPY_AND_ASSIGN(ThemeService); 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 184516e1..eac91dae 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,14 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3511,8 +3511,6 @@ static_library("browser") { +@@ -2170,7 +2170,6 @@ static_library("browser") { + "//components/reputation/core:proto", + "//components/resources", + "//components/safe_browsing/content/browser", +- "//components/safe_browsing/content/browser:client_side_detection", + "//components/safe_browsing/content/password_protection", + "//components/safe_browsing/content/web_ui", + "//components/safe_browsing/core:download_file_types_proto", +@@ -3568,8 +3567,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -42,7 +50,7 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/site_isolation/prefs_observer.h" #include "chrome/browser/ssl/secure_origin_prefs_observer.h" -@@ -367,8 +366,6 @@ void BrowserProcessImpl::StartTearDown() +@@ -366,8 +365,6 @@ void BrowserProcessImpl::StartTearDown() metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -51,7 +59,7 @@ network_time_tracker_.reset(); #if BUILDFLAG(ENABLE_PLUGINS) plugins_resource_service_.reset(); -@@ -972,14 +969,6 @@ StatusTray* BrowserProcessImpl::status_t +@@ -971,14 +968,6 @@ StatusTray* BrowserProcessImpl::status_t return status_tray_.get(); } @@ -66,7 +74,7 @@ subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1229,26 +1218,6 @@ void BrowserProcessImpl::CreateBackgroun +@@ -1219,26 +1208,6 @@ void BrowserProcessImpl::CreateBackgroun #endif } @@ -123,7 +131,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/spellchecker/spellcheck_factory.h" #include "chrome/browser/spellchecker/spellcheck_service.h" -@@ -663,10 +662,6 @@ void ChromeBrowsingDataRemoverDelegate:: +@@ -665,10 +664,6 @@ void ChromeBrowsingDataRemoverDelegate:: base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -136,7 +144,7 @@ delete_begin, delete_end, filter_builder, host_content_settings_map_, --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1011,30 +1011,6 @@ void SetApplicationLocaleOnIOThread(cons +@@ -1005,30 +1005,6 @@ void SetApplicationLocaleOnIOThread(cons GetIOThreadApplicationLocale() = locale; } @@ -167,7 +175,7 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) AppLoadedInTabSource ClassifyAppLoadedInTabSource( -@@ -1462,7 +1438,6 @@ void ChromeContentBrowserClient::PostAft +@@ -1458,7 +1434,6 @@ void ChromeContentBrowserClient::PostAft InitNetworkContextsParentDirectory(); DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -175,7 +183,7 @@ } bool ChromeContentBrowserClient::IsBrowserStartupComplete() { -@@ -4196,7 +4171,7 @@ ChromeContentBrowserClient::CreateThrott +@@ -4132,7 +4107,7 @@ ChromeContentBrowserClient::CreateThrott base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent)); throttles.push_back(std::make_unique( handle, @@ -184,7 +192,7 @@ base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp), base::BindOnce( &TypedNavigationUpgradeThrottle:: -@@ -4224,9 +4199,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -4160,9 +4135,6 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -219,7 +227,7 @@ } // namespace --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -392,13 +392,6 @@ ChromeDownloadManagerDelegate::~ChromeDo +@@ -393,13 +393,6 @@ ChromeDownloadManagerDelegate::~ChromeDo void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) { download_manager_ = dm; @@ -252,7 +260,7 @@ void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -82,7 +82,7 @@ class DownloadItemModelData : public bas +@@ -85,7 +85,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. @@ -261,7 +269,7 @@ // Whether the download is currently being revived. bool is_being_revived_; -@@ -119,7 +119,7 @@ DownloadItemModelData::DownloadItemModel +@@ -122,7 +122,7 @@ DownloadItemModelData::DownloadItemModel : should_show_in_shelf_(true), was_ui_notified_(false), should_prefer_opening_in_browser_(false), @@ -269,8 +277,8 @@ + danger_level_(safe_browsing::DownloadFileType::NOT_DANGEROUS), is_being_revived_(false) {} - } // namespace -@@ -372,13 +372,13 @@ void DownloadItemModel::SetShouldPreferO + } // namespace +@@ -376,13 +376,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -287,7 +295,7 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -539,9 +539,6 @@ bool DownloadItemModel::IsCommandEnabled +@@ -547,9 +547,6 @@ bool DownloadItemModel::IsCommandEnabled // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -315,7 +323,7 @@ } } -@@ -473,10 +466,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c +@@ -480,10 +473,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension( const base::FilePath& file_name) { base::FilePath::StringType extension = file_name.Extension(); @@ -328,7 +336,7 @@ extension.erase(0, 1); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -292,13 +292,6 @@ base::FilePath DownloadTargetDeterminer: +@@ -293,13 +293,6 @@ base::FilePath DownloadTargetDeterminer: download_->GetURL(), download_->GetContentDisposition(), referrer_charset, suggested_filename, sniffed_mime_type, default_filename); @@ -342,7 +350,7 @@ // If no mime type or explicitly specified a name, don't replace file // extension. if (sniffed_mime_type.empty() || !suggested_filename.empty()) -@@ -1097,29 +1090,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1102,29 +1095,7 @@ DownloadFileType::DangerLevel DownloadTa download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; @@ -383,7 +391,7 @@ #include "chrome/browser/download/download_file_icon_extractor.h" #include "chrome/browser/download/download_open_prompt.h" #include "chrome/browser/download/download_prefs.h" -@@ -1301,9 +1300,6 @@ DownloadsAcceptDangerFunction::Downloads +@@ -1271,9 +1270,6 @@ DownloadsAcceptDangerFunction::Downloads DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} @@ -393,7 +401,7 @@ ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() { std::unique_ptr params( downloads::AcceptDanger::Params::Create(*args_)); -@@ -1341,41 +1337,7 @@ void DownloadsAcceptDangerFunction::Prom +@@ -1311,42 +1307,7 @@ void DownloadsAcceptDangerFunction::Prom return; } RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); @@ -410,7 +418,8 @@ -} - -void DownloadsAcceptDangerFunction::DangerPromptCallback( -- int download_id, DownloadDangerPrompt::Action action) { +- int download_id, +- DownloadDangerPrompt::Action action) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - DownloadItem* download_item = GetDownload( - browser_context(), include_incognito_information(), download_id); @@ -475,7 +484,7 @@ --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc -@@ -52,37 +52,7 @@ SafeBrowsingPrivateGetReferrerChainFunct +@@ -53,37 +53,7 @@ SafeBrowsingPrivateGetReferrerChainFunct base::StringPrintf("Could not find tab with id %d.", params->tab_id))); } @@ -534,7 +543,7 @@ } void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone( -@@ -1180,51 +1168,9 @@ WebstorePrivateGetReferrerChainFunction: +@@ -1176,51 +1164,9 @@ WebstorePrivateGetReferrerChainFunction: ExtensionFunction::ResponseAction WebstorePrivateGetReferrerChainFunction::Run() { @@ -669,7 +678,7 @@ // SimpleURLLoader -> (owned loader, extension id). --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -800,9 +800,6 @@ void ChromeMetricsServiceClient::Registe +@@ -811,9 +811,6 @@ void ChromeMetricsServiceClient::Registe metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -693,7 +702,7 @@ // static --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -277,7 +277,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -288,7 +288,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(IS_CHROMEOS_LACROS) CertDbInitializerFactory::GetInstance(); #endif @@ -703,7 +712,7 @@ #endif --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -91,7 +91,6 @@ +@@ -90,7 +90,6 @@ #include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/push_messaging/push_messaging_service_factory.h" #include "chrome/browser/push_messaging/push_messaging_service_impl.h" @@ -711,7 +720,7 @@ #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/signin_ui_util.h" -@@ -650,17 +649,6 @@ void ProfileImpl::LoadPrefsForNormalStar +@@ -652,17 +651,6 @@ void ProfileImpl::LoadPrefsForNormalStar mojo::PendingRemote pref_validation_delegate; @@ -731,7 +740,7 @@ CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false), --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc -@@ -319,9 +319,6 @@ void RemoveBrowsingDataForProfile(const +@@ -315,9 +315,6 @@ void RemoveBrowsingDataForProfile(const // The BrowsingDataRemover relies on many objects that aren't created in unit // tests. Previously this code would depend on content::ResourceDispatcherHost // but that's gone, so do a similar hack for now. @@ -759,7 +768,7 @@ if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode -@@ -392,6 +394,7 @@ static_library("advanced_protection") { +@@ -395,6 +397,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -767,7 +776,7 @@ sources = [ "safe_browsing_metrics_collector.cc", "safe_browsing_metrics_collector.h", -@@ -409,6 +412,7 @@ source_set("metrics_collector") { +@@ -412,6 +415,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -866,21 +875,9 @@ return security_state::MALICIOUS_CONTENT_STATUS_NONE; } ---- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc -+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc -@@ -53,8 +53,5 @@ void ChromeSubresourceFilterClient::Show - - const scoped_refptr - ChromeSubresourceFilterClient::GetSafeBrowsingDatabaseManager() { -- safe_browsing::SafeBrowsingService* safe_browsing_service = -- g_browser_process->safe_browsing_service(); -- return safe_browsing_service ? safe_browsing_service->database_manager() -- : nullptr; -+ return nullptr; - } --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -3691,7 +3691,6 @@ static_library("ui") { +@@ -3754,7 +3754,6 @@ static_library("ui") { "views/device_chooser_content_view.h", "views/devtools_process_observer.cc", "views/devtools_process_observer.h", @@ -890,7 +887,7 @@ "views/download/download_item_view.cc", --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -308,11 +308,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -315,11 +315,6 @@ void TabHelpers::AttachTabHelpers(WebCon // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); @@ -912,7 +909,7 @@ #include "chrome/browser/download/download_history.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_prefs.h" -@@ -168,9 +167,6 @@ void DownloadsDOMHandler::SaveDangerousR +@@ -171,9 +170,6 @@ void DownloadsDOMHandler::SaveDangerousR } CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); @@ -922,7 +919,7 @@ } void DownloadsDOMHandler::DiscardDangerous(const std::string& id) { -@@ -316,12 +312,6 @@ void DownloadsDOMHandler::RemoveDownload +@@ -319,12 +315,6 @@ void DownloadsDOMHandler::RemoveDownload IdSet ids; for (auto* download : to_remove) { @@ -935,7 +932,7 @@ DownloadItemModel item_model(download); if (!item_model.ShouldShowInShelf() || download->GetState() == download::DownloadItem::IN_PROGRESS) { -@@ -395,44 +385,6 @@ void DownloadsDOMHandler::FinalizeRemova +@@ -398,44 +388,6 @@ void DownloadsDOMHandler::FinalizeRemova } } @@ -1166,7 +1163,7 @@ #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h" --- a/components/security_interstitials/content/cert_report_helper.cc +++ b/components/security_interstitials/content/cert_report_helper.cc -@@ -178,7 +178,6 @@ void CertReportHelper::FinishCertCollect +@@ -177,7 +177,6 @@ void CertReportHelper::FinishCertCollect return; } 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 de0ff705..c3f7136c 100644 --- a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch +++ b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch @@ -1,6 +1,6 @@ --- a/components/autofill/core/browser/autofill_download_manager.cc +++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -831,96 +831,6 @@ AutofillDownloadManager::GetRequestURLAn +@@ -829,96 +829,6 @@ AutofillDownloadManager::GetRequestURLAn } bool AutofillDownloadManager::StartRequest(FormRequestData request_data) { diff --git a/patches/core/inox-patchset/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index e286dd7f..9cfdfde9 100644 --- a/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc +++ b/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc -@@ -28,7 +28,6 @@ namespace extensions { +@@ -29,7 +29,6 @@ namespace extensions { bool IsComponentExtensionAllowlisted(const std::string& extension_id) { const char* const kAllowed[] = { extension_misc::kCastExtensionIdRelease, @@ -10,7 +10,7 @@ extension_misc::kAccessibilityCommonExtensionId, --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc -@@ -352,11 +352,6 @@ void ComponentLoader::AddWebStoreApp() { +@@ -353,11 +353,6 @@ void ComponentLoader::AddWebStoreApp() { if (!IsNormalSession()) return; #endif @@ -22,7 +22,7 @@ } #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -527,18 +522,6 @@ void ComponentLoader::AddDefaultComponen +@@ -534,18 +529,6 @@ void ComponentLoader::AddDefaultComponen AddHangoutServicesExtension(); #endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) @@ -76,7 +76,7 @@ } // http://crbug.com/165634 -@@ -714,21 +700,6 @@ void WebstoreInstaller::UpdateDownloadPr +@@ -713,21 +699,6 @@ void WebstoreInstaller::UpdateDownloadPr void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!crx_installer_.get()); diff --git a/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch b/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch index 0e29fea3..9dabe296 100644 --- a/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch +++ b/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch @@ -1,6 +1,6 @@ --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -134,10 +134,10 @@ const unsigned kMinimumTTLSeconds = kCac +@@ -135,10 +135,10 @@ const unsigned kMinimumTTLSeconds = kCac // cached. const int kIPv6ProbePeriodMs = 1000; diff --git a/patches/core/inox-patchset/0021-disable-rlz.patch b/patches/core/inox-patchset/0021-disable-rlz.patch index 1e7424ba..e3d73e04 100644 --- a/patches/core/inox-patchset/0021-disable-rlz.patch +++ b/patches/core/inox-patchset/0021-disable-rlz.patch @@ -2,7 +2,7 @@ --- a/BUILD.gn +++ b/BUILD.gn -@@ -459,14 +459,6 @@ group("gn_all") { +@@ -473,14 +473,6 @@ group("gn_all") { deps += [ "//chromeos:chromeos_unittests" ] } diff --git a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index e146f408..8c1d5925 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 @@ -77,9 +77,9 @@ by default. _RemoveKeys(plist, 'KSChannelID') if base_tag != '': ---- a/chrome/browser/chromeos/customization/customization_document.cc -+++ b/chrome/browser/chromeos/customization/customization_document.cc -@@ -172,7 +172,7 @@ std::string ReadFileInBackground(const b +--- a/chrome/browser/ash/customization/customization_document.cc ++++ b/chrome/browser/ash/customization/customization_document.cc +@@ -173,7 +173,7 @@ std::string ReadFileInBackground(const b // Template URL where to fetch OEM services customization manifest from. const char ServicesCustomizationDocument::kManifestUrl[] = @@ -98,10 +98,10 @@ by default. + scopes.emplace_back("trk:208:https://www.googleapis.com/auth/drive.readonly"); scoped_refptr url_loader_factory = - content::BrowserContext::GetDefaultStoragePartition(browser_context()) + browser_context() --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -@@ -81,7 +81,7 @@ namespace { +@@ -82,7 +82,7 @@ namespace { using api::file_manager_private::ProfileInfo; @@ -112,7 +112,7 @@ by default. constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold = --- a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc +++ b/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc -@@ -78,11 +78,11 @@ constexpr char kCRDConnectClientKey[] = +@@ -36,11 +36,11 @@ namespace { // OAuth2 Token scopes constexpr char kCloudDevicesOAuth2Scope[] = @@ -125,8 +125,8 @@ by default. - "https://www.googleapis.com/auth/tachyon"; + "trk:235:https://www.googleapis.com/auth/tachyon"; - } // namespace - + class DefaultNativeMessageHostFactory + : public CRDHostDelegate::NativeMessageHostFactory { --- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc +++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc @@ -42,8 +42,8 @@ namespace { @@ -175,7 +175,7 @@ by default. ? upload_url_for_testing_ --- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc +++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc -@@ -32,7 +32,7 @@ std::u16string NaClInfoBarDelegate::GetL +@@ -33,7 +33,7 @@ std::u16string NaClInfoBarDelegate::GetL } GURL NaClInfoBarDelegate::GetLinkURL() const { @@ -197,7 +197,7 @@ by default. ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index, --- a/chrome/browser/resources/default_apps/external_extensions.json +++ b/chrome/browser/resources/default_apps/external_extensions.json -@@ -27,17 +27,17 @@ +@@ -23,17 +23,17 @@ }, // Google Sheets "aapocclcgogkmnckokdopfmhonfmgoek" : { @@ -242,7 +242,7 @@ by default. base::ToLowerASCII(bdict_file)); --- a/chrome/browser/supervised_user/supervised_user_service.cc +++ b/chrome/browser/supervised_user/supervised_user_service.cc -@@ -85,7 +85,7 @@ namespace { +@@ -86,7 +86,7 @@ namespace { // The URL from which to download a host denylist if no local one exists yet. const char kDenylistURL[] = @@ -275,7 +275,7 @@ by default. // The maximum number of ignored bubble we track in the NumLaterPerReinstall --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -@@ -68,22 +68,22 @@ namespace { +@@ -67,22 +67,22 @@ namespace { // The URL for the the Learn More page shown on incognito new tab. const char kLearnMoreIncognitoUrl[] = #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -385,7 +385,7 @@ by default. --- a/components/cloud_devices/common/cloud_devices_urls.cc +++ b/components/cloud_devices/common/cloud_devices_urls.cc -@@ -14,14 +14,14 @@ +@@ -13,14 +13,14 @@ namespace cloud_devices { const char kCloudPrintAuthScope[] = @@ -429,7 +429,7 @@ by default. --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc -@@ -139,7 +139,7 @@ bool IsGoogleSearchSubdomainUrl(const GU +@@ -140,7 +140,7 @@ bool IsGoogleSearchSubdomainUrl(const GU // Global functions ----------------------------------------------------------- @@ -487,15 +487,15 @@ by default. base::Time out_time; --- a/components/safe_browsing/content/browser/client_side_detection_service.cc +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc -@@ -59,7 +59,7 @@ const int ClientSideDetectionService::kN +@@ -60,7 +60,7 @@ const int ClientSideDetectionService::kN const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30; const char ClientSideDetectionService::kClientReportPhishingUrl[] = - "https://sb-ssl.google.com/safebrowsing/clientreport/phishing"; + "trk:148:https://sb-ssl.google.com/safebrowsing/clientreport/phishing"; - constexpr char kAuthHeaderBearer[] = "Bearer "; - + struct ClientSideDetectionService::ClientPhishingReportInfo { + std::unique_ptr loader; --- a/components/safe_search_api/safe_search/safe_search_url_checker_client.cc +++ b/components/safe_search_api/safe_search/safe_search_url_checker_client.cc @@ -29,7 +29,7 @@ namespace safe_search_api { @@ -563,7 +563,7 @@ by default. --- a/content/browser/webauth/authenticator_common.cc +++ b/content/browser/webauth/authenticator_common.cc -@@ -178,9 +178,9 @@ base::Optional ProcessAppId +@@ -178,9 +178,9 @@ absl::optional ProcessAppId // special-case AppIDs. Firefox also does this: // https://groups.google.com/forum/#!msg/mozilla.dev.platform/Uiu3fwnA2xw/201ynAiPAQAJ const GURL kGstatic1 = @@ -577,7 +577,7 @@ by default. if (origin.DomainIs("google.com") && !appid_url.has_ref() && --- a/content/shell/browser/shell_browser_main_parts.cc +++ b/content/shell/browser/shell_browser_main_parts.cc -@@ -89,7 +89,7 @@ GURL GetStartupURL() { +@@ -87,7 +87,7 @@ GURL GetStartupURL() { #else const base::CommandLine::StringVector& args = command_line->GetArgs(); if (args.empty()) @@ -802,15 +802,15 @@ by default. const jingle_xmpp::QName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT( --- a/remoting/base/breakpad_mac.mm +++ b/remoting/base/breakpad_mac.mm -@@ -52,7 +52,7 @@ void InitializeCrashReporting() { - [breakpad_config setObject:@"21600" forKey:@BREAKPAD_REPORT_INTERVAL]; +@@ -50,7 +50,7 @@ void InitializeCrashReporting() { + breakpad_config[@BREAKPAD_REPORT_INTERVAL] = @"21600"; } - if (![breakpad_config objectForKey:@BREAKPAD_URL]) { -- [breakpad_config setObject:@"https://clients2.google.com/cr/report" -+ [breakpad_config setObject:@"trk:310:https://clients2.google.com/cr/report" - forKey:@BREAKPAD_URL]; + if (!breakpad_config[@BREAKPAD_URL]) { +- breakpad_config[@BREAKPAD_URL] = @"https://clients2.google.com/cr/report"; ++ breakpad_config[@BREAKPAD_URL] = @"trk:310:https://clients2.google.com/cr/report"; } + if (!BreakpadCreate(breakpad_config)) { --- a/remoting/protocol/jingle_messages.cc +++ b/remoting/protocol/jingle_messages.cc @@ -27,7 +27,7 @@ const char kJabberNamespace[] = "jabber: @@ -824,7 +824,7 @@ by default. --- a/rlz/lib/lib_values.cc +++ b/rlz/lib/lib_values.cc -@@ -41,7 +41,7 @@ const char kSetDccResponseVariable[] = " +@@ -40,7 +40,7 @@ const char kSetDccResponseVariable[] = " // const char kFinancialPingPath[] = "/tools/pso/ping"; diff --git a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch index 06361666..ba597f83 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future). --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -261,7 +261,7 @@ SafeBrowsingUIManager* SafeBrowsingServi +@@ -262,7 +262,7 @@ SafeBrowsingUIManager* SafeBrowsingServi } void SafeBrowsingService::RegisterAllDelayedAnalysis() { diff --git a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch index 97816462..3ca77c5b 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 -@@ -222,6 +222,10 @@ void ClientSideDetectionService::StartCl +@@ -208,6 +208,10 @@ void ClientSideDetectionService::StartCl return; } @@ -22,9 +22,9 @@ This prevents trk:148 (phishing) and trk:149 (malware). + callback.Run(GURL(request->url()), false); +#else // Fill in metadata about which model we used. - request->set_model_filename(model_loader_->name()); *request->mutable_population() = delegate_->GetUserPopulation(); -@@ -303,6 +307,7 @@ void ClientSideDetectionService::StartCl + +@@ -288,6 +292,7 @@ void ClientSideDetectionService::StartCl base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent, base::Unretained(WebUIInfoSingleton::GetInstance()), std::move(request), access_token)); diff --git a/patches/core/ungoogled-chromium/block-requests.patch b/patches/core/ungoogled-chromium/block-requests.patch index 1b6d142e..b8ceb700 100644 --- a/patches/core/ungoogled-chromium/block-requests.patch +++ b/patches/core/ungoogled-chromium/block-requests.patch @@ -15,7 +15,7 @@ --- a/chrome/browser/search/background/ntp_background_service.cc +++ b/chrome/browser/search/background/ntp_background_service.cc -@@ -66,6 +66,7 @@ void NtpBackgroundService::Shutdown() { +@@ -65,6 +65,7 @@ void NtpBackgroundService::Shutdown() { } void NtpBackgroundService::FetchCollectionInfo() { @@ -25,7 +25,7 @@ collection_error_info_.ClearError(); --- a/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc +++ b/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc -@@ -296,6 +296,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad +@@ -298,6 +298,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default; void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) { @@ -65,7 +65,7 @@ if (state_ == REQUESTING) { --- a/components/update_client/update_checker.cc +++ b/components/update_client/update_checker.cc -@@ -128,6 +128,7 @@ void UpdateCheckerImpl::CheckForUpdates( +@@ -127,6 +127,7 @@ void UpdateCheckerImpl::CheckForUpdates( const base::flat_map& additional_attributes, bool enabled_component_updates, UpdateCheckCallback update_check_callback) { diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index 28149e0c..5af5c5c4 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -35,7 +35,7 @@ GURL rewritten_tab_url = tab_url; --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc -@@ -525,7 +525,8 @@ void AutocompleteInput::ParseForEmphasiz +@@ -532,7 +532,8 @@ void AutocompleteInput::ParseForEmphasiz // For the view-source and blob schemes, we should emphasize the host of the // URL qualified by the view-source or blob prefix. if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) || @@ -70,15 +70,15 @@ // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1076,6 +1076,8 @@ component("net") { - "url_request/report_sender.h", - "url_request/static_http_user_agent_settings.cc", - "url_request/static_http_user_agent_settings.h", -+ "url_request/trk_protocol_handler.cc", -+ "url_request/trk_protocol_handler.h", - "url_request/url_fetcher.cc", - "url_request/url_fetcher.h", - "url_request/url_fetcher_core.cc", +@@ -1013,6 +1013,8 @@ component("net") { + "url_request/report_sender.h", + "url_request/static_http_user_agent_settings.cc", + "url_request/static_http_user_agent_settings.h", ++ "url_request/trk_protocol_handler.cc", ++ "url_request/trk_protocol_handler.h", + "url_request/url_fetcher.cc", + "url_request/url_fetcher.h", + "url_request/url_fetcher_core.cc", --- /dev/null +++ b/net/url_request/trk_protocol_handler.cc @@ -0,0 +1,25 @@ @@ -152,7 +152,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/threading/thread_task_runner_handle.h" -@@ -41,6 +42,7 @@ +@@ -44,6 +45,7 @@ #include "net/url_request/url_request_redirect_job.h" #include "url/gurl.h" #include "url/origin.h" @@ -160,7 +160,7 @@ using base::Time; using std::string; -@@ -577,6 +579,12 @@ URLRequest::URLRequest(const GURL& url, +@@ -582,6 +584,12 @@ URLRequest::URLRequest(const GURL& url, // Sanity check out environment. DCHECK(base::ThreadTaskRunnerHandle::IsSet()); diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index 1385c074..edfa376b 100644 --- a/patches/core/ungoogled-chromium/disable-crash-reporter.patch +++ b/patches/core/ungoogled-chromium/disable-crash-reporter.patch @@ -13,7 +13,7 @@ - base::BindOnce(&TraceCrashServiceUploader::DoCompressOnBackgroundThread, - base::Unretained(this), file_contents, upload_mode, - upload_url_, std::move(metadata))); -+ base::Bind(progress_callback_, 1, 1)); ++ base::BindOnce(progress_callback_, 1, 1)); + } + if (!done_callback_.is_null()) { + base::ThreadPool::PostTask( @@ -31,3 +31,15 @@ DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK(!simple_url_loader_); +--- a/components/crash/core/app/crashpad_linux.cc ++++ b/components/crash/core/app/crashpad_linux.cc +@@ -54,8 +54,7 @@ void SetFirstChanceExceptionHandler(bool + } + + bool IsCrashpadEnabled() { +- return base::CommandLine::ForCurrentProcess()->HasSwitch( +- ::switches::kEnableCrashpad); ++ return false; + } + + bool GetHandlerSocket(int* fd, pid_t* pid) { diff --git a/patches/core/ungoogled-chromium/disable-domain-reliability.patch b/patches/core/ungoogled-chromium/disable-domain-reliability.patch index 294f1c2b..017cba6b 100644 --- a/patches/core/ungoogled-chromium/disable-domain-reliability.patch +++ b/patches/core/ungoogled-chromium/disable-domain-reliability.patch @@ -677,8 +677,8 @@ const std::string& hostname) { bool is_www_subdomain = @@ -578,23 +20,6 @@ std::unique_ptr config = nullptr; - std::unique_ptr superdomain_config = nullptr; + std::unique_ptr config; + std::unique_ptr superdomain_config; - for (const auto& params : kGoogleConfigs) { - if (params.hostname == hostname) { diff --git a/patches/core/ungoogled-chromium/disable-floc.patch b/patches/core/ungoogled-chromium/disable-floc.patch index 791b6b8f..22b3c422 100644 --- a/patches/core/ungoogled-chromium/disable-floc.patch +++ b/patches/core/ungoogled-chromium/disable-floc.patch @@ -43,22 +43,24 @@ } // namespace federated_learning --- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc +++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc -@@ -174,11 +174,7 @@ PrivacySandboxSettings::~PrivacySandboxS - bool PrivacySandboxSettings::IsFlocAllowed( - const GURL& url, - const base::Optional& top_frame_origin) const { -- ContentSettingsForOneType cookie_settings; -- cookie_settings_->GetCookieSettings(&cookie_settings); +@@ -211,13 +211,7 @@ PrivacySandboxSettings::~PrivacySandboxS + } + + bool PrivacySandboxSettings::IsFlocAllowed() const { +- if (!PrivacySandboxSettingsFunctional()) { +- // Simply respect 3rd-party cookies blocking settings if the UI is not +- // available. +- return !cookie_settings_->ShouldBlockThirdPartyCookies(); +- } - -- return IsPrivacySandboxAllowedForContext(url, top_frame_origin, -- cookie_settings); +- return IsFlocAllowedByPrefs(pref_service_); + return false; } - base::Time PrivacySandboxSettings::FlocDataAccessibleSince() const { + bool PrivacySandboxSettings::IsFlocAllowedForContext( --- a/components/federated_learning/features/features.cc +++ b/components/federated_learning/features/features.cc -@@ -28,7 +28,7 @@ const base::Feature kFlocPagesWithAdReso +@@ -34,7 +34,7 @@ const base::Feature kFlocPagesWithAdReso // required. // TODO(yaoxia): merge other floc features into this one. const base::Feature kFederatedLearningOfCohorts{ diff --git a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch index 8a33e66f..f66a1386 100644 --- a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch +++ b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch @@ -1,7 +1,7 @@ # Disables references to fonts.googleapis.com ---- a/chrome/browser/chromeos/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html -+++ b/chrome/browser/chromeos/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html +--- a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html ++++ b/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html @@ -5,7 +5,7 @@ diff --git a/patches/core/ungoogled-chromium/disable-gcm.patch b/patches/core/ungoogled-chromium/disable-gcm.patch index e1200596..610df6ef 100644 --- a/patches/core/ungoogled-chromium/disable-gcm.patch +++ b/patches/core/ungoogled-chromium/disable-gcm.patch @@ -2,7 +2,7 @@ --- a/components/gcm_driver/gcm_client_impl.cc +++ b/components/gcm_driver/gcm_client_impl.cc -@@ -467,6 +467,7 @@ void GCMClientImpl::StartGCM() { +@@ -466,6 +466,7 @@ void GCMClientImpl::StartGCM() { void GCMClientImpl::InitializeMCSClient() { DCHECK(network_connection_tracker_); @@ -10,7 +10,7 @@ std::vector endpoints; endpoints.push_back(gservices_settings_.GetMCSMainEndpoint()); GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint(); -@@ -672,27 +673,6 @@ void GCMClientImpl::RemoveHeartbeatInter +@@ -671,27 +672,6 @@ void GCMClientImpl::RemoveHeartbeatInter void GCMClientImpl::StartCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); @@ -38,7 +38,7 @@ } void GCMClientImpl::OnCheckinCompleted( -@@ -749,24 +729,6 @@ void GCMClientImpl::SetGServicesSettings +@@ -748,24 +728,6 @@ void GCMClientImpl::SetGServicesSettings void GCMClientImpl::SchedulePeriodicCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index 3f9c209d..0a68c8fc 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -13,7 +13,7 @@ namespace { #if defined(OS_ANDROID) -@@ -66,61 +62,6 @@ void GoogleURLLoaderThrottle::DetachFrom +@@ -64,52 +60,6 @@ void GoogleURLLoaderThrottle::DetachFrom void GoogleURLLoaderThrottle::WillStartRequest( network::ResourceRequest* request, bool* defer) { @@ -54,15 +54,6 @@ - google_util::IsGoogleHomePageUrl(request->url) || - google_util::IsGoogleSearchUrl(request->url); - if (is_google_homepage_or_search) { -- // TODO (crbug.com/1081510): Remove this experimental code once a final -- // solution is agreed upon. -- if (base::FeatureList::IsEnabled(features::kAndroidDarkSearch)) { -- request->url = net::AppendOrReplaceQueryParameter( -- request->url, "cs", night_mode_enabled_ ? "1" : "0"); -- } -- base::UmaHistogramBoolean("Android.DarkTheme.DarkSearchRequested", -- night_mode_enabled_); -- - if (base::FeatureList::IsEnabled(features::kRequestDesktopSiteForTablets) && - ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) { - request->headers.SetHeader(kRequestDesktopDataHeader, @@ -75,7 +66,7 @@ } void GoogleURLLoaderThrottle::WillRedirectRequest( -@@ -130,37 +71,6 @@ void GoogleURLLoaderThrottle::WillRedire +@@ -119,37 +69,6 @@ void GoogleURLLoaderThrottle::WillRedire std::vector* to_be_removed_headers, net::HttpRequestHeaders* modified_headers, net::HttpRequestHeaders* modified_cors_exempt_headers) { @@ -113,7 +104,7 @@ } #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -168,22 +78,5 @@ void GoogleURLLoaderThrottle::WillProces +@@ -157,22 +76,5 @@ void GoogleURLLoaderThrottle::WillProces const GURL& response_url, network::mojom::URLResponseHead* response_head, bool* defer) { @@ -138,7 +129,7 @@ #endif --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc -@@ -32,109 +32,6 @@ namespace google_util { +@@ -33,109 +33,6 @@ namespace google_util { namespace { @@ -248,20 +239,20 @@ } // namespace // Global functions ----------------------------------------------------------- -@@ -142,12 +39,6 @@ bool IsGoogleSearchSubdomainUrl(const GU +@@ -143,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/"; bool HasGoogleSearchQueryParam(base::StringPiece str) { - url::Component query(0, static_cast(str.length())), key, value; - while (url::ExtractQueryKeyValue(str.data(), &query, &key, &value)) { - base::StringPiece key_str = str.substr(key.begin, key.len); -- if (key_str == "q" || key_str == "as_q") +- if (key_str == "q" || key_str == "as_q" || key_str == "imgurl") - return true; - } return false; } -@@ -158,161 +49,53 @@ std::string GetGoogleLocale(const std::s +@@ -159,161 +50,53 @@ std::string GetGoogleLocale(const std::s GURL AppendGoogleLocaleParam(const GURL& url, const std::string& application_locale) { @@ -289,7 +280,7 @@ - // so use Spain instead. - if (country_code == "cat") - return "es"; -- return country_code.as_string(); +- return std::string(country_code); + return "nolocale"; } @@ -372,7 +363,7 @@ - // Make sure the path is a known search path. - base::StringPiece path(url.path_piece()); - bool is_home_page_base = IsPathHomePageBase(path); -- if (!is_home_page_base && (path != "/search")) +- if (!is_home_page_base && path != "/search" && path != "/imgres") - return false; - - // Check for query parameter in URL parameter and hash fragment, depending on @@ -439,7 +430,7 @@ } bool IsGoogleSearchHostname(const GURL& url) { -- base::Optional result = +- absl::optional result = - page_load_metrics::GetGoogleHostnamePrefix(url); - return result && result.value() == "www"; + return false; @@ -448,10 +439,10 @@ bool IsGoogleSearchResultUrl(const GURL& url) { --- a/components/page_load_metrics/common/page_load_metrics_util.cc +++ b/components/page_load_metrics/common/page_load_metrics_util.cc -@@ -12,38 +12,7 @@ - namespace page_load_metrics { +@@ -32,38 +32,7 @@ const char* kBufferTimerDelayParamName = + } // namespace - base::Optional GetGoogleHostnamePrefix(const GURL& url) { + absl::optional GetGoogleHostnamePrefix(const GURL& url) { - const size_t registry_length = - net::registry_controlled_domains::GetRegistryLength( - url, @@ -467,7 +458,7 @@ - const base::StringPiece hostname = url.host_piece(); - if (registry_length == 0 || registry_length == std::string::npos || - registry_length >= hostname.length()) { -- return base::Optional(); +- return absl::optional(); - } - - // Removes the tld and the preceding dot. @@ -479,12 +470,12 @@ - - if (!base::EndsWith(hostname_minus_registry, ".google", - base::CompareCase::INSENSITIVE_ASCII)) { -- return base::Optional(); +- return absl::optional(); - } - - return std::string(hostname_minus_registry.substr( - 0, hostname_minus_registry.length() - strlen(".google"))); -+ return base::Optional(); ++ return absl::optional(); } bool IsGoogleHostname(const GURL& url) { diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index 684cbb6b..04747f6a 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 -@@ -317,7 +317,6 @@ if (!is_android && !is_mac) { +@@ -318,7 +318,6 @@ if (!is_android && !is_mac) { } data_deps += [ @@ -15,7 +15,7 @@ "//third_party/widevine/cdm", ] } -@@ -1121,7 +1120,6 @@ if (is_win) { +@@ -1140,7 +1139,6 @@ if (is_win) { ":keystone_registration_framework", ":swiftshader_library", ":widevine_cdm_library", diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch new file mode 100644 index 00000000..155ccbf7 --- /dev/null +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -0,0 +1,33 @@ +--- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc ++++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc +@@ -207,7 +207,7 @@ PrivacySandboxSettings::PrivacySandboxSe + PrivacySandboxSettings::~PrivacySandboxSettings() = default; + + /*static*/ bool PrivacySandboxSettings::PrivacySandboxSettingsFunctional() { +- return base::FeatureList::IsEnabled(features::kPrivacySandboxSettings); ++ return false; + } + + bool PrivacySandboxSettings::IsFlocAllowed() const { +--- a/chrome/common/chrome_features.cc ++++ b/chrome/common/chrome_features.cc +@@ -771,7 +771,7 @@ const base::Feature kPrivacyAdvisor{"Pri + + // Enables the privacy sandbox settings page. + const base::Feature kPrivacySandboxSettings{"PrivacySandboxSettings", +- base::FEATURE_ENABLED_BY_DEFAULT}; ++ base::FEATURE_DISABLED_BY_DEFAULT}; + const base::FeatureParam kPrivacySandboxSettingsURL{ + &kPrivacySandboxSettings, "website-url", "https://www.privacysandbox.com"}; + +--- a/components/privacy_sandbox/privacy_sandbox_prefs.cc ++++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc +@@ -31,7 +31,7 @@ namespace privacy_sandbox { + + void RegisterProfilePrefs(PrefRegistrySimple* registry) { + registry->RegisterBooleanPref( +- prefs::kPrivacySandboxApisEnabled, true, ++ prefs::kPrivacySandboxApisEnabled, false, + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); + registry->RegisterBooleanPref( + prefs::kPrivacySandboxManuallyControlled, false, diff --git a/patches/core/ungoogled-chromium/disable-signin.patch b/patches/core/ungoogled-chromium/disable-signin.patch index 88ba0006..cc7890cd 100644 --- a/patches/core/ungoogled-chromium/disable-signin.patch +++ b/patches/core/ungoogled-chromium/disable-signin.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -479,32 +479,6 @@ GURL GetOSSettingsUrl(const std::string& +@@ -474,32 +474,6 @@ GURL GetOSSettingsUrl(const std::string& void ShowBrowserSignin(Browser* browser, signin_metrics::AccessPoint access_point, signin::ConsentLevel consent_level) { diff --git a/patches/core/ungoogled-chromium/disable-untraceable-urls.patch b/patches/core/ungoogled-chromium/disable-untraceable-urls.patch index 416af7bf..00964630 100644 --- a/patches/core/ungoogled-chromium/disable-untraceable-urls.patch +++ b/patches/core/ungoogled-chromium/disable-untraceable-urls.patch @@ -41,7 +41,7 @@ update_renderers_callback_(update_renderers_callback), url_loader_factory_(url_loader_factory), last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) { -@@ -138,7 +136,7 @@ ModelLoader::ModelLoader( +@@ -137,7 +135,7 @@ ModelLoader::ModelLoader( scoped_refptr url_loader_factory, const std::string& model_name) : name_(model_name), @@ -82,7 +82,7 @@ // wininet implementation. --- a/rlz/lib/lib_values.cc +++ b/rlz/lib/lib_values.cc -@@ -41,7 +41,6 @@ const char kSetDccResponseVariable[] = " +@@ -40,7 +40,6 @@ const char kSetDccResponseVariable[] = " // const char kFinancialPingPath[] = "/tools/pso/ping"; diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index 677038b8..d607eb8e 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 -@@ -588,10 +588,6 @@ std::vector ChromeContentBr +@@ -656,10 +656,6 @@ std::vector ChromeContentBr GetOriginsRequiringDedicatedProcess() { std::vector list; @@ -54,7 +54,7 @@ - base::Value(extension_urls::GetWebstoreUpdateUrl().spec())); + base::Value(chrome_blank_.spec())); - prefs->SetWithoutPathExpansion(new_id_, std::move(entry)); + prefs->SetKey(new_id_, base::Value::FromUniquePtrValue(std::move(entry))); } --- a/chrome/browser/extensions/extension_migrator.h +++ b/chrome/browser/extensions/extension_migrator.h @@ -146,7 +146,7 @@ } else { url_stats_.other_url_count++; } -@@ -844,20 +822,6 @@ void ExtensionDownloader::HandleManifest +@@ -848,20 +826,6 @@ void ExtensionDownloader::HandleManifest update->info); } @@ -167,7 +167,7 @@ NotifyExtensionsDownloadStageChanged( no_updates, ExtensionDownloaderDelegate::Stage::FINISHED); NotifyExtensionsDownloadFailed( -@@ -1409,11 +1373,7 @@ bool ExtensionDownloader::IterateFetchCr +@@ -1421,11 +1385,7 @@ bool ExtensionDownloader::IterateFetchCr // fetch. switch (fetch->credentials) { case ExtensionFetch::CREDENTIALS_NONE: 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 5b0b436d..326101cf 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -1,9 +1,40 @@ # Contains tests and features that are unneeded and would otherwise # require binaries to be whitelisted in the pruning list +--- a/chrome/test/chromedriver/BUILD.gn ++++ b/chrome/test/chromedriver/BUILD.gn +@@ -308,11 +308,7 @@ source_set("lib") { + } + } + +-if (is_linux) { +- chromedriver_output = "chromedriver.unstripped" +-} else { + chromedriver_output = "chromedriver" +-} + + executable("$chromedriver_output") { + testonly = true +@@ -337,16 +333,6 @@ executable("$chromedriver_output") { + } + } + +-if (is_linux) { +- strip_binary("chromedriver") { +- testonly = true +- binary_input = "$root_out_dir/$chromedriver_output" +- symbol_output = "$root_out_dir/chromedriver.debug" +- stripped_binary_output = "$root_out_dir/chromedriver" +- deps = [ ":$chromedriver_output" ] +- } +-} +- + python_library("chromedriver_py_tests") { + testonly = true + deps = [ --- a/third_party/devtools-frontend/src/BUILD.gn +++ b/third_party/devtools-frontend/src/BUILD.gn -@@ -166,7 +166,6 @@ devtools_applications = [ +@@ -138,7 +138,6 @@ foreach(module_file, non_autostart_non_r devtools_frontend_resources_deps = [ ":build_release_devtools", "front_end", diff --git a/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch b/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch index d88edfd6..33987b31 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch @@ -1,6 +1,6 @@ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -1180,6 +1180,10 @@ source_set("browser") { +@@ -1203,6 +1203,10 @@ source_set("browser") { "net/browser_online_state_observer.cc", "net/browser_online_state_observer.h", "net/cookie_store_factory.cc", @@ -11,7 +11,7 @@ "net/network_errors_listing_ui.cc", "net/network_errors_listing_ui.h", "net/network_quality_observer_impl.cc", -@@ -2878,10 +2882,6 @@ source_set("browser") { +@@ -2919,10 +2923,6 @@ source_set("browser") { if (enable_reporting) { sources += [ @@ -24,15 +24,15 @@ ] --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -38,6 +38,7 @@ - #include "base/unguessable_token.h" +@@ -39,6 +39,7 @@ + #include "base/values.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "mojo/public/cpp/system/message_pipe.h" +#include "net/net_buildflags.h" #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h" #include "services/network/public/cpp/features.h" #include "services/network/public/mojom/content_security_policy.mojom-blink.h" -@@ -553,7 +554,9 @@ void LocalFrame::Trace(Visitor* visitor) +@@ -630,7 +631,9 @@ void LocalFrame::Trace(Visitor* visitor) visitor->Trace(raw_system_clipboard_); visitor->Trace(virtual_keyboard_overlay_changed_observers_); visitor->Trace(pause_handle_receivers_); @@ -42,7 +42,7 @@ #if defined(OS_MAC) visitor->Trace(text_input_host_); #endif -@@ -2364,6 +2367,7 @@ const base::UnguessableToken& LocalFrame +@@ -2500,6 +2503,7 @@ const base::UnguessableToken& LocalFrame return base::UnguessableToken::Null(); } @@ -50,7 +50,7 @@ mojom::blink::ReportingServiceProxy* LocalFrame::GetReportingService() { if (!reporting_service_.is_bound()) { GetBrowserInterfaceBroker().GetInterface( -@@ -2372,6 +2376,7 @@ mojom::blink::ReportingServiceProxy* Loc +@@ -2508,6 +2512,7 @@ mojom::blink::ReportingServiceProxy* Loc } return reporting_service_.get(); } @@ -60,15 +60,15 @@ void LocalFrame::NotifyUserActivation( --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h -@@ -38,6 +38,7 @@ +@@ -37,6 +37,7 @@ + #include "build/build_config.h" #include "mojo/public/cpp/bindings/pending_associated_receiver.h" #include "mojo/public/cpp/bindings/pending_receiver.h" - #include "mojo/public/cpp/bindings/unique_receiver_set.h" +#include "net/net_buildflags.h" + #include "third_party/blink/public/common/frame/frame_ad_evidence.h" #include "third_party/blink/public/common/frame/payment_request_token.h" #include "third_party/blink/public/common/frame/transient_allow_fullscreen.h" - #include "third_party/blink/public/mojom/blob/blob_url_store.mojom-blink.h" -@@ -537,9 +538,9 @@ class CORE_EXPORT LocalFrame final +@@ -540,9 +541,9 @@ class CORE_EXPORT LocalFrame final } SmoothScrollSequencer& GetSmoothScrollSequencer(); @@ -80,7 +80,7 @@ // Returns the frame host ptr. The interface returned is backed by an // associated interface with the legacy Chrome IPC channel. mojom::blink::LocalFrameHost& GetLocalFrameHostRemote() const; -@@ -956,8 +957,10 @@ class CORE_EXPORT LocalFrame final +@@ -1019,8 +1020,10 @@ class CORE_EXPORT LocalFrame final // const methods. // // LocalFrame can be reused by multiple ExecutionContext. diff --git a/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch b/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch index 742d7a7e..f8f2f2d1 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch @@ -1,16 +1,5 @@ # Fix building without one click signin ---- a/chrome/browser/ui/BUILD.gn -+++ b/chrome/browser/ui/BUILD.gn -@@ -4496,8 +4496,6 @@ static_library("ui") { - "views/sync/dice_bubble_sync_promo_view.h", - "views/sync/dice_signin_button_view.cc", - "views/sync/dice_signin_button_view.h", -- "views/sync/one_click_signin_dialog_view.cc", -- "views/sync/one_click_signin_dialog_view.h", - ] - deps += [ "//ui/views/window/vector_icons" ] - } --- a/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc +++ b/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc @@ -16,9 +16,4 @@ OneClickSigninLinksDelegateImpl::OneClic @@ -25,16 +14,16 @@ } --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc -@@ -359,6 +359,7 @@ void InlineSigninHelper::OnClientOAuthSu +@@ -348,6 +348,7 @@ void InlineSigninHelper::OnClientOAuthSu const ClientOAuthResult& result, Profile* /*profile*/, Profile::CreateStatus /*status*/) { +#if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) HandlerSigninReason reason = GetHandlerSigninReason(current_url_); - if (reason == HandlerSigninReason::FETCH_LST_ONLY) { + if (reason == HandlerSigninReason::kFetchLstOnly) { // Constants are only available on Windows for the Google Credential -@@ -419,6 +420,7 @@ void InlineSigninHelper::OnClientOAuthSu - CreateSyncStarter(result.refresh_token); +@@ -425,6 +426,7 @@ void InlineSigninHelper::OnClientOAuthSu + } base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); +#endif diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index 838d7b50..b77c1f04 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -4199,11 +4199,13 @@ ChromeContentBrowserClient::CreateThrott +@@ -4135,11 +4135,13 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -16,7 +16,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -@@ -5434,26 +5436,7 @@ ChromeContentBrowserClient::GetSafeBrows +@@ -5411,26 +5413,7 @@ ChromeContentBrowserClient::GetSafeBrows const std::vector& allowlist_domains) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -44,7 +44,7 @@ } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -5474,11 +5457,6 @@ ChromeContentBrowserClient::GetUrlLookup +@@ -5451,11 +5434,6 @@ ChromeContentBrowserClient::GetUrlLookup GetForProfile(profile); } #endif @@ -58,7 +58,7 @@ --- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc +++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc -@@ -87,45 +87,6 @@ void MaybeCreateSafeBrowsingForRenderer( +@@ -92,45 +92,6 @@ void MaybeCreateSafeBrowsingForRenderer( const std::vector& allowlist_domains)> get_checker_delegate, mojo::PendingReceiver receiver) { @@ -103,10 +103,43 @@ - std::move(receiver))); } - } // namespace + // BadgeManager is not used for Android. +--- a/chrome/browser/component_updater/client_side_phishing_component_installer.cc ++++ b/chrome/browser/component_updater/client_side_phishing_component_installer.cc +@@ -36,20 +36,6 @@ const char kClientSidePhishingManifestNa + + void LoadFromDisk(const base::FilePath& pb_path, + const base::FilePath& visual_tflite_model_path) { +- if (pb_path.empty()) +- return; +- +- std::string binary_pb; +- if (!base::ReadFileToString(pb_path, &binary_pb)) +- binary_pb.clear(); +- +- base::File visual_tflite_model(visual_tflite_model_path, +- base::File::FLAG_OPEN | base::File::FLAG_READ); +- +- // The ClientSidePhishingModel singleton will react appropriately if the +- // |binary_pb| is empty or |visual_tflite_model| is invalid. +- safe_browsing::ClientSidePhishingModel::GetInstance() +- ->PopulateFromDynamicUpdate(binary_pb, std::move(visual_tflite_model)); + } + + base::FilePath GetInstalledProtoPath(const base::FilePath& base) { +@@ -123,9 +109,6 @@ update_client::InstallerAttributes + ClientSidePhishingComponentInstallerPolicy::GetInstallerAttributes() const { + update_client::InstallerAttributes attributes; + +- // Pass the tag parameter to the installer as the "tag" attribute; it will +- // be used to choose which binary is downloaded. +- attributes["tag"] = safe_browsing::GetClientSideDetectionTag(); + return attributes; + } + --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -128,7 +128,6 @@ using content::DownloadManager; +@@ -129,7 +129,6 @@ using content::DownloadManager; using download::DownloadItem; using download::DownloadPathReservationTracker; using download::PathValidationResult; @@ -114,7 +147,7 @@ using safe_browsing::DownloadProtectionService; using ConnectionType = net::NetworkChangeNotifier::ConnectionType; -@@ -1423,8 +1422,6 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -1426,8 +1425,6 @@ void ChromeDownloadManagerDelegate::OnDo if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif @@ -141,8 +174,8 @@ #include "content/public/browser/web_contents.h" --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -362,19 +362,6 @@ base::Optional ConnectorsSe - return base::nullopt; +@@ -362,19 +362,6 @@ absl::optional ConnectorsSe + return absl::nullopt; } -safe_browsing::EnterpriseRealTimeUrlCheckMode @@ -173,7 +206,7 @@ namespace base { @@ -74,12 +73,6 @@ class ConnectorsService : public KeyedSe // is no token to use. - base::Optional GetDMTokenForRealTimeUrlCheck() const; + absl::optional GetDMTokenForRealTimeUrlCheck() const; - // Returns the value to used by the enterprise real-time URL check Connector - // if it is set and if the scope it's set at has a valid browser-profile @@ -236,9 +269,20 @@ std::vector GetOnSecurityEventProviders(); +--- a/chrome/browser/extensions/BUILD.gn ++++ b/chrome/browser/extensions/BUILD.gn +@@ -656,8 +656,6 @@ static_library("extensions") { + "menu_manager_factory.h", + "navigation_observer.cc", + "navigation_observer.h", +- "omaha_attributes_handler.cc", +- "omaha_attributes_handler.h", + "pack_extension_job.cc", + "pack_extension_job.h", + "pending_extension_info.cc", --- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc +++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -69,17 +69,8 @@ api::enterprise_reporting_private::Conte +@@ -55,17 +55,8 @@ api::enterprise_reporting_private::Conte info.on_file_downloaded_providers = signals.on_file_downloaded_providers; info.on_bulk_data_entry_providers = signals.on_bulk_data_entry_providers; info.on_security_event_providers = signals.on_security_event_providers; @@ -258,7 +302,7 @@ return info; --- 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 -@@ -305,6 +305,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -307,6 +307,7 @@ void SafeBrowsingPrivateEventRouter::OnD event_router_->BroadcastEvent(std::move(extension_event)); } @@ -266,7 +310,7 @@ auto settings = GetReportingSettings(); if (!settings.has_value() || settings->enabled_event_names.count(kKeyDangerousDownloadEvent) == 0) { -@@ -330,6 +331,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -336,6 +337,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -274,7 +318,7 @@ } void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown( -@@ -357,6 +359,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -363,6 +365,7 @@ void SafeBrowsingPrivateEventRouter::OnS event_router_->BroadcastEvent(std::move(extension_event)); } @@ -282,7 +326,7 @@ auto settings = GetReportingSettings(); if (!settings.has_value() || settings->enabled_event_names.count(kKeyInterstitialEvent) == 0) { -@@ -379,6 +382,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -385,6 +388,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()), std::move(event)); @@ -290,7 +334,7 @@ } void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded( -@@ -406,6 +410,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -412,6 +416,7 @@ void SafeBrowsingPrivateEventRouter::OnS event_router_->BroadcastEvent(std::move(extension_event)); } @@ -298,7 +342,7 @@ auto settings = GetReportingSettings(); if (!settings.has_value() || settings->enabled_event_names.count(kKeyInterstitialEvent) == 0) { -@@ -424,6 +429,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -430,6 +435,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()), std::move(event)); @@ -306,7 +350,7 @@ } void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorResult( -@@ -436,6 +442,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -443,6 +449,7 @@ void SafeBrowsingPrivateEventRouter::OnA const enterprise_connectors::ContentAnalysisResponse::Result& result, const int64_t content_size, safe_browsing::EventResult event_result) { @@ -314,23 +358,23 @@ if (result.tag() == "malware") { DCHECK_EQ(1, result.triggered_rules().size()); OnDangerousDeepScanningResult( -@@ -447,6 +454,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -454,6 +461,7 @@ void SafeBrowsingPrivateEventRouter::OnA OnSensitiveDataEvent(url, file_name, download_digest_sha256, mime_type, - trigger, result, content_size, event_result); + trigger, scan_id, result, content_size, event_result); } +#endif // FULL_SAFE_BROWSING } void SafeBrowsingPrivateEventRouter::OnDangerousDeepScanningResult( -@@ -461,6 +469,7 @@ void SafeBrowsingPrivateEventRouter::OnD - const std::string& malware_family, +@@ -469,6 +477,7 @@ void SafeBrowsingPrivateEventRouter::OnD const std::string& malware_category, - const std::string& evidence_locker_filepath) { + const std::string& evidence_locker_filepath, + const std::string& scan_id) { +#if defined(FULL_SAFE_BROWSING) auto settings = GetReportingSettings(); if (!settings.has_value() || settings->enabled_event_names.count(kKeyDangerousDownloadEvent) == 0) { -@@ -493,6 +502,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -505,6 +514,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -338,7 +382,7 @@ } void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent( -@@ -504,6 +514,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -517,6 +527,7 @@ void SafeBrowsingPrivateEventRouter::OnS const enterprise_connectors::ContentAnalysisResponse::Result& result, const int64_t content_size, safe_browsing::EventResult event_result) { @@ -346,7 +390,7 @@ auto settings = GetReportingSettings(); if (!settings.has_value() || settings->enabled_event_names.count(kKeySensitiveDataEvent) == 0) { -@@ -534,6 +545,7 @@ void SafeBrowsingPrivateEventRouter::OnS +@@ -548,6 +559,7 @@ void SafeBrowsingPrivateEventRouter::OnS ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()), std::move(event)); @@ -354,7 +398,7 @@ } void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed( -@@ -545,6 +557,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -560,6 +572,7 @@ void SafeBrowsingPrivateEventRouter::OnA safe_browsing::DeepScanAccessPoint access_point, const enterprise_connectors::ContentAnalysisResponse::Result& result, const int64_t content_size) { @@ -362,7 +406,7 @@ auto settings = GetReportingSettings(); if (!settings.has_value() || settings->enabled_event_names.count(kKeySensitiveDataEvent) == 0) { -@@ -575,6 +588,7 @@ void SafeBrowsingPrivateEventRouter::OnA +@@ -591,6 +604,7 @@ void SafeBrowsingPrivateEventRouter::OnA ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()), std::move(event)); @@ -370,7 +414,7 @@ } void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent( -@@ -587,6 +601,7 @@ void SafeBrowsingPrivateEventRouter::OnU +@@ -603,6 +617,7 @@ void SafeBrowsingPrivateEventRouter::OnU const std::string& reason, const int64_t content_size, safe_browsing::EventResult event_result) { @@ -378,7 +422,7 @@ auto settings = GetReportingSettings(); if (!settings.has_value() || settings->enabled_event_names.count(kKeyUnscannedFileEvent) == 0) { -@@ -612,6 +627,7 @@ void SafeBrowsingPrivateEventRouter::OnU +@@ -628,6 +643,7 @@ void SafeBrowsingPrivateEventRouter::OnU ReportRealtimeEvent(kKeyUnscannedFileEvent, std::move(settings.value()), std::move(event)); @@ -386,15 +430,15 @@ } void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent( -@@ -635,6 +651,7 @@ void SafeBrowsingPrivateEventRouter::OnD - const std::string& mime_type, +@@ -653,6 +669,7 @@ void SafeBrowsingPrivateEventRouter::OnD + const std::string& scan_id, const int64_t content_size, safe_browsing::EventResult event_result) { +#if defined(FULL_SAFE_BROWSING) auto settings = GetReportingSettings(); if (!settings.has_value() || settings->enabled_event_names.count(kKeyDangerousDownloadEvent) == 0) { -@@ -659,6 +676,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -682,6 +699,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -402,15 +446,15 @@ } void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed( -@@ -680,6 +698,7 @@ void SafeBrowsingPrivateEventRouter::OnD - const std::string& threat_type, +@@ -705,6 +723,7 @@ void SafeBrowsingPrivateEventRouter::OnD const std::string& mime_type, + const std::string& scan_id, const int64_t content_size) { +#if defined(FULL_SAFE_BROWSING) auto settings = GetReportingSettings(); if (!settings.has_value() || settings->enabled_event_names.count(kKeyDangerousDownloadEvent) == 0) { -@@ -705,6 +724,7 @@ void SafeBrowsingPrivateEventRouter::OnD +@@ -734,6 +753,7 @@ void SafeBrowsingPrivateEventRouter::OnD ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), std::move(event)); @@ -418,7 +462,7 @@ } // static -@@ -977,7 +997,11 @@ void SafeBrowsingPrivateEventRouter::Rep +@@ -1006,7 +1026,11 @@ void SafeBrowsingPrivateEventRouter::Rep } std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const { @@ -430,17 +474,235 @@ } #if BUILDFLAG(IS_CHROMEOS_ASH) +--- 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" + #include "chrome/browser/extensions/installed_loader.h" +-#include "chrome/browser/extensions/omaha_attributes_handler.h" + #include "chrome/browser/extensions/pending_extension_manager.h" + #include "chrome/browser/extensions/permissions_updater.h" + #include "chrome/browser/extensions/shared_module_service.h" +@@ -376,7 +375,6 @@ ExtensionService::ExtensionService(Profi + safe_browsing_verdict_handler_(extension_prefs, + ExtensionRegistry::Get(profile), + this), +- omaha_attributes_handler_(extension_prefs, this), + registry_(ExtensionRegistry::Get(profile)), + pending_extension_manager_(profile), + install_directory_(install_directory), +@@ -845,50 +843,6 @@ bool ExtensionService::IsExtensionEnable + return extension_registrar_.IsExtensionEnabled(extension_id); + } + +-void ExtensionService::PerformActionBasedOnOmahaAttributes( +- const std::string& extension_id, +- const base::Value& attributes) { +- DCHECK_CURRENTLY_ON(BrowserThread::UI); +- HandleMalwareOmahaAttribute(extension_id, attributes); +- omaha_attributes_handler_.PerformActionBasedOnOmahaAttributes(extension_id, +- attributes); +- allowlist_.PerformActionBasedOnOmahaAttributes(extension_id, attributes); +-} +- +-void ExtensionService::HandleMalwareOmahaAttribute( +- const std::string& extension_id, +- const base::Value& attributes) { +- bool has_malware_value = +- OmahaAttributesHandler::HasOmahaBlocklistStateInAttributes( +- attributes, BitMapBlocklistState::BLOCKLISTED_MALWARE); +- if (!base::FeatureList::IsEnabled( +- extensions_features::kDisableMalwareExtensionsRemotely) || +- !has_malware_value) { +- OmahaAttributesHandler::ReportNoUpdateCheckKeys(); +- // Omaha attributes may have previously have the "_malware" key. +- MaybeEnableRemotelyDisabledExtension(extension_id); +- return; +- } +- +- if (extension_prefs_->HasDisableReason( +- extension_id, disable_reason::DISABLE_REMOTELY_FOR_MALWARE)) { +- // The extension is already disabled. No work needs to be done. +- return; +- } +- +- OmahaAttributesHandler::ReportExtensionDisabledRemotely( +- extension_registrar_.IsExtensionEnabled(extension_id), +- ExtensionUpdateCheckDataKey::kMalware); +- +- // Add the extension to the blocklisted extensions set. +- UpdateBlocklistedExtensions({extension_id}, +- registry_->blocklisted_extensions().GetIDs()); +- extension_prefs_->AddDisableReason( +- extension_id, disable_reason::DISABLE_REMOTELY_FOR_MALWARE); +- // Show an error for the newly blocklisted extension. +- error_controller_->ShowErrorIfNeeded(); +-} +- + void ExtensionService::MaybeEnableRemotelyDisabledExtension( + const std::string& extension_id) { + CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); +@@ -904,56 +858,6 @@ void ExtensionService::MaybeEnableRemote + unchanged.erase(extension_id); + // Remove the extension from the blocklist. + UpdateBlocklistedExtensions({}, unchanged); +- OmahaAttributesHandler::ReportReenableExtension( +- ExtensionUpdateCheckDataKey::kMalware); +-} +- +-void ExtensionService::ClearGreylistedAcknowledgedStateAndMaybeReenable( +- const std::string& extension_id) { +- bool is_on_sb_list = (extension_prefs_->GetExtensionBlocklistState( +- extension_id) != NOT_BLOCKLISTED); +- bool is_on_omaha_list = +- blocklist_prefs::HasAnyOmahaGreylistState(extension_id, extension_prefs_); +- if (is_on_sb_list || is_on_omaha_list) { +- return; +- } +- // Clear all acknowledged states so the extension will still get disabled if +- // it is added to the greylist again. +- blocklist_prefs::ClearAcknowledgedBlocklistStates(extension_id, +- extension_prefs_); +- RemoveDisableReasonAndMaybeEnable(extension_id, +- disable_reason::DISABLE_GREYLIST); +-} +- +-void ExtensionService::MaybeDisableGreylistedExtension( +- const std::string& extension_id, +- BitMapBlocklistState new_state) { +-#if DCHECK_IS_ON() +- bool has_new_state_on_sb_list = +- (blocklist_prefs::BlocklistStateToBitMapBlocklistState( +- extension_prefs_->GetExtensionBlocklistState(extension_id)) == +- new_state); +- bool has_new_state_on_omaha_list = blocklist_prefs::HasOmahaBlocklistState( +- extension_id, new_state, extension_prefs_); +- DCHECK(has_new_state_on_sb_list || has_new_state_on_omaha_list); +-#endif +- if (blocklist_prefs::HasAcknowledgedBlocklistState(extension_id, new_state, +- extension_prefs_)) { +- // If the extension is already acknowledged, don't disable it again +- // because it can be already re-enabled by the user. This could happen if +- // the extension is added to the SafeBrowsing blocklist, and then +- // subsequently marked by Omaha. In this case, we don't want to disable the +- // extension twice. +- return; +- } +- +- // Set the current greylist states to acknowledge immediately because the +- // extension is disabled silently. Clear the other acknowledged state because +- // when the state changes to another greylist state in the future, we'd like +- // to disable the extension again. +- blocklist_prefs::UpdateCurrentGreylistStatesAsAcknowledged(extension_id, +- extension_prefs_); +- DisableExtension(extension_id, disable_reason::DISABLE_GREYLIST); + } + + void ExtensionService::RemoveDisableReasonAndMaybeEnable( +--- a/chrome/browser/extensions/extension_service.h ++++ b/chrome/browser/extensions/extension_service.h +@@ -25,7 +25,6 @@ + #include "chrome/browser/extensions/forced_extensions/force_installed_metrics.h" + #include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h" + #include "chrome/browser/extensions/install_gate.h" +-#include "chrome/browser/extensions/omaha_attributes_handler.h" + #include "chrome/browser/extensions/pending_extension_manager.h" + #include "chrome/browser/extensions/safe_browsing_verdict_handler.h" + #include "chrome/browser/profiles/profile_manager.h" +@@ -253,28 +252,11 @@ class ExtensionService : public Extensio + // nothing. + void EnableExtension(const std::string& extension_id); + +- // Takes Safe Browsing and Omaha blocklist states into account and decides +- // whether to remove greylist disabled reason. Called when a greylisted +- // state is removed from the Safe Browsing blocklist or Omaha blocklist. Also +- // clears all acknowledged states if the greylist disabled reason is removed. +- void ClearGreylistedAcknowledgedStateAndMaybeReenable( +- const std::string& extension_id); +- +- // Takes acknowledged blocklist states into account and decides whether to +- // disable the greylisted extension. Called when a new greylisted state is +- // added to the Safe Browsing blocklist or Omaha blocklist. +- void MaybeDisableGreylistedExtension(const std::string& extension_id, +- BitMapBlocklistState new_state); +- + // Removes the disable reason and enable the extension if there are no disable + // reasons left and is not blocked for another reason. + void RemoveDisableReasonAndMaybeEnable(const std::string& extension_id, + disable_reason::DisableReason reason); + +- // Performs action based on Omaha attributes for the extension. +- void PerformActionBasedOnOmahaAttributes(const std::string& extension_id, +- const base::Value& attributes); +- + // Disables the extension. If the extension is already disabled, just adds + // the |disable_reasons| (a bitmask of disable_reason::DisableReason - there + // can be multiple DisableReasons e.g. when an extension comes in disabled +@@ -551,11 +533,6 @@ class ExtensionService : public Extensio + // Helper method to determine if an extension can be blocked. + bool CanBlockExtension(const Extension* extension) const; + +- // Handles the malware Omaha attribute for remotely disabled extensions. +- // TODO(crbug.com/1193695): Move this function to OmahaAttributesHandler. +- void HandleMalwareOmahaAttribute(const std::string& extension_id, +- const base::Value& attributes); +- + // Enables an extension that was only previously disabled remotely. + void MaybeEnableRemotelyDisabledExtension(const std::string& extension_id); + +@@ -628,8 +605,6 @@ class ExtensionService : public Extensio + + SafeBrowsingVerdictHandler safe_browsing_verdict_handler_; + +- OmahaAttributesHandler omaha_attributes_handler_; +- + // Sets of enabled/disabled/terminated/blocklisted extensions. Not owned. + ExtensionRegistry* registry_ = nullptr; + +--- a/chrome/browser/extensions/extension_system_impl.cc ++++ b/chrome/browser/extensions/extension_system_impl.cc +@@ -469,8 +469,6 @@ void ExtensionSystemImpl::InstallUpdate( + void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes( + const std::string& extension_id, + const base::Value& attributes) { +- extension_service()->PerformActionBasedOnOmahaAttributes(extension_id, +- attributes); + } + + bool ExtensionSystemImpl::FinishDelayedInstallationIfReady( +--- a/chrome/browser/extensions/safe_browsing_verdict_handler.cc ++++ b/chrome/browser/extensions/safe_browsing_verdict_handler.cc +@@ -100,8 +100,6 @@ void SafeBrowsingVerdictHandler::UpdateG + greylist_.Remove(id); + extension_prefs_->SetExtensionBlocklistState(extension->id(), + NOT_BLOCKLISTED); +- extension_service_->ClearGreylistedAcknowledgedStateAndMaybeReenable( +- extension->id()); + } + + // Iterate over `greylist` instead of `not_yet_greylisted`, because the +@@ -119,9 +117,6 @@ void SafeBrowsingVerdictHandler::UpdateG + greylist_.Insert(extension); + BlocklistState greylist_state = state_map.find(id)->second; + extension_prefs_->SetExtensionBlocklistState(id, greylist_state); +- extension_service_->MaybeDisableGreylistedExtension( +- id, +- blocklist_prefs::BlocklistStateToBitMapBlocklistState(greylist_state)); + } + } + --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -25,7 +25,6 @@ - #include "chrome/browser/file_system_access/file_system_access_permission_context_factory.h" +@@ -35,7 +35,6 @@ #include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h" + #include "chrome/browser/installable/installable_utils.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h" #include "chrome/browser/ui/file_system_access_dialogs.h" #include "chrome/common/chrome_paths.h" #include "components/content_settings/core/browser/host_content_settings_map.h" -@@ -278,79 +277,6 @@ BindResultCallbackToCurrentSequence( +@@ -310,80 +309,6 @@ BindResultCallbackToCurrentSequence( base::SequencedTaskRunnerHandle::Get(), std::move(callback)); } @@ -500,6 +762,7 @@ - case Result::BLOCKED_PASSWORD_PROTECTED: - case Result::BLOCKED_TOO_LARGE: - case Result::BLOCKED_UNSUPPORTED_FILE_TYPE: +- case Result::DANGEROUS_ACCOUNT_COMPROMISE: - return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult:: - kBlock; - @@ -520,7 +783,7 @@ std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey : base::StrCat({kCustomLastPickedDirectoryKey, "-", id}); -@@ -825,28 +751,6 @@ void ChromeFileSystemAccessPermissionCon +@@ -1114,28 +1039,6 @@ void ChromeFileSystemAccessPermissionCon std::move(callback))); } @@ -551,7 +814,7 @@ const url::Origin& origin, --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h -@@ -63,10 +63,6 @@ class ChromeFileSystemAccessPermissionCo +@@ -81,10 +81,6 @@ class ChromeFileSystemAccessPermissionCo HandleType handle_type, content::GlobalFrameRoutingId frame_id, base::OnceCallback callback) override; @@ -582,10 +845,10 @@ // Do not allow picker UI to be shown on a page that isn't in the foreground --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -32,7 +32,6 @@ +@@ -31,7 +31,6 @@ + #include "chrome/browser/password_manager/field_info_manager_factory.h" #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/profiles/profile_metrics.h" -#include "chrome/browser/safe_browsing/chrome_password_protection_service.h" #include "chrome/browser/safe_browsing/user_interaction_observer.h" #include "chrome/browser/signin/identity_manager_factory.h" @@ -603,7 +866,7 @@ #if defined(OS_ANDROID) #include "base/feature_list.h" -@@ -798,6 +797,7 @@ autofill::LanguageCode ChromePasswordMan +@@ -804,6 +803,7 @@ autofill::LanguageCode ChromePasswordMan return autofill::LanguageCode(); } @@ -611,7 +874,7 @@ safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { return safe_browsing::ChromePasswordProtectionService:: -@@ -808,13 +808,6 @@ ChromePasswordManagerClient::GetPassword +@@ -814,13 +814,6 @@ ChromePasswordManagerClient::GetPassword void ChromePasswordManagerClient::CheckSafeBrowsingReputation( const GURL& form_action, const GURL& frame_url) { @@ -625,7 +888,7 @@ } #endif // defined(ON_FOCUS_PING_ENABLED) -@@ -824,22 +817,10 @@ void ChromePasswordManagerClient::CheckP +@@ -830,22 +823,10 @@ void ChromePasswordManagerClient::CheckP const std::vector& matching_reused_credentials, bool password_field_exists) { @@ -649,7 +912,7 @@ } ukm::SourceId ChromePasswordManagerClient::GetUkmSourceId() { -@@ -1294,9 +1275,11 @@ void ChromePasswordManagerClient::OnPast +@@ -1304,9 +1285,11 @@ void ChromePasswordManagerClient::OnPast } was_on_paste_called_ = true; @@ -662,7 +925,7 @@ void ChromePasswordManagerClient::RenderFrameCreated( content::RenderFrameHost* render_frame_host) { -@@ -1331,7 +1314,9 @@ void ChromePasswordManagerClient::OnInpu +@@ -1341,7 +1324,9 @@ void ChromePasswordManagerClient::OnInpu if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) { OnPaste(); } else { @@ -672,7 +935,7 @@ } #endif // defined(OS_ANDROID) } -@@ -1370,6 +1355,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1380,6 +1365,7 @@ bool ChromePasswordManagerClient::IsPass is_enabled = false; } @@ -680,7 +943,7 @@ // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Disable password -@@ -1380,6 +1366,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1390,6 +1376,7 @@ bool ChromePasswordManagerClient::IsPass observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -690,7 +953,7 @@ password_manager::BrowserSavePasswordProgressLogger logger( --- a/chrome/browser/password_manager/chrome_password_manager_client.h +++ b/chrome/browser/password_manager/chrome_password_manager_client.h -@@ -190,13 +190,14 @@ class ChromePasswordManagerClient +@@ -191,13 +191,14 @@ class ChromePasswordManagerClient void AnnotateNavigationEntry(bool has_password_field) override; autofill::LanguageCode GetPageLanguage() const override; @@ -706,7 +969,7 @@ void CheckProtectedPasswordEntry( password_manager::metrics_util::PasswordType reused_password_type, -@@ -204,6 +205,7 @@ class ChromePasswordManagerClient +@@ -205,6 +206,7 @@ class ChromePasswordManagerClient const std::vector& matching_reused_credentials, bool password_field_exists) override; @@ -742,18 +1005,19 @@ void AbusiveOriginPermissionRevocationRequest::OnSafeBrowsingVerdictReceived( --- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc +++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc -@@ -17,10 +17,8 @@ +@@ -17,11 +17,9 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h" #include "chrome/browser/permissions/quiet_notification_permission_ui_state.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_features.h" #include "components/permissions/permission_request.h" + #include "components/permissions/request_type.h" -#include "components/safe_browsing/core/db/database_manager.h" namespace { -@@ -150,9 +148,6 @@ void ContextualNotificationPermissionUiS +@@ -151,9 +149,6 @@ void ContextualNotificationPermissionUiS } void ContextualNotificationPermissionUiSelector::Cancel() { @@ -762,9 +1026,9 @@ - safe_browsing_request_.reset(); } - ContextualNotificationPermissionUiSelector:: -@@ -173,24 +168,14 @@ void ContextualNotificationPermissionUiS - base::Optional decision = + bool ContextualNotificationPermissionUiSelector::IsPermissionRequestSupported( +@@ -179,24 +174,14 @@ void ContextualNotificationPermissionUiS + absl::optional decision = GetDecisionBasedOnSiteReputation(reputation); - // If the PreloadData suggests this is an unacceptable site, ping Safe @@ -795,7 +1059,7 @@ void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived( --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -20,7 +20,6 @@ +@@ -22,7 +22,6 @@ #include "components/permissions/prediction_service/prediction_service.h" #include "components/permissions/prediction_service/prediction_service_messages.pb.h" #include "components/prefs/pref_service.h" @@ -803,16 +1067,37 @@ namespace { -@@ -197,8 +196,7 @@ bool PredictionBasedPermissionUiSelector +@@ -205,10 +204,8 @@ bool PredictionBasedPermissionUiSelector + permissions::RequestType request_type) { // We need to also check `kQuietNotificationPrompts` here since there is no // generic safeguard anywhere else in the stack. - return base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) && -- base::FeatureList::IsEnabled(features::kPermissionPredictions) && -- safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs())); -+ base::FeatureList::IsEnabled(features::kPermissionPredictions); - } - - // static +- if (!base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) || +- !safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) { ++ if (!base::FeatureList::IsEnabled(features::kQuietNotificationPrompts)) + return false; +- } + double hold_back_chance = 0.0; + bool is_permissions_predictions_enabled = false; + switch (request_type) { +--- a/chrome/browser/profiles/profile_info_cache.cc ++++ b/chrome/browser/profiles/profile_info_cache.cc +@@ -33,7 +33,6 @@ + #include "components/prefs/pref_registry_simple.h" + #include "components/prefs/pref_service.h" + #include "components/prefs/scoped_user_pref_update.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "ui/base/l10n/l10n_util.h" + #include "ui/base/resource/resource_bundle.h" + #include "ui/gfx/image/image.h" +@@ -165,8 +164,6 @@ void ProfileInfoCache::AddProfileToCache + info->SetBoolean(kIsUsingDefaultAvatarKey, true); + if (params.account_id.HasAccountIdKey()) + info->SetString(kAccountIdKey, params.account_id.GetAccountIdKey()); +- info->SetBoolKey(prefs::kSignedInWithCredentialProvider, +- params.is_signed_in_with_credential_provider); + cache->SetKey(key, base::Value::FromUniquePtrValue(std::move(info))); + ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted); + entry->InitializeLastNameToDisplay(); --- a/chrome/browser/reputation/reputation_service.cc +++ b/chrome/browser/reputation/reputation_service.cc @@ -119,9 +119,7 @@ void ReputationService::GetReputationSta @@ -826,6 +1111,32 @@ LookalikeUrlService* service = LookalikeUrlService::Get(profile_); if (service->EngagedSitesNeedUpdating()) { +--- a/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc ++++ b/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc +@@ -7,7 +7,6 @@ + #include "base/metrics/histogram_functions.h" + #include "chrome/browser/profiles/profile.h" + #include "components/prefs/pref_service.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + + namespace safe_browsing { + +@@ -17,15 +16,6 @@ SafeBrowsingMetricsProvider::~SafeBrowsi + + void SafeBrowsingMetricsProvider::ProvideCurrentSessionData( + metrics::ChromeUserMetricsExtension* uma_proto) { +- Profile* profile = cached_profile_.GetMetricsProfile(); +- +- if (!profile) +- return; +- +- SafeBrowsingState state = GetSafeBrowsingState(*profile->GetPrefs()); +- +- base::UmaHistogramEnumeration( +- "SafeBrowsing.Pref.MainProfile.SafeBrowsingState", state); + } + + } // namespace safe_browsing --- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc +++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc @@ -55,29 +55,7 @@ RealTimeUrlLookupServiceFactory::RealTim @@ -878,6 +1189,28 @@ } content::BrowserContext* SCTReportingServiceFactory::GetBrowserContextToUse( +--- a/chrome/browser/subresource_filter/chrome_content_subresource_filter_throttle_manager_factory.cc ++++ b/chrome/browser/subresource_filter/chrome_content_subresource_filter_throttle_manager_factory.cc +@@ -6,7 +6,6 @@ + + #include "chrome/browser/browser_process.h" + #include "chrome/browser/profiles/profile.h" +-#include "chrome/browser/safe_browsing/safe_browsing_service.h" + #include "chrome/browser/subresource_filter/subresource_filter_profile_context_factory.h" + #include "components/safe_browsing/core/db/database_manager.h" + #include "components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h" +@@ -18,10 +17,7 @@ namespace { + // available. Otherwise returns nullptr. + const scoped_refptr + GetDatabaseManagerFromSafeBrowsingService() { +- safe_browsing::SafeBrowsingService* safe_browsing_service = +- g_browser_process->safe_browsing_service(); +- return safe_browsing_service ? safe_browsing_service->database_manager() +- : nullptr; ++ return nullptr; + } + + } // namespace --- a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc +++ b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc @@ -36,6 +36,7 @@ JavaScriptTabModalDialogManagerDelegateD @@ -942,9 +1275,9 @@ } --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc -@@ -778,9 +778,7 @@ void DownloadItemView::UpdateLabels() { - - deep_scanning_label_->SetVisible(mode_ == Mode::kDeepScanning); +@@ -789,9 +789,7 @@ void DownloadItemView::UpdateLabels() { + deep_scanning_label_->SetVisible(mode_ == + download::DownloadItemMode::kDeepScanning); if (deep_scanning_label_->GetVisible()) { - const int id = (model_->download() && - safe_browsing::DeepScanningRequest::ShouldUploadBinary( @@ -953,12 +1286,12 @@ ? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD : IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD; const std::u16string filename = ElidedFilename(*deep_scanning_label_); -@@ -804,11 +802,15 @@ void DownloadItemView::UpdateButtons() { +@@ -815,11 +813,15 @@ void DownloadItemView::UpdateButtons() { } const bool allow_open_during_deep_scan = +#if BUILDFLAG(FULL_SAFE_BROWSING) - (mode_ == Mode::kDeepScanning) && + (mode_ == download::DownloadItemMode::kDeepScanning) && !enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext( model_->profile()) ->DelayUntilVerdict( @@ -966,10 +1299,10 @@ +#else + false; +#endif // BUILDFLAG(FULL_SAFE_BROWSING) - open_button_->SetEnabled((mode_ == Mode::kNormal) || prompt_to_scan || - allow_open_during_deep_scan); + open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) || + prompt_to_scan || allow_open_during_deep_scan); -@@ -1237,7 +1239,9 @@ void DownloadItemView::ShowContextMenuIm +@@ -1261,7 +1263,9 @@ void DownloadItemView::ShowContextMenuIm } void DownloadItemView::OpenDownloadDuringAsyncScanning() { @@ -981,16 +1314,16 @@ --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -75,8 +75,6 @@ +@@ -76,8 +76,6 @@ #include "components/prefs/pref_service.h" #include "components/reading_list/features/reading_list_switches.h" #include "components/safe_browsing/buildflags.h" -#include "components/safe_browsing/content/web_ui/safe_browsing_ui.h" -#include "components/safe_browsing/core/web_ui/constants.h" - #include "components/search/ntp_features.h" #include "components/security_interstitials/content/connection_help_ui.h" #include "components/security_interstitials/content/known_interception_disclosure_ui.h" -@@ -588,8 +586,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc + #include "components/security_interstitials/content/urls.h" +@@ -615,8 +613,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc return &NewWebUI; if (url.host_piece() == chrome::kChromeUIQuotaInternalsHost) return &NewWebUI; @@ -1001,7 +1334,7 @@ if (url.host_piece() == chrome::kChromeUISuggestionsHost) --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -357,7 +357,6 @@ void DownloadsDOMHandler::OpenDuringScan +@@ -360,7 +360,6 @@ void DownloadsDOMHandler::OpenDuringScan if (download) { DownloadItemModel model(download); model.SetOpenWhenComplete(true); @@ -1011,24 +1344,22 @@ --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -790,14 +790,6 @@ base::Value ManagementUIHandler::GetThre +@@ -801,12 +801,6 @@ base::Value ManagementUIHandler::GetThre + &info); + } - auto* on_page_visited_event = - chrome_policies.GetValue(policy::key::kEnterpriseRealTimeUrlCheckMode); -- if (on_page_visited_event && on_page_visited_event->is_int() && -- on_page_visited_event->GetInt() != -- safe_browsing::REAL_TIME_CHECK_DISABLED) { -- base::Value value(base::Value::Type::DICTIONARY); -- value.SetStringKey("title", kManagementOnPageVisitedEvent); -- value.SetStringKey("permission", kManagementOnPageVisitedVisibleData); -- info.Append(std::move(value)); +- if (connectors_service->GetAppliedRealTimeUrlCheck() != +- safe_browsing::REAL_TIME_CHECK_DISABLED) { +- AddThreatProtectionPermission(kManagementOnPageVisitedEvent, +- kManagementOnPageVisitedVisibleData, &info); - } - +- #if BUILDFLAG(IS_CHROMEOS_ASH) std::string enterprise_manager = GetDeviceManager(); + if (enterprise_manager.empty()) --- a/components/password_manager/content/browser/content_password_manager_driver.cc +++ b/components/password_manager/content/browser/content_password_manager_driver.cc -@@ -316,7 +316,7 @@ void ContentPasswordManagerDriver::Check +@@ -318,7 +318,7 @@ void ContentPasswordManagerDriver::Check if (client_->GetMetricsRecorder()) { client_->GetMetricsRecorder()->RecordUserFocusedPasswordField(); } @@ -1088,7 +1419,7 @@ } --- a/components/safe_browsing/content/common/safe_browsing.mojom +++ b/components/safe_browsing/content/common/safe_browsing.mojom -@@ -117,7 +117,6 @@ enum PhishingDetectorResult { +@@ -120,7 +120,6 @@ enum PhishingDetectorResult { INVALID_SCORE = 4, }; @@ -1187,7 +1518,7 @@ PasswordProtectionServiceBase::GetPasswordProtectionReusedPasswordType( --- a/components/safe_browsing/core/password_protection/password_protection_service_base.h +++ b/components/safe_browsing/core/password_protection/password_protection_service_base.h -@@ -23,7 +23,6 @@ +@@ -22,7 +22,6 @@ #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/core/browser/referrer_chain_provider.h" #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h" @@ -1195,7 +1526,7 @@ #include "components/safe_browsing/core/db/database_manager.h" #include "components/safe_browsing/core/db/v4_protocol_manager_util.h" #include "components/safe_browsing/core/password_protection/metrics_util.h" -@@ -143,10 +142,6 @@ class PasswordProtectionServiceBase : pu +@@ -142,10 +141,6 @@ class PasswordProtectionServiceBase : pu // Returns if the warning UI is enabled. bool IsWarningEnabled(ReusedPasswordAccountType password_type); @@ -1208,7 +1539,7 @@ // policy. --- a/content/browser/file_system_access/file_system_access_file_writer_impl.cc +++ b/content/browser/file_system_access/file_system_access_file_writer_impl.cc -@@ -335,15 +335,8 @@ void FileSystemAccessFileWriterImpl::Clo +@@ -338,15 +338,8 @@ void FileSystemAccessFileWriterImpl::Clo close_callback_ = std::move(callback); @@ -1226,7 +1557,7 @@ } void FileSystemAccessFileWriterImpl::AbortImpl(AbortCallback callback) { -@@ -363,35 +356,6 @@ void FileSystemAccessFileWriterImpl::Abo +@@ -366,35 +359,6 @@ void FileSystemAccessFileWriterImpl::Abo manager()->RemoveFileWriter(this); } @@ -1289,3 +1620,29 @@ // Returns whether the give |origin| already allows read permission, or it is // possible to request one. This is used to block file dialogs from being +--- a/extensions/browser/updater/update_service.cc ++++ b/extensions/browser/updater/update_service.cc +@@ -111,13 +111,6 @@ void UpdateService::OnEvent(Events event + break; + } + +- if (should_perform_action_on_omaha_attributes) { +- base::Value attributes = GetExtensionOmahaAttributes(extension_id); +- // Note that it's important to perform actions even if |attributes| is +- // empty, missing values may default to false and have associated logic. +- ExtensionSystem::Get(browser_context_) +- ->PerformActionBasedOnOmahaAttributes(extension_id, attributes); +- } + } + + UpdateService::UpdateService( +--- a/weblayer/BUILD.gn ++++ b/weblayer/BUILD.gn +@@ -451,7 +451,6 @@ source_set("weblayer_lib_base") { + "//components/pref_registry:pref_registry", + "//components/prefs", + "//components/profile_metrics", +- "//components/safe_browsing/content/browser:client_side_detection", + "//components/safe_browsing/content/common:interfaces", + "//components/safe_browsing/content/renderer:throttles", + "//components/safe_browsing/content/renderer/phishing_classifier", diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 96249cbd..45773e58 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -4,15 +4,15 @@ --- a/android_webview/browser/aw_browser_context.cc +++ b/android_webview/browser/aw_browser_context.cc -@@ -47,7 +47,6 @@ - #include "components/prefs/pref_registry_simple.h" - #include "components/prefs/pref_service.h" +@@ -49,7 +49,6 @@ #include "components/prefs/pref_service_factory.h" + #include "components/prefs/segregated_pref_store.h" + #include "components/profile_metrics/browser_profile_type.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/url_formatter/url_fixer.h" #include "components/user_prefs/user_prefs.h" #include "components/visitedlink/browser/visitedlink_writer.h" -@@ -453,8 +452,6 @@ void AwBrowserContext::RebuildTable( +@@ -457,8 +456,6 @@ void AwBrowserContext::RebuildTable( } void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) { @@ -23,9 +23,9 @@ // TODO(amalova): Make sure NetworkContextParams is configured correctly when --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -1431,78 +1431,9 @@ +@@ -1491,78 +1491,9 @@ - Pre-fetches information from pages, including pages you have not yet visited. Information fetched may include cookies, if you allow cookies. + Preloads pages that Chrome thinks you might visit. To do this, Chrome may use cookies, if you allow cookies, and may encrypt and send pages through Google to hide your identity from sites. - - Safe Browsing (protects you and your device from dangerous sites) @@ -152,7 +152,7 @@ jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const { --- a/chrome/browser/android/signin/signin_manager_android.h +++ b/chrome/browser/android/signin/signin_manager_android.h -@@ -117,9 +117,6 @@ class SigninManagerAndroid : public Keye +@@ -113,9 +113,6 @@ class SigninManagerAndroid : public Keye Profile* const profile_ = nullptr; @@ -183,7 +183,7 @@ --- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc +++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc -@@ -35,7 +35,6 @@ +@@ -37,7 +37,6 @@ #include "components/arc/session/arc_session.h" #include "components/crx_file/id_util.h" #include "components/prefs/pref_service.h" @@ -193,7 +193,7 @@ #include "extensions/common/extension_builder.h" --- a/chrome/browser/ash/login/signin/device_id_browsertest.cc +++ b/chrome/browser/ash/login/signin/device_id_browsertest.cc -@@ -23,7 +23,6 @@ +@@ -24,7 +24,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/prefs/pref_service.h" @@ -201,7 +201,7 @@ #include "components/user_manager/known_user.h" #include "components/user_manager/user_manager.h" #include "content/public/test/browser_test.h" -@@ -250,15 +249,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE +@@ -251,15 +250,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword, kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId); @@ -217,7 +217,7 @@ // Can't use SetKnownUserDeviceId here, because it forbids changing a device // ID. user_manager::known_user::SetStringPref( -@@ -283,13 +273,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE +@@ -284,13 +274,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword, kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId); @@ -233,7 +233,7 @@ user_manager::known_user::SetStringPref( --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -264,7 +264,6 @@ +@@ -267,7 +267,6 @@ #include "components/safe_browsing/content/browser/browser_url_loader_throttle.h" #include "components/safe_browsing/content/password_protection/password_protection_navigation_throttle.h" #include "components/safe_browsing/core/browser/url_checker_delegate.h" @@ -241,7 +241,7 @@ #include "components/safe_browsing/core/db/database_manager.h" #include "components/safe_browsing/core/features.h" #include "components/safe_browsing/core/realtime/policy_engine.h" -@@ -274,7 +273,6 @@ +@@ -277,7 +276,6 @@ #include "components/security_interstitials/content/ssl_cert_reporter.h" #include "components/security_interstitials/content/ssl_error_handler.h" #include "components/security_interstitials/content/ssl_error_navigation_throttle.h" @@ -271,7 +271,7 @@ namespace policy { --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc -@@ -98,7 +98,6 @@ +@@ -99,7 +99,6 @@ #include "components/prefs/pref_service.h" #include "components/reputation/core/safety_tip_test_utils.h" #include "components/safe_browsing/buildflags.h" @@ -281,7 +281,7 @@ #include "components/safe_browsing/core/safe_browsing_service_interface.h" --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -699,6 +699,7 @@ void DownloadItemModel::ExecuteCommand(D +@@ -719,6 +719,7 @@ void DownloadItemModel::ExecuteCommand(D DownloadUIModel::ExecuteCommand(download_commands, command); break; case DownloadCommands::DEEP_SCAN: @@ -289,7 +289,7 @@ safe_browsing::SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); if (!sb_service) -@@ -724,6 +725,7 @@ void DownloadItemModel::ExecuteCommand(D +@@ -744,6 +745,7 @@ void DownloadItemModel::ExecuteCommand(D safe_browsing::DeepScanningRequest::DeepScanTrigger:: TRIGGER_APP_PROMPT, std::move(settings)); @@ -327,28 +327,28 @@ #include "components/user_prefs/user_prefs.h" @@ -345,20 +344,6 @@ std::vector ConnectorsServi - base::Optional ConnectorsService::GetDMTokenForRealTimeUrlCheck() + absl::optional ConnectorsService::GetDMTokenForRealTimeUrlCheck() const { - if (!ConnectorsEnabled()) -- return base::nullopt; +- return absl::nullopt; - - if (Profile::FromBrowserContext(context_)->GetPrefs()->GetInteger( - prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode) == - safe_browsing::REAL_TIME_CHECK_DISABLED) { -- return base::nullopt; +- return absl::nullopt; - } - -- base::Optional dm_token = +- absl::optional dm_token = - GetDmToken(prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope); - - if (dm_token.has_value()) - return dm_token.value().value; - return base::nullopt; + return absl::nullopt; } --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc -@@ -55,7 +55,6 @@ +@@ -56,7 +56,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_reconcilor.h" #include "components/signin/public/base/list_accounts_test_utils.h" @@ -358,7 +358,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" --- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc +++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc -@@ -29,7 +29,6 @@ +@@ -30,7 +30,6 @@ #include "chrome/common/channel_info.h" #include "chrome/common/extensions/api/identity.h" #include "components/prefs/pref_service.h" @@ -366,7 +366,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/accounts_in_cookie_jar_info.h" -@@ -71,7 +70,7 @@ const char* const kExtensionsIdentityAPI +@@ -72,7 +71,7 @@ const char* const kExtensionsIdentityAPI "extensions_identity_api"; bool IsBrowserSigninAllowed(Profile* profile) { @@ -377,7 +377,7 @@ std::string GetOAuth2MintTokenFlowVersion() { --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc -@@ -34,7 +34,6 @@ +@@ -35,7 +35,6 @@ #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/proxy_config/proxy_config_pref_names.h" @@ -385,7 +385,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" #include "extensions/browser/extension_pref_value_map.h" -@@ -108,11 +107,6 @@ const PrefMappingEntry kPrefMapping[] = +@@ -109,11 +108,6 @@ const PrefMappingEntry kPrefMapping[] = APIPermissionID::kPrivacy}, {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy, APIPermissionID::kPrivacy}, @@ -397,7 +397,7 @@ {"searchSuggestEnabled", prefs::kSearchSuggestEnabled, APIPermissionID::kPrivacy, APIPermissionID::kPrivacy}, {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, -@@ -813,18 +807,6 @@ ExtensionFunction::ResponseAction SetPre +@@ -842,18 +836,6 @@ ExtensionFunction::ResponseAction SetPre base::Value(browser_pref_value->GetBool())); } @@ -416,7 +416,7 @@ preference_api->SetExtensionControlledPref( extension_id(), browser_pref, scope, base::Value::FromUniquePtrValue(std::move(browser_pref_value))); -@@ -878,18 +860,6 @@ ExtensionFunction::ResponseAction ClearP +@@ -907,18 +889,6 @@ ExtensionFunction::ResponseAction ClearP PreferenceAPI::Get(browser_context()) ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); @@ -471,7 +471,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 -@@ -39,7 +39,6 @@ +@@ -36,7 +36,6 @@ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/content/web_ui/safe_browsing_ui.h" @@ -491,7 +491,7 @@ #include "content/public/test/browser_task_environment.h" --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -41,7 +41,6 @@ +@@ -43,7 +43,6 @@ #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/proxy_config/proxy_config_pref_names.h" @@ -499,7 +499,7 @@ #include "components/search_engines/default_search_manager.h" #include "components/spellcheck/browser/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" -@@ -282,18 +281,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -287,18 +286,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::PREF_TYPE_BOOLEAN; } @@ -520,7 +520,7 @@ settings_api::PrefType::PREF_TYPE_BOOLEAN; --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc -@@ -643,9 +643,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore +@@ -642,9 +642,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, GetReferrerChainForNonSafeBrowsingUser) { PrefService* pref_service = browser()->profile()->GetPrefs(); @@ -529,7 +529,7 @@ - pref_service->SetBoolean(prefs::kSafeBrowsingEnabled, false); GURL page_url = GetTestServerURLWithReferrers("empty_referrer_chain.html"); - ASSERT_TRUE(RunExtensionTest({.page_url = page_url.spec().c_str()})); + ASSERT_TRUE(OpenTestURL(page_url)); --- a/chrome/browser/extensions/extension_allowlist.cc +++ b/chrome/browser/extensions/extension_allowlist.cc @@ -9,7 +9,6 @@ @@ -585,7 +585,7 @@ } // namespace extensions --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc -@@ -696,12 +696,6 @@ void InstalledLoader::RecordExtensionsMe +@@ -708,12 +708,6 @@ void InstalledLoader::RecordExtensionsMe enabled_not_allowlisted_count); base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled", disabled_not_allowlisted_count); @@ -608,7 +608,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/network_service_instance.h" -@@ -756,13 +755,6 @@ void ProfileNetworkContextService::Confi +@@ -742,13 +741,6 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; network_context_params->enable_expect_ct_reporting = true; @@ -733,7 +733,7 @@ identity_manager_observer_.Observe(identity_manager); --- a/chrome/browser/password_manager/password_store_factory.cc +++ b/chrome/browser/password_manager/password_store_factory.cc -@@ -164,16 +164,6 @@ PasswordStoreFactory::BuildServiceInstan +@@ -163,16 +163,6 @@ PasswordStoreFactory::BuildServiceInstan profile->GetPrefs(), base::TimeDelta::FromSeconds(60), network_context_getter); @@ -809,7 +809,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/driver/sync_policy_handler.h" -@@ -192,12 +189,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -201,12 +198,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kQuicAllowed, prefs::kQuicAllowed, base::Value::Type::BOOLEAN }, @@ -822,7 +822,7 @@ { key::kUrlKeyedAnonymizedDataCollectionEnabled, unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, base::Value::Type::BOOLEAN }, -@@ -327,15 +318,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -336,15 +327,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGloballyScopeHTTPAuthCacheEnabled, prefs::kGloballyScopeHTTPAuthCacheEnabled, base::Value::Type::BOOLEAN }, @@ -838,7 +838,7 @@ { key::kSafeSitesFilterBehavior, policy_prefs::kSafeSitesFilterBehavior, base::Value::Type::INTEGER }, -@@ -447,18 +429,12 @@ const PolicyToPreferenceMapEntry kSimple +@@ -456,18 +438,12 @@ const PolicyToPreferenceMapEntry kSimple { key::kMaxConnectionsPerProxy, prefs::kMaxConnectionsPerProxy, base::Value::Type::INTEGER }, @@ -857,7 +857,7 @@ { key::kCECPQ2Enabled, prefs::kCECPQ2Enabled, base::Value::Type::BOOLEAN }, -@@ -637,9 +613,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -649,9 +625,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kIntranetRedirectBehavior, omnibox::kIntranetRedirectBehavior, base::Value::Type::INTEGER }, @@ -867,7 +867,7 @@ { key::kAccessibilityImageLabelsEnabled, prefs::kAccessibilityImageLabelsEnabled, base::Value::Type::BOOLEAN }, -@@ -1510,8 +1483,6 @@ std::unique_ptrAddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); @@ -876,7 +876,7 @@ handlers->AddHandler(std::make_unique( std::make_unique(key::kAuthServerWhitelist, prefs::kAuthServerAllowlist, -@@ -1535,9 +1506,6 @@ std::unique_ptrAddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); -@@ -1546,12 +1514,6 @@ std::unique_ptrAddHandler(std::make_unique( key::kURLAllowlist, policy_prefs::kUrlAllowlist, base::Value::Type::LIST)); @@ -899,7 +899,7 @@ handlers->AddHandler( std::make_unique()); -@@ -1629,12 +1591,6 @@ std::unique_ptrAddHandler(std::make_unique( + handlers->AddHandler(std::make_unique( key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, -@@ -1669,17 +1625,6 @@ std::unique_ptr( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); @@ -932,7 +932,7 @@ std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -133,7 +133,6 @@ +@@ -135,7 +135,6 @@ #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/proxy_config/pref_proxy_config_tracker_impl.h" @@ -940,7 +940,7 @@ #include "components/search_engines/template_url_prepopulate_data.h" #include "components/security_interstitials/content/insecure_form_blocking_page.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" -@@ -709,7 +708,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -751,7 +750,6 @@ void RegisterLocalState(PrefRegistrySimp ProfileNetworkContextService::RegisterLocalStatePrefs(registry); profiles::RegisterPrefs(registry); RegisterScreenshotPrefs(registry); @@ -948,7 +948,7 @@ secure_origin_allowlist::RegisterPrefs(registry); sessions::SessionIdGenerator::RegisterPrefs(registry); SSLConfigServiceManager::RegisterPrefs(registry); -@@ -952,7 +950,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -995,7 +993,6 @@ void RegisterProfilePrefs(user_prefs::Pr PushMessagingAppIdentifier::RegisterProfilePrefs(registry); QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); @@ -1073,9 +1073,9 @@ #include "components/profile_metrics/state.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/account_info.h" + #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/resource/resource_bundle.h" - #include "ui/gfx/canvas.h" -@@ -418,7 +417,7 @@ bool ProfileAttributesEntry::IsAuthError +@@ -422,7 +421,7 @@ bool ProfileAttributesEntry::IsAuthError } bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const { @@ -1096,7 +1096,7 @@ void ProfileAttributesEntry::LockForceSigninProfile(bool is_lock) { --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -137,7 +137,6 @@ +@@ -140,7 +140,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/profile_metrics/browser_profile_type.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" @@ -1106,7 +1106,7 @@ #include "components/sync_preferences/pref_service_syncable.h" --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -91,7 +91,6 @@ +@@ -92,7 +92,6 @@ #include "components/search_engines/default_search_manager.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -1114,7 +1114,7 @@ #include "components/signin/public/identity_manager/consent_level.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -1961,8 +1960,7 @@ void ProfileManager::AddProfileToStorage +@@ -2055,8 +2054,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1124,13 +1124,14 @@ #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -2025,14 +2023,11 @@ void ProfileManager::AddProfileToStorage - entry->SetIsOmitted(true); +@@ -2116,15 +2114,13 @@ void ProfileManager::AddProfileToStorage } -- entry->SetSignedInWithCredentialProvider( -- profile->GetPrefs()->GetBoolean(prefs::kSignedInWithCredentialProvider)); -+ entry->SetSignedInWithCredentialProvider(false); + init_params.is_signed_in_with_credential_provider = +- profile->GetPrefs()->GetBoolean(prefs::kSignedInWithCredentialProvider); ++ false; + + storage.AddProfile(std::move(init_params)); } void ProfileManager::SetNonPersonalProfilePrefs(Profile* profile) { @@ -1177,7 +1178,7 @@ --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -713,48 +713,6 @@ +@@ -718,48 +718,6 @@ @@ -1383,7 +1384,7 @@ /** --- a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js +++ b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js -@@ -217,8 +217,6 @@ const SiteSettingsBehaviorImpl = { +@@ -218,8 +218,6 @@ const SiteSettingsBehaviorImpl = { ContentSettingsTypes.BLUETOOTH_SCANNING, 'enableExperimentalWebPlatformFeatures'); addOrRemoveSettingWithFlag( @@ -1405,7 +1406,7 @@ route: routes.SITE_SETTINGS_AR, --- a/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc +++ b/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc -@@ -17,7 +17,6 @@ +@@ -19,7 +19,6 @@ #include "components/prefs/testing_pref_service.h" #include "components/safe_browsing/content/triggers/ad_redirect_trigger.h" #include "components/safe_browsing/content/triggers/mock_trigger_manager.h" @@ -1663,7 +1664,7 @@ #include "components/sync/driver/sync_service.h" --- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc -@@ -34,7 +34,6 @@ +@@ -33,7 +33,6 @@ #include "components/enterprise/common/strings.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/content/web_ui/safe_browsing_ui.h" @@ -1930,7 +1931,7 @@ // static --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -90,7 +90,6 @@ base::FilePath SafeBrowsingService::GetB +@@ -91,7 +91,6 @@ base::FilePath SafeBrowsingService::GetB SafeBrowsingService::SafeBrowsingService() : services_delegate_(ServicesDelegate::Create(this)), @@ -1938,7 +1939,7 @@ shutdown_(false), enabled_(false), enabled_by_prefs_(false) {} -@@ -235,8 +234,6 @@ TriggerManager* SafeBrowsingService::tri +@@ -236,8 +235,6 @@ TriggerManager* SafeBrowsingService::tri PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService( Profile* profile) const { @@ -1947,7 +1948,7 @@ return nullptr; } -@@ -362,9 +359,6 @@ void SafeBrowsingService::OnProfileAdded +@@ -363,9 +360,6 @@ void SafeBrowsingService::OnProfileAdded std::unique_ptr registrar = std::make_unique(); registrar->Init(pref_service); @@ -1957,7 +1958,7 @@ // ClientSideDetectionService will need to be refresh the models // renderers have if extended-reporting changes. registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled, -@@ -376,14 +370,6 @@ void SafeBrowsingService::OnProfileAdded +@@ -377,14 +371,6 @@ void SafeBrowsingService::OnProfileAdded prefs_map_[pref_service] = std::move(registrar); RefreshState(); @@ -1972,7 +1973,7 @@ // Extended Reporting metrics are handled together elsewhere. RecordExtendedReportingMetrics(*pref_service); -@@ -423,18 +409,6 @@ void SafeBrowsingService::RefreshState() +@@ -424,18 +410,6 @@ void SafeBrowsingService::RefreshState() DCHECK_CURRENTLY_ON(BrowserThread::UI); // Check if any profile requires the service to be active. enabled_by_prefs_ = false; @@ -2103,7 +2104,7 @@ #include "google_apis/google_api_keys.h" #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -92,7 +91,6 @@ AccountConsistencyModeManager::AccountCo +@@ -96,7 +95,6 @@ AccountConsistencyModeManager::AccountCo // pref. bool signin_allowed = IsDiceSignInAllowed() && prefs->GetBoolean(prefs::kSigninAllowedOnNextStartup); @@ -2111,8 +2112,8 @@ UMA_HISTOGRAM_BOOLEAN("Signin.SigninAllowed", signin_allowed); #endif -@@ -207,16 +205,7 @@ AccountConsistencyModeManager::ComputeAc - : AccountConsistencyMethod::kDisabled; +@@ -215,16 +213,7 @@ AccountConsistencyModeManager::ComputeAc + // AccountManager is not available, when DICE has been disabled on Lacros. #endif -#if BUILDFLAG(ENABLE_DICE_SUPPORT) @@ -2300,8 +2301,8 @@ - profile->GetPrefs()->SetBoolean(prefs::kSignedInWithCredentialProvider, true); } - // Extracts preferences to consider while signing in through credential -@@ -350,20 +346,7 @@ bool ReauthWithCredentialProviderIfPossi + // Extracts the |cred_provider_gaia_id| and |cred_provider_email| for the user +@@ -313,20 +309,7 @@ bool ReauthWithCredentialProviderIfPossi // - The profile is marked as having been signed in with a system credential. // - The profile is already signed in. // - The profile is in an auth error state. @@ -2352,7 +2353,7 @@ #include "content/public/browser/network_service_instance.h" #include "content/public/browser/storage_partition.h" #include "net/traffic_annotation/network_traffic_annotation.h" -@@ -120,8 +119,5 @@ void SCTReportingService::SetReportingEn +@@ -119,8 +118,5 @@ void SCTReportingService::SetReportingEn } void SCTReportingService::OnPreferenceChanged() { @@ -2364,7 +2365,7 @@ } --- a/chrome/browser/ssl/ssl_browsertest.cc +++ b/chrome/browser/ssl/ssl_browsertest.cc -@@ -92,7 +92,6 @@ +@@ -93,7 +93,6 @@ #include "components/policy/core/common/policy_types.h" #include "components/policy/policy_constants.h" #include "components/prefs/testing_pref_service.h" @@ -2384,7 +2385,7 @@ #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" --- a/chrome/browser/supervised_user/supervised_user_pref_store.cc +++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc -@@ -22,7 +22,6 @@ +@@ -23,7 +23,6 @@ #include "chrome/common/pref_names.h" #include "components/feed/core/shared_prefs/pref_names.h" #include "components/prefs/pref_value_map.h" @@ -2392,7 +2393,7 @@ #include "extensions/buildflags/buildflags.h" namespace { -@@ -54,10 +53,6 @@ SupervisedUserSettingsPrefMappingEntry k +@@ -55,10 +54,6 @@ SupervisedUserSettingsPrefMappingEntry k prefs::kSupervisedUserSafeSites, }, { @@ -2403,7 +2404,7 @@ supervised_users::kUserName, prefs::kProfileName, }, -@@ -123,7 +118,6 @@ void SupervisedUserPrefStore::OnNewSetti +@@ -124,7 +119,6 @@ void SupervisedUserPrefStore::OnNewSetti prefs_->SetInteger(prefs::kForceYouTubeRestrict, safe_search_util::YOUTUBE_RESTRICT_MODERATE); prefs_->SetBoolean(prefs::kHideWebStoreIcon, false); @@ -2423,15 +2424,15 @@ #include "components/sync/driver/sync_service.h" --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -55,7 +55,6 @@ - #include "components/dom_distiller/core/dom_distiller_features.h" +@@ -57,7 +57,6 @@ #include "components/prefs/pref_service.h" #include "components/sessions/core/tab_restore_service.h" + #include "components/signin/public/base/signin_buildflags.h" -#include "components/signin/public/base/signin_pref_names.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" -@@ -183,10 +182,6 @@ BrowserCommandController::BrowserCommand +@@ -184,10 +183,6 @@ BrowserCommandController::BrowserCommand &BrowserCommandController::UpdateCommandsForFullscreenMode, base::Unretained(this))); #endif @@ -2442,7 +2443,7 @@ InitCommandState(); -@@ -1523,7 +1518,7 @@ void BrowserCommandController::UpdateSho +@@ -1495,7 +1490,7 @@ void BrowserCommandController::UpdateSho return; command_updater_.UpdateCommandEnabled( @@ -2453,7 +2454,7 @@ // static --- a/chrome/browser/ui/browser_command_controller.h +++ b/chrome/browser/ui/browser_command_controller.h -@@ -215,7 +215,6 @@ class BrowserCommandController : public +@@ -207,7 +207,6 @@ class BrowserCommandController : public PrefChangeRegistrar profile_pref_registrar_; PrefChangeRegistrar local_pref_registrar_; @@ -2473,7 +2474,7 @@ #include "ui/events/keycodes/keyboard_codes.h" --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -74,7 +74,6 @@ +@@ -61,7 +61,6 @@ #if !defined(OS_ANDROID) #include "chrome/browser/signin/identity_manager_factory.h" @@ -2481,7 +2482,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif -@@ -483,13 +482,7 @@ void ShowBrowserSignin(Browser* browser, +@@ -478,13 +477,7 @@ void ShowBrowserSignin(Browser* browser, void ShowBrowserSigninOrSettings(Browser* browser, signin_metrics::AccessPoint access_point) { @@ -2508,7 +2509,7 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -52,7 +52,6 @@ +@@ -53,7 +53,6 @@ #include "chrome/grit/generated_resources.h" #include "chrome/grit/theme_resources.h" #include "components/signin/core/browser/signin_error_controller.h" @@ -2516,7 +2517,7 @@ #include "components/signin/public/identity_manager/consent_level.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/strings/grit/components_strings.h" -@@ -566,11 +565,6 @@ void ProfileMenuView::BuildAutofillButto +@@ -548,11 +547,6 @@ void ProfileMenuView::BuildAutofillButto void ProfileMenuView::BuildSyncInfo() { Profile* profile = browser()->profile(); @@ -2530,9 +2531,9 @@ IdentityManagerFactory::GetForProfile(profile); --- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc -@@ -49,7 +49,6 @@ - #include "chrome/test/base/ui_test_utils.h" - #include "components/autofill/core/common/autofill_payments_features.h" +@@ -56,7 +56,6 @@ + #include "components/feature_engagement/public/tracker.h" + #include "components/feature_engagement/test/test_tracker.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/consent_level.h" @@ -2540,7 +2541,7 @@ #include "components/sync/driver/sync_service.h" --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc -@@ -117,7 +117,6 @@ PasswordReuseModalWarningDialog::Passwor +@@ -118,7 +118,6 @@ PasswordReuseModalWarningDialog::Passwor OnWarningDone done_callback) : content::WebContentsObserver(web_contents), done_callback_(std::move(done_callback)), @@ -2548,7 +2549,7 @@ url_(web_contents->GetLastCommittedURL()), password_type_(password_type) { bool show_check_passwords = false; -@@ -158,34 +157,13 @@ PasswordReuseModalWarningDialog::Passwor +@@ -159,34 +158,13 @@ PasswordReuseModalWarningDialog::Passwor SetCancelCallback(make_done_callback(WarningAction::IGNORE_WARNING)); SetCloseCallback(make_done_callback(WarningAction::CLOSE)); @@ -2606,36 +2607,6 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" ---- a/chrome/browser/ui/webui/app_launcher_login_handler.cc -+++ b/chrome/browser/ui/webui/app_launcher_login_handler.cc -@@ -31,7 +31,6 @@ - #include "chrome/grit/generated_resources.h" - #include "components/prefs/pref_service.h" - #include "components/signin/public/base/signin_metrics.h" --#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/identity_manager/consent_level.h" - #include "components/signin/public/identity_manager/identity_manager.h" - #include "content/public/browser/web_contents.h" -@@ -171,8 +170,7 @@ void AppLauncherLoginHandler::UpdateLogi - #if !BUILDFLAG(IS_CHROMEOS_ASH) - // Chromeos does not show this status header. - bool is_signin_allowed = -- profile->GetOriginalProfile()->GetPrefs()->GetBoolean( -- prefs::kSigninAllowed); -+ false; - if (is_signin_allowed) { - std::u16string signed_in_link = - l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_LINK); -@@ -211,8 +209,6 @@ bool AppLauncherLoginHandler::ShouldShow - // UI and the avatar menu don't exist on that platform. - return false; - #else -- bool is_signin_allowed = -- profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed); -- return !profile->IsOffTheRecord() && is_signin_allowed; -+ return false; - #endif - } --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc @@ -37,7 +37,6 @@ @@ -2648,7 +2619,7 @@ #include "content/public/browser/render_process_host.h" --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -29,7 +29,6 @@ +@@ -31,7 +31,6 @@ #include "chrome/browser/ui/managed_ui.h" #include "chrome/common/chrome_features.h" #include "chrome/common/pref_names.h" @@ -2757,7 +2728,7 @@ IdentityManagerFactory::GetInstance()->GetForProfile(profile_)); --- a/chrome/browser/ui/webui/settings/safety_check_handler.cc +++ b/chrome/browser/ui/webui/settings/safety_check_handler.cc -@@ -28,7 +28,6 @@ +@@ -29,7 +29,6 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "components/prefs/pref_service.h" @@ -2775,7 +2746,7 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/strings/grit/components_chromium_strings.h" #include "components/strings/grit/components_strings.h" -@@ -1325,46 +1324,6 @@ void AddPrivacyStrings(content::WebUIDat +@@ -1329,46 +1328,6 @@ void AddPrivacyStrings(content::WebUIDat {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, @@ -2822,7 +2793,7 @@ {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL}, {"syncAndGoogleServicesPrivacyDescription", IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT}, -@@ -2395,11 +2354,6 @@ void AddSiteSettingsStrings(content::Web +@@ -2460,11 +2419,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -2836,7 +2807,7 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -74,7 +74,6 @@ +@@ -75,7 +75,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/features.h" @@ -2844,9 +2815,9 @@ #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -@@ -255,9 +254,7 @@ SettingsUI::SettingsUI(content::WebUI* w - std::make_unique()); - #endif // OS_WIN && BUILDFLAG(GOOGLE_CHROME_BRANDING) +@@ -268,9 +267,7 @@ SettingsUI::SettingsUI(content::WebUI* w + html_source->AddBoolean("enableLandingPageRedesign", + enable_landing_page_redesign); - html_source->AddBoolean("signinAllowed", !profile->IsGuestSession() && - profile->GetPrefs()->GetBoolean( @@ -2865,7 +2836,7 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -248,8 +247,7 @@ DiceTurnSyncOnHelper::DiceTurnSyncOnHelp +@@ -247,8 +246,7 @@ DiceTurnSyncOnHelper::DiceTurnSyncOnHelp // last authenticated account of the current profile, then Chrome will show a // confirmation dialog before starting sync. // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754). @@ -2906,7 +2877,7 @@ default_email.clear(); --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc -@@ -67,7 +67,6 @@ +@@ -68,7 +68,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/core/browser/about_signin_internals.h" #include "components/signin/public/base/signin_metrics.h" @@ -2914,7 +2885,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" #include "components/signin/public/identity_manager/accounts_mutator.h" -@@ -260,11 +259,6 @@ void OnSyncSetupComplete(Profile* profil +@@ -229,11 +228,6 @@ void OnSyncSetupComplete(Profile* profil scoped_refptr password_store = PasswordStoreFactory::GetForProfile(profile, ServiceAccessType::EXPLICIT_ACCESS); @@ -2925,7 +2896,7 @@ - SAVED_ON_CHROME_SIGNIN); } - if (has_primary_account && is_force_sign_in_with_usermanager && + if (has_primary_account && is_force_sign_in_with_usermanager) { --- a/chrome/browser/ui/webui/signin/signin_error_ui.cc +++ b/chrome/browser/ui/webui/signin/signin_error_ui.cc @@ -23,7 +23,6 @@ @@ -2986,7 +2957,7 @@ #include "components/strings/grit/components_strings.h" #include "net/base/url_util.h" #include "ui/base/webui/web_ui_util.h" -@@ -160,7 +159,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web +@@ -165,7 +164,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web "returningUserModules", welcome::GetModules(profile).FindKey("returning-user")->GetString()); html_source->AddBoolean( @@ -3042,7 +3013,7 @@ #include "services/network/public/cpp/shared_url_loader_factory.h" namespace password_manager { -@@ -164,28 +163,7 @@ void LeakDetectionDelegate::OnError(Leak +@@ -162,28 +161,7 @@ void LeakDetectionDelegate::OnError(Leak bool CanStartLeakCheck(const PrefService& prefs, const PasswordManagerClient* client) { @@ -3074,15 +3045,15 @@ } // namespace password_manager --- a/components/password_manager/core/browser/password_bubble_experiment.cc +++ b/components/password_manager/core/browser/password_bubble_experiment.cc -@@ -17,7 +17,6 @@ - #include "components/pref_registry/pref_registry_syncable.h" +@@ -18,7 +18,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" + #include "components/signin/public/base/signin_buildflags.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/sync/driver/sync_service.h" #include "components/sync/driver/sync_user_settings.h" -@@ -72,9 +71,6 @@ bool ShouldShowChromeSignInPasswordPromo +@@ -71,9 +70,6 @@ bool ShouldShowChromeSignInPasswordPromo return false; } @@ -3102,7 +3073,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" #include "url/origin.h" -@@ -178,9 +177,7 @@ PasswordReuseDetector::CheckNonGaiaEnter +@@ -180,9 +179,7 @@ PasswordReuseDetector::CheckNonGaiaEnter // Skips password reuse check if |domain| matches enterprise login URL or // enterprise change password URL. GURL page_url(domain); @@ -3110,7 +3081,7 @@ - safe_browsing::MatchesURLList(page_url, - enterprise_password_urls_.value())) { + if (enterprise_password_urls_.has_value()) { - return base::nullopt; + return absl::nullopt; } --- a/components/password_manager/core/browser/password_store.cc @@ -3183,14 +3154,14 @@ #include "components/security_interstitials/content/settings_page_helper.h" --- a/components/safe_browsing/content/browser/client_side_detection_service.cc +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc -@@ -24,7 +24,6 @@ - #include "components/safe_browsing/content/browser/client_side_detection_host.h" +@@ -25,7 +25,6 @@ + #include "components/safe_browsing/content/browser/client_side_phishing_model.h" #include "components/safe_browsing/content/common/safe_browsing.mojom.h" #include "components/safe_browsing/content/web_ui/safe_browsing_ui.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "components/safe_browsing/core/common/utils.h" #include "components/safe_browsing/core/features.h" - #include "components/safe_browsing/core/proto/client_model.pb.h" --- a/components/safe_browsing/content/triggers/suspicious_site_trigger_unittest.cc +++ b/components/safe_browsing/content/triggers/suspicious_site_trigger_unittest.cc @@ -11,7 +11,6 @@ @@ -3211,7 +3182,7 @@ #include "components/safe_browsing/core/features.h" #include "components/safe_browsing/core/proto/csd.pb.h" #include "services/network/public/mojom/cookie_manager.mojom.h" -@@ -1752,9 +1751,7 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -1800,9 +1799,7 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); std::string callback_id; args->GetString(0, &callback_id); @@ -3250,14 +3221,14 @@ source_set("safe_browsing_policy_handler") { --- a/components/safe_browsing/core/common/safe_browsing_policy_handler.cc +++ b/components/safe_browsing/core/common/safe_browsing_policy_handler.cc -@@ -12,7 +12,6 @@ +@@ -11,7 +11,6 @@ #include "components/policy/policy_constants.h" #include "components/prefs/pref_service.h" #include "components/prefs/pref_value_map.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/strings/grit/components_strings.h" + #include "third_party/abseil-cpp/absl/types/optional.h" - namespace safe_browsing { @@ -172,34 +171,14 @@ void SafeBrowsingPolicyHandler::ApplyPol if (!value.has_value()) @@ -3338,9 +3309,9 @@ --- a/components/safe_browsing/core/db/util.h +++ b/components/safe_browsing/core/db/util.h -@@ -18,7 +18,6 @@ +@@ -17,7 +17,6 @@ + #include "base/containers/flat_map.h" #include "base/strings/string_piece.h" - #include "base/time/time.h" #include "base/trace_event/traced_value.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/safe_browsing/core/db/v4_protocol_manager_util.h" @@ -3348,7 +3319,7 @@ namespace safe_browsing { --- a/components/safe_browsing/core/db/v4_local_database_manager.cc +++ b/components/safe_browsing/core/db/v4_local_database_manager.cc -@@ -320,10 +320,9 @@ const V4LocalDatabaseManager* +@@ -321,10 +321,9 @@ const V4LocalDatabaseManager* // static scoped_refptr V4LocalDatabaseManager::Create( @@ -3361,7 +3332,7 @@ } void V4LocalDatabaseManager::CollectDatabaseManagerInfo( -@@ -345,10 +344,8 @@ void V4LocalDatabaseManager::CollectData +@@ -346,10 +345,8 @@ void V4LocalDatabaseManager::CollectData V4LocalDatabaseManager::V4LocalDatabaseManager( const base::FilePath& base_path, @@ -3372,7 +3343,7 @@ list_infos_(GetListInfos()), task_runner_(task_runner_for_tests ? task_runner_for_tests -@@ -1087,8 +1084,7 @@ void V4LocalDatabaseManager::SetupUpdate +@@ -1093,8 +1090,7 @@ void V4LocalDatabaseManager::SetupUpdate weak_factory_.GetWeakPtr()); v4_update_protocol_manager_ = V4UpdateProtocolManager::Create( @@ -3544,7 +3515,7 @@ --- a/components/safe_browsing/core/db/v4_update_protocol_manager.h +++ b/components/safe_browsing/core/db/v4_update_protocol_manager.h -@@ -22,7 +22,6 @@ +@@ -21,7 +21,6 @@ #include "base/sequence_checker.h" #include "base/time/time.h" #include "base/timer/timer.h" @@ -3640,7 +3611,7 @@ } // static -@@ -104,9 +103,7 @@ bool RealTimePolicyEngine::CanPerformEnt +@@ -100,9 +99,7 @@ bool RealTimePolicyEngine::CanPerformEnt return false; } @@ -3661,7 +3632,7 @@ #include "components/safe_browsing/core/common/thread_utils.h" #include "components/safe_browsing/core/db/v4_protocol_manager_util.h" #include "components/safe_browsing/core/features.h" -@@ -109,7 +108,7 @@ int RealTimeUrlLookupService::GetReferre +@@ -114,7 +113,7 @@ int RealTimeUrlLookupService::GetReferre } bool RealTimeUrlLookupService::CanCheckSubresourceURL() const { @@ -3677,9 +3648,9 @@ #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/browser/referrer_chain_provider.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "components/safe_browsing/core/common/thread_utils.h" #include "components/safe_browsing/core/common/utils.h" - #include "components/safe_browsing/core/verdict_cache_manager.h" --- a/components/safe_browsing/core/triggers/trigger_manager.cc +++ b/components/safe_browsing/core/triggers/trigger_manager.cc @@ -10,7 +10,6 @@ @@ -3774,7 +3745,7 @@ #include "testing/gtest/include/gtest/gtest.h" --- a/components/safety_check/safety_check.cc +++ b/components/safety_check/safety_check.cc -@@ -4,8 +4,6 @@ +@@ -4,26 +4,9 @@ #include "components/safety_check/safety_check.h" @@ -3782,35 +3753,25 @@ - namespace safety_check { - SafetyCheck::SafetyCheck(SafetyCheckHandlerInterface* handler) -@@ -16,26 +14,7 @@ SafetyCheck::SafetyCheck(SafetyCheckHand - SafetyCheck::~SafetyCheck() = default; - - void SafetyCheck::CheckSafeBrowsing(PrefService* pref_service) { + SafeBrowsingStatus CheckSafeBrowsing(PrefService* pref_service) { - const PrefService::Preference* enabled_pref = - pref_service->FindPreference(prefs::kSafeBrowsingEnabled); - bool is_sb_enabled = pref_service->GetBoolean(prefs::kSafeBrowsingEnabled); - bool is_sb_managed = enabled_pref->IsManaged(); - -- SafeBrowsingStatus status; -- if (is_sb_enabled && pref_service->GetBoolean(prefs::kSafeBrowsingEnhanced)) { -- status = SafeBrowsingStatus::kEnabledEnhanced; -- } else if (is_sb_enabled && is_sb_managed) { -- status = SafeBrowsingStatus::kEnabledStandard; -- } else if (is_sb_enabled && !is_sb_managed) { -- status = SafeBrowsingStatus::kEnabledStandardAvailableEnhanced; -- } else if (is_sb_managed) { -- status = SafeBrowsingStatus::kDisabledByAdmin; -- } else if (enabled_pref->IsExtensionControlled()) { -- status = SafeBrowsingStatus::kDisabledByExtension; -- } else { -- status = SafeBrowsingStatus::kDisabled; -- } -- handler_->OnSafeBrowsingCheckResult(status); -+ handler_->OnSafeBrowsingCheckResult(SafeBrowsingStatus::kDisabled); +- if (is_sb_enabled && pref_service->GetBoolean(prefs::kSafeBrowsingEnhanced)) +- return SafeBrowsingStatus::kEnabledEnhanced; +- if (is_sb_enabled && is_sb_managed) +- return SafeBrowsingStatus::kEnabledStandard; +- if (is_sb_enabled && !is_sb_managed) +- return SafeBrowsingStatus::kEnabledStandardAvailableEnhanced; +- if (is_sb_managed) +- return SafeBrowsingStatus::kDisabledByAdmin; +- if (enabled_pref->IsExtensionControlled()) +- return SafeBrowsingStatus::kDisabledByExtension; + return SafeBrowsingStatus::kDisabled; } - } // namespace safety_check --- a/components/security_interstitials/content/bad_clock_blocking_page.cc +++ b/components/security_interstitials/content/bad_clock_blocking_page.cc @@ -7,7 +7,6 @@ @@ -3833,7 +3794,7 @@ #include "components/security_interstitials/content/ssl_cert_reporter.h" --- a/components/security_interstitials/content/cert_report_helper.cc +++ b/components/security_interstitials/content/cert_report_helper.cc -@@ -15,7 +15,6 @@ +@@ -14,7 +14,6 @@ #include "build/branding_buildflags.h" #include "build/build_config.h" #include "components/prefs/pref_service.h" @@ -3841,7 +3802,7 @@ #include "components/security_interstitials/content/ssl_cert_reporter.h" #include "components/security_interstitials/core/controller_client.h" #include "components/security_interstitials/core/metrics_helper.h" -@@ -87,8 +86,7 @@ void CertReportHelper::PopulateExtendedR +@@ -86,8 +85,7 @@ void CertReportHelper::PopulateExtendedR return; load_time_data->SetBoolean( @@ -3851,7 +3812,7 @@ load_time_data->SetString( security_interstitials::kOptInLink, -@@ -125,14 +123,8 @@ void CertReportHelper::HandleReportingCo +@@ -124,14 +122,8 @@ void CertReportHelper::HandleReportingCo PrefService* pref_service) { switch (command) { case security_interstitials::CMD_DO_REPORT: @@ -3866,7 +3827,7 @@ break; case security_interstitials::CMD_PROCEED: user_action_ = CertificateErrorReport::USER_PROCEEDED; -@@ -150,7 +142,7 @@ void CertReportHelper::FinishCertCollect +@@ -149,7 +141,7 @@ void CertReportHelper::FinishCertCollect if (!ShouldShowCertificateReporterCheckbox()) return; @@ -3875,7 +3836,7 @@ return; if (metrics_helper_) { -@@ -181,51 +173,11 @@ void CertReportHelper::FinishCertCollect +@@ -180,51 +172,11 @@ void CertReportHelper::FinishCertCollect } bool CertReportHelper::ShouldShowCertificateReporterCheckbox() { @@ -4150,8 +4111,8 @@ #include "components/signin/public/base/signin_client.h" -#include "components/signin/public/base/signin_pref_names.h" - const base::Feature kUseMultiloginEndpoint{"UseMultiloginEndpoint", - base::FEATURE_ENABLED_BY_DEFAULT}; + namespace signin { + --- a/components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc +++ b/components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc @@ -8,7 +8,6 @@ @@ -4353,7 +4314,7 @@ #include "components/signin/public/identity_manager/account_info.h" --- a/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc +++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc -@@ -28,7 +28,6 @@ +@@ -29,7 +29,6 @@ #include "components/signin/internal/identity_manager/ubertoken_fetcher_impl.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -4361,7 +4322,7 @@ #include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_urls.h" -@@ -440,9 +439,7 @@ GaiaCookieManagerService::GaiaCookieMana +@@ -446,9 +445,7 @@ GaiaCookieManagerService::GaiaCookieMana listAccountsUnexpectedServerResponseRetried_(false), external_cc_result_fetched_(false), list_accounts_stale_(true) { @@ -4372,7 +4333,7 @@ if (!gaia_cookie_last_list_accounts_data.empty()) { if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data, -@@ -466,8 +463,6 @@ GaiaCookieManagerService::~GaiaCookieMan +@@ -472,8 +469,6 @@ GaiaCookieManagerService::~GaiaCookieMan // static void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) { @@ -4381,7 +4342,7 @@ } void GaiaCookieManagerService::InitCookieListener() { -@@ -860,16 +855,12 @@ void GaiaCookieManagerService::OnListAcc +@@ -896,16 +891,12 @@ void GaiaCookieManagerService::OnListAcc &signed_out_accounts_)) { listed_accounts_.clear(); signed_out_accounts_.clear(); @@ -4418,7 +4379,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/webdata/token_web_data.h" #include "components/webdata/common/web_data_service_base.h" -@@ -118,7 +117,7 @@ signin::LoadCredentialsState LoadCredent +@@ -94,7 +93,7 @@ signin::LoadCredentialsState LoadCredent bool ShouldMigrateToDice(signin::AccountConsistencyMethod account_consistency, PrefService* prefs) { return account_consistency == signin::AccountConsistencyMethod::kDice && @@ -4427,7 +4388,7 @@ } } // namespace -@@ -276,7 +275,6 @@ MutableProfileOAuth2TokenServiceDelegate +@@ -241,7 +240,6 @@ MutableProfileOAuth2TokenServiceDelegate // static void MutableProfileOAuth2TokenServiceDelegate::RegisterProfilePrefs( PrefRegistrySimple* registry) { @@ -4435,7 +4396,7 @@ } std::unique_ptr -@@ -635,9 +633,6 @@ void MutableProfileOAuth2TokenServiceDel +@@ -600,9 +598,6 @@ void MutableProfileOAuth2TokenServiceDel UpdateCredentials(loading_primary_account_id_, old_login_token); } } @@ -4445,7 +4406,7 @@ } void MutableProfileOAuth2TokenServiceDelegate::UpdateCredentials( -@@ -828,8 +823,6 @@ void MutableProfileOAuth2TokenServiceDel +@@ -793,8 +788,6 @@ void MutableProfileOAuth2TokenServiceDel } void MutableProfileOAuth2TokenServiceDelegate::FinishLoadingCredentials() { @@ -4454,7 +4415,7 @@ FireRefreshTokensLoaded(); } -@@ -860,8 +853,7 @@ void MutableProfileOAuth2TokenServiceDel +@@ -825,8 +818,7 @@ void MutableProfileOAuth2TokenServiceDel LOAD_CREDENTIALS_FINISHED_WITH_DB_CANNOT_BE_OPENED); if (account_consistency_ == signin::AccountConsistencyMethod::kDice && @@ -4484,7 +4445,7 @@ #include "components/signin/public/base/signin_switches.h" using signin::PrimaryAccountChangeEvent; -@@ -47,22 +46,10 @@ PrimaryAccountManager::~PrimaryAccountMa +@@ -47,23 +46,10 @@ PrimaryAccountManager::~PrimaryAccountMa // static void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { @@ -4497,6 +4458,7 @@ - registry->RegisterBooleanPref(prefs::kAutologinEnabled, true); - registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList); - registry->RegisterBooleanPref(prefs::kSigninAllowed, true); +- registry->RegisterBooleanPref(prefs::kSigninAllowedByPolicy, true); - registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false); } @@ -4507,7 +4469,7 @@ } void PrimaryAccountManager::Initialize(PrefService* local_state) { -@@ -70,25 +57,7 @@ void PrimaryAccountManager::Initialize(P +@@ -71,25 +57,7 @@ void PrimaryAccountManager::Initialize(P DCHECK(!IsInitialized()); initialized_ = true; @@ -4534,7 +4496,7 @@ if (!pref_account_id.empty()) { if (account_tracker_service_->GetMigrationState() == -@@ -98,14 +67,11 @@ void PrimaryAccountManager::Initialize(P +@@ -99,14 +67,11 @@ void PrimaryAccountManager::Initialize(P // |account_info.gaia| could be empty if |account_id| is already gaia id. if (!account_info.gaia.empty()) { pref_account_id = account_info.gaia; @@ -4550,7 +4512,7 @@ CoreAccountId account_id = CoreAccountId::FromString(pref_account_id); CoreAccountInfo account_info = account_tracker_service_->GetAccountInfo(account_id); -@@ -171,8 +137,7 @@ void PrimaryAccountManager::SetSyncPrima +@@ -172,8 +137,7 @@ void PrimaryAccountManager::SetSyncPrima #if DCHECK_IS_ON() { @@ -4560,7 +4522,7 @@ bool consented_to_sync = client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync); -@@ -188,10 +153,6 @@ void PrimaryAccountManager::SetSyncPrima +@@ -189,10 +153,6 @@ void PrimaryAccountManager::SetSyncPrima // Go ahead and update the last signed in account info here as well. Once a // user is signed in the corresponding preferences should match. Doing it here // as opposed to on signin allows us to catch the upgrade scenario. @@ -4571,7 +4533,7 @@ // Commit primary sync account info immediately so that it does not get lost // if Chrome crashes before the next commit interval. -@@ -205,20 +166,11 @@ void PrimaryAccountManager::SetPrimaryAc +@@ -206,20 +166,11 @@ void PrimaryAccountManager::SetPrimaryAc PrefService* prefs = client_->GetPrefs(); const std::string& account_id = primary_account_info_.account_id.ToString(); @@ -4613,15 +4575,15 @@ #include "google_apis/gaia/core_account_id.h" namespace signin { -@@ -50,7 +49,7 @@ bool PrimaryAccountMutatorImpl::SetPrima - AccountInfo account_info = account_tracker_->GetAccountInfo(account_id); +@@ -58,7 +57,7 @@ bool PrimaryAccountMutatorImpl::SetPrima + DCHECK(!account_info.gaia.empty()); #if !BUILDFLAG(IS_CHROMEOS_ASH) - if (!pref_service_->GetBoolean(prefs::kSigninAllowed)) + if (true) return false; + #endif - if (primary_account_manager_->HasPrimaryAccount(ConsentLevel::kSync)) --- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc +++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc @@ -10,7 +10,6 @@ @@ -4852,7 +4814,7 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -77818,7 +77818,6 @@ Full version information for the fingerp +@@ -79113,7 +79113,6 @@ Full version information for the fingerp @@ -4860,7 +4822,7 @@ -@@ -77833,10 +77832,7 @@ Full version information for the fingerp +@@ -79128,10 +79127,7 @@ Full version information for the fingerp diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index bef4b1aa..92364fe6 100644 --- a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch +++ b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch @@ -1,7 +1,7 @@ # Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -123,6 +123,7 @@ +@@ -125,6 +125,7 @@ #include "components/spellcheck/common/spellcheck_common.h" #include "components/spellcheck/spellcheck_buildflags.h" #include "components/strings/grit/components_strings.h" @@ -9,7 +9,7 @@ #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" -@@ -1577,6 +1578,8 @@ void RenderViewContextMenu::AppendPageIt +@@ -1592,6 +1593,8 @@ void RenderViewContextMenu::AppendPageIt menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); } @@ -18,7 +18,7 @@ ChromeTranslateClient* chrome_translate_client = ChromeTranslateClient::FromWebContents(embedder_web_contents_); const bool canTranslate = -@@ -1598,6 +1601,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -1613,6 +1616,7 @@ void RenderViewContextMenu::AppendPageIt IDC_CONTENT_CONTEXT_TRANSLATE, l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language)); } @@ -36,14 +36,14 @@ #include "base/json/json_reader.h" #include "base/lazy_instance.h" #include "base/notreached.h" -@@ -25,6 +26,7 @@ +@@ -24,6 +25,7 @@ #include "components/translate/core/browser/translate_event_details.h" #include "components/translate/core/browser/translate_url_fetcher.h" #include "components/translate/core/browser/translate_url_util.h" +#include "components/translate/core/common/translate_switches.h" #include "components/translate/core/common/translate_util.h" #include "net/base/url_util.h" - #include "ui/base/l10n/l10n_util.h" + #include "third_party/abseil-cpp/absl/types/optional.h" @@ -220,6 +222,9 @@ GURL TranslateLanguageList::TranslateLan } @@ -56,7 +56,7 @@ request_pending_ = true; --- a/components/translate/core/browser/translate_manager.cc +++ b/components/translate/core/browser/translate_manager.cc -@@ -908,8 +908,9 @@ void TranslateManager::FilterIsTranslate +@@ -892,8 +892,9 @@ void TranslateManager::FilterIsTranslate ->LogAutofillAssistantDeferredTriggerDecision(); } @@ -70,7 +70,7 @@ // that settings syncs and we don't want to turn off translate everywhere --- a/components/translate/core/browser/translate_ranker_impl.cc +++ b/components/translate/core/browser/translate_ranker_impl.cc -@@ -155,12 +155,9 @@ TranslateRankerImpl::TranslateRankerImpl +@@ -156,12 +156,9 @@ TranslateRankerImpl::TranslateRankerImpl ukm::UkmRecorder* ukm_recorder) : ukm_recorder_(ukm_recorder), is_uma_logging_enabled_(false), @@ -86,7 +86,7 @@ if (is_query_enabled_ || is_enforcement_enabled_) { model_loader_ = std::make_unique( base::BindRepeating(&ValidateModel), -@@ -234,6 +231,8 @@ bool TranslateRankerImpl::ShouldOfferTra +@@ -235,6 +232,8 @@ bool TranslateRankerImpl::ShouldOfferTra // (or become False). const bool kDefaultResponse = 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 62f42474..b5261ada 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 -@@ -2323,6 +2323,7 @@ static_library("browser") { +@@ -2346,6 +2346,7 @@ static_library("browser") { "//third_party/libyuv", "//third_party/metrics_proto", "//third_party/re2", @@ -19,14 +19,14 @@ "//third_party/widevine/cdm:headers", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -178,6 +178,7 @@ - #include "third_party/blink/public/common/forcedark/forcedark_switches.h" - #include "third_party/blink/public/common/switches.h" - #include "third_party/leveldatabase/leveldb_features.h" +@@ -139,6 +139,7 @@ + #include "components/translate/core/browser/translate_ranker_impl.h" + #include "components/translate/core/common/translate_util.h" + #include "components/ui_devtools/switches.h" +#include "components/ungoogled/ungoogled_switches.h" - #include "ui/accessibility/accessibility_features.h" - #include "ui/accessibility/accessibility_switches.h" - #include "ui/base/ui_base_features.h" + #include "components/version_info/version_info.h" + #include "components/viz/common/features.h" + #include "components/viz/common/switches.h" --- a/chrome/browser/bromite_flag_entries.h +++ b/chrome/browser/bromite_flag_entries.h @@ -4,4 +4,12 @@ @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -217,6 +217,7 @@ source_set("browser") { +@@ -218,6 +218,7 @@ source_set("browser") { "//third_party/libyuv", "//third_party/re2", "//third_party/sqlite", @@ -54,7 +54,7 @@ "//third_party/zlib", --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -208,6 +208,7 @@ +@@ -209,6 +209,7 @@ #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" #include "third_party/blink/public/mojom/disk_allocator.mojom.h" #include "third_party/blink/public/public_buildflags.h" @@ -62,7 +62,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/accessibility/accessibility_switches.h" #include "ui/base/ui_base_switches.h" -@@ -3252,6 +3253,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3370,6 +3371,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLDraftExtensions, switches::kEnableWebGLImageChromium, switches::kFileUrlPathAlias, @@ -73,7 +73,7 @@ switches::kForceGpuMemAvailableMb, --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn -@@ -104,6 +104,7 @@ target(link_target_type, "child") { +@@ -102,6 +102,7 @@ target(link_target_type, "child") { "//third_party/blink/public/common", "//third_party/blink/public/strings", "//third_party/ced", @@ -83,7 +83,7 @@ "//ui/events/blink", --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -30,6 +30,7 @@ +@@ -31,6 +31,7 @@ #include "third_party/blink/public/common/loader/referrer_utils.h" #include "third_party/blink/public/common/switches.h" #include "third_party/blink/public/platform/web_runtime_features.h" @@ -91,7 +91,7 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -456,6 +457,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -468,6 +469,10 @@ void SetRuntimeFeaturesFromCommandLine(c {wrf::EnableWebGPU, switches::kEnableUnsafeWebGPU, true}, {wrf::ForceOverlayFullscreenVideo, switches::kForceOverlayFullscreenVideo, true}, @@ -104,7 +104,7 @@ if (command_line.HasSwitch(mapping.switch_name)) --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -210,6 +210,8 @@ class WebRuntimeFeatures { +@@ -215,6 +215,8 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool); BLINK_PLATFORM_EXPORT static void EnableGetCurrentBrowsingContextMedia(bool); BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool); @@ -116,14 +116,14 @@ --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc @@ -43,6 +43,7 @@ + #include "base/debug/dump_without_crashing.h" #include "base/macros.h" #include "base/metrics/histogram_functions.h" - #include "base/optional.h" +#include "base/rand_util.h" #include "base/time/time.h" #include "cc/input/overscroll_behavior.h" #include "cc/input/scroll_snap_data.h" -@@ -867,6 +868,14 @@ Range* Document::CreateRangeAdjustedToTr +@@ -859,6 +860,14 @@ Range* Document::CreateRangeAdjustedToTr Position::BeforeNode(*shadow_host)); } @@ -138,7 +138,7 @@ SelectorQueryCache& Document::GetSelectorQueryCache() { if (!selector_query_cache_) selector_query_cache_ = std::make_unique(); -@@ -2398,6 +2407,15 @@ void Document::UpdateStyleAndLayoutTreeF +@@ -2157,6 +2166,15 @@ void Document::UpdateStyleAndLayoutTreeF #if DCHECK_IS_ON() AssertLayoutTreeUpdated(*this); #endif @@ -156,7 +156,7 @@ void Document::InvalidateStyleAndLayoutForFontUpdates() { --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -445,6 +445,10 @@ class CORE_EXPORT Document : public Cont +@@ -456,6 +456,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -167,7 +167,7 @@ AtomicString visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -2005,6 +2009,9 @@ class CORE_EXPORT Document : public Cont +@@ -2021,6 +2025,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -179,7 +179,7 @@ HeapVector> current_script_stack_; --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2092,6 +2092,11 @@ DOMRectList* Element::getClientRects() { +@@ -2120,6 +2120,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom( quads, *element_layout_object); @@ -191,7 +191,7 @@ return MakeGarbageCollected(quads); } -@@ -2109,6 +2114,9 @@ FloatRect Element::GetBoundingClientRect +@@ -2137,6 +2142,9 @@ FloatRect Element::GetBoundingClientRect DCHECK(element_layout_object); GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -203,7 +203,7 @@ --- a/third_party/blink/renderer/core/dom/range.cc +++ b/third_party/blink/renderer/core/dom/range.cc -@@ -1615,11 +1615,21 @@ DOMRectList* Range::getClientRects() con +@@ -1614,11 +1614,21 @@ DOMRectList* Range::getClientRects() con Vector quads; GetBorderAndTextQuads(quads); @@ -266,7 +266,7 @@ const TextDirection&, --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -968,9 +968,15 @@ TextMetrics* CanvasRenderingContext2D::m +@@ -983,9 +983,15 @@ TextMetrics* CanvasRenderingContext2D::m TextDirection direction = ToTextDirection(GetState().GetDirection(), canvas()); @@ -285,7 +285,7 @@ void CanvasRenderingContext2D::fillFormattedText( --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1660,6 +1660,7 @@ component("platform") { +@@ -1669,6 +1669,7 @@ component("platform") { "//components/paint_preview/common", "//components/power_scheduler", "//components/search_engines:search_engine_utils", @@ -295,7 +295,7 @@ "//crypto", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -671,4 +671,12 @@ void WebRuntimeFeatures::EnableDocumentT +@@ -686,4 +686,12 @@ void WebRuntimeFeatures::EnableDocumentT RuntimeEnabledFeatures::SetDocumentTransitionEnabled(enable); } @@ -310,7 +310,7 @@ } // namespace blink --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -948,6 +948,12 @@ +@@ -975,6 +975,12 @@ origin_trial_feature_name: "FledgeInterestGroupAPI", }, { 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 f653246a..6191f090 100644 --- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch +++ b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch @@ -34,7 +34,7 @@ approach to change color components. #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3255,6 +3255,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3373,6 +3373,7 @@ void RenderProcessHostImpl::PropagateBro switches::kFileUrlPathAlias, switches::kFingerprintingClientRectsNoise, switches::kFingerprintingCanvasMeasureTextNoise, @@ -44,7 +44,7 @@ approach to change color components. switches::kForceGpuMemAvailableMb, --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -461,6 +461,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -473,6 +473,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -55,7 +55,7 @@ approach to change color components. if (command_line.HasSwitch(mapping.switch_name)) --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -212,6 +212,7 @@ class WebRuntimeFeatures { +@@ -217,6 +217,7 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool); BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool); BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool); @@ -65,7 +65,7 @@ approach to change color components. BLINK_PLATFORM_EXPORT static void EnableSignedExchangeSubresourcePrefetch( --- 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 -@@ -21,6 +21,7 @@ +@@ -24,6 +24,7 @@ #include "third_party/blink/renderer/platform/geometry/float_quad.h" #include "third_party/blink/renderer/platform/graphics/bitmap_image.h" #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" @@ -73,21 +73,21 @@ approach to change color components. #include "third_party/blink/renderer/platform/graphics/stroke_data.h" #include "third_party/blink/renderer/platform/heap/heap.h" -@@ -2005,6 +2006,11 @@ ImageData* BaseRenderingContext2D::getIm +@@ -2180,6 +2181,11 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } + if (read_pixels_successful && RuntimeEnabledFeatures::FingerprintingCanvasImageDataNoiseEnabled()) { -+ base::span dst = base::span(reinterpret_cast(contents.Data()), -+ contents.DataLength()); -+ StaticBitmapImage::ShuffleSubchannelColorData(dst.data(), image_info, sx, sy); ++ base::span dst = base::span(reinterpret_cast(image_data_pixmap.writable_addr()), ++ image_data_pixmap.rowBytes()); ++ StaticBitmapImage::ShuffleSubchannelColorData(dst.data(), image_data_pixmap.info(), sx, sy); + } } - // Wrap |contents| in an ImageData. + if (!IsPaint2D()) { --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1619,7 +1619,9 @@ component("platform") { +@@ -1628,7 +1628,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -100,7 +100,7 @@ approach to change color components. "//third_party/blink/renderer/platform/blob", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -679,4 +679,8 @@ void WebRuntimeFeatures::EnableFingerpri +@@ -694,4 +694,8 @@ void WebRuntimeFeatures::EnableFingerpri RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable); } @@ -324,7 +324,7 @@ approach to change color components. // Methods overridden by all sub-classes --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -954,6 +954,9 @@ +@@ -981,6 +981,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 7d583504..e86475ca 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 -@@ -2084,6 +2084,7 @@ static_library("browser") { +@@ -2105,6 +2105,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -80,7 +80,7 @@ with limited CPU/memory resources and it is disabled by default. #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/features.h" -@@ -317,6 +321,18 @@ void BrowserProcessImpl::Init() { +@@ -316,6 +320,18 @@ void BrowserProcessImpl::Init() { base::BindRepeating(&ApplyMetricsReportingPolicy)); #endif @@ -101,7 +101,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1477,6 +1477,10 @@ const char kMediaHistoryDescription[] = +@@ -1511,6 +1511,10 @@ const char kMediaHistoryDescription[] = "Enables Media History which records data around media playbacks on " "websites."; @@ -114,7 +114,7 @@ with limited CPU/memory resources and it is disabled by default. const char kMediaRouterCastAllowAllIPsDescription[] = --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -866,6 +866,9 @@ extern const char kLogJsConsoleMessagesD +@@ -883,6 +883,9 @@ extern const char kLogJsConsoleMessagesD extern const char kMediaHistoryName[]; extern const char kMediaHistoryDescription[]; diff --git a/patches/extra/debian/disable/google-api-warning.patch b/patches/extra/debian/disable/google-api-warning.patch index 44383a77..255d277f 100644 --- a/patches/extra/debian/disable/google-api-warning.patch +++ b/patches/extra/debian/disable/google-api-warning.patch @@ -3,12 +3,12 @@ author: Michael Gilbert --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -652,9 +652,6 @@ void StartupBrowserCreatorImpl::AddInfoB +@@ -647,9 +647,6 @@ void StartupBrowserCreatorImpl::AddInfoB } #endif - if (!google_apis::HasAPIKeyConfigured()) -- GoogleApiKeysInfoBarDelegate::Create(infobar_service); +- GoogleApiKeysInfoBarDelegate::Create(infobar_manager); - if (ObsoleteSystem::IsObsoleteNowOrSoon()) { PrefService* local_state = g_browser_process->local_state(); diff --git a/patches/extra/debian/disable/welcome-page.patch b/patches/extra/debian/disable/welcome-page.patch index 002db519..c36aa098 100644 --- a/patches/extra/debian/disable/welcome-page.patch +++ b/patches/extra/debian/disable/welcome-page.patch @@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1249,7 +1249,7 @@ void ProfileManager::InitProfileUserPref +@@ -1337,7 +1337,7 @@ void ProfileManager::InitProfileUserPref profile->GetPrefs()->SetString(prefs::kSupervisedUserId, supervised_user_id); } diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 209aff23..0e308f2f 100644 --- a/patches/extra/inox-patchset/0006-modify-default-prefs.patch +++ b/patches/extra/inox-patchset/0006-modify-default-prefs.patch @@ -12,7 +12,7 @@ void BackgroundModeManager::RegisterProfile(Profile* profile) { --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1292,7 +1292,7 @@ void ChromeContentBrowserClient::Registe +@@ -1286,7 +1286,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -45,7 +45,7 @@ enum class NetworkPredictionStatus { --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -325,7 +325,7 @@ void ProfileNetworkContextService::Updat +@@ -319,7 +319,7 @@ void ProfileNetworkContextService::Updat void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -56,7 +56,7 @@ registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled, --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -265,7 +265,7 @@ const char Profile::kProfileKey[] = "__P +@@ -280,7 +280,7 @@ const char Profile::kProfileKey[] = "__P void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, @@ -78,7 +78,7 @@ --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -116,7 +116,7 @@ void AccountConsistencyModeManager::Regi +@@ -120,7 +120,7 @@ void AccountConsistencyModeManager::Regi #if BUILDFLAG(ENABLE_DICE_SUPPORT) registry->RegisterBooleanPref(kDiceMigrationCompletePref, false); #endif @@ -89,7 +89,7 @@ // static --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -71,11 +71,11 @@ void RegisterBrowserUserPrefs(user_prefs +@@ -72,11 +72,11 @@ void RegisterBrowserUserPrefs(user_prefs registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); registry->RegisterBooleanPref( @@ -168,7 +168,7 @@ --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -198,10 +198,10 @@ FormData SimplifiedFormDataFromFormStruc +@@ -207,10 +207,10 @@ bool HasMutedCredentials(base::spanRegisterBooleanPref( diff --git a/patches/extra/inox-patchset/0013-disable-missing-key-warning.patch b/patches/extra/inox-patchset/0013-disable-missing-key-warning.patch index d819bc12..c5a74c76 100644 --- a/patches/extra/inox-patchset/0013-disable-missing-key-warning.patch +++ b/patches/extra/inox-patchset/0013-disable-missing-key-warning.patch @@ -1,10 +1,12 @@ --- a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc +++ b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc -@@ -16,6 +16,7 @@ - +@@ -17,9 +17,6 @@ // static - void GoogleApiKeysInfoBarDelegate::Create(InfoBarService* infobar_service) { -+ return; - infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar( - std::unique_ptr( - new GoogleApiKeysInfoBarDelegate()))); + void GoogleApiKeysInfoBarDelegate::Create( + infobars::ContentInfoBarManager* infobar_manager) { +- infobar_manager->AddInfoBar( +- CreateConfirmInfoBar(std::unique_ptr( +- new GoogleApiKeysInfoBarDelegate()))); + } + + GoogleApiKeysInfoBarDelegate::GoogleApiKeysInfoBarDelegate() 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 ef4dee6b..88cba48a 100644 --- a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch +++ b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch @@ -9,7 +9,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1461,8 +1461,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1479,8 +1479,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { diff --git a/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch b/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch index b73d59c2..781e54a7 100644 --- a/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch +++ b/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch @@ -10,7 +10,7 @@ Out with all those tracking cookies! --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -140,7 +140,7 @@ void ContentSettingsRegistry::Init() { +@@ -127,7 +127,7 @@ void ContentSettingsRegistry::Init() { // WARNING: The string names of the permissions passed in below are used to // generate preference names and should never be changed! diff --git a/patches/extra/iridium-browser/updater-disable-auto-update.patch b/patches/extra/iridium-browser/updater-disable-auto-update.patch index 8656d422..2147f1df 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 -@@ -728,7 +728,7 @@ static base::mac::ScopedObjCClassSwizzle +@@ -846,7 +846,7 @@ static base::mac::ScopedObjCClassSwizzle CFStringRef checkInterval = CFSTR("checkInterval"); CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app); if (!plist) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch b/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch index 9c20985a..649a3ea4 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5794,7 +5794,7 @@ bool ChromeContentBrowserClient::ShouldA +@@ -5770,7 +5770,7 @@ bool ChromeContentBrowserClient::ShouldA const url::Origin& embedder_origin, const content::PepperPluginInfo& plugin_info) { #if BUILDFLAG(ENABLE_PDF) @@ -11,7 +11,7 @@ if (embedder_origin.scheme() == extensions::kExtensionScheme && --- a/chrome/browser/pdf/pdf_extension_util.cc +++ b/chrome/browser/pdf/pdf_extension_util.cc -@@ -172,7 +172,7 @@ std::string GetManifest() { +@@ -169,7 +169,7 @@ std::string GetManifest() { DCHECK(manifest_contents.find(kNameTag) != std::string::npos); base::ReplaceFirstSubstringAfterOffset( &manifest_contents, 0, kNameTag, @@ -254,7 +254,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -247,6 +247,7 @@ static_library("common") { +@@ -251,6 +251,7 @@ static_library("common") { "//components/no_state_prefetch/common", "//components/no_state_prefetch/common:mojo_bindings", "//components/page_load_metrics/common:common", @@ -264,7 +264,7 @@ if (enable_plugins) { --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc -@@ -143,7 +143,7 @@ void ComputeBuiltInPlugins(std::vectorReportPluginDisabled(orig_mime_type, url); if (info.name == 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 59b48694..4bba96e0 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc -@@ -139,9 +139,10 @@ ChromeRenderFrameObserver::ChromeRenderF +@@ -140,9 +140,10 @@ ChromeRenderFrameObserver::ChromeRenderF if (!render_frame->IsMainFrame()) return; @@ -25,7 +25,7 @@ if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection)) SetClientSidePhishingDetection(); #endif -@@ -201,14 +202,16 @@ void ChromeRenderFrameObserver::DidFinis +@@ -202,14 +203,16 @@ void ChromeRenderFrameObserver::DidFinis if (frame->Parent()) return; @@ -52,7 +52,7 @@ --- a/chrome/renderer/chrome_render_frame_observer.h +++ b/chrome/renderer/chrome_render_frame_observer.h -@@ -135,6 +135,7 @@ class ChromeRenderFrameObserver : public +@@ -134,6 +134,7 @@ class ChromeRenderFrameObserver : public #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) safe_browsing::PhishingClassifierDelegate* phishing_classifier_ = nullptr; #endif @@ -102,7 +102,7 @@ } bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy( -@@ -1450,6 +1458,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -1446,6 +1454,8 @@ SyncDataMap TemplateURLService::CreateGU void TemplateURLService::Init(const Initializer* initializers, int num_initializers) { @@ -111,7 +111,7 @@ if (client_) client_->SetOwner(this); -@@ -1586,6 +1596,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -1582,6 +1592,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -123,7 +123,7 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -685,6 +685,8 @@ class TemplateURLService : public WebDat +@@ -681,6 +681,8 @@ class TemplateURLService : public WebDat // ---------- Browser state related members --------------------------------- PrefService* prefs_ = nullptr; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch index f10baac6..7b37c900 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch @@ -8,7 +8,7 @@ #include "components/browsing_data/core/pref_names.h" #include "components/keep_alive_registry/keep_alive_types.h" #include "components/keep_alive_registry/scoped_keep_alive.h" -@@ -275,8 +276,9 @@ void ChromeBrowsingDataLifetimeManager:: +@@ -277,8 +278,9 @@ void ChromeBrowsingDataLifetimeManager:: bool keep_browser_alive) { auto* data_types = profile_->GetPrefs()->GetList( browsing_data::prefs::kClearBrowsingDataOnExitList); @@ -19,8 +19,8 @@ + !ProfileSyncServiceFactory::IsSyncAllowed(profile_))) { profile_->GetPrefs()->SetBoolean( browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true); - auto* remover = content::BrowserContext::GetBrowsingDataRemover(profile_); -@@ -292,8 +294,8 @@ void ChromeBrowsingDataLifetimeManager:: + auto* remover = profile_->GetBrowsingDataRemover(); +@@ -294,8 +296,8 @@ void ChromeBrowsingDataLifetimeManager:: KeepAliveRestartOption::DISABLED) : nullptr; remover->RemoveAndReply(base::Time(), base::Time::Max(), diff --git a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch index bda81ddb..babc57b4 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -8,7 +8,7 @@ #include "base/containers/flat_map.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" -@@ -1790,6 +1791,10 @@ bool TabStripModel::InternalCloseTabs( +@@ -1798,6 +1799,10 @@ bool TabStripModel::InternalCloseTabs( if (items.empty()) return true; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index f19c848b..9ac753ef 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 @@ -11,7 +11,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" -@@ -127,6 +128,14 @@ scoped_refptr +@@ -128,6 +129,14 @@ scoped_refptr return installer; } @@ -26,7 +26,7 @@ bool IsExtensionDownload(const DownloadItem& download_item) { if (download_item.GetTargetDisposition() == DownloadItem::TARGET_DISPOSITION_PROMPT) -@@ -135,7 +144,7 @@ bool IsExtensionDownload(const DownloadI +@@ -136,7 +145,7 @@ bool IsExtensionDownload(const DownloadI if (download_item.GetMimeType() == extensions::Extension::kMimeType || extensions::UserScript::IsURLUserScript(download_item.GetURL(), download_item.GetMimeType())) { @@ -50,7 +50,7 @@ bool IsExtensionDownload(const download::DownloadItem& download_item); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1041,10 +1041,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1046,10 +1046,12 @@ DownloadConfirmationReason DownloadTarge return DownloadConfirmationReason::SAVE_AS; #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch index 05870bf2..9ff7d2c1 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc -@@ -81,6 +81,8 @@ WindowOpenDisposition RenderViewImpl::Na +@@ -79,6 +79,8 @@ WindowOpenDisposition RenderViewImpl::Na case blink::kWebNavigationPolicyNewWindow: return WindowOpenDisposition::NEW_WINDOW; case blink::kWebNavigationPolicyNewPopup: diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch index 87380569..30655aa2 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc -@@ -14,6 +14,7 @@ +@@ -15,6 +15,7 @@ #include #include "base/bind.h" diff --git a/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch b/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch index db149db4..3a5ce8d8 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch @@ -21,7 +21,7 @@ #include "base/lazy_instance.h" #include "base/numerics/safe_conversions.h" #include "base/stl_util.h" -@@ -266,6 +267,13 @@ IDNConversionResult IDNToUnicodeWithAdju +@@ -265,6 +266,13 @@ IDNConversionResult IDNToUnicodeWithAdju host16.reserve(host.length()); host16.insert(host16.end(), host.begin(), host.end()); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch index c7a97ebb..7a7cc85b 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -607,7 +607,8 @@ void StartupBrowserCreatorImpl::AddInfoB +@@ -612,7 +612,8 @@ void StartupBrowserCreatorImpl::AddInfoB if (command_line_.HasSwitch(switches::kKioskMode)) return; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch index c3486f7b..df2bb7cd 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch @@ -8,7 +8,7 @@ #include "base/metrics/user_metrics.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" -@@ -105,6 +106,18 @@ DragOperation GetDropEffect(const ui::Dr +@@ -106,6 +107,18 @@ DragOperation GetDropEffect(const ui::Dr return DragOperation::kMove; } @@ -27,7 +27,7 @@ } // namespace BrowserRootView::DropInfo::DropInfo() = default; -@@ -116,7 +129,9 @@ BrowserRootView::DropInfo::~DropInfo() { +@@ -117,7 +130,9 @@ BrowserRootView::DropInfo::~DropInfo() { BrowserRootView::BrowserRootView(BrowserView* browser_view, views::Widget* widget) @@ -38,7 +38,7 @@ BrowserRootView::~BrowserRootView() { // It's possible to destroy the browser while a drop is active. In this case, -@@ -267,7 +282,7 @@ bool BrowserRootView::OnMouseWheel(const +@@ -268,7 +283,7 @@ bool BrowserRootView::OnMouseWheel(const // Scroll-event-changes-tab is incompatible with scrolling tabstrip, so // disable it if the latter feature is enabled. diff --git a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch index 1d974ac8..e508c57a 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -250,14 +250,30 @@ void ToolbarView::Init() { +@@ -263,14 +263,30 @@ void ToolbarView::Init() { std::unique_ptr toolbar_account_icon_container; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch index 166f59c6..56044130 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc -@@ -79,14 +79,13 @@ using content::WebContents; +@@ -81,14 +81,13 @@ using content::WebContents; namespace { bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) { diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index 55e06043..dfd73c72 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -236,5 +236,7 @@ const base::Feature kDocumentReporting{" +@@ -242,5 +242,7 @@ const base::Feature kUdpSocketPosixAlway const base::Feature kCookieSameSiteConsidersRedirectChain{ "CookieSameSiteConsidersRedirectChain", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -23,7 +23,7 @@ } // namespace net --- a/net/base/features.h +++ b/net/base/features.h -@@ -347,6 +347,8 @@ NET_EXPORT extern const base::Feature kD +@@ -356,6 +356,8 @@ NET_EXPORT extern const base::Feature kU // See spec changes in https://github.com/httpwg/http-extensions/pull/1348 NET_EXPORT extern const base::Feature kCookieSameSiteConsidersRedirectChain; @@ -34,7 +34,7 @@ --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -134,11 +134,6 @@ const unsigned kMinimumTTLSeconds = kCac +@@ -135,11 +135,6 @@ const unsigned kMinimumTTLSeconds = kCac // cached. const int kIPv6ProbePeriodMs = 1000; @@ -46,7 +46,7 @@ enum DnsResolveStatus { RESOLVE_STATUS_DNS_SUCCESS = 0, RESOLVE_STATUS_PROC_SUCCESS, -@@ -3340,7 +3335,7 @@ bool HostResolverManager::IsIPv6Reachabl +@@ -3367,7 +3362,7 @@ bool HostResolverManager::IsIPv6Reachabl (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { SetLastIPv6ProbeResult( diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index 91f4a4d2..3f6118e8 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -416,7 +416,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -644,7 +644,8 @@ void TemplateURLService::IncrementUsageC +@@ -640,7 +640,8 @@ void TemplateURLService::IncrementUsageC void TemplateURLService::ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -426,7 +426,7 @@ DCHECK(!IsCreatedByExtension(url)); DCHECK(!keyword.empty()); DCHECK(!search_url.empty()); -@@ -658,6 +659,7 @@ void TemplateURLService::ResetTemplateUR +@@ -654,6 +655,7 @@ void TemplateURLService::ResetTemplateUR } data.safe_for_autoreplace = false; data.last_modified = clock_->Now(); @@ -436,7 +436,7 @@ --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -252,7 +252,8 @@ class TemplateURLService : public WebDat +@@ -248,7 +248,8 @@ class TemplateURLService : public WebDat void ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index 8d42738c..13149a0e 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 -@@ -2587,7 +2587,13 @@ const FeatureEntry::FeatureVariation kPa +@@ -2649,7 +2649,13 @@ const FeatureEntry::FeatureVariation kPa // 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 a9c6db3c..ac908426 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -153,7 +153,7 @@ } // namespace download --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -78,7 +78,6 @@ source_set("browser") { +@@ -79,7 +79,6 @@ source_set("browser") { "//components/payments/mojom", "//components/power_scheduler", "//components/services/filesystem:lib", @@ -163,7 +163,7 @@ "//components/services/storage/dom_storage:local_storage_proto", --- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -438,7 +438,7 @@ void PepperFileIOHost::OnLocalFileOpened +@@ -480,7 +480,7 @@ void PepperFileIOHost::OnLocalFileOpened ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { @@ -172,7 +172,7 @@ // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -472,7 +472,7 @@ void PepperFileIOHost::OnLocalFileOpened +@@ -514,7 +514,7 @@ void PepperFileIOHost::OnLocalFileOpened #endif } @@ -183,7 +183,7 @@ const base::FilePath& path, --- a/content/browser/renderer_host/pepper/pepper_file_io_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h -@@ -15,7 +15,6 @@ +@@ -13,7 +13,6 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" @@ -191,7 +191,7 @@ #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_platform_file.h" -@@ -91,12 +90,6 @@ class PepperFileIOHost : public ppapi::h +@@ -89,12 +88,6 @@ class PepperFileIOHost : public ppapi::h const base::FilePath& path, base::File::Error error_code); diff --git a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch index e7be84f0..312842a3 100644 --- a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch +++ b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch @@ -2,7 +2,7 @@ --- a/components/url_formatter/url_formatter.cc +++ b/components/url_formatter/url_formatter.cc -@@ -465,14 +465,14 @@ ComponentResult IDNToUnicodeOneComponent +@@ -464,14 +464,14 @@ ComponentResult IDNToUnicodeOneComponent } // namespace const FormatUrlType kFormatUrlOmitNothing = 0; diff --git a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch index c8f8f13a..8c3a8291 100644 --- a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch @@ -3,7 +3,7 @@ --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3572,8 +3572,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3582,8 +3582,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -13,7 +13,7 @@ } SynthesizeGLError( GL_INVALID_ENUM, "getParameter", -@@ -3587,8 +3586,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3597,8 +3596,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_VENDOR)))); } diff --git a/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch b/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch index 992e5f93..5f47cb77 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 -@@ -375,7 +375,7 @@ const base::Feature kComputePressure{"Co +@@ -361,7 +361,7 @@ const base::Feature kComputePressure{"Co // Prefetch request properties are updated to be privacy-preserving. See // crbug.com/988956. const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges", diff --git a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch index d541a11b..669ebfba 100644 --- a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch +++ b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc -@@ -415,11 +415,6 @@ int GetContentRestrictions(const Browser +@@ -425,11 +425,6 @@ int GetContentRestrictions(const Browser CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(current_tab); content_restrictions = core_tab_helper->content_restrictions(); @@ -14,7 +14,7 @@ } return content_restrictions; } -@@ -1272,8 +1267,7 @@ bool CanSavePage(const Browser* browser) +@@ -1306,8 +1301,7 @@ bool CanSavePage(const Browser* browser) prefs::kAllowFileSelectionDialogs)) { return false; } @@ -64,7 +64,7 @@ // These lists are lazily initialized below and are leaked on shutdown to --- a/content/public/common/url_utils.cc +++ b/content/public/common/url_utils.cc -@@ -26,11 +26,7 @@ bool HasWebUIScheme(const GURL& url) { +@@ -27,11 +27,7 @@ bool HasWebUIScheme(const GURL& url) { } bool IsSavableURL(const GURL& url) { diff --git a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch index a9d3d23e..c137311f 100644 --- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch +++ b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch @@ -13,7 +13,7 @@ AddChildView(std::make_unique()); --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -2651,8 +2651,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2662,8 +2662,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { @@ -22,7 +22,7 @@ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); CHECK(clipboard); std::u16string clipboard_text; -@@ -2660,7 +2658,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2671,7 +2669,6 @@ void TabStrip::NewTabButtonPressed(const /* data_dst = */ nullptr, &clipboard_text); if (!clipboard_text.empty()) controller_->CreateNewTabWithLocation(clipboard_text); diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 6727d6f1..0940bb12 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -51,7 +51,7 @@ hidden="[[!prefs.feedback_allowed.value]]" --- a/chrome/browser/resources/settings/basic_page/basic_page.html +++ b/chrome/browser/resources/settings/basic_page/basic_page.html -@@ -91,6 +91,7 @@ +@@ -95,6 +95,7 @@ @@ -59,7 +59,7 @@ @@ -106,16 +106,18 @@ - --- a/chrome/browser/resources/settings/settings_menu/settings_menu.html +++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html -@@ -111,12 +111,6 @@ +@@ -111,14 +111,6 @@ $i18n{autofillPageTitle} -- +-