From 26170723f07b64daf7a7a3885d2586244d0d8fa5 Mon Sep 17 00:00:00 2001 From: Blaise Date: Thu, 15 Aug 2024 14:47:11 -0500 Subject: [PATCH] Update to Chromium 128.0.6613.84 --- chromium_version.txt | 2 +- domain_substitution.list | 554 ++++++-------- ...01-fix-building-without-safebrowsing.patch | 183 ++--- .../0005-disable-default-extensions.patch | 10 +- .../core/inox-patchset/0021-disable-rlz.patch | 2 +- ...refixes-to-possibly-evil-connections.patch | 17 +- ..._browsing-disable-incident-reporting.patch | 2 +- ...sable-reporting-of-safebrowsing-over.patch | 4 +- .../block-trk-and-subdomains.patch | 24 +- .../disable-crash-reporter.patch | 4 +- .../disable-domain-reliability.patch | 2 +- .../ungoogled-chromium/disable-gaia.patch | 2 +- .../core/ungoogled-chromium/disable-gcm.patch | 6 +- .../disable-google-host-detection.patch | 13 +- .../disable-mei-preload.patch | 22 +- .../disable-untraceable-urls.patch | 2 +- .../disable-webrtc-log-uploader.patch | 2 +- .../disable-webstore-urls.patch | 2 +- .../core/ungoogled-chromium/doh-changes.patch | 2 +- .../extensions-manifestv2.patch | 24 +- .../fix-building-with-prunned-binaries.patch | 227 +++--- .../fix-building-without-safebrowsing.patch | 683 ++++++++++-------- .../fix-learn-doubleclick-hsts.patch | 2 +- .../remove-unused-preferences-fields.patch | 545 ++++++++------ ...e-google-search-engine-with-nosearch.patch | 6 +- .../toggle-translation-via-switch.patch | 8 +- ...g-flags-client-rects-and-measuretext.patch | 44 +- ...ngerprinting-canvas-image-data-noise.patch | 12 +- .../flag-max-connections-per-host.patch | 12 +- .../0006-modify-default-prefs.patch | 14 +- ...ble-profile-auto-import-on-first-run.patch | 2 +- ...e-default-key-length-for-newly-gener.patch | 2 +- .../updater-disable-auto-update.patch | 2 +- .../add-flag-for-close-confirmation.patch | 12 +- .../add-flag-for-custom-ntp.patch | 6 +- .../add-flag-for-disabling-link-drag.patch | 4 +- .../add-flag-for-grab-handle.patch | 2 +- .../add-flag-for-incognito-themes.patch | 2 +- ...g-for-omnibox-autocomplete-filtering.patch | 4 +- .../add-flag-for-qr-generator.patch | 44 +- ...dd-flag-for-search-engine-collection.patch | 18 +- .../add-flag-for-tab-hover-cards.patch | 4 +- .../add-flag-for-tabsearch-button.patch | 4 +- ...dd-flag-to-change-http-accept-header.patch | 4 +- .../add-flag-to-clear-data-on-exit.patch | 4 +- ...d-flag-to-close-window-with-last-tab.patch | 2 +- ...g-to-configure-extension-downloading.patch | 2 +- ...-to-disable-local-history-expiration.patch | 4 +- .../add-flag-to-disable-tls-grease.patch | 2 +- .../add-flag-to-hide-extensions-menu.patch | 6 +- .../add-flag-to-hide-fullscreen-exit-ui.patch | 2 +- .../add-flag-to-hide-tab-close-buttons.patch | 4 +- .../add-flag-to-remove-client-hints.patch | 4 +- .../add-flag-to-scroll-tabs.patch | 8 +- .../add-flag-to-show-avatar-button.patch | 6 +- .../add-flags-for-existing-switches.patch | 2 +- ...add-flags-for-referrer-customization.patch | 28 +- .../add-ipv6-probing-option.patch | 4 +- .../add-suggestions-url-field.patch | 8 +- .../add-ungoogled-flag-headers.patch | 2 +- .../default-webrtc-ip-handling-policy.patch | 2 +- .../disable-download-quarantine.patch | 2 +- .../disable-intranet-redirect-detector.patch | 2 +- .../disable-remote-optimization-guide.patch | 2 +- .../disable-webgl-renderer-info.patch | 4 +- ...ble-default-prefetch-privacy-changes.patch | 2 +- .../enable-page-saving-on-more-pages.patch | 4 +- .../enable-paste-and-go-new-tab-button.patch | 6 +- .../ungoogled-chromium/first-run-page.patch | 16 +- .../keep-expired-flags.patch | 6 +- .../prepopulated-search-engines.patch | 2 +- .../remove-uneeded-ui.patch | 81 +-- .../upstream-fixes/missing-dependencies.patch | 30 +- pruning.list | 134 ++-- utils/clone.py | 9 - utils/depot_tools.patch | 11 +- 76 files changed, 1508 insertions(+), 1435 deletions(-) diff --git a/chromium_version.txt b/chromium_version.txt index c715ec81..cf79f6d4 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -127.0.6533.119 +128.0.6613.84 diff --git a/domain_substitution.list b/domain_substitution.list index ecbad99f..f2ddf55c 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -49,6 +49,7 @@ ash/assistant/ui/main_stage/assistant_onboarding_view_unittest.cc ash/assistant/ui/main_stage/suggestion_chip_view_unittest.cc ash/assistant/util/deep_link_util.cc ash/assistant/util/deep_link_util_unittest.cc +ash/auth/views/auth_header_view_pixeltest.cc ash/birch/birch_item.cc ash/birch/birch_item_unittest.cc ash/birch/birch_model_unittest.cc @@ -60,6 +61,7 @@ ash/child_accounts/parent_access_controller_impl_unittest.cc ash/clipboard/clipboard_history_controller_unittest.cc ash/clipboard/clipboard_history_menu_model_adapter_unittest.cc ash/components/arc/arc_util.h +ash/components/arc/net/arc_net_host_impl_unittest.cc ash/components/arc/net/passpoint_dialog_view.cc ash/components/arc/session/arc_upgrade_params.h ash/components/arc/session/serial_number_util_unittest.cc @@ -83,7 +85,6 @@ ash/glanceables/tasks/glanceables_tasks_view_unittest.cc ash/glanceables/tasks/test/glanceables_tasks_test_util.cc ash/login/ui/auth_icon_view.cc ash/login/ui/login_remove_account_dialog_unittest.cc -ash/picker/picker_asset_fetcher_impl.cc ash/picker/search/picker_search_controller_unittest.cc ash/picker/search/picker_search_request_unittest.cc ash/projector/projector_metadata_model.cc @@ -122,17 +123,18 @@ ash/system/eche/eche_tray.cc ash/system/eche/eche_tray_unittest.cc ash/system/federated/federated_client_manager_unittest.cc ash/system/federated/federated_service_controller_impl_unittest.cc +ash/system/focus_mode/focus_mode_countdown_view_unittest.cc ash/system/focus_mode/focus_mode_feature_pod_controller_unittest.cc ash/system/focus_mode/sounds/focus_mode_sounds_controller.cc ash/system/focus_mode/sounds/soundscape/soundscapes_downloader.cc -ash/system/focus_mode/youtube_music/youtube_music_client.cc -ash/system/focus_mode/youtube_music/youtube_music_types.h +ash/system/focus_mode/sounds/youtube_music/youtube_music_client.cc +ash/system/focus_mode/sounds/youtube_music/youtube_music_types.h ash/system/human_presence/snooping_protection_controller_unittest.cc ash/system/input_device_settings/device_image_downloader.cc +ash/system/input_device_settings/device_image_downloader_unittest.cc ash/system/input_device_settings/input_device_settings_metrics_manager_unittest.cc ash/system/input_device_settings/input_device_settings_notification_controller.cc ash/system/input_device_settings/input_device_settings_notification_controller_unittest.cc -ash/system/magic_boost/magic_boost_disclaimer_view.cc ash/system/mahi/mahi_constants.h ash/system/mahi/mahi_content_source_button_unittest.cc ash/system/mahi/mahi_panel_view_unittest.cc @@ -197,7 +199,9 @@ ash/webui/firmware_update_ui/resources/PRESUBMIT.py ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc ash/webui/help_app_ui/resources/js/help_app.d.ts ash/webui/media_app_ui/media_app_guest_ui.cc +ash/webui/media_app_ui/media_app_page_handler.cc ash/webui/media_app_ui/resources/js/launch.ts +ash/webui/media_app_ui/resources/js/media_app.d.ts ash/webui/os_feedback_ui/backend/feedback_service_provider_unittest.cc ash/webui/os_feedback_ui/backend/help_content_provider.cc ash/webui/os_feedback_ui/backend/help_content_provider_unittest.cc @@ -218,6 +222,11 @@ ash/webui/projector_app/test/projector_oauth_token_fetcher_unittest.cc ash/webui/projector_app/test/projector_xhr_sender_unittest.cc ash/webui/projector_app/test/untrusted_projector_page_handler_impl_unittest.cc ash/webui/projector_app/untrusted_projector_ui.cc +ash/webui/recorder_app_ui/resources/components/onboarding-dialog.ts +ash/webui/recorder_app_ui/resources/core/externs.d.ts +ash/webui/recorder_app_ui/resources/core/recording_session.ts +ash/webui/recorder_app_ui/resources/platforms/dev/handler.ts +ash/webui/recorder_app_ui/resources/static/audio_worklet.js ash/webui/scanning/resources/PRESUBMIT.py ash/webui/scanning/resources/scanning_app.html ash/webui/scanning/resources/scanning_app.ts @@ -231,7 +240,7 @@ ash/wm/desks/templates/saved_desk_test_helper.cc ash/wm/desks/templates/saved_desk_unittest.cc ash/wm/overview/birch/birch_bar_unittest.cc ash/wm/screen_pinning_controller.h -ash/wm/window_restore/pine_controller.cc +ash/wm/window_restore/informed_restore_controller.cc base/BUILD.gn base/PRESUBMIT.py base/allocator/partition_alloc_support.cc @@ -318,6 +327,7 @@ base/metrics/histogram_functions.h base/metrics/histogram_macros.h base/metrics/statistics_recorder.cc base/metrics/user_metrics.h +base/observer_list.h base/power_monitor/battery_level_provider_win.cc base/power_monitor/cpu_frequency_utils.cc base/power_monitor/power_monitor_device_source_android.cc @@ -334,7 +344,6 @@ base/profiler/metadata_recorder.h base/rand_util_win.cc base/strings/pattern_unittest.cc base/strings/string_number_conversions_unittest.cc -base/strings/string_piece_unittest.cc base/synchronization/lock.h base/system/sys_info.h base/task/sequence_manager/sequence_manager_impl.cc @@ -347,6 +356,7 @@ base/test/gtest_links_unittest.cc base/test/gtest_xml_unittest_result_printer_unittest.cc base/test/launcher/test_launcher.cc base/test/launcher/test_results_tracker_unittest.cc +base/test/metrics/action_suffix_reader_unittest.cc base/test/sequenced_task_runner_test_template.h base/test/task_environment_unittest.cc base/test/test_file_util.h @@ -389,6 +399,7 @@ base/win/windows_version.h base/win/windows_version_unittest.cc base/win/wmi.cc base/win/wmi.h +build/3pp_common/maven.py build/android/BUILD.gn build/android/PRESUBMIT.py build/android/apk_operations.py @@ -435,6 +446,7 @@ build/config/BUILDCONFIG.gn build/config/android/BUILD.gn build/config/android/internal_rules.gni build/config/android/rules.gni +build/config/c++/c++.gni build/config/chrome_build.gni build/config/chromeos/args.gni build/config/chromeos/rules.gni @@ -464,7 +476,6 @@ build/linux/unbundle/remove_bundled_libraries.py build/mac_toolchain.py build/nocompile.gni build/rust/rustc_wrapper.py -build/rust/std/remap_alloc.cc build/rust/std/rules/BUILD.gn build/sanitizers/lsan_suppressions.cc build/sanitizers/tsan_suppressions.cc @@ -508,7 +519,6 @@ chrome/android/java/res/values/strings.xml chrome/android/java/res/values/values.xml chrome/android/java/res/xml/phone_as_a_security_key_accessory_filter.xml chrome/android/java/src/PRESUBMIT.py -chrome/android/javatests/AndroidManifest.xml chrome/android/javatests/src/org/chromium/chrome/test/smoke/AndroidManifest_bundle.xml chrome/android/trichrome.gni chrome/android/webapk/PRESUBMIT.py @@ -517,6 +527,7 @@ chrome/android/webapk/shell_apk/res/values/dimens.xml chrome/app/PRESUBMIT.py chrome/app/app_management_strings.grdp chrome/app/chrome_command_ids.h +chrome/app/chrome_main.cc chrome/app/chromeos_strings.grdp chrome/app/chromium_strings.grd chrome/app/delay_load_failure_hook_win.cc @@ -557,9 +568,6 @@ chrome/browser/apps/almanac_api_client/almanac_api_util.cc chrome/browser/apps/almanac_api_client/almanac_api_util_unittest.cc chrome/browser/apps/almanac_api_client/almanac_icon_cache.cc chrome/browser/apps/almanac_api_client/device_info_manager.cc -chrome/browser/apps/almanac_api_client/proto_file_manager_unittest.cc -chrome/browser/apps/app_deduplication_service/app_deduplication_almanac_endpoint.cc -chrome/browser/apps/app_deduplication_service/app_deduplication_service_unittest.cc chrome/browser/apps/app_discovery_service/app_discovery_service_unittest.cc chrome/browser/apps/app_discovery_service/launcher_app_almanac_endpoint.cc chrome/browser/apps/app_discovery_service/recommended_arc_app_fetcher_unittest.cc @@ -606,6 +614,7 @@ chrome/browser/ash/android_sms/android_sms_urls.cc chrome/browser/ash/android_sms/android_sms_urls.h chrome/browser/ash/app_list/app_context_menu_unittest.cc chrome/browser/ash/app_list/app_list_sort_browsertest.cc +chrome/browser/ash/app_list/app_list_syncable_service_unittest.cc chrome/browser/ash/app_list/app_list_test_util.cc chrome/browser/ash/app_list/app_service/app_service_app_model_builder_unittest.cc chrome/browser/ash/app_list/chrome_app_list_model_updater_browsertest.cc @@ -688,11 +697,6 @@ chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc chrome/browser/ash/drive/drivefs_test_support.cc chrome/browser/ash/drive/file_system_util_unittest.cc -chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.cc -chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.h -chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_impl.cc -chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_test_utils.h -chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_utils.cc chrome/browser/ash/extensions/file_manager/file_manager_private_apitest.cc chrome/browser/ash/extensions/file_manager/system_notification_manager_unittest.cc chrome/browser/ash/extensions/users_private/users_private_apitest.cc @@ -715,6 +719,7 @@ chrome/browser/ash/growth/install_web_app_action_unittest.cc chrome/browser/ash/growth/open_url_action_performer_unittest.cc chrome/browser/ash/hats/hats_dialog.cc chrome/browser/ash/http_auth_dialog.h +chrome/browser/ash/input_device_settings/peripherals_app_delegate_impl.cc chrome/browser/ash/input_method/assistive_input_denylist.cc chrome/browser/ash/input_method/assistive_input_denylist_unittest.cc chrome/browser/ash/input_method/assistive_suggester_client_filter.cc @@ -751,6 +756,8 @@ chrome/browser/ash/login/saml/saml_lockscreen_browsertest.cc chrome/browser/ash/login/screens/arc_vm_data_migration_screen_unittest.cc chrome/browser/ash/login/screens/assistant_optin_flow_screen_browsertest.cc chrome/browser/ash/login/screens/categories_selection_screen_browsertest.cc +chrome/browser/ash/login/screens/locale_switch_screen.cc +chrome/browser/ash/login/screens/locale_switch_screen_browsertest.cc chrome/browser/ash/login/screens/personalized_recommend_apps_screen_browsertest.cc chrome/browser/ash/login/screens/quick_start_screen_browsertest.cc chrome/browser/ash/login/screens/recommend_apps_screen_browsertest.cc @@ -766,6 +773,8 @@ chrome/browser/ash/login/ui/captive_portal_view.cc chrome/browser/ash/login/users/default_user_image/default_user_images.cc chrome/browser/ash/login/users/multi_user_sign_in_policy_controller_unittest.cc chrome/browser/ash/login/wizard_controller_browsertest.cc +chrome/browser/ash/magic_boost/magic_boost_controller_ash.cc +chrome/browser/ash/magic_boost/magic_boost_controller_ash_unittest.cc chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc @@ -808,6 +817,7 @@ chrome/browser/ash/policy/networking/network_policy_application_browsertest.cc chrome/browser/ash/policy/remote_commands/crd/crd_oauth_token_fetcher.cc chrome/browser/ash/policy/remote_commands/device_command_fetch_support_packet_job_browsertest.cc chrome/browser/ash/policy/reporting/metrics_reporting/network/https_latency_events_unittest.cc +chrome/browser/ash/policy/skyvault/drive_skyvault_uploader_browsertest.cc chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc chrome/browser/ash/policy/status_collector/status_collector.h @@ -938,11 +948,13 @@ chrome/browser/content_settings/sound_content_setting_observer_unittest.cc chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc chrome/browser/device_identity/device_oauth2_token_service_unittest.cc chrome/browser/device_notifications/device_connection_tracker_unittest.cc +chrome/browser/devtools/aida_client.cc chrome/browser/devtools/device/adb/adb_client_socket_browsertest.cc chrome/browser/devtools/device/adb/mock_adb_server.cc chrome/browser/devtools/devtools_browsertest.cc chrome/browser/devtools/devtools_ui_bindings.cc chrome/browser/devtools/devtools_ui_bindings_unittest.cc +chrome/browser/devtools/process_sharing_infobar_delegate.cc chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc chrome/browser/devtools/protocol/devtools_pwa_browsertest.cc chrome/browser/devtools/url_constants.cc @@ -959,7 +971,6 @@ chrome/browser/download/save_page_browsertest.cc chrome/browser/engagement/important_sites_util_browsertest.cc chrome/browser/engagement/important_sites_util_unittest.cc chrome/browser/engagement/site_engagement_service_unittest.cc -chrome/browser/enterprise/browser_management/browser_management_service.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_browsertest.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_unittest.cc chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc @@ -978,7 +989,7 @@ chrome/browser/enterprise/connectors/device_trust/key_management/installer/manag chrome/browser/enterprise/connectors/device_trust/signals/decorators/ash/ash_signals_decorator_browsertest.cc chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator_unittest.cc chrome/browser/enterprise/connectors/device_trust/test/test_constants.cc -chrome/browser/enterprise/connectors/reporting/reporting_service_settings_unittest.cc +chrome/browser/enterprise/connectors/reporting/extension_telemetry_event_router_unittest.cc chrome/browser/enterprise/connectors/test/deep_scanning_test_utils.cc chrome/browser/enterprise/data_controls/chrome_rules_service_unittest.cc chrome/browser/enterprise/data_controls/reporting_service_unittest.cc @@ -1156,6 +1167,7 @@ chrome/browser/ip_protection/ip_protection_config_http.cc chrome/browser/k_anonymity_service/k_anonymity_service_client_browsertest.cc chrome/browser/k_anonymity_service/k_anonymity_service_client_unittest.cc chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter_unittest.cc +chrome/browser/keyboard_accessory/android/address_accessory_controller_impl_unittest.cc chrome/browser/lacros/account_manager/account_manager_util_unittest.cc chrome/browser/lacros/account_manager/account_profile_mapper_unittest.cc chrome/browser/lacros/account_manager/get_account_information_helper_unittest.cc @@ -1252,15 +1264,11 @@ chrome/browser/new_tab_page/modules/file_suggestion/drive_service_unittest.cc chrome/browser/new_tab_page/modules/history_clusters/cart/cart_processor.cc chrome/browser/new_tab_page/modules/history_clusters/cart/cart_processor_unittest.cc chrome/browser/new_tab_page/modules/history_clusters/history_clusters_module_util.cc -chrome/browser/new_tab_page/modules/history_clusters/history_clusters_page_handler_unittest.cc chrome/browser/new_tab_page/modules/history_clusters/history_clusters_test_support.h chrome/browser/new_tab_page/modules/history_clusters/ranking/history_clusters_module_ranking_model_handler.cc chrome/browser/new_tab_page/modules/history_clusters/ranking/history_clusters_module_ranking_model_handler_unittest.cc chrome/browser/new_tab_page/modules/new_tab_page_modules_interactive_uitest.cc chrome/browser/new_tab_page/modules/new_tab_page_modules_unittest.cc -chrome/browser/new_tab_page/modules/photos/photos_service.cc -chrome/browser/new_tab_page/modules/photos/photos_service_unittest.cc -chrome/browser/new_tab_page/modules/recipes/recipes_service_unittest.cc chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.cc chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler_unittest.cc chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler.cc @@ -1294,6 +1302,7 @@ chrome/browser/page_load_metrics/observers/core/ukm_page_load_metrics_observer_u chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.cc chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc +chrome/browser/page_load_metrics/observers/gws_abandoned_page_load_metrics_observer_browsertest.cc chrome/browser/page_load_metrics/observers/gws_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer_unittest.cc @@ -1332,7 +1341,6 @@ chrome/browser/password_manager/password_manager_util_win.cc chrome/browser/payments/android_payment_app_factory_browsertest.cc chrome/browser/payments/journey_logger_browsertest.cc chrome/browser/payments/manifest_verifier_browsertest.cc -chrome/browser/payments/payment_handler_just_in_time_installation_browsertest.cc chrome/browser/payments/payment_request_app_store_billing_browsertest.cc chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc chrome/browser/performance_manager/policies/page_discarding_helper_unittest.cc @@ -1428,6 +1436,7 @@ chrome/browser/renderer_context_menu/link_to_text_menu_observer_interactive_uite chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc chrome/browser/renderer_host/chrome_navigation_ui_data.h +chrome/browser/request_header_integrity/request_header_integrity_url_loader_throttle_unittest.cc chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc chrome/browser/resources/PRESUBMIT.py chrome/browser/resources/accessibility/chromevox_helper_manifest.json.jinja2 @@ -1511,7 +1520,7 @@ chrome/browser/resources/chromeos/emoji_picker/prefix_search.ts chrome/browser/resources/chromeos/emulator/icons.html chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json chrome/browser/resources/chromeos/login/components/web_view_loader.ts -chrome/browser/resources/chromeos/login/debug/debug.js +chrome/browser/resources/chromeos/login/debug/debug.ts chrome/browser/resources/chromeos/login/debug/quick_start_debugger.ts chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html chrome/browser/resources/chromeos/login/screens/login/encryption_migration.ts @@ -1521,6 +1530,8 @@ chrome/browser/resources/chromeos/multidevice_internals/browser_tabs_metadata_fo chrome/browser/resources/chromeos/parent_access/parent_access_ui.ts chrome/browser/resources/default_apps/external_extensions.json chrome/browser/resources/downloads/icons.html +chrome/browser/resources/extensions/detail_view.ts +chrome/browser/resources/extensions/mv2_deprecation_panel.ts chrome/browser/resources/family_link_user_internals/family_link_user_internals.js chrome/browser/resources/feedback/js/feedback_util.ts chrome/browser/resources/gaia_auth_host/PRESUBMIT.py @@ -1549,11 +1560,8 @@ chrome/browser/resources/new_tab_page/doodle_share_dialog.ts chrome/browser/resources/new_tab_page/lens_form.html chrome/browser/resources/new_tab_page/lens_form.ts chrome/browser/resources/new_tab_page/modules/drive/module.ts -chrome/browser/resources/new_tab_page/modules/history_clusters/suggest_tile.ts -chrome/browser/resources/new_tab_page/modules/photos/module.html chrome/browser/resources/new_tab_page/modules/v2/calendar/google_calendar_module.html chrome/browser/resources/new_tab_page/modules/v2/file_suggestion/module.ts -chrome/browser/resources/new_tab_page/modules/v2/history_clusters/suggest_tile.ts chrome/browser/resources/new_tab_page/transparency.ts chrome/browser/resources/new_tab_page/voice_search_overlay.ts chrome/browser/resources/omnibox/omnibox.html @@ -1564,6 +1572,8 @@ chrome/browser/resources/pdf/elements/icons.html chrome/browser/resources/pdf/ink/drawing_canvas.d.ts chrome/browser/resources/print_preview/data/destination_store.ts chrome/browser/resources/print_preview/ui/icons.html +chrome/browser/resources/privacy_sandbox/internals/private_state_tokens/container.html.ts +chrome/browser/resources/privacy_sandbox/internals/related_website_sets/related_website_sets_list_container.html.ts chrome/browser/resources/settings/a11y_page/a11y_page.ts chrome/browser/resources/settings/a11y_page/captions_subpage.ts chrome/browser/resources/settings/about_page/about_page.html @@ -1580,7 +1590,7 @@ chrome/browser/resources/usb_internals/descriptor_panel.ts chrome/browser/resources/webstore_app/manifest.json chrome/browser/resources/webui_gallery/demos/card/card_demo.ts chrome/browser/resources/webui_gallery/demos/cr_input/cr_input_demo.html.ts -chrome/browser/resources/webui_gallery/demos/cr_url_list_item/cr_url_list_item_demo.html +chrome/browser/resources/webui_gallery/demos/cr_url_list_item/cr_url_list_item_demo.html.ts chrome/browser/resources/webui_gallery/demos/side_panel/sp_components_demo.ts chrome/browser/rlz/chrome_rlz_tracker_web_contents_observer_unittest.cc chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc @@ -1588,6 +1598,7 @@ chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_unittest.cc chrome/browser/safe_browsing/chrome_password_protection_service.cc chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc +chrome/browser/safe_browsing/chrome_password_reuse_detection_manager_client_unittest.cc chrome/browser/safe_browsing/chrome_ping_manager_factory_unittest.cc chrome/browser/safe_browsing/client_side_detection_host_unittest.cc chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service.cc @@ -1665,6 +1676,7 @@ chrome/browser/signin/chrome_signin_proxying_url_loader_factory_unittest.cc chrome/browser/signin/chrome_signin_url_loader_throttle_unittest.cc chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc chrome/browser/signin/dice_browsertest.cc +chrome/browser/signin/dice_response_handler.cc chrome/browser/signin/dice_response_handler_unittest.cc chrome/browser/signin/dice_signed_in_profile_creator_unittest.cc chrome/browser/signin/dice_tab_helper_unittest.cc @@ -1717,6 +1729,7 @@ chrome/browser/sync/test/integration/single_client_extension_apps_sync_test.cc chrome/browser/sync/test/integration/single_client_history_sync_test.cc chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc chrome/browser/sync/test/integration/single_client_send_tab_to_self_sync_test.cc +chrome/browser/sync/test/integration/single_client_shared_tab_group_data_sync_test.cc chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc chrome/browser/sync/test/integration/single_client_wallet_credential_sync_test.cc chrome/browser/sync/test/integration/sync_auth_test.cc @@ -1746,6 +1759,7 @@ chrome/browser/translate/translate_manager_browsertest.cc chrome/browser/translate/translate_manager_render_view_host_android_unittest.cc chrome/browser/translate/translate_manager_render_view_host_unittest.cc chrome/browser/trusted_vault/trusted_vault_encryption_keys_tab_helper_browsertest.cc +chrome/browser/ui/android/plus_addresses/all_plus_addresses_bottom_sheet_view_browsertest.cc chrome/browser/ui/android/strings/android_chrome_strings.grd chrome/browser/ui/ash/ambient/ambient_client_impl.cc chrome/browser/ui/ash/ambient/ambient_client_impl_unittest.cc @@ -1761,7 +1775,6 @@ chrome/browser/ui/ash/birch/birch_browsertest.cc chrome/browser/ui/ash/birch/birch_calendar_fetcher.cc chrome/browser/ui/ash/birch/birch_calendar_fetcher_unittest.cc chrome/browser/ui/ash/birch/birch_keyed_service_unittest.cc -chrome/browser/ui/ash/birch/birch_weather_v2_provider.cc chrome/browser/ui/ash/birch/refresh_token_waiter_unittest.cc chrome/browser/ui/ash/calendar/calendar_client_impl.cc chrome/browser/ui/ash/calendar/calendar_client_impl_unittest.cc @@ -1816,7 +1829,6 @@ chrome/browser/ui/browser_navigator_iwa_browsertest.cc chrome/browser/ui/browser_navigator_params.h chrome/browser/ui/browser_tabstrip_browsertest_chromeos.cc chrome/browser/ui/chrome_pages.cc -chrome/browser/ui/chromeos/magic_boost/magic_boost_disclaimer_view.cc chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_browsertest.mm chrome/browser/ui/cocoa/applescript/tab_applescript.mm chrome/browser/ui/cocoa/applescript/window_applescript_browsertest.mm @@ -1854,7 +1866,6 @@ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc chrome/browser/ui/omnibox/omnibox_view_browsertest.cc chrome/browser/ui/page_info/chrome_page_info_ui_delegate.cc chrome/browser/ui/passwords/account_storage_auth_helper_unittest.cc -chrome/browser/ui/passwords/bubble_controllers/manage_passwords_bubble_controller_unittest.cc chrome/browser/ui/passwords/bubble_controllers/move_to_account_store_bubble_controller_unittest.cc chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc chrome/browser/ui/passwords/password_cross_domain_confirmation_popup_controller_impl_unittest.cc @@ -1866,6 +1877,7 @@ chrome/browser/ui/pdf/adobe_reader_info_win.cc chrome/browser/ui/profiles/profile_picker_unittest.cc chrome/browser/ui/quick_answers/quick_answers_state_ash_unittest.cc chrome/browser/ui/quick_answers/ui/quick_answers_util.cc +chrome/browser/ui/quick_answers/ui/quick_answers_view_unittest.cc chrome/browser/ui/safety_hub/notification_permission_review_service_unittest.cc chrome/browser/ui/safety_hub/password_status_check_service_unittest.cc chrome/browser/ui/search/ntp_user_data_logger_unittest.cc @@ -1891,7 +1903,6 @@ chrome/browser/ui/tabs/pinned_tab_service_browsertest.cc chrome/browser/ui/tabs/pinned_tab_service_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service_unittest.cc chrome/browser/ui/tabs/tab_strip_model_unittest.cc -chrome/browser/ui/test/popup_fullscreen_browsertest.cc chrome/browser/ui/toolbar/app_menu_model_interactive_uitest.cc chrome/browser/ui/toolbar/location_bar_model_unittest.cc chrome/browser/ui/toolbar/media_router/media_router_contextual_menu.cc @@ -1904,6 +1915,8 @@ chrome/browser/ui/views/autofill/payments/local_card_migration_uitest.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/autofill/popup/password_favicon_loader_unittest.cc +chrome/browser/ui/views/autofill/popup/popup_row_factory_utils_browsertest.cc chrome/browser/ui/views/autofill/popup/popup_separator_view.h chrome/browser/ui/views/autofill/popup/popup_view_views_browsertest.cc chrome/browser/ui/views/autofill/popup/popup_view_views_unittest.cc @@ -1958,8 +1971,10 @@ chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view_unitte chrome/browser/ui/views/profiles/first_run_interactive_uitest.cc chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider_browsertest.cc +chrome/browser/ui/views/profiles/profile_picker_ui_browsertest.cc chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc chrome/browser/ui/views/profiles/profiles_pixel_test_utils.cc +chrome/browser/ui/views/profiles/sync_confirmation_ui_browsertest.cc chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble_unittest.cc chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc chrome/browser/ui/views/session_crashed_bubble_view.cc @@ -1970,7 +1985,6 @@ chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_view_impl_unittest.cc chrome/browser/ui/views/side_panel/companion/exps_registration_success_observer_unittest.cc chrome/browser/ui/views/side_panel/lens/lens_core_tab_side_panel_helper_browsertest.cc chrome/browser/ui/views/side_panel/lens/lens_unified_side_panel_view.cc -chrome/browser/ui/views/side_panel/read_anything/read_anything_controller_unittest.cc chrome/browser/ui/views/side_panel/search_companion/companion_live_test.cc chrome/browser/ui/views/side_panel/search_companion/companion_page_browsertest.cc chrome/browser/ui/views/side_panel/search_companion/companion_side_panel_controller.cc @@ -1982,7 +1996,6 @@ chrome/browser/ui/views/user_education/browser_user_education_service.cc chrome/browser/ui/views/user_education/low_usage_promo.cc chrome/browser/ui/views/web_apps/force_installed_preinstalled_deprecated_app_dialog_view.cc chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_browsertest.cc -chrome/browser/ui/views/webauthn/authenticator_request_bubble.cc chrome/browser/ui/views/webid/account_selection_view_base.cc chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop_browsertest.cc chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks_browsertest.cc @@ -1993,7 +2006,6 @@ chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.cc chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc chrome/browser/ui/webauthn/authenticator_request_window.cc -chrome/browser/ui/webauthn/sheet_models.cc chrome/browser/ui/webui/PRESUBMIT.py chrome/browser/ui/webui/access_code_cast/access_code_cast_handler_unittest.cc chrome/browser/ui/webui/app_home/app_home_page_handler.cc @@ -2024,9 +2036,11 @@ chrome/browser/ui/webui/ash/settings/pages/power/power_section.cc chrome/browser/ui/webui/ash/settings/services/metrics/per_session_settings_user_action_tracker_unittest.cc chrome/browser/ui/webui/ash/settings/services/metrics/settings_user_action_tracker_unittest.cc chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc +chrome/browser/ui/webui/certificate_manager/certificate_manager_ui.cc chrome/browser/ui/webui/commerce/shopping_ui_handler_delegate_browsertest.cc chrome/browser/ui/webui/components/components_handler.cc chrome/browser/ui/webui/cr_components/history_embeddings/history_embeddings_handler_unittest.cc +chrome/browser/ui/webui/data_sharing/data_sharing_ui.cc chrome/browser/ui/webui/devtools/devtools_ui_data_source_unittest.cc chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc @@ -2092,7 +2106,9 @@ chrome/browser/ui/webui/webui_allowlist_provider_unittest.cc chrome/browser/ui/webui/welcome/google_apps_handler.cc chrome/browser/ui/webui/welcome/ntp_background_handler.cc chrome/browser/ui/webui/whats_new/whats_new_fetcher.cc +chrome/browser/ui/webui/whats_new/whats_new_fetcher_browsertest.cc chrome/browser/ui/webui/whats_new/whats_new_handler_unittest.cc +chrome/browser/ui/webui/whats_new/whats_new_registrar_unittest.cc chrome/browser/ui/webui/whats_new/whats_new_ui.cc chrome/browser/ui/webui/whats_new/whats_new_util_unittest.cc chrome/browser/ui/window_sizer/window_sizer_chromeos.cc @@ -2112,10 +2128,8 @@ chrome/browser/web_applications/chromeos_web_app_experiments_browsertest.cc chrome/browser/web_applications/commands/fetch_manifest_and_install_command.cc chrome/browser/web_applications/commands/install_app_from_verified_manifest_command.cc chrome/browser/web_applications/commands/install_app_from_verified_manifest_command_browsertest.cc -chrome/browser/web_applications/isolated_web_apps/isolated_web_app_downloader.cc chrome/browser/web_applications/isolated_web_apps/isolated_web_app_source_unittest.cc chrome/browser/web_applications/isolated_web_apps/isolated_web_app_update_manager.h -chrome/browser/web_applications/isolated_web_apps/update_manifest/update_manifest_fetcher.cc chrome/browser/web_applications/migrations/migrate_preinstalls_to_aps_browsertest.cc chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.cc chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.h @@ -2218,7 +2232,7 @@ chrome/common/net/x509_certificate_model_nss_unittest.cc chrome/common/net/x509_certificate_model_unittest.cc chrome/common/pref_names.h chrome/common/url_constants.h -chrome/common/webui_url_constants.cc +chrome/common/webui_url_constants.h chrome/common/win/delay_load_failure_hook.cc chrome/common/win/delay_load_notify_hook.cc chrome/common/win/delay_load_notify_hook.h @@ -2250,6 +2264,9 @@ chrome/docs/index.html chrome/docs/platform-pillar.html chrome/elevation_service/caller_validation.cc chrome/elevation_service/service_main.cc +chrome/enterprise_companion/branding.gni +chrome/enterprise_companion/crash_client.cc +chrome/enterprise_companion/event_logger.cc chrome/install_static/install_constants.h chrome/install_static/install_details.h chrome/install_static/install_modes_unittest.cc @@ -2316,6 +2333,7 @@ chrome/installer/util/shell_util.h chrome/installer/util/work_item.h chrome/notification_helper/notification_activator.h chrome/notification_helper/notification_helper.cc +chrome/renderer/accessibility/read_aloud_traversal_utils.cc chrome/renderer/accessibility/read_anything_app_controller.cc chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc chrome/renderer/accessibility/read_anything_app_model.cc @@ -2356,7 +2374,6 @@ chrome/test/base/chromeos/crosier/chromeos_integration_login_mixin.cc chrome/test/base/chromeos/crosier/chromeos_integration_login_mixin.h chrome/test/base/chromeos/crosier/demo_integration_test.cc chrome/test/base/chromeos/crosier/helper/reset_dut.py -chrome/test/base/chromeos/test_chrome_main.cc chrome/test/base/fake_gaia_mixin.cc chrome/test/base/fake_gaia_mixin.h chrome/test/base/in_process_browser_test_browsertest.cc @@ -2380,6 +2397,7 @@ chrome/test/chromedriver/window_commands.cc chrome/test/chromedriver/window_commands_unittest.cc chrome/test/enterprise/e2e/connector/chrome_reporting_connector_test_case.py chrome/test/enterprise/e2e/connector/common/realtime_reporting_ui_test.py +chrome/test/enterprise/e2e/connector/identity_connector/managed_profile_test.py chrome/test/enterprise/e2e/connector/local_content_analysis_connector/local_content_analysis_connector_test.py chrome/test/enterprise/e2e/connector/realtime_reporting_bce/reporting_server.py chrome/test/enterprise/e2e/connector/reporting_connector_chronicle/chronicle_api_service.py @@ -2391,6 +2409,7 @@ chrome/test/enterprise/e2e/policy/allow_deleting_browser_history/allow_deleting_ chrome/test/enterprise/e2e/policy/apps_shortcut/apps_shortcut.py chrome/test/enterprise/e2e/policy/bookmarkbar_enabled/bookmarkbar_enabled.py chrome/test/enterprise/e2e/policy/cloud_management_enrollment_token/cloud_management_enrollment_token.py +chrome/test/enterprise/e2e/policy/cloud_reporting_enabled/cloud_reporting_enabled.py chrome/test/enterprise/e2e/policy/default_search_provider/default_search_provider.py chrome/test/enterprise/e2e/policy/encrypted_reporting/report_cbcm_events.py chrome/test/enterprise/e2e/policy/extension_allowlist/extension_allowlist.py @@ -2412,7 +2431,8 @@ chrome/test/enterprise/e2e/policy/url_blocklist/url_blocklist.py chrome/test/enterprise/e2e/policy/user_data_dir/user_data_dir.py chrome/test/enterprise/e2e/policy/webprotect_file_download/webprotect_file_download_webdriver.py chrome/test/enterprise/e2e/policy/youtube_restrict/youtube_restrict.py -chrome/test/fuzzing/in_process_fuzzer.h +chrome/test/fuzzing/atspi_in_process_fuzzer.cc +chrome/test/fuzzing/in_process_fuzzer.cc chrome/test/interaction/interactive_browser_test_interactive_uitest.cc chrome/test/mini_installer/PRESUBMIT.py chrome/test/mini_installer/create_zip.py @@ -2442,9 +2462,10 @@ chrome/updater/certificate_tag_internal.h chrome/updater/certificate_tag_unittest.cc chrome/updater/constants.h chrome/updater/crash_reporter.cc +chrome/updater/enterprise/win/google/build_group_policy_template_unittest.py +chrome/updater/enterprise/win/google/public_apps.py chrome/updater/external_constants_builder_unittest.cc chrome/updater/external_constants_override_unittest.cc -chrome/updater/mac/keystone/ksadmin_unittest.cc chrome/updater/mac/launcher_main.c chrome/updater/mac/setup/ks_tickets.mm chrome/updater/mac/setup/ks_tickets_unittest.mm @@ -2506,8 +2527,11 @@ chromeos/ash/components/dbus/biod/fake_biod_client_unittest.cc chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h chromeos/ash/components/dbus/dlcservice/dlcservice_client.h chromeos/ash/components/dbus/rmad/fake_rmad_client.cc -chromeos/ash/components/dbus/shill/shill_manager_client.h chromeos/ash/components/drivefs/drivefs_http_client_unittest.cc +chromeos/ash/components/enhanced_network_tts/enhanced_network_tts_constants.h +chromeos/ash/components/enhanced_network_tts/enhanced_network_tts_impl.cc +chromeos/ash/components/enhanced_network_tts/enhanced_network_tts_test_utils.h +chromeos/ash/components/enhanced_network_tts/enhanced_network_tts_utils.cc chromeos/ash/components/file_manager/indexing/file_index_service_registry_unittest.cc chromeos/ash/components/fwupd/firmware_update_manager.cc chromeos/ash/components/fwupd/firmware_update_manager_unittest.cc @@ -2569,6 +2593,7 @@ chromeos/ash/services/quick_pair/public/cpp/account_key_filter.h chromeos/ash/services/quick_pair/public/cpp/battery_notification.h chromeos/ash/services/quick_pair/public/cpp/not_discoverable_advertisement.h chromeos/chromeos_strings.grd +chromeos/components/quick_answers/public/cpp/quick_answers_state_unittest.cc chromeos/components/quick_answers/translation_result_loader.cc chromeos/components/quick_answers/translation_result_loader_unittest.cc chromeos/components/quick_answers/utils/spell_check_language.cc @@ -2620,7 +2645,6 @@ components/autofill/core/browser/address_data_cleaner_unittest.cc components/autofill/core/browser/address_data_manager_unittest.cc components/autofill/core/browser/address_suggestion_generator_unittest.cc components/autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals.js -components/autofill/core/browser/autofill_experiments_unittest.cc components/autofill/core/browser/autofill_test_utils.cc components/autofill/core/browser/browser_autofill_manager_unittest.cc components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc @@ -2629,7 +2653,6 @@ components/autofill/core/browser/crowdsourcing/determine_possible_field_types_un components/autofill/core/browser/data_model/autofill_profile_unittest.cc components/autofill/core/browser/form_data_importer_unittest.cc components/autofill/core/browser/form_filler_unittest.cc -components/autofill/core/browser/form_parsing/address_field_parser.cc components/autofill/core/browser/form_structure_unittest.cc components/autofill/core/browser/metrics/autofill_metrics.cc components/autofill/core/browser/metrics/autofill_metrics_test_base.cc @@ -2637,6 +2660,7 @@ components/autofill/core/browser/metrics/autofill_metrics_unittest.cc components/autofill/core/browser/metrics/profile_deduplication_metrics_unittest.cc components/autofill/core/browser/metrics/quality_metrics_unittest.cc components/autofill/core/browser/metrics/shadow_prediction_metrics_unittest.cc +components/autofill/core/browser/ml_model/autofill_ml_prediction_model_handler.cc components/autofill/core/browser/ml_model/autofill_ml_prediction_model_handler_unittest.cc components/autofill/core/browser/payments/autofill_offer_manager_unittest.cc components/autofill/core/browser/payments/constants.h @@ -2702,8 +2726,10 @@ components/cloud_devices/common/cloud_device_description.h components/cloud_devices/common/printer_description.h components/commerce/core/account_checker.cc components/commerce/core/account_checker_unittest.cc -components/commerce/core/commerce_constants.cc +components/commerce/core/commerce_constants.h components/commerce/core/commerce_feature_list.h +components/commerce/core/compare/cluster_server_proxy.cc +components/commerce/core/compare/cluster_server_proxy_unittest.cc components/commerce/core/compare/product_specifications_server_proxy.cc components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json components/commerce/core/parcel/parcels_server_proxy.cc @@ -2740,7 +2766,6 @@ components/cronet/gn2bp/gn_utils.py components/cronet/native/cronet.idl components/cronet/native/perftest/perf_test.cc components/cronet/tools/cr_cronet.py -components/cronet/tools/generate_javadoc.py components/cronet/tools/utils.py components/custom_handlers/protocol_handler_registry_unittest.cc components/data_sharing/internal/data_sharing_service_impl_unittest.cc @@ -2772,11 +2797,12 @@ components/drive/service/drive_api_service.cc components/drive/service/fake_drive_service.cc components/embedder_support/android/BUILD.gn components/endpoint_fetcher/endpoint_fetcher_unittest.cc +components/enterprise/connectors/reporting/reporting_service_settings_unittest.cc components/enterprise/connectors/service_provider_config.cc components/enterprise/connectors/service_provider_config_unittest.cc -components/enterprise/data_controls/attributes_condition_unittest.cc -components/enterprise/data_controls/data_controls_policy_handler_unittest.cc -components/enterprise/data_controls/rule_unittest.cc +components/enterprise/data_controls/core/conditions/attributes_condition_unittest.cc +components/enterprise/data_controls/core/data_controls_policy_handler_unittest.cc +components/enterprise/data_controls/core/rule_unittest.cc components/error_page/common/localized_error.cc components/error_page_strings.grdp components/exo/data_offer_unittest.cc @@ -2784,6 +2810,7 @@ components/exo/drag_drop_operation_unittest.cc components/exo/seat_unittest.cc components/exo/ui_lock_controller.h components/eye_dropper/eye_dropper_view.cc +components/facilitated_payments/core/util/payment_link_validator_unittest.cc components/favicon/content/content_favicon_driver_unittest.cc components/favicon/core/fallback_url_util_unittest.cc components/favicon/core/favicon_backend.cc @@ -2864,8 +2891,13 @@ components/history_clusters/core/ranking_cluster_finalizer_unittest.cc components/history_clusters/core/similar_visit_deduper_cluster_finalizer_unittest.cc components/history_clusters/core/single_visit_cluster_finalizer_unittest.cc components/history_clusters_strings.grdp +components/history_embeddings/ml_answerer_unittest.cc components/history_strings.grdp components/infobars/content/content_infobar_manager.cc +components/input/render_input_router.h +components/input/render_widget_host_input_event_router.cc +components/input/render_widget_host_view_input.h +components/input/touch_action_filter.h components/invalidation/impl/fcm_invalidation_service_unittest.cc components/invalidation/impl/per_user_topic_subscription_manager.cc components/invalidation/impl/per_user_topic_subscription_manager_unittest.cc @@ -2884,6 +2916,7 @@ components/lookalikes/core/lookalike_url_util.cc components/lookalikes/core/lookalike_url_util.h components/lookalikes/core/lookalike_url_util_unittest.cc components/management_strings.grdp +components/manta/anchovy/anchovy_provider.cc components/manta/base_provider.cc components/manta/base_provider_test_helper.cc components/manta/manta_service_callbacks.cc @@ -2956,6 +2989,7 @@ components/omnibox/browser/history_match.h components/omnibox/browser/history_provider.h components/omnibox/browser/history_quick_provider.cc components/omnibox/browser/history_quick_provider_unittest.cc +components/omnibox/browser/history_scoring_signals_annotator_unittest.cc components/omnibox/browser/history_url_provider.cc components/omnibox/browser/history_url_provider_unittest.cc components/omnibox/browser/in_memory_url_index_types.h @@ -2985,7 +3019,6 @@ components/omnibox/browser/shortcuts_backend_unittest.cc components/omnibox/browser/shortcuts_database_unittest.cc components/omnibox/browser/shortcuts_provider_unittest.cc components/omnibox/browser/suggestion_answer.h -components/omnibox/browser/suggestion_answer_unittest.cc components/omnibox/browser/suggestion_group_unittest.cc components/omnibox/browser/titled_url_match_utils.cc components/omnibox/browser/titled_url_match_utils_unittest.cc @@ -2997,6 +3030,7 @@ components/omnibox_pedal_ui_strings.grdp components/omnibox_strings.grdp components/optimization_guide/core/hints_component_util_unittest.cc components/optimization_guide/core/hints_manager_unittest.cc +components/optimization_guide/core/model_execution/json_response_parser_unittest.cc components/optimization_guide/core/model_execution/model_execution_fetcher.cc components/optimization_guide/core/model_execution/model_execution_fetcher_unittest.cc components/optimization_guide/core/model_execution/model_execution_manager_unittest.cc @@ -3238,6 +3272,8 @@ components/policy/test/data/pref_mapping/DeviceLoginScreenWebUsbAllowDevicesForU components/policy/test/data/pref_mapping/DirectSocketsAllowedForUrls.json components/policy/test/data/pref_mapping/DirectSocketsBlockedForUrls.json components/policy/test/data/pref_mapping/DisabledSchemes.json +components/policy/test/data/pref_mapping/DnsOverHttpsExcludedDomains.json +components/policy/test/data/pref_mapping/DnsOverHttpsIncludedDomains.json components/policy/test/data/pref_mapping/ExtensionInstallForcelist.json components/policy/test/data/pref_mapping/ExtensionOAuthRedirectUrls.json components/policy/test/data/pref_mapping/ExtensionSettings.json @@ -3256,6 +3292,8 @@ components/policy/test/data/pref_mapping/JavaScriptAllowedForUrls.json components/policy/test/data/pref_mapping/JavaScriptBlockedForUrls.json components/policy/test/data/pref_mapping/JavaScriptJitAllowedForSites.json components/policy/test/data/pref_mapping/JavaScriptJitBlockedForSites.json +components/policy/test/data/pref_mapping/JavaScriptOptimizerAllowedForSites.json +components/policy/test/data/pref_mapping/JavaScriptOptimizerBlockedForSites.json components/policy/test/data/pref_mapping/LegacySameSiteCookieBehaviorEnabledForDomainList.json components/policy/test/data/pref_mapping/LocalFontsAllowedForUrls.json components/policy/test/data/pref_mapping/LocalFontsBlockedForUrls.json @@ -3331,6 +3369,7 @@ components/printing/test/print_render_frame_helper_browsertest.cc components/privacy_sandbox/privacy_sandbox_settings_impl.cc components/privacy_sandbox/privacy_sandbox_settings_impl_unittest.cc components/privacy_sandbox_chrome_strings.grdp +components/privacy_sandbox_strings.grd components/protocol_handler_strings.grdp components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc components/proxy_config/proxy_policy_handler_unittest.cc @@ -3395,8 +3434,8 @@ components/resources/terms/terms_zh-TW.html components/rlz/rlz_tracker.h components/safe_browsing/android/real_time_url_checks_allowlist_resource_file_unittest.cc components/safe_browsing/android/real_time_url_checks_allowlist_unittest.cc -components/safe_browsing/content/browser/base_ui_manager.cc components/safe_browsing/content/browser/client_side_detection_service.cc +components/safe_browsing/content/browser/client_side_phishing_model_unittest.cc components/safe_browsing/content/browser/password_protection/password_protection_service_unittest.cc components/safe_browsing/content/browser/triggers/ad_sampler_trigger_unittest.cc components/safe_browsing/content/browser/triggers/suspicious_site_trigger.cc @@ -3420,6 +3459,7 @@ components/safe_browsing/core/browser/password_protection/password_protection_se components/safe_browsing/core/browser/ping_manager_unittest.cc components/safe_browsing/core/browser/realtime/url_lookup_service.cc components/safe_browsing/core/browser/realtime/url_lookup_service_unittest.cc +components/safe_browsing/core/browser/sync/sync_utils_unittest.cc components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc components/safe_browsing/core/browser/tailored_security_service/tailored_security_service_observer_util.cc components/safe_browsing/core/browser/tailored_security_service/tailored_security_service_unittest.cc @@ -3436,6 +3476,8 @@ components/saved_tab_groups/android/tab_group_sync_service_android_unittest.cc components/saved_tab_groups/saved_tab_group_sync_bridge_unittest.cc components/saved_tab_groups/saved_tab_group_test_utils.cc components/saved_tab_groups/saved_tab_group_unittest.cc +components/saved_tab_groups/shared_tab_group_data_sync_bridge_unittest.cc +components/saved_tab_groups/tab_group_sync_bridge_mediator_unittest.cc components/saved_tab_groups/tab_group_sync_service_unittest.cc components/search_engines/PRESUBMIT.py components/search_engines/android/template_url_service_android_unittest.cc @@ -3516,6 +3558,7 @@ components/signin/core/browser/signin_metrics_service_unittests.cc components/signin/internal/identity_manager/account_capabilities_fetcher_unittest.cc components/signin/internal/identity_manager/account_tracker_service_unittest.cc components/signin/internal/identity_manager/gaia_cookie_manager_service.cc +components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc components/signin/internal/identity_manager/oauth_multilogin_helper_unittest.cc components/signin/internal/identity_manager/primary_account_manager_unittest.cc @@ -3613,6 +3656,9 @@ components/ui_devtools/agent_util.cc components/ukm/ukm_service_unittest.cc components/undo/bookmark_undo_service_test.cc components/unified_consent/unified_consent_service_unittest.cc +components/url_deduplication/docs_url_strip_handler.cc +components/url_deduplication/docs_url_strip_handler_unittest.cc +components/url_deduplication/url_deduplication_helper_unittest.cc components/url_formatter/elide_url.cc components/url_formatter/elide_url.h components/url_formatter/elide_url_unittest.cc @@ -3657,6 +3703,7 @@ components/variations/variations_url_constants.cc components/visited_url_ranking/internal/history_url_visit_data_fetcher_unittest.cc components/visited_url_ranking/internal/session_url_visit_data_fetcher_unittest.cc components/visited_url_ranking/internal/transformer/default_app_url_visit_aggregates_transformer_unittest.cc +components/visited_url_ranking/public/features.h components/visited_url_ranking/public/test_support.h components/visited_url_ranking/public/url_visit_util.h components/visitedlink/test/visitedlink_perftest.cc @@ -3678,7 +3725,6 @@ components/webapps/browser/android/webapk/webapk_icons_hasher_unittest.cc components/webapps/browser/android/webapk/webapk_single_icon_hasher_unittest.cc components/webapps/browser/banners/app_banner_settings_helper_unittest.cc components/webapps/browser/installable/installable_evaluator_unittest.cc -components/webdata/common/PRESUBMIT.py components/webxr/android/arcore_install_helper.cc components/webxr/android/arcore_install_helper.h components/wifi/wifi_service_win.cc @@ -3717,7 +3763,6 @@ content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc content/browser/browsing_topics/browsing_topics_url_loader_unittest.cc content/browser/buckets/bucket_manager_host_unittest.cc content/browser/cache_storage/cache_storage_context_unittest.cc -content/browser/cache_storage/cache_storage_dispatcher_host.cc content/browser/child_process_security_policy_unittest.cc content/browser/client_hints/client_hints.cc content/browser/content_security_policy_browsertest.cc @@ -3740,7 +3785,6 @@ content/browser/file_system_access/file_path_watcher/file_path_watcher_win.cc content/browser/file_system_access/file_system_access_observer_observation.h content/browser/font_access/font_enumeration_cache.cc content/browser/font_access/font_enumeration_data_source_win.cc -content/browser/font_unique_name_lookup/font_unique_name_lookup_unittest.cc content/browser/geolocation/geolocation_service_impl_unittest.cc content/browser/gpu/gpu_data_manager_impl_private.cc content/browser/hid/hid_service_unittest.cc @@ -3784,6 +3828,7 @@ content/browser/permissions/permission_controller_impl_unittest.cc content/browser/permissions/permission_service_context_unittest.cc content/browser/plugin_service_impl_browsertest.cc content/browser/preloading/prefetch/prefetch_container.h +content/browser/preloading/prefetch/prefetch_container_unittest.cc content/browser/preloading/prefetch/prefetch_status.h content/browser/preloading/prefetch/prefetch_url_loader_interceptor.cc content/browser/preloading/preloading_decider_unittest.cc @@ -3811,7 +3856,6 @@ content/browser/renderer_host/navigator.cc content/browser/renderer_host/navigator_unittest.cc content/browser/renderer_host/recently_destroyed_hosts_unittest.cc content/browser/renderer_host/render_frame_host_impl.cc -content/browser/renderer_host/render_frame_host_impl.h content/browser/renderer_host/render_frame_host_manager_browsertest.cc content/browser/renderer_host/render_frame_host_manager_unittest.cc content/browser/renderer_host/render_frame_host_permissions_policy_unittest.cc @@ -3830,6 +3874,7 @@ content/browser/resources/gpu/info_view.ts content/browser/resources/traces_internals/icons.html content/browser/sandbox_ipc_linux.h content/browser/screen_orientation/screen_orientation_provider_unittest.cc +content/browser/security/dip/document_isolation_policy_browsertest.cc content/browser/serial/serial_unittest.cc content/browser/service_worker/service_worker_hid_delegate_observer_unittest.cc content/browser/service_worker/service_worker_main_resource_loader.h @@ -3873,10 +3918,6 @@ content/browser/webid/idp_network_request_manager_unittest.cc content/browser/zygote_host/zygote_host_impl_linux.cc content/child/runtime_features.cc content/common/features.cc -content/common/input/render_input_router.h -content/common/input/render_widget_host_input_event_router.cc -content/common/input/render_widget_host_view_input.h -content/common/input/touch_action_filter.h content/common/service_worker/race_network_request_url_loader_client.cc content/common/zygote/zygote_communication_linux.h content/public/android/java/res/values/strings.xml @@ -3901,7 +3942,6 @@ content/public/common/content_features.cc content/public/common/content_switches.cc content/public/common/pseudonymization_util.h content/public/common/resource_request_body_android.cc -content/public/common/url_constants.cc content/public/test/blink_test_environment.cc content/public/test/browser_test_utils.h content/public/test/permission_overrides_unittest.cc @@ -4251,15 +4291,37 @@ ios/chrome/browser/app_launcher/model/app_launcher_abuse_detector_unittest.mm ios/chrome/browser/app_launcher/model/app_launcher_tab_helper_unittest.mm ios/chrome/browser/autofill/model/automation/automation_action.mm ios/chrome/browser/autofill/model/form_suggestion_controller_unittest.mm +ios/chrome/browser/autofill/ui_bundled/authentication/authentication_egtest_util.mm +ios/chrome/browser/autofill/ui_bundled/authentication/card_unmask_authentication_egtest.mm +ios/chrome/browser/autofill/ui_bundled/bottom_sheet/virtual_card_enrollment_bottom_sheet_egtest.mm +ios/chrome/browser/autofill/ui_bundled/cells/target_account_item_unittest.mm +ios/chrome/browser/autofill/ui_bundled/manual_fill/form_observer_helper_unittest.mm +ios/chrome/browser/autofill/ui_bundled/manual_fill/manual_fill_password_mediator_unittest.mm +ios/chrome/browser/autofill/ui_bundled/save_card_infobar_egtest.mm +ios/chrome/browser/autofill/ui_bundled/save_profile_egtest.mm +ios/chrome/browser/bookmarks/ui_bundled/bookmark_earl_grey.mm +ios/chrome/browser/bookmarks/ui_bundled/bookmark_earl_grey_ui.h +ios/chrome/browser/bookmarks/ui_bundled/bookmark_mediator_unittest.mm +ios/chrome/browser/bookmarks/ui_bundled/bookmarks_egtest.mm +ios/chrome/browser/bookmarks/ui_bundled/folder_chooser/bookmarks_folder_chooser_egtest.mm +ios/chrome/browser/bring_android_tabs/ui_bundled/tab_list_from_android_mediator_unittest.mm ios/chrome/browser/browser_state/model/chrome_browser_state_impl.h ios/chrome/browser/commerce/model/shopping_persisted_data_tab_helper_unittest.mm +ios/chrome/browser/context_menu/ui_bundled/context_menu_configuration_provider_unittest.mm ios/chrome/browser/crash_report/model/breadcrumbs/breadcrumb_manager_tab_helper_unittest.mm ios/chrome/browser/credential_provider/model/credential_provider_service_unittest.mm +ios/chrome/browser/credential_provider_promo/ui_bundled/resources/CPE_promo_animation_edu_autofill.json +ios/chrome/browser/credential_provider_promo/ui_bundled/resources/CPE_promo_animation_edu_autofill_darkmode.json +ios/chrome/browser/dialogs/ui_bundled/nsurl_protection_space_util_unittest.mm ios/chrome/browser/download/model/ar_quick_look_tab_helper_unittest.mm +ios/chrome/browser/drive/model/drive_list.h ios/chrome/browser/drive/model/manage_storage_url_util.mm ios/chrome/browser/flags/about_flags.mm ios/chrome/browser/history/model/history_tab_helper_unittest.mm ios/chrome/browser/intents/user_activity_browser_agent_unittest.mm +ios/chrome/browser/lens_overlay/coordinator/lens_result_page_mediator.mm +ios/chrome/browser/lens_overlay/coordinator/lens_result_page_mediator_unittest.mm +ios/chrome/browser/lens_overlay/ui/lens_overlay_selection_placeholder_view_controller.mm ios/chrome/browser/link_to_text/model/link_to_text_java_script_feature_unittest.mm ios/chrome/browser/metrics/model/ios_family_link_user_metrics_provider_unittest.mm ios/chrome/browser/metrics/model/tab_usage_recorder_browser_agent_unittest.mm @@ -4270,9 +4332,9 @@ ios/chrome/browser/optimization_guide/model/optimization_guide_validation_tab_he ios/chrome/browser/page_info/about_this_site_tab_helper_unittest.mm ios/chrome/browser/passwords/model/password_controller_js_unittest.mm ios/chrome/browser/passwords/model/password_controller_unittest.mm +ios/chrome/browser/plus_addresses/ui/plus_address_bottom_sheet_constants.h ios/chrome/browser/policy/model/cloud/user_policy_signin_service_unittest.mm ios/chrome/browser/policy/model/new_tab_page_location_policy_handler_unittest.cc -ios/chrome/browser/policy/model/reporting/profile_report_generator_ios_unittest.mm ios/chrome/browser/policy/model/restrict_accounts_policy_handler_unittest.cc ios/chrome/browser/prerender/model/preload_controller_unittest.mm ios/chrome/browser/prerender/model/prerender_service_impl_unittest.mm @@ -4280,6 +4342,7 @@ ios/chrome/browser/reading_list/model/reading_list_browser_agent_unittest.mm ios/chrome/browser/safe_browsing/model/safe_browsing_client_impl_unittest.mm ios/chrome/browser/safe_browsing/model/tailored_security/tailored_security_tab_helper_unittest.mm ios/chrome/browser/safety_check/model/ios_chrome_safety_check_manager_unittest.mm +ios/chrome/browser/saved_tab_groups/model/tab_group_local_update_observer_unittest.mm ios/chrome/browser/search_engines/model/extension_search_engine_data_updater_unittest.mm ios/chrome/browser/search_engines/model/resources/search_engine.ts ios/chrome/browser/search_engines/model/search_engine_js_unittest.mm @@ -4294,6 +4357,7 @@ ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item_unitte ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item_unittest.mm ios/chrome/browser/shared/ui/util/pasteboard_util_unittest.mm ios/chrome/browser/signin/model/account_capabilities_fetcher_ios_unittest.mm +ios/chrome/browser/signin/model/chrome_account_manager_service.mm ios/chrome/browser/signin/model/chrome_account_manager_service_unittest.mm ios/chrome/browser/signin/model/fake_system_identity.mm ios/chrome/browser/signin/model/fake_system_identity_manager.mm @@ -4301,35 +4365,16 @@ ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_unittest.mm ios/chrome/browser/signin/model/pattern_account_restriction_unittest.mm ios/chrome/browser/signin/model/system_identity_manager.h ios/chrome/browser/ssl/model/ios_ssl_error_handler_unittest.mm +ios/chrome/browser/start_surface/ui_bundled/start_surface_scene_agent_unittest.mm ios/chrome/browser/supervised_user/model/supervised_user_url_filter_tab_helper_unittest.mm +ios/chrome/browser/ui/authentication/account_menu/account_menu_view_controller_presentation_delegate.h ios/chrome/browser/ui/authentication/history_sync/history_sync_capabilities_fetcher_unittest.mm -ios/chrome/browser/ui/authentication/identity_chooser/identity_chooser_coordinator_unittest.mm ios/chrome/browser/ui/authentication/signin/add_account_signin/add_account_signin_manager_unittest.mm -ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_mediator_unittest.mm -ios/chrome/browser/ui/authentication/signin/signin_utils_unittest.mm ios/chrome/browser/ui/authentication/signin_earl_grey_ui_test_util.mm -ios/chrome/browser/ui/autofill/authentication/authentication_egtest_util.mm -ios/chrome/browser/ui/autofill/authentication/card_unmask_authentication_egtest.mm -ios/chrome/browser/ui/autofill/cells/target_account_item_unittest.mm -ios/chrome/browser/ui/autofill/manual_fill/form_observer_helper_unittest.mm -ios/chrome/browser/ui/autofill/manual_fill/manual_fill_password_mediator_unittest.mm -ios/chrome/browser/ui/autofill/save_card_infobar_egtest.mm -ios/chrome/browser/ui/autofill/save_profile_egtest.mm -ios/chrome/browser/ui/bookmarks/bookmark_earl_grey.mm -ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_ui.h -ios/chrome/browser/ui/bookmarks/bookmark_mediator_unittest.mm -ios/chrome/browser/ui/bookmarks/bookmarks_egtest.mm -ios/chrome/browser/ui/bookmarks/folder_chooser/bookmarks_folder_chooser_egtest.mm -ios/chrome/browser/ui/bring_android_tabs/tab_list_from_android_mediator_unittest.mm ios/chrome/browser/ui/content_suggestions/cells/most_visited_tiles_mediator_unittest.mm -ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller_unittest.mm ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm ios/chrome/browser/ui/content_suggestions/parcel_tracking/parcel_tracking_mediator_unittest.mm ios/chrome/browser/ui/content_suggestions/tab_resumption/tab_resumption_mediator.mm -ios/chrome/browser/ui/context_menu/context_menu_configuration_provider_unittest.mm -ios/chrome/browser/ui/credential_provider_promo/resources/CPE_promo_animation_edu_autofill.json -ios/chrome/browser/ui/credential_provider_promo/resources/CPE_promo_animation_edu_autofill_darkmode.json -ios/chrome/browser/ui/dialogs/nsurl_protection_space_util_unittest.mm ios/chrome/browser/ui/first_run/first_run_search_engine_choice_egtest.mm ios/chrome/browser/ui/infobars/modals/autofill_address_profile/infobar_save_address_profile_table_view_controller_unittest.mm ios/chrome/browser/ui/infobars/test/test_infobar_password_delegate.mm @@ -4343,7 +4388,6 @@ ios/chrome/browser/ui/ntp/new_tab_page_mediator_unittest.mm ios/chrome/browser/ui/omnibox/omnibox_egtest.mm ios/chrome/browser/ui/omnibox/zero_suggest_prefetch_helper_unittest.mm ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator_unittest.mm -ios/chrome/browser/ui/overlays/infobar_banner/tab_pickup/tab_pickup_infobar_banner_overlay_mediator_unittest.mm ios/chrome/browser/ui/overlays/infobar_modal/passwords/password_infobar_modal_overlay_mediator_unittest.mm ios/chrome/browser/ui/page_info/page_info_egtest.mm ios/chrome/browser/ui/page_info/page_info_security_egtest.mm @@ -4356,9 +4400,8 @@ ios/chrome/browser/ui/reading_list/reading_list_table_view_item_unittest.mm ios/chrome/browser/ui/save_to_photos/save_to_photos_mediator.mm ios/chrome/browser/ui/settings/autofill/autofill_profile_settings_egtest.mm ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_egtest.mm -ios/chrome/browser/ui/settings/google_services/manage_accounts/accounts_table_view_controller_unittest.mm +ios/chrome/browser/ui/settings/clear_browsing_data/quick_delete_egtest.mm ios/chrome/browser/ui/settings/google_services/manage_sync_settings_command_handler.h -ios/chrome/browser/ui/settings/google_services/manage_sync_settings_mediator_unittest.mm ios/chrome/browser/ui/settings/password/password_checkup/password_checkup_constants.mm ios/chrome/browser/ui/settings/password/password_checkup/password_checkup_mediator_unittest.mm ios/chrome/browser/ui/settings/password/password_checkup/password_checkup_view_controller_unittest.mm @@ -4391,8 +4434,8 @@ ios/chrome/browser/ui/sharing/activity_services/activity_service_mediator_unitte ios/chrome/browser/ui/sharing/activity_services/activity_type_util.mm ios/chrome/browser/ui/sharing/qr_generator/qr_generator_coordinator_unittest.mm ios/chrome/browser/ui/sharing/qr_generator/qr_generator_util_unittest.mm -ios/chrome/browser/ui/start_surface/start_surface_scene_agent_unittest.mm ios/chrome/browser/ui/tab_switcher/tab_grid/grid/base_grid_mediator_unittest.mm +ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_egtest.mm ios/chrome/browser/ui/toolbar/adaptive_toolbar_mediator_unittest.mm ios/chrome/browser/url_loading/model/image_search_param_generator_unittest.mm ios/chrome/browser/web/model/chrome_web_client_unittest.mm @@ -4544,8 +4587,6 @@ media/gpu/test/video_encoder/video_encoder_client.cc media/gpu/test/video_encoder/video_encoder_test_environment.cc media/gpu/v4l2/mt21/mt21_decompressor_unittest.cc media/gpu/v4l2/mt21/mt21_util.h -media/gpu/v4l2/stateless/av1_delegate.cc -media/gpu/v4l2/stateless/v4l2_stateless_video_decoder.cc media/gpu/v4l2/test/av1_decoder.cc media/gpu/v4l2/test/video_decoder.cc media/gpu/v4l2/v4l2_stateful_video_decoder.cc @@ -4787,8 +4828,9 @@ net/cookies/parsed_cookie.h net/data/filter_unittests/google.txt net/data/fuzzer_data/http_security_headers/http_security_header_047.txt net/data/parse_certificate_unittest/v3_certificate_template.txt -net/device_bound_sessions/device_bound_session_registration_fetcher_param.cc net/device_bound_sessions/registration_fetcher.cc +net/device_bound_sessions/registration_fetcher_param.cc +net/device_bound_sessions/session_json_utils.cc net/device_bound_sessions/unexportable_key_service_factory.cc net/disk_cache/disk_cache.h net/disk_cache/simple/simple_backend_impl.h @@ -4933,8 +4975,10 @@ net/third_party/mozilla_win/cert/win_util.h net/third_party/nss/ssl/cmpcert.cc net/third_party/nss/ssl/cmpcert.h net/third_party/quiche/BUILD.gn +net/third_party/quiche/src/quiche/balsa/balsa_frame_test.cc net/third_party/quiche/src/quiche/blind_sign_auth/blind_sign_auth.cc net/third_party/quiche/src/quiche/common/platform/api/quiche_hostname_utils_test.cc +net/third_party/quiche/src/quiche/http2/core/spdy_protocol.h net/third_party/quiche/src/quiche/quic/core/crypto/client_proof_source_test.cc net/third_party/quiche/src/quiche/quic/core/crypto/quic_crypto_client_config.h net/third_party/quiche/src/quiche/quic/core/crypto/quic_crypto_client_config_test.cc @@ -4952,7 +4996,6 @@ net/third_party/quiche/src/quiche/quic/tools/quic_memory_cache_backend.cc net/third_party/quiche/src/quiche/quic/tools/quic_memory_cache_backend_test.cc net/third_party/quiche/src/quiche/quic/tools/quic_simple_server_stream_test.cc net/third_party/quiche/src/quiche/quic/tools/quic_toy_client.cc -net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.h net/tools/print_certificates.py net/tools/quic/quic_simple_client_bin.cc net/tools/testserver/testserver.py.vpython3 @@ -5099,6 +5142,7 @@ sandbox/linux/suid/client/setuid_sandbox_client.cc sandbox/linux/suid/client/setuid_sandbox_host.cc sandbox/linux/suid/sandbox.c sandbox/linux/system_headers/linux_prctl.h +sandbox/policy/features.cc sandbox/policy/linux/sandbox_linux.h sandbox/policy/sandbox.cc sandbox/policy/win/sandbox_warmup.cc @@ -5110,6 +5154,7 @@ sandbox/win/src/interception_agent.h sandbox/win/src/interception_internal.h sandbox/win/src/nt_internals.h sandbox/win/src/process_mitigations.cc +sandbox/win/src/process_mitigations_unittest.cc sandbox/win/src/resolver.h sandbox/win/src/sandbox_nt_util.cc sandbox/win/src/sandbox_nt_util.h @@ -5146,7 +5191,6 @@ services/network/http_cache_data_remover_unittest.cc services/network/mojo_host_resolver_impl_unittest.cc services/network/network_context_unittest.cc services/network/orb/orb_impl.cc -services/network/orb/orb_impl.h services/network/orb/orb_impl_unittest.cc services/network/orb/orb_sniffers.cc services/network/proxy_resolver_factory_mojo_unittest.cc @@ -5218,6 +5262,7 @@ storage/common/database/database_identifier_unittest.cc storage/common/file_system/file_system_util_unittest.cc storage/test/PRESUBMIT.py testing/PRESUBMIT.py +testing/android/instrumentation/java/AndroidManifest_permissions.xml testing/android/junit/shadows-allowlist.txt testing/android/native_test/java/AndroidManifest.xml.jinja2 testing/buildbot/PRESUBMIT.py @@ -5226,6 +5271,7 @@ testing/buildbot/filters/PRESUBMIT.py testing/buildbot/generate_buildbot_json.py testing/buildbot/query_optimal_shard_counts.py testing/buildbot/scripts/upload_test_result_artifacts.py +testing/buildbot/test_suite_exceptions.pyl testing/buildbot/waterfalls.pyl testing/chromoting/browser_test_commands_linux.txt testing/chromoting/chromoting_test_driver_commands_linux.txt @@ -5310,12 +5356,6 @@ third_party/afl/src/qemu_mode/patches/afl-qemu-cpu-inl.h third_party/afl/src/test-instr.c third_party/afl/src/types.h third_party/android_build_tools/aapt2/3pp/fetch.py -third_party/android_build_tools/apkanalyzer/3pp/fetch.py -third_party/android_build_tools/apkanalyzer/3pp/install.py -third_party/android_build_tools/lint/3pp/fetch.py -third_party/android_build_tools/lint/3pp/install.py -third_party/android_build_tools/manifest_merger/3pp/fetch.py -third_party/android_build_tools/manifest_merger/3pp/install.py third_party/android_deps/libs/android_arch_core_common/3pp/fetch.py third_party/android_deps/libs/android_arch_core_runtime/3pp/fetch.py third_party/android_deps/libs/android_arch_lifecycle_common/3pp/fetch.py @@ -5525,6 +5565,7 @@ third_party/angle/src/libANGLE/renderer/vulkan/vk_cache_utils.h third_party/angle/src/libANGLE/renderer/vulkan/vk_format_utils.h third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp third_party/angle/src/libANGLE/renderer/vulkan/vk_renderer.cpp +third_party/angle/src/libANGLE/renderer/wgpu/gen_wgpu_format_table.py third_party/angle/src/libANGLE/validationEGL.cpp third_party/angle/src/libANGLE/validationES.cpp third_party/angle/src/libGLESv2/egl_stubs.cpp @@ -5757,9 +5798,7 @@ third_party/blink/public/platform/web_audio_source_provider_impl.h third_party/blink/public/platform/web_url_response.h third_party/blink/public/strings/blink_strings.grd third_party/blink/public/web/web_crypto_histograms.h -third_party/blink/public/web/web_navigation_params.h third_party/blink/public/web/web_node.h -third_party/blink/public/web/web_window_features.h third_party/blink/renderer/PRESUBMIT.py third_party/blink/renderer/bindings/PRESUBMIT.py third_party/blink/renderer/bindings/core/v8/generated_code_helper.cc @@ -5792,6 +5831,7 @@ third_party/blink/renderer/core/css/element_rule_collector_test.cc third_party/blink/renderer/core/css/invalidation/pending_invalidations.h third_party/blink/renderer/core/css/invalidation/style_invalidator.h third_party/blink/renderer/core/css/parser/css_selector_parser.cc +third_party/blink/renderer/core/css/parser/find_length_of_declaration_list-inl.h third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc third_party/blink/renderer/core/css/remote_font_face_source.cc third_party/blink/renderer/core/css/resolver/style_adjuster.cc @@ -5893,7 +5933,6 @@ third_party/blink/renderer/core/fragment_directive/text_fragment_anchor_metrics_ third_party/blink/renderer/core/fragment_directive/text_fragment_selector.h third_party/blink/renderer/core/frame/csp/content_security_policy.cc third_party/blink/renderer/core/frame/deprecation/PRESUBMIT.py -third_party/blink/renderer/core/frame/dom_window.cc third_party/blink/renderer/core/frame/frame.h third_party/blink/renderer/core/frame/frame_serializer.cc third_party/blink/renderer/core/frame/local_dom_window.h @@ -5901,7 +5940,6 @@ third_party/blink/renderer/core/frame/local_dom_window_test.cc third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.h third_party/blink/renderer/core/frame/local_frame_back_forward_cache_test.cc -third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc third_party/blink/renderer/core/frame/local_frame_view.cc third_party/blink/renderer/core/frame/local_frame_view.h third_party/blink/renderer/core/frame/navigator.cc @@ -5912,8 +5950,6 @@ third_party/blink/renderer/core/frame/web_frame_test.cc third_party/blink/renderer/core/frame/web_frame_widget_impl.cc third_party/blink/renderer/core/frame/web_local_frame_impl.cc third_party/blink/renderer/core/frame/web_remote_frame_impl.cc -third_party/blink/renderer/core/fullscreen/fullscreen.cc -third_party/blink/renderer/core/fullscreen/fullscreen_request_type.h third_party/blink/renderer/core/html/anchor_element_metrics_test.cc third_party/blink/renderer/core/html/custom/element_internals.idl third_party/blink/renderer/core/html/custom/validity_state_flags.idl @@ -5970,7 +6006,6 @@ third_party/blink/renderer/core/input/event_handling_util.cc third_party/blink/renderer/core/input/mouse_event_manager.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/inspector/inspector_animation_agent.h third_party/blink/renderer/core/inspector/inspector_style_sheet.cc third_party/blink/renderer/core/intersection_observer/intersection_observer_controller.h third_party/blink/renderer/core/layout/adjust_for_absolute_zoom.h @@ -6012,7 +6047,6 @@ third_party/blink/renderer/core/layout/scroll_anchor_test.cc third_party/blink/renderer/core/layout/svg/layout_svg_path.cc third_party/blink/renderer/core/layout/svg/layout_svg_shape.cc third_party/blink/renderer/core/layout/table/layout_table_section_test.cc -third_party/blink/renderer/core/loader/frame_load_request.h third_party/blink/renderer/core/loader/frame_loader.cc third_party/blink/renderer/core/loader/http_equiv.cc third_party/blink/renderer/core/loader/idna_util.cc @@ -6054,6 +6088,7 @@ third_party/blink/renderer/core/paint/timing/first_meaningful_paint_detector.h third_party/blink/renderer/core/paint/timing/image_paint_timing_detector.h third_party/blink/renderer/core/paint/timing/image_paint_timing_detector_test.cc third_party/blink/renderer/core/permissions_policy/permissions_policy_parser.cc +third_party/blink/renderer/core/scheduler/scheduler.idl third_party/blink/renderer/core/script/detect_javascript_frameworks.cc third_party/blink/renderer/core/script/document_write_intervention.cc third_party/blink/renderer/core/script/document_write_intervention.h @@ -6155,7 +6190,6 @@ third_party/blink/renderer/modules/payments/payment_request_optional_total_test. third_party/blink/renderer/modules/payments/payment_response_test.cc third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc third_party/blink/renderer/modules/presentation/presentation_connection_available_event.h -third_party/blink/renderer/modules/scheduler/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/smart_card/smart_card_error.cc @@ -6225,6 +6259,7 @@ third_party/blink/renderer/platform/graphics/paint/geometry_mapper.cc third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.h third_party/blink/renderer/platform/graphics/paint/region_capture_data.h third_party/blink/renderer/platform/heap/collection_support/heap_linked_stack.h +third_party/blink/renderer/platform/image-decoders/bmp/bmp_image_decoder.cc third_party/blink/renderer/platform/image-decoders/bmp/bmp_image_decoder_test.cc third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc third_party/blink/renderer/platform/image-decoders/png/png_image_decoder.cc @@ -6279,6 +6314,7 @@ third_party/blink/renderer/platform/weborigin/security_origin.h third_party/blink/renderer/platform/weborigin/security_origin_fuzzer.cc third_party/blink/renderer/platform/weborigin/security_origin_test.cc third_party/blink/renderer/platform/weborigin/security_policy_test.cc +third_party/blink/renderer/platform/widget/compositing/layer_tree_view.cc third_party/blink/renderer/platform/widget/input/input_handler_proxy.cc third_party/blink/renderer/platform/widget/widget_base.cc third_party/blink/renderer/platform/wtf/assertions.h @@ -6295,6 +6331,8 @@ third_party/blink/renderer/platform/wtf/vector_test.cc third_party/boringssl/roll_boringssl.py third_party/boringssl/src/CMakeLists.txt third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c +third_party/boringssl/src/crypto/dilithium/dilithium.c +third_party/boringssl/src/crypto/fipsmodule/aes/internal.h third_party/boringssl/src/crypto/fipsmodule/bn/mul.c third_party/boringssl/src/crypto/fipsmodule/rsa/rsa_impl.c third_party/boringssl/src/crypto/internal.h @@ -6327,6 +6365,7 @@ third_party/boringssl/src/tool/fd.cc third_party/boringssl/src/tool/internal.h third_party/boringssl/src/util/bot/go/env.py third_party/boringssl/src/util/bot/update_clang.py +third_party/breakpad/BUILD.gn third_party/breakpad/breakpad/default.xml third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc @@ -6690,7 +6729,6 @@ third_party/catapult/third_party/apiclient/googleapiclient/model.py third_party/catapult/third_party/apiclient/googleapiclient/sample_tools.py third_party/catapult/third_party/apiclient/googleapiclient/schema.py third_party/catapult/third_party/beautifulsoup4/README.txt -third_party/catapult/third_party/certifi/LICENSE.txt third_party/catapult/third_party/chardet/chardet/chardistribution.py third_party/catapult/third_party/chardet/chardet/codingstatemachine.py third_party/catapult/third_party/chardet/chardet/cp949prober.py @@ -6821,88 +6859,6 @@ third_party/catapult/third_party/google-auth/google/auth/transport/requests.py third_party/catapult/third_party/google-auth/google/auth/transport/urllib3.py third_party/catapult/third_party/google-auth/google/oauth2/credentials.py third_party/catapult/third_party/google-auth/google/oauth2/id_token.py -third_party/catapult/third_party/google-endpoints/apitools/base/protorpclite/messages.py -third_party/catapult/third_party/google-endpoints/apitools/base/py/base_api_test.py -third_party/catapult/third_party/google-endpoints/apitools/base/py/batch.py -third_party/catapult/third_party/google-endpoints/apitools/base/py/credentials_lib.py -third_party/catapult/third_party/google-endpoints/apitools/base/py/testing/testclient/fusiontables_v1_client.py -third_party/catapult/third_party/google-endpoints/apitools/base/py/transfer.py -third_party/catapult/third_party/google-endpoints/apitools/base/py/util.py -third_party/catapult/third_party/google-endpoints/apitools/data/apitools_client_secrets.json -third_party/catapult/third_party/google-endpoints/apitools/gen/gen_client.py -third_party/catapult/third_party/google-endpoints/apitools/gen/gen_client_lib.py -third_party/catapult/third_party/google-endpoints/apitools/gen/message_registry.py -third_party/catapult/third_party/google-endpoints/apitools/gen/service_registry.py -third_party/catapult/third_party/google-endpoints/apitools/gen/util.py -third_party/catapult/third_party/google-endpoints/apitools/scripts/oauth2l.py -third_party/catapult/third_party/google-endpoints/apitools/scripts/oauth2l_test.py -third_party/catapult/third_party/google-endpoints/appdirs-1.4.0.dist-info/metadata.json -third_party/catapult/third_party/google-endpoints/appdirs.py -third_party/catapult/third_party/google-endpoints/endpoints/api_config.py -third_party/catapult/third_party/google-endpoints/endpoints/discovery_api_proxy.py -third_party/catapult/third_party/google-endpoints/endpoints/discovery_generator.py -third_party/catapult/third_party/google-endpoints/endpoints/endpoints_dispatcher.py -third_party/catapult/third_party/google-endpoints/endpoints/endpointscfg.py -third_party/catapult/third_party/google-endpoints/endpoints/openapi_generator.py -third_party/catapult/third_party/google-endpoints/endpoints/test/api_config_test.py -third_party/catapult/third_party/google-endpoints/endpoints/test/apiserving_test.py -third_party/catapult/third_party/google-endpoints/endpoints/test/discovery_generator_test.py -third_party/catapult/third_party/google-endpoints/endpoints/test/discovery_service_test.py -third_party/catapult/third_party/google-endpoints/endpoints/test/openapi_generator_test.py -third_party/catapult/third_party/google-endpoints/endpoints/test/users_id_token_test.py -third_party/catapult/third_party/google-endpoints/endpoints/users_id_token.py -third_party/catapult/third_party/google-endpoints/endpoints/util.py -third_party/catapult/third_party/google-endpoints/future/backports/test/support.py -third_party/catapult/third_party/google-endpoints/google/api/config/service_config.py -third_party/catapult/third_party/google-endpoints/google/api/control/label_descriptor.py -third_party/catapult/third_party/google-endpoints/google/api/control/metric_descriptor.py -third_party/catapult/third_party/google-endpoints/google/api/gen/servicecontrol_v1_client.py -third_party/catapult/third_party/google-endpoints/google/api/gen/servicecontrol_v1_messages.py -third_party/catapult/third_party/google-endpoints/google_apitools-0.4.15.dist-info/metadata.json -third_party/catapult/third_party/google-endpoints/httplib2/__init__.py -third_party/catapult/third_party/google-endpoints/oauth2client/__init__.py -third_party/catapult/third_party/google-endpoints/oauth2client/appengine.py -third_party/catapult/third_party/google-endpoints/oauth2client/client.py -third_party/catapult/third_party/google-endpoints/oauth2client/clientsecrets.py -third_party/catapult/third_party/google-endpoints/oauth2client/django_orm.py -third_party/catapult/third_party/google-endpoints/oauth2client/file.py -third_party/catapult/third_party/google-endpoints/oauth2client/flask_util.py -third_party/catapult/third_party/google-endpoints/oauth2client/gce.py -third_party/catapult/third_party/google-endpoints/oauth2client/keyring_storage.py -third_party/catapult/third_party/google-endpoints/oauth2client/locked_file.py -third_party/catapult/third_party/google-endpoints/oauth2client/multistore_file.py -third_party/catapult/third_party/google-endpoints/oauth2client/tools.py -third_party/catapult/third_party/google-endpoints/oauth2client/util.py -third_party/catapult/third_party/google-endpoints/oauth2client/xsrfutil.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/chardistribution.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/codingstatemachine.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/cp949prober.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/escprober.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/escsm.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/eucjpprober.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/euckrprober.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/euctwprober.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/gb2312prober.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/mbcssm.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/sjisprober.py -third_party/catapult/third_party/google-endpoints/requests/packages/chardet/utf8prober.py -third_party/catapult/third_party/google-endpoints/requests/packages/urllib3/connectionpool.py -third_party/catapult/third_party/google-endpoints/requests/packages/urllib3/contrib/appengine.py -third_party/catapult/third_party/google-endpoints/requests/packages/urllib3/contrib/ntlmpool.py -third_party/catapult/third_party/google-endpoints/requests/packages/urllib3/poolmanager.py -third_party/catapult/third_party/google-endpoints/requests/packages/urllib3/util/ssl_.py -third_party/catapult/third_party/google-endpoints/requests/packages/urllib3/util/url.py -third_party/catapult/third_party/google-endpoints/rsa/randnum.py -third_party/catapult/third_party/google-endpoints/setuptools/msvc.py -third_party/catapult/third_party/google-endpoints/test/test_check_request.py -third_party/catapult/third_party/google-endpoints/test/test_path_template.py -third_party/catapult/third_party/google-endpoints/test/test_service.py -third_party/catapult/third_party/google-endpoints/urllib3/connectionpool.py -third_party/catapult/third_party/google-endpoints/urllib3/contrib/appengine.py -third_party/catapult/third_party/google-endpoints/urllib3/contrib/ntlmpool.py -third_party/catapult/third_party/google-endpoints/urllib3/poolmanager.py -third_party/catapult/third_party/google-endpoints/urllib3/util/ssl_.py -third_party/catapult/third_party/google-endpoints/urllib3/util/url.py third_party/catapult/third_party/graphy/graphy/backends/google_chart_api/base_encoder_test.py third_party/catapult/third_party/graphy/graphy/backends/google_chart_api/encoders.py third_party/catapult/third_party/gsutil/gslib/__main__.py @@ -6914,6 +6870,7 @@ third_party/catapult/third_party/gsutil/gslib/addlhelp/dev.py third_party/catapult/third_party/gsutil/gslib/addlhelp/metadata.py third_party/catapult/third_party/gsutil/gslib/addlhelp/prod.py third_party/catapult/third_party/gsutil/gslib/addlhelp/security.py +third_party/catapult/third_party/gsutil/gslib/addlhelp/shim.py third_party/catapult/third_party/gsutil/gslib/addlhelp/support.py third_party/catapult/third_party/gsutil/gslib/addlhelp/versions.py third_party/catapult/third_party/gsutil/gslib/boto_resumable_upload.py @@ -6946,7 +6903,9 @@ third_party/catapult/third_party/gsutil/gslib/commands/retention.py third_party/catapult/third_party/gsutil/gslib/commands/rm.py third_party/catapult/third_party/gsutil/gslib/commands/rpo.py third_party/catapult/third_party/gsutil/gslib/commands/rsync.py +third_party/catapult/third_party/gsutil/gslib/commands/setmeta.py third_party/catapult/third_party/gsutil/gslib/commands/signurl.py +third_party/catapult/third_party/gsutil/gslib/commands/stat.py third_party/catapult/third_party/gsutil/gslib/commands/test.py third_party/catapult/third_party/gsutil/gslib/commands/ubla.py third_party/catapult/third_party/gsutil/gslib/commands/versioning.py @@ -6963,6 +6922,7 @@ third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.json third_party/catapult/third_party/gsutil/gslib/tests/test_data/test_external_account_authorized_user_credentials.json third_party/catapult/third_party/gsutil/gslib/tests/test_data/test_external_account_credentials.json third_party/catapult/third_party/gsutil/gslib/tests/test_hmac.py +third_party/catapult/third_party/gsutil/gslib/tests/test_iam.py third_party/catapult/third_party/gsutil/gslib/tests/test_kms.py third_party/catapult/third_party/gsutil/gslib/tests/test_ls.py third_party/catapult/third_party/gsutil/gslib/tests/test_mtls.py @@ -7124,7 +7084,10 @@ third_party/catapult/third_party/gsutil/third_party/chardet/tests/windows-1255-h third_party/catapult/third_party/gsutil/third_party/crcmod/setup.py third_party/catapult/third_party/gsutil/third_party/gcs-oauth2-boto-plugin/gcs_oauth2_boto_plugin/oauth2_client.py third_party/catapult/third_party/gsutil/third_party/gcs-oauth2-boto-plugin/gcs_oauth2_boto_plugin/oauth2_helper.py +third_party/catapult/third_party/gsutil/third_party/gcs-oauth2-boto-plugin/gcs_oauth2_boto_plugin/test_oauth2_client.py third_party/catapult/third_party/gsutil/third_party/gcs-oauth2-boto-plugin/setup.py +third_party/catapult/third_party/gsutil/third_party/google-auth-library-python-httplib2/google_auth_httplib2.py +third_party/catapult/third_party/gsutil/third_party/google-auth-library-python-httplib2/setup.py third_party/catapult/third_party/gsutil/third_party/google-auth-library-python/docs/_static/custom.css third_party/catapult/third_party/gsutil/third_party/google-auth-library-python/google/auth/_cloud_sdk.py third_party/catapult/third_party/gsutil/third_party/google-auth-library-python/google/auth/_default.py @@ -7333,7 +7296,6 @@ third_party/catapult/third_party/gsutil/third_party/requests/tests/test_requests third_party/catapult/third_party/gsutil/third_party/requests/tests/test_utils.py third_party/catapult/third_party/gsutil/third_party/retry-decorator/setup.py third_party/catapult/third_party/gsutil/third_party/rsa/rsa/randnum.py -third_party/catapult/third_party/gsutil/third_party/urllib3/CONTRIBUTORS.txt third_party/catapult/third_party/gsutil/third_party/urllib3/dummyserver/proxy.py third_party/catapult/third_party/gsutil/third_party/urllib3/src/urllib3/connectionpool.py third_party/catapult/third_party/gsutil/third_party/urllib3/src/urllib3/contrib/_appengine_environ.py @@ -7350,6 +7312,7 @@ third_party/catapult/third_party/gsutil/third_party/urllib3/test/test_connection third_party/catapult/third_party/gsutil/third_party/urllib3/test/test_poolmanager.py third_party/catapult/third_party/gsutil/third_party/urllib3/test/test_ssl.py third_party/catapult/third_party/gsutil/third_party/urllib3/test/test_util.py +third_party/catapult/third_party/gsutil/third_party/urllib3/test/with_dummyserver/test_proxy_poolmanager.py third_party/catapult/third_party/gsutil/third_party/urllib3/test/with_dummyserver/test_socketlevel.py third_party/catapult/third_party/html5lib-1.1/html5lib/tests/test_parser2.py third_party/catapult/third_party/html5lib-python/html5lib/serializer/htmlserializer.py @@ -7457,119 +7420,6 @@ third_party/catapult/third_party/polymer/components/webcomponentsjs/ShadowDOM.js third_party/catapult/third_party/polymer/components/webcomponentsjs/ShadowDOM.min.js third_party/catapult/third_party/polymer/components/webcomponentsjs/webcomponents.js third_party/catapult/third_party/polymer/components/webcomponentsjs/webcomponents.min.js -third_party/catapult/third_party/polymer2/bower_components/app-route/demo/youtube-demo/youtube-search.html -third_party/catapult/third_party/polymer2/bower_components/chai/chai.js -third_party/catapult/third_party/polymer2/bower_components/chai/package.json -third_party/catapult/third_party/polymer2/bower_components/chopsui/.bower.json -third_party/catapult/third_party/polymer2/bower_components/chopsui/Makefile -third_party/catapult/third_party/polymer2/bower_components/chopsui/bower.json -third_party/catapult/third_party/polymer2/bower_components/chopsui/chops-bug-link.html -third_party/catapult/third_party/polymer2/bower_components/chopsui/chops-signin.js -third_party/catapult/third_party/polymer2/bower_components/chopsui/chops-tree-status.html -third_party/catapult/third_party/polymer2/bower_components/chopsui/demo/chops-bug-link_demo.html -third_party/catapult/third_party/polymer2/bower_components/chopsui/demo/chops-chip_demo.html -third_party/catapult/third_party/polymer2/bower_components/chopsui/demo/chops-cl-link_demo.html -third_party/catapult/third_party/polymer2/bower_components/chopsui/demo/chops-dialog_demo.html -third_party/catapult/third_party/polymer2/bower_components/chopsui/demo/chops-header_demo.html -third_party/catapult/third_party/polymer2/bower_components/chopsui/demo/chops-login_demo.html -third_party/catapult/third_party/polymer2/bower_components/chopsui/demo/chops-tree-status_demo.html -third_party/catapult/third_party/polymer2/bower_components/chopsui/demo/chops-user-id_demo.html -third_party/catapult/third_party/polymer2/bower_components/chopsui/demo/chops-user-input_demo.html -third_party/catapult/third_party/polymer2/bower_components/chopsui/prpc-client.js -third_party/catapult/third_party/polymer2/bower_components/font-roboto/roboto.html -third_party/catapult/third_party/polymer2/bower_components/google-apis/.bower.json -third_party/catapult/third_party/polymer2/bower_components/google-apis/bower.json -third_party/catapult/third_party/polymer2/bower_components/google-apis/demo/index.html -third_party/catapult/third_party/polymer2/bower_components/google-apis/google-client-loader.html -third_party/catapult/third_party/polymer2/bower_components/google-apis/google-js-api.html -third_party/catapult/third_party/polymer2/bower_components/google-apis/google-legacy-loader.html -third_party/catapult/third_party/polymer2/bower_components/google-apis/google-maps-api.html -third_party/catapult/third_party/polymer2/bower_components/google-apis/google-plusone-api.html -third_party/catapult/third_party/polymer2/bower_components/google-apis/google-realtime-api.html -third_party/catapult/third_party/polymer2/bower_components/google-apis/google-youtube-api.html -third_party/catapult/third_party/polymer2/bower_components/google-signin/demo/index.html -third_party/catapult/third_party/polymer2/bower_components/google-signin/google-signin-aware.html -third_party/catapult/third_party/polymer2/bower_components/google-signin/google-signin.html -third_party/catapult/third_party/polymer2/bower_components/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html -third_party/catapult/third_party/polymer2/bower_components/iron-flex-layout/iron-flex-layout.html -third_party/catapult/third_party/polymer2/bower_components/iron-icon/iron-icon.d.ts -third_party/catapult/third_party/polymer2/bower_components/iron-icon/iron-icon.html -third_party/catapult/third_party/polymer2/bower_components/iron-icons/iron-icons.d.ts -third_party/catapult/third_party/polymer2/bower_components/iron-icons/iron-icons.html -third_party/catapult/third_party/polymer2/bower_components/iron-jsonp-library/demo/index.html -third_party/catapult/third_party/polymer2/bower_components/iron-jsonp-library/iron-jsonp-library.d.ts -third_party/catapult/third_party/polymer2/bower_components/iron-jsonp-library/iron-jsonp-library.html -third_party/catapult/third_party/polymer2/bower_components/iron-location/iron-location.html -third_party/catapult/third_party/polymer2/bower_components/iron-location/test/initialization-tests.html -third_party/catapult/third_party/polymer2/bower_components/iron-location/test/integration.html -third_party/catapult/third_party/polymer2/bower_components/iron-location/test/iron-location.html -third_party/catapult/third_party/polymer2/bower_components/iron-location/test/iron-query-params.html -third_party/catapult/third_party/polymer2/bower_components/iron-menu-behavior/iron-menu-behavior.html -third_party/catapult/third_party/polymer2/bower_components/iron-overlay-behavior/iron-focusables-helper.html -third_party/catapult/third_party/polymer2/bower_components/iron-overlay-behavior/iron-overlay-manager.html -third_party/catapult/third_party/polymer2/bower_components/lodash/lodash.js -third_party/catapult/third_party/polymer2/bower_components/marked/.bower.json -third_party/catapult/third_party/polymer2/bower_components/marked/bower.json -third_party/catapult/third_party/polymer2/bower_components/mocha/mocha.js -third_party/catapult/third_party/polymer2/bower_components/moment-timezone/composer.json -third_party/catapult/third_party/polymer2/bower_components/moment/locale/ko.js -third_party/catapult/third_party/polymer2/bower_components/moment/locale/mi.js -third_party/catapult/third_party/polymer2/bower_components/moment/locale/sr-cyrl.js -third_party/catapult/third_party/polymer2/bower_components/moment/locale/sr.js -third_party/catapult/third_party/polymer2/bower_components/moment/min/locales.js -third_party/catapult/third_party/polymer2/bower_components/moment/min/locales.min.js -third_party/catapult/third_party/polymer2/bower_components/moment/min/moment-with-locales.js -third_party/catapult/third_party/polymer2/bower_components/moment/min/moment-with-locales.min.js -third_party/catapult/third_party/polymer2/bower_components/moment/moment.js -third_party/catapult/third_party/polymer2/bower_components/moment/src/lib/duration/create.js -third_party/catapult/third_party/polymer2/bower_components/moment/src/locale/ko.js -third_party/catapult/third_party/polymer2/bower_components/moment/src/locale/mi.js -third_party/catapult/third_party/polymer2/bower_components/moment/src/locale/sr-cyrl.js -third_party/catapult/third_party/polymer2/bower_components/moment/src/locale/sr.js -third_party/catapult/third_party/polymer2/bower_components/neon-animation/neon-animated-pages.d.ts -third_party/catapult/third_party/polymer2/bower_components/neon-animation/neon-animated-pages.html -third_party/catapult/third_party/polymer2/bower_components/paper-button/paper-button.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-button/paper-button.html -third_party/catapult/third_party/polymer2/bower_components/paper-checkbox/paper-checkbox.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-checkbox/paper-checkbox.html -third_party/catapult/third_party/polymer2/bower_components/paper-dialog/paper-dialog.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-dialog/paper-dialog.html -third_party/catapult/third_party/polymer2/bower_components/paper-icon-button/paper-icon-button.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-icon-button/paper-icon-button.html -third_party/catapult/third_party/polymer2/bower_components/paper-input/paper-input-behavior.html -third_party/catapult/third_party/polymer2/bower_components/paper-input/paper-input.html -third_party/catapult/third_party/polymer2/bower_components/paper-item/paper-item.html -third_party/catapult/third_party/polymer2/bower_components/paper-material/paper-material.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-material/paper-material.html -third_party/catapult/third_party/polymer2/bower_components/paper-progress/paper-progress.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-progress/paper-progress.html -third_party/catapult/third_party/polymer2/bower_components/paper-radio-button/paper-radio-button.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-radio-button/paper-radio-button.html -third_party/catapult/third_party/polymer2/bower_components/paper-radio-group/paper-radio-group.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-radio-group/paper-radio-group.html -third_party/catapult/third_party/polymer2/bower_components/paper-ripple/paper-ripple.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-ripple/paper-ripple.html -third_party/catapult/third_party/polymer2/bower_components/paper-styles/default-theme.html -third_party/catapult/third_party/polymer2/bower_components/paper-styles/element-styles/paper-item-styles.html -third_party/catapult/third_party/polymer2/bower_components/paper-styles/element-styles/paper-material-styles.html -third_party/catapult/third_party/polymer2/bower_components/paper-styles/paper-styles.html -third_party/catapult/third_party/polymer2/bower_components/paper-styles/typography.html -third_party/catapult/third_party/polymer2/bower_components/paper-tabs/paper-tabs.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-tabs/paper-tabs.html -third_party/catapult/third_party/polymer2/bower_components/paper-toast/paper-toast.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-toast/paper-toast.html -third_party/catapult/third_party/polymer2/bower_components/paper-toggle-button/paper-toggle-button.d.ts -third_party/catapult/third_party/polymer2/bower_components/paper-toggle-button/paper-toggle-button.html -third_party/catapult/third_party/polymer2/bower_components/polymer-redux/.bower.json -third_party/catapult/third_party/polymer2/bower_components/polymer-redux/bower.json -third_party/catapult/third_party/polymer2/bower_components/polymer-redux/package.json -third_party/catapult/third_party/polymer2/bower_components/polymer/types/extra-types.d.ts -third_party/catapult/third_party/polymer2/bower_components/shadycss/src/style-settings.js -third_party/catapult/third_party/polymer2/bower_components/sinonjs/sinon.js -third_party/catapult/third_party/polymer2/bower_components/stacky/browser.js -third_party/catapult/third_party/polymer2/bower_components/stacky/lib/parsing.js -third_party/catapult/third_party/polymer2/bower_components/web-animations-js/src/apply-preserving-inline-style.js -third_party/catapult/third_party/polymer2/bower_components/web-component-tester/browser.js third_party/catapult/third_party/polymer3/bower_components/polymer/test/unit/styling-cross-scope-apply.html third_party/catapult/third_party/polymer3/bower_components/polymer/test/unit/styling-scoped.html third_party/catapult/third_party/pyasn1/LICENSE.txt @@ -7931,6 +7781,8 @@ third_party/crossbench/crossbench/probes/profiling/browser_profiling.py third_party/crossbench/crossbench/probes/profiling/system_profiling.py third_party/crossbench/crossbench/probes/web_page_replay/recorder.py third_party/crossbench/tests/crossbench/benchmarks/test_loading.py +third_party/crossbench/tests/crossbench/probes/test_js.py +third_party/crossbench/tests/crossbench/probes/test_v8_rcs.py third_party/crossbench/tests/end2end/test_cli.py third_party/dav1d/BUILD.gn third_party/dav1d/generate_source.py @@ -7967,7 +7819,6 @@ third_party/dawn/src/dawn/native/d3d12/SharedTextureMemoryD3D12.cpp third_party/dawn/src/dawn/native/d3d12/TextureD3D12.cpp third_party/dawn/src/dawn/native/metal/QueueMTL.h third_party/dawn/src/dawn/native/metal/SharedTextureMemoryMTL.mm -third_party/dawn/src/dawn/native/opengl/BackendGL.cpp third_party/dawn/src/dawn/native/opengl/CommandBufferGL.cpp third_party/dawn/src/dawn/native/opengl/TextureGL.cpp third_party/dawn/src/dawn/native/vulkan/RenderPassCache.h @@ -7979,7 +7830,6 @@ third_party/dawn/src/dawn/partition_alloc/partition_alloc/pointers/raw_ref.h third_party/dawn/src/dawn/platform/metrics/HistogramMacros.h third_party/dawn/src/dawn/tests/PartitionAllocSupport.cpp third_party/dawn/src/dawn/tests/end2end/DepthBiasTests.cpp -third_party/dawn/src/dawn/tests/end2end/TextureFormatTests.cpp third_party/dawn/src/dawn/tests/end2end/TextureViewTests.cpp third_party/dawn/src/dawn/tests/end2end/VertexStateTests.cpp third_party/dawn/src/dawn/tests/end2end/VideoViewsTests.h @@ -7994,6 +7844,7 @@ third_party/dawn/src/dawn/tests/white_box/VulkanImageWrappingTests_DmaBuf.cpp third_party/dawn/src/dawn/utils/WindowsDebugLogger.cpp third_party/dawn/src/tint/lang/core/constant/eval_builtin_test.cc third_party/dawn/src/tint/lang/hlsl/writer/ast_printer/ast_printer.cc +third_party/dawn/src/tint/lang/hlsl/writer/printer/printer.cc third_party/dawn/src/tint/lang/spirv/reader/ast_parser/ast_parser.cc third_party/dawn/src/tint/lang/spirv/reader/ast_parser/function.cc third_party/dawn/src/tint/lang/spirv/reader/ast_parser/function_cfg_test.cc @@ -8171,6 +8022,7 @@ third_party/depot_tools/PRESUBMIT.py third_party/depot_tools/auth.py third_party/depot_tools/autoninja.py third_party/depot_tools/breakpad.py +third_party/depot_tools/build_telemetry.py third_party/depot_tools/cipd_manifest.txt third_party/depot_tools/cipd_manifest_cros_python2.txt third_party/depot_tools/fetch.py @@ -8178,6 +8030,7 @@ third_party/depot_tools/fetch_configs/angle.py third_party/depot_tools/fetch_configs/breakpad.py third_party/depot_tools/fetch_configs/chromium.py third_party/depot_tools/fetch_configs/crashpad.py +third_party/depot_tools/fetch_configs/crossbench.py third_party/depot_tools/fetch_configs/dart.py third_party/depot_tools/fetch_configs/depot_tools.py third_party/depot_tools/fetch_configs/devtools-frontend.py @@ -8195,6 +8048,7 @@ third_party/depot_tools/fetch_configs/skia.py third_party/depot_tools/fetch_configs/skia_buildbot.py third_party/depot_tools/fetch_configs/syzygy.py third_party/depot_tools/fetch_configs/v8.py +third_party/depot_tools/fetch_configs/web-workload.py third_party/depot_tools/fetch_configs/webrtc.py third_party/depot_tools/fetch_configs/website.py third_party/depot_tools/gclient.py @@ -8232,7 +8086,6 @@ third_party/depot_tools/metrics_utils.py third_party/depot_tools/my_activity.py third_party/depot_tools/ninja.py third_party/depot_tools/ninjalog_uploader.py -third_party/depot_tools/ninjalog_uploader_wrapper.py third_party/depot_tools/owners_client.py third_party/depot_tools/owners_finder.py third_party/depot_tools/presubmit_canned_checks.py @@ -8261,6 +8114,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/resolve_chromium_fixed_version.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/revision_specifying_ref.json +third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/stale-process-duration-override.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json third_party/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json @@ -8334,7 +8188,6 @@ third_party/depot_tools/recipes/recipe_modules/tryserver/tests/gerrit_change_tar third_party/depot_tools/recipes/recipe_modules/tryserver/tests/require_is_tryserver.py third_party/depot_tools/recipes/recipes.py third_party/depot_tools/reclient_helper.py -third_party/depot_tools/reclient_metrics.py third_party/depot_tools/roll_dep.py third_party/depot_tools/siso.py third_party/depot_tools/split_cl.py @@ -8342,6 +8195,7 @@ third_party/depot_tools/subprocess2.py third_party/depot_tools/testing_support/fake_repos.py third_party/depot_tools/tests/autoninja_test.py third_party/depot_tools/tests/bot_update_coverage_test.py +third_party/depot_tools/tests/build_telemetry_test.py third_party/depot_tools/tests/fetch_test.py third_party/depot_tools/tests/gclient_cipd_smoketest.py third_party/depot_tools/tests/gclient_git_smoketest.py @@ -8352,10 +8206,8 @@ third_party/depot_tools/tests/git_cache_test.py third_party/depot_tools/tests/git_cl_creds_check_report.txt third_party/depot_tools/tests/git_cl_test.py third_party/depot_tools/tests/metrics_test.py -third_party/depot_tools/tests/ninja_reclient_test.py -third_party/depot_tools/tests/ninjalog_uploader_test.py third_party/depot_tools/tests/presubmit_unittest.py -third_party/depot_tools/tests/reclient_metrics_test.py +third_party/depot_tools/tests/reclient_helper_test.py third_party/depot_tools/tests/roll_dep_test.py third_party/depot_tools/tests/split_cl_test.py third_party/depot_tools/tests/watchlists_unittest.py @@ -8363,6 +8215,7 @@ 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/build_overrides/BUILDCONFIG.gn third_party/devtools-frontend/src/extensions/cxx_debugging/third_party/lit-html/lib/template.js third_party/devtools-frontend/src/extensions/cxx_debugging/third_party/lit-html/src/lib/template.ts third_party/devtools-frontend/src/front_end/core/common/ColorConverter.ts @@ -8471,6 +8324,7 @@ third_party/devtools-frontend/src/front_end/generated/protocol-proxy-api.d.ts third_party/devtools-frontend/src/front_end/generated/protocol.ts third_party/devtools-frontend/src/front_end/integration_test_runner.html third_party/devtools-frontend/src/front_end/models/bindings/ResourceUtils.ts +third_party/devtools-frontend/src/front_end/models/crux-manager/CrUXManager.ts third_party/devtools-frontend/src/front_end/models/extensions/ExtensionServer.test.ts third_party/devtools-frontend/src/front_end/models/extensions/ExtensionServer.ts third_party/devtools-frontend/src/front_end/models/extensions/HostUrlPattern.test.ts @@ -8495,6 +8349,14 @@ third_party/devtools-frontend/src/front_end/models/trace/helpers/Trace.test.ts third_party/devtools-frontend/src/front_end/models/trace/insights/CumulativeLayoutShift.ts third_party/devtools-frontend/src/front_end/models/trace/insights/InteractionToNextPaint.ts third_party/devtools-frontend/src/front_end/models/trace/insights/RenderBlocking.test.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/RenderBlocking.ts +third_party/devtools-frontend/src/front_end/models/trace/lantern/core/NetworkAnalyzer.test.ts +third_party/devtools-frontend/src/front_end/models/trace/lantern/graph/NetworkNode.ts +third_party/devtools-frontend/src/front_end/models/trace/lantern/graph/PageDependencyGraph.ts +third_party/devtools-frontend/src/front_end/models/trace/lantern/metrics/SpeedIndex.ts +third_party/devtools-frontend/src/front_end/models/trace/lantern/simulation/ConnectionPool.ts +third_party/devtools-frontend/src/front_end/models/trace/lantern/simulation/Constants.ts +third_party/devtools-frontend/src/front_end/models/trace/lantern/simulation/Simulator.ts third_party/devtools-frontend/src/front_end/models/trace/types/TraceEvents.ts third_party/devtools-frontend/src/front_end/panels/accessibility/AccessibilityNodeView.ts third_party/devtools-frontend/src/front_end/panels/accessibility/AccessibilityStrings.ts @@ -8506,7 +8368,6 @@ third_party/devtools-frontend/src/front_end/panels/application/ReportingApiRepor third_party/devtools-frontend/src/front_end/panels/application/ReportingApiReportsView.ts third_party/devtools-frontend/src/front_end/panels/application/ServiceWorkerCacheTreeElement.ts third_party/devtools-frontend/src/front_end/panels/application/StorageView.ts -third_party/devtools-frontend/src/front_end/panels/application/components/BackForwardCacheStrings.ts third_party/devtools-frontend/src/front_end/panels/application/components/EndpointsGrid.ts third_party/devtools-frontend/src/front_end/panels/application/components/FrameDetailsView.ts third_party/devtools-frontend/src/front_end/panels/application/components/ReportsGrid.ts @@ -8524,6 +8385,8 @@ third_party/devtools-frontend/src/front_end/panels/elements/components/CSSProper third_party/devtools-frontend/src/front_end/panels/emulation/DeviceModeToolbar.ts third_party/devtools-frontend/src/front_end/panels/emulation/emulation-meta.ts third_party/devtools-frontend/src/front_end/panels/explain/components/ConsoleInsight.ts +third_party/devtools-frontend/src/front_end/panels/freestyler/components/FreestylerChatUi.ts +third_party/devtools-frontend/src/front_end/panels/freestyler/components/ProvideFeedback.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedCookiesView.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedDirectivesView.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedMetadataAllowedSitesView.ts @@ -8555,10 +8418,12 @@ third_party/devtools-frontend/src/front_end/panels/sources/components/Breakpoint third_party/devtools-frontend/src/front_end/panels/sources/components/HeadersView.test.ts third_party/devtools-frontend/src/front_end/panels/sources/components/HeadersView.ts third_party/devtools-frontend/src/front_end/panels/timeline/EventUICategory.ts +third_party/devtools-frontend/src/front_end/panels/timeline/Initiators.test.ts third_party/devtools-frontend/src/front_end/panels/timeline/ThreadAppender.ts third_party/devtools-frontend/src/front_end/panels/timeline/TimelineLandingPage.ts third_party/devtools-frontend/src/front_end/panels/timeline/TimelineTreeView.test.ts third_party/devtools-frontend/src/front_end/panels/timeline/TimelineUIUtils.test.ts +third_party/devtools-frontend/src/front_end/panels/timeline/TimingsTrackAppender.ts third_party/devtools-frontend/src/front_end/panels/timeline/components/DetailsView.ts third_party/devtools-frontend/src/front_end/panels/timeline/track_appenders/ThreadAppender.test.ts third_party/devtools-frontend/src/front_end/panels/webauthn/WebauthnPane.ts @@ -8689,7 +8554,6 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cj third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/Device.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/FileChooser.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/FileChooser.js -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/PDFOptions.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/QueryHandler.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/QueryHandler.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/Viewport.d.ts @@ -8726,7 +8590,6 @@ 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/common/Device.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/FileChooser.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/FileChooser.js -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/PDFOptions.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/Viewport.d.ts @@ -8754,7 +8617,6 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/co third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/CustomQueryHandler.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/Device.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/FileChooser.ts -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/PDFOptions.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/QueryHandler.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/Viewport.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/common/util.ts @@ -8791,7 +8653,6 @@ third_party/devtools-frontend/src/front_end/ui/legacy/components/utils/JSPresent third_party/devtools-frontend/src/front_end/ui/legacy/components/utils/Linkifier.test.ts third_party/devtools-frontend/src/front_end/ui/legacy/themeColors.css third_party/devtools-frontend/src/front_end/ui/legacy/theme_support/ThemeSupport.ts -third_party/devtools-frontend/src/node_modules/@aashutoshrathi/word-wrap/package.json third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/dist/source-map.debug.js third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/dist/source-map.js third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/lib/base64-vlq.js @@ -8837,8 +8698,13 @@ third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/install.t third_party/devtools-frontend/src/node_modules/@rollup/plugin-node-resolve/node_modules/@rollup/pluginutils/package.json third_party/devtools-frontend/src/node_modules/@rollup/plugin-node-resolve/package.json third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/package.json -third_party/devtools-frontend/src/node_modules/@sinonjs/commons/lib/class-name.js +third_party/devtools-frontend/src/node_modules/@sinonjs/commons/lib/prototypes/throws-on-proto.js +third_party/devtools-frontend/src/node_modules/@sinonjs/commons/types/prototypes/throws-on-proto.d.ts third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/lib/create-set.js +third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/lib/deep-equal.js +third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons/lib/class-name.js +third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons/lib/prototypes/throws-on-proto.js +third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons/types/prototypes/throws-on-proto.d.ts third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/types/create-set.d.ts third_party/devtools-frontend/src/node_modules/@sinonjs/text-encoding/package.json third_party/devtools-frontend/src/node_modules/@tootallnate/quickjs-emscripten/dist/context.d.ts @@ -9009,7 +8875,10 @@ third_party/devtools-frontend/src/node_modules/dom5/node_modules/parse5/lib/toke third_party/devtools-frontend/src/node_modules/dom5/node_modules/parse5/package.json third_party/devtools-frontend/src/node_modules/dom5/src/util.ts third_party/devtools-frontend/src/node_modules/end-of-stream/package.json -third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ws/package.json +third_party/devtools-frontend/src/node_modules/engine.io-parser/build/cjs/index.js +third_party/devtools-frontend/src/node_modules/engine.io-parser/build/esm/index.js +third_party/devtools-frontend/src/node_modules/engine.io/build/transports/webtransport.d.ts +third_party/devtools-frontend/src/node_modules/engine.io/build/transports/webtransport.js third_party/devtools-frontend/src/node_modules/engine.io/package.json third_party/devtools-frontend/src/node_modules/error-ex/package.json third_party/devtools-frontend/src/node_modules/es-abstract/package.json @@ -9039,6 +8908,7 @@ third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/lib/typed.js third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/lib/utility.js third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/package.json +third_party/devtools-frontend/src/node_modules/eslint-plugin-jsdoc/dist/tagNames.js third_party/devtools-frontend/src/node_modules/eslint-plugin-jsdoc/node_modules/debug/package.json third_party/devtools-frontend/src/node_modules/eslint-plugin-jsdoc/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp/package.json @@ -9147,6 +9017,7 @@ third_party/devtools-frontend/src/node_modules/internal-slot/package.json third_party/devtools-frontend/src/node_modules/is-bigint/package.json third_party/devtools-frontend/src/node_modules/is-binary-path/package.json third_party/devtools-frontend/src/node_modules/is-boolean-object/package.json +third_party/devtools-frontend/src/node_modules/is-builtin-module/package.json third_party/devtools-frontend/src/node_modules/is-callable/package.json third_party/devtools-frontend/src/node_modules/is-core-module/package.json third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/package.json @@ -9454,6 +9325,11 @@ third_party/devtools-frontend/src/node_modules/shebang-regex/package.json third_party/devtools-frontend/src/node_modules/side-channel/package.json third_party/devtools-frontend/src/node_modules/sinon/lib/sinon/proxy-invoke.js third_party/devtools-frontend/src/node_modules/sinon/lib/sinon/util/core/extend.js +third_party/devtools-frontend/src/node_modules/sinon/lib/sinon/util/core/get-property-descriptor.js +third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/dist/diff.js +third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/lib/convert/dmp.js +third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/lib/index.es6.js +third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/package.json third_party/devtools-frontend/src/node_modules/sinon/node_modules/has-flag/package.json third_party/devtools-frontend/src/node_modules/sinon/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/sinon/pkg/sinon-esm.js @@ -9463,7 +9339,8 @@ third_party/devtools-frontend/src/node_modules/slice-ansi/node_modules/ansi-styl third_party/devtools-frontend/src/node_modules/slice-ansi/node_modules/color-convert/package.json third_party/devtools-frontend/src/node_modules/slice-ansi/node_modules/color-name/package.json third_party/devtools-frontend/src/node_modules/slide/package.json -third_party/devtools-frontend/src/node_modules/socket.io-adapter/node_modules/ws/package.json +third_party/devtools-frontend/src/node_modules/socket.io-adapter/node_modules/debug/package.json +third_party/devtools-frontend/src/node_modules/socket.io-adapter/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/socket.io/client-dist/socket.io.js third_party/devtools-frontend/src/node_modules/socket.io/dist/index.d.ts third_party/devtools-frontend/src/node_modules/socket.io/dist/index.js @@ -9573,9 +9450,7 @@ third_party/devtools-frontend/src/node_modules/typescript/lib/pt-br/diagnosticMe third_party/devtools-frontend/src/node_modules/typescript/lib/ru/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/tr/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/tsc.js -third_party/devtools-frontend/src/node_modules/typescript/lib/tsserver.js third_party/devtools-frontend/src/node_modules/typescript/lib/typescript.js -third_party/devtools-frontend/src/node_modules/typescript/lib/typingsInstaller.js third_party/devtools-frontend/src/node_modules/typescript/lib/zh-cn/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/zh-tw/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/ua-parser-js/package.json @@ -11443,7 +11318,6 @@ third_party/jstemplate/jstemplate_example.html third_party/jstemplate/jstemplate_example.js third_party/jstemplate/jstemplate_jsunit.html third_party/jstemplate/jstemplate_test.js -third_party/kotlin_stdlib/3pp/install.py third_party/leveldatabase/src/doc/benchmark.html third_party/leveldatabase/src/table/format.h third_party/libFuzzer/src/FuzzerSHA1.cpp @@ -11520,9 +11394,9 @@ third_party/libavif/src/src/scale.c third_party/libavif/src/tests/gtest/avifprogressivetest.cc third_party/libc++/src/CREDITS.TXT third_party/libc++/src/src/chrono.cpp +third_party/libc++/src/src/experimental/tzdb.cpp third_party/libc++/src/src/fstream.cpp third_party/libc++/src/src/print.cpp -third_party/libc++/src/src/tzdb.cpp third_party/libc++/src/test/libcxx/containers/sequences/deque/asan_turning_off.pass.cpp third_party/libc++/src/test/libcxx/containers/sequences/vector/asan_turning_off.pass.cpp third_party/libc++/src/test/libcxx/containers/strings/basic.string/asan_turning_off.pass.cpp @@ -12099,7 +11973,6 @@ third_party/node/node_modules/typescript/lib/lib.es2022.intl.d.ts third_party/node/node_modules/typescript/lib/lib.webworker.d.ts third_party/node/node_modules/typescript/lib/lib.webworker.iterable.d.ts third_party/node/node_modules/typescript/lib/tsc.js -third_party/node/node_modules/typescript/lib/tsserver.js third_party/node/node_modules/typescript/lib/typescript.js third_party/node/node_modules/uri-js/dist/es5/uri.all.js third_party/node/node_modules/uri-js/dist/esnext/uri.js @@ -12115,7 +11988,6 @@ third_party/openh264/src/module/task_utils_generated.h third_party/openh264/src/test/build/windowsphone/codec_ut/CodecUTApp/Properties/AppManifest.xml third_party/openh264/src/test/build/windowsphone/codec_ut/CodecUTApp/Properties/WMAppManifest.xml third_party/openscreen/src/BUILD.gn -third_party/openscreen/src/PRESUBMIT.py third_party/openscreen/src/buildtools/README.txt third_party/openscreen/src/buildtools/clang_format/README.txt third_party/openscreen/src/buildtools/reclient_cfgs/configure_reclient_cfgs.py @@ -12157,14 +12029,10 @@ third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance.h third_party/openscreen/src/discovery/dnssd/public/dns_sd_querier.h third_party/openscreen/src/discovery/mdns/impl/mdns_probe_unittest.cc third_party/openscreen/src/discovery/mdns/impl/mdns_responder.cc -third_party/openscreen/src/discovery/mdns/impl/mdns_responder_unittest.cc third_party/openscreen/src/discovery/mdns/public/mdns_reader.cc third_party/openscreen/src/discovery/public/dns_sd_service_watcher.h third_party/openscreen/src/osp/impl/message_demuxer.cc -third_party/openscreen/src/osp/impl/presentation/presentation_controller.cc -third_party/openscreen/src/osp/impl/quic/quic_client.h -third_party/openscreen/src/osp/impl/quic/quic_connection_factory_client.cc -third_party/openscreen/src/osp/impl/quic/quic_connection_factory_server.cc +third_party/openscreen/src/osp/impl/quic/certificates/quic_agent_certificate.cc third_party/openscreen/src/platform/impl/tls_connection_factory_posix.cc third_party/openscreen/src/platform/impl/tls_connection_posix.cc third_party/openscreen/src/test/test_main.cc @@ -12708,7 +12576,7 @@ third_party/perfetto/include/perfetto/public/te_category_macros.h third_party/perfetto/infra/ci/Makefile third_party/perfetto/infra/ci/common_utils.py third_party/perfetto/infra/ci/config.py -third_party/perfetto/infra/ci/controller/controller.py +third_party/perfetto/infra/ci/controller/main.py third_party/perfetto/infra/ci/controller/stackdriver_metrics.py third_party/perfetto/infra/ci/frontend/static/index.html third_party/perfetto/infra/ci/frontend/static/script.js @@ -12785,6 +12653,7 @@ third_party/perfetto/ui/src/assets/bigtrace.html third_party/perfetto/ui/src/assets/index.html third_party/perfetto/ui/src/base/errors.ts third_party/perfetto/ui/src/chrome_extension/index.ts +third_party/perfetto/ui/src/common/gcs_uploader.ts third_party/perfetto/ui/src/common/recordingV2/adb_connection_over_webusb.ts third_party/perfetto/ui/src/common/recordingV2/adb_file_handler.ts third_party/perfetto/ui/src/common/recordingV2/recording_interfaces_v2.ts @@ -12792,11 +12661,11 @@ third_party/perfetto/ui/src/common/recordingV2/recording_page_controller.ts third_party/perfetto/ui/src/common/recordingV2/recording_utils.ts third_party/perfetto/ui/src/common/recordingV2/target_factories/android_websocket_target_factory.ts third_party/perfetto/ui/src/common/recordingV2/targets/android_target.ts -third_party/perfetto/ui/src/common/upload_utils.ts third_party/perfetto/ui/src/controller/adb.ts third_party/perfetto/ui/src/controller/chrome_proxy_record_controller.ts third_party/perfetto/ui/src/frontend/analytics.ts third_party/perfetto/ui/src/frontend/cookie_consent.ts +third_party/perfetto/ui/src/frontend/css_constants.ts third_party/perfetto/ui/src/frontend/error_dialog.ts third_party/perfetto/ui/src/frontend/home_page.ts third_party/perfetto/ui/src/frontend/index.ts @@ -13722,7 +13591,6 @@ third_party/skia/infra/bots/recipes/infra.py third_party/skia/infra/bots/recipes/perf_pathkit.py third_party/skia/infra/bots/recipes/perf_skottietrace.py third_party/skia/infra/bots/recipes/perf_skottiewasm_lottieweb.py -third_party/skia/infra/bots/recipes/skpbench.py third_party/skia/infra/bots/recipes/sync_and_compile.expected/Build-Debian10-Clang-arm-Release-NoPatch (tryjob).json third_party/skia/infra/bots/recipes/sync_and_compile.expected/Build-Debian10-Clang-arm-Release-NoPatch.json third_party/skia/infra/bots/recipes/sync_and_compile.expected/Build-Win10-Clang-x86_64-Release-NoDEPS.json @@ -14654,6 +14522,7 @@ third_party/webrtc/rtc_base/win32_unittest.cc third_party/webrtc/rtc_tools/data_channel_benchmark/peer_connection_client.cc third_party/webrtc/rtc_tools/testing/utils.py third_party/webrtc/rtc_tools/unpack_aecdump/unpack.cc +third_party/webrtc/rtc_tools/video_encoder/video_encoder.cc third_party/webrtc/sdk/android/native_api/jni/class_loader.cc third_party/webrtc/sdk/android/native_api/jni/class_loader.h third_party/webrtc/sdk/android/native_api/jni/java_types.h @@ -14783,7 +14652,6 @@ third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executormarionette third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/executorwebdriver.py third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/executors/test-wait.js third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/formatters/chromium.py -third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/testharnessreport-content-shell.js third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/wpttest.py third_party/wuffs/BUILD.gn third_party/wuffs/src/release/c/wuffs-v0.3.c @@ -14883,8 +14751,6 @@ tools/chrome_extensions/open_my_editor/ext/manifest.json tools/clang/blink_gc_plugin/BlinkGCPlugin.cpp tools/clang/iterator_checker/tests/PRESUBMIT.py tools/clang/plugins/ChromeClassTester.cpp -tools/clang/plugins/tests/bad_raw_ptr_cast_in_the_wild.cpp -tools/clang/plugins/tests/raw_ptr_to_stack_allocated.cpp tools/clang/raw_ptr_plugin/tests/bad_raw_ptr_cast_in_the_wild.cpp tools/clang/raw_ptr_plugin/tests/raw_ptr_to_stack_allocated.cpp tools/clang/rewrite_raw_ptr_fields/RewriteRawPtrFields.cpp @@ -15011,6 +14877,8 @@ tools/metrics/histograms/merge_xml_test.py tools/metrics/histograms/metadata/accessibility/enums.xml tools/metrics/histograms/metadata/accessibility/histograms.xml tools/metrics/histograms/metadata/account_manager/histograms.xml +tools/metrics/histograms/metadata/ai/enums.xml +tools/metrics/histograms/metadata/ai/histograms.xml tools/metrics/histograms/metadata/android/enums.xml tools/metrics/histograms/metadata/android/histograms.xml tools/metrics/histograms/metadata/apps/enums.xml @@ -15026,6 +14894,7 @@ tools/metrics/histograms/metadata/ash_growth/histograms.xml tools/metrics/histograms/metadata/ash_user_education/enums.xml tools/metrics/histograms/metadata/ash_user_education/histograms.xml tools/metrics/histograms/metadata/assistant/histograms.xml +tools/metrics/histograms/metadata/attribution_reporting/histograms.xml tools/metrics/histograms/metadata/auto/histograms.xml tools/metrics/histograms/metadata/autofill/enums.xml tools/metrics/histograms/metadata/autofill/histograms.xml @@ -15147,8 +15016,6 @@ tools/metrics/histograms/metadata/memory/enums.xml tools/metrics/histograms/metadata/memory/histograms.xml tools/metrics/histograms/metadata/mobile/enums.xml tools/metrics/histograms/metadata/mobile/histograms.xml -tools/metrics/histograms/metadata/model_execution/enums.xml -tools/metrics/histograms/metadata/model_execution/histograms.xml tools/metrics/histograms/metadata/na_cl/enums.xml tools/metrics/histograms/metadata/na_cl/histograms.xml tools/metrics/histograms/metadata/navigation/enums.xml @@ -15177,7 +15044,6 @@ tools/metrics/histograms/metadata/page/histograms.xml tools/metrics/histograms/metadata/password/enums.xml tools/metrics/histograms/metadata/password/histograms.xml tools/metrics/histograms/metadata/payment/histograms.xml -tools/metrics/histograms/metadata/pcscan/histograms.xml tools/metrics/histograms/metadata/pdf/enums.xml tools/metrics/histograms/metadata/pdf/histograms.xml tools/metrics/histograms/metadata/performance_controls/enums.xml @@ -15240,7 +15106,6 @@ tools/metrics/histograms/metadata/signin/histograms.xml tools/metrics/histograms/metadata/simple/histograms.xml tools/metrics/histograms/metadata/stability/enums.xml tools/metrics/histograms/metadata/stability/histograms.xml -tools/metrics/histograms/metadata/start_surface/histograms.xml tools/metrics/histograms/metadata/startup/enums.xml tools/metrics/histograms/metadata/startup/histograms.xml tools/metrics/histograms/metadata/storage/enums.xml @@ -15268,6 +15133,8 @@ tools/metrics/histograms/metadata/variations/enums.xml tools/metrics/histograms/metadata/variations/histograms.xml tools/metrics/histograms/metadata/views/histograms.xml tools/metrics/histograms/metadata/virtualization/histograms.xml +tools/metrics/histograms/metadata/visited_url_ranking/enums.xml +tools/metrics/histograms/metadata/visited_url_ranking/histograms.xml tools/metrics/histograms/metadata/web_apk/enums.xml tools/metrics/histograms/metadata/web_apk/histograms.xml tools/metrics/histograms/metadata/web_audio/enums.xml @@ -15294,8 +15161,6 @@ tools/metrics/histograms/test_data/components/histograms.xml tools/metrics/histograms/test_data/histograms.xml tools/metrics/histograms/test_data/tokens/histograms.xml tools/metrics/histograms/test_data/ukm.xml -tools/metrics/histograms/visited_url_ranking/enums.xml -tools/metrics/histograms/visited_url_ranking/histograms.xml tools/metrics/md2xml.py tools/metrics/structured/PRESUBMIT.py tools/metrics/structured/sync/model.py @@ -15382,6 +15247,7 @@ tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf_timing.json tools/perf/core/shard_maps/timing_data/android-pixel6-perf_timing.json tools/perf/core/shard_maps/timing_data/android-pixel6-pro-perf_timing.json tools/perf/core/shard_maps/timing_data/linux-perf_timing.json +tools/perf/core/shard_maps/timing_data/linux-r350-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-laptop_low_end-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json @@ -15691,7 +15557,7 @@ ui/color/PRESUBMIT.py ui/color/color_provider_key.h ui/display/display_switches.cc ui/display/display_transform.cc -ui/display/mac/display_link_mac.cc +ui/display/mac/display_link_mac.mm ui/display/win/test/virtual_display_util_win.cc ui/events/android/motion_event_android_unittest.cc ui/events/ash/keyboard_capability_unittest.cc @@ -15790,7 +15656,7 @@ ui/views/view_targeter_delegate.h ui/views/view_unittest.cc ui/views/win/hwnd_message_handler.cc ui/views/window/non_client_view.cc -ui/webui/resources/cr_components/customize_themes/customize_themes.ts +ui/webui/resources/cr_components/certificate_manager/certificate_manager_v2.html ui/webui/resources/cr_components/help_bubble/help_bubble_icons.html ui/webui/resources/cr_elements/icons.html ui/webui/resources/js/ios/web_ui.js @@ -15885,7 +15751,6 @@ v8/src/trap-handler/handler-outside-win.cc v8/src/trap-handler/handler-outside.cc v8/src/trap-handler/handler-shared.cc v8/src/wasm/wasm-code-manager.cc -v8/src/wasm/wasm-feature-flags.h v8/testing/gtest/BUILD.gn v8/third_party/googletest/BUILD.gn v8/third_party/inspector_protocol/crdtp/cbor.cc @@ -15915,6 +15780,7 @@ v8/tools/release/merge_to_branch.py v8/tools/release/merge_to_branch_gerrit.py v8/tools/release/roll_bisect.py v8/tools/release/roll_merge_gerrit.py +v8/tools/release/roll_merge_gerrit_test.py v8/tools/release/test_scripts.py v8/tools/release/testdata/roll_merge_gerrit_happy_path.txt v8/tools/run_perf.py 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 1bb39905..833d647c 100644 --- a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch +++ b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2400,7 +2400,6 @@ static_library("browser") { +@@ -2390,7 +2390,6 @@ static_library("browser") { "//components/reporting/util:task_runner_context", "//components/resources", "//components/safe_browsing/content/browser", @@ -8,7 +8,7 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", -@@ -3864,8 +3863,6 @@ static_library("browser") { +@@ -3849,8 +3848,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -19,7 +19,7 @@ "download/download_dir_util.cc", --- a/chrome/browser/browser_process.h +++ b/chrome/browser/browser_process.h -@@ -55,10 +55,6 @@ class NetworkQualityTracker; +@@ -56,10 +56,6 @@ class NetworkQualityTracker; class SharedURLLoaderFactory; } @@ -30,7 +30,7 @@ namespace subresource_filter { class RulesetService; } -@@ -223,9 +219,6 @@ class BrowserProcess { +@@ -224,9 +220,6 @@ class BrowserProcess { // on this platform (or this is a unit test). virtual StatusTray* status_tray() = 0; @@ -50,7 +50,7 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/site_isolation/prefs_observer.h" #include "chrome/browser/ssl/secure_origin_prefs_observer.h" -@@ -456,8 +455,6 @@ void BrowserProcessImpl::StartTearDown() +@@ -452,8 +451,6 @@ void BrowserProcessImpl::StartTearDown() #endif metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -74,7 +74,7 @@ subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1451,26 +1440,6 @@ void BrowserProcessImpl::CreateBackgroun +@@ -1446,26 +1435,6 @@ void BrowserProcessImpl::CreateBackgroun #endif } @@ -103,7 +103,7 @@ created_subresource_filter_ruleset_service_ = true; --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -200,7 +200,6 @@ class BrowserProcessImpl : public Browse +@@ -199,7 +199,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr manager) override; #endif StatusTray* status_tray() override; @@ -123,7 +123,7 @@ subresource_filter_ruleset_service_; --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -69,7 +69,6 @@ +@@ -72,7 +72,6 @@ #include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/reading_list/reading_list_model_factory.h" @@ -131,7 +131,7 @@ #include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/share/share_history.h" -@@ -643,10 +642,6 @@ void ChromeBrowsingDataRemoverDelegate:: +@@ -663,10 +662,6 @@ void ChromeBrowsingDataRemoverDelegate:: base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -144,7 +144,7 @@ browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_, --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5248,10 +5248,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -5461,10 +5461,6 @@ ChromeContentBrowserClient::CreateThrott throttles.push_back(std::make_unique( handle, handle->GetWebContents()->GetBrowserContext())); @@ -155,7 +155,7 @@ throttles.push_back(std::make_unique( handle, base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp), -@@ -5303,16 +5299,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -5516,16 +5512,6 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -172,7 +172,7 @@ if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) { throttles.push_back( std::make_unique( -@@ -5617,8 +5603,6 @@ bool ChromeContentBrowserClient::IsPlugi +@@ -5830,8 +5816,6 @@ bool ChromeContentBrowserClient::IsPlugi void ChromeContentBrowserClient::InitOnUIThread() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -207,7 +207,7 @@ } // namespace --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -514,13 +514,6 @@ void ChromeDownloadManagerDelegate::SetD +@@ -527,13 +527,6 @@ void ChromeDownloadManagerDelegate::SetD download_manager_ = dm; @@ -221,7 +221,7 @@ if (download_manager_) { download_manager_->AddObserver(this); } -@@ -955,17 +948,6 @@ void ChromeDownloadManagerDelegate::Choo +@@ -967,17 +960,6 @@ void ChromeDownloadManagerDelegate::Choo void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( base::FilePath* filename, const GURL& source_url) { @@ -250,7 +250,7 @@ // Whether the download is currently being revived. bool is_being_revived_ = false; -@@ -536,13 +536,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -555,13 +555,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -267,7 +267,7 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -749,9 +749,6 @@ bool DownloadItemModel::IsCommandEnabled +@@ -764,9 +764,6 @@ bool DownloadItemModel::IsCommandEnabled // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -308,7 +308,7 @@ extension.erase(0, 1); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -323,13 +323,6 @@ base::FilePath DownloadTargetDeterminer: +@@ -333,13 +333,6 @@ base::FilePath DownloadTargetDeterminer: download_->GetURL(), download_->GetContentDisposition(), referrer_charset, suggested_filename, sniffed_mime_type, default_filename); @@ -322,7 +322,7 @@ // If no mime type or explicitly specified a name, don't replace file // extension. if (sniffed_mime_type.empty() || !suggested_filename.empty()) -@@ -1291,30 +1284,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1362,30 +1355,7 @@ DownloadFileType::DangerLevel DownloadTa download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; @@ -381,7 +381,7 @@ - // DownloadDangerPrompt displays a modal dialog using native widgets that the - // user must either accept or cancel. It cannot be scripted. - DownloadDangerPrompt* prompt = DownloadDangerPrompt::Create( -- download_item, web_contents, true, +- download_item, web_contents, - base::BindOnce(&DownloadsAcceptDangerFunction::DangerPromptCallback, this, - download_id)); - // DownloadDangerPrompt deletes itself @@ -500,7 +500,7 @@ referrer_entries))); --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -701,18 +701,6 @@ void WebstorePrivateBeginInstallWithMani +@@ -704,18 +704,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -519,7 +519,7 @@ } void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone( -@@ -1217,54 +1205,9 @@ WebstorePrivateGetReferrerChainFunction: +@@ -1220,54 +1208,9 @@ WebstorePrivateGetReferrerChainFunction: ExtensionFunction::ResponseAction WebstorePrivateGetReferrerChainFunction::Run() { @@ -695,15 +695,15 @@ sources = [ "chrome_controller_client.cc", "chrome_controller_client.h", -@@ -71,6 +72,7 @@ static_library("safe_browsing") { +@@ -73,6 +74,7 @@ static_library("safe_browsing") { "//mojo/public/cpp/system", "//services/preferences/public/cpp", ] + } if (is_android) { - deps += [ "//chrome/browser/password_manager/android:utils" ] -@@ -504,6 +506,7 @@ static_library("advanced_protection") { + deps += [ +@@ -520,6 +522,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -711,7 +711,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -523,6 +526,7 @@ source_set("metrics_collector") { +@@ -539,6 +542,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -738,7 +738,7 @@ - scoped_refptr sb_ui_manager = sb_service->ui_manager(); - safe_browsing::SBThreatType threat_type; - if (sb_ui_manager->IsUrlAllowlistedOrPendingForWebContents( -- entry->GetURL(), false, entry, web_contents(), false, &threat_type)) { +- entry->GetURL(), entry, web_contents(), false, &threat_type)) { - switch (threat_type) { - case SB_THREAT_TYPE_UNUSED: - case SB_THREAT_TYPE_SAFE: @@ -817,7 +817,7 @@ --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -5413,7 +5413,6 @@ static_library("ui") { +@@ -5048,7 +5048,6 @@ static_library("ui") { "views/download/bubble/download_dialog_view.h", "views/download/bubble/download_toolbar_button_view.cc", "views/download/bubble/download_toolbar_button_view.h", @@ -827,7 +827,7 @@ "views/download/download_item_view.cc", --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -503,32 +503,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -501,32 +501,6 @@ void TabHelpers::AttachTabHelpers(WebCon // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); @@ -870,21 +870,7 @@ #include "chrome/browser/download/download_history.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_item_warning_data.h" -@@ -291,13 +290,6 @@ void DownloadsDOMHandler::SaveDangerousR - } - - CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); -- download::DownloadItem* file = GetDownloadByStringId(id); -- if (file) { -- DownloadItemWarningData::AddWarningActionEvent( -- file, DownloadItemWarningData::WarningSurface::DOWNLOADS_PAGE, -- DownloadItemWarningData::WarningAction::KEEP); -- ShowDangerPrompt(file); -- } - } - - // "Suspicious" in this context applies to insecure as well as dangerous -@@ -568,12 +560,6 @@ void DownloadsDOMHandler::RemoveDownload +@@ -695,12 +694,6 @@ void DownloadsDOMHandler::RemoveDownload IdSet ids; for (download::DownloadItem* download : to_remove) { @@ -897,93 +883,19 @@ DownloadItemModel item_model(download); if (!item_model.ShouldShowInShelf() || download->GetState() == download::DownloadItem::IN_PROGRESS) { -@@ -782,54 +768,6 @@ void DownloadsDOMHandler::FinalizeRemova - } - } - --// TODO(chlily): This is obsoleted by ImprovedDownloadPageWarnings. Clean this --// up. --void DownloadsDOMHandler::ShowDangerPrompt( -- download::DownloadItem* dangerous_item) { -- DownloadDangerPrompt* danger_prompt = DownloadDangerPrompt::Create( -- dangerous_item, GetWebUIWebContents(), false, -- base::BindOnce(&DownloadsDOMHandler::DangerPromptDone, -- weak_ptr_factory_.GetWeakPtr(), dangerous_item->GetId())); -- // danger_prompt will delete itself. -- DCHECK(danger_prompt); --} -- --// TODO(chlily): This is obsoleted by ImprovedDownloadPageWarnings. Clean this --// up. --void DownloadsDOMHandler::DangerPromptDone( -- int download_id, -- DownloadDangerPrompt::Action action) { -- if (action != DownloadDangerPrompt::ACCEPT) { -- return; -- } -- download::DownloadItem* item = nullptr; -- if (GetMainNotifierManager()) { -- item = GetMainNotifierManager()->GetDownload(download_id); -- } -- if (!item && GetOriginalNotifierManager()) { -- item = GetOriginalNotifierManager()->GetDownload(download_id); -- } -- if (!item || item->IsDone()) { -- return; -- } -- CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); -- -- // If a download is insecure, validate that first. Is most cases, insecure -- // download warnings will occur first, but in the worst case scenario, we show -- // a dangerous warning twice. That's better than showing an insecure download -- // warning, then dismissing the dangerous download warning. Since insecure -- // downloads triggering the UI are temporary and rare to begin with, this -- // should very rarely occur. -- if (item->IsInsecure()) { -- item->ValidateInsecureDownload(); -- return; -- } -- -- RecordDownloadsPageValidatedHistogram(item); -- -- item->ValidateDangerousDownload(); --} -- - void DownloadsDOMHandler::MaybeTriggerDownloadWarningHatsSurvey( - download::DownloadItem* item, - DownloadWarningHatsType survey_type) { --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h -@@ -12,7 +12,6 @@ - +@@ -13,7 +13,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" + #include "base/time/time.h" -#include "chrome/browser/download/download_danger_prompt.h" #include "chrome/browser/download/download_warning_desktop_hats_utils.h" #include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h" #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h" -@@ -120,18 +119,6 @@ class DownloadsDOMHandler : public conte - // null-checking |original_notifier_|. - content::DownloadManager* GetOriginalNotifierManager() const; - -- // Displays a native prompt asking the user for confirmation after accepting -- // the dangerous download specified by |dangerous|. The function returns -- // immediately, and will invoke DangerPromptAccepted() asynchronously if the -- // user accepts the dangerous download. The native prompt will observe -- // |dangerous| until either the dialog is dismissed or |dangerous| is no -- // longer an in-progress dangerous download. -- virtual void ShowDangerPrompt(download::DownloadItem* dangerous); -- -- // Conveys danger acceptance from the DownloadDangerPrompt to the -- // DownloadItem. -- void DangerPromptDone(int download_id, DownloadDangerPrompt::Action action); -- - // Launches a HaTS survey for a download warning that is heeded, bypassed, or - // ignored (if all preconditions are met). - void MaybeTriggerDownloadWarningHatsSurvey( --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -275,66 +275,6 @@ CreateHttpsOnlyModePage(content::WebCont +@@ -279,64 +279,6 @@ CreateHttpsOnlyModePage(content::WebCont security_interstitials::https_only_mode::HttpInterstitialState{}); } @@ -1020,8 +932,6 @@ - primary_main_frame->GetGlobalId(); - safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource; - resource.url = request_url; -- resource.is_subresource = false; -- resource.is_subframe = false; - resource.threat_type = threat_type; - resource.render_process_id = primary_main_frame_id.child_id; - resource.render_frame_token = primary_main_frame->GetFrameToken().value(); @@ -1050,7 +960,7 @@ std::unique_ptr CreateEnterpriseBlockPage( content::WebContents* web_contents) { const GURL kRequestUrl("https://enterprise-block.example.net"); -@@ -345,94 +285,6 @@ std::unique_ptr Cre +@@ -347,35 +289,6 @@ std::unique_ptr Cre kRequestUrl)); } @@ -1066,8 +976,6 @@ - primary_main_frame->GetGlobalId(); - safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource; - resource.url = kRequestUrl; -- resource.is_subresource = false; -- resource.is_subframe = false; - resource.threat_type = - safe_browsing::SBThreatType::SB_THREAT_TYPE_MANAGED_POLICY_WARN; - resource.render_process_id = primary_main_frame_id.child_id; @@ -1085,6 +993,13 @@ - kRequestUrl)); -} - + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + std::unique_ptr + CreateSupervisedUserVerificationPage(content::WebContents* web_contents) { +@@ -391,61 +304,6 @@ CreateSupervisedUserVerificationPage(con + } + #endif + -std::unique_ptr -CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) { - safe_browsing::SBThreatType threat_type = @@ -1118,8 +1033,6 @@ - primary_main_frame->GetGlobalId(); - safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource; - resource.url = request_url; -- resource.is_subresource = false; -- resource.is_subframe = false; - resource.threat_type = threat_type; - resource.render_process_id = primary_main_frame_id.child_id; - resource.render_frame_token = primary_main_frame->GetFrameToken().value(); @@ -1145,7 +1058,7 @@ #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) std::unique_ptr CreateCaptivePortalBlockingPage( content::WebContents* web_contents) { -@@ -539,12 +391,8 @@ void InterstitialHTMLSource::StartDataRe +@@ -552,12 +410,8 @@ void InterstitialHTMLSource::StartDataRe interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents); } else if (path_without_query == "/blocked-interception") { interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents); @@ -1158,8 +1071,8 @@ } else if (path_without_query == "/clock") { interstitial_delegate = CreateBadClockBlockingPage(web_contents); } else if (path_without_query == "/lookalike") { -@@ -559,12 +407,7 @@ void InterstitialHTMLSource::StartDataRe - interstitial_delegate = CreateHttpsOnlyModePage(web_contents); +@@ -576,12 +430,7 @@ void InterstitialHTMLSource::StartDataRe + #endif } - if (path_without_query == "/quietsafebrowsing") { @@ -1167,8 +1080,8 @@ - CreateSafeBrowsingQuietBlockingPage(web_contents); - html = blocking_page->GetHTML(); - interstitial_delegate = std::move(blocking_page); -- } else if (path_without_query == "/supervised_user") { -+ if (path_without_query == "/supervised_user") { +- } else if (path_without_query == "/supervised-user-ask-parent") { ++ if (path_without_query == "/supervised-user-ask-parent") { html = GetSupervisedUserInterstitialHTML(path); } else if (interstitial_delegate.get()) { html = interstitial_delegate.get()->GetHTMLContents(); @@ -1180,11 +1093,11 @@ #include "components/safe_browsing/buildflags.h" -#include "components/safe_browsing/content/renderer/threat_dom_details.h" #include "components/spellcheck/spellcheck_buildflags.h" - #include "components/subresource_filter/content/renderer/safe_browsing_unverified_ruleset_dealer.h" #include "components/subresource_filter/content/renderer/subresource_filter_agent.h" + #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h" @@ -459,12 +458,8 @@ void ChromeContentRendererClient::Render - subresource_filter_ruleset_dealer_ = std::make_unique< - subresource_filter::SafeBrowsingUnverifiedRulesetDealer>(); + subresource_filter_ruleset_dealer_ = + std::make_unique(); - phishing_model_setter_ = - std::make_unique(); diff --git a/patches/core/inox-patchset/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index d0db48fd..3a2ceeb4 100644 --- a/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -1,13 +1,13 @@ --- a/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc +++ b/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc -@@ -31,7 +31,6 @@ namespace extensions { +@@ -32,7 +32,6 @@ namespace extensions { bool IsComponentExtensionAllowlisted(const std::string& extension_id) { - const char* const kAllowed[] = { -- extension_misc::kInAppPaymentsSupportAppId, - extension_misc::kPdfExtensionId, + constexpr auto kAllowed = base::MakeFixedFlatSet({ +- extension_misc::kInAppPaymentsSupportAppId, + extension_misc::kPdfExtensionId, #if BUILDFLAG(IS_CHROMEOS) - extension_misc::kAssessmentAssistantExtensionId, + extension_misc::kAssessmentAssistantExtensionId, --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -410,11 +410,6 @@ void ComponentLoader::AddWebStoreApp() { diff --git a/patches/core/inox-patchset/0021-disable-rlz.patch b/patches/core/inox-patchset/0021-disable-rlz.patch index 490fe246..056b20e8 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 -@@ -465,14 +465,6 @@ group("gn_all") { +@@ -463,14 +463,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 f350cd42..a7825558 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 @@ -326,7 +326,7 @@ by default. 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 -@@ -28,7 +28,7 @@ namespace safe_search_api { +@@ -27,7 +27,7 @@ namespace safe_search_api { namespace { const char kSafeSearchApiUrl[] = @@ -391,7 +391,7 @@ by default. --- a/content/browser/webauth/webauth_request_security_checker.h +++ b/content/browser/webauth/webauth_request_security_checker.h -@@ -86,9 +86,9 @@ class CONTENT_EXPORT WebAuthRequestSecur +@@ -87,9 +87,9 @@ class CONTENT_EXPORT WebAuthRequestSecur // Legacy App IDs, which google.com origins are allowed to assert for // compatibility reasons. static constexpr char kGstaticAppId[] = @@ -432,7 +432,7 @@ by default. const char kExtensionsMenuUtmSource[] = "ext_extensions_menu"; --- a/google_apis/gaia/gaia_constants.cc +++ b/google_apis/gaia/gaia_constants.cc -@@ -14,157 +14,157 @@ const char kChromeSource[] = "ChromiumBr +@@ -14,166 +14,166 @@ const char kChromeSource[] = "ChromiumBr const char kUnexpectedServiceResponse[] = "UnexpectedServiceResponse"; // OAuth scopes. @@ -495,6 +495,17 @@ by default. - "https://www.googleapis.com/auth/peopleapi.readonly"; + "trk:081:https://www.googleapis.com/auth/peopleapi.readonly"; + // OAuth2 scope for access to the people API (read-write). + const char kPeopleApiReadWriteOAuth2Scope[] = +- "https://www.googleapis.com/auth/peopleapi.readwrite"; ++ "trk:115:https://www.googleapis.com/auth/peopleapi.readwrite"; + + // OAuth2 scope for access to the people API person's locale preferences + // (read-only). + const char kProfileLanguageReadOnlyOAuth2Scope[] = +- "https://www.googleapis.com/auth/profile.language.read"; ++ "trk:116:https://www.googleapis.com/auth/profile.language.read"; + // OAuth2 scope for access to the programmatic challenge API (read-only). const char kProgrammaticChallengeOAuth2Scope[] = - "https://www.googleapis.com/auth/accounts.programmaticchallenge"; 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 cb6d3413..e05a2110 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -39,7 +39,7 @@ the URL so we get notified if this happens again in the future). kSafeBrowsingIncidentTrafficAnnotation = --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -304,11 +304,14 @@ IncidentReportingService::UploadContext: +@@ -305,11 +305,14 @@ IncidentReportingService::UploadContext: // static bool IncidentReportingService::IsEnabledForProfile(Profile* profile) { 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 48719031..bce92880 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 -@@ -274,6 +274,10 @@ void ClientSideDetectionService::StartCl +@@ -271,6 +271,10 @@ void ClientSideDetectionService::StartCl return; } @@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware). std::string request_data; request->SerializeToString(&request_data); -@@ -353,6 +357,7 @@ void ClientSideDetectionService::StartCl +@@ -350,6 +354,7 @@ void ClientSideDetectionService::StartCl base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent, base::Unretained(WebUIInfoSingleton::GetInstance()), std::move(request), access_token)); diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index bdb58a75..ba7a7210 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 @@ --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc -@@ -582,7 +582,8 @@ void AutocompleteInput::ParseForEmphasiz +@@ -592,7 +592,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::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) || @@ -60,7 +60,7 @@ return GURL(parts.scheme.is_valid() ? text : FixupPath(text)); --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc -@@ -852,6 +852,7 @@ ChildProcessSecurityPolicyImpl::ChildPro +@@ -855,6 +855,7 @@ ChildProcessSecurityPolicyImpl::ChildPro RegisterWebSafeScheme(url::kWssScheme); #endif // BUILDFLAG(ENABLE_WEBSOCKETS) RegisterWebSafeScheme(url::kDataScheme); @@ -70,7 +70,7 @@ // other origins, so we should not treat them as web safe. Remove callers of --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -998,6 +998,8 @@ component("net") { +@@ -1030,6 +1030,8 @@ component("net") { "url_request/referrer_policy.h", "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", @@ -142,15 +142,15 @@ +#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc -@@ -12,6 +12,7 @@ - #include "base/functional/callback_helpers.h" +@@ -13,6 +13,7 @@ #include "base/metrics/histogram_macros.h" + #include "base/notreached.h" #include "base/rand_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" -@@ -49,6 +50,7 @@ +@@ -51,6 +52,7 @@ #include "net/url_request/url_request_redirect_job.h" #include "url/gurl.h" #include "url/origin.h" @@ -158,7 +158,7 @@ namespace net { -@@ -605,6 +607,12 @@ URLRequest::URLRequest(base::PassKey URLRe +@@ -592,6 +593,9 @@ std::unique_ptr URLRe } protocol_handlers_.clear(); @@ -193,7 +193,7 @@ if (cookie_deprecation_label_.has_value()) { --- a/url/url_constants.h +++ b/url/url_constants.h -@@ -52,6 +52,8 @@ inline constexpr char kMaterializedViewS +@@ -50,6 +50,8 @@ inline constexpr char kMaterializedViewS inline constexpr char kSteamScheme[] = "steam"; inline constexpr char kTelScheme[] = "tel"; inline constexpr char16_t kTelScheme16[] = u"tel"; @@ -204,7 +204,7 @@ inline constexpr char kUuidInPackageScheme[] = "uuid-in-package"; --- a/url/url_util.cc +++ b/url/url_util.cc -@@ -79,6 +79,7 @@ struct SchemeRegistry { +@@ -84,6 +84,7 @@ struct SchemeRegistry { kWssScheme, kDataScheme, kAboutScheme, @@ -212,7 +212,7 @@ }; // Schemes that normal pages cannot link to or access (i.e., with the same -@@ -93,6 +94,7 @@ struct SchemeRegistry { +@@ -98,6 +99,7 @@ struct SchemeRegistry { kAboutScheme, kJavaScriptScheme, kDataScheme, diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index 49488996..2fa09984 100644 --- a/patches/core/ungoogled-chromium/disable-crash-reporter.patch +++ b/patches/core/ungoogled-chromium/disable-crash-reporter.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -2576,24 +2576,6 @@ void ChromeContentBrowserClient::AppendE +@@ -2707,24 +2707,6 @@ void ChromeContentBrowserClient::AppendE command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -29,7 +29,7 @@ if (logging::DialogsAreSuppressed()) --- a/components/crash/core/app/crashpad.cc +++ b/components/crash/core/app/crashpad.cc -@@ -81,6 +81,12 @@ void InitializeDatabasePath(const base:: +@@ -68,6 +68,12 @@ void InitializeDatabasePath(const base:: } bool InitializeCrashpadImpl(bool initial_client, diff --git a/patches/core/ungoogled-chromium/disable-domain-reliability.patch b/patches/core/ungoogled-chromium/disable-domain-reliability.patch index fcac6d7d..64115b46 100644 --- a/patches/core/ungoogled-chromium/disable-domain-reliability.patch +++ b/patches/core/ungoogled-chromium/disable-domain-reliability.patch @@ -704,7 +704,7 @@ --- a/components/domain_reliability/uploader.cc +++ b/components/domain_reliability/uploader.cc -@@ -80,7 +80,7 @@ class DomainReliabilityUploaderImpl : pu +@@ -81,7 +81,7 @@ class DomainReliabilityUploaderImpl : pu if (discard_uploads_) discarded_upload_count_++; diff --git a/patches/core/ungoogled-chromium/disable-gaia.patch b/patches/core/ungoogled-chromium/disable-gaia.patch index 567ca15e..ec0ee804 100644 --- a/patches/core/ungoogled-chromium/disable-gaia.patch +++ b/patches/core/ungoogled-chromium/disable-gaia.patch @@ -3,7 +3,7 @@ --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc -@@ -263,61 +263,6 @@ void GaiaAuthFetcher::CreateAndStartGaia +@@ -264,61 +264,6 @@ void GaiaAuthFetcher::CreateAndStartGaia network::mojom::CredentialsMode credentials_mode, const net::NetworkTrafficAnnotationTag& traffic_annotation) { DCHECK(!fetch_pending_) << "Tried to fetch two things at once!"; diff --git a/patches/core/ungoogled-chromium/disable-gcm.patch b/patches/core/ungoogled-chromium/disable-gcm.patch index 04efd3c0..34cf8001 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 -@@ -449,6 +449,7 @@ void GCMClientImpl::StartGCM() { +@@ -450,6 +450,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(); -@@ -653,28 +654,6 @@ void GCMClientImpl::RemoveHeartbeatInter +@@ -654,28 +655,6 @@ void GCMClientImpl::RemoveHeartbeatInter void GCMClientImpl::StartCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); @@ -39,7 +39,7 @@ } void GCMClientImpl::OnCheckinCompleted( -@@ -731,24 +710,6 @@ void GCMClientImpl::SetGServicesSettings +@@ -732,24 +711,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 71afb715..a37a3e54 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -546,7 +546,7 @@ bool IsGoogleHostname(const GURL& url) { --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -593,11 +593,7 @@ std::u16string TemplateURLRef::SearchTer +@@ -589,11 +589,7 @@ std::u16string TemplateURLRef::SearchTer bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); @@ -663,6 +663,17 @@ } } // namespace variations +--- a/content/browser/preloading/prefetch/prefetch_container.cc ++++ b/content/browser/preloading/prefetch/prefetch_container.cc +@@ -745,7 +745,7 @@ void PrefetchContainer::AddRedirectHop(c + // some which are added by throttles). These aren't yet supported for + // prefetch, including browsing topics and client hints. + net::HttpRequestHeaders updated_headers; +- std::vector headers_to_remove = {variations::kClientDataHeader}; ++ std::vector headers_to_remove; + updated_headers.SetHeader("Sec-Purpose", + GetSecPurposeHeaderValue(redirect_info.new_url)); + --- a/net/base/url_util.cc +++ b/net/base/url_util.cc @@ -495,28 +495,6 @@ bool HasGoogleHost(const GURL& url) { diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index 13ce2f93..edcbe435 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 -@@ -375,7 +375,6 @@ if (!is_android && !is_mac) { +@@ -382,7 +382,6 @@ if (!is_android && !is_mac) { } data_deps += [ @@ -15,11 +15,17 @@ "//third_party/widevine/cdm", ] if (invoker.collect_inputs_only) { -@@ -1222,7 +1221,6 @@ if (is_win) { - ":optimization_guide_library", - ":swiftshader_library", - ":widevine_cdm_library", -- "//chrome/browser/resources/media/mei_preload:component_bundle", - ] +--- a/chrome/browser/resources/BUILD.gn ++++ b/chrome/browser/resources/BUILD.gn +@@ -96,11 +96,6 @@ group("resources") { + public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ] + } - if (is_chrome_branded) { +- if (is_mac) { +- public_deps += [ +- "//chrome/browser/resources/media/mei_preload:component", +- ] +- } + + if (is_win || is_mac || is_linux || is_chromeos_ash) { + public_deps += [ "connectors_internals:resources" ] diff --git a/patches/core/ungoogled-chromium/disable-untraceable-urls.patch b/patches/core/ungoogled-chromium/disable-untraceable-urls.patch index f1aaaa40..a24a3e83 100644 --- a/patches/core/ungoogled-chromium/disable-untraceable-urls.patch +++ b/patches/core/ungoogled-chromium/disable-untraceable-urls.patch @@ -2,7 +2,7 @@ --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc -@@ -306,7 +306,7 @@ FinancialPing::PingResponse FinancialPin +@@ -311,7 +311,7 @@ FinancialPing::PingResponse FinancialPin response->clear(); std::string url = diff --git a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch index 9ba5e37b..c4e68a8a 100644 --- a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch +++ b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch @@ -116,7 +116,7 @@ --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -107,7 +107,7 @@ void RegisterBrowserUserPrefs(user_prefs +@@ -111,7 +111,7 @@ void RegisterBrowserUserPrefs(user_prefs registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string()); registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false); registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls); diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index 18b0aa34..7a314e60 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 -@@ -623,12 +623,6 @@ std::vector ChromeContentBr +@@ -669,12 +669,6 @@ std::vector ChromeContentBr GetOriginsRequiringDedicatedProcess() { std::vector list; diff --git a/patches/core/ungoogled-chromium/doh-changes.patch b/patches/core/ungoogled-chromium/doh-changes.patch index 1b22ae4c..15ec4205 100644 --- a/patches/core/ungoogled-chromium/doh-changes.patch +++ b/patches/core/ungoogled-chromium/doh-changes.patch @@ -55,7 +55,7 @@ DohProviderIij, base::FEATURE_ENABLED_BY_DEFAULT), --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -119,12 +119,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso +@@ -126,12 +126,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode. BASE_FEATURE(kDnsOverHttpsUpgrade, "DnsOverHttpsUpgrade", diff --git a/patches/core/ungoogled-chromium/extensions-manifestv2.patch b/patches/core/ungoogled-chromium/extensions-manifestv2.patch index 2e4d4d59..d0797d1f 100644 --- a/patches/core/ungoogled-chromium/extensions-manifestv2.patch +++ b/patches/core/ungoogled-chromium/extensions-manifestv2.patch @@ -79,10 +79,16 @@ bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy( --- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc +++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc -@@ -76,11 +76,6 @@ KeyedService* ManifestV2ExperimentManage - } +@@ -139,17 +139,6 @@ bool ManifestV2ExperimentManagerFactory: + // Determines the current stage of the MV2 deprecation experiments. MV2ExperimentStage CalculateCurrentExperimentStage() { +- // Return the "highest" stage that is currently active for the user. +- if (base::FeatureList::IsEnabled( +- extensions_features::kExtensionManifestV2Disabled)) { +- return MV2ExperimentStage::kDisableWithReEnable; +- } +- - if (base::FeatureList::IsEnabled( - extensions_features::kExtensionManifestV2DeprecationWarning)) { - return MV2ExperimentStage::kWarning; @@ -91,3 +97,17 @@ return MV2ExperimentStage::kNone; } +--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc ++++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc +@@ -468,9 +468,9 @@ content::WebUIDataSource* CreateAndAddEx + extensions_features::kExtensionsMenuAccessControlWithPermittedSites)); + source->AddBoolean( + "safetyCheckShowReviewPanel", +- base::FeatureList::IsEnabled(features::kSafetyCheckExtensions)); ++ false); + source->AddBoolean("safetyHubShowReviewPanel", +- base::FeatureList::IsEnabled(features::kSafetyHub)); ++ false); + + // MV2 deprecation. + auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile); 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 befa7435..57d57f3e 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -3,7 +3,15 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -940,8 +940,6 @@ if (is_win) { +@@ -383,7 +383,6 @@ if (!is_android && !is_mac) { + + data_deps += [ + "//chrome/browser/resources/media/mei_preload:component", +- "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component", + "//third_party/widevine/cdm", + ] + if (invoker.collect_inputs_only) { +@@ -949,8 +948,6 @@ if (is_win) { bundle_data("chrome_framework_resources") { sources = [ @@ -47,7 +55,7 @@ #include "chrome/browser/preloading/preloading_prefs.h" #include "chrome/browser/profiles/profile.h" #include "components/no_state_prefetch/browser/no_state_prefetch_manager.h" -@@ -94,11 +92,6 @@ base::TimeDelta MLModelExecutionTimerSta +@@ -107,11 +105,6 @@ base::TimeDelta MLModelExecutionTimerSta return base::Milliseconds(timer_start_delay); } @@ -59,7 +67,7 @@ bool MLModelOneExecutionPerHover() { static bool one_execution_per_hover = -@@ -369,80 +362,6 @@ void NavigationPredictor::ProcessPointer +@@ -421,87 +414,6 @@ void NavigationPredictor::ProcessPointer } void NavigationPredictor::OnMLModelExecutionTimerFired() { @@ -117,6 +125,14 @@ - if (model_score_callback_) { - std::move(model_score_callback_).Run(inputs); - } +- +- content::PreloadingData* preloading_data = +- content::PreloadingData::GetOrCreateForWebContents( +- content::WebContents::FromRenderFrameHost(&render_frame_host())); +- preloading_data->OnPreloadingHeuristicsModelInput( +- anchor.target_url, +- base::BindOnce(&RecordMetricsForModelTraining, inputs, +- render_frame_host().GetPageUkmSourceId())); - model_service->Score( - &scoring_model_task_tracker_, inputs, - base::BindOnce(&NavigationPredictor::OnPreloadingHeuristicsModelDone, @@ -127,10 +143,9 @@ - // repeated executions wasteful. So we only do one execution per mouse over. - // As we iterate on the model, multiple executions may become useful, but we - // need to take care to not produce a large amount of redundant predictions -- // (as seen in crbug.com/338200075 ). Other ideas here could be to only report -- // when the score differs from the previous execution and/or to have a fixed -- // limit on the number of executions while dwelling. +- // (as seen in crbug.com/338200075 ). - if (!MLModelOneExecutionPerHover() && +- inputs.hover_dwell_time < MLModelMaxHoverTime() && - !ml_model_execution_timer_.IsRunning()) { - ml_model_execution_timer_.Start( - FROM_HERE, MLModelExecutionTimerInterval(), @@ -142,15 +157,15 @@ void NavigationPredictor::SetModelScoreCallbackForTesting( --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -92,7 +92,6 @@ +@@ -98,7 +98,6 @@ #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h" - #include "chrome/browser/metrics/variations/google_groups_updater_service_factory.h" + #include "chrome/browser/metrics/variations/google_groups_manager_factory.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" -#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h" #include "chrome/browser/net/dns_probe_service_factory.h" #include "chrome/browser/net/profile_network_context_service_factory.h" #include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h" -@@ -958,7 +957,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -975,7 +974,6 @@ void ChromeBrowserMainExtraPartsProfiles #endif ModelTypeStoreServiceFactory::GetInstance(); NavigationPredictorKeyedServiceFactory::GetInstance(); @@ -158,7 +173,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) NearbySharingServiceFactory::GetInstance(); if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) { -@@ -1007,9 +1005,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1024,9 +1022,6 @@ void ChromeBrowserMainExtraPartsProfiles OneTimePermissionsTrackerFactory::GetInstance(); #endif OpenerHeuristicServiceFactory::GetInstance(); @@ -170,7 +185,7 @@ OriginTrialsFactory::GetInstance(); --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -48,7 +48,6 @@ +@@ -49,7 +49,6 @@ #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" @@ -178,7 +193,7 @@ #include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/delete_profile_helper.h" -@@ -1539,9 +1538,6 @@ void ProfileManager::DoFinalInitForServi +@@ -1542,9 +1541,6 @@ void ProfileManager::DoFinalInitForServi // Ensure NavigationPredictorKeyedService is started. NavigationPredictorKeyedServiceFactory::GetForProfile(profile); @@ -188,48 +203,51 @@ IdentityManagerFactory::GetForProfile(profile)->OnNetworkInitialized(); AccountReconcilorFactory::GetForProfile(profile); #if BUILDFLAG(IS_ANDROID) +--- a/chrome/browser/resources/BUILD.gn ++++ b/chrome/browser/resources/BUILD.gn +@@ -99,7 +99,6 @@ group("resources") { + if (is_mac) { + public_deps += [ + "//chrome/browser/resources/media/mei_preload:component", +- "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component", + ] + } + --- a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc +++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc -@@ -39,13 +39,6 @@ void AccessibilityMainHandler::RegisterM +@@ -36,11 +36,6 @@ void AccessibilityMainHandler::RegisterM base::BindRepeating( &AccessibilityMainHandler::HandleCheckAccessibilityImageLabels, base::Unretained(this))); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - web_ui()->RegisterMessageCallback( - "getScreenAiInstallState", - base::BindRepeating( - &AccessibilityMainHandler::HandleGetScreenAIInstallState, - base::Unretained(this))); --#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) } void AccessibilityMainHandler::OnJavascriptAllowed() { -@@ -56,13 +49,6 @@ void AccessibilityMainHandler::OnJavascr +@@ -51,11 +46,6 @@ void AccessibilityMainHandler::OnJavascr base::Unretained(this))); #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -- if (features::IsPdfOcrEnabled() || features::IsMainNodeAnnotationsEnabled()) { +- if (features::IsMainNodeAnnotationsEnabled()) { - CHECK(!component_ready_observer_.IsObserving()); - component_ready_observer_.Observe( - screen_ai::ScreenAIInstallState::GetInstance()); - } --#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) } void AccessibilityMainHandler::OnJavascriptDisallowed() { -@@ -70,40 +56,7 @@ void AccessibilityMainHandler::OnJavascr +@@ -63,35 +53,6 @@ void AccessibilityMainHandler::OnJavascr accessibility_subscription_ = {}; #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -- if (features::IsPdfOcrEnabled() || features::IsMainNodeAnnotationsEnabled()) { +- if (features::IsMainNodeAnnotationsEnabled()) { - component_ready_observer_.Reset(); - } --#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -} - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -void AccessibilityMainHandler::DownloadProgressChanged(double progress) { - CHECK_GE(progress, 0.0); - CHECK_LE(progress, 1.0); @@ -255,97 +273,72 @@ - ResolveJavascriptCallback( - callback_id, base::Value(static_cast(current_install_state))); } --#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) void AccessibilityMainHandler::HandleGetScreenReaderState( - const base::Value::List& args) { --- a/chrome/browser/ui/webui/settings/accessibility_main_handler.h +++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.h -@@ -13,10 +13,6 @@ - #include "chrome/browser/ash/accessibility/accessibility_manager.h" - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) --#include "base/scoped_observation.h" --#include "chrome/browser/screen_ai/screen_ai_install_state.h" --#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - - namespace settings { - -@@ -24,10 +20,6 @@ namespace settings { +@@ -21,8 +21,7 @@ namespace settings { + // Settings handler for the main accessibility settings page, // chrome://settings/accessibility. class AccessibilityMainHandler - : public ::settings::SettingsPageUIHandler --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -- , -- public screen_ai::ScreenAIInstallState::Observer --#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - { +- : public ::settings::SettingsPageUIHandler, +- public screen_ai::ScreenAIInstallState::Observer { ++ : public ::settings::SettingsPageUIHandler { public: AccessibilityMainHandler(); -@@ -40,11 +32,6 @@ class AccessibilityMainHandler + ~AccessibilityMainHandler() override; +@@ -34,9 +33,6 @@ class AccessibilityMainHandler void OnJavascriptAllowed() override; void OnJavascriptDisallowed() override; --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - // screen_ai::ScreenAIInstallState::Observer: - void DownloadProgressChanged(double progress) override; - void StateChanged(screen_ai::ScreenAIInstallState::State state) override; --#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) private: void HandleGetScreenReaderState(const base::Value::List& args); -@@ -63,11 +50,6 @@ class AccessibilityMainHandler +@@ -53,9 +49,6 @@ class AccessibilityMainHandler base::CallbackListSubscription accessibility_subscription_; #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - base::ScopedObservation - component_ready_observer_{this}; --#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) }; } // namespace settings ---- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -285,7 +285,6 @@ void AddA11yStrings(content::WebUIDataSo - IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, - {"overscrollHistoryNavigationSubtitle", - IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_SUBTITLE}, --#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) - {"mainNodeAnnotationsDownloadCompleteLabel", - IDS_SETTINGS_MAIN_NODE_ANNOTATIONS_DOWNLOAD_COMPLETE}, - {"mainNodeAnnotationsDownloadErrorLabel", -@@ -297,13 +296,11 @@ void AddA11yStrings(content::WebUIDataSo - {"mainNodeAnnotationsTitle", IDS_SETTINGS_MAIN_NODE_ANNOTATIONS_TITLE}, - {"mainNodeAnnotationsSubtitle", - IDS_SETTINGS_MAIN_NODE_ANNOTATIONS_SUBTITLE}, --#endif // BULDFLAG(ENABLE_SCREEN_AI_SERVICE) - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - }; - html_source->AddLocalizedStrings(kLocalizedStrings); +--- a/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc ++++ b/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc +@@ -61,7 +61,6 @@ std::u16string GetHelpUrlWithBoard(const + #endif --#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)) && \ -- BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + void AddAxAnnotationsSectionStrings(content::WebUIDataSource* html_source) { +-#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) + static constexpr webui::LocalizedString kLocalizedStrings[] = { + {"mainNodeAnnotationsDownloadErrorLabel", + IDS_SETTINGS_MAIN_NODE_ANNOTATIONS_DOWNLOAD_ERROR}, +@@ -77,7 +76,6 @@ void AddAxAnnotationsSectionStrings(cont html_source->AddBoolean( "mainNodeAnnotationsEnabled", base::FeatureList::IsEnabled(features::kMainNodeAnnotations)); +-#endif // BULDFLAG(ENABLE_SCREEN_AI_SERVICE) + } + + void AddCaptionSubpageStrings(content::WebUIDataSource* html_source) { --- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc +++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc -@@ -17,8 +17,6 @@ - #include "chrome/browser/accessibility/pdf_ocr_controller_factory.h" +@@ -18,8 +18,6 @@ #include "chrome/browser/browser_features.h" + #include "chrome/browser/language/language_model_manager_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/screen_ai/screen_ai_service_router.h" -#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -301,21 +299,6 @@ ReadAnythingUntrustedPageHandler::ReadAn - highlightGranularity); - } +@@ -307,21 +305,6 @@ ReadAnythingUntrustedPageHandler::ReadAn + prefs_lang = language::ExtractBaseLanguage(prefs_lang); + SetDefaultLanguageCode(prefs_lang); - if (features::IsReadAnythingWithScreen2xEnabled()) { - screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext( @@ -365,7 +358,7 @@ OnActiveWebContentsChanged(); -@@ -728,10 +711,6 @@ void ReadAnythingUntrustedPageHandler::S +@@ -702,10 +685,6 @@ void ReadAnythingUntrustedPageHandler::S inner_contents[0]->GetPrimaryMainFrame()->GetLastCommittedOrigin())) { pdf_observer_ = std::make_unique( weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode); @@ -378,17 +371,33 @@ --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -424,10 +424,6 @@ static_library("renderer") { +@@ -405,18 +405,6 @@ static_library("renderer") { + deps += [ "//chrome/common/wallet:mojo_bindings" ] + } else { sources += [ - "accessibility/ax_tree_distiller.cc", - "accessibility/ax_tree_distiller.h", +- "accessibility/ax_tree_distiller.cc", +- "accessibility/ax_tree_distiller.h", +- "accessibility/read_aloud_app_model.cc", +- "accessibility/read_aloud_app_model.h", +- "accessibility/read_aloud_traversal_utils.cc", +- "accessibility/read_aloud_traversal_utils.h", - "accessibility/read_anything_app_controller.cc", - "accessibility/read_anything_app_controller.h", - "accessibility/read_anything_app_model.cc", - "accessibility/read_anything_app_model.h", +- "accessibility/read_anything_node_utils.cc", +- "accessibility/read_anything_node_utils.h", "media/chrome_speech_recognition_client.cc", "media/chrome_speech_recognition_client.h", "searchbox/searchbox.cc", +@@ -430,7 +418,6 @@ static_library("renderer") { + "//components/crx_file", + "//components/trusted_vault", + "//services/screen_ai/buildflags", +- "//services/screen_ai/public/mojom", + "//services/strings", + "//third_party/re2:re2", + ] --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc @@ -320,21 +320,6 @@ void ChromeRenderFrameObserver::DidCommi @@ -415,7 +424,7 @@ void ChromeRenderFrameObserver::DidMeaningfulLayout( --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn -@@ -403,7 +403,7 @@ source_set("lib") { +@@ -405,7 +405,7 @@ source_set("lib") { } } @@ -436,7 +445,7 @@ python_library("fixtures") { --- a/components/omnibox/browser/autocomplete_classifier.cc +++ b/components/omnibox/browser/autocomplete_classifier.cc -@@ -96,8 +96,6 @@ void AutocompleteClassifier::Classify( +@@ -102,8 +102,6 @@ void AutocompleteClassifier::Classify( metrics::OmniboxEventProto::PageClassification page_classification, AutocompleteMatch* match, GURL* alternate_nav_url) { @@ -445,9 +454,29 @@ DCHECK(!inside_classify_); base::AutoReset reset(&inside_classify_, true); AutocompleteInput input(text, page_classification, *scheme_classifier_); +--- a/components/pdf/renderer/BUILD.gn ++++ b/components/pdf/renderer/BUILD.gn +@@ -44,7 +44,6 @@ static_library("renderer") { + "//pdf:pdf_view_web_plugin", + "//printing/buildflags", + "//services/screen_ai/buildflags", +- "//services/screen_ai/public/cpp:metrics", + "//skia", + "//third_party/blink/public:blink", + "//third_party/icu", +--- a/components/pdf/renderer/pdf_accessibility_tree_builder.cc ++++ b/components/pdf/renderer/pdf_accessibility_tree_builder.cc +@@ -9,7 +9,6 @@ + + #include "base/i18n/break_iterator.h" + #include "base/strings/utf_string_conversion_utils.h" +-#include "components/pdf/renderer/pdf_ocr_helper.h" + #include "components/strings/grit/components_strings.h" + #include "pdf/accessibility_structs.h" + #include "pdf/pdf_features.h" --- a/components/update_client/BUILD.gn +++ b/components/update_client/BUILD.gn -@@ -312,8 +312,6 @@ source_set("unit_tests") { +@@ -315,8 +315,6 @@ source_set("unit_tests") { "//third_party/puffin:libpuffpatch", "//third_party/re2", ] @@ -458,7 +487,7 @@ fuzzer_test("update_client_protocol_serializer_fuzzer") { --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -807,10 +807,6 @@ if (is_apple) { +@@ -806,10 +806,6 @@ if (is_apple) { deps = [ "//third_party/icu:icudata" ] } @@ -521,14 +550,38 @@ group("devtools_all_files") { --- a/third_party/devtools-frontend/src/front_end/BUILD.gn +++ b/third_party/devtools-frontend/src/front_end/BUILD.gn -@@ -184,7 +184,6 @@ group("unittests") { - "panels/sources/components:unittests", +@@ -190,7 +190,6 @@ group("unittests") { "panels/timeline:unittests", "panels/timeline/components:unittests", + "panels/timeline/components/insights:unittests", - "panels/timeline/fixtures/traces", + "panels/timeline/overlays:unittests", "panels/timeline/track_appenders:unittests", "panels/utils:unittests", - "panels/web_audio:unittests", +--- a/third_party/devtools-frontend/src/front_end/models/trace/lantern/core/BUILD.gn ++++ b/third_party/devtools-frontend/src/front_end/models/trace/lantern/core/BUILD.gn +@@ -38,5 +38,4 @@ ts_library("unittests") { + "../testing:bundle", + ] + +- public_deps = [ "../../../../panels/timeline/fixtures/traces" ] + } +--- a/third_party/devtools-frontend/src/front_end/models/trace/lantern/metrics/BUILD.gn ++++ b/third_party/devtools-frontend/src/front_end/models/trace/lantern/metrics/BUILD.gn +@@ -54,5 +54,4 @@ ts_library("unittests") { + "../testing:bundle", + ] + +- public_deps = [ "../../../../panels/timeline/fixtures/traces" ] + } +--- a/third_party/devtools-frontend/src/front_end/models/trace/lantern/simulation/BUILD.gn ++++ b/third_party/devtools-frontend/src/front_end/models/trace/lantern/simulation/BUILD.gn +@@ -51,5 +51,4 @@ ts_library("unittests") { + "../testing:bundle", + ] + +- public_deps = [ "../../../../panels/timeline/fixtures/traces" ] + } --- a/third_party/puffin/BUILD.gn +++ b/third_party/puffin/BUILD.gn @@ -115,7 +115,6 @@ executable("puffin_unittest") { diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index d1aa8201..910b1e22 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -630,8 +630,6 @@ static_library("browser") { +@@ -626,8 +626,6 @@ static_library("browser") { "internal_auth.h", "interstitials/chrome_settings_page_helper.cc", "interstitials/chrome_settings_page_helper.h", @@ -11,16 +11,27 @@ "invalidation/profile_invalidation_provider_factory.cc", "invalidation/profile_invalidation_provider_factory.h", "k_anonymity_service/k_anonymity_service_client.cc", -@@ -3882,8 +3880,6 @@ static_library("browser") { +@@ -4118,10 +4116,6 @@ static_library("browser") { + "new_tab_page/modules/modules_util.h", + "new_tab_page/modules/new_tab_page_modules.cc", + "new_tab_page/modules/new_tab_page_modules.h", +- "new_tab_page/modules/safe_browsing/safe_browsing_handler.cc", +- "new_tab_page/modules/safe_browsing/safe_browsing_handler.h", +- "new_tab_page/modules/safe_browsing/safe_browsing_prefs.cc", +- "new_tab_page/modules/safe_browsing/safe_browsing_prefs.h", + "new_tab_page/modules/v2/calendar/google_calendar_page_handler.cc", + "new_tab_page/modules/v2/calendar/google_calendar_page_handler.h", + "new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler.cc", +@@ -6834,8 +6828,6 @@ static_library("browser") { + sources += [ + "enterprise/connectors/analysis/analysis_service_settings.cc", "enterprise/connectors/analysis/analysis_service_settings.h", - "enterprise/connectors/analysis/analysis_settings.cc", - "enterprise/connectors/analysis/analysis_settings.h", - "enterprise/connectors/analysis/content_analysis_delegate.cc", - "enterprise/connectors/analysis/content_analysis_delegate.h", "enterprise/connectors/analysis/content_analysis_delegate_base.h", "enterprise/connectors/analysis/content_analysis_dialog.cc", "enterprise/connectors/analysis/content_analysis_dialog.h", -@@ -3891,8 +3887,6 @@ static_library("browser") { +@@ -6843,8 +6835,6 @@ static_library("browser") { "enterprise/connectors/analysis/content_analysis_downloads_delegate.h", "enterprise/connectors/analysis/files_request_handler.cc", "enterprise/connectors/analysis/files_request_handler.h", @@ -29,26 +40,7 @@ "enterprise/connectors/analysis/request_handler_base.cc", "enterprise/connectors/analysis/request_handler_base.h", "enterprise/connectors/common.cc", -@@ -4188,10 +4182,6 @@ static_library("browser") { - "new_tab_page/modules/recipes/recipes_service_factory.h", - "new_tab_page/modules/recipes/time_format_util.cc", - "new_tab_page/modules/recipes/time_format_util.h", -- "new_tab_page/modules/safe_browsing/safe_browsing_handler.cc", -- "new_tab_page/modules/safe_browsing/safe_browsing_handler.h", -- "new_tab_page/modules/safe_browsing/safe_browsing_prefs.cc", -- "new_tab_page/modules/safe_browsing/safe_browsing_prefs.h", - "new_tab_page/modules/v2/calendar/google_calendar_page_handler.cc", - "new_tab_page/modules/v2/calendar/google_calendar_page_handler.h", - "new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.cc", -@@ -4630,7 +4620,6 @@ static_library("browser") { - "//chrome/browser/new_tab_page/modules/history_clusters/discount:mojo_bindings", - "//chrome/browser/new_tab_page/modules/photos:mojo_bindings", - "//chrome/browser/new_tab_page/modules/recipes:mojo_bindings", -- "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings", - "//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings", - "//chrome/browser/new_tab_page/modules/v2/history_clusters:mojo_bindings", - "//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings", -@@ -7193,13 +7182,6 @@ static_library("browser") { +@@ -7534,13 +7524,6 @@ static_library("browser") { } } @@ -62,7 +54,7 @@ if (enable_captive_portal_detection) { sources += [ -@@ -8055,9 +8037,14 @@ static_library("browser") { +@@ -8393,9 +8376,14 @@ static_library("browser") { "//components/safe_browsing/content/browser:safe_browsing_blocking_page", "//components/safe_browsing/content/browser/download:download_stats", "//components/safe_browsing/content/common:file_type_policies", @@ -78,9 +70,17 @@ if (build_with_tflite_lib) { sources += [ +@@ -8673,7 +8661,6 @@ static_library("browser_generated_files" + "//chrome/browser/new_tab_page/modules/history_clusters:mojo_bindings", + "//chrome/browser/new_tab_page/modules/history_clusters/cart:mojo_bindings", + "//chrome/browser/new_tab_page/modules/history_clusters/discount:mojo_bindings", +- "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings", + "//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings", + "//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings", + "//chrome/browser/new_tab_page/modules/v2/tab_resumption:mojo_bindings", --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5281,11 +5281,13 @@ ChromeContentBrowserClient::CreateThrott +@@ -5494,11 +5494,13 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -94,7 +94,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: -@@ -7112,26 +7114,7 @@ ChromeContentBrowserClient::GetSafeBrows +@@ -7262,26 +7264,7 @@ ChromeContentBrowserClient::GetSafeBrows const std::vector& allowlist_domains) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -122,7 +122,7 @@ } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -7152,11 +7135,6 @@ ChromeContentBrowserClient::GetUrlLookup +@@ -7302,11 +7285,6 @@ ChromeContentBrowserClient::GetUrlLookup GetForProfile(profile); } #endif @@ -134,7 +134,7 @@ return nullptr; } -@@ -7168,32 +7146,7 @@ ChromeContentBrowserClient::GetAsyncChec +@@ -7318,32 +7296,7 @@ ChromeContentBrowserClient::GetAsyncChec safe_browsing::hash_realtime_utils::HashRealTimeSelection hash_realtime_selection, int frame_tree_node_id) { @@ -185,7 +185,7 @@ #include "content/public/browser/download_item_utils.h" #include "content/public/browser/download_manager.h" -@@ -272,14 +270,6 @@ void DownloadBubbleUIController::Process +@@ -267,14 +265,6 @@ void DownloadBubbleUIController::Process switch (command) { case DownloadCommands::KEEP: case DownloadCommands::DISCARD: { @@ -200,7 +200,7 @@ DownloadItemWarningData::AddWarningActionEvent(item, warning_surface, warning_action); // Launch a HaTS survey. Note this needs to come before the command is -@@ -298,8 +288,6 @@ void DownloadBubbleUIController::Process +@@ -293,8 +283,6 @@ void DownloadBubbleUIController::Process break; } case DownloadCommands::REVIEW: @@ -209,7 +209,7 @@ break; case DownloadCommands::RETRY: RetryDownload(model.get(), command); -@@ -444,6 +432,4 @@ DownloadBubbleUIController::GetWeakPtr() +@@ -439,6 +427,4 @@ DownloadBubbleUIController::GetWeakPtr() } void DownloadBubbleUIController::SetDeepScanNoticeSeen() { @@ -218,7 +218,7 @@ } --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -155,7 +155,6 @@ using content::DownloadManager; +@@ -162,7 +162,6 @@ using content::DownloadManager; using download::DownloadItem; using download::DownloadPathReservationTracker; using download::PathValidationResult; @@ -226,7 +226,7 @@ using ConnectionType = net::NetworkChangeNotifier::ConnectionType; #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -674,15 +673,6 @@ bool ChromeDownloadManagerDelegate::Shou +@@ -686,15 +685,6 @@ bool ChromeDownloadManagerDelegate::Shou #endif bool should_open = download_prefs_->IsAutoOpenEnabled(url, path); @@ -242,7 +242,7 @@ return should_open; } -@@ -1662,7 +1652,6 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -1686,7 +1676,6 @@ void ChromeDownloadManagerDelegate::OnDo DownloadItemModel model(item); model.DetermineAndSetShouldPreferOpeningInBrowser( target_info.target_path, target_info.is_filetype_handled_safely); @@ -250,7 +250,7 @@ } if (ShouldBlockFile(item, target_info.danger_type)) { MaybeReportDangerousDownloadBlocked( -@@ -1743,53 +1732,6 @@ bool ChromeDownloadManagerDelegate::IsOp +@@ -1767,53 +1756,6 @@ bool ChromeDownloadManagerDelegate::IsOp bool ChromeDownloadManagerDelegate::ShouldBlockFile( download::DownloadItem* item, download::DownloadDangerType danger_type) const { @@ -304,7 +304,7 @@ return false; } -@@ -1804,7 +1746,6 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1828,7 +1770,6 @@ void ChromeDownloadManagerDelegate::Mayb service->MaybeSendDangerousDownloadOpenedReport(download, show_download_in_folder); } @@ -312,7 +312,7 @@ if (!download->GetAutoOpened()) { download::DownloadContent download_content = download::DownloadContentFromMimeType(download->GetMimeType(), false); -@@ -1812,6 +1753,7 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1836,6 +1777,7 @@ void ChromeDownloadManagerDelegate::Mayb download->GetDangerType(), download_content, base::Time::Now(), download->GetEndTime(), show_download_in_folder); } @@ -320,7 +320,7 @@ } void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadCanceledReport( -@@ -1920,8 +1862,7 @@ void ChromeDownloadManagerDelegate::Chec +@@ -1960,8 +1902,7 @@ void ChromeDownloadManagerDelegate::Chec DCHECK(download_item); DCHECK(download_item->IsSavePackageDownload()); @@ -332,7 +332,7 @@ --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -970,30 +970,6 @@ void DownloadItemModel::ExecuteCommand(D +@@ -985,30 +985,6 @@ void DownloadItemModel::ExecuteCommand(D } TailoredWarningType DownloadItemModel::GetTailoredWarningType() const { @@ -385,7 +385,7 @@ } --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1003,12 +1003,6 @@ void DownloadTargetDeterminer::CheckVisi +@@ -1070,12 +1070,6 @@ void DownloadTargetDeterminer::CheckVisi bool visited_referrer_before) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); @@ -398,7 +398,7 @@ danger_level_ = GetDangerLevel( visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER); if (danger_level_ != DownloadFileType::NOT_DANGEROUS && -@@ -1289,14 +1283,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1360,14 +1354,7 @@ DownloadFileType::DangerLevel DownloadTa std::optional DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { @@ -585,7 +585,7 @@ analysis_config_->supported_tags[0].max_file_size; --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc -@@ -37,8 +37,6 @@ +@@ -36,8 +36,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" @@ -610,17 +610,6 @@ request->FinishRequest(result, enterprise_connectors::ContentAnalysisResponse()); } ---- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h -+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h -@@ -94,7 +94,7 @@ class ContentAnalysisDelegate : public C - Data(); - Data(Data&& other); - Data& operator=(Data&& other); -- ~Data(); -+ ~Data() = default; - - // Helper function to populate `text` and `image` with the data in a - // `content::ClipboardPasteData` object. --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc @@ -123,7 +123,7 @@ ContentAnalysisDownloadsDelegate::GetCus @@ -634,7 +623,7 @@ std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel() --- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc +++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc -@@ -174,52 +174,12 @@ void FilesRequestHandler::FileRequestCal +@@ -175,52 +175,12 @@ void FilesRequestHandler::FileRequestCal } bool FilesRequestHandler::UploadDataImpl() { @@ -687,7 +676,7 @@ void FilesRequestHandler::OnGotFileInfo( std::unique_ptr request, size_t index, -@@ -268,15 +228,6 @@ void FilesRequestHandler::OnGotFileInfo( +@@ -269,15 +229,6 @@ void FilesRequestHandler::OnGotFileInfo( void FilesRequestHandler::FinishRequestEarly( std::unique_ptr request, safe_browsing::BinaryUploadService::Result result) { @@ -718,7 +707,7 @@ void OnGotFileInfo( --- a/chrome/browser/enterprise/connectors/common.cc +++ b/chrome/browser/enterprise/connectors/common.cc -@@ -574,7 +574,7 @@ void ShowDownloadReviewDialog(const std: +@@ -269,7 +269,7 @@ void ShowDownloadReviewDialog(const std: bool IsResumableUpload(const BinaryUploadService::Request& request) { // Currently resumable upload doesn't support paste or LBUS. If one day we do, // we should update the logic here as well. @@ -729,7 +718,7 @@ enterprise_connectors::AnalysisConnector::BULK_DATA_ENTRY && --- a/chrome/browser/enterprise/connectors/connectors_manager.cc +++ b/chrome/browser/enterprise/connectors/connectors_manager.cc -@@ -398,13 +398,7 @@ std::vector Conne +@@ -431,13 +431,7 @@ std::vector Conne } safe_browsing::DataRegion ConnectorsManager::GetDataRegion() const { @@ -746,7 +735,7 @@ void ConnectorsManager::StartObservingPrefs(PrefService* pref_service) { --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -456,37 +456,8 @@ std::optional ConnectorsSer +@@ -453,37 +453,8 @@ std::optional ConnectorsSer return std::nullopt; } @@ -866,28 +855,9 @@ } std::string RealtimeReportingClient::GetProfileIdentifier() const { ---- a/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc -+++ b/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc -@@ -73,16 +73,6 @@ ReportingServiceSettings::ReportingServi - else - DVLOG(1) << "Enabled event name list contains a non string value!"; - } -- } else { -- // When the list of enabled event names is not set, we assume all events are -- // enabled. This is to support the feature of selecting the "All always on" -- // option in the policy UI, which means to always enable all events, even -- // when new events may be added in the future. And this is also to support -- // existing customer policies that were created before we introduced the -- // concept of enabling/disabling events. -- for (const char* event : kAllReportingEvents) { -- enabled_event_names_.insert(event); -- } - } - - const base::Value::List* enabled_opt_in_events_value = --- a/chrome/browser/enterprise/data_controls/reporting_service.cc +++ b/chrome/browser/enterprise/data_controls/reporting_service.cc -@@ -122,10 +122,6 @@ void ReportingService::ReportPaste( +@@ -124,10 +124,6 @@ void ReportingService::ReportPaste( const content::ClipboardEndpoint& destination, const content::ClipboardMetadata& metadata, const Verdict& verdict) { @@ -898,7 +868,7 @@ } void ReportingService::ReportPasteWarningBypassed( -@@ -133,29 +129,17 @@ void ReportingService::ReportPasteWarnin +@@ -135,29 +131,17 @@ void ReportingService::ReportPasteWarnin const content::ClipboardEndpoint& destination, const content::ClipboardMetadata& metadata, const Verdict& verdict) { @@ -928,7 +898,7 @@ } void ReportingService::ReportCopyOrPaste( -@@ -165,45 +149,6 @@ void ReportingService::ReportCopyOrPaste +@@ -167,45 +151,6 @@ void ReportingService::ReportCopyOrPaste const Verdict& verdict, const std::string& trigger, safe_browsing::EventResult event_result) { @@ -974,7 +944,7 @@ } // -------------------------------------- -@@ -234,7 +179,6 @@ ReportingServiceFactory::ReportingServic +@@ -235,7 +180,6 @@ ReportingServiceFactory::ReportingServic .WithSystem(ProfileSelection::kNone) .WithAshInternals(ProfileSelection::kNone) .Build()) { @@ -984,7 +954,7 @@ ReportingServiceFactory::~ReportingServiceFactory() = default; --- a/chrome/browser/enterprise/data_protection/data_protection_clipboard_utils.cc +++ b/chrome/browser/enterprise/data_protection/data_protection_clipboard_utils.cc -@@ -94,77 +94,6 @@ class ClipboardObserver : public ui::Cli +@@ -95,77 +95,6 @@ class ClipboardObserver : public ui::Cli content::ClipboardPasteData pending_seqno_data_; }; @@ -1062,13 +1032,13 @@ bool SkipDataControlOrContentAnalysisChecks( const content::ClipboardEndpoint& main_endpoint) { -@@ -196,41 +125,7 @@ void PasteIfAllowedByContentAnalysis( - DCHECK(web_contents); - DCHECK(!SkipDataControlOrContentAnalysisChecks(destination)); +@@ -206,41 +135,7 @@ void PasteIfAllowedByContentAnalysis( + return; + } - Profile* profile = Profile::FromBrowserContext(destination.browser_context()); - if (!profile) { -- std::move(callback).Run(std::move(clipboard_paste_data)); + std::move(callback).Run(std::move(clipboard_paste_data)); - return; - } - @@ -1082,7 +1052,7 @@ - if (!enterprise_connectors::ContentAnalysisDelegate::IsEnabled( - profile, *destination.data_transfer_endpoint()->GetURL(), - &dialog_data, connector)) { - std::move(callback).Run(std::move(clipboard_paste_data)); +- std::move(callback).Run(std::move(clipboard_paste_data)); - return; - } - @@ -1123,8 +1093,8 @@ bool IsScreenshotAllowedByDataControls(content::BrowserContext* context, const GURL& url) { -- auto* rules = -- data_controls::ChromeRulesServiceFactory::GetForBrowserContext(context); +- auto* rules = data_controls::ChromeRulesServiceFactory::GetInstance() +- ->GetForBrowserContext(context); - return rules ? !rules->BlockScreenshots(url) : true; + return true; } @@ -1291,7 +1261,7 @@ } // namespace utils --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -317,10 +317,6 @@ source_set("extensions") { +@@ -315,10 +315,6 @@ source_set("extensions") { "api/runtime/chrome_runtime_api_delegate.h", "api/safe_browsing_private/safe_browsing_private_api.cc", "api/safe_browsing_private/safe_browsing_private_api.h", @@ -1302,7 +1272,7 @@ "api/safe_browsing_private/safe_browsing_util.cc", "api/safe_browsing_private/safe_browsing_util.h", "api/search/search_api.cc", -@@ -668,8 +664,6 @@ source_set("extensions") { +@@ -665,8 +661,6 @@ source_set("extensions") { "mv2_experiment_stage.h", "navigation_extension_enabler.cc", "navigation_extension_enabler.h", @@ -1389,7 +1359,7 @@ info.enterprise_profile_id = signals.enterprise_profile_id; --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -343,8 +343,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -347,8 +347,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; (*s_allowlist)[::kGeneratedHttpsFirstModePref] = settings_api::PrefType::kNumber; @@ -1456,7 +1426,7 @@ void Blocklist::GetMalwareIDs(const std::set& ids, --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc -@@ -797,44 +797,17 @@ void ChromeExtensionsBrowserClient::Noti +@@ -807,44 +807,17 @@ void ChromeExtensionsBrowserClient::Noti content::BrowserContext* context, const ExtensionId& extension_id, const std::string& code) const { @@ -1502,7 +1472,7 @@ } void ChromeExtensionsBrowserClient:: -@@ -843,59 +816,12 @@ void ChromeExtensionsBrowserClient:: +@@ -853,59 +826,12 @@ void ChromeExtensionsBrowserClient:: const ExtensionId& extension_id, const GURL& request_url, const GURL& redirect_url) const { @@ -1562,7 +1532,7 @@ } // static -@@ -1064,7 +990,6 @@ void ChromeExtensionsBrowserClient::GetW +@@ -1074,7 +1000,6 @@ void ChromeExtensionsBrowserClient::GetW void ChromeExtensionsBrowserClient::CreatePasswordReuseDetectionManager( content::WebContents* web_contents) const { @@ -1724,7 +1694,7 @@ #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/safe_browsing_verdict_handler.h" #include "chrome/browser/profiles/profile_manager_observer.h" -@@ -284,40 +283,11 @@ class ExtensionService : public Extensio +@@ -283,40 +282,11 @@ class ExtensionService : public Extensio // nothing. void EnableExtension(const std::string& extension_id); @@ -1765,7 +1735,7 @@ // Performs action based on verdicts received from the Extension Telemetry // server. Currently, these verdicts are limited to off-store extensions. void PerformActionBasedOnExtensionTelemetryServiceVerdicts( -@@ -680,8 +650,6 @@ class ExtensionService : public Extensio +@@ -676,8 +646,6 @@ class ExtensionService : public Extensio SafeBrowsingVerdictHandler safe_browsing_verdict_handler_; @@ -1858,7 +1828,7 @@ const enterprise_connectors::ContentAnalysisDelegate::Data& data, --- a/chrome/browser/file_select_helper.h +++ b/chrome/browser/file_select_helper.h -@@ -227,7 +227,7 @@ class FileSelectHelper : public base::Re +@@ -225,7 +225,7 @@ class FileSelectHelper : public base::Re void PerformContentAnalysisIfNeeded( std::vector list); @@ -1982,7 +1952,7 @@ } } // namespace -@@ -1601,7 +1511,7 @@ void ChromeFileSystemAccessPermissionCon +@@ -1602,7 +1512,7 @@ void ChromeFileSystemAccessPermissionCon std::vector entries, content::GlobalRenderFrameHostId frame_id, EntriesAllowedByEnterprisePolicyCallback callback) { @@ -1991,7 +1961,7 @@ // Get WebContents pointer in order to perform enterprise content analysis. content::WebContents* web_contents = nullptr; if (!entries.empty()) { -@@ -1709,29 +1619,6 @@ void ChromeFileSystemAccessPermissionCon +@@ -1710,29 +1620,6 @@ void ChromeFileSystemAccessPermissionCon std::move(callback)); } @@ -2036,15 +2006,15 @@ void SetLastPickedDirectory(const url::Origin& origin, --- a/chrome/browser/media/webrtc/display_media_access_handler.cc +++ b/chrome/browser/media/webrtc/display_media_access_handler.cc -@@ -24,6 +24,7 @@ - #include "chrome/browser/ui/url_identity.h" +@@ -29,6 +29,7 @@ + #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" +#include "components/safe_browsing/buildflags.h" #include "components/url_formatter/elide_url.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/desktop_media_id.h" -@@ -121,6 +122,7 @@ void DisplayMediaAccessHandler::HandleRe +@@ -136,6 +137,7 @@ void DisplayMediaAccessHandler::HandleRe return; } @@ -2052,7 +2022,7 @@ // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Show the warning -@@ -136,6 +138,7 @@ void DisplayMediaAccessHandler::HandleRe +@@ -151,6 +153,7 @@ void DisplayMediaAccessHandler::HandleRe observer->OnDesktopCaptureRequest(); return; } @@ -2086,7 +2056,7 @@ #include "chrome/browser/safe_browsing/user_interaction_observer.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/sync/sync_service_factory.h" -@@ -996,6 +995,7 @@ autofill::LanguageCode ChromePasswordMan +@@ -1008,6 +1007,7 @@ autofill::LanguageCode ChromePasswordMan return autofill::LanguageCode(); } @@ -2094,7 +2064,7 @@ safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { return safe_browsing::ChromePasswordProtectionService:: -@@ -1015,6 +1015,7 @@ void ChromePasswordManagerClient::CheckS +@@ -1027,6 +1027,7 @@ void ChromePasswordManagerClient::CheckS } } #endif // defined(ON_FOCUS_PING_ENABLED) @@ -2102,9 +2072,9 @@ #if !BUILDFLAG(IS_ANDROID) void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent( -@@ -1022,30 +1023,10 @@ void ChromePasswordManagerClient::MaybeR +@@ -1034,30 +1035,10 @@ void ChromePasswordManagerClient::MaybeR bool is_federated, - const url::Origin& federated_origin, + const url::SchemeHostPort& federated_origin, const std::u16string& login_user_name) const { - extensions::SafeBrowsingPrivateEventRouter* router = - extensions::SafeBrowsingPrivateEventRouterFactory::GetForProfile( @@ -2133,7 +2103,7 @@ } #endif -@@ -1725,6 +1706,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1744,6 +1725,7 @@ bool ChromePasswordManagerClient::IsPass is_enabled = false; } @@ -2141,7 +2111,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 -@@ -1735,6 +1717,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1754,6 +1736,7 @@ bool ChromePasswordManagerClient::IsPass observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -2169,7 +2139,7 @@ #if !BUILDFLAG(IS_ANDROID) --- a/chrome/browser/permissions/chrome_permissions_client.cc +++ b/chrome/browser/permissions/chrome_permissions_client.cc -@@ -403,16 +403,6 @@ void ChromePermissionsClient::OnPromptRe +@@ -411,16 +411,6 @@ void ChromePermissionsClient::OnPromptRe PermissionRevocationRequest::ExemptOriginFromFutureRevocations(profile, origin); } @@ -2356,7 +2326,7 @@ } --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -108,6 +108,7 @@ +@@ -109,6 +109,7 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/privacy_sandbox/tracking_protection_prefs.h" #include "components/proxy_config/proxy_policy_handler.h" @@ -2364,7 +2334,7 @@ #include "components/safe_browsing/content/common/file_type_policies_prefs.h" #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" #include "components/safe_browsing/core/common/safe_browsing_prefs.h" -@@ -2290,8 +2291,6 @@ std::unique_ptrAddHandler( std::make_unique( chrome_schema)); @@ -2373,7 +2343,7 @@ handlers->AddHandler(std::make_unique()); handlers->AddHandler( std::make_unique(key::kURLBlocklist)); -@@ -2394,20 +2393,6 @@ std::unique_ptr scanning_data = enterprise_data_protection::GetPrintAnalysisData( web_contents(), enterprise_data_protection::PrintScanningContext:: -@@ -1358,17 +1358,6 @@ void PrintViewManagerBase::ContentAnalys +@@ -1340,7 +1340,7 @@ void PrintViewManagerBase::CompleteScrip + std::move(callback_wrapper))); + } + +-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS) ++#if false + void PrintViewManagerBase::CompletePrintDocumentAfterContentAnalysis( + scoped_refptr print_data, + const gfx::Size& page_size, +@@ -1363,17 +1363,6 @@ void PrintViewManagerBase::ContentAnalys const gfx::Size& page_size, const gfx::Rect& content_area, const gfx::Point& offsets) { @@ -2450,11 +2467,22 @@ } void PrintViewManagerBase::set_analyzing_content(bool analyzing) { +--- a/chrome/browser/printing/print_view_manager_base.h ++++ b/chrome/browser/printing/print_view_manager_base.h +@@ -229,7 +229,7 @@ class PrintViewManagerBase : public Prin + mojom::ScriptedPrintParamsPtr params, + ScriptedPrintCallback callback); + +-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS) ++#if false + // Helper method bound to `content_analysis_before_printing_document_` when + // content analysis should happen right before the document is to be printed. + // This method is virtual for testing purposes. --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -805,9 +805,6 @@ void ChromeBrowserMainExtraPartsProfiles - #if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS) +@@ -817,9 +817,6 @@ void ChromeBrowserMainExtraPartsProfiles enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance(); + enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance(); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance(); @@ -2462,7 +2490,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_ANDROID) enterprise_idle::IdleServiceFactory::GetInstance(); -@@ -1126,23 +1123,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1141,23 +1138,6 @@ void ChromeBrowserMainExtraPartsProfiles #if !BUILDFLAG(IS_ANDROID) ResetReportUploaderFactory::GetInstance(); #endif @@ -2484,8 +2512,8 @@ - safe_browsing::TailoredSecurityServiceFactory::GetInstance(); - safe_browsing::VerdictCacheManagerFactory::GetInstance(); SafeSearchFactory::GetInstance(); - #if !BUILDFLAG(IS_ANDROID) - SafetyHubMenuNotificationServiceFactory::GetInstance(); + #if BUILDFLAG(IS_ANDROID) + if (base::FeatureList::IsEnabled(features::kSafetyHub)) { --- a/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc @@ -71,10 +71,6 @@ void FileOpeningJob::ProcessNextTask(bas @@ -2540,7 +2568,7 @@ } // namespace safe_browsing --- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc +++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc -@@ -68,27 +68,7 @@ RealTimeUrlLookupServiceFactory::~RealTi +@@ -71,27 +71,7 @@ RealTimeUrlLookupServiceFactory::~RealTi std::unique_ptr RealTimeUrlLookupServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { @@ -2570,7 +2598,7 @@ scoped_refptr --- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc +++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc -@@ -145,15 +145,6 @@ CreateSettingsPageHelper() { +@@ -146,15 +146,6 @@ CreateSettingsPageHelper() { CreateChromeSettingsPageHelper(); } @@ -2586,7 +2614,7 @@ } // namespace std::unique_ptr -@@ -176,10 +167,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -177,10 +168,6 @@ ChromeSecurityBlockingPageFactory::Creat Profile::FromBrowserContext(web_contents->GetBrowserContext())); state->DidDisplayErrorPage(cert_error); @@ -2597,7 +2625,7 @@ auto controller_client = std::make_unique( web_contents, ssl_info, cert_error, request_url, std::move(metrics_helper), CreateSettingsPageHelper()); -@@ -242,10 +229,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -243,10 +230,6 @@ ChromeSecurityBlockingPageFactory::Creat const GURL& request_url, const net::SSLInfo& ssl_info, const std::string& mitm_software_name) { @@ -2608,7 +2636,7 @@ auto page = std::make_unique( web_contents, cert_error, request_url, /*can_show_enhanced_protection_message=*/true, ssl_info, -@@ -265,10 +248,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -266,10 +249,6 @@ ChromeSecurityBlockingPageFactory::Creat int cert_error, const GURL& request_url, const net::SSLInfo& ssl_info) { @@ -2621,7 +2649,7 @@ /*can_show_enhanced_protection_message=*/true, ssl_info, --- a/chrome/browser/ssl/sct_reporting_service_factory.cc +++ b/chrome/browser/ssl/sct_reporting_service_factory.cc -@@ -38,15 +38,7 @@ SCTReportingServiceFactory::~SCTReportin +@@ -41,15 +41,7 @@ SCTReportingServiceFactory::~SCTReportin std::unique_ptr SCTReportingServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* profile) const { @@ -2673,7 +2701,7 @@ } // namespace --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -632,7 +632,6 @@ static_library("ui") { +@@ -622,7 +622,6 @@ static_library("ui") { "//components/renderer_context_menu", "//components/resources", "//components/safe_browsing/content/browser", @@ -2681,7 +2709,7 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser/db:database_manager", -@@ -4269,8 +4268,6 @@ static_library("ui") { +@@ -3892,8 +3891,6 @@ static_library("ui") { "startup/web_app_startup_utils.h", "tab_contents/chrome_web_contents_menu_helper.cc", "tab_contents/chrome_web_contents_menu_helper.h", @@ -2690,7 +2718,7 @@ "views/autofill/payments/webauthn_dialog_view.cc", "views/autofill/payments/webauthn_dialog_view.h", "views/close_bubble_on_tab_activation_helper.cc", -@@ -5970,8 +5967,6 @@ static_library("ui") { +@@ -5614,8 +5611,6 @@ static_library("ui") { "views/safe_browsing/prompt_for_scanning_modal_dialog.h", "views/safe_browsing/tailored_security_desktop_dialog_manager.cc", "views/safe_browsing/tailored_security_desktop_dialog_manager.h", @@ -2768,7 +2796,7 @@ void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() { --- a/chrome/browser/ui/safety_hub/unused_site_permissions_service.cc +++ b/chrome/browser/ui/safety_hub/unused_site_permissions_service.cc -@@ -50,7 +50,6 @@ +@@ -51,7 +51,6 @@ #include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2776,30 +2804,29 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "ui/base/l10n/l10n_util.h" -@@ -283,22 +282,6 @@ UnusedSitePermissionsService::UnusedSite - base::Unretained(this))); - } +@@ -357,21 +356,6 @@ UnusedSitePermissionsService::UnusedSite + base::Unretained(this))); + } -- if (base::FeatureList::IsEnabled( -- safe_browsing::kSafetyHubAbusiveNotificationRevocation)) { -- abusive_notification_manager_ = -- std::make_unique( -- g_browser_process->safe_browsing_service() -- ? g_browser_process->safe_browsing_service() -- ->database_manager() -- : nullptr, -- hcsm()); +- if (base::FeatureList::IsEnabled( +- safe_browsing::kSafetyHubAbusiveNotificationRevocation)) { +- abusive_notification_manager_ = +- std::make_unique( +- g_browser_process->safe_browsing_service() +- ? g_browser_process->safe_browsing_service()->database_manager() +- : nullptr, +- hcsm()); - -- pref_change_registrar_->Add( -- prefs::kSafeBrowsingEnabled, -- base::BindRepeating(&UnusedSitePermissionsService:: -- OnPermissionsAutorevocationControlChanged, -- base::Unretained(this))); -- } +- pref_change_registrar_->Add( +- prefs::kSafeBrowsingEnabled, +- base::BindRepeating(&UnusedSitePermissionsService:: +- OnPermissionsAutorevocationControlChanged, +- base::Unretained(this))); +- } - InitializeLatestResult(); - -@@ -949,9 +932,7 @@ bool UnusedSitePermissionsService::IsUnu + bool migration_completed = pref_change_registrar_->prefs()->GetBoolean( + safety_hub_prefs::kUnusedSitePermissionsRevocationMigrationCompleted); +@@ -1027,9 +1011,7 @@ bool UnusedSitePermissionsService::IsUnu bool UnusedSitePermissionsService:: IsAbusiveNotificationAutoRevocationEnabled() { @@ -2812,7 +2839,7 @@ const std::set --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -385,7 +385,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -383,7 +383,6 @@ void TabHelpers::AttachTabHelpers(WebCon if (!autofill_client_provider.uses_platform_autofill()) { ChromePasswordManagerClient::CreateForWebContents(web_contents); } @@ -2933,7 +2960,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/color/chrome_color_id.h" -@@ -819,9 +818,7 @@ void DownloadItemView::UpdateLabels() { +@@ -820,9 +819,7 @@ void DownloadItemView::UpdateLabels() { deep_scanning_label_->SetVisible(mode_ == download::DownloadItemMode::kDeepScanning); if (deep_scanning_label_->GetVisible()) { @@ -2944,7 +2971,7 @@ ? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD : IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD; const std::u16string filename = ElidedFilename(*deep_scanning_label_); -@@ -847,11 +844,15 @@ void DownloadItemView::UpdateButtons() { +@@ -848,11 +845,15 @@ void DownloadItemView::UpdateButtons() { } const bool allow_open_during_deep_scan = @@ -2960,7 +2987,7 @@ open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) || prompt_to_scan || allow_open_during_deep_scan); -@@ -1275,7 +1276,9 @@ void DownloadItemView::ShowContextMenuIm +@@ -1276,7 +1277,9 @@ void DownloadItemView::ShowContextMenuIm } void DownloadItemView::OpenDownloadDuringAsyncScanning() { @@ -2972,7 +2999,7 @@ --- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc +++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc -@@ -169,7 +169,6 @@ void PresentationReceiverWindowView::Ini +@@ -171,7 +171,6 @@ void PresentationReceiverWindowView::Ini ChromeTranslateClient::CreateForWebContents(web_contents); autofill::ChromeAutofillClient::CreateForWebContents(web_contents); ChromePasswordManagerClient::CreateForWebContents(web_contents); @@ -2980,6 +3007,17 @@ ManagePasswordsUIController::CreateForWebContents(web_contents); SearchTabHelper::CreateForWebContents(web_contents); TabDialogs::CreateForWebContents(web_contents); +--- a/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc ++++ b/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc +@@ -255,8 +255,6 @@ void ProfilePickerDiceSignInProvider::On + .Then(base::BindOnce(std::move(switch_finished_callback), true)); + host_->ShowScreen(contents(), BuildSigninURL(), + std::move(navigation_finished_closure)); +- ChromePasswordReuseDetectionManagerClient::CreateForProfilePickerWebContents( +- contents()); + // Attach a `DiceTabHelper` to the `WebContents` to trigger the completion + // of the step. + DiceTabHelper::CreateForWebContents(contents()); --- a/chrome/browser/ui/views/profiles/profile_picker_force_signin_dialog_delegate.cc +++ b/chrome/browser/ui/views/profiles/profile_picker_force_signin_dialog_delegate.cc @@ -46,9 +46,6 @@ ProfilePickerForceSigninDialogDelegate:: @@ -3016,7 +3054,7 @@ std::unique_ptr --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -465,9 +465,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc +@@ -456,9 +456,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc } if (url.host_piece() == chrome::kChromeUIPredictorsHost) return &NewWebUI; @@ -3028,7 +3066,7 @@ if (url.host_piece() == chrome::kChromeUISignInInternalsHost) --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -159,10 +159,6 @@ void MaybeReportBypassAction(download::D +@@ -191,10 +191,6 @@ void MaybeReportBypassAction(download::D if (action != WarningAction::PROCEED && action != WarningAction::DISCARD) { return; } @@ -3039,7 +3077,7 @@ } // Triggers a Trust and Safety sentiment survey (if enabled). Should be called -@@ -171,21 +167,6 @@ void MaybeReportBypassAction(download::D +@@ -203,21 +199,6 @@ void MaybeReportBypassAction(download::D void MaybeTriggerTrustSafetySurvey(download::DownloadItem* file, WarningSurface surface, WarningAction action) { @@ -3061,80 +3099,92 @@ } void RecordDownloadsPageValidatedHistogram(download::DownloadItem* item) { -@@ -296,104 +277,17 @@ void DownloadsDOMHandler::SaveDangerousR - // downloads of certain danger types. - void DownloadsDOMHandler::SaveSuspiciousRequiringGesture( +@@ -369,46 +350,10 @@ void DownloadsDOMHandler::RecordOpenBypa + + void DownloadsDOMHandler::RecordOpenBypassWarningInterstitial( const std::string& id) { - CHECK(base::FeatureList::IsEnabled( -- safe_browsing::kImprovedDownloadPageWarnings)); -- if (!GetWebUIWebContents()->HasRecentInteraction()) { -- LOG(ERROR) << "SaveSuspiciousRequiringGesture received without recent " -- "user interaction"; -- return; -- } -- -- CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_SUSPICIOUS); -- download::DownloadItem* file = GetDownloadByStringId(id); -- if (!file || file->IsDone()) { -- return; -- } -- -- // If a download is insecure, validate that first. Is most cases, insecure -- // download warnings will occur first, but in the worst case scenario, we show -- // a dangerous warning twice. That's better than showing an insecure download -- // warning, then dismissing the dangerous download warning. Since insecure -- // downloads triggering the UI are temporary and rare to begin with, this -- // should very rarely occur. -- if (file->IsInsecure()) { -- // `file` is potentially deleted. -- file->ValidateInsecureDownload(); -- } else if (file->IsDangerous()) { -- MaybeReportBypassAction(file, WarningSurface::DOWNLOADS_PAGE, -- WarningAction::PROCEED); -- MaybeTriggerDownloadWarningHatsSurvey( -- file, DownloadWarningHatsType::kDownloadsPageBypass); -- MaybeTriggerTrustSafetySurvey(file, WarningSurface::DOWNLOADS_PAGE, -- WarningAction::PROCEED); -- -- RecordDownloadsPageValidatedHistogram(file); -- -- // `file` is potentially deleted. -- file->ValidateDangerousDownload(); -- } - } - - void DownloadsDOMHandler::RecordOpenBypassWarningPrompt(const std::string& id) { -- CHECK(base::FeatureList::IsEnabled( -- safe_browsing::kImprovedDownloadPageWarnings)); -- +- safe_browsing::kDangerousDownloadInterstitial)); - CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_OPEN_BYPASS_WARNING_PROMPT); - download::DownloadItem* file = GetDownloadByStringId(id); -- if (!file || !file->IsDangerous() || file->IsDone()) { +- if (!CanLogWarningMetrics(file)) { - return; - } - +- interstitial_open_time_ = base::TimeTicks::Now(); +- +- RecordDangerousDownloadInterstitialActionHistogram( +- DangerousDownloadInterstitialAction::kOpenInterstitial); +- - RecordDownloadDangerPromptHistogram("Shown", *file); - - MaybeReportBypassAction(file, WarningSurface::DOWNLOADS_PAGE, - WarningAction::KEEP); } - void DownloadsDOMHandler::SaveDangerousFromPromptRequiringGesture( + void DownloadsDOMHandler::RecordOpenSurveyOnDangerousInterstitial( const std::string& id) { - CHECK(base::FeatureList::IsEnabled( -- safe_browsing::kImprovedDownloadPageWarnings)); +- safe_browsing::kDangerousDownloadInterstitial)); +- CountDownloadsDOMEvents( +- DOWNLOADS_DOM_EVENT_OPEN_SURVEY_ON_DANGEROUS_INTERSTITIAL); +- download::DownloadItem* file = GetDownloadByStringId(id); +- if (!CanLogWarningMetrics(file)) { +- return; +- } +- +- DCHECK(interstitial_open_time_.has_value()) +- << "Dangerous download interstitial survey should only open after the " +- "download interstitial is opened."; +- interstitial_survey_open_time_ = base::TimeTicks::Now(); +- +- RecordDangerousDownloadInterstitialInteractionHistogram( +- DangerousDownloadInterstitialInteraction::kOpenSurvey, +- (*interstitial_survey_open_time_) - (*interstitial_open_time_)); +- RecordDangerousDownloadInterstitialActionHistogram( +- DangerousDownloadInterstitialAction::kOpenSurvey); + } + + void DownloadsDOMHandler::SaveDangerousFromDialogRequiringGesture( +@@ -443,54 +388,6 @@ void DownloadsDOMHandler::SaveDangerousF + void DownloadsDOMHandler::SaveDangerousFromInterstitialNeedGesture( + const std::string& id, + downloads::mojom::DangerousDownloadInterstitialSurveyOptions response) { +- CHECK(base::FeatureList::IsEnabled( +- safe_browsing::kDangerousDownloadInterstitial)); - if (!GetWebUIWebContents()->HasRecentInteraction()) { -- LOG(ERROR) << "SaveDangerousFromPromptRequiringGesture received without " +- LOG(ERROR) << "SaveDangerousFromInterstitialNeedGesture received without " - "recent user interaction"; - return; - } - - CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS_FROM_PROMPT); - download::DownloadItem* file = GetDownloadByStringId(id); -- if (!file || !file->IsDangerous() || file->IsDone()) { +- if (!CanLogWarningMetrics(file)) { - return; - } - +- DCHECK(interstitial_open_time_.has_value()) +- << "Saving from the dangerous download interstitial should only happen " +- "if the interstitial is opened."; +- DCHECK(interstitial_survey_open_time_.has_value()) +- << "Saving from the dangerous download interstitial should only happen " +- "after the interstitial survey is opened."; +- +- base::TimeTicks save_time = base::TimeTicks::Now(); +- RecordDangerousDownloadInterstitialInteractionHistogram( +- DangerousDownloadInterstitialInteraction::kCompleteSurvey, +- save_time - (*interstitial_survey_open_time_)); +- RecordDangerousDownloadInterstitialInteractionHistogram( +- DangerousDownloadInterstitialInteraction::kSaveDangerous, +- save_time - (*interstitial_open_time_)); +- +- RecordDangerousDownloadInterstitialActionHistogram( +- DangerousDownloadInterstitialAction::kSaveDangerous); +- +- base::UmaHistogramEnumeration( +- "Download.DangerousDownloadInterstitial.SurveyResponse", response); +- - RecordDownloadDangerPromptHistogram("Proceed", *file); - - MaybeReportBypassAction(file, WarningSurface::DOWNLOAD_PROMPT, @@ -3150,23 +3200,36 @@ - file->ValidateDangerousDownload(); } - void DownloadsDOMHandler::RecordCancelBypassWarningPrompt( + void DownloadsDOMHandler::RecordCancelBypassWarningDialog( +@@ -507,27 +404,6 @@ void DownloadsDOMHandler::RecordCancelBy + + void DownloadsDOMHandler::RecordCancelBypassWarningInterstitial( const std::string& id) { - CHECK(base::FeatureList::IsEnabled( -- safe_browsing::kImprovedDownloadPageWarnings)); -- +- safe_browsing::kDangerousDownloadInterstitial)); - CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_CANCEL_BYPASS_WARNING_PROMPT); - download::DownloadItem* file = GetDownloadByStringId(id); -- if (!file || !file->IsDangerous() || file->IsDone()) { +- if (!CanLogWarningMetrics(file)) { - return; - } - +- DCHECK(interstitial_open_time_.has_value()) +- << "Dangerous download interstitial should only be cancelled after the " +- "download interstitial is opened."; +- +- RecordDangerousDownloadInterstitialInteractionHistogram( +- DangerousDownloadInterstitialInteraction::kCancelInterstitial, +- base::TimeTicks::Now() - (*interstitial_open_time_)); +- +- RecordDangerousDownloadInterstitialActionHistogram( +- DangerousDownloadInterstitialAction::kCancelInterstitial); +- - MaybeReportBypassAction(file, WarningSurface::DOWNLOAD_PROMPT, - WarningAction::CANCEL); } void DownloadsDOMHandler::DiscardDangerous(const std::string& id) { -@@ -619,15 +513,6 @@ void DownloadsDOMHandler::DeepScan(const +@@ -753,15 +629,6 @@ void DownloadsDOMHandler::DeepScan(const return; } @@ -3182,19 +3245,7 @@ DownloadItemModel model(download); DownloadCommands commands(model.GetWeakPtr()); commands.ExecuteCommand(DownloadCommands::DEEP_SCAN); -@@ -654,10 +539,7 @@ void DownloadsDOMHandler::BypassDeepScan - // file" which does not imply opening the file. In the old behavior, the - // button says "Open anyway" so we should open the file. - commands.ExecuteCommand( -- base::FeatureList::IsEnabled( -- safe_browsing::kImprovedDownloadPageWarnings) -- ? DownloadCommands::BYPASS_DEEP_SCANNING -- : DownloadCommands::BYPASS_DEEP_SCANNING_AND_OPEN); -+ DownloadCommands::BYPASS_DEEP_SCANNING_AND_OPEN); - } - } - -@@ -668,12 +550,6 @@ void DownloadsDOMHandler::ReviewDangerou +@@ -797,12 +664,6 @@ void DownloadsDOMHandler::ReviewDangerou return; } @@ -3206,43 +3257,22 @@ - } } - // This function will be called when a user clicks on the ESB -@@ -702,32 +578,7 @@ void DownloadsDOMHandler::OpenEsbSetting - - void DownloadsDOMHandler::IsEligibleForEsbPromo( - IsEligibleForEsbPromoCallback callback) { -- content::DownloadManager* manager = GetMainNotifierManager(); -- if (!manager) { - std::move(callback).Run(false); -- return; -- } -- -- content::BrowserContext* browser_context = manager->GetBrowserContext(); -- -- if (!safe_browsing::SafeBrowsingService::IsUserEligibleForESBPromo( -- Profile::FromBrowserContext(browser_context))) { -- std::move(callback).Run(false); -- return; -- } -- -- bool should_show_esb_promo = false; -- if (feature_engagement::Tracker* tracker = -- feature_engagement::TrackerFactory::GetForBrowserContext( -- browser_context); -- tracker && tracker->ShouldTriggerHelpUI( -- feature_engagement::kEsbDownloadRowPromoFeature)) { -- should_show_esb_promo = true; -- // since the promotion row is not an IPH, it never calls dismissed, so we -- // need to do it artificially here or we can trigger a DCHECK. -- tracker->Dismissed(feature_engagement::kEsbDownloadRowPromoFeature); -- } -- std::move(callback).Run(should_show_esb_promo); - } - - void DownloadsDOMHandler::LogEsbPromotionRowViewed() { + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -442,12 +442,6 @@ base::Value::Dict ManagementUIHandler::G +@@ -274,10 +274,7 @@ void ManagementUIHandler::AddReportingIn + enterprise_reporting::kCloudProfileReportingEnabled); + + const bool real_time_url_check_connector_enabled = +- enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext( +- Profile::FromWebUI(web_ui())) +- ->GetAppliedRealTimeUrlCheck() != +- safe_browsing::REAL_TIME_CHECK_DISABLED; ++ false; + + if (cloud_legacy_tech_report_enabled) { + Profile::FromWebUI(web_ui())->GetPrefs()->GetList( +@@ -453,12 +450,6 @@ base::Value::Dict ManagementUIHandler::G &info); } @@ -3391,17 +3421,64 @@ std::move(callback), --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -731,7 +731,6 @@ const char* const kChromeHostURLs[] = { - kChromeUISuggestInternalsHost, +@@ -126,7 +126,6 @@ base::span Chr + kChromeUISuggestInternalsHost, #endif - kChromeUINTPTilesInternalsHost, -- safe_browsing::kChromeUISafeBrowsingHost, - kChromeUISyncInternalsHost, + kChromeUINTPTilesInternalsHost, +- safe_browsing::kChromeUISafeBrowsingHost, + kChromeUISyncInternalsHost, #if !BUILDFLAG(IS_ANDROID) - kChromeUITabSearchHost, + kChromeUITabSearchHost, +--- a/chrome/renderer/url_loader_throttle_provider_impl.cc ++++ b/chrome/renderer/url_loader_throttle_provider_impl.cc +@@ -171,26 +171,6 @@ URLLoaderThrottleProviderImpl::CreateThr + DCHECK(!is_frame_resource || + type_ == blink::URLLoaderThrottleProviderType::kFrame); + +- if (!is_frame_resource) { +- if (pending_safe_browsing_) { +- safe_browsing_.Bind(std::move(pending_safe_browsing_)); +- } +- +-#if BUILDFLAG(ENABLE_EXTENSIONS) +- if (pending_extension_web_request_reporter_) { +- extension_web_request_reporter_.Bind( +- std::move(pending_extension_web_request_reporter_)); +- } +- +- auto throttle = std::make_unique( +- safe_browsing_.get(), local_frame_token, +- extension_web_request_reporter_.get()); +-#else +- auto throttle = std::make_unique( +- safe_browsing_.get(), local_frame_token); +-#endif // BUILDFLAG(ENABLE_EXTENSIONS) +- throttles.emplace_back(std::move(throttle)); +- } + + if (type_ == blink::URLLoaderThrottleProviderType::kFrame && + !is_frame_resource && local_frame_token.has_value()) { +--- a/chrome/renderer/websocket_handshake_throttle_provider_impl.cc ++++ b/chrome/renderer/websocket_handshake_throttle_provider_impl.cc +@@ -58,15 +58,5 @@ WebSocketHandshakeThrottleProviderImpl:: + scoped_refptr task_runner) { + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); + +-#if BUILDFLAG(ENABLE_EXTENSIONS) +- if (pending_extension_web_request_reporter_) { +- extension_web_request_reporter_.Bind( +- std::move(pending_extension_web_request_reporter_)); +- } +- return std::make_unique< +- safe_browsing::WebSocketSBExtensionsHandshakeThrottle>( +- extension_web_request_reporter_.get()); +-#else + return nullptr; +-#endif + } --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -2010,9 +2010,6 @@ if (!is_android) { +@@ -2019,9 +2019,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -3411,7 +3488,7 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:test_support", -@@ -7158,9 +7155,6 @@ test("unit_tests") { +@@ -6941,9 +6938,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -3421,9 +3498,28 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:mock_password_protection", "//components/safe_browsing/content/browser/web_ui", +--- a/components/enterprise/connectors/reporting/reporting_service_settings.cc ++++ b/components/enterprise/connectors/reporting/reporting_service_settings.cc +@@ -44,16 +44,6 @@ ReportingServiceSettings::ReportingServi + else + DVLOG(1) << "Enabled event name list contains a non string value!"; + } +- } else { +- // When the list of enabled event names is not set, we assume all events are +- // enabled. This is to support the feature of selecting the "All always on" +- // option in the policy UI, which means to always enable all events, even +- // when new events may be added in the future. And this is also to support +- // existing customer policies that were created before we introduced the +- // concept of enabling/disabling events. +- for (const char* event : kAllReportingEvents) { +- enabled_event_names_.insert(event); +- } + } + + const base::Value::List* enabled_opt_in_events_value = --- a/components/password_manager/content/browser/content_password_manager_driver.cc +++ b/components/password_manager/content/browser/content_password_manager_driver.cc -@@ -577,7 +577,7 @@ void ContentPasswordManagerDriver::Check +@@ -584,7 +584,7 @@ void ContentPasswordManagerDriver::Check if (!password_manager::bad_message::CheckFrameNotPrerendering( render_frame_host_)) return; @@ -3450,7 +3546,7 @@ } // namespace password_manager --- a/components/password_manager/core/browser/password_manager_client.h +++ b/components/password_manager/core/browser/password_manager_client.h -@@ -408,9 +408,6 @@ class PasswordManagerClient { +@@ -411,9 +411,6 @@ class PasswordManagerClient { // Returns the current best guess as to the page's display language. virtual autofill::LanguageCode GetPageLanguage() const; @@ -3460,7 +3556,7 @@ // Maybe triggers a hats survey that measures the user's perception of // Autofill for passwords. When triggering happens, the survey dialog will be -@@ -422,13 +419,6 @@ class PasswordManagerClient { +@@ -425,13 +422,6 @@ class PasswordManagerClient { virtual void TriggerUserPerceptionOfPasswordManagerSurvey( const std::string& filling_assistance); @@ -3493,7 +3589,7 @@ +# } --- a/components/safe_browsing/content/common/safe_browsing.mojom +++ b/components/safe_browsing/content/common/safe_browsing.mojom -@@ -156,7 +156,6 @@ interface PhishingDetector { +@@ -146,7 +146,6 @@ interface PhishingDetector { mojo_base.mojom.ProtoWrapper? request); }; @@ -3511,6 +3607,17 @@ - "user_population.h", ] + configs += [ "//build/config/compiler:wexit_time_destructors" ] +--- a/components/safe_browsing/core/browser/db/BUILD.gn ++++ b/components/safe_browsing/core/browser/db/BUILD.gn +@@ -247,8 +247,6 @@ source_set("v4_store") { + sources = [ + "hash_prefix_map.cc", + "hash_prefix_map.h", +- "v4_store.cc", +- "v4_store.h", + ] + configs += [ "//build/config/compiler:wexit_time_destructors" ] --- a/components/safe_browsing/core/browser/db/hash_prefix_map.h +++ b/components/safe_browsing/core/browser/db/hash_prefix_map.h @@ -3524,9 +3631,9 @@ #include "components/safe_browsing/core/common/proto/webui.pb.h" --- a/components/safe_browsing/core/browser/hashprefix_realtime/hash_realtime_service.h +++ b/components/safe_browsing/core/browser/hashprefix_realtime/hash_realtime_service.h -@@ -7,6 +7,7 @@ - - #include +@@ -12,6 +12,7 @@ + #include + #include +#include "base/containers/flat_map.h" #include "base/containers/unique_ptr_adapters.h" @@ -3542,7 +3649,7 @@ #include "components/safe_browsing/core/common/utils.h" #include "google_apis/google_api_keys.h" #include "net/base/net_errors.h" -@@ -112,13 +111,7 @@ constexpr net::NetworkTrafficAnnotationT +@@ -115,13 +114,7 @@ constexpr net::NetworkTrafficAnnotationT )"); bool IsEnabled(PrefService* pref_service, std::optional country) { @@ -3557,7 +3664,7 @@ } GURL GetKeyFetchingUrl() { -@@ -395,25 +388,9 @@ void OhttpKeyService::MaybeStartServerTr +@@ -403,25 +396,9 @@ void OhttpKeyService::MaybeStartServerTr } void OhttpKeyService::PopulateKeyFromPref() { @@ -3585,7 +3692,7 @@ void OhttpKeyService::Shutdown() { --- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc -@@ -249,17 +249,6 @@ void RealTimeUrlLookupService::MaybeLogP +@@ -253,17 +253,6 @@ void RealTimeUrlLookupService::MaybeLogP bool request_had_cookie, bool was_first_request, bool sent_with_token) { diff --git a/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch b/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch index 709a5821..8debb778 100644 --- a/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch +++ b/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch @@ -2,7 +2,7 @@ --- a/net/tools/transport_security_state_generator/transport_security_state_generator.cc +++ b/net/tools/transport_security_state_generator/transport_security_state_generator.cc -@@ -133,7 +133,7 @@ bool CheckDuplicateEntries(const Transpo +@@ -132,7 +132,7 @@ bool CheckDuplicateEntries(const Transpo bool CheckNoopEntries(const TransportSecurityStateEntries& entries) { for (const auto& entry : entries) { if (!entry->force_https && entry->pinset.empty()) { diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 6bc5ec20..0b8cb99e 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -4,7 +4,7 @@ --- a/android_webview/browser/aw_browser_context.cc +++ b/android_webview/browser/aw_browser_context.cc -@@ -61,7 +61,6 @@ +@@ -62,7 +62,6 @@ #include "components/prefs/pref_service_factory.h" #include "components/prefs/segregated_pref_store.h" #include "components/profile_metrics/browser_profile_type.h" @@ -12,7 +12,7 @@ #include "components/url_formatter/url_fixer.h" #include "components/user_prefs/user_prefs.h" #include "components/visitedlink/browser/visitedlink_writer.h" -@@ -516,8 +515,6 @@ void AwBrowserContext::BuildVisitedLinkT +@@ -517,8 +516,6 @@ void AwBrowserContext::BuildVisitedLinkT } void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) { @@ -63,10 +63,10 @@ + return false; } - jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const { + bool SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const { --- a/chrome/browser/android/signin/signin_manager_android.h +++ b/chrome/browser/android/signin/signin_manager_android.h -@@ -144,9 +144,6 @@ class SigninManagerAndroid : public Keye +@@ -142,9 +142,6 @@ class SigninManagerAndroid : public Keye const raw_ptr profile_ = nullptr; @@ -184,7 +184,7 @@ } --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -295,7 +295,6 @@ +@@ -297,7 +297,6 @@ #include "components/safe_browsing/core/browser/url_checker_delegate.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" @@ -204,7 +204,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -867,17 +867,6 @@ void DownloadItemModel::ExecuteCommand(D +@@ -882,17 +882,6 @@ void DownloadItemModel::ExecuteCommand(D #if BUILDFLAG(FULL_SAFE_BROWSING) CompleteSafeBrowsingScan(); #endif @@ -222,7 +222,7 @@ [[fallthrough]]; case DownloadCommands::KEEP: #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -946,24 +935,9 @@ void DownloadItemModel::ExecuteCommand(D +@@ -961,24 +950,9 @@ void DownloadItemModel::ExecuteCommand(D DownloadUIModel::ExecuteCommand(download_commands, command); break; case DownloadCommands::DEEP_SCAN: { @@ -279,7 +279,7 @@ #include "crypto/secure_hash.h" --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -44,7 +44,6 @@ +@@ -41,7 +41,6 @@ #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h" #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/policy/core/common/policy_types.h" @@ -287,7 +287,7 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/user_prefs/user_prefs.h" -@@ -386,8 +385,7 @@ std::string ConnectorsService::GetManage +@@ -383,8 +382,7 @@ std::string ConnectorsService::GetManage std::optional scope = std::nullopt; for (const char* scope_pref : @@ -297,7 +297,7 @@ ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED), ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY), ConnectorScopePref(AnalysisConnector::PRINT), -@@ -439,20 +437,6 @@ std::string ConnectorsService::GetManage +@@ -436,20 +434,6 @@ std::string ConnectorsService::GetManage std::optional ConnectorsService::GetDMTokenForRealTimeUrlCheck() const { @@ -421,9 +421,29 @@ class PolicyBlocklistService; class PrefService; +--- a/chrome/browser/enterprise/signin/oidc_authentication_signin_interceptor.cc ++++ b/chrome/browser/enterprise/signin/oidc_authentication_signin_interceptor.cc +@@ -48,7 +48,6 @@ + #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" + #include "components/policy/core/common/policy_logger.h" + #include "components/prefs/pref_service.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/identity_manager/primary_account_mutator.h" + #include "content/public/browser/storage_partition.h" + #include "content/public/browser/web_contents.h" +@@ -372,8 +371,7 @@ void OidcAuthenticationSigninInterceptor + + // TODO(b/355270189): The interaction between OIDC profiles and BrowserSignin + // policy should be finalized, this check only prevents Chrome from crashing. +- if (dasher_based_ && +- !profile_->GetPrefs()->GetBoolean(prefs::kSigninAllowedOnNextStartup)) { ++ if (dasher_based_) { + LOG_POLICY(ERROR, OIDC_ENROLLMENT) + << "Google-synced OIDC profile can't be created because browser sign " + "in is disabled."; --- a/chrome/browser/enterprise/signin/oidc_managed_profile_creation_delegate.cc +++ b/chrome/browser/enterprise/signin/oidc_managed_profile_creation_delegate.cc -@@ -8,7 +8,6 @@ +@@ -9,7 +9,6 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "chrome/browser/profiles/profile_attributes_storage.h" #include "components/prefs/pref_service.h" @@ -431,7 +451,7 @@ OidcManagedProfileCreationDelegate::OidcManagedProfileCreationDelegate() = default; -@@ -54,8 +53,6 @@ void OidcManagedProfileCreationDelegate: +@@ -55,8 +54,6 @@ void OidcManagedProfileCreationDelegate: void OidcManagedProfileCreationDelegate::CheckManagedProfileStatus( Profile* new_profile) { @@ -526,7 +546,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -61,7 +60,7 @@ const char* const kExtensionsIdentityAPI +@@ -62,7 +61,7 @@ const char* const kExtensionsIdentityAPI "extensions_identity_api"; bool IsBrowserSigninAllowed(Profile* profile) { @@ -616,7 +636,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 -@@ -40,7 +40,6 @@ +@@ -41,7 +41,6 @@ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" @@ -636,7 +656,7 @@ #include "extensions/browser/test_event_router.h" --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -51,10 +51,8 @@ +@@ -54,10 +54,8 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/privacy_sandbox/tracking_protection_prefs.h" #include "components/proxy_config/proxy_config_pref_names.h" @@ -647,7 +667,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/supervised_user/core/common/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" -@@ -305,8 +303,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -309,8 +307,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil #endif // Privacy page @@ -656,7 +676,7 @@ (*s_allowlist)[::prefs::kDnsOverHttpsMode] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kDnsOverHttpsTemplates] = settings_api::PrefType::kString; -@@ -329,16 +325,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -333,16 +329,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; // Security page @@ -675,7 +695,7 @@ (*s_allowlist)[::kGeneratedHttpsFirstModePref] = --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc -@@ -791,9 +791,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore +@@ -780,9 +780,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, GetReferrerChainForNonSafeBrowsingUser) { PrefService* pref_service = browser()->profile()->GetPrefs(); @@ -770,7 +790,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" #include "extensions/browser/allowlist_state.h" -@@ -1128,19 +1127,6 @@ void InstalledLoader::RecordExtensionsMe +@@ -1119,19 +1118,6 @@ void InstalledLoader::RecordExtensionsMe base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled2", disabled_not_allowlisted_count); } @@ -814,7 +834,7 @@ {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -64,7 +64,6 @@ +@@ -65,7 +65,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" @@ -822,7 +842,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/first_party_sets_handler.h" -@@ -1139,15 +1138,8 @@ void ProfileNetworkContextService::Confi +@@ -1123,15 +1122,8 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; @@ -997,7 +1017,7 @@ } // namespace policy --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -110,14 +110,11 @@ +@@ -111,14 +111,11 @@ #include "components/proxy_config/proxy_policy_handler.h" #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/common/file_type_policies_prefs.h" @@ -1012,7 +1032,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/service/sync_policy_handler.h" -@@ -294,9 +291,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -295,9 +292,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kForcePermissionPolicyUnloadDefaultEnabled, policy_prefs::kForcePermissionPolicyUnloadDefaultEnabled, base::Value::Type::BOOLEAN}, @@ -1022,7 +1042,7 @@ { key::kDomainReliabilityAllowed, domain_reliability::prefs::kDomainReliabilityAllowedByPolicy, base::Value::Type::BOOLEAN }, -@@ -330,12 +324,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -331,12 +325,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kOopPrintDriversAllowedByPolicy, base::Value::Type::BOOLEAN }, #endif @@ -1035,7 +1055,7 @@ { key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled, base::Value::Type::BOOLEAN }, -@@ -436,9 +424,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -440,9 +428,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdsSettingForIntrusiveAdsSites, prefs::kManagedDefaultAdsSetting, base::Value::Type::INTEGER }, @@ -1045,7 +1065,7 @@ { key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, base::Value::Type::BOOLEAN }, -@@ -647,15 +632,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -653,15 +638,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kPasswordDismissCompromisedAlertEnabled, password_manager::prefs::kPasswordDismissCompromisedAlertEnabled, base::Value::Type::BOOLEAN }, @@ -1061,7 +1081,7 @@ #if BUILDFLAG(ENABLE_PDF) { key::kPdfLocalFileAccessAllowedForDomains, prefs::kPdfLocalFileAccessAllowedForDomains, -@@ -705,9 +681,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -708,9 +684,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRestoreOnStartupURLs, prefs::kURLsToRestoreOnStartup, base::Value::Type::LIST }, @@ -1071,7 +1091,7 @@ { key::kSameOriginTabCaptureAllowedByOrigins, prefs::kSameOriginTabCaptureAllowedByOrigins, base::Value::Type::LIST }, -@@ -819,9 +792,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -822,9 +795,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdditionalDnsQueryTypesEnabled, prefs::kAdditionalDnsQueryTypesEnabled, base::Value::Type::BOOLEAN }, @@ -1081,7 +1101,7 @@ { key::kForceGoogleSafeSearch, policy_prefs::kForceGoogleSafeSearch, base::Value::Type::BOOLEAN }, -@@ -877,9 +847,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -889,9 +859,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, @@ -1091,7 +1111,7 @@ #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -1785,9 +1752,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1814,9 +1781,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, @@ -1101,7 +1121,7 @@ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) { key::kDefaultBrowserSettingEnabled, -@@ -1846,9 +1810,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1875,9 +1839,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kImportDialogAutofillFormData, base::Value::Type::BOOLEAN }, @@ -1111,7 +1131,7 @@ { key::kHardwareAccelerationModeEnabled, prefs::kHardwareAccelerationModeEnabled, base::Value::Type::BOOLEAN }, -@@ -2128,9 +2089,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2159,9 +2120,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGoogleSearchSidePanelEnabled, prefs::kGoogleSearchSidePanelEnabled, base::Value::Type::BOOLEAN }, @@ -1121,7 +1141,7 @@ #endif // BUILDFLAG(IS_ANDROID) { key::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, policy_prefs::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, -@@ -2386,12 +2344,6 @@ std::unique_ptrAddHandler( std::make_unique()); -@@ -2581,21 +2533,7 @@ std::unique_ptrAddHandler(std::make_unique( key::kProfileReauthPrompt, enterprise_signin::prefs::kProfileReauthPrompt, static_cast(enterprise_signin::ProfileReauthPrompt::kDoNotPrompt), -@@ -2685,24 +2623,6 @@ std::unique_ptr> signin_legacy_policies; @@ -1183,7 +1203,7 @@ std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -160,7 +160,6 @@ +@@ -165,7 +165,6 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "components/safe_browsing/content/common/file_type_policies_prefs.h" @@ -1191,7 +1211,7 @@ #include "components/saved_tab_groups/pref_names.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/security_interstitials/content/insecure_form_blocking_page.h" -@@ -168,7 +167,6 @@ +@@ -173,7 +172,6 @@ #include "components/segmentation_platform/embedder/default_model/device_switcher_result_dispatcher.h" #include "components/segmentation_platform/public/segmentation_platform_service.h" #include "components/sessions/core/session_id_generator.h" @@ -1199,7 +1219,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_engagement/content/site_engagement_service.h" -@@ -1724,7 +1722,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1492,7 +1490,6 @@ void RegisterLocalState(PrefRegistrySimp PushMessagingServiceImpl::RegisterPrefs(registry); #endif RegisterScreenshotPrefs(registry); @@ -1207,16 +1227,16 @@ secure_origin_allowlist::RegisterPrefs(registry); segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs( registry); -@@ -2033,8 +2030,6 @@ void RegisterProfilePrefs(user_prefs::Pr - QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); - RegisterBrowserUserPrefs(registry); - RegisterPrefersDefaultScrollbarStylesPrefs(registry); +@@ -1822,8 +1819,6 @@ void RegisterProfilePrefs(user_prefs::Pr + #if BUILDFLAG(IS_CHROMEOS_ASH) + settings::ResetSettingsHandler::RegisterProfilePrefs(registry); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) - safe_browsing::file_type::RegisterProfilePrefs(registry); - safe_browsing::RegisterProfilePrefs(registry); SearchPrefetchService::RegisterProfilePrefs(registry); blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs( registry); -@@ -2617,20 +2612,6 @@ void MigrateObsoleteProfilePrefs(PrefSer +@@ -2344,20 +2339,6 @@ void MigrateObsoleteProfilePrefs(PrefSer chrome_browser_net::secure_dns::MigrateProbesSettingToOrFromBackup( profile_prefs); @@ -1237,7 +1257,7 @@ // TODO(326079444): After experiment is over, update the deprecated date and // allow this to be cleaned up. -@@ -2889,9 +2870,6 @@ void MigrateObsoleteProfilePrefs(PrefSer +@@ -2486,9 +2467,6 @@ void MigrateObsoleteProfilePrefs(PrefSer // If the sync (old) pref still exists, copy it to signin (new), // and clear the sync part of the pref. if (profile_prefs->HasPrefPath(kSync_ExplicitBrowserSignin)) { @@ -1247,7 +1267,7 @@ profile_prefs->ClearPref(kSync_ExplicitBrowserSignin); } -@@ -2983,10 +2961,6 @@ void MigrateObsoleteProfilePrefs(PrefSer +@@ -2580,10 +2558,6 @@ void MigrateObsoleteProfilePrefs(PrefSer // Added 03/2024. profile_prefs->ClearPref(kDefaultSearchProviderChoicePendingDeprecated); @@ -1279,10 +1299,10 @@ ash::prefs::kEnableTouchpadThreeFingerClick, true}, --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc -@@ -52,10 +52,8 @@ - #include "components/prefs/pref_service.h" +@@ -55,10 +55,8 @@ #include "components/prefs/pref_store.h" #include "components/prefs/pref_value_store.h" + #include "components/prefs/wrap_with_prefix_pref_store.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/search_engines_pref_names.h" @@ -1290,7 +1310,7 @@ #include "components/supervised_user/core/browser/supervised_user_pref_store.h" #include "components/sync/base/features.h" #include "components/sync/base/model_type.h" -@@ -127,9 +125,6 @@ const prefs::TrackedPreferenceMetadata k +@@ -130,9 +128,6 @@ const prefs::TrackedPreferenceMetadata k {5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT, PrefTrackingStrategy::SPLIT, ValueType::IMPERSONAL}, #endif @@ -1300,7 +1320,7 @@ {7, prefs::kSearchProviderOverrides, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, #if !BUILDFLAG(IS_ANDROID) -@@ -153,16 +148,6 @@ const prefs::TrackedPreferenceMetadata k +@@ -156,16 +151,6 @@ const prefs::TrackedPreferenceMetadata k PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, // kSyncRemainingRollbackTries is deprecated and will be removed a few // releases after M50. @@ -1317,7 +1337,7 @@ {29, prefs::kMediaStorageIdSalt, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, #if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -174,9 +159,6 @@ const prefs::TrackedPreferenceMetadata k +@@ -177,9 +162,6 @@ const prefs::TrackedPreferenceMetadata k {32, prefs::kMediaCdmOriginData, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, #endif // BUILDFLAG(IS_WIN) @@ -1357,7 +1377,7 @@ EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); --- a/chrome/browser/profiles/gaia_info_update_service.cc +++ b/chrome/browser/profiles/gaia_info_update_service.cc -@@ -19,7 +19,6 @@ +@@ -23,7 +23,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/avatar_icon_util.h" #include "components/signin/public/base/consent_level.h" @@ -1377,15 +1397,15 @@ #include "components/sync_preferences/pref_service_syncable.h" --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc -@@ -28,7 +28,6 @@ +@@ -27,7 +27,6 @@ #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" #include "components/profile_metrics/state.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/supervised_user/core/common/supervised_user_constants.h" - #include "ui/base/resource/resource_bundle.h" -@@ -470,7 +469,7 @@ bool ProfileAttributesEntry::IsUsingDefa +@@ -507,7 +506,7 @@ bool ProfileAttributesEntry::IsUsingDefa } bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const { @@ -1394,7 +1414,7 @@ } bool ProfileAttributesEntry::IsDasherlessManagement() const { -@@ -668,7 +667,6 @@ void ProfileAttributesEntry::SetLastDown +@@ -710,7 +709,6 @@ void ProfileAttributesEntry::SetLastDown } void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) { @@ -1435,7 +1455,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -89,7 +89,6 @@ +@@ -91,7 +91,6 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -1443,7 +1463,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/supervised_user/core/browser/child_account_service.h" -@@ -1976,8 +1975,7 @@ void ProfileManager::AddProfileToStorage +@@ -1979,8 +1978,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1453,7 +1473,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -2026,14 +2024,13 @@ void ProfileManager::AddProfileToStorage +@@ -2029,14 +2027,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsForceEphemeralProfilesEnabled(profile); init_params.is_signed_in_with_credential_provider = @@ -1491,7 +1511,7 @@ #if BUILDFLAG(IS_CHROMEOS_LACROS) --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -873,7 +873,7 @@ +@@ -858,7 +858,7 @@ @@ -1513,7 +1533,7 @@ --- a/chrome/browser/resources/settings/privacy_page/security_page.html +++ b/chrome/browser/resources/settings/privacy_page/security_page.html -@@ -71,192 +71,6 @@ +@@ -71,194 +71,6 @@ @@ -1674,14 +1694,16 @@ - - -
-- +- -- +- +- -

$i18n{advancedPageTitle}

-@@ -406,11 +220,3 @@ +@@ -407,11 +219,3 @@ on-click="onAdvancedProtectionProgramLinkClick_" external> @@ -1720,7 +1742,7 @@ - --- a/chrome/browser/resources/settings/privacy_page/security_page.ts +++ b/chrome/browser/resources/settings/privacy_page/security_page.ts -@@ -292,17 +292,6 @@ export class SettingsSecurityPageElement +@@ -299,17 +299,6 @@ export class SettingsSecurityPageElement super.ready(); CrSettingsPrefs.initialized.then(() => { @@ -1738,7 +1760,7 @@ // The HTTPS-First Mode generated pref should never be set to // ENABLED_INCOGNITO if the feature flag is not enabled. if (!loadTimeData.getBoolean('enableHttpsFirstModeNewSettings')) { -@@ -312,10 +301,6 @@ export class SettingsSecurityPageElement +@@ -319,10 +308,6 @@ export class SettingsSecurityPageElement } }); @@ -1749,7 +1771,7 @@ // Initialize the last focus time on page load. this.lastFocusTime_ = HatsBrowserProxyImpl.getInstance().now(); } -@@ -439,8 +424,7 @@ export class SettingsSecurityPageElement +@@ -446,8 +431,7 @@ export class SettingsSecurityPageElement } private getDisabledExtendedSafeBrowsing_(): boolean { @@ -1908,7 +1930,7 @@ } RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason( -@@ -1800,23 +1759,6 @@ MaybeCreateCommitDeferringCondition( +@@ -1799,23 +1758,6 @@ MaybeCreateCommitDeferringCondition( : nullptr; } @@ -2151,7 +2173,7 @@ #include "content/public/test/test_utils.h" --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -39,7 +39,6 @@ +@@ -40,7 +40,6 @@ #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -2177,8 +2199,8 @@ #include "components/safe_browsing/core/common/proto/csd.pb.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/sync_preferences/testing_pref_service_syncable.h" + #include "content/public/browser/download_manager.h" #include "content/public/test/browser_task_environment.h" - #include "content/public/test/test_utils.h" --- a/chrome/browser/safe_browsing/incident_reporting/state_store.cc +++ b/chrome/browser/safe_browsing/incident_reporting/state_store.cc @@ -14,7 +14,6 @@ @@ -2322,7 +2344,7 @@ --- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc +++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc -@@ -28,7 +28,6 @@ +@@ -30,7 +30,6 @@ #include "components/safe_browsing/core/browser/db/database_manager.h" #include "components/safe_browsing/core/browser/ping_manager.h" #include "components/safe_browsing/core/common/features.h" @@ -2330,7 +2352,7 @@ #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item_utils.h" -@@ -125,11 +124,9 @@ bool AndroidTelemetryService::CanSendPin +@@ -137,11 +136,9 @@ bool AndroidTelemetryService::CanSendPin return false; } @@ -2347,9 +2369,9 @@ RecordApkDownloadTelemetryOutcome( --- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc +++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc -@@ -18,7 +18,6 @@ - #include "components/download/public/common/mock_download_item.h" - #include "components/prefs/pref_service.h" +@@ -21,7 +21,6 @@ + #include "components/safe_browsing/android/safe_browsing_api_handler_bridge.h" + #include "components/safe_browsing/android/safe_browsing_api_handler_util.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "content/public/browser/browser_task_traits.h" @@ -2511,14 +2533,14 @@ #include "components/user_manager/user.h" --- a/chrome/browser/signin/dice_browsertest.cc +++ b/chrome/browser/signin/dice_browsertest.cc -@@ -70,7 +70,6 @@ +@@ -73,7 +73,6 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_capabilities_test_mutator.h" - #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" --- a/chrome/browser/signin/dice_signed_in_profile_creator.cc +++ b/chrome/browser/signin/dice_signed_in_profile_creator.cc @@ -20,7 +20,6 @@ @@ -2536,10 +2558,10 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" - #include "components/signin/public/identity_manager/account_managed_status_finder.h" -@@ -323,16 +322,8 @@ void DiceWebSigninInterceptor::RegisterP +@@ -428,16 +427,8 @@ void DiceWebSigninInterceptor::RegisterP registry->RegisterBooleanPref(prefs::kSigninInterceptionEnabled, true); registry->RegisterStringPref(prefs::kManagedAccountsSigninRestriction, std::string()); @@ -2556,7 +2578,7 @@ } std::optional -@@ -1338,16 +1329,6 @@ void DiceWebSigninInterceptor:: +@@ -1451,16 +1442,6 @@ void DiceWebSigninInterceptor:: g_browser_process->browser_policy_connector(), g_browser_process->system_network_context_manager() ->GetSharedURLLoaderFactory()); @@ -2915,7 +2937,7 @@ --- a/chrome/browser/ssl/ssl_browsertest.cc +++ b/chrome/browser/ssl/ssl_browsertest.cc -@@ -95,7 +95,6 @@ +@@ -94,7 +94,6 @@ #include "components/policy/policy_constants.h" #include "components/prefs/testing_pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2935,7 +2957,7 @@ #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" --- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc -@@ -44,7 +44,6 @@ +@@ -46,7 +46,6 @@ #include "components/autofill/core/common/autofill_features.h" #include "components/autofill/core/common/autofill_payments_features.h" #include "components/signin/public/base/signin_buildflags.h" @@ -2945,7 +2967,7 @@ #include "components/sync/service/sync_service.h" --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -87,7 +87,6 @@ +@@ -91,7 +91,6 @@ #include "components/sessions/core/tab_restore_service.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -2961,11 +2983,11 @@ #include "components/policy/core/common/policy_pref_names.h" -#include "components/signin/public/base/signin_pref_names.h" #include "content/public/test/web_contents_tester.h" + #include "extensions/buildflags/buildflags.h" #include "ui/events/keycodes/dom/dom_code.h" - #include "ui/events/keycodes/keyboard_codes.h" --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -82,7 +82,6 @@ +@@ -83,7 +83,6 @@ #if !BUILDFLAG(IS_ANDROID) #include "base/metrics/histogram_functions.h" #include "chrome/browser/signin/identity_manager_factory.h" @@ -3018,7 +3040,7 @@ product_specific_data["Is page info UI"] = false; product_specific_data["Is modal dialog UI"] = false; product_specific_data["Is interstitial UI"] = false; -@@ -440,31 +429,12 @@ void TrustSafetySentimentService::Intera +@@ -438,31 +427,12 @@ void TrustSafetySentimentService::Intera void TrustSafetySentimentService::InteractedWithSafeBrowsingInterstitial( bool did_proceed, safe_browsing::SBThreatType threat_type) { @@ -3052,7 +3074,7 @@ product_specific_data["Is download prompt UI"] = false; --- a/chrome/browser/ui/safety_hub/card_data_helper.cc +++ b/chrome/browser/ui/safety_hub/card_data_helper.cc -@@ -28,7 +28,6 @@ +@@ -29,7 +29,6 @@ #include "chrome/browser/upgrade_detector/build_state.h" #include "chrome/grit/branded_strings.h" #include "chrome/grit/generated_resources.h" @@ -3060,40 +3082,20 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "ui/base/l10n/l10n_util.h" -@@ -50,19 +49,6 @@ base::Value::Dict CardDataToValue(int he - - // Returns the state of Safe Browsing setting. - SafeBrowsingState GetSafeBrowsingState(PrefService* pref_service) { -- // TODO(crbug.com/40267370): Use SafeBrowsingResult from Safety Hub instead. -- if (safe_browsing::IsEnhancedProtectionEnabled(*pref_service)) { -- return SafeBrowsingState::kEnabledEnhanced; -- } -- if (safe_browsing::IsSafeBrowsingEnabled(*pref_service)) { -- return SafeBrowsingState::kEnabledStandard; -- } -- if (safe_browsing::IsSafeBrowsingPolicyManaged(*pref_service)) { -- return SafeBrowsingState::kDisabledByAdmin; -- } -- if (safe_browsing::IsSafeBrowsingExtensionControlled(*pref_service)) { -- return SafeBrowsingState::kDisabledByExtension; -- } - return SafeBrowsingState::kDisabledByUser; - } - --- a/chrome/browser/ui/safety_hub/menu_notification_service.cc +++ b/chrome/browser/ui/safety_hub/menu_notification_service.cc -@@ -20,7 +20,6 @@ - #include "chrome/browser/ui/safety_hub/safety_hub_service.h" +@@ -21,7 +21,6 @@ #include "chrome/browser/ui/safety_hub/unused_site_permissions_service.h" + #include "chrome/common/chrome_features.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - namespace { - SafetyHubModuleInfoElement::SafetyHubModuleInfoElement() = default; -@@ -102,15 +101,6 @@ SafetyHubMenuNotificationService::Safety - base::Unretained(password_check_service)), + #if !BUILDFLAG(IS_ANDROID) + #include "chrome/browser/ui/safety_hub/extensions_result.h" +@@ -114,15 +113,6 @@ SafetyHubMenuNotificationService::Safety stored_notifications); } + #endif // BUILDFLAG(IS_ANDROID) - - // Listen for changes to the Safe Browsing pref to accommodate the trigger - // logic. @@ -3116,29 +3118,25 @@ #include "ui/base/l10n/l10n_util.h" SafetyHubSafeBrowsingResult::SafetyHubSafeBrowsingResult( -@@ -28,22 +27,6 @@ SafetyHubSafeBrowsingResult::~SafetyHubS +@@ -35,18 +34,6 @@ SafetyHubSafeBrowsingResult::GetResult(c // static - std::optional> - SafetyHubSafeBrowsingResult::GetResult(const PrefService* pref_service) { + SafeBrowsingState SafetyHubSafeBrowsingResult::GetState( + const PrefService* pref_service) { - if (safe_browsing::IsEnhancedProtectionEnabled(*pref_service)) { -- return std::make_unique( -- SafeBrowsingState::kEnabledEnhanced); +- return SafeBrowsingState::kEnabledEnhanced; - } - if (safe_browsing::IsSafeBrowsingEnabled(*pref_service)) { -- return std::make_unique( -- SafeBrowsingState::kEnabledStandard); +- return SafeBrowsingState::kEnabledStandard; - } - if (safe_browsing::IsSafeBrowsingPolicyManaged(*pref_service)) { -- return std::make_unique( -- SafeBrowsingState::kDisabledByAdmin); +- return SafeBrowsingState::kDisabledByAdmin; - } - if (safe_browsing::IsSafeBrowsingExtensionControlled(*pref_service)) { -- return std::make_unique( -- SafeBrowsingState::kDisabledByExtension); +- return SafeBrowsingState::kDisabledByExtension; - } - return std::make_unique( - SafeBrowsingState::kDisabledByUser); + return SafeBrowsingState::kDisabledByUser; } + --- a/chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice.cc +++ b/chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice.cc @@ -23,7 +23,6 @@ @@ -3221,8 +3219,8 @@ PolicyEffect ComputeDevicePolicyEffect(Profile& profile) { - const PrefService* const local_state = g_browser_process->local_state(); -- if (!local_state->GetBoolean(prefs::kPromotionalTabsEnabled)) { -- // Corresponding policy: PromotionalTabsEnabled=false +- if (!local_state->GetBoolean(prefs::kPromotionsEnabled)) { +- // Corresponding policy: PromotionsEnabled=false - return PolicyEffect::kDisabled; - } - @@ -3267,7 +3265,7 @@ void SetFirstRunFinished(FirstRunService::FinishedReason reason) { --- a/chrome/browser/ui/toolbar/app_menu_model.cc +++ b/chrome/browser/ui/toolbar/app_menu_model.cc -@@ -100,7 +100,6 @@ +@@ -104,7 +104,6 @@ #include "components/profile_metrics/browser_profile_type.h" #include "components/saved_tab_groups/features.h" #include "components/signin/public/base/signin_metrics.h" @@ -3275,7 +3273,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" #include "components/vector_icons/vector_icons.h" -@@ -575,53 +574,7 @@ int ProfileSubMenuModel::GetAndIncrement +@@ -629,53 +628,7 @@ int ProfileSubMenuModel::GetAndIncrement } bool ProfileSubMenuModel::BuildSyncSection() { @@ -3356,10 +3354,10 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" - #include "components/signin/public/identity_manager/primary_account_change_event.h" -@@ -1550,18 +1549,6 @@ void AvatarToolbarButtonDelegate::OnErro +@@ -1564,18 +1563,6 @@ void AvatarToolbarButtonDelegate::OnErro const CoreAccountInfo& account_info, const GoogleServiceAuthError& error, signin_metrics::SourceForRefreshTokenOperation token_operation_source) { @@ -3388,7 +3386,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -653,7 +652,6 @@ void ProfileMenuView::BuildAutofillButto +@@ -644,7 +643,6 @@ void ProfileMenuView::BuildAutofillButto void ProfileMenuView::BuildSyncInfo() { Profile* profile = browser()->profile(); @@ -3471,7 +3469,7 @@ #include "content/public/browser/render_process_host.h" --- a/chrome/browser/ui/views/toolbar/app_menu.cc +++ b/chrome/browser/ui/views/toolbar/app_menu.cc -@@ -58,7 +58,6 @@ +@@ -61,7 +61,6 @@ #include "chrome/grit/theme_resources.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/saved_tab_groups/features.h" @@ -3479,7 +3477,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/zoom/page_zoom.h" #include "components/zoom/zoom_controller.h" -@@ -388,61 +387,6 @@ void AddSignedInChipToProfileMenuItem( +@@ -391,61 +390,6 @@ void AddSignedInChipToProfileMenuItem( const int horizontal_padding, std::vector& profile_menu_subscription_list) { @@ -3541,17 +3539,28 @@ } // AppMenuView is a view that can contain label buttons. +--- a/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc ++++ b/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc +@@ -909,8 +909,6 @@ void FedCmAccountSelectionView::OnChoose + ShowMultiAccountPicker(idp_display_data_list_, + /*show_back_button=*/true, + /*is_choose_an_account=*/true); +- base::UmaHistogramBoolean("Blink.FedCm.ChooseAnAccountSelected.Desktop", +- true); + } + + void FedCmAccountSelectionView::OnPopupWindowDestroyed() { --- a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc +++ b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc -@@ -26,7 +26,6 @@ +@@ -27,7 +27,6 @@ #include "components/performance_manager/public/features.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/safe_browsing/core/common/safebrowsing_referral_methods.h" + #include "components/saved_tab_groups/features.h" #include "components/user_education/common/tutorial_identifier.h" - #include "components/user_education/common/tutorial_service.h" -@@ -76,13 +75,6 @@ void BrowserCommandHandler::CanExecuteCo +@@ -78,13 +77,6 @@ void BrowserCommandHandler::CanExecuteCo case Command::kOpenSafetyCheck: can_execute = !chrome::enterprise_util::IsBrowserManaged(profile_); break; @@ -3577,7 +3586,7 @@ #include "content/public/browser/download_item_utils.h" --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc -@@ -56,7 +56,6 @@ +@@ -59,7 +59,6 @@ #include "components/page_image_service/image_service.h" #include "components/page_image_service/image_service_handler.h" #include "components/prefs/pref_service.h" @@ -3585,7 +3594,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" -@@ -163,8 +162,6 @@ content::WebUIDataSource* CreateAndAddHi +@@ -174,8 +173,6 @@ content::WebUIDataSource* CreateAndAddHi source->AddBoolean("allowDeletingHistory", allow_deleting_history); source->AddBoolean("isGuestSession", profile->IsGuestSession()); @@ -3606,7 +3615,7 @@ #include "content/public/browser/web_contents.h" --- a/chrome/browser/ui/webui/policy/policy_ui_handler.cc +++ b/chrome/browser/ui/webui/policy/policy_ui_handler.cc -@@ -76,7 +76,6 @@ +@@ -78,7 +78,6 @@ #include "components/policy/proto/device_management_backend.pb.h" #include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_service.h" @@ -3614,7 +3623,7 @@ #include "components/strings/grit/components_strings.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" -@@ -326,15 +325,6 @@ void PolicyUIHandler::HandleSetLocalTest +@@ -334,15 +333,6 @@ void PolicyUIHandler::HandleSetLocalTest CHECK(local_test_provider); @@ -3630,10 +3639,10 @@ Profile::FromWebUI(web_ui()) ->GetProfilePolicyConnector() ->UseLocalTestPolicyProvider(); -@@ -346,13 +336,6 @@ void PolicyUIHandler::HandleSetLocalTest - - void PolicyUIHandler::HandleRevertLocalTestPolicies( - const base::Value::List& args) { +@@ -356,13 +346,6 @@ void PolicyUIHandler::HandleRevertLocalT + if (!PolicyUI::ShouldLoadTestPage(Profile::FromWebUI(web_ui()))) { + return; + } -#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) - Profile::FromWebUI(web_ui())->GetPrefs()->ClearPref( - prefs::kUserCloudSigninPolicyResponseFromPolicyTestPage); @@ -3688,7 +3697,7 @@ #include "components/user_prefs/user_prefs.h" --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -50,7 +50,6 @@ +@@ -51,7 +51,6 @@ #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -3696,7 +3705,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -389,10 +388,6 @@ void PeopleHandler::OnJavascriptAllowed( +@@ -394,10 +393,6 @@ void PeopleHandler::OnJavascriptAllowed( PrefService* prefs = profile_->GetPrefs(); profile_pref_registrar_ = std::make_unique(); profile_pref_registrar_->Init(prefs); @@ -3719,7 +3728,7 @@ #include "content/public/browser/storage_partition.h" --- a/chrome/browser/ui/webui/settings/safety_hub_handler.cc +++ b/chrome/browser/ui/webui/settings/safety_hub_handler.cc -@@ -48,7 +48,6 @@ +@@ -49,7 +49,6 @@ #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/permissions/constants.h" #include "components/safe_browsing/core/common/features.h" @@ -3737,7 +3746,7 @@ #include "components/saved_tab_groups/features.h" #include "components/search_engines/search_engine_choice/search_engine_choice_service.h" #include "components/signin/public/base/signin_buildflags.h" -@@ -3331,11 +3330,6 @@ void AddSiteSettingsStrings(content::Web +@@ -3369,11 +3368,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -3751,7 +3760,7 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -100,7 +100,6 @@ +@@ -99,7 +99,6 @@ #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" #include "components/search_engines/search_engine_choice/search_engine_choice_service.h" #include "components/search_engines/search_engine_choice/search_engine_choice_utils.h" @@ -3759,7 +3768,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "content/public/browser/url_data_source.h" -@@ -313,9 +312,7 @@ SettingsUI::SettingsUI(content::WebUI* w +@@ -307,9 +306,7 @@ SettingsUI::SettingsUI(content::WebUI* w } #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -3835,10 +3844,10 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/strings/grit/components_strings.h" #include "content/public/browser/web_contents.h" -@@ -351,23 +350,6 @@ base::Value::Dict ManagedUserProfileNoti +@@ -401,23 +400,6 @@ base::Value::Dict ManagedUserProfileNoti profile_creation_required_by_policy_ ? IDS_ENTERPRISE_PROFILE_WELCOME_CREATE_PROFILE_BUTTON - : IDS_WELCOME_SIGNIN_VIEW_SIGNIN)); + : IDS_APP_CONTINUE)); -#if !BUILDFLAG(IS_CHROMEOS) - // We apply the checkLinkDataCheckboxByDefault to true value only if the - // link data checkbox is visible and the policy @@ -4109,7 +4118,7 @@ void AddressDataManager::SetAutofillSelectableTypeEnabled(bool enabled) { --- a/components/browser_sync/BUILD.gn +++ b/components/browser_sync/BUILD.gn -@@ -17,8 +17,6 @@ static_library("browser_sync") { +@@ -18,8 +18,6 @@ static_library("browser_sync") { "sync_api_component_factory_impl.h", "sync_client_utils.cc", "sync_client_utils.h", @@ -4125,10 +4134,10 @@ #include "components/offline_pages/task/closure_task.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" - #include "ui/base/l10n/l10n_util.h" namespace feed { -@@ -174,9 +173,6 @@ FeedStream::FeedStream(RefreshTaskSchedu + namespace { +@@ -173,9 +172,6 @@ FeedStream::FeedStream(RefreshTaskSchedu snippets_enabled_by_dse_.Init(prefs::kEnableSnippetsByDse, profile_prefs, preference_change_callback); has_stored_data_.Init(feed::prefs::kHasStoredData, profile_prefs); @@ -4148,7 +4157,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "net/base/network_change_notifier.h" -@@ -192,7 +191,7 @@ class FeedService::StreamDelegateImpl : +@@ -190,7 +189,7 @@ class FeedService::StreamDelegateImpl : // Returns if signin is allowed on Android. Return true on other platform so // behavior is unchanged there. bool IsSigninAllowed() override { @@ -4187,7 +4196,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/sync/base/pref_names.h" -@@ -397,15 +396,7 @@ bool ShouldShowAccountStorageSettingTogg +@@ -392,15 +391,7 @@ bool ShouldShowAccountStorageSettingTogg } bool AreAccountStorageOptInPromosAllowed() { @@ -4313,7 +4322,7 @@ void PasswordReuseManagerImpl::RequestLoginsFromStores() { --- a/components/password_manager/core/browser/password_store/password_store.cc +++ b/components/password_manager/core/browser/password_store/password_store.cc -@@ -36,7 +36,6 @@ +@@ -37,7 +37,6 @@ #include "components/password_manager/core/common/password_manager_features.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" @@ -4353,7 +4362,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" -@@ -703,7 +702,7 @@ StoreMetricsReporter::StoreMetricsReport +@@ -693,7 +692,7 @@ StoreMetricsReporter::StoreMetricsReport is_opted_in_account_storage_ = features_util::IsOptedInForAccountStorage(prefs_, sync_service); @@ -4490,27 +4499,27 @@ #include "components/security_interstitials/core/unsafe_resource.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" -@@ -101,16 +100,16 @@ SBErrorOptions TriggerManager::GetSBErro - const PrefService& pref_service, +@@ -102,16 +101,16 @@ SBErrorOptions TriggerManager::GetSBErro content::WebContents* web_contents) { - return SBErrorOptions(/*is_main_frame_load_pending=*/false, -- IsExtendedReportingOptInAllowed(pref_service), -+ /*IsExtendedReportingOptInAllowed(pref_service)*/false, - web_contents->GetBrowserContext()->IsOffTheRecord(), -- IsExtendedReportingEnabled(pref_service), -- IsExtendedReportingPolicyManaged(pref_service), -- IsEnhancedProtectionEnabled(pref_service), -+ /*IsExtendedReportingEnabled(pref_service)*/false, -+ /*IsExtendedReportingPolicyManaged(pref_service)*/false, -+ /*IsEnhancedProtectionEnabled(pref_service)*/false, - /*is_proceed_anyway_disabled=*/false, - /*should_open_links_in_new_tab=*/false, - /*always_show_back_to_safety=*/true, -- /*is_enhanced_protection_message_enabled=*/true, -- IsSafeBrowsingPolicyManaged(pref_service), -+ /*is_enhanced_protection_message_enabled=*/false, -+ /*IsSafeBrowsingPolicyManaged(pref_service)*/false, - /*help_center_article_link=*/std::string()); + return SBErrorOptions( + /*is_main_frame_load_pending=*/false, +- IsExtendedReportingOptInAllowed(pref_service), ++ /*IsExtendedReportingOptInAllowed(pref_service)*/false, + web_contents->GetBrowserContext()->IsOffTheRecord(), +- IsExtendedReportingEnabledBypassDeprecationFlag(pref_service), +- IsExtendedReportingPolicyManaged(pref_service), +- IsEnhancedProtectionEnabled(pref_service), ++ /*IsExtendedReportingEnabledBypassDeprecationFlag(pref_service)*/false, ++ /*IsExtendedReportingPolicyManaged(pref_service)*/false, ++ /*IsEnhancedProtectionEnabled(pref_service)*/false, + /*is_proceed_anyway_disabled=*/false, + /*should_open_links_in_new_tab=*/false, + /*always_show_back_to_safety=*/true, +- /*is_enhanced_protection_message_enabled=*/true, +- IsSafeBrowsingPolicyManaged(pref_service), ++ /*is_enhanced_protection_message_enabled=*/false, ++ /*IsSafeBrowsingPolicyManaged(pref_service)*/false, + /*help_center_article_link=*/std::string()); } --- a/components/safe_browsing/content/browser/triggers/trigger_throttler.cc @@ -4596,7 +4605,7 @@ #include "content/public/browser/global_routing_id.h" #include "services/network/public/mojom/cookie_manager.mojom.h" #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -1810,17 +1809,7 @@ std::string SerializeHitReport(const Hit +@@ -1814,17 +1813,7 @@ std::string SerializeHitReport(const Hit } hit_report_dict.Set("threat_source", threat_source); std::string extended_reporting_level; @@ -4614,7 +4623,7 @@ hit_report_dict.Set("extended_reporting_level", extended_reporting_level); hit_report_dict.Set("is_enhanced_protection", hit_report.is_enhanced_protection); -@@ -3095,18 +3084,13 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -3100,18 +3089,13 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); DCHECK(!args.empty()); std::string callback_id = args[0].GetString(); @@ -4664,7 +4673,7 @@ --- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc +++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc -@@ -282,12 +282,9 @@ const V4LocalDatabaseManager* +@@ -287,12 +287,9 @@ const V4LocalDatabaseManager* scoped_refptr V4LocalDatabaseManager::Create( const base::FilePath& base_path, scoped_refptr ui_task_runner, @@ -4679,7 +4688,7 @@ std::move(io_task_runner), nullptr)); } -@@ -310,17 +307,12 @@ void V4LocalDatabaseManager::CollectData +@@ -315,17 +312,12 @@ void V4LocalDatabaseManager::CollectData V4LocalDatabaseManager::V4LocalDatabaseManager( const base::FilePath& base_path, @@ -4697,7 +4706,7 @@ list_infos_(GetListInfos()), task_runner_(task_runner_for_tests ? task_runner_for_tests -@@ -657,12 +649,6 @@ void V4LocalDatabaseManager::DatabaseRea +@@ -659,12 +651,6 @@ void V4LocalDatabaseManager::DatabaseRea v4_database_ = std::move(v4_database); v4_database_->RecordFileSizeHistograms(); @@ -4710,7 +4719,7 @@ PopulateArtificialDatabase(); -@@ -1237,8 +1223,7 @@ void V4LocalDatabaseManager::SetupUpdate +@@ -1247,8 +1233,7 @@ void V4LocalDatabaseManager::SetupUpdate weak_factory_.GetWeakPtr()); v4_update_protocol_manager_ = V4UpdateProtocolManager::Create( @@ -4722,7 +4731,7 @@ void V4LocalDatabaseManager::UpdateRequestCompleted( --- a/components/safe_browsing/core/browser/db/v4_local_database_manager.h +++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.h -@@ -41,9 +41,7 @@ class V4LocalDatabaseManager : public Sa +@@ -44,9 +44,7 @@ class V4LocalDatabaseManager : public Sa static scoped_refptr Create( const base::FilePath& base_path, scoped_refptr ui_task_runner, @@ -4733,7 +4742,7 @@ V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete; V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete; -@@ -115,8 +113,6 @@ class V4LocalDatabaseManager : public Sa +@@ -117,8 +115,6 @@ class V4LocalDatabaseManager : public Sa // Must be initialized by calling StartOnSBThread() before using. V4LocalDatabaseManager( const base::FilePath& base_path, @@ -4742,7 +4751,7 @@ scoped_refptr ui_task_runner, scoped_refptr io_task_runner, scoped_refptr task_runner_for_tests); -@@ -428,13 +424,6 @@ class V4LocalDatabaseManager : public Sa +@@ -440,13 +436,6 @@ class V4LocalDatabaseManager : public Sa // ready to process next update. DatabaseUpdatedCallback db_updated_callback_; @@ -4967,7 +4976,7 @@ // policy. --- a/components/safe_browsing/core/browser/ping_manager.cc +++ b/components/safe_browsing/core/browser/ping_manager.cc -@@ -479,7 +479,7 @@ GURL PingManager::SafeBrowsingHitUrl( +@@ -480,7 +480,7 @@ GURL PingManager::SafeBrowsingHitUrl( hit_report->threat_type == SB_THREAT_TYPE_URL_BINARY_MALWARE || hit_report->threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING); std::string url = @@ -5053,8 +5062,8 @@ + return false; } - void RealTimeUrlLookupService::Shutdown() { -@@ -235,14 +227,6 @@ RealTimeUrlLookupService::GetMinAllowedT + std::string RealTimeUrlLookupService::GetUserEmail() const { +@@ -239,14 +231,6 @@ RealTimeUrlLookupService::GetMinAllowedT void RealTimeUrlLookupService::MaybeLogLastProtegoPingTimeToPrefs( bool sent_with_token) { @@ -5071,7 +5080,7 @@ void RealTimeUrlLookupService::MaybeLogProtegoPingCookieHistograms( --- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -16,7 +16,6 @@ +@@ -17,7 +17,6 @@ #include "components/safe_browsing/core/browser/referrer_chain_provider.h" #include "components/safe_browsing/core/browser/verdict_cache_manager.h" #include "components/safe_browsing/core/common/features.h" @@ -5944,6 +5953,19 @@ } void AccountReconcilor::RegisterWithAllDependencies() { +@@ -300,12 +289,6 @@ void AccountReconcilor::RegisterWithIden + return; + + identity_manager_->AddObserver(this); +-#if BUILDFLAG(ENABLE_DICE_SUPPORT) +- pref_observer_.Add( +- prefs::kExplicitBrowserSignin, +- base::BindRepeating(&MaybeMigrateClearOnExit, std::ref(*client_), +- std::ref(*identity_manager_))); +-#endif + registered_with_identity_manager_ = true; + } + --- a/components/signin/core/browser/account_reconcilor_unittest.cc +++ b/components/signin/core/browser/account_reconcilor_unittest.cc @@ -35,7 +35,6 @@ @@ -5964,6 +5986,40 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "components/signin/public/identity_manager/accounts_mutator.h" +--- a/components/signin/core/browser/signin_metrics_service.cc ++++ b/components/signin/core/browser/signin_metrics_service.cc +@@ -18,7 +18,6 @@ + #include "components/prefs/scoped_user_pref_update.h" + #include "components/signin/public/base/consent_level.h" + #include "components/signin/public/base/signin_metrics.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" + #include "components/signin/public/base/signin_switches.h" + #include "components/signin/public/identity_manager/account_info.h" +@@ -240,23 +239,6 @@ void SigninMetricsService::OnRefreshToke + #if BUILDFLAG(ENABLE_DICE_SUPPORT) + + void SigninMetricsService::RecordExplicitSigninMigrationStatus() { +- ExplicitSigninMigration explicit_signin_migration = +- ExplicitSigninMigration::kMigratedSignedOut; +- const bool explicit_signin_pref = +- pref_service_->GetBoolean(prefs::kExplicitBrowserSignin); +- if (identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSync)) { +- explicit_signin_migration = +- explicit_signin_pref ? ExplicitSigninMigration::kMigratedSyncing +- : ExplicitSigninMigration::kNotMigratedSyncing; +- } else if (identity_manager_->HasPrimaryAccount( +- signin::ConsentLevel::kSignin)) { +- explicit_signin_migration = +- explicit_signin_pref ? ExplicitSigninMigration::kMigratedSignedIn +- : ExplicitSigninMigration::kNotMigratedSignedIn; +- } +- +- base::UmaHistogramEnumeration(kExplicitSigninMigrationHistogramName, +- explicit_signin_migration); + } + + void SigninMetricsService::MaybeRecordWebSigninToChromeSigninMetrics( --- a/components/signin/internal/identity_manager/account_tracker_service.cc +++ b/components/signin/internal/identity_manager/account_tracker_service.cc @@ -38,7 +38,6 @@ @@ -6304,10 +6360,10 @@ -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" - #include "components/signin/public/webdata/token_web_data.h" + #include "components/signin/public/webdata/token_service_table.h" --- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc +++ b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc -@@ -27,7 +27,6 @@ +@@ -28,7 +28,6 @@ #include "components/signin/public/base/account_consistency_method.h" #include "components/signin/public/base/device_id_helper.h" #include "components/signin/public/base/signin_metrics.h" @@ -6322,10 +6378,10 @@ #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" - #include "google_apis/gaia/core_account_id.h" -@@ -214,15 +213,6 @@ PrimaryAccountManager::PrimaryAccountMan +@@ -215,100 +214,19 @@ PrimaryAccountManager::PrimaryAccountMan account_tracker_service_(account_tracker_service) { DCHECK(client_); DCHECK(account_tracker_service_); @@ -6337,11 +6393,15 @@ - scoped_pref_commit.ClearPref(prefs::kExplicitBrowserSignin); - scoped_pref_commit.ClearPref( - prefs::kCookieClearOnExitMigrationNoticeComplete); +- } else { +- signin_allowed_.Init( +- prefs::kSigninAllowed, client_->GetPrefs(), +- base::BindRepeating(&PrimaryAccountManager::OnSigninAllowedPrefChanged, +- base::Unretained(this))); - } } - PrimaryAccountManager::~PrimaryAccountManager() { -@@ -231,80 +221,13 @@ PrimaryAccountManager::~PrimaryAccountMa + PrimaryAccountManager::~PrimaryAccountManager() = default; // static void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { @@ -6422,7 +6482,7 @@ } std::pair -@@ -332,46 +255,10 @@ PrimaryAccountManager::GetOrRestorePrima +@@ -336,46 +254,10 @@ PrimaryAccountManager::GetOrRestorePrima kEmptyAccountInfo_RestoreFailedNotSyncConsented); } @@ -6469,7 +6529,7 @@ } void PrimaryAccountManager::Initialize() { -@@ -381,11 +268,9 @@ void PrimaryAccountManager::Initialize() +@@ -385,11 +267,9 @@ void PrimaryAccountManager::Initialize() // Prepare prefs before loading them. PrepareToLoadPrefs(); @@ -6483,7 +6543,7 @@ LogPrimaryAccountPrefsOnInitialize(pref_account_id, pref_consented_to_sync); ScopedPrefCommit scoped_pref_commit(client_->GetPrefs(), -@@ -403,14 +288,6 @@ void PrimaryAccountManager::Initialize() +@@ -407,14 +287,6 @@ void PrimaryAccountManager::Initialize() if (pref_consented_to_sync && !account_info.IsEmpty()) { SetPrimaryAccountInternal(account_info, /*consented_to_sync=*/true, scoped_pref_commit); @@ -6495,10 +6555,10 @@ - account_info.gaia); - scoped_pref_commit.SetString(prefs::kGoogleServicesLastSyncingUsername, - account_info.email); - } else { - SetPrimaryAccountInternal(account_info, /*consented_to_sync=*/false, - scoped_pref_commit); -@@ -537,10 +414,6 @@ void PrimaryAccountManager::SetSyncPrima + } else if (ShouldSigninAllowedPrefAffectPrimaryAccount( + pref_consented_to_sync)) { + SetPrimaryAccountInternal(CoreAccountInfo(), /*consented_to_sync=*/false, +@@ -545,10 +417,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. @@ -6509,7 +6569,7 @@ } void PrimaryAccountManager::SetPrimaryAccountInternal( -@@ -552,22 +425,6 @@ void PrimaryAccountManager::SetPrimaryAc +@@ -560,22 +428,6 @@ void PrimaryAccountManager::SetPrimaryAc // 'account_info' might be a reference to the contents of `primary_account_`. // Create a PrimaryAccount object before calling emplace to avoid crashes. primary_account_.emplace(PrimaryAccount(account_info, consented_to_sync)); @@ -6532,7 +6592,7 @@ } void PrimaryAccountManager::RecordHadPreviousSyncAccount() const { -@@ -577,7 +434,7 @@ void PrimaryAccountManager::RecordHadPre +@@ -585,7 +437,7 @@ void PrimaryAccountManager::RecordHadPre } const std::string& last_gaia_id_with_sync_enabled = @@ -6541,7 +6601,7 @@ const bool existed_primary_account_with_sync = !last_gaia_id_with_sync_enabled.empty(); -@@ -727,38 +584,6 @@ PrimaryAccountChangeEvent::State Primary +@@ -735,38 +587,6 @@ PrimaryAccountChangeEvent::State Primary void PrimaryAccountManager::ComputeExplicitBrowserSignin( const PrimaryAccountChangeEvent& event_details, ScopedPrefCommit& scoped_pref_commit) { @@ -6580,16 +6640,24 @@ } void PrimaryAccountManager::FirePrimaryAccountChanged( +@@ -850,7 +670,6 @@ void PrimaryAccountManager::OnSigninAllo + bool PrimaryAccountManager::ShouldSigninAllowedPrefAffectPrimaryAccount( + bool is_sync_consent) { + return switches::IsExplicitBrowserSigninUIOnDesktopEnabled() && +- !signin_allowed_.GetValue() && + // If sync is enabled, we do not directly clear the primary account. + // This is handled by `PrimaryAccountPolicyManager`. That flow is + // extremely hard to follow especially for the case when the user is --- a/components/signin/internal/identity_manager/primary_account_manager_unittest.cc +++ b/components/signin/internal/identity_manager/primary_account_manager_unittest.cc -@@ -29,7 +29,6 @@ +@@ -30,7 +30,6 @@ #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/base/test_signin_client.h" - #include "components/signin/public/identity_manager/account_info.h" --- a/components/signin/internal/identity_manager/primary_account_mutator_impl.cc +++ b/components/signin/internal/identity_manager/primary_account_mutator_impl.cc @@ -17,7 +17,6 @@ @@ -6619,7 +6687,7 @@ #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_access_token_consumer.h" -@@ -98,8 +97,6 @@ bool ProfileOAuth2TokenService::HasRefre +@@ -103,8 +102,6 @@ bool ProfileOAuth2TokenService::HasRefre // static void ProfileOAuth2TokenService::RegisterProfilePrefs( PrefRegistrySimple* registry) { @@ -6630,7 +6698,7 @@ ProfileOAuth2TokenServiceDelegate* ProfileOAuth2TokenService::GetDelegate() { --- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc +++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc -@@ -27,7 +27,6 @@ +@@ -28,7 +28,6 @@ #include "components/account_manager_core/mock_account_manager_facade.h" #include "components/signin/internal/identity_manager/account_tracker_service.h" #include "components/signin/internal/identity_manager/profile_oauth2_token_service_observer.h" @@ -6640,7 +6708,7 @@ #include "components/sync_preferences/testing_pref_service_syncable.h" --- a/components/signin/public/base/BUILD.gn +++ b/components/signin/public/base/BUILD.gn -@@ -167,8 +167,6 @@ component("signin_switches") { +@@ -177,8 +177,6 @@ component("signin_switches") { defines = [ "IS_SIGNIN_SWITCHES_IMPL" ] sources = [ @@ -6742,7 +6810,7 @@ namespace { // Name of the main pref dictionary holding the account dictionaries of the -@@ -60,8 +59,6 @@ SigninPrefs::~SigninPrefs() = default; +@@ -71,8 +70,6 @@ SigninPrefs::~SigninPrefs() = default; void SigninPrefs::RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterDictionaryPref(kSigninAccountPrefs); @@ -6761,7 +6829,7 @@ namespace switches { -@@ -57,11 +56,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti +@@ -61,11 +60,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti base::FEATURE_DISABLED_BY_DEFAULT); bool IsBoundSessionCredentialsEnabled(const PrefService* profile_prefs) { @@ -6775,15 +6843,15 @@ --- a/components/signin/public/identity_manager/identity_utils.cc +++ b/components/signin/public/identity_manager/identity_utils.cc -@@ -11,7 +11,6 @@ - #include "base/strings/string_util.h" +@@ -14,7 +14,6 @@ #include "base/strings/utf_string_conversions.h" #include "components/prefs/pref_service.h" + #include "components/signin/public/base/consent_level.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" + #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "components/signin/public/identity_manager/identity_manager.h" - #include "third_party/icu/source/i18n/unicode/regex.h" -@@ -58,21 +57,13 @@ bool IsUsernameAllowedByPattern(std::str +@@ -63,21 +62,13 @@ bool IsUsernameAllowedByPattern(std::str bool IsUsernameAllowedByPatternFromPrefs(const PrefService* prefs, const std::string& username) { @@ -6809,14 +6877,14 @@ bool AreGoogleCookiesRebuiltAfterClearingWhenSignedIn( --- a/components/signin/public/identity_manager/identity_utils_unittest.cc +++ b/components/signin/public/identity_manager/identity_utils_unittest.cc -@@ -11,7 +11,6 @@ +@@ -12,7 +12,6 @@ #include "components/prefs/pref_service.h" #include "components/prefs/testing_pref_service.h" #include "components/signin/public/base/consent_level.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" + #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "components/signin/public/identity_manager/identity_manager.h" - #include "components/signin/public/identity_manager/identity_test_environment.h" --- a/components/signin/public/identity_manager/primary_account_mutator_unittest.cc +++ b/components/signin/public/identity_manager/primary_account_mutator_unittest.cc @@ -16,7 +16,6 @@ @@ -6862,7 +6930,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "components/sync/base/passphrase_enums.h" -@@ -251,7 +250,7 @@ bool SyncPrefs::IsInitialSyncFeatureSetu +@@ -238,7 +237,7 @@ bool SyncPrefs::IsInitialSyncFeatureSetu } bool SyncPrefs::IsExplicitBrowserSignin() const { @@ -6871,7 +6939,7 @@ } #if !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -303,16 +302,6 @@ UserSelectableTypeSet SyncPrefs::GetSele +@@ -290,16 +289,6 @@ UserSelectableTypeSet SyncPrefs::GetSele type == UserSelectableType::kAutofill) { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) type_enabled = true; @@ -6888,10 +6956,10 @@ #endif } else if (type == UserSelectableType::kBookmarks || type == UserSelectableType::kReadingList) { -@@ -1109,25 +1098,6 @@ void SyncPrefs::MaybeMigratePasswordsToP +@@ -1078,30 +1067,6 @@ void SyncPrefs::MaybeMigrateAutofillToPe return; } - pref_service->SetBoolean(kPasswordsPerAccountPrefMigrationDone, true); + pref_service->SetBoolean(kAutofillPerAccountPrefMigrationDone, true); - - std::string last_syncing_gaia_id = - pref_service->GetString(::prefs::kGoogleServicesLastSyncingGaiaId); @@ -6899,18 +6967,23 @@ - return; - } - -- bool global_password_setting_enabled = -- pref_service->GetBoolean(prefs::internal::kSyncKeepEverythingSynced) || -- pref_service->GetBoolean( -- GetPrefNameForType(UserSelectableType::kPasswords)); -- if (global_password_setting_enabled) { +- if (pref_service->GetBoolean(prefs::internal::kSyncKeepEverythingSynced)) { - return; - } - -- SetAccountKeyedPrefDictEntry( -- pref_service, prefs::internal::kSelectedTypesPerAccount, -- signin::GaiaIdHash::FromGaiaId(last_syncing_gaia_id), -- GetPrefNameForType(UserSelectableType::kPasswords), base::Value(false)); +- for (auto user_selectable_type : +- {UserSelectableType::kPasswords, UserSelectableType::kAutofill}) { +- const char* const pref_name_for_type = +- GetPrefNameForType(user_selectable_type); +- if (pref_service->GetBoolean(pref_name_for_type)) { +- continue; +- } +- +- SetAccountKeyedPrefDictEntry( +- pref_service, prefs::internal::kSelectedTypesPerAccount, +- signin::GaiaIdHash::FromGaiaId(last_syncing_gaia_id), +- pref_name_for_type, base::Value(false)); +- } } #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) @@ -6953,7 +7026,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) --- a/content/browser/webid/federated_auth_request_impl.cc +++ b/content/browser/webid/federated_auth_request_impl.cc -@@ -578,31 +578,6 @@ FederatedAuthRequestImpl::~FederatedAuth +@@ -556,31 +556,6 @@ FederatedAuthRequestImpl::~FederatedAuth void FederatedAuthRequestImpl::Create( RenderFrameHost* host, mojo::PendingReceiver receiver) { diff --git a/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch b/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch index c0a6a41b..4aecc771 100644 --- a/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch +++ b/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch @@ -1,8 +1,8 @@ --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json -@@ -125,27 +125,11 @@ - }, - +@@ -133,27 +133,11 @@ + // TODO(b/343792225): Identify a way to resolve this problem and implement + // necessary changes. "google": { - "name": "Google", - "keyword": "google.com", diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index 4868bb6b..9681dbf5 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 -@@ -169,6 +169,7 @@ +@@ -172,6 +172,7 @@ #include "components/supervised_user/core/browser/supervised_user_preferences.h" #include "components/supervised_user/core/browser/supervised_user_service.h" #include "components/supervised_user/core/browser/supervised_user_url_filter.h" @@ -9,7 +9,7 @@ #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" -@@ -2265,6 +2266,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -2282,6 +2283,7 @@ void RenderViewContextMenu::AppendPageIt } if (CanTranslate(/*menu_logging=*/true)) { @@ -47,7 +47,7 @@ request_pending_ = true; --- a/components/translate/core/browser/translate_manager.cc +++ b/components/translate/core/browser/translate_manager.cc -@@ -834,8 +834,9 @@ void TranslateManager::FilterIsTranslate +@@ -837,8 +837,9 @@ void TranslateManager::FilterIsTranslate TriggerDecision::kDisabledOffline); } @@ -88,7 +88,7 @@ translate_event->set_ranker_version(GetModelVersion()); --- a/components/translate/core/browser/translate_script.cc +++ b/components/translate/core/browser/translate_script.cc -@@ -139,8 +139,13 @@ void TranslateScript::OnScriptFetchCompl +@@ -138,8 +138,13 @@ void TranslateScript::OnScriptFetchCompl server_params.c_str()); GURL security_origin = translate::GetTranslateSecurityOrigin(); diff --git a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch index d422d772..791b3254 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 -@@ -2593,6 +2593,7 @@ static_library("browser") { +@@ -2584,6 +2584,7 @@ static_library("browser") { "//third_party/libyuv", "//third_party/metrics_proto", "//third_party/re2", @@ -19,7 +19,7 @@ "//third_party/widevine/cdm:headers", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -172,6 +172,7 @@ +@@ -171,6 +171,7 @@ #include "components/translate/core/common/translate_util.h" #include "components/trusted_vault/features.h" #include "components/ui_devtools/switches.h" @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -256,6 +256,7 @@ source_set("browser") { +@@ -271,6 +271,7 @@ source_set("browser") { "//third_party/libyuv", "//third_party/re2", "//third_party/sqlite", @@ -54,7 +54,7 @@ "//tools/v8_context_snapshot:buildflags", --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -79,6 +79,7 @@ +@@ -78,6 +78,7 @@ #include "components/services/storage/public/cpp/quota_error_or.h" #include "components/services/storage/public/mojom/cache_storage_control.mojom.h" #include "components/tracing/common/tracing_switches.h" @@ -62,7 +62,7 @@ #include "components/viz/common/switches.h" #include "components/viz/host/gpu_client.h" #include "content/browser/bad_message.h" -@@ -3515,6 +3516,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3216,6 +3217,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLImageChromium, switches::kEnableWebGPUDeveloperFeatures, switches::kFileUrlPathAlias, @@ -91,7 +91,7 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -492,6 +493,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -489,6 +490,10 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kEnableWebGPUDeveloperFeatures, true}, {wrf::EnableWebGPUExperimentalFeatures, switches::kEnableUnsafeWebGPU, true}, @@ -116,7 +116,7 @@ --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -40,6 +40,7 @@ +@@ -45,6 +45,7 @@ #include "base/i18n/time_formatting.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" @@ -124,7 +124,7 @@ #include "base/ranges/algorithm.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" -@@ -907,6 +908,11 @@ Document::Document(const DocumentInit& i +@@ -916,6 +917,11 @@ Document::Document(const DocumentInit& i TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this), TRACE_EVENT_FLAG_FLOW_OUT); DCHECK(agent_); @@ -136,7 +136,7 @@ if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) && features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) { script_runner_delayer_->Activate(); -@@ -1022,6 +1028,14 @@ const Position Document::PositionAdjuste +@@ -1031,6 +1037,14 @@ const Position Document::PositionAdjuste return Position::BeforeNode(*shadow_host); } @@ -153,7 +153,7 @@ selector_query_cache_ = std::make_unique(); --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -549,6 +549,10 @@ class CORE_EXPORT Document : public Cont +@@ -552,6 +552,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -164,7 +164,7 @@ AtomicString visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -2554,6 +2558,9 @@ class CORE_EXPORT Document : public Cont +@@ -2574,6 +2578,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -176,7 +176,7 @@ --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2425,6 +2425,11 @@ DOMRectList* Element::getClientRects() { +@@ -2439,6 +2439,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads, *element_layout_object); @@ -188,7 +188,7 @@ return MakeGarbageCollected(quads); } -@@ -2452,6 +2457,9 @@ gfx::RectF Element::GetBoundingClientRec +@@ -2466,6 +2471,9 @@ gfx::RectF Element::GetBoundingClientRec DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -228,7 +228,7 @@ // TODO(editing-dev): We should make --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc -@@ -74,6 +74,24 @@ TextMetrics::TextMetrics(const Font& fon +@@ -79,6 +79,24 @@ TextMetrics::TextMetrics(const Font& fon Update(font, direction, baseline, align, text); } @@ -255,9 +255,9 @@ const TextBaseline& baseline, --- a/third_party/blink/renderer/core/html/canvas/text_metrics.h +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h -@@ -72,6 +72,8 @@ class CORE_EXPORT TextMetrics final : pu - - void Trace(Visitor*) const override; +@@ -93,6 +93,8 @@ class CORE_EXPORT TextMetrics final : pu + float x_position_; + }; + void Shuffle(const double factor); + @@ -266,7 +266,7 @@ const TextDirection&, --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -214,6 +214,9 @@ class Isolate; +@@ -219,6 +219,9 @@ class Isolate; class Value; } // namespace v8 @@ -276,7 +276,7 @@ namespace blink { class DOMMatrixInit; -@@ -3419,8 +3422,22 @@ TextMetrics* BaseRenderingContext2D::mea +@@ -3512,8 +3515,22 @@ TextMetrics* BaseRenderingContext2D::mea const CanvasRenderingContext2DState& state = GetState(); TextDirection direction = ToTextDirection(state.GetDirection(), canvas); @@ -303,7 +303,7 @@ void BaseRenderingContext2D::SnapshotStateForFilter() { --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1738,6 +1738,7 @@ component("platform") { +@@ -1747,6 +1747,7 @@ component("platform") { "//cc/mojo_embedder", "//components/paint_preview/common", "//components/search_engines:search_engine_utils", @@ -338,7 +338,7 @@ #include "third_party/blink/renderer/platform/wtf/vector.h" --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1737,6 +1737,12 @@ +@@ -1848,6 +1848,12 @@ status: "experimental", }, { @@ -349,5 +349,5 @@ + }, + { name: "Fledge", + status: "stable", base_feature: "none", - origin_trial_feature_name: "PrivacySandboxAdsAPIs", 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 83c9c128..8b5638cc 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 -@@ -3518,6 +3518,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3219,6 +3219,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 -@@ -497,6 +497,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -494,6 +494,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -65,7 +65,7 @@ approach to change color components. }; --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -2743,6 +2743,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -2835,6 +2835,9 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -77,7 +77,7 @@ approach to change color components. return image_data; --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1690,7 +1690,9 @@ component("platform") { +@@ -1699,7 +1699,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -314,7 +314,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 -@@ -1743,6 +1743,9 @@ +@@ -1854,6 +1854,9 @@ name: "FingerprintingCanvasMeasureTextNoise", }, { @@ -322,5 +322,5 @@ approach to change color components. + }, + { name: "Fledge", + status: "stable", base_feature: "none", - origin_trial_feature_name: "PrivacySandboxAdsAPIs", diff --git a/patches/extra/bromite/flag-max-connections-per-host.patch b/patches/extra/bromite/flag-max-connections-per-host.patch index 06853af9..23705269 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 -@@ -2295,6 +2295,7 @@ static_library("browser") { +@@ -2282,6 +2282,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -72,15 +72,15 @@ with limited CPU/memory resources and it is disabled by default. #include "components/network_time/network_time_tracker.h" #include "components/os_crypt/async/browser/os_crypt_async.h" #include "components/permissions/permissions_client.h" -@@ -142,6 +145,7 @@ +@@ -141,6 +144,7 @@ + #include "extensions/common/constants.h" #include "media/media_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" - #include "net/log/net_log.h" +#include "net/socket/client_socket_pool_manager.h" #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/features.h" -@@ -384,6 +388,18 @@ void BrowserProcessImpl::Init() { +@@ -380,6 +384,18 @@ void BrowserProcessImpl::Init() { pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled, base::BindRepeating(&ApplyMetricsReportingPolicy)); @@ -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 -@@ -2291,6 +2291,10 @@ const char kLogJsConsoleMessagesDescript +@@ -2369,6 +2369,10 @@ const char kLogJsConsoleMessagesDescript "Enable logging JS console messages in system logs, please note that they " "may contain PII."; @@ -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 -@@ -1313,6 +1313,9 @@ extern const char kLocationBarModelOptim +@@ -1356,6 +1356,9 @@ extern const char kLocationBarModelOptim extern const char kLogJsConsoleMessagesName[]; extern const char kLogJsConsoleMessagesDescription[]; diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 1c716eaa..312fd269 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 -@@ -1547,7 +1547,7 @@ void ChromeContentBrowserClient::Registe +@@ -1581,7 +1581,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -23,7 +23,7 @@ // used for mapping the command-line flags). --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -382,7 +382,7 @@ void ProfileNetworkContextService::Confi +@@ -381,7 +381,7 @@ void ProfileNetworkContextService::Confi void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled, @@ -67,7 +67,7 @@ --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -91,7 +91,7 @@ void RegisterBrowserUserPrefs(user_prefs +@@ -95,7 +95,7 @@ void RegisterBrowserUserPrefs(user_prefs registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); registry->RegisterBooleanPref( @@ -78,7 +78,7 @@ registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true); --- a/components/autofill/core/common/autofill_prefs.cc +++ b/components/autofill/core/common/autofill_prefs.cc -@@ -39,7 +39,7 @@ int GetSyncTransportOptInBitFieldForAcco +@@ -40,7 +40,7 @@ int GetSyncTransportOptInBitFieldForAcco void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // Synced prefs. Used for cross-device choices, e.g., credit card Autofill. registry->RegisterBooleanPref( @@ -87,7 +87,7 @@ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterIntegerPref( prefs::kAutofillLastVersionDeduped, 0, -@@ -48,7 +48,7 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -49,7 +49,7 @@ void RegisterProfilePrefs(user_prefs::Pr prefs::kAutofillHasSeenIban, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref( @@ -98,7 +98,7 @@ prefs::kAutofillPaymentCvcStorage, true, --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc -@@ -491,7 +491,7 @@ bool DoesBookmarkContainWords(const std: +@@ -492,7 +492,7 @@ bool DoesBookmarkContainWords(const std: void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -120,7 +120,7 @@ --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -277,14 +277,14 @@ bool HasManuallyFilledFields(const Passw +@@ -314,14 +314,14 @@ bool HasManuallyFilledFields(const Passw void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch index c0ac2b8c..2c5a6406 100644 --- a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch +++ b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch @@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1661,11 +1661,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1671,11 +1671,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { diff --git a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch b/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch index fc6b8947..e80bda43 100644 --- a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch +++ b/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch @@ -12,7 +12,7 @@ it as hidden as it was before? --- a/net/cert/x509_util.cc +++ b/net/cert/x509_util.cc -@@ -304,7 +304,7 @@ bool GetTLSServerEndPointChannelBinding( +@@ -285,7 +285,7 @@ bool GetTLSServerEndPointChannelBinding( } // RSA keys created by CreateKeyAndSelfSignedCert will be of this length. diff --git a/patches/extra/iridium-browser/updater-disable-auto-update.patch b/patches/extra/iridium-browser/updater-disable-auto-update.patch index 60d4730f..94b61f0f 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 -@@ -1059,7 +1059,7 @@ class AppControllerNativeThemeObserver : +@@ -1062,7 +1062,7 @@ class AppControllerNativeThemeObserver : CFStringRef checkInterval = CFSTR("checkInterval"); CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app); if (!plist) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch index 8934851a..0688ae43 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -16,7 +16,7 @@ override_bounds_(params.initial_bounds), initial_show_state_(params.initial_show_state), initial_workspace_(params.initial_workspace), -@@ -987,20 +989,22 @@ Browser::WarnBeforeClosingResult Browser +@@ -988,20 +990,22 @@ Browser::WarnBeforeClosingResult Browser return WarnBeforeClosingResult::kOkToClose; } @@ -52,7 +52,7 @@ } DCHECK(!warn_before_closing_callback_) -@@ -1038,6 +1042,7 @@ bool Browser::TryToCloseWindow( +@@ -1039,6 +1043,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = NOT_PROMPTED; @@ -60,7 +60,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -3098,6 +3103,58 @@ bool Browser::CanCloseWithInProgressDown +@@ -3085,6 +3090,58 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -119,7 +119,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -3123,6 +3180,22 @@ void Browser::InProgressDownloadResponse +@@ -3110,6 +3167,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -152,7 +152,7 @@ #include "chrome/browser/ui/signin/signin_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/unload_controller.h" -@@ -1183,12 +1184,17 @@ class Browser : public TabStripModelObse +@@ -1174,12 +1175,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -170,7 +170,7 @@ // Called when the user has decided whether to proceed or not with the browser // closure, in case the cookie migration notice was shown. |proceed_closing| // is true if the browser can be closed. -@@ -1361,6 +1367,8 @@ class Browser : public TabStripModelObse +@@ -1347,6 +1353,8 @@ class Browser : public TabStripModelObse // when the browser is closed with in-progress downloads. CancelDownloadConfirmationState cancel_download_confirmation_state_; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch b/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch index 087a5480..19a3b8ed 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -889,10 +889,14 @@ bool HandleNewTabPageLocationOverride( +@@ -909,10 +909,14 @@ bool HandleNewTabPageLocationOverride( // Don't change the URL when incognito mode. if (profile->IsOffTheRecord()) @@ -28,7 +28,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/flags_ui/flags_state.cc +++ b/components/flags_ui/flags_state.cc -@@ -222,6 +222,7 @@ std::string GetCombinedOriginListValue(c +@@ -223,6 +223,7 @@ std::string GetCombinedOriginListValue(c command_line.GetSwitchValueASCII(command_line_switch); const std::string new_value = flags_storage.GetOriginListFlag(internal_entry_name); @@ -36,7 +36,7 @@ return CombineAndSanitizeOriginLists(existing_value, new_value); } -@@ -460,6 +461,7 @@ void FlagsState::SetOriginListFlag(const +@@ -461,6 +462,7 @@ void FlagsState::SetOriginListFlag(const const std::string& value, FlagsStorage* flags_storage) { const std::string new_value = diff --git a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch index e34ed2e6..3a4cd772 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch @@ -33,7 +33,7 @@ // --- a/third_party/blink/renderer/core/editing/selection_controller.cc +++ b/third_party/blink/renderer/core/editing/selection_controller.cc -@@ -1439,10 +1439,14 @@ FrameSelection& SelectionController::Sel +@@ -1435,10 +1435,14 @@ FrameSelection& SelectionController::Sel } bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) { @@ -50,7 +50,7 @@ Node* inner_node = event.InnerNode(); --- a/third_party/blink/renderer/core/input/mouse_event_manager.cc +++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc -@@ -648,8 +648,14 @@ WebInputEventResult MouseEventManager::H +@@ -650,8 +650,14 @@ WebInputEventResult MouseEventManager::H bool single_click = event.Event().click_count <= 1; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch index 585daaa7..3a8775b7 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -75,6 +75,7 @@ class FrameGrabHandle : public views::Vi +@@ -76,6 +76,7 @@ class FrameGrabHandle : public views::Vi // Reserve some space for the frame to be grabbed by, even if the tabstrip // is full. // TODO(tbergquist): Define this relative to the NTB insets again. diff --git a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch index e2fc26ad..ad49db31 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch @@ -18,7 +18,7 @@ #include "ui/gfx/color_utils.h" #include "ui/native_theme/native_theme.h" -@@ -416,7 +417,9 @@ void NTPResourceCache::CreateNewTabIncog +@@ -421,7 +422,9 @@ void NTPResourceCache::CreateNewTabIncog profile_->GetPrefs()->GetString(prefs::kCurrentThemeID); // Colors. diff --git a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch index 8ce49d0b..c10ca79c 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch @@ -41,7 +41,7 @@ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/functional/bind.h" -@@ -501,6 +502,15 @@ AutocompleteController::AutocompleteCont +@@ -531,6 +532,15 @@ AutocompleteController::AutocompleteCont steady_state_omnibox_position_( metrics::OmniboxEventProto::UNKNOWN_POSITION) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); @@ -59,7 +59,7 @@ // so their async requests can be kicked off before waiting a few milliseconds --- a/components/omnibox/browser/history_url_provider.cc +++ b/components/omnibox/browser/history_url_provider.cc -@@ -487,6 +487,9 @@ void HistoryURLProvider::Start(const Aut +@@ -488,6 +488,9 @@ void HistoryURLProvider::Start(const Aut if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY) matches_.push_back(what_you_typed_match); diff --git a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch index ae6a2a25..7e91bfc1 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch @@ -1,22 +1,14 @@ ---- a/chrome/browser/sharing/features.cc -+++ b/chrome/browser/sharing/features.cc -@@ -17,3 +17,5 @@ const base::FeatureParam kSharingPu - - const base::FeatureParam kSharingPulseDeltaAndroidHours = { - &kSharingMatchPulseInterval, "SharingPulseDeltaAndroidHours", 24}; -+ -+BASE_FEATURE(kDisableQRGenerator, "DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT); ---- a/chrome/browser/sharing/features.h -+++ b/chrome/browser/sharing/features.h -@@ -26,4 +26,5 @@ extern const base::FeatureParam kSh - // backgrounded. Such devices cannot be marked stale aggressively. - extern const base::FeatureParam kSharingPulseDeltaAndroidHours; - -+BASE_DECLARE_FEATURE(kDisableQRGenerator); - #endif // CHROME_BROWSER_SHARING_FEATURES_H_ --- a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc +++ b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc -@@ -23,7 +23,7 @@ QRCodeGeneratorBubbleController::~QRCode +@@ -12,6 +12,7 @@ + #include "chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h" + #include "chrome/common/pref_names.h" + #include "components/prefs/pref_change_registrar.h" ++#include "components/sharing_message/features.h" + #include "content/public/browser/web_contents.h" + #include "url/gurl.h" + +@@ -37,7 +38,7 @@ QRCodeGeneratorBubbleController::~QRCode // static bool QRCodeGeneratorBubbleController::IsGeneratorAvailable(const GURL& url) { @@ -24,7 +16,7 @@ + if (!url.SchemeIsHTTPOrHTTPS() || base::FeatureList::IsEnabled(kDisableQRGenerator)) return false; - return true; + // Check policy. --- a/chrome/browser/ungoogled_flag_entries.h +++ b/chrome/browser/ungoogled_flag_entries.h @@ -64,4 +64,8 @@ @@ -36,3 +28,19 @@ + "Disables the QR generator for sharing page links. ungoogled-chromium flag", + kOsDesktop, FEATURE_VALUE_TYPE(kDisableQRGenerator)}, #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ +--- a/components/sharing_message/features.cc ++++ b/components/sharing_message/features.cc +@@ -17,3 +17,5 @@ const base::FeatureParam kSharingPu + + const base::FeatureParam kSharingPulseDeltaAndroidHours = { + &kSharingMatchPulseInterval, "SharingPulseDeltaAndroidHours", 24}; ++ ++BASE_FEATURE(kDisableQRGenerator, "DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT); +--- a/components/sharing_message/features.h ++++ b/components/sharing_message/features.h +@@ -26,4 +26,5 @@ extern const base::FeatureParam kSh + // backgrounded. Such devices cannot be marked stale aggressively. + extern const base::FeatureParam kSharingPulseDeltaAndroidHours; + ++BASE_DECLARE_FEATURE(kDisableQRGenerator); + #endif // COMPONENTS_SHARING_MESSAGE_FEATURES_H_ 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 68c8cfa1..54c20b1f 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -503,7 +503,9 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -501,7 +501,9 @@ void TabHelpers::AttachTabHelpers(WebCon resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); SafetyTipWebContentsObserver::CreateForWebContents(web_contents); @@ -33,7 +33,7 @@ - if (!osdd_url.is_empty()) { - mojo::Remote - osdd_handler; -- render_frame()->GetBrowserInterfaceBroker()->GetInterface( +- render_frame()->GetBrowserInterfaceBroker().GetInterface( - osdd_handler.BindNewPipeAndPassReceiver()); - osdd_handler->PageHasOpenSearchDescriptionDocument( - frame->GetDocument().Url(), osdd_url); @@ -42,7 +42,7 @@ + if (!osdd_url.is_empty()) { + mojo::Remote + osdd_handler; -+ render_frame()->GetBrowserInterfaceBroker()->GetInterface( ++ render_frame()->GetBrowserInterfaceBroker().GetInterface( + osdd_handler.BindNewPipeAndPassReceiver()); + osdd_handler->PageHasOpenSearchDescriptionDocument( + frame->GetDocument().Url(), osdd_url); @@ -60,7 +60,7 @@ #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/debug/crash_logging.h" -@@ -210,6 +211,12 @@ TemplateURL MergeEnterpriseSiteSearchEng +@@ -209,6 +210,12 @@ TemplateURL MergeEnterpriseSiteSearchEng return TemplateURL(merged_data); } @@ -73,7 +73,7 @@ } // namespace // TemplateURLService::LessWithPrefix ----------------------------------------- -@@ -392,6 +399,7 @@ TemplateURLService::TemplateURLService( +@@ -391,6 +398,7 @@ TemplateURLService::TemplateURLService( #endif // BUILDFLAG(IS_CHROMEOS_LACROS) ) : prefs_(prefs), @@ -81,7 +81,7 @@ search_engine_choice_service_(search_engine_choice_service), search_terms_data_(std::move(search_terms_data)), web_data_service_(web_data_service), -@@ -530,8 +538,8 @@ bool TemplateURLService::CanAddAutogener +@@ -509,8 +517,8 @@ bool TemplateURLService::CanAddAutogener // that may interfere with search queries). An easy heuristic for this is // whether the user has a TemplateURL that has been manually modified (e.g., // renamed) connected to the same host. @@ -92,7 +92,7 @@ } bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy( -@@ -2071,6 +2079,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -2049,6 +2057,8 @@ SyncDataMap TemplateURLService::CreateGU } void TemplateURLService::Init() { @@ -101,7 +101,7 @@ if (client_) client_->SetOwner(this); -@@ -2254,6 +2264,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -2231,6 +2241,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -113,7 +113,7 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -896,6 +896,8 @@ class TemplateURLService final : public +@@ -891,6 +891,8 @@ class TemplateURLService final : public raw_ptr search_engine_choice_service_ = nullptr; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch index 59a8ebf0..bb9e41e6 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch @@ -8,7 +8,7 @@ #include "base/debug/alias.h" #include "base/functional/bind.h" #include "base/i18n/rtl.h" -@@ -688,6 +689,8 @@ void Tab::OnGestureEvent(ui::GestureEven +@@ -693,6 +694,8 @@ void Tab::OnGestureEvent(ui::GestureEven } std::u16string Tab::GetTooltipText(const gfx::Point& p) const { @@ -27,7 +27,7 @@ #include "base/check.h" #include "base/compiler_specific.h" #include "base/containers/adapters.h" -@@ -1808,6 +1809,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -1822,6 +1823,8 @@ void TabStrip::OnMouseEventInTab(views:: } void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch index 0e6ab402..73467de4 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -1438,7 +1438,8 @@ void BrowserCommandController::InitComma +@@ -1432,7 +1432,8 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, normal_window); @@ -20,7 +20,7 @@ #include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h" -@@ -111,7 +112,8 @@ TabStripRegionView::TabStripRegionView(s +@@ -112,7 +113,8 @@ TabStripRegionView::TabStripRegionView(s // Add and configure the TabSearchContainer. std::unique_ptr tab_search_container; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch b/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch index fec82444..eae4547a 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/flags_ui/flags_state.cc +++ b/components/flags_ui/flags_state.cc -@@ -223,6 +223,7 @@ std::string GetCombinedOriginListValue(c +@@ -224,6 +224,7 @@ std::string GetCombinedOriginListValue(c const std::string new_value = flags_storage.GetOriginListFlag(internal_entry_name); if (command_line_switch == "custom-ntp") return existing_value.empty() ? new_value : existing_value; @@ -19,7 +19,7 @@ return CombineAndSanitizeOriginLists(existing_value, new_value); } -@@ -462,6 +463,7 @@ void FlagsState::SetOriginListFlag(const +@@ -463,6 +464,7 @@ void FlagsState::SetOriginListFlag(const FlagsStorage* flags_storage) { const std::string new_value = internal_name == "custom-ntp" ? value : diff --git a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch index 3f410716..98b81f49 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/browser_features.cc +++ b/chrome/browser/browser_features.cc -@@ -401,4 +401,5 @@ BASE_FEATURE(kBrowserDynamicCodeDisabled +@@ -378,4 +378,5 @@ BASE_FEATURE(kBrowserDynamicCodeDisabled base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_WIN) @@ -8,7 +8,7 @@ } // namespace features --- a/chrome/browser/browser_features.h +++ b/chrome/browser/browser_features.h -@@ -151,6 +151,7 @@ BASE_DECLARE_FEATURE(kWebUsbDeviceDetect +@@ -133,6 +133,7 @@ BASE_DECLARE_FEATURE(kWebUsbDeviceDetect #if BUILDFLAG(IS_WIN) BASE_DECLARE_FEATURE(kBrowserDynamicCodeDisabled); #endif 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 c67e2ce1..c4ddf4db 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -8,7 +8,7 @@ #include "base/containers/adapters.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" -@@ -2022,6 +2023,10 @@ void TabStripModel::CloseTabs(base::span +@@ -2063,6 +2064,10 @@ void TabStripModel::CloseTabs(base::span return; } diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index 6856c784..e89587d0 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch @@ -50,7 +50,7 @@ bool IsExtensionDownload(const download::DownloadItem& download_item); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1192,10 +1192,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1263,10 +1263,12 @@ DownloadConfirmationReason DownloadTarge return DownloadConfirmationReason::SAVE_AS; #if BUILDFLAG(ENABLE_EXTENSIONS) 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 7711cb68..51933241 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 @@ -21,7 +21,7 @@ #include "base/compiler_specific.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" -@@ -1319,7 +1320,8 @@ void HistoryBackend::InitImpl( +@@ -1320,7 +1321,8 @@ void HistoryBackend::InitImpl( db_->GetStartDate(&first_recorded_time_); // Start expiring old stuff. @@ -31,7 +31,7 @@ } void HistoryBackend::OnMemoryPressure( -@@ -1547,6 +1549,8 @@ void HistoryBackend::AddPagesWithDetails +@@ -1548,6 +1550,8 @@ void HistoryBackend::AddPagesWithDetails } bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch index 50c0452e..994b82b9 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/net/socket/ssl_client_socket_impl.cc +++ b/net/socket/ssl_client_socket_impl.cc -@@ -211,7 +211,8 @@ class SSLClientSocketImpl::SSLContext { +@@ -210,7 +210,8 @@ class SSLClientSocketImpl::SSLContext { SSL_CTX_sess_set_new_cb(ssl_ctx_.get(), NewSessionCallback); SSL_CTX_set_timeout(ssl_ctx_.get(), 1 * 60 * 60 /* one hour */); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch index bde7bd1b..99d8f670 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch @@ -8,7 +8,7 @@ #include "base/feature_list.h" #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" -@@ -36,6 +37,7 @@ +@@ -37,6 +38,7 @@ #include "chrome/browser/ui/views/side_panel/side_panel_ui.h" #include "chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.h" #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h" @@ -16,7 +16,7 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/feature_engagement/public/event_constants.h" -@@ -534,6 +536,17 @@ void ExtensionsToolbarContainer::AnchorA +@@ -535,6 +537,17 @@ void ExtensionsToolbarContainer::AnchorA widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView( anchor_view && anchor_view->GetVisible() ? anchor_view : GetExtensionsButton()); @@ -34,7 +34,7 @@ widget->Show(); } -@@ -920,6 +933,9 @@ void ExtensionsToolbarContainer::UpdateC +@@ -921,6 +934,9 @@ void ExtensionsToolbarContainer::UpdateC } bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch index 7b71ffff..4d53146b 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -1953,6 +1953,10 @@ void BrowserView::ExitFullscreen() { +@@ -1950,6 +1950,10 @@ void BrowserView::ExitFullscreen() { void BrowserView::UpdateExclusiveAccessBubble( const ExclusiveAccessBubbleParams& params, ExclusiveAccessBubbleHideCallback first_hide_callback) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch index eeaf8779..9a9afd89 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc -@@ -1063,7 +1063,11 @@ void Tab::UpdateIconVisibility() { +@@ -1068,7 +1068,11 @@ void Tab::UpdateIconVisibility() { if (IsActive()) { // Close button is shown on active tabs regardless of the size. showing_close_button_ = true; @@ -12,7 +12,7 @@ showing_alert_indicator_ = has_alert_icon && alert_icon_width <= available_width; -@@ -1088,6 +1092,8 @@ void Tab::UpdateIconVisibility() { +@@ -1093,6 +1097,8 @@ void Tab::UpdateIconVisibility() { } showing_close_button_ = large_enough_for_close_button; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch index e102c17d..4e988cae 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/browser/client_hints/client_hints.cc +++ b/content/browser/client_hints/client_hints.cc -@@ -841,6 +841,8 @@ void UpdateNavigationRequestClientUaHead +@@ -840,6 +840,8 @@ void UpdateNavigationRequestClientUaHead net::HttpRequestHeaders* headers, const std::optional& request_url) { DCHECK(frame_tree_node); @@ -20,7 +20,7 @@ if (!ShouldAddClientHints(origin, frame_tree_node, delegate, request_url)) { return; } -@@ -862,6 +864,8 @@ void AddRequestClientHintsHeaders( +@@ -861,6 +863,8 @@ void AddRequestClientHintsHeaders( FrameTreeNode* frame_tree_node, const blink::ParsedPermissionsPolicy& container_policy, const std::optional& request_url) { 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 02ae3183..d3014653 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/containers/adapters.h" #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" -@@ -172,6 +173,18 @@ DragOperation GetDropEffect(const ui::Dr +@@ -173,6 +174,18 @@ DragOperation GetDropEffect(const ui::Dr return DragOperation::kMove; } @@ -27,7 +27,7 @@ } // namespace BrowserRootView::DropInfo::DropInfo() = default; -@@ -184,7 +197,9 @@ BrowserRootView::DropInfo::~DropInfo() { +@@ -185,7 +198,9 @@ BrowserRootView::DropInfo::~DropInfo() { BrowserRootView::BrowserRootView(BrowserView* browser_view, views::Widget* widget) @@ -38,13 +38,13 @@ BrowserRootView::~BrowserRootView() { // It's possible to destroy the browser while a drop is active. In this case, -@@ -328,7 +343,7 @@ bool BrowserRootView::OnMouseWheel(const +@@ -329,7 +344,7 @@ bool BrowserRootView::OnMouseWheel(const // Scroll-event-changes-tab is incompatible with scrolling tabstrip, so // disable it if the latter feature is enabled. - if (browser_defaults::kScrollEventChangesTab && + if (scroll_event_changes_tab_ && - !base::FeatureList::IsEnabled(features::kScrollableTabStrip)) { + !base::FeatureList::IsEnabled(tabs::kScrollableTabStrip)) { // Switch to the left/right tab if the wheel-scroll happens over the // tabstrip, or the empty space beside the tabstrip. --- a/chrome/browser/ui/views/frame/browser_root_view.h 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 a6f60643..865224f5 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch @@ -1,8 +1,8 @@ --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -467,6 +467,17 @@ void ToolbarView::Init() { - #elif BUILDFLAG(IS_CHROMEOS_LACROS) - show_avatar_toolbar_button = !chromeos::IsManagedGuestSession(); +@@ -483,6 +483,17 @@ void ToolbarView::Init() { + browser_->profile()->IsGuestSession() || + browser_->profile()->IsRegularProfile(); #endif + + const std::string sab_value = base::CommandLine::ForCurrentProcess()-> diff --git a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch index 9b534563..bef7b84a 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4132,10 +4132,12 @@ const FeatureEntry::FeatureVariation kAu +@@ -4189,10 +4189,12 @@ const FeatureEntry::FeatureVariation #include "chrome/browser/ungoogled_flag_choices.h" #include "chrome/browser/bromite_flag_choices.h" #include "chrome/browser/ungoogled_platform_flag_choices.h" diff --git a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch index 4207d95b..2378ec66 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch @@ -19,7 +19,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -155,6 +155,8 @@ static_library("common_lib") { +@@ -160,6 +160,8 @@ static_library("common_lib") { "pref_names_util.cc", "pref_names_util.h", "ref_counted_util.h", @@ -28,7 +28,7 @@ "search/instant_mojom_traits.h", "search/instant_types.cc", "search/instant_types.h", -@@ -267,6 +269,7 @@ static_library("common_lib") { +@@ -272,6 +274,7 @@ static_library("common_lib") { "//components/no_state_prefetch/common:mojo_bindings", "//components/page_load_metrics/common:common", "//components/pdf/common:constants", @@ -38,7 +38,7 @@ if (is_android || enable_library_cdms) { --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -961,6 +961,14 @@ BASE_FEATURE(kNewFilesPolicyUX, +@@ -982,6 +982,14 @@ BASE_FEATURE(kNewFilesPolicyUX, // referrers instead of their ordinary behavior. BASE_FEATURE(kNoReferrers, "NoReferrers", base::FEATURE_DISABLED_BY_DEFAULT); @@ -55,7 +55,7 @@ // on-screen until dismissed, they are instead shown for a very long time. --- a/chrome/common/chrome_features.h +++ b/chrome/common/chrome_features.h -@@ -578,6 +578,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX); +@@ -594,6 +594,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers); @@ -152,7 +152,7 @@ +#endif // CHROME_COMMON_REFERRER_SANITIZER_H_ --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn -@@ -355,8 +355,7 @@ source_set("lib") { +@@ -357,8 +357,7 @@ source_set("lib") { "//base", "//build:branding_buildflags", "//build:chromeos_buildflags", @@ -173,7 +173,7 @@ disallowed_extension_deps_ = [ # Components should largely not depend on //extensions. Since // extensions # is not a component target and is linked with //chrome, depending on most -@@ -851,7 +851,7 @@ test("components_unittests") { +@@ -853,7 +853,7 @@ test("components_unittests") { # On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -182,7 +182,7 @@ assert_no_deps = [ "//chrome/*" ] assert_no_deps += disallowed_extension_deps_ } -@@ -1137,7 +1137,7 @@ if (use_blink) { +@@ -1145,7 +1145,7 @@ if (use_blink) { # dependency. On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -193,15 +193,15 @@ } --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -41,6 +41,7 @@ +@@ -42,6 +42,7 @@ #include "build/build_config.h" #include "build/buildflag.h" #include "build/chromeos_buildflags.h" +#include "chrome/common/referrer_sanitizer.h" #include "components/viz/host/host_frame_sink_manager.h" + #include "content/browser/agent_cluster_key.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" - #include "content/browser/browsing_topics/header_util.h" -@@ -386,10 +387,10 @@ void AddAdditionalRequestHeaders( +@@ -393,10 +394,10 @@ void AddAdditionalRequestHeaders( net::HttpRequestHeaders::kUserAgent, ComputeUserAgentValue(*headers, user_agent_override, browser_context)); @@ -219,14 +219,14 @@ --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -55,6 +55,7 @@ + #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "cc/base/switches.h" - #include "cc/trees/ukm_manager.h" +#include "chrome/common/referrer_sanitizer.h" #include "content/common/associated_interfaces.mojom.h" #include "content/common/content_navigation_policy.h" #include "content/common/content_switches_internal.h" -@@ -4547,10 +4548,13 @@ void RenderFrameImpl::WillSendRequestInt +@@ -4548,10 +4549,13 @@ void RenderFrameImpl::WillSendRequestInt request.SetHasUserGesture(frame_->HasTransientUserActivation()); @@ -256,7 +256,7 @@ "//components/custom_handlers:test_support", --- a/services/network/network_service_network_delegate.cc +++ b/services/network/network_service_network_delegate.cc -@@ -12,6 +12,7 @@ +@@ -13,6 +13,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/types/optional_util.h" #include "build/build_config.h" @@ -264,7 +264,7 @@ #include "components/domain_reliability/monitor.h" #include "net/base/features.h" #include "net/base/isolation_info.h" -@@ -54,9 +55,14 @@ NetworkServiceNetworkDelegate::~NetworkS +@@ -57,9 +58,14 @@ NetworkServiceNetworkDelegate::~NetworkS void NetworkServiceNetworkDelegate::MaybeTruncateReferrer( net::URLRequest* const request, const GURL& effective_url) { diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index ab7ab117..f7d1b66e 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -35,7 +35,7 @@ // https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html. --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -151,11 +151,6 @@ const size_t kMaxHostLength = 4096; +@@ -152,11 +152,6 @@ const size_t kMaxHostLength = 4096; // cached. const int kIPv6ProbePeriodMs = 1000; @@ -47,7 +47,7 @@ // True if |hostname| ends with either ".local" or ".local.". bool ResemblesMulticastDNSName(std::string_view hostname) { return hostname.ends_with(".local") || hostname.ends_with(".local."); -@@ -1429,33 +1424,10 @@ int HostResolverManager::StartIPv6Reacha +@@ -1430,33 +1425,10 @@ int HostResolverManager::StartIPv6Reacha return OK; } diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index 581247b4..269fe0a8 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -76,7 +76,7 @@ this.$.dialog.close(); } -@@ -185,8 +194,10 @@ export class SettingsSearchEngineEditDia +@@ -192,8 +201,10 @@ export class SettingsSearchEngineEditDia this.$.searchEngine, this.$.keyword, this.$.queryUrl, @@ -427,7 +427,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -925,7 +925,8 @@ void TemplateURLService::IncrementUsageC +@@ -904,7 +904,8 @@ void TemplateURLService::IncrementUsageC void TemplateURLService::ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -437,7 +437,7 @@ DCHECK(!IsCreatedByExtension(url)); DCHECK(!keyword.empty()); DCHECK(!search_url.empty()); -@@ -940,6 +941,7 @@ void TemplateURLService::ResetTemplateUR +@@ -919,6 +920,7 @@ void TemplateURLService::ResetTemplateUR data.safe_for_autoreplace = false; data.last_modified = clock_->Now(); data.is_active = TemplateURLData::ActiveStatus::kTrue; @@ -447,7 +447,7 @@ } --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -319,7 +319,8 @@ class TemplateURLService final : public +@@ -314,7 +314,8 @@ class TemplateURLService final : public void ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index 84834562..e30006bc 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 -@@ -4128,7 +4128,13 @@ const FeatureEntry::FeatureVariation kAu +@@ -4185,7 +4185,13 @@ const FeatureEntry::FeatureVariation // calculate and verify checksum. // // When adding a new choice, add it to the end of the list. diff --git a/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch b/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch index 0f349277..4c67527b 100644 --- a/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch +++ b/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -103,7 +103,7 @@ void RegisterBrowserUserPrefs(user_prefs +@@ -107,7 +107,7 @@ void RegisterBrowserUserPrefs(user_prefs false); #endif registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy, diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index c14eb57a..4e885999 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -142,7 +142,7 @@ } // namespace download --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -99,7 +99,6 @@ source_set("browser") { +@@ -114,7 +114,6 @@ source_set("browser") { "//components/payments/mojom", "//components/power_monitor", "//components/services/filesystem:lib", diff --git a/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch b/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch index 2fd99b37..bcd56f8a 100644 --- a/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch +++ b/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc -@@ -117,9 +117,7 @@ void IntranetRedirectDetector::FinishSle +@@ -118,9 +118,7 @@ void IntranetRedirectDetector::FinishSle simple_loaders_.clear(); resulting_origins_.clear(); diff --git a/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch b/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch index 827efa37..17ac769e 100644 --- a/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch +++ b/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch @@ -1,6 +1,6 @@ --- a/components/optimization_guide/core/optimization_guide_features.cc +++ b/components/optimization_guide/core/optimization_guide_features.cc -@@ -54,7 +54,7 @@ BASE_FEATURE(kOptimizationHints, +@@ -55,7 +55,7 @@ BASE_FEATURE(kOptimizationHints, // Enables fetching from a remote Optimization Guide Service. BASE_FEATURE(kRemoteOptimizationGuideFetching, "OptimizationHintsFetching", diff --git a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch index 4c84dd06..292f5e8f 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 -@@ -3841,8 +3841,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3835,8 +3835,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -13,7 +13,7 @@ } SynthesizeGLError( GL_INVALID_ENUM, "getParameter", -@@ -3856,8 +3855,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3850,8 +3849,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 9f3842aa..d444e75d 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 -@@ -1843,7 +1843,7 @@ BASE_FEATURE(kPrefetchFontLookupTables, +@@ -1834,7 +1834,7 @@ BASE_FEATURE(kPrefetchFontLookupTables, // crbug.com/988956. BASE_FEATURE(kPrefetchPrivacyChanges, "PrefetchPrivacyChanges", diff --git a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch index 1e6dee4e..352873db 100644 --- a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch +++ b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc -@@ -557,11 +557,6 @@ int GetContentRestrictions(const Browser +@@ -554,11 +554,6 @@ int GetContentRestrictions(const Browser CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(current_tab); content_restrictions = core_tab_helper->content_restrictions(); @@ -14,7 +14,7 @@ } return content_restrictions; } -@@ -1712,8 +1707,7 @@ bool CanSavePage(const Browser* browser) +@@ -1717,8 +1712,7 @@ bool CanSavePage(const Browser* browser) DownloadPrefs::DownloadRestriction::ALL_FILES) { return false; } diff --git a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch index 999221bf..fb11d545 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 @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -200,12 +200,10 @@ TabStripRegionView::TabStripRegionView(s +@@ -201,12 +201,10 @@ TabStripRegionView::TabStripRegionView(s // TODO(crbug.com/40118868): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -15,7 +15,7 @@ reserved_grab_handle_space_ = --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -2041,8 +2041,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2059,8 +2059,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { @@ -24,7 +24,7 @@ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); CHECK(clipboard) << "Clipboard instance is not available, cannot proceed with " -@@ -2053,7 +2051,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2071,7 +2069,6 @@ void TabStrip::NewTabButtonPressed(const if (!clipboard_text.empty()) { controller_->CreateNewTabWithLocation(clipboard_text); } diff --git a/patches/extra/ungoogled-chromium/first-run-page.patch b/patches/extra/ungoogled-chromium/first-run-page.patch index 7f543897..7d4b50ec 100644 --- a/patches/extra/ungoogled-chromium/first-run-page.patch +++ b/patches/extra/ungoogled-chromium/first-run-page.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1098,6 +1098,7 @@ int ChromeBrowserMainParts::PreCreateThr +@@ -1106,6 +1106,7 @@ int ChromeBrowserMainParts::PreCreateThr if (first_run::IsChromeFirstRun()) { if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) && !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) { @@ -18,7 +18,7 @@ #include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h" #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h" #include "chrome/browser/ui/webui/version/version_ui.h" -@@ -793,6 +794,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc +@@ -774,6 +775,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc return &NewWebUI; } @@ -169,11 +169,11 @@ +#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_ --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -677,6 +677,7 @@ const char kExtensionConfigureCommandsSu - // Add hosts here to be included in chrome://chrome-urls (about:about). +@@ -75,6 +75,7 @@ bool IsSystemWebUIHost(std::string_view // These hosts will also be suggested by BuiltinProvider. - const char* const kChromeHostURLs[] = { -+ "ungoogled-first-run", - kChromeUIAboutHost, - kChromeUIAccessibilityHost, + base::span ChromeURLHosts() { + static constexpr auto kChromeURLHosts = std::to_array({ ++ "ungoogled-first-run", + kChromeUIAboutHost, + kChromeUIAccessibilityHost, #if !BUILDFLAG(IS_ANDROID) diff --git a/patches/extra/ungoogled-chromium/keep-expired-flags.patch b/patches/extra/ungoogled-chromium/keep-expired-flags.patch index 46244147..47e062a4 100644 --- a/patches/extra/ungoogled-chromium/keep-expired-flags.patch +++ b/patches/extra/ungoogled-chromium/keep-expired-flags.patch @@ -1,6 +1,6 @@ --- a/components/flags_ui/flags_state.cc +++ b/components/flags_ui/flags_state.cc -@@ -24,6 +24,7 @@ +@@ -25,6 +25,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" @@ -8,7 +8,7 @@ #include "components/flags_ui/feature_entry.h" #include "components/flags_ui/flags_storage.h" #include "components/flags_ui/flags_ui_switches.h" -@@ -653,13 +654,17 @@ void FlagsState::GetFlagFeatureEntries( +@@ -654,13 +655,17 @@ void FlagsState::GetFlagFeatureEntries( int current_platform = GetCurrentPlatform(); for (const FeatureEntry& entry : feature_entries_) { @@ -27,7 +27,7 @@ base::Value::List supported_platforms; AddOsStrings(entry.supported_platforms, &supported_platforms); -@@ -1063,6 +1068,7 @@ bool FlagsState::IsSupportedFeature(cons +@@ -1064,6 +1069,7 @@ bool FlagsState::IsSupportedFeature(cons if (!entry.InternalNameMatches(name)) continue; if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry)) diff --git a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch index c4a40f30..774ae377 100644 --- a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch +++ b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch @@ -3,7 +3,7 @@ # --- a/components/omnibox/common/omnibox_features.cc +++ b/components/omnibox/common/omnibox_features.cc -@@ -520,7 +520,7 @@ BASE_FEATURE(kSiteSearchSettingsPolicy, +@@ -521,7 +521,7 @@ BASE_FEATURE(kSiteSearchSettingsPolicy, // Enables additional site search providers for the Site search Starter Pack. BASE_FEATURE(kStarterPackExpansion, "StarterPackExpansion", diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 2ee5a3a6..53b7a0b8 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -33,7 +33,7 @@ --- a/chrome/browser/resources/extensions/item_list.html +++ b/chrome/browser/resources/extensions/item_list.html -@@ -114,13 +114,6 @@ +@@ -115,13 +115,6 @@ @@ -49,24 +49,22 @@ shownAppsCount_, shownExtensionsCount_, apps, extensions)]]"> --- a/chrome/browser/resources/extensions/sidebar.html +++ b/chrome/browser/resources/extensions/sidebar.html -@@ -71,14 +71,3 @@ +@@ -74,12 +74,3 @@ cr-shared-style"> - --
--
--
-- -- -- -- --
+ +-
+-
+- +- +- +- -
--- a/chrome/browser/resources/extensions/sidebar.ts +++ b/chrome/browser/resources/extensions/sidebar.ts -@@ -50,21 +50,11 @@ export class ExtensionsSidebarElement ex +@@ -51,21 +51,11 @@ export class ExtensionsSidebarElement ex * displayed. */ selectedPath_: String, @@ -88,14 +86,14 @@ /** * The ID of the listener on |navigation|. Stored so that the -@@ -120,13 +110,6 @@ export class ExtensionsSidebarElement ex +@@ -121,13 +111,6 @@ export class ExtensionsSidebarElement ex } } - private computeDiscoverMoreText_(): TrustedHTML { - return this.i18nAdvanced('sidebarDiscoverMore', { - tags: ['a'], -- attrs: ['target', 'on-click'], +- attrs: ['target'], - substitutions: [loadTimeData.getString('getMoreExtensionsUrl')], - }); - } @@ -187,16 +185,17 @@
-