From 46c4319ca20d4c23fd6ceb81850d6f215ce130fd Mon Sep 17 00:00:00 2001 From: Blaise Date: Wed, 21 Sep 2022 15:22:10 -0500 Subject: [PATCH] Update to Chromium 106.0.5249.61 --- chromium_version.txt | 2 +- domain_substitution.list | 212 +++++----- ...01-fix-building-without-safebrowsing.patch | 80 ++-- ...03-disable-autofill-download-manager.patch | 2 +- .../0005-disable-default-extensions.patch | 6 +- .../0015-disable-update-pings.patch | 2 +- .../core/inox-patchset/0021-disable-rlz.patch | 2 +- ...refixes-to-possibly-evil-connections.patch | 8 +- .../ungoogled-chromium/block-requests.patch | 14 +- .../block-trk-and-subdomains.patch | 4 +- .../disable-domain-reliability.patch | 11 +- .../disable-fonts-googleapis-references.patch | 13 +- .../ungoogled-chromium/disable-gaia.patch | 2 +- .../core/ungoogled-chromium/disable-gcm.patch | 19 +- .../disable-google-host-detection.patch | 4 +- .../disable-mei-preload.patch | 4 +- .../disable-privacy-sandbox.patch | 6 +- .../disable-webstore-urls.patch | 8 +- .../core/ungoogled-chromium/doh-changes.patch | 2 +- .../fix-building-with-prunned-binaries.patch | 14 +- .../fix-building-without-safebrowsing.patch | 202 +++++---- .../remove-unused-preferences-fields.patch | 400 ++++++++---------- .../toggle-translation-via-switch.patch | 4 +- ...g-flags-client-rects-and-measuretext.patch | 32 +- ...ngerprinting-canvas-image-data-noise.patch | 16 +- .../flag-max-connections-per-host.patch | 15 +- .../extra/debian/disable/welcome-page.patch | 2 +- patches/extra/debian/gn/parallel.patch | 2 +- .../0006-modify-default-prefs.patch | 14 +- ...ble-profile-auto-import-on-first-run.patch | 2 +- ...e-default-key-length-for-newly-gener.patch | 2 +- .../prefs-only-keep-cookies-until-exit.patch | 14 +- .../updater-disable-auto-update.patch | 2 +- .../add-flag-for-close-confirmation.patch | 16 +- .../add-flag-for-custom-ntp.patch | 2 +- .../add-flag-for-disabling-link-drag.patch | 10 +- ...g-for-omnibox-autocomplete-filtering.patch | 6 +- .../add-flag-for-qr-generator.patch | 4 +- ...dd-flag-for-search-engine-collection.patch | 12 +- .../add-flag-for-tab-hover-cards.patch | 2 +- .../add-flag-for-tabsearch-button.patch | 2 +- .../add-flag-to-clear-data-on-exit.patch | 43 +- ...d-flag-to-close-window-with-last-tab.patch | 2 +- ...g-to-configure-extension-downloading.patch | 2 +- .../add-flag-to-convert-popups-to-tabs.patch | 8 +- ...-to-disable-local-history-expiration.patch | 2 +- .../add-flag-to-hide-side-panel-button.patch | 2 +- .../add-flag-to-show-avatar-button.patch | 12 +- .../add-ipv6-probing-option.patch | 12 +- .../add-suggestions-url-field.patch | 44 +- .../add-ungoogled-flag-headers.patch | 2 +- .../disable-download-quarantine.patch | 2 +- .../disable-webgl-renderer-info.patch | 4 +- ...ble-default-prefetch-privacy-changes.patch | 2 +- .../enable-page-saving-on-more-pages.patch | 2 +- .../enable-paste-and-go-new-tab-button.patch | 4 +- .../prepopulated-search-engines.patch | 2 +- .../remove-uneeded-ui.patch | 8 +- pruning.list | 138 ++++-- 59 files changed, 784 insertions(+), 683 deletions(-) diff --git a/chromium_version.txt b/chromium_version.txt index 7cb296ec..65d56cfa 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -105.0.5195.127 +106.0.5249.61 diff --git a/domain_substitution.list b/domain_substitution.list index 7e192397..0e42aeb7 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -22,7 +22,6 @@ android_webview/nonembedded/java/res_devui/values/strings.xml android_webview/test/data/components/fake_component_manifest.json android_webview/test/data/components/fake_component_update_response.json android_webview/tools/cts_config/webview_cts_gcs_path.json -android_webview/tools/cts_utils.py android_webview/tools/generate_flag_labels.py android_webview/tools/record_netlog.py android_webview/tools/remove_preinstalled_webview.py @@ -46,14 +45,12 @@ ash/child_accounts/parent_access_controller_impl_unittest.cc ash/components/arc/arc_util.h ash/components/arc/session/arc_upgrade_params.h ash/components/arc/session/serial_number_util_unittest.cc -ash/components/attestation/attestation_flow_adaptive_unittest.cc -ash/components/attestation/attestation_flow_integrated_unittest.cc -ash/components/cryptohome/userdataauth_util.cc ash/components/device_activity/device_activity_client_unittest.cc ash/components/device_activity/device_activity_controller.cc ash/components/drivefs/drivefs_auth.cc ash/components/drivefs/drivefs_http_client_unittest.cc ash/components/geolocation/simple_geolocation_provider.cc +ash/components/login/hibernate/hibernate_manager_unittest.cc ash/components/multidevice/remote_device_test_util.cc ash/components/multidevice/stub_multidevice_util.cc ash/components/phonehub/notification.h @@ -68,6 +65,7 @@ ash/constants/ash_switches.cc ash/constants/url_constants.cc ash/controls/contextual_nudge.cc ash/fast_ink/laser/laser_pointer_view.cc +ash/glanceables/glanceables_welcome_label_unittest.cc ash/login/ui/auth_icon_view.cc ash/login/ui/login_remove_account_dialog_unittest.cc ash/public/cpp/android_intent_helper_unittest.cc @@ -101,6 +99,7 @@ ash/services/quick_pair/public/cpp/battery_notification.h ash/services/quick_pair/public/cpp/not_discoverable_advertisement.h ash/session/fullscreen_controller_unittest.cc ash/shelf/launcher_nudge_controller_unittest.cc +ash/shelf/scrollable_shelf_view_pixeltest.cc ash/shelf/shelf_controller_unittest.cc ash/style/dark_light_mode_nudge_controller_unittests.cc ash/system/diagnostics/diagnostics_log_controller_unittest.cc @@ -108,7 +107,6 @@ ash/system/eche/eche_tray.cc ash/system/eche/eche_tray_unittest.cc ash/system/human_presence/snooping_protection_controller_unittest.cc ash/system/message_center/ash_notification_view_unittest.cc -ash/system/message_center/metrics_utils.cc ash/system/message_center/notification_grouping_controller_unittest.cc ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc ash/system/pcie_peripheral/pcie_peripheral_notification_controller_unittest.cc @@ -132,6 +130,7 @@ ash/webui/camera_app_ui/resources/js/views/crop_document.ts ash/webui/camera_app_ui/resources/js/views/settings/primary.ts ash/webui/camera_app_ui/resources/strings/camera_strings.grd ash/webui/common/resources/PRESUBMIT.py +ash/webui/common/resources/cr_picture/png.js ash/webui/common/resources/keyboard_layouts.js ash/webui/diagnostics_ui/diagnostics_ui.cc ash/webui/diagnostics_ui/resources/PRESUBMIT.py @@ -152,7 +151,7 @@ ash/webui/os_feedback_ui/resources/feedback_constants.js ash/webui/os_feedback_ui/resources/search_page.js ash/webui/personalization_app/personalization_app_ui.cc ash/webui/personalization_app/resources/PRESUBMIT.py -ash/webui/personalization_app/resources/trusted/wallpaper/google_photos_zero_state_element.ts +ash/webui/personalization_app/resources/js/wallpaper/google_photos_zero_state_element.ts ash/webui/print_management/resources/PRESUBMIT.py ash/webui/projector_app/projector_xhr_sender.cc ash/webui/projector_app/projector_xhr_sender.h @@ -177,14 +176,11 @@ base/allocator/partition_allocator/address_space_randomization.h base/allocator/partition_allocator/oom.cc base/allocator/partition_allocator/oom.h base/allocator/partition_allocator/page_allocator_internals_win.h -base/allocator/partition_allocator/partition_alloc_base/check.cc -base/allocator/partition_allocator/partition_alloc_base/files/file_path.cc base/allocator/partition_allocator/partition_alloc_base/logging.h base/allocator/partition_allocator/partition_alloc_base/memory/scoped_refptr.h base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc base/allocator/partition_allocator/partition_alloc_base/rand_util_win.cc base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_win_for_testing.cc -base/allocator/partition_allocator/partition_alloc_base/time/time.cc base/allocator/partition_allocator/partition_alloc_base/time/time.h base/allocator/partition_allocator/partition_alloc_base/time/time_win.cc base/allocator/partition_allocator/partition_alloc_config.h @@ -202,21 +198,15 @@ base/atomicops.h base/barrier_callback.h base/base_paths_win.cc base/callback.h -base/check.cc -base/check_op.cc base/command_line.cc -base/containers/circular_deque_unittest.cc -base/containers/flat_tree.cc -base/containers/span_unittest.cc -base/debug/alias.cc +base/compiler_specific.h base/debug/debugger_posix.cc base/debug/stack_trace_fuchsia.cc base/debug/stack_trace_posix.cc base/debug/stack_trace_win.cc -base/feature_list.cc +base/feature_list.h base/file_version_info.h base/files/file_enumerator_posix.cc -base/files/file_path.cc base/files/file_unittest.cc base/files/file_util_posix.cc base/files/file_util_win.cc @@ -228,7 +218,6 @@ base/i18n/rtl_unittest.cc base/i18n/timezone_unittest.cc base/ios/device_util.mm base/lazy_instance_helpers.h -base/location.cc base/logging.cc base/logging.h base/mac/close_nocancel.cc @@ -246,7 +235,7 @@ base/metrics/histogram_functions.h base/metrics/histogram_macros.h base/metrics/user_metrics.h base/native_library_win.cc -base/observer_list_unittest.cc +base/power_monitor/battery_level_provider_win.cc base/power_monitor/power_monitor_device_source_android.cc base/power_monitor/speed_limit_observer_win.cc base/process/launch.h @@ -283,7 +272,6 @@ base/third_party/symbolize/symbolize.cc base/threading/platform_thread.h base/threading/platform_thread_unittest.cc base/threading/platform_thread_win.cc -base/time/time.cc base/time/time.h base/time/time_delta_from_string.cc base/time/time_delta_from_string_unittest.cc @@ -294,7 +282,6 @@ base/trace_event/process_memory_dump.h base/trace_event/trace_category.h base/trace_event/trace_event_etw_export_win.cc base/trace_event/trace_logging_minimal_win.h -base/values.cc base/values.h base/values_unittest.cc base/win/pe_image.h @@ -311,6 +298,7 @@ base/win/windows_version.h base/win/windows_version_unittest.cc base/win/wmi.cc base/win/wmi.h +build/android/BUILD.gn build/android/PRESUBMIT.py build/android/apk_operations.py build/android/dump_apk_resource_strings.py @@ -437,8 +425,6 @@ chrome/app/nearby_share_strings.grdp chrome/app/os_settings_strings.grdp chrome/app/profiles_strings.grdp chrome/app/resources/locale_settings.grd -chrome/app/settings_chromium_strings.grdp -chrome/app/settings_google_chrome_strings.grdp chrome/app/settings_strings.grdp chrome/app/shared_settings_strings.grdp chrome/app/supervised_user_error_page_strings.grdp @@ -447,7 +433,6 @@ chrome/app/welcome_strings.grdp chrome/browser/about_flags.cc chrome/browser/accessibility/live_caption_speech_recognition_host_browsertest.cc chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc -chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc chrome/browser/android/customtabs/custom_tabs_browsertest.cc chrome/browser/android/customtabs/detached_resource_request_unittest.cc chrome/browser/android/examples/custom_tabs_client/src/res/values/strings.xml @@ -478,6 +463,7 @@ chrome/browser/apps/app_service/app_service_proxy_lacros_unittest.cc chrome/browser/apps/app_service/app_service_proxy_unittest.cc chrome/browser/apps/app_service/intent_util_unittest.cc chrome/browser/apps/app_service/metrics/app_service_metrics.h +chrome/browser/apps/app_service/publishers/arc_apps_unittest.cc chrome/browser/apps/app_service/publishers/publisher_unittest.cc chrome/browser/apps/app_service/web_contents_app_id_utils.h chrome/browser/apps/app_service/webapk/webapk_install_task.cc @@ -534,7 +520,6 @@ chrome/browser/ash/child_accounts/child_user_service.cc chrome/browser/ash/child_accounts/family_user_device_metrics_browsertest.cc chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc chrome/browser/ash/child_accounts/time_limits/app_time_limit_utils_unittest.cc -chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html chrome/browser/ash/child_accounts/website_approval_notifier_unittest.cc chrome/browser/ash/crosapi/browser_data_migrator.cc chrome/browser/ash/crosapi/browser_data_migrator_browsertest.cc @@ -559,12 +544,13 @@ chrome/browser/ash/file_manager/file_tasks.h chrome/browser/ash/file_manager/office_task_selection_helper.cc chrome/browser/ash/file_manager/path_util_unittest.cc chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h +chrome/browser/ash/floating_workspace/floating_workspace_service_unittest.cc chrome/browser/ash/hats/hats_dialog.cc chrome/browser/ash/input_method/assistive_suggester_client_filter.cc chrome/browser/ash/input_method/assistive_suggester_client_filter_unittest.cc chrome/browser/ash/input_method/ime_rules_config.h chrome/browser/ash/input_method/ime_rules_config_unittest.cc -chrome/browser/ash/kerberos/kerberos_credentials_manager_test.cc +chrome/browser/ash/kerberos/kerberos_credentials_manager_unittest.cc chrome/browser/ash/login/app_mode/test/kiosk_enterprise_browsertest.cc chrome/browser/ash/login/app_mode/test/kiosk_launch_controller_browsertest.cc chrome/browser/ash/login/ash_hud_login_browsertest.cc @@ -623,7 +609,6 @@ chrome/browser/ash/plugin_vm/plugin_vm_util.cc chrome/browser/ash/plugin_vm/plugin_vm_util_unittest.cc chrome/browser/ash/policy/active_directory/active_directory_policy_manager.cc chrome/browser/ash/policy/arc/android_management_client_unittest.cc -chrome/browser/ash/policy/core/device_cloud_policy_browsertest.cc chrome/browser/ash/policy/core/device_local_account_browsertest.cc chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_browsertest.cc @@ -639,10 +624,8 @@ chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc chrome/browser/ash/policy/login/login_policy_test_base.cc chrome/browser/ash/policy/networking/network_policy_application_browsertest.cc chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc -chrome/browser/ash/policy/reporting/extension_install_event_logger_unittest.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/legacy_device_status_collector_browsertest.cc chrome/browser/ash/policy/status_collector/status_collector.h chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc chrome/browser/ash/policy/uploading/status_uploader_unittest.cc @@ -720,6 +703,7 @@ chrome/browser/chrome_browser_main_win_unittest.cc chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client_browsertest.cc chrome/browser/chrome_content_browser_client_unittest.cc +chrome/browser/chrome_for_testing/buildflags.gni chrome/browser/chrome_main_process_singleton_browsertest.cc chrome/browser/chrome_navigation_browsertest.cc chrome/browser/chrome_web_platform_security_metrics_browsertest.cc @@ -748,6 +732,7 @@ chrome/browser/content_settings/content_settings_pref_provider_unittest.cc chrome/browser/content_settings/host_content_settings_map_unittest.cc 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/devtools/device/adb/adb_client_socket_browsertest.cc chrome/browser/devtools/device/adb/mock_adb_server.cc chrome/browser/devtools/devtools_browsertest.cc @@ -770,6 +755,8 @@ chrome/browser/enterprise/connectors/connectors_manager_unittest.cc chrome/browser/enterprise/connectors/connectors_service_unittest.cc chrome/browser/enterprise/connectors/device_trust/attestation/desktop/google_keys.cc chrome/browser/enterprise/connectors/device_trust/device_trust_browsertest.cc +chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc +chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command_unittest.cc chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util_unittest.cc chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator_unittest.cc @@ -887,7 +874,6 @@ chrome/browser/extensions/extension_user_script_loader_unittest.cc chrome/browser/extensions/external_policy_loader_unittest.cc chrome/browser/extensions/external_pref_loader.cc chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc -chrome/browser/extensions/external_provider_impl_unittest.cc chrome/browser/extensions/forced_extensions/force_installed_test_base.cc chrome/browser/extensions/install_signer.cc chrome/browser/extensions/installed_loader_unittest.cc @@ -900,6 +886,7 @@ chrome/browser/extensions/permission_message_combinations_unittest.cc chrome/browser/extensions/permissions_updater.cc chrome/browser/extensions/permissions_updater_unittest.cc chrome/browser/extensions/policy_handlers_unittest.cc +chrome/browser/extensions/process_management_browsertest.cc chrome/browser/extensions/scripting_permissions_modifier.h chrome/browser/extensions/scripting_permissions_modifier_unittest.cc chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc @@ -922,6 +909,7 @@ chrome/browser/google/google_search_domain_mixing_metrics_emitter_factory.h chrome/browser/google/google_search_domain_mixing_metrics_emitter_unittest.cc chrome/browser/google/google_update_win.cc chrome/browser/guest_view/web_view/context_menu_content_type_web_view.cc +chrome/browser/hid/chrome_hid_delegate_unittest.cc chrome/browser/hid/hid_chooser_context_unittest.cc chrome/browser/history/redirect_browsertest.cc chrome/browser/history_clusters/history_clusters_metrics_browsertest.cc @@ -940,6 +928,7 @@ chrome/browser/lacros/account_manager/get_account_information_helper_unittest.cc chrome/browser/lacros/app_mode/kiosk_session_service_browsertest.cc chrome/browser/lacros/browser_service_lacros.cc chrome/browser/lacros/browser_service_lacros_browsertest.cc +chrome/browser/lacros/fullscreen_controller_client_lacros_unittest.cc chrome/browser/lacros/lacros_startup_infobar_delegate.cc chrome/browser/lacros/lacros_url_handling_unittest.cc chrome/browser/lacros/net/network_settings_translation_unittest.cc @@ -979,7 +968,6 @@ chrome/browser/media_galleries/fileapi/media_path_filter.cc chrome/browser/metrics/family_link_user_metrics_provider_unittest.cc chrome/browser/metrics/family_user_metrics_provider_browsertest.cc chrome/browser/metrics/perf/perf_events_collector.cc -chrome/browser/metrics/power/battery_level_provider_win.cc chrome/browser/metrics/testing/sync_metrics_test_utils.cc chrome/browser/metrics/variations/variations_http_headers_browsertest.cc chrome/browser/nacl_host/nacl_infobar_delegate.cc @@ -1020,7 +1008,7 @@ chrome/browser/new_tab_page/modules/drive/drive_service.cc chrome/browser/new_tab_page/modules/drive/drive_service_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/task_module/task_module_service_unittest.cc +chrome/browser/new_tab_page/modules/recipes/recipes_service_unittest.cc chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc chrome/browser/new_tab_page/promos/promo_service_unittest.cc chrome/browser/no_best_effort_tasks_browsertest.cc @@ -1037,7 +1025,6 @@ chrome/browser/obsolete_system/obsolete_system_linux.cc chrome/browser/optimization_guide/chrome_hints_manager_unittest.cc chrome/browser/optimization_guide/hints_fetcher_browsertest.cc chrome/browser/optimization_guide/page_content_annotations_service_browsertest.cc -chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/core/ukm_page_load_metrics_observer_unittest.cc @@ -1092,7 +1079,6 @@ chrome/browser/plugins/plugin_finder_unittest.cc chrome/browser/policy/cloud/cloud_policy_browsertest.cc chrome/browser/policy/cloud/device_management_service_browsertest.cc chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc -chrome/browser/policy/extension_force_install_mixin.cc chrome/browser/policy/extension_policy_browsertest.cc chrome/browser/policy/policy_prefs_browsertest.cc chrome/browser/policy/safe_search_policy_test.cc @@ -1114,10 +1100,6 @@ chrome/browser/predictors/preconnect_manager_unittest.cc chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc chrome/browser/predictors/resource_prefetch_predictor_unittest.cc chrome/browser/prefetch/prefetch_browsertest.cc -chrome/browser/prefetch/prefetch_proxy/chrome_prefetch_service_delegate.cc -chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_browsertest.cc -chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc -chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_tab_helper_unittest.cc chrome/browser/prefs/chrome_command_line_pref_store_proxy_unittest.cc chrome/browser/prefs/pref_functional_browsertest.cc chrome/browser/prefs/pref_metrics_service.cc @@ -1126,8 +1108,15 @@ chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_unittest. chrome/browser/preloading/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc chrome/browser/preloading/prefetch/no_state_prefetch/tools/prerender_test_server/index.html chrome/browser/preloading/prefetch/no_state_prefetch/tools/prerender_test_server/prerender_test_server.py +chrome/browser/preloading/prefetch/prefetch_proxy/chrome_prefetch_service_delegate.cc +chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_browsertest.cc +chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_params.cc +chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper_unittest.cc +chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_service_browsertest.cc +chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper_browsertest.cc chrome/browser/printing/print_preview_dialog_controller_unittest.cc chrome/browser/privacy/secure_dns_bridge.cc +chrome/browser/privacy_sandbox/privacy_sandbox_service.cc chrome/browser/privacy_sandbox/privacy_sandbox_service_unittest.cc chrome/browser/process_singleton_posix.cc chrome/browser/process_singleton_posix_unittest.cc @@ -1214,7 +1203,6 @@ 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.js chrome/browser/resources/chromeos/login/debug/debug.js -chrome/browser/resources/chromeos/login/oobe.js chrome/browser/resources/chromeos/login/screens/common/arc_terms_of_service.js chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.js chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html @@ -1233,7 +1221,7 @@ chrome/browser/resources/default_apps/external_extensions.json chrome/browser/resources/discards/graph_doc_template.html chrome/browser/resources/downloads/icons.html chrome/browser/resources/family_link_user_internals/family_link_user_internals.js -chrome/browser/resources/feedback_webui/js/feedback_util.ts +chrome/browser/resources/feedback/js/feedback_util.ts chrome/browser/resources/gaia_auth_host/PRESUBMIT.py chrome/browser/resources/gaia_auth_host/authenticator.js chrome/browser/resources/gaia_auth_host/password_change_authenticator.js @@ -1273,13 +1261,13 @@ chrome/browser/resources/print_preview/ui/icons.html chrome/browser/resources/settings/a11y_page/a11y_page.ts chrome/browser/resources/settings/about_page/about_page.html chrome/browser/resources/settings/appearance_page/appearance_page.ts -chrome/browser/resources/settings/autofill_page/password_edit_dialog.ts chrome/browser/resources/settings/autofill_page/passwords_list_handler.ts chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_device_list_item.js chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.html chrome/browser/resources/settings/chromeos/device_page/stylus.js chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js +chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.html chrome/browser/resources/settings/chromeos/os_about_page/channel_switcher_dialog.html chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.html chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/borealis_page/borealis_detail_view.html @@ -1291,6 +1279,7 @@ chrome/browser/resources/settings/icons.html chrome/browser/resources/settings/incompatible_applications_page/incompatible_application_item.ts chrome/browser/resources/settings/languages_page/edit_dictionary_page.ts chrome/browser/resources/settings/settings_shared.css +chrome/browser/resources/tools/build_webui.gni chrome/browser/resources/usb_internals/descriptor_panel.ts chrome/browser/resources/webstore_app/manifest.json chrome/browser/resources/webui_gallery/demos/cr_input/cr_input_demo_component.html @@ -1444,7 +1433,8 @@ chrome/browser/ui/app_list/search/common/string_util.cc chrome/browser/ui/app_list/search/common/string_util_unittest.cc chrome/browser/ui/app_list/search/files/item_suggest_cache.h chrome/browser/ui/app_list/search/files/item_suggest_cache_unittest.cc -chrome/browser/ui/app_list/search/omnibox_provider.cc +chrome/browser/ui/app_list/search/omnibox_lacros_provider_unittest.cc +chrome/browser/ui/app_list/search/omnibox_util.cc chrome/browser/ui/app_list/search/search_result_ranker/app_launch_event_logger_unittest.cc chrome/browser/ui/app_list/search/search_result_ranker/ranking_item_util_unittest.cc chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker_unittest.cc @@ -1530,6 +1520,7 @@ chrome/browser/ui/search/third_party_ntp_browsertest.cc chrome/browser/ui/signin_reauth_view_controller_browsertest.cc chrome/browser/ui/signin_view_controller.cc chrome/browser/ui/signin_view_controller_interactive_uitest.cc +chrome/browser/ui/singleton_tabs_unittest.cc chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.cc chrome/browser/ui/startup/startup_browser_creator_browsertest.cc chrome/browser/ui/startup/startup_tab_provider_unittest.cc @@ -1558,6 +1549,7 @@ chrome/browser/ui/views/file_system_access/file_system_access_permission_view_br chrome/browser/ui/views/file_system_access/file_system_access_usage_bubble_view_browsertest.cc chrome/browser/ui/views/frame/browser_root_view_browsertest.cc chrome/browser/ui/views/frame/browser_view.h +chrome/browser/ui/views/frame/webui_tab_strip_interactive_uitest.cc chrome/browser/ui/views/hats/hats_next_web_dialog.cc chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc @@ -1569,6 +1561,7 @@ chrome/browser/ui/views/omnibox/omnibox_view_views.cc chrome/browser/ui/views/omnibox/omnibox_view_views.h chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc +chrome/browser/ui/views/page_info/about_this_site_side_panel_view.cc chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc @@ -1666,17 +1659,16 @@ chrome/browser/ui/webui/whats_new/whats_new_ui.cc chrome/browser/ui/webui/whats_new/whats_new_util.cc chrome/browser/ui/window_sizer/window_sizer_chromeos.cc chrome/browser/updates/announcement_notification/announcement_notification_service_unittest.cc +chrome/browser/usb/chrome_usb_browsertest.cc chrome/browser/usb/chrome_usb_delegate_unittest.cc -chrome/browser/usb/usb_browsertest.cc chrome/browser/usb/usb_chooser_context_unittest.cc chrome/browser/usb/usb_chooser_controller_unittest.cc chrome/browser/usb/usb_policy_allowed_devices_unittest.cc -chrome/browser/usb/usb_tab_helper_unittest.cc chrome/browser/usb/web_usb_detector_unittest.cc -chrome/browser/usb/web_usb_service_impl_unittest.cc chrome/browser/user_notes/user_note_service_delegate_impl_unittest.cc chrome/browser/user_notes/user_notes_tab_helper_unittest.cc chrome/browser/vr/PRESUBMIT.py +chrome/browser/web_applications/commands/web_app_install_command.cc chrome/browser/web_applications/extensions/bookmark_app_util_unittest.cc chrome/browser/web_applications/externally_installed_web_app_prefs.cc chrome/browser/web_applications/externally_managed_app_manager.cc @@ -1685,7 +1677,6 @@ chrome/browser/web_applications/os_integration/web_app_handler_registration_util chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.h chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win_unittest.cc chrome/browser/web_applications/preinstalled_web_app_manager_unittest.cc -chrome/browser/web_applications/preinstalled_web_app_migration_browsertest.cc chrome/browser/web_applications/preinstalled_web_apps/gmail.cc chrome/browser/web_applications/preinstalled_web_apps/google_calendar.cc chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc @@ -1701,7 +1692,6 @@ chrome/browser/web_applications/preinstalled_web_apps_browsertest.cc chrome/browser/web_applications/user_display_mode.h chrome/browser/web_applications/web_app_helpers_unittest.cc chrome/browser/web_applications/web_app_icon_downloader_unittest.cc -chrome/browser/web_applications/web_app_id.h chrome/browser/web_applications/web_app_id_constants.cc chrome/browser/web_applications/web_app_install_task.cc chrome/browser/web_applications/web_app_install_utils_unittest.cc @@ -2031,8 +2021,6 @@ chromecast/cast_core/runtime/browser/grpc_resource_data_source_unittest.cc chromecast/cast_core/runtime/browser/grpc_webui_controller.cc chromecast/chromecast.gni chromecast/common/activity_url_filter_unittest.cc -chromecast/common/extensions_api/tabs.json -chromecast/common/extensions_api/windows.json chromecast/crash/linux/minidump_uploader.cc chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.h chromecast/net/connectivity_checker_impl.h @@ -2040,9 +2028,13 @@ chromecast/net/net_switches.cc chromecast/public/bluetooth/gatt.h chromecast/public/output_restrictions.h chromeos/BUILD.gn +chromeos/ash/components/attestation/attestation_flow_adaptive_unittest.cc +chromeos/ash/components/attestation/attestation_flow_integrated_unittest.cc chromeos/ash/components/cros_elements/button/button.ts +chromeos/ash/components/cryptohome/userdataauth_util.cc chromeos/ash/components/dbus/arc/arc_obb_mounter_client.h chromeos/ash/components/dbus/biod/fake_biod_client_unittest.cc +chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h chromeos/ash/components/dbus/hiberman/hiberman_client_unittest.cc chromeos/ash/components/dbus/rmad/fake_rmad_client.cc chromeos/ash/components/local_search_service/content_extraction_utils_unittest.cc @@ -2051,16 +2043,17 @@ chromeos/ash/components/network/network_cert_loader.cc chromeos/ash/components/network/network_util.h chromeos/ash/components/network/profile_policies.h chromeos/ash/components/network/system_token_cert_db_storage.h +chromeos/ash/components/oobe_quick_start/connectivity/target_fido_controller.cc +chromeos/ash/components/oobe_quick_start/connectivity/target_fido_controller_unittest.cc +chromeos/ash/components/string_matching/tokenized_string_unittest.cc chromeos/ash/services/assistant/assistant_manager_service_impl.cc chromeos/ash/services/assistant/service.cc chromeos/ash/services/assistant/service_unittest.cc chromeos/chromeos_strings.grd chromeos/components/quick_answers/translation_result_loader.cc chromeos/components/quick_answers/translation_result_loader_unittest.cc -chromeos/components/string_matching/tokenized_string_unittest.cc chromeos/components/test/data/onc/proxy_config.json chromeos/components/test/data/onc/shill_wifi_proxy.json -chromeos/dbus/debug_daemon/debug_daemon_client.h chromeos/dbus/dlcservice/dlcservice_client.h chromeos/dbus/permission_broker/permission_broker_client.h chromeos/hugepage_text/hugepage_text.cc @@ -2204,6 +2197,9 @@ components/cloud_devices/common/cloud_device_description.h components/cloud_devices/common/printer_description.h components/commerce/core/commerce_feature_list.h components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json +components/commerce/core/subscriptions/subscriptions_manager_unittest.cc +components/commerce/core/subscriptions/subscriptions_server_proxy.cc +components/commerce/core/subscriptions/subscriptions_server_proxy_unittest.cc components/component_updater/component_updater_url_constants.cc components/components_google_chrome_strings.grd components/content_creation/notes/core/server/notes_repository.cc @@ -2220,6 +2216,7 @@ components/content_settings/core/common/content_settings_pattern_unittest.cc components/content_settings/core/common/cookie_settings_base.h components/content_settings/renderer/content_settings_agent_impl.cc components/contextual_search/core/browser/contextual_search_context.h +components/contextual_search/core/browser/contextual_search_delegate_unittest.cc components/continuous_search/browser/search_result_extractor_client_unittest.cc components/cookie_config/cookie_store_util.cc components/country_codes/country_codes.cc @@ -2455,7 +2452,7 @@ components/omnibox/browser/suggestion_answer.h components/omnibox/browser/suggestion_answer_unittest.cc components/omnibox/browser/titled_url_match_utils.cc components/omnibox/browser/titled_url_match_utils_unittest.cc -components/omnibox/browser/zero_suggest_provider.cc +components/omnibox/browser/zero_suggest_provider_unittest.cc components/omnibox/browser/zero_suggest_verbatim_match_provider_unittest.cc components/omnibox/resources/omnibox_pedal_concepts.json components/omnibox/resources/omnibox_pedal_concepts_desktop_am.json @@ -2581,7 +2578,6 @@ components/password_manager/core/browser/import/csv_password.h components/password_manager/core/browser/import/csv_password_iterator.h components/password_manager/core/browser/import/csv_password_sequence.h components/password_manager/core/browser/import/csv_password_sequence_unittest.cc -components/password_manager/core/browser/import/csv_password_unittest.cc components/password_manager/core/browser/import/password_importer_unittest.cc components/password_manager/core/browser/leak_detection/bulk_leak_check_impl_unittest.cc components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl_unittest.cc @@ -2695,6 +2691,7 @@ components/policy/core/browser/url_scheme_list_policy_handler.cc components/policy/core/browser/url_scheme_list_policy_handler.h components/policy/core/common/cloud/cloud_policy_client_unittest.cc components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc +components/policy/core/common/cloud/user_info_fetcher.cc components/policy/core/common/cloud/user_info_fetcher_unittest.cc components/policy/core/common/default_chrome_apps_migrator.cc components/policy/core/common/default_chrome_apps_migrator_unittest.cc @@ -2710,6 +2707,8 @@ components/policy/core/common/registry_dict_unittest.cc components/policy/core/common/values_util.h components/policy/resources/PRESUBMIT.py components/policy/resources/policy_templates.json +components/policy/test_support/fake_dmserver.h +components/policy/test_support/fake_dmserver_unittest.cc components/policy/test_support/request_handler_for_policy.cc components/policy/test_support/signature_provider.h components/policy/tools/syntax_check_policy_template_json.py @@ -2822,6 +2821,7 @@ components/search_engines/keyword_table_unittest.cc components/search_engines/template_url.cc components/search_engines/template_url_data_unittest.cc components/search_engines/template_url_prepopulate_data_unittest.cc +components/search_engines/template_url_starter_pack_data.cc components/search_engines/template_url_unittest.cc components/search_engines/util.cc components/search_provider_logos/google_logo_api.cc @@ -2849,7 +2849,6 @@ components/services/app_service/public/cpp/app_capability_access_cache_unittest. components/services/app_service/public/cpp/app_capability_access_cache_wrapper_unittest.cc components/services/app_service/public/cpp/app_registry_cache_unittest.cc components/services/app_service/public/cpp/app_registry_cache_wrapper_unittest.cc -components/services/app_service/public/cpp/app_update_mojom_unittest.cc components/services/app_service/public/cpp/app_update_unittest.cc components/services/app_service/public/cpp/capability_access_update_unittest.cc components/services/app_service/public/cpp/intent.h @@ -2926,13 +2925,12 @@ components/sync/driver/sync_stopped_reporter_unittest.cc components/sync/engine/bookmark_update_preprocessing.cc components/sync/engine/net/http_bridge_unittest.cc components/sync/protocol/proto_value_conversions_unittest.cc -components/sync/test/engine/mock_connection_manager.cc +components/sync/test/mock_connection_manager.cc components/sync/trusted_vault/standalone_trusted_vault_client.cc components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend.cc components/sync/trusted_vault/trusted_vault_access_token_fetcher_frontend_unittest.cc components/sync/trusted_vault/trusted_vault_server_constants.h components/sync_bookmarks/PRESUBMIT.py -components/sync_device_info/device_info.cc components/sync_preferences/pref_service_syncable_unittest.cc components/sync_sessions/PRESUBMIT.py components/sync_sessions/session_sync_bridge.h @@ -3048,6 +3046,7 @@ content/browser/devtools/devtools_protocol_encoding_cbor_fuzzer.cc content/browser/devtools/protocol/devtools_protocol_browsertest.cc content/browser/download/mhtml_generation_browsertest.cc content/browser/download/save_package_unittest.cc +content/browser/fenced_frame/fenced_frame_browsertest.cc content/browser/fenced_frame/fenced_frame_unittest.cc content/browser/file_system/browser_file_system_helper_unittest.cc content/browser/first_party_sets/first_party_sets_handler_impl.cc @@ -3089,7 +3088,6 @@ content/browser/renderer_host/clipboard_host_impl_unittest.cc content/browser/renderer_host/compositor_impl_android.cc content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc content/browser/renderer_host/dwrite_font_proxy_impl_win.cc -content/browser/renderer_host/frame_tree_browsertest.cc content/browser/renderer_host/frame_tree_node.cc content/browser/renderer_host/frame_tree_unittest.cc content/browser/renderer_host/input/touch_action_filter.h @@ -3104,7 +3102,6 @@ content/browser/renderer_host/navigation_request_unittest.cc 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.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 @@ -3140,8 +3137,10 @@ content/browser/speech/tts_mac.h content/browser/speech/tts_win.cc content/browser/storage_partition_impl_unittest.cc content/browser/text_fragment_browsertest.cc +content/browser/usb/web_usb_service_impl_unittest.cc content/browser/utility_sandbox_delegate_win.cc content/browser/web_contents/aura/gesture_nav_simple_unittest.cc +content/browser/web_contents/web_contents_android.cc content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl_browsertest.cc content/browser/web_contents/web_contents_impl_unittest.cc @@ -3167,10 +3166,8 @@ content/public/browser/browser_main_parts.h content/public/browser/browser_task_traits.h content/public/browser/browsing_data_filter_builder.h content/public/browser/browsing_data_remover.h -content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.h content/public/browser/navigation_handle_timing.h -content/public/browser/page_navigator.cc content/public/browser/payment_app_provider.h content/public/browser/render_frame_host.h content/public/browser/render_view_host.h @@ -3311,6 +3308,7 @@ extensions/browser/permissions_manager.h extensions/browser/service_worker_task_queue.cc extensions/browser/suggest_permission_util.cc extensions/browser/updater/extension_downloader.cc +extensions/browser/updater/extension_downloader_test_helper.cc extensions/browser/updater/extension_downloader_unittest.cc extensions/browser/updater/safe_manifest_parser.cc extensions/browser/updater/safe_manifest_parser.h @@ -3446,6 +3444,7 @@ gpu/command_buffer/service/shader_translator_unittest.cc gpu/command_buffer/service/shared_image/d3d_image_representation.h gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h gpu/command_buffer/service/shared_image/iosurface_image_backing_factory.mm +gpu/command_buffer/service/shared_image/ozone_image_backing_factory.cc gpu/command_buffer/service/shared_image/video_image_reader_image_backing.cc gpu/command_buffer/service/surface_texture_gl_owner.cc gpu/config/PRESUBMIT.py @@ -3674,6 +3673,7 @@ ios/chrome/browser/ui/toolbar/toolbar_mediator_unittest.mm ios/chrome/browser/ui/util/pasteboard_util_unittest.mm ios/chrome/browser/ui/webui/interstitials/interstitial_ui_util.mm ios/chrome/browser/url_loading/image_search_param_generator_unittest.mm +ios/chrome/browser/web/chrome_web_client_unittest.mm ios/chrome/browser/web/font_size/font_size_tab_helper_unittest.mm ios/chrome/browser/web_state_list/web_state_list_order_controller_unittest.mm ios/chrome/browser/web_state_list/web_state_list_removing_indexes_unittest.mm @@ -3737,6 +3737,7 @@ ios/web_view/internal/cwv_lookalike_url_handler_unittest.mm ios/web_view/internal/cwv_ssl_error_handler_unittest.mm ios/web_view/internal/cwv_web_view.mm ios/web_view/internal/passwords/cwv_credential_provider_extension_utils_unittest.mm +ios/web_view/internal/passwords/cwv_leak_check_credential_unittest.mm ios/web_view/internal/passwords/cwv_password_unittest.mm ios/web_view/internal/safe_browsing/cwv_unsafe_url_handler_unittest.mm ios/web_view/internal/signin/cwv_identity_unittest.mm @@ -3749,7 +3750,6 @@ ios/web_view/public/cwv_identity.h ios/web_view/public/cwv_translation_language.h ios/web_view/public/cwv_web_view.h ipc/ipc_channel.h -ipc/ipc_message.cc media/PRESUBMIT.py media/audio/android/audio_track_output_stream.cc media/audio/android/opensles_util.cc @@ -3771,6 +3771,7 @@ media/base/status.h media/base/test_random.h media/base/video_codecs.h media/base/win/dxgi_device_manager.cc +media/base/win/hresults.h media/base/win/media_foundation_cdm_proxy.h media/base/win/mf_helpers.h media/base/win/mf_initializer.cc @@ -3783,6 +3784,7 @@ media/capture/video/linux/v4l2_capture_delegate.cc media/capture/video/video_capture_device_client.cc media/capture/video/win/sink_filter_win.h media/capture/video/win/video_capture_device_factory_win.cc +media/capture/video/win/video_capture_device_mf_win.cc media/capture/video/win/video_capture_device_utils_win.cc media/capture/video/win/video_capture_device_utils_win.h media/capture/video/win/video_capture_device_win.cc @@ -4007,7 +4009,6 @@ native_client/tools/glibc-tests/exclude_list.txt native_client/tools/toolchain_tester/known_failures_clang.txt native_client/tools/toolchain_tester/known_failures_pnacl.txt native_client/tools/toolchain_tester/toolchain_tester.py -native_client_sdk/PRESUBMIT.py native_client_sdk/doc_generated/cds2014/cpp.html native_client_sdk/doc_generated/cds2014/python.html native_client_sdk/doc_generated/community/application-gallery.html @@ -4330,7 +4331,6 @@ net/spdy/spdy_http_utils_unittest.cc net/spdy/spdy_proxy_client_socket_unittest.cc net/spdy/spdy_session.cc net/spdy/spdy_session_unittest.cc -net/ssl/client_cert_store_mac.cc net/ssl/client_cert_store_win.cc net/ssl/openssl_ssl_util.cc net/ssl/ssl_key_logger.h @@ -4648,6 +4648,7 @@ testing/perf/luci_test_result.h testing/perf/perf_result_reporter.cc testing/scripts/PRESUBMIT.py testing/scripts/common.py +testing/scripts/run_finch_smoke_tests_android.py testing/scripts/run_performance_tests.py testing/scripts/rust/test_filtering_unittests.py testing/scripts/variations_smoke_test_data/http_server/index.html @@ -5001,6 +5002,7 @@ third_party/blink/common/loader/record_load_histograms.cc third_party/blink/common/origin_trials/trial_token.cc third_party/blink/common/origin_trials/trial_token_validator_unittest.cc third_party/blink/common/page_state/page_state_serialization_unittest.cc +third_party/blink/common/permissions_policy/permissions_policy.cc third_party/blink/manual_tests/forms/color-suggestion-picker.html third_party/blink/manual_tests/media-elements/video-moved-from-iframe-to-main-page.html third_party/blink/manual_tests/plugins/windowed.html @@ -5219,6 +5221,7 @@ third_party/blink/renderer/core/events/ui_event_with_key_state.h third_party/blink/renderer/core/events/wheel_event.cc third_party/blink/renderer/core/events/wheel_event.h third_party/blink/renderer/core/events/wheel_event.idl +third_party/blink/renderer/core/execution_context/navigator_base.cc third_party/blink/renderer/core/exported/web_plugin_container_impl.cc third_party/blink/renderer/core/exported/web_searchable_form_data.cc third_party/blink/renderer/core/fetch/response.h @@ -5238,12 +5241,14 @@ third_party/blink/renderer/core/frame/local_frame_back_forward_cache_test.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 +third_party/blink/renderer/core/frame/pending_beacon_dispatcher.h third_party/blink/renderer/core/frame/settings.h third_party/blink/renderer/core/frame/visual_viewport.h third_party/blink/renderer/core/frame/web_frame_serializer_impl.cc 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/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 @@ -5316,6 +5321,7 @@ third_party/blink/renderer/core/layout/layout_block.h third_party/blink/renderer/core/layout/layout_block_flow.cc third_party/blink/renderer/core/layout/layout_block_flow.h third_party/blink/renderer/core/layout/layout_box.cc +third_party/blink/renderer/core/layout/layout_box_hot.cc third_party/blink/renderer/core/layout/layout_box_model_object.cc third_party/blink/renderer/core/layout/layout_box_model_object.h third_party/blink/renderer/core/layout/layout_image.cc @@ -5458,7 +5464,6 @@ third_party/blink/renderer/modules/credentialmanagement/authentication_extension third_party/blink/renderer/modules/credentialmanagement/credentials_container.cc third_party/blink/renderer/modules/crypto/crypto_histograms.h third_party/blink/renderer/modules/encryptedmedia/encrypted_media_utils.h -third_party/blink/renderer/modules/file_system_access/file_system_read_write_options.idl third_party/blink/renderer/modules/file_system_access/file_system_sync_access_handle.idl third_party/blink/renderer/modules/filesystem/dom_file_system_base_test.cc third_party/blink/renderer/modules/font_access/font_metadata.h @@ -5480,7 +5485,6 @@ third_party/blink/renderer/modules/payments/payment_request.cc third_party/blink/renderer/modules/payments/payment_request_optional_total_test.cc third_party/blink/renderer/modules/payments/payment_response_test.cc third_party/blink/renderer/modules/peerconnection/adapters/ice_transport_adapter_impl.cc -third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.h third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.idl third_party/blink/renderer/modules/presentation/presentation_connection_available_event.h third_party/blink/renderer/modules/scheduler/scheduler.idl @@ -5503,7 +5507,6 @@ third_party/blink/renderer/modules/xr/xr_session.h third_party/blink/renderer/modules/xr/xr_system.cc third_party/blink/renderer/platform/PRESUBMIT.py third_party/blink/renderer/platform/animation/timing_function.h -third_party/blink/renderer/platform/bindings/parkable_string.cc third_party/blink/renderer/platform/fonts/bitmap_glyphs_block_list.cc third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc third_party/blink/renderer/platform/fonts/font_description.cc @@ -5617,7 +5620,6 @@ third_party/blink/renderer/platform/wtf/thread_specific.h 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/asn1/asn1_test.cc third_party/boringssl/src/crypto/cpu_arm_linux.c third_party/boringssl/src/crypto/fipsmodule/CMakeLists.txt third_party/boringssl/src/crypto/fipsmodule/bn/mul.c @@ -5633,6 +5635,7 @@ third_party/boringssl/src/crypto/trust_token/trust_token.c third_party/boringssl/src/include/openssl/base.h third_party/boringssl/src/include/openssl/span.h third_party/boringssl/src/include/openssl/ssl.h +third_party/boringssl/src/ssl/ssl_test.cc third_party/boringssl/src/third_party/googletest/include/gtest/gtest_pred_impl.h third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-port.h third_party/boringssl/src/third_party/googletest/scripts/common.py @@ -5845,7 +5848,6 @@ third_party/catapult/dashboard/dashboard/pinpoint/elements/jobs-page/new-job-fab third_party/catapult/dashboard/dashboard/pinpoint/elements/navigation-bar-test.html third_party/catapult/dashboard/dashboard/pinpoint/elements/navigation-bar.html third_party/catapult/dashboard/dashboard/pinpoint/elements/results2-frame.html -third_party/catapult/dashboard/dashboard/pinpoint/handlers/config_test.py third_party/catapult/dashboard/dashboard/pinpoint/handlers/new_test.py third_party/catapult/dashboard/dashboard/pinpoint/index/index.html third_party/catapult/dashboard/dashboard/pinpoint/models/change/change_test.py @@ -5950,6 +5952,7 @@ third_party/catapult/telemetry/telemetry/internal/backends/android_browser_backe third_party/catapult/telemetry/telemetry/internal/backends/chrome/cros_unittest.py third_party/catapult/telemetry/telemetry/internal/backends/chrome/crx_id.py third_party/catapult/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py +third_party/catapult/telemetry/telemetry/internal/backends/chrome/lacros_browser_backend.py third_party/catapult/telemetry/telemetry/internal/backends/chrome/oobe.py third_party/catapult/telemetry/telemetry/internal/backends/chrome/possible_desktop_browser_unittest.py third_party/catapult/telemetry/telemetry/internal/backends/chrome_inspector/inspector_websocket.py @@ -7080,7 +7083,6 @@ third_party/dav1d/libdav1d/tools/input/parse.h third_party/dav1d/libdav1d/tools/input/section5.c third_party/dawn/.vscode/tasks.json third_party/dawn/CMakeLists.txt -third_party/dawn/src/dawn/common/Compiler.h third_party/dawn/src/dawn/common/vulkan_platform.h third_party/dawn/src/dawn/native/CommandAllocator.cpp third_party/dawn/src/dawn/native/CopyTextureForBrowserHelper.cpp @@ -7450,6 +7452,8 @@ third_party/depot_tools/fetch_configs/crashpad.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 +third_party/depot_tools/fetch_configs/devtools-internal.py +third_party/depot_tools/fetch_configs/gn.py third_party/depot_tools/fetch_configs/goma_client.py third_party/depot_tools/fetch_configs/gyp.py third_party/depot_tools/fetch_configs/infra.py @@ -7715,7 +7719,6 @@ 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/extensions/ExtensionServer.ts -third_party/devtools-frontend/src/front_end/models/issues_manager/AttributionReportingIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/ContentSecurityPolicyIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/CookieIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/CorsIssue.ts @@ -7848,6 +7851,8 @@ 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/ExecutionContext.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/FirefoxTargetManager.d.ts +third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/FirefoxTargetManager.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/FrameManager.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/FrameManager.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/HTTPRequest.d.ts @@ -7884,6 +7889,8 @@ 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/ExecutionContext.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/FirefoxTargetManager.d.ts +third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/FirefoxTargetManager.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/FrameManager.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/FrameManager.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPRequest.d.ts @@ -8597,6 +8604,7 @@ third_party/devtools-frontend/src/scripts/deps/roll_to_chromium.py third_party/devtools-frontend/src/scripts/hosted_mode/server.js third_party/devtools-frontend/src/test/e2e/application/reporting-api_test.ts third_party/devtools-frontend/src/test/e2e/console/console-message-format_test.ts +third_party/devtools-frontend/src/test/e2e/lighthouse/navigation_test.ts third_party/devtools-frontend/src/test/e2e/rendering/Rendering_test.ts third_party/devtools-frontend/src/test/e2e/resources/console/primitives.html third_party/devtools-frontend/src/test/e2e/resources/elements/inactive-css-page.html @@ -8607,6 +8615,7 @@ third_party/devtools-frontend/src/test/unittests/front_end/core/sdk/CookieModel_ third_party/devtools-frontend/src/test/unittests/front_end/models/bindings/BreakpointManager_test.ts third_party/devtools-frontend/src/test/unittests/front_end/panels/application/ReportingApiReportsView_test.ts third_party/devtools-frontend/src/test/unittests/front_end/panels/settings/components/SyncSection_test.ts +third_party/devtools-frontend/src/test/unittests/front_end/panels/sources/components/BreakpointsView_test.ts third_party/devtools-frontend/src/test/unittests/front_end/ui/UIUtils_test.ts third_party/devtools-frontend/src/test/unittests/front_end/ui/legacy/components/object_ui/ObjectPropertiesSection_test.ts third_party/devtools-frontend/src/test/unittests/front_end/ui/legacy/components/utils/JSPresentationUtils_test.ts @@ -10457,9 +10466,10 @@ third_party/liblouis/src/tools/gnulib/stat.c third_party/liblouis/wasm/liblouis_wasm.js third_party/libphonenumber/dist/cpp/src/phonenumbers/phonenumbermatcher.h third_party/libphonenumber/dist/cpp/test/phonenumbers/phonenumberutil_test.cc -third_party/libphonenumber/dist/java/demo/war/WEB-INF/appengine-web.xml +third_party/libphonenumber/dist/java/demo/src/main/webapp/WEB-INF/appengine-web.xml third_party/libphonenumber/dist/java/pom.xml third_party/libphonenumber/dist/javascript/i18n/phonenumbers/phonenumberutil_test.js +third_party/libphonenumber/dist/migrator/migrator-servlet/src/main/webapp/WEB-INF/appengine-web.xml third_party/libphonenumber/dist/release_notes.txt third_party/libphonenumber/dist/resources/ShortNumberMetadata.xml third_party/libphonenumber/dist/resources/carrier/en/221.txt @@ -10500,7 +10510,6 @@ third_party/libvpx/source/libvpx/vp9/encoder/vp9_block.h third_party/libvpx/source/libvpx/vpx_dsp/x86/convolve.h third_party/libvpx/source/libvpx/vpx_util/vpx_thread.c third_party/libvpx/source/libvpx/vpx_util/vpx_thread.h -third_party/libwebp/BUILD.gn third_party/libwebp/src/Android.mk third_party/libwebp/src/PRESUBMIT.py third_party/libwebp/src/doc/webp-container-spec.txt @@ -10823,6 +10832,7 @@ third_party/llvm/llvm/lib/CodeGen/JMCInstrumenter.cpp third_party/llvm/llvm/lib/CodeGen/MachineFunctionSplitter.cpp third_party/llvm/llvm/lib/CodeGen/MachineOutliner.cpp third_party/llvm/llvm/lib/DebugInfo/CodeView/Formatters.cpp +third_party/llvm/llvm/lib/ExecutionEngine/JITLink/COFFDirectiveParser.h third_party/llvm/llvm/lib/MC/MCWin64EH.cpp third_party/llvm/llvm/lib/ObjCopy/ELF/ELFObject.cpp third_party/llvm/llvm/lib/ObjCopy/MachO/MachOWriter.cpp @@ -10924,6 +10934,9 @@ third_party/mozilla/NSWorkspace+Utils.h third_party/nearby/src/connections/clients/ios/Public/NearbyConnections/GNCConnection.h third_party/nearby/src/embedded/common/source/nearby_event.h third_party/nearby/src/embedded/common/source/nearby_message_stream.h +third_party/nearby/src/internal/crypto/hmac_unittest.cc +third_party/nearby/src/internal/crypto/rsa_private_key_unittest.cc +third_party/nearby/src/internal/crypto/secure_util.h third_party/nearby/src/internal/platform/bluetooth_adapter.h third_party/nearby/src/internal/platform/bluetooth_classic.h third_party/nearby/src/internal/platform/implementation/ble.h @@ -10944,6 +10957,7 @@ third_party/nearby/src/internal/platform/implementation/windows/bluetooth_classi third_party/nearby/src/internal/platform/implementation/windows/bluetooth_classic_socket.cc third_party/nearby/src/internal/platform/implementation/windows/bluetooth_classic_socket.h third_party/nearby/src/internal/platform/implementation/windows/generated/winrt/Windows.Foundation.h +third_party/nearby/src/internal/platform/implementation/windows/json/json.hpp third_party/nearby/src/internal/platform/implementation/windows/platform.cc third_party/nearby/src/internal/platform/implementation/windows/test_utils.cc third_party/nearby/src/internal/platform/nsd_service_info.h @@ -11169,22 +11183,6 @@ third_party/node/node_modules/polymer-bundler/node_modules/rollup/package.json third_party/node/node_modules/polymer-bundler/node_modules/table-layout/node_modules/array-back/package.json third_party/node/node_modules/polymer-bundler/node_modules/table-layout/package.json third_party/node/node_modules/polymer-bundler/node_modules/wordwrapjs/package.json -third_party/node/node_modules/polymer-css-build/lib/bundled-shadycss.js -third_party/node/node_modules/polymer-css-build/node_modules/array-back/package.json -third_party/node/node_modules/polymer-css-build/node_modules/clone/package.json -third_party/node/node_modules/polymer-css-build/node_modules/command-line-args/node_modules/typical/package.json -third_party/node/node_modules/polymer-css-build/node_modules/command-line-args/package.json -third_party/node/node_modules/polymer-css-build/node_modules/command-line-usage/node_modules/array-back/package.json -third_party/node/node_modules/polymer-css-build/node_modules/command-line-usage/package.json -third_party/node/node_modules/polymer-css-build/node_modules/deep-extend/lib/deep-extend.js -third_party/node/node_modules/polymer-css-build/node_modules/deep-extend/package.json -third_party/node/node_modules/polymer-css-build/node_modules/dom5/lib/util.js -third_party/node/node_modules/polymer-css-build/node_modules/find-replace/package.json -third_party/node/node_modules/polymer-css-build/node_modules/parse5/lib/tokenizer/index.js -third_party/node/node_modules/polymer-css-build/node_modules/parse5/package.json -third_party/node/node_modules/polymer-css-build/node_modules/table-layout/node_modules/array-back/package.json -third_party/node/node_modules/polymer-css-build/node_modules/table-layout/package.json -third_party/node/node_modules/polymer-css-build/node_modules/wordwrapjs/package.json third_party/node/node_modules/progress/package.json third_party/node/node_modules/reduce-flatten/package.json third_party/node/node_modules/regenerator-runtime/runtime.js @@ -11302,6 +11300,7 @@ third_party/openscreen/src/platform/base/udp_packet.cc third_party/openscreen/src/platform/impl/tls_connection_posix.cc third_party/openscreen/src/test/test_main.cc third_party/openscreen/src/testing/libfuzzer/BUILD.gn +third_party/openscreen/src/third_party/abseil/BUILD.gn third_party/openscreen/src/third_party/mozilla/LICENSE.txt third_party/openscreen/src/third_party/mozilla/url_parse.cc third_party/openscreen/src/third_party/mozilla/url_parse.h @@ -11407,8 +11406,13 @@ third_party/perfetto/infra/perfetto.dev/src/markdown_render.js third_party/perfetto/infra/perfetto.dev/src/template_footer.html third_party/perfetto/infra/perfetto.dev/src/template_header.html third_party/perfetto/infra/ui.perfetto.dev/appengine/main.py +third_party/perfetto/python/perfetto/prebuilts/manifests/trace_processor_shell.py +third_party/perfetto/python/perfetto/prebuilts/manifests/tracebox.py +third_party/perfetto/python/perfetto/prebuilts/manifests/traceconv.py +third_party/perfetto/python/perfetto/prebuilts/perfetto_prebuilts.py third_party/perfetto/python/perfetto/trace_processor/shell.py third_party/perfetto/python/setup.py +third_party/perfetto/python/tools/record_android_trace.py third_party/perfetto/src/android_internal/health_hal.cc third_party/perfetto/src/base/flat_hash_map_benchmark.cc third_party/perfetto/src/base/utils.cc @@ -11421,6 +11425,7 @@ third_party/perfetto/src/profiling/symbolizer/breakpad_parser.cc third_party/perfetto/src/profiling/symbolizer/breakpad_parser.h third_party/perfetto/src/trace_processor/analysis/describe_slice.cc third_party/perfetto/src/trace_processor/forwarding_trace_parser.cc +third_party/perfetto/src/trace_processor/importers/common/args_translation_table.cc third_party/perfetto/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.h third_party/perfetto/src/trace_processor/importers/fuchsia/fuchsia_trace_utils.h third_party/perfetto/src/trace_processor/importers/ninja/ninja_log_parser.cc @@ -11434,14 +11439,16 @@ third_party/perfetto/src/traced/probes/android_log/android_log_data_source.cc third_party/perfetto/src/traced/probes/statsd_client/statsd_data_source.h third_party/perfetto/test/cts/AndroidTest.xml third_party/perfetto/tools/download_changed_screenshots.py -third_party/perfetto/tools/get_perfetto_prebuilt.py third_party/perfetto/ui/package.json third_party/perfetto/ui/release/build_all_channels.py third_party/perfetto/ui/src/assets/index.html +third_party/perfetto/ui/src/common/cache_manager.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/chrome_utils.ts third_party/perfetto/ui/src/common/recordingV2/recording_interfaces_v2.ts third_party/perfetto/ui/src/common/recordingV2/target_factories/android_websocket_target_factory.ts +third_party/perfetto/ui/src/common/recordingV2/targets/android_webusb_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 @@ -12394,6 +12401,7 @@ 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.json third_party/skia/infra/bots/recipes/sync_and_compile.expected/Build-Win10-Clang-x86_64-Release-NoDEPS.json third_party/skia/infra/bots/recipes/sync_and_compile.py third_party/skia/infra/bots/recipes/test.py @@ -12431,7 +12439,6 @@ third_party/skia/modules/pathkit/npm-asmjs/package.json third_party/skia/modules/pathkit/npm-wasm/package.json third_party/skia/modules/skottie/src/layers/TextLayer.cpp third_party/skia/modules/skunicode/src/SkUnicode_icu.cpp -third_party/skia/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt third_party/skia/platform_tools/android/tradefed/upload_dm_results.py third_party/skia/platform_tools/libraries/include/arcore_c_api.h third_party/skia/resources/skottie/skottie-line-height.json @@ -12537,6 +12544,7 @@ third_party/skia/tools/skpbench/_hardware_pixel.py third_party/skia/tools/skpbench/_hardware_pixel_c.py third_party/skia/tools/skpbench/sheet.py third_party/skia/tools/skqp/src/skqp.cpp +third_party/skia/tools/skqp/src/skqp_GpuTestProcs.cpp third_party/smhasher/src/PMurHash.c third_party/snappy/linux/snappy-stubs-public.h third_party/snappy/mac/snappy-stubs-public.h @@ -12627,8 +12635,8 @@ third_party/text-fragments-polyfill/src/package.json third_party/text-fragments-polyfill/src/src/text-fragment-utils.js third_party/text-fragments-polyfill/src/test/unit/complicated-layout.html third_party/tflite/src/configure.py -third_party/tflite/src/tensorflow/compiler/mlir/hlo/lib/Dialect/mhlo/transforms/chlo_legalize_to_hlo.cc -third_party/tflite/src/tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.cc +third_party/tflite/src/tensorflow/compiler/xla/mlir_hlo/lib/Dialect/mhlo/transforms/chlo_legalize_to_hlo.cc +third_party/tflite/src/tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.h third_party/tflite/src/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc third_party/tflite/src/tensorflow/compiler/xla/service/hlo_graph_dumper.cc third_party/tflite/src/tensorflow/compiler/xla/service/hlo_verifier.cc @@ -12684,6 +12692,7 @@ third_party/tflite/src/tensorflow/lite/toco/model.h third_party/tflite/src/tensorflow/lite/tools/benchmark/experimental/firebase/android/jni/benchmark_model_jni.cc third_party/tflite/src/tensorflow/lite/tutorials/dataset.py third_party/tflite/src/tensorflow/python/eager/profiler.py +third_party/tflite/src/tensorflow/python/eager/remote_cluster_test.py third_party/tflite/src/tensorflow/python/framework/graph_to_function_def.py third_party/tflite/src/tensorflow/python/framework/ops.py third_party/tflite/src/tensorflow/python/framework/test_util_test.py @@ -12762,6 +12771,9 @@ third_party/vulkan-deps/vulkan-validation-layers/src/layers/device_state.h third_party/vulkan-deps/vulkan-validation-layers/src/layers/drawdispatch.cpp third_party/vulkan-deps/vulkan-validation-layers/src/layers/generated/corechecks_optick_instrumentation.cpp third_party/vulkan-deps/vulkan-validation-layers/src/layers/generated/corechecks_optick_instrumentation.h +third_party/vulkan-deps/vulkan-validation-layers/src/layers/generated/gpu_as_inspection_comp.h +third_party/vulkan-deps/vulkan-validation-layers/src/layers/generated/gpu_pre_dispatch_comp.h +third_party/vulkan-deps/vulkan-validation-layers/src/layers/generated/gpu_pre_draw_vert.h third_party/vulkan-deps/vulkan-validation-layers/src/layers/generated/spirv_tools_commit_id.h third_party/vulkan-deps/vulkan-validation-layers/src/layers/generated/synchronization_validation_types.cpp third_party/vulkan-deps/vulkan-validation-layers/src/layers/generated/synchronization_validation_types.h @@ -12791,6 +12803,7 @@ third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker.h third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_layer_data.h third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_layer_utils.h third_party/vulkan-deps/vulkan-validation-layers/src/scripts/external_revision_generator.py +third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generate_spirv.py third_party/vulkan-deps/vulkan-validation-layers/src/scripts/github_ci_android.py third_party/vulkan-deps/vulkan-validation-layers/src/scripts/github_ci_gn.py third_party/vulkan-deps/vulkan-validation-layers/src/scripts/helper_file_generator.py @@ -13427,6 +13440,7 @@ tools/bisect-builds.py tools/bisect_repackage/bisect_repackage.py tools/bisect_repackage/bisect_repackage_utils.py tools/boilerplate.py +tools/browserbench-webdriver/browserbench.py tools/captured_sites/refresh.py tools/check_git_config.py tools/checkbins/checkbins.py @@ -13488,6 +13502,7 @@ tools/emacs/trybot-mac.txt tools/find_runtime_symbols/PRESUBMIT.py tools/flags/list_flags.py tools/generate_stubs/generate_stubs.py +tools/get_asan_chrome/get_asan_chrome.py tools/git/suggest_owners.py tools/gn/bootstrap/bootstrap.py tools/gn/infra/recipe_modules/macos_sdk/__init__.py @@ -13590,6 +13605,7 @@ tools/metrics/histograms/metadata/android/histograms.xml tools/metrics/histograms/metadata/apps/histograms.xml tools/metrics/histograms/metadata/arc/histograms.xml tools/metrics/histograms/metadata/ash/histograms.xml +tools/metrics/histograms/metadata/ash_clipboard/histograms.xml tools/metrics/histograms/metadata/assistant/histograms.xml tools/metrics/histograms/metadata/auth/histograms.xml tools/metrics/histograms/metadata/auto/histograms.xml @@ -13748,7 +13764,6 @@ tools/perf/PRESUBMIT.py tools/perf/benchmarks/blink_perf.py tools/perf/benchmarks/desktop_ui.py tools/perf/benchmarks/dummy_benchmark.py -tools/perf/benchmarks/gp.py tools/perf/benchmarks/jetstream.py tools/perf/benchmarks/jetstream2.py tools/perf/benchmarks/kraken.py @@ -13793,6 +13808,8 @@ tools/perf/contrib/leak_detection/leak_detection.py tools/perf/contrib/leak_detection/page_sets.py tools/perf/contrib/memory_extras/memory_extras.py tools/perf/contrib/orderfile/orderfile.py +tools/perf/contrib/power/power_mobile.py +tools/perf/contrib/power/top_sites_story.py tools/perf/contrib/system_health_scroll_jank/system_health_scroll_jank.py tools/perf/contrib/vr_benchmarks/vr_benchmarks.py tools/perf/core/bot_platforms.py @@ -14059,7 +14076,9 @@ ui/accessibility/extensions/chromevoxclassic/cvox2/background/panel.html ui/accessibility/extensions/chromevoxclassic/extensions/searchvox/loader.js ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js ui/accessibility/extensions/chromevoxclassic/manifest.json.jinja2 +ui/accessibility/extensions/color_contrast_companion/help.html ui/accessibility/extensions/strings/accessibility_extensions_strings.grd +ui/accessibility/platform/ax_platform_node_base_unittest.cc ui/accessibility/platform/ax_platform_node_delegate_utils_win.cc ui/accessibility/platform/ax_platform_node_textrangeprovider_win.cc ui/accessibility/platform/ax_platform_node_textrangeprovider_win_unittest.cc @@ -14099,7 +14118,6 @@ ui/base/win/event_creation_utils.cc ui/base/win/lock_state.cc ui/base/win/win_cursor.cc ui/chromeos/file_manager_strings.grdp -ui/compositor/layer_owner.cc ui/display/display_transform.cc ui/display/mac/display_link_mac.cc ui/display/mac/test/virtual_display_mac_util.mm @@ -14119,20 +14137,19 @@ ui/events/test/keyboard_layout_win.cc ui/events/win/events_win.cc ui/events/win/events_win_utils.cc ui/events/win/modifier_keyboard_hook_win.cc -ui/file_manager/audio_player/manifest.json ui/file_manager/base/gn/PRESUBMIT.py ui/file_manager/file_manager/background/js/background.js ui/file_manager/file_manager/background/js/volume_manager_unittest.js ui/file_manager/file_manager/common/js/files_app_entry_types.js ui/file_manager/file_manager/common/js/mock_chrome.js ui/file_manager/file_manager/common/js/util.js -ui/file_manager/file_manager/externs/chrome_cast.js ui/file_manager/file_manager/externs/chrome_file_browser_handler.js ui/file_manager/file_manager/externs/html_menu_item_element.js ui/file_manager/file_manager/externs/volume_info.js ui/file_manager/file_manager/foreground/elements/icons.html ui/file_manager/file_manager/foreground/js/file_manager_commands.js ui/file_manager/file_manager/foreground/js/file_transfer_controller.js +ui/file_manager/file_manager/foreground/js/ui/file_table.js ui/file_manager/file_manager/foreground/js/ui/file_tap_handler.js ui/file_manager/file_manager/manifest.json ui/file_manager/image_loader/piex/Makefile @@ -14153,7 +14170,7 @@ ui/gfx/text_elider_unittest.cc ui/gfx/win/physical_size.cc ui/gfx/win/singleton_hwnd_hot_key_observer.cc ui/gl/android/surface_texture.cc -ui/gl/direct_composition_surface_win.cc +ui/gl/direct_composition_support.cc ui/gl/gl_display.cc ui/gl/gl_image_io_surface_egl.mm ui/gl/gl_surface_egl.cc @@ -14191,7 +14208,6 @@ ui/views/window/non_client_view.cc ui/webui/resources/cr_components/app_management/icons.html ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard_icon.html ui/webui/resources/cr_components/customize_themes/customize_themes.ts -ui/webui/resources/cr_elements/chromeos/cr_picture/png.js ui/webui/resources/cr_elements/icons.html ui/webui/resources/js/ios/web_ui.js url/BUILD.gn 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 ad225623..4c171663 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 -@@ -2226,7 +2226,6 @@ static_library("browser") { +@@ -2232,7 +2232,6 @@ static_library("browser") { "//components/reputation/core:proto", "//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", -@@ -3674,8 +3673,6 @@ static_library("browser") { +@@ -3689,8 +3688,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -42,7 +42,7 @@ virtual subresource_filter::RulesetService* --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -71,7 +71,6 @@ +@@ -72,7 +72,6 @@ #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h" @@ -50,7 +50,7 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/site_isolation/prefs_observer.h" #include "chrome/browser/ssl/secure_origin_prefs_observer.h" -@@ -406,8 +405,6 @@ void BrowserProcessImpl::StartTearDown() +@@ -407,8 +406,6 @@ void BrowserProcessImpl::StartTearDown() metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -59,7 +59,7 @@ network_time_tracker_.reset(); #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1038,14 +1035,6 @@ StatusTray* BrowserProcessImpl::status_t +@@ -1039,14 +1036,6 @@ StatusTray* BrowserProcessImpl::status_t return status_tray_.get(); } @@ -74,7 +74,7 @@ subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1286,26 +1275,6 @@ void BrowserProcessImpl::CreateBackgroun +@@ -1284,26 +1273,6 @@ void BrowserProcessImpl::CreateBackgroun #endif } @@ -111,7 +111,7 @@ subresource_filter::RulesetService* subresource_filter_ruleset_service() override; -@@ -329,9 +328,6 @@ class BrowserProcessImpl : public Browse +@@ -330,9 +329,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr background_mode_manager_; #endif @@ -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" -@@ -630,10 +629,6 @@ void ChromeBrowsingDataRemoverDelegate:: +@@ -636,10 +635,6 @@ void ChromeBrowsingDataRemoverDelegate:: base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -144,7 +144,7 @@ host_content_settings_map_); --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1003,34 +1003,6 @@ void SetApplicationLocaleOnIOThread(cons +@@ -997,34 +997,6 @@ void SetApplicationLocaleOnIOThread(cons GetIOThreadApplicationLocale() = locale; } @@ -179,7 +179,7 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) AppLoadedInTabSource ClassifyAppLoadedInTabSource( -@@ -4487,14 +4459,9 @@ ChromeContentBrowserClient::CreateThrott +@@ -4520,14 +4492,9 @@ ChromeContentBrowserClient::CreateThrott throttles.push_back(std::make_unique( handle, handle->GetWebContents()->GetBrowserContext())); @@ -195,7 +195,7 @@ base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp), base::BindOnce( &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps))); -@@ -4529,16 +4496,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -4562,16 +4529,6 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -212,7 +212,7 @@ if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) { throttles.push_back( std::make_unique( -@@ -4765,8 +4722,6 @@ void ChromeContentBrowserClient::Overrid +@@ -4800,8 +4757,6 @@ void ChromeContentBrowserClient::Overrid void ChromeContentBrowserClient::InitOnUIThread() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -246,7 +246,7 @@ } // namespace --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -451,13 +451,6 @@ void ChromeDownloadManagerDelegate::SetD +@@ -450,13 +450,6 @@ void ChromeDownloadManagerDelegate::SetD download_manager_ = dm; @@ -260,7 +260,7 @@ if (download_manager_) { download_manager_->AddObserver(this); } -@@ -810,17 +803,6 @@ void ChromeDownloadManagerDelegate::Choo +@@ -809,17 +802,6 @@ void ChromeDownloadManagerDelegate::Choo void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( base::FilePath* filename, const GURL& source_url) { @@ -280,7 +280,7 @@ void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -97,7 +97,7 @@ class DownloadItemModelData : public bas +@@ -99,7 +99,7 @@ class DownloadItemModelData : public bas // Danger level of the file determined based on the file type and whether // there was a user action associated with the download. @@ -289,16 +289,16 @@ // Whether the download is currently being revived. bool is_being_revived_; -@@ -143,7 +143,7 @@ DownloadItemModelData::DownloadItemModel +@@ -144,7 +144,7 @@ DownloadItemModelData* DownloadItemModel + DownloadItemModelData::DownloadItemModelData() : should_show_in_shelf_(true), was_ui_notified_(false), - should_prefer_opening_in_browser_(false), - danger_level_(DownloadFileType::NOT_DANGEROUS), + danger_level_(safe_browsing::DownloadFileType::NOT_DANGEROUS), is_being_revived_(false) {} #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -444,13 +444,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -465,13 +465,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -315,7 +315,7 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -672,9 +672,6 @@ bool DownloadItemModel::IsCommandEnabled +@@ -694,9 +694,6 @@ bool DownloadItemModel::IsCommandEnabled // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -370,7 +370,7 @@ // If no mime type or explicitly specified a name, don't replace file // extension. if (sniffed_mime_type.empty() || !suggested_filename.empty()) -@@ -1160,30 +1153,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1158,30 +1151,7 @@ DownloadFileType::DangerLevel DownloadTa download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; @@ -476,7 +476,7 @@ #include "chrome/common/extensions/api/downloads.h" #include "components/download/content/public/all_download_item_notifier.h" #include "components/download/public/common/download_path_reservation_tracker.h" -@@ -199,13 +198,6 @@ class DownloadsRemoveFileFunction : publ +@@ -201,13 +200,6 @@ class DownloadsRemoveFileFunction : publ class DownloadsAcceptDangerFunction : public ExtensionFunction { public: @@ -490,7 +490,7 @@ DECLARE_EXTENSION_FUNCTION("downloads.acceptDanger", DOWNLOADS_ACCEPTDANGER) DownloadsAcceptDangerFunction(); -@@ -217,13 +209,10 @@ class DownloadsAcceptDangerFunction : pu +@@ -219,13 +211,10 @@ class DownloadsAcceptDangerFunction : pu protected: ~DownloadsAcceptDangerFunction() override; @@ -548,7 +548,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 -@@ -721,18 +721,6 @@ void WebstorePrivateBeginInstallWithMani +@@ -720,18 +720,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -567,7 +567,7 @@ } void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone( -@@ -1202,55 +1190,9 @@ WebstorePrivateGetReferrerChainFunction: +@@ -1201,55 +1189,9 @@ WebstorePrivateGetReferrerChainFunction: ExtensionFunction::ResponseAction WebstorePrivateGetReferrerChainFunction::Run() { @@ -696,7 +696,7 @@ // SimpleURLLoader -> (owned loader, extension id). --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -867,9 +867,6 @@ void ChromeMetricsServiceClient::Registe +@@ -877,9 +877,6 @@ void ChromeMetricsServiceClient::Registe metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -718,27 +718,17 @@ } // static ---- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -349,7 +349,6 @@ void ChromeBrowserMainExtraPartsProfiles - #if BUILDFLAG(IS_CHROMEOS_LACROS) - CertDbInitializerFactory::GetInstance(); - #endif -- CertificateReportingServiceFactory::GetInstance(); - #if !BUILDFLAG(IS_ANDROID) - ChromeBrowsingDataLifetimeManagerFactory::GetInstance(); - #endif --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -89,7 +89,6 @@ - #include "chrome/browser/profiles/profile_metrics.h" +@@ -90,7 +90,6 @@ #include "chrome/browser/push_messaging/push_messaging_service_factory.h" #include "chrome/browser/push_messaging/push_messaging_service_impl.h" + #include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/sessions/exit_type_service.h" #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" -@@ -620,17 +619,6 @@ void ProfileImpl::LoadPrefsForNormalStar +@@ -628,17 +627,6 @@ void ProfileImpl::LoadPrefsForNormalStar mojo::PendingRemote pref_validation_delegate; @@ -758,7 +748,7 @@ CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false), --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc -@@ -257,9 +257,6 @@ void RemoveBrowsingDataForProfile(const +@@ -260,9 +260,6 @@ void RemoveBrowsingDataForProfile(const // The BrowsingDataRemover relies on many objects that aren't created in unit // tests. Previously this code would depend on content::ResourceDispatcherHost // but that's gone, so do a similar hack for now. @@ -786,7 +776,7 @@ if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode -@@ -463,6 +465,7 @@ static_library("advanced_protection") { +@@ -461,6 +463,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -794,7 +784,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -480,6 +483,7 @@ source_set("metrics_collector") { +@@ -478,6 +481,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -896,7 +886,7 @@ --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -4312,7 +4312,6 @@ static_library("ui") { +@@ -4350,7 +4350,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", @@ -906,7 +896,7 @@ "views/download/download_item_view.cc", --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -402,22 +402,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -403,22 +403,6 @@ void TabHelpers::AttachTabHelpers(WebCon // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); @@ -962,7 +952,7 @@ DownloadItemModel item_model(download); if (!item_model.ShouldShowInShelf() || download->GetState() == download::DownloadItem::IN_PROGRESS) { -@@ -416,44 +406,6 @@ void DownloadsDOMHandler::FinalizeRemova +@@ -418,44 +408,6 @@ void DownloadsDOMHandler::FinalizeRemova } } @@ -1198,7 +1188,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/subresource_filter/content/renderer/subresource_filter_agent.h" #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h" -@@ -426,12 +425,8 @@ void ChromeContentRendererClient::Render +@@ -437,12 +436,8 @@ void ChromeContentRendererClient::Render subresource_filter_ruleset_dealer_ = std::make_unique(); diff --git a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch index 257326ea..944014b2 100644 --- a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch +++ b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch @@ -1,6 +1,6 @@ --- a/components/autofill/core/browser/autofill_download_manager.cc +++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -799,94 +799,6 @@ std::tuple AutofillDo +@@ -798,94 +798,6 @@ std::tuple AutofillDo } bool AutofillDownloadManager::StartRequest(FormRequestData request_data) { diff --git a/patches/core/inox-patchset/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index f9be5324..e90f10cc 100644 --- a/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -10,7 +10,7 @@ extension_misc::kAssessmentAssistantExtensionId, --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc -@@ -360,11 +360,6 @@ void ComponentLoader::AddWebStoreApp() { +@@ -363,11 +363,6 @@ void ComponentLoader::AddWebStoreApp() { if (!IsNormalSession()) return; #endif @@ -36,7 +36,7 @@ { --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc -@@ -553,20 +553,6 @@ void WebstoreInstaller::DownloadNextPend +@@ -551,20 +551,6 @@ void WebstoreInstaller::DownloadNextPend void WebstoreInstaller::DownloadCrx( const std::string& extension_id, InstallSource source) { @@ -57,7 +57,7 @@ } // http://crbug.com/165634 -@@ -714,21 +700,6 @@ void WebstoreInstaller::UpdateDownloadPr +@@ -712,21 +698,6 @@ void WebstoreInstaller::UpdateDownloadPr void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!crx_installer_.get()); diff --git a/patches/core/inox-patchset/0015-disable-update-pings.patch b/patches/core/inox-patchset/0015-disable-update-pings.patch index 1aab06a9..1c0ba6dc 100644 --- a/patches/core/inox-patchset/0015-disable-update-pings.patch +++ b/patches/core/inox-patchset/0015-disable-update-pings.patch @@ -1,6 +1,6 @@ --- a/chrome/updater/configurator.cc +++ b/chrome/updater/configurator.cc -@@ -92,7 +92,7 @@ int Configurator::UpdateDelay() const { +@@ -84,7 +84,7 @@ int Configurator::UpdateDelay() const { } std::vector Configurator::UpdateUrl() const { diff --git a/patches/core/inox-patchset/0021-disable-rlz.patch b/patches/core/inox-patchset/0021-disable-rlz.patch index b30f19d8..db537920 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 -@@ -471,14 +471,6 @@ group("gn_all") { +@@ -478,14 +478,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 1d5db943..88cd923d 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 @@ -90,7 +90,7 @@ by default. if base_tag != '': --- a/chrome/browser/ash/customization/customization_document.cc +++ b/chrome/browser/ash/customization/customization_document.cc -@@ -198,7 +198,7 @@ std::string ReadFileInBackground(const b +@@ -199,7 +199,7 @@ std::string ReadFileInBackground(const b // Template URL where to fetch OEM services customization manifest from. const char ServicesCustomizationDocument::kManifestUrl[] = @@ -213,7 +213,7 @@ by default. base::ToLowerASCII(bdict_file)); --- a/chrome/browser/supervised_user/supervised_user_service.cc +++ b/chrome/browser/supervised_user/supervised_user_service.cc -@@ -88,7 +88,7 @@ namespace { +@@ -87,7 +87,7 @@ namespace { // The URL from which to download a host denylist if no local one exists yet. const char kDenylistURL[] = @@ -484,12 +484,14 @@ by default. GURL url(base::WideToUTF16(args[0])); --- a/extensions/common/extension_urls.cc +++ b/extensions/common/extension_urls.cc -@@ -26,9 +26,9 @@ bool IsSourceFromAnExtension(const std:: +@@ -26,10 +26,10 @@ bool IsSourceFromAnExtension(const std:: namespace extension_urls { -const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore"; +-const char kNewChromeWebstoreBaseURL[] = "https://webstore.google.com/"; +const char kChromeWebstoreBaseURL[] = "trk:09:https://chrome.google.com/webstore"; ++const char kNewChromeWebstoreBaseURL[] = "trk:08:https://webstore.google.com/"; const char kChromeWebstoreUpdateURL[] = - "https://clients2.google.com/service/update2/crx"; + "trk:05:https://clients2.google.com/service/update2/crx"; diff --git a/patches/core/ungoogled-chromium/block-requests.patch b/patches/core/ungoogled-chromium/block-requests.patch index 8fb44c53..d3ec790d 100644 --- a/patches/core/ungoogled-chromium/block-requests.patch +++ b/patches/core/ungoogled-chromium/block-requests.patch @@ -2,7 +2,7 @@ # chrome://discards/ attempts to use d3 to display the graph --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc -@@ -285,6 +285,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad +@@ -287,6 +287,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default; void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) { @@ -12,14 +12,14 @@ // Note: If there is an ongoing request, abandon it. It's possible that --- a/chrome/browser/new_tab_page/promos/promo_service.cc +++ b/chrome/browser/new_tab_page/promos/promo_service.cc -@@ -139,6 +139,7 @@ PromoService::PromoService( +@@ -171,6 +171,7 @@ PromoService::PromoService( PromoService::~PromoService() = default; void PromoService::Refresh() { -+ return; - net::NetworkTrafficAnnotationTag traffic_annotation = - net::DefineNetworkTrafficAnnotation("promo_service", R"( - semantics { ++ if ((true)) return; + std::string command_id; + // Replace the promo URL with "command:" if such a command ID is set + // via the feature params. --- a/chrome/browser/resources/discards/graph_doc_template.html +++ b/chrome/browser/resources/discards/graph_doc_template.html @@ -78,10 +78,6 @@ URL. As result, this document needs to b @@ -65,7 +65,7 @@ if (state_ == REQUESTING) { --- a/components/update_client/update_checker.cc +++ b/components/update_client/update_checker.cc -@@ -97,6 +97,7 @@ void UpdateCheckerImpl::CheckForUpdates( +@@ -98,6 +98,7 @@ void UpdateCheckerImpl::CheckForUpdates( scoped_refptr context, const base::flat_map& additional_attributes, UpdateCheckCallback update_check_callback) { diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index 9b4c8af4..a3c23134 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -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 -@@ -743,6 +743,7 @@ ChildProcessSecurityPolicyImpl::ChildPro +@@ -744,6 +744,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 -@@ -1002,6 +1002,8 @@ component("net") { +@@ -1007,6 +1007,8 @@ component("net") { "url_request/report_sender.h", "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", diff --git a/patches/core/ungoogled-chromium/disable-domain-reliability.patch b/patches/core/ungoogled-chromium/disable-domain-reliability.patch index d342db32..9f59bc4e 100644 --- a/patches/core/ungoogled-chromium/disable-domain-reliability.patch +++ b/patches/core/ungoogled-chromium/disable-domain-reliability.patch @@ -111,7 +111,7 @@ def quote_and_wrap_text(text, width=79, prefix=' "', suffix='"'): --- a/components/domain_reliability/google_configs.cc +++ b/components/domain_reliability/google_configs.cc -@@ -11,548 +11,6 @@ +@@ -11,549 +11,6 @@ namespace domain_reliability { @@ -637,14 +637,15 @@ - bool include_subdomains = params.include_subdomains && !is_www; - - auto config = std::make_unique(); -- config->origin = GURL("https://" + hostname + "/"); +- GURL url("https://" + hostname + "/"); +- config->origin = url::Origin::Create(url); - config->include_subdomains = include_subdomains; - config->collectors.clear(); - if (params.include_origin_specific_collector) { - GURL::Replacements replacements; - replacements.SetPathStr(kGoogleOriginSpecificCollectorPathString); - config->collectors.push_back( -- std::make_unique(config->origin.ReplaceComponents(replacements))); +- std::make_unique(url.ReplaceComponents(replacements))); - } - for (const char* collector : kGoogleStandardCollectors) { - config->collectors.push_back(std::make_unique(collector)); @@ -660,7 +661,7 @@ std::unique_ptr MaybeGetGoogleConfig( const std::string& hostname) { bool is_www_subdomain = -@@ -562,23 +20,6 @@ std::unique_ptr config; std::unique_ptr superdomain_config; @@ -684,7 +685,7 @@ if (config) { DCHECK(config->origin.host() == hostname); return config; -@@ -597,11 +38,6 @@ std::vector> configs_out; diff --git a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch index ebfc63a8..b61cd354 100644 --- a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch +++ b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch @@ -1,16 +1,5 @@ # Disables references to fonts.googleapis.com ---- a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html -+++ b/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html -@@ -5,7 +5,7 @@ - - $i18n{blockPageTitle} -- -+ - - - --- a/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css @@ -2,7 +2,7 @@ @@ -46,7 +35,7 @@ --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc -@@ -298,7 +298,7 @@ bool DomDistillerViewerSource::ShouldSer +@@ -299,7 +299,7 @@ bool DomDistillerViewerSource::ShouldSer std::string DomDistillerViewerSource::GetContentSecurityPolicy( network::mojom::CSPDirectiveName directive) { if (directive == network::mojom::CSPDirectiveName::StyleSrc) { diff --git a/patches/core/ungoogled-chromium/disable-gaia.patch b/patches/core/ungoogled-chromium/disable-gaia.patch index fa843149..460f55da 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 -@@ -292,64 +292,6 @@ void GaiaAuthFetcher::CreateAndStartGaia +@@ -288,64 +288,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 7838c200..154e0316 100644 --- a/patches/core/ungoogled-chromium/disable-gcm.patch +++ b/patches/core/ungoogled-chromium/disable-gcm.patch @@ -10,7 +10,7 @@ std::vector endpoints; endpoints.push_back(gservices_settings_.GetMCSMainEndpoint()); GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint(); -@@ -670,27 +671,6 @@ void GCMClientImpl::RemoveHeartbeatInter +@@ -670,32 +671,6 @@ void GCMClientImpl::RemoveHeartbeatInter void GCMClientImpl::StartCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); @@ -21,11 +21,16 @@ - - checkin_proto::ChromeBuildProto chrome_build_proto; - ToCheckinProtoVersion(chrome_build_info_, &chrome_build_proto); -- CheckinRequest::RequestInfo request_info(device_checkin_info_.android_id, -- device_checkin_info_.secret, -- device_checkin_info_.account_tokens, -- gservices_settings_.digest(), -- chrome_build_proto); +- +- std::map empty_account_tokens; +- bool include_account_tokens = base::FeatureList::IsEnabled( +- features::kGCMIncludeAccountTokensInCheckinRequest); +- +- CheckinRequest::RequestInfo request_info( +- device_checkin_info_.android_id, device_checkin_info_.secret, +- include_account_tokens ? device_checkin_info_.account_tokens +- : empty_account_tokens, +- gservices_settings_.digest(), chrome_build_proto); - checkin_request_ = std::make_unique( - gservices_settings_.GetCheckinURL(), request_info, GetGCMBackoffPolicy(), - base::BindOnce(&GCMClientImpl::OnCheckinCompleted, @@ -38,7 +43,7 @@ } void GCMClientImpl::OnCheckinCompleted( -@@ -747,24 +727,6 @@ void GCMClientImpl::SetGServicesSettings +@@ -752,24 +727,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 b5dc0bde..75e44e3b 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -430,7 +430,7 @@ --- a/components/page_load_metrics/browser/page_load_metrics_util.cc +++ b/components/page_load_metrics/browser/page_load_metrics_util.cc -@@ -210,9 +210,7 @@ bool DidObserveLoadingBehaviorInAnyFrame +@@ -266,9 +266,7 @@ bool DidObserveLoadingBehaviorInAnyFrame } bool IsGoogleSearchHostname(const GURL& url) { @@ -485,7 +485,7 @@ bool IsGoogleHostname(const GURL& url) { --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -533,11 +533,7 @@ std::u16string TemplateURLRef::SearchTer +@@ -534,11 +534,7 @@ std::u16string TemplateURLRef::SearchTer bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index a9aa58bd..eadbcaf5 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 -@@ -378,7 +378,6 @@ if (!is_android && !is_mac) { +@@ -364,7 +364,6 @@ if (!is_android && !is_mac) { } data_deps += [ @@ -15,7 +15,7 @@ "//third_party/widevine/cdm", ] } -@@ -1204,7 +1203,6 @@ if (is_win) { +@@ -1190,7 +1189,6 @@ if (is_win) { ":optimization_guide_library", ":swiftshader_library", ":widevine_cdm_library", diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch index d2f4ccb3..2c78ee0b 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -24,7 +24,7 @@ --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc +++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc -@@ -60,7 +60,7 @@ namespace privacy_sandbox { +@@ -66,7 +66,7 @@ namespace privacy_sandbox { void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref( @@ -35,7 +35,7 @@ registry->RegisterBooleanPref( --- a/components/privacy_sandbox/privacy_sandbox_settings.cc +++ b/components/privacy_sandbox/privacy_sandbox_settings.cc -@@ -329,45 +329,10 @@ bool PrivacySandboxSettings::IsSharedSto +@@ -336,45 +336,10 @@ bool PrivacySandboxSettings::IsPrivateAg } bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const { @@ -95,7 +95,7 @@ kPrivacySandboxAggregationServiceTrustedServerUrlParam{ --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -49,7 +49,7 @@ const base::Feature kCSSContainerQueries +@@ -109,7 +109,7 @@ const base::Feature kCSSContainerQueries // Controls whether the Conversion Measurement API infrastructure is enabled. const base::Feature kConversionMeasurement{"ConversionMeasurement", diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index 5db29572..f69eeb99 100644 --- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch +++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch @@ -2,13 +2,15 @@ --- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc +++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc -@@ -559,10 +559,6 @@ std::vector ChromeContentBr +@@ -559,12 +559,6 @@ std::vector ChromeContentBr GetOriginsRequiringDedicatedProcess() { std::vector list; - // Require a dedicated process for the webstore origin. See - // https://crbug.com/939108. - list.push_back(url::Origin::Create(extension_urls::GetWebstoreLaunchURL())); +- list.push_back( +- url::Origin::Create(extension_urls::GetNewWebstoreLaunchURL())); - return list; } @@ -149,7 +151,7 @@ } DCHECK(!task.update_url.is_empty()); -@@ -849,20 +829,6 @@ void ExtensionDownloader::HandleManifest +@@ -846,20 +826,6 @@ void ExtensionDownloader::HandleManifest update.second->info); } @@ -170,7 +172,7 @@ ExtensionIdSet extension_ids_with_errors; for (const auto& failure : failures) extension_ids_with_errors.insert(failure.first.id); -@@ -1446,11 +1412,7 @@ bool ExtensionDownloader::IterateFetchCr +@@ -1443,11 +1409,7 @@ bool ExtensionDownloader::IterateFetchCr // fetch. switch (fetch->credentials) { case ExtensionFetch::CREDENTIALS_NONE: diff --git a/patches/core/ungoogled-chromium/doh-changes.patch b/patches/core/ungoogled-chromium/doh-changes.patch index 1f02a969..e31fcb8e 100644 --- a/patches/core/ungoogled-chromium/doh-changes.patch +++ b/patches/core/ungoogled-chromium/doh-changes.patch @@ -1,6 +1,6 @@ --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -313,12 +313,7 @@ const base::Feature kDisruptiveNotificat +@@ -305,12 +305,7 @@ const base::Feature kDisruptiveNotificat // Enable DNS over HTTPS (DoH). const base::Feature kDnsOverHttps { "DnsOverHttps", 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 3e1b6720..db64c276 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -3,7 +3,7 @@ --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn -@@ -333,11 +333,7 @@ source_set("lib") { +@@ -357,11 +357,7 @@ source_set("lib") { } } @@ -15,7 +15,7 @@ executable("$chromedriver_output") { testonly = true -@@ -359,16 +355,6 @@ executable("$chromedriver_output") { +@@ -383,16 +379,6 @@ executable("$chromedriver_output") { } } @@ -32,6 +32,16 @@ python_library("chromedriver_py_tests") { testonly = true deps = [ +--- a/components/segmentation_platform/embedder/BUILD.gn ++++ b/components/segmentation_platform/embedder/BUILD.gn +@@ -21,7 +21,6 @@ source_set("embedder") { + "//components/optimization_guide/core", + "//components/optimization_guide/core:features", + "//components/segmentation_platform/internal", +- "//components/segmentation_platform/internal:optimization_guide_segmentation_handler", + "//components/segmentation_platform/internal/proto", + "//components/segmentation_platform/public", + "//url", --- a/third_party/devtools-frontend/src/BUILD.gn +++ b/third_party/devtools-frontend/src/BUILD.gn @@ -13,7 +13,6 @@ import("./third_party/blink/public/publi diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index fae5dcce..da470940 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 -@@ -626,8 +626,6 @@ static_library("browser") { +@@ -633,8 +633,6 @@ static_library("browser") { "internal_auth.h", "interstitials/chrome_settings_page_helper.cc", "interstitials/chrome_settings_page_helper.h", @@ -11,7 +11,7 @@ "invalidation/profile_invalidation_provider_factory.cc", "invalidation/profile_invalidation_provider_factory.h", "language/accept_languages_service_factory.cc", -@@ -3696,10 +3694,6 @@ static_library("browser") { +@@ -3711,10 +3709,6 @@ static_library("browser") { "enterprise/connectors/analysis/analysis_service_settings.h", "enterprise/connectors/analysis/analysis_settings.cc", "enterprise/connectors/analysis/analysis_settings.h", @@ -22,26 +22,26 @@ "enterprise/connectors/analysis/content_analysis_dialog.cc", "enterprise/connectors/analysis/content_analysis_dialog.h", "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc", -@@ -3970,10 +3964,6 @@ static_library("browser") { - "new_tab_page/modules/photos/photos_service.h", - "new_tab_page/modules/photos/photos_service_factory.cc", - "new_tab_page/modules/photos/photos_service_factory.h", +@@ -3991,10 +3985,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/task_module/task_module_handler.cc", - "new_tab_page/modules/task_module/task_module_handler.h", - "new_tab_page/modules/task_module/task_module_service.cc", -@@ -4407,7 +4397,6 @@ static_library("browser") { - "//chrome/browser/new_tab_page/modules/drive:mojo_bindings", + "new_tab_page/new_tab_page_util.cc", + "new_tab_page/new_tab_page_util.h", + "new_tab_page/one_google_bar/one_google_bar_data.cc", +@@ -4431,7 +4421,6 @@ static_library("browser") { "//chrome/browser/new_tab_page/modules/feed: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/task_module:mojo_bindings", "//chrome/browser/policy:path_parser", "//chrome/browser/profile_resetter:profile_reset_report_proto", -@@ -7675,9 +7664,14 @@ static_library("browser") { + "//chrome/browser/resource_coordinator:intervention_policy_database_proto", +@@ -7758,9 +7747,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", @@ -59,7 +59,7 @@ sources += [ --- a/chrome/browser/accuracy_tips/accuracy_service_factory.cc +++ b/chrome/browser/accuracy_tips/accuracy_service_factory.cc -@@ -48,10 +48,7 @@ KeyedService* AccuracyServiceFactory::Bu +@@ -45,10 +45,7 @@ KeyedService* AccuracyServiceFactory::Bu content::BrowserContext* browser_context) const { DCHECK(base::FeatureList::IsEnabled(safe_browsing::kAccuracyTipsFeature)); Profile* profile = Profile::FromBrowserContext(browser_context); @@ -73,7 +73,7 @@ auto delegate = std::make_unique(profile); --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -4496,11 +4496,13 @@ ChromeContentBrowserClient::CreateThrott +@@ -4529,11 +4529,13 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -87,7 +87,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -@@ -5903,26 +5905,7 @@ ChromeContentBrowserClient::GetSafeBrows +@@ -5933,26 +5935,7 @@ ChromeContentBrowserClient::GetSafeBrows const std::vector& allowlist_domains) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -115,7 +115,7 @@ } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -5943,11 +5926,6 @@ ChromeContentBrowserClient::GetUrlLookup +@@ -5973,11 +5956,6 @@ ChromeContentBrowserClient::GetUrlLookup GetForProfile(profile); } #endif @@ -199,7 +199,7 @@ --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc -@@ -71,6 +71,7 @@ +@@ -72,6 +72,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_client.h" #include "content/public/common/url_constants.h" @@ -228,16 +228,15 @@ using safe_browsing::DownloadProtectionService; using ConnectionType = net::NetworkChangeNotifier::ConnectionType; -@@ -1497,8 +1496,6 @@ void ChromeDownloadManagerDelegate::OnDo - if (item->GetOriginalMimeType() == "application/x-x509-user-cert") - DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); - #endif -- -- DownloadItemModel(item).SetDangerLevel(target_info->danger_level); +@@ -1487,7 +1486,6 @@ void ChromeDownloadManagerDelegate::OnDo + DownloadItemModel model(item); + model.DetermineAndSetShouldPreferOpeningInBrowser( + target_info->target_path, target_info->is_filetype_handled_safely); +- model.SetDangerLevel(target_info->danger_level); } if (ShouldBlockFile(item, target_info->danger_type)) { MaybeReportDangerousDownloadBlocked( -@@ -1577,56 +1574,6 @@ bool ChromeDownloadManagerDelegate::IsOp +@@ -1566,56 +1564,6 @@ bool ChromeDownloadManagerDelegate::IsOp bool ChromeDownloadManagerDelegate::ShouldBlockFile( download::DownloadItem* item, download::DownloadDangerType danger_type) const { @@ -294,7 +293,7 @@ return false; } -@@ -1641,7 +1588,6 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1630,7 +1578,6 @@ void ChromeDownloadManagerDelegate::Mayb service->MaybeSendDangerousDownloadOpenedReport(download, show_download_in_folder); } @@ -302,7 +301,7 @@ if (!download->GetAutoOpened()) { download::DownloadContent download_content = download::DownloadContentFromMimeType(download->GetMimeType(), false); -@@ -1649,6 +1595,7 @@ void ChromeDownloadManagerDelegate::Mayb +@@ -1638,6 +1585,7 @@ void ChromeDownloadManagerDelegate::Mayb download->GetDangerType(), download_content, base::Time::Now(), download->GetEndTime(), show_download_in_folder); } @@ -310,7 +309,7 @@ } void ChromeDownloadManagerDelegate::CheckDownloadAllowed( -@@ -1718,8 +1665,7 @@ void ChromeDownloadManagerDelegate::Chec +@@ -1707,8 +1655,7 @@ void ChromeDownloadManagerDelegate::Chec DCHECK(download_item); DCHECK(download_item->IsSavePackageDownload()); @@ -343,7 +342,7 @@ void RecordOpenedDangerousConfirmDialog( --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -913,12 +913,14 @@ void DownloadTargetDeterminer::CheckVisi +@@ -912,12 +912,14 @@ void DownloadTargetDeterminer::CheckVisi bool visited_referrer_before) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); @@ -358,7 +357,7 @@ danger_level_ = GetDangerLevel( visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER); if (danger_level_ != DownloadFileType::NOT_DANGEROUS && -@@ -1158,6 +1160,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1156,6 +1158,7 @@ DownloadFileType::DangerLevel DownloadTa absl::optional DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { @@ -366,7 +365,7 @@ safe_browsing::SafeBrowsingMetricsCollector* metrics_collector = safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( GetProfile()); -@@ -1166,6 +1169,9 @@ DownloadTargetDeterminer::GetLastDownloa +@@ -1164,6 +1167,9 @@ DownloadTargetDeterminer::GetLastDownloa safe_browsing::SafeBrowsingMetricsCollector:: EventType::DANGEROUS_DOWNLOAD_BYPASS) : absl::nullopt; @@ -399,9 +398,27 @@ } std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel() +--- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc ++++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc +@@ -187,15 +187,6 @@ void FilesRequestHandler::OnGotFileInfo( + void FilesRequestHandler::FinishRequestEarly( + std::unique_ptr request, + safe_browsing::BinaryUploadService::Result result) { +- // We add the request here in case we never actually uploaded anything, so it +- // wasn't added in OnGetRequestData +- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanRequests( +- request->tab_url(), request->per_profile_request(), +- request->content_analysis_request()); +- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanResponses( +- /*token=*/"", safe_browsing::BinaryUploadService::ResultToString(result), +- enterprise_connectors::ContentAnalysisResponse()); +- + request->FinishRequest(result, + enterprise_connectors::ContentAnalysisResponse()); + } --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -409,19 +409,6 @@ absl::optional ConnectorsSe +@@ -432,19 +432,6 @@ absl::optional ConnectorsSe return absl::nullopt; } @@ -423,7 +440,7 @@ } --- a/chrome/browser/enterprise/connectors/connectors_service.h +++ b/chrome/browser/enterprise/connectors/connectors_service.h -@@ -81,12 +81,6 @@ class ConnectorsService : public KeyedSe +@@ -91,12 +91,6 @@ class ConnectorsService : public KeyedSe // is no token to use. absl::optional GetDMTokenForRealTimeUrlCheck() const; @@ -468,7 +485,7 @@ LogSignalsCollectionLatency(kLatencyHistogramWithCacheVariant, start_time); --- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc +++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc -@@ -384,7 +384,7 @@ void RealtimeReportingClient::ReportReal +@@ -383,7 +383,7 @@ void RealtimeReportingClient::ReportReal } std::string RealtimeReportingClient::GetProfileUserName() const { @@ -479,7 +496,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) --- a/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc +++ b/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc -@@ -70,16 +70,6 @@ ReportingServiceSettings::ReportingServi +@@ -72,16 +72,6 @@ ReportingServiceSettings::ReportingServi else DVLOG(1) << "Enabled event name list contains a non string value!"; } @@ -721,7 +738,7 @@ #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/browser/extensions/shared_module_service.h" -@@ -194,7 +193,6 @@ void ExtensionService::BlocklistExtensio +@@ -190,7 +189,6 @@ void ExtensionService::BlocklistExtensio blocklist_prefs::SetSafeBrowsingExtensionBlocklistState( extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE, extension_prefs_); @@ -729,7 +746,7 @@ } bool ExtensionService::OnExternalExtensionUpdateUrlFound( -@@ -360,9 +358,6 @@ ExtensionService::ExtensionService(Profi +@@ -356,9 +354,6 @@ ExtensionService::ExtensionService(Profi safe_browsing_verdict_handler_(extension_prefs, ExtensionRegistry::Get(profile), this), @@ -739,7 +756,7 @@ registry_(ExtensionRegistry::Get(profile)), pending_extension_manager_(profile), install_directory_(install_directory), -@@ -866,100 +861,6 @@ bool ExtensionService::IsExtensionEnable +@@ -862,100 +857,6 @@ bool ExtensionService::IsExtensionEnable return extension_registrar_.IsExtensionEnabled(extension_id); } @@ -956,7 +973,7 @@ #include "chrome/browser/ui/file_system_access_dialogs.h" #include "chrome/common/chrome_paths.h" #include "chrome/grit/generated_resources.h" -@@ -312,83 +310,6 @@ BindResultCallbackToCurrentSequence( +@@ -342,83 +340,6 @@ BindResultCallbackToCurrentSequence( base::SequencedTaskRunnerHandle::Get(), std::move(callback)); } @@ -1040,8 +1057,8 @@ std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey : base::StrCat({kCustomLastPickedDirectoryKey, "-", id}); -@@ -1167,28 +1088,6 @@ void ChromeFileSystemAccessPermissionCon - std::move(callback))); +@@ -1200,28 +1121,6 @@ void ChromeFileSystemAccessPermissionCon + frame_id, std::move(callback))); } -void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( @@ -1069,12 +1086,40 @@ void ChromeFileSystemAccessPermissionContext:: DidConfirmSensitiveDirectoryAccess( const url::Origin& origin, +@@ -1233,27 +1132,6 @@ void ChromeFileSystemAccessPermissionCon + bool should_block) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + if (!should_block) { +- // If attempting to save a file with a dangerous extension, prompt the user +- // to make them confirm they actually want to save the file. +- if (dialog_type == ui::SelectFileDialog::SELECT_SAVEAS_FILE) { +- safe_browsing::DownloadFileType::DangerLevel danger_level = +- safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( +- path, origin.GetURL(), +- Profile::FromBrowserContext(profile_)->GetPrefs()); +- // See https://crbug.com/1320877#c4 for justification for why we show the +- // prompt if `danger_level` is ALLOW_ON_USER_GESTURE as well as DANGEROUS. +- if (danger_level == safe_browsing::DownloadFileType::DANGEROUS || +- danger_level == +- safe_browsing::DownloadFileType::ALLOW_ON_USER_GESTURE) { +- auto result_callback = +- BindResultCallbackToCurrentSequence(std::move(callback)); +- content::GetUIThreadTaskRunner({})->PostTask( +- FROM_HERE, +- base::BindOnce(&ShowFileSystemAccessDangerousFileDialogOnUIThread, +- frame_id, origin, path, std::move(result_callback))); +- return; +- } +- } + std::move(callback).Run(SensitiveEntryResult::kAllowed); + return; + } --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h -@@ -87,10 +87,6 @@ class ChromeFileSystemAccessPermissionCo - HandleType handle_type, +@@ -88,10 +88,6 @@ class ChromeFileSystemAccessPermissionCo + ui::SelectFileDialog::Type dialog_type, content::GlobalRenderFrameHostId frame_id, - base::OnceCallback callback) override; + base::OnceCallback callback) override; - void PerformAfterWriteChecks( - std::unique_ptr item, - content::GlobalRenderFrameHostId frame_id, @@ -1134,19 +1179,6 @@ #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" -@@ -118,11 +117,11 @@ - #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) - #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h" - #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" -+#endif - #include "third_party/blink/public/mojom/clipboard/clipboard.mojom.h" - #include "ui/base/clipboard/clipboard.h" - #include "ui/base/data_transfer_policy/data_transfer_endpoint.h" - #include "ui/events/keycodes/keyboard_codes.h" --#endif - - #if BUILDFLAG(IS_ANDROID) - #include "chrome/browser/android/tab_android.h" @@ -885,6 +884,7 @@ autofill::LanguageCode ChromePasswordMan return autofill::LanguageCode(); } @@ -1377,7 +1409,7 @@ --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -322,47 +322,5 @@ bool PredictionBasedPermissionUiSelector +@@ -321,47 +321,5 @@ bool PredictionBasedPermissionUiSelector PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse( permissions::RequestType request_type) { @@ -1435,7 +1467,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" -@@ -1764,8 +1765,6 @@ std::unique_ptrAddHandler( std::make_unique( chrome_schema)); @@ -1444,7 +1476,7 @@ handlers->AddHandler(std::make_unique()); handlers->AddHandler( std::make_unique(key::kURLBlocklist)); -@@ -1823,13 +1822,6 @@ std::unique_ptr callback) = 0; +@@ -113,12 +113,6 @@ class FileSystemAccessPermissionContext + base::OnceCallback callback) = 0; enum class AfterWriteCheckResult { kAllow, kBlock }; - // Runs a recently finished write operation through checks such as malware @@ -2138,20 +2162,20 @@ UpdateService::UpdateService( --- a/printing/buildflags/buildflags.gni +++ b/printing/buildflags/buildflags.gni -@@ -37,7 +37,7 @@ declare_args() { +@@ -36,7 +36,7 @@ declare_args() { + # Enable snapshotting a page when printing for its content to be analyzed for # sensitive content by enterprise users. - enable_print_content_analysis = -- is_chromeos_ash || is_chromeos_lacros || is_win || is_linux || is_mac -+ false +- enable_print_content_analysis = is_chromeos || is_win || is_linux || is_mac ++ enable_print_content_analysis = false } declare_args() { --- a/weblayer/BUILD.gn +++ b/weblayer/BUILD.gn -@@ -471,7 +471,6 @@ source_set("weblayer_lib_base") { - "//components/prefs", +@@ -473,7 +473,6 @@ source_set("weblayer_lib_base") { "//components/profile_metrics", + "//components/reduce_accept_language/browser", "//components/safe_browsing/content/browser", - "//components/safe_browsing/content/browser:client_side_detection", "//components/safe_browsing/content/browser/web_ui", diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index d515e9fa..5ec33f3a 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -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" -@@ -469,8 +468,6 @@ void AwBrowserContext::RebuildTable( +@@ -474,8 +473,6 @@ void AwBrowserContext::RebuildTable( } void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) { @@ -23,7 +23,7 @@ // TODO(amalova): Make sure NetworkContextParams is configured correctly when --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -1889,69 +1889,9 @@ +@@ -2005,69 +2005,9 @@ Preloads pages that Chrome thinks you might visit. To do this, Chrome may use cookies, if you allow cookies, and may encrypt and send pages through Google to hide your identity from sites. @@ -174,8 +174,8 @@ --- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc +++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc -@@ -39,7 +39,6 @@ - #include "chromeos/dbus/dbus_thread_manager.h" +@@ -38,7 +38,6 @@ + #include "chromeos/ash/components/dbus/concierge/concierge_client.h" #include "components/crx_file/id_util.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" @@ -244,7 +244,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 -@@ -849,6 +849,7 @@ void DownloadItemModel::ExecuteCommand(D +@@ -873,6 +873,7 @@ void DownloadItemModel::ExecuteCommand(D DownloadUIModel::ExecuteCommand(download_commands, command); break; case DownloadCommands::DEEP_SCAN: @@ -252,7 +252,7 @@ safe_browsing::SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); if (!sb_service) -@@ -874,6 +875,7 @@ void DownloadItemModel::ExecuteCommand(D +@@ -905,6 +906,7 @@ void DownloadItemModel::ExecuteCommand(D safe_browsing::DeepScanningRequest::DeepScanTrigger:: TRIGGER_APP_PROMPT, safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings)); @@ -272,7 +272,7 @@ #include "crypto/secure_hash.h" --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -39,7 +39,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" @@ -280,7 +280,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" -@@ -339,8 +338,7 @@ std::string ConnectorsService::GetManage +@@ -362,8 +361,7 @@ std::string ConnectorsService::GetManage absl::optional scope = absl::nullopt; for (const char* scope_pref : @@ -290,7 +290,7 @@ ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED), ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY), ConnectorScopePref(AnalysisConnector::PRINT), -@@ -392,20 +390,6 @@ std::string ConnectorsService::GetManage +@@ -415,20 +413,6 @@ std::string ConnectorsService::GetManage absl::optional ConnectorsService::GetDMTokenForRealTimeUrlCheck() const { @@ -442,15 +442,15 @@ #include "components/signin/public/identity_manager/identity_manager.h" --- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc +++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc -@@ -29,7 +29,6 @@ +@@ -24,7 +24,6 @@ #include "chrome/common/channel_info.h" #include "chrome/common/extensions/api/identity.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" -@@ -63,7 +62,7 @@ const char* const kExtensionsIdentityAPI + #include "components/signin/public/identity_manager/scope_set.h" +@@ -52,7 +51,7 @@ const char* const kExtensionsIdentityAPI "extensions_identity_api"; bool IsBrowserSigninAllowed(Profile* profile) { @@ -689,15 +689,15 @@ int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) { --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -48,7 +48,6 @@ +@@ -52,7 +52,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" - #include "content/public/browser/network_service_instance.h" -@@ -829,15 +828,8 @@ void ProfileNetworkContextService::Confi + #include "content/public/browser/first_party_sets_handler.h" +@@ -865,15 +864,8 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; network_context_params->enable_expect_ct_reporting = true; @@ -834,7 +834,7 @@ constexpr char kExcludedKey[] = "exempted"; --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -26,7 +26,6 @@ +@@ -25,7 +25,6 @@ #include "components/permissions/prediction_service/prediction_service.h" #include "components/permissions/prediction_service/prediction_service_messages.pb.h" #include "components/prefs/pref_service.h" @@ -902,7 +902,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/driver/sync_policy_handler.h" -@@ -212,9 +209,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -217,9 +214,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kDefaultPopupsSetting, prefs::kManagedDefaultPopupsSetting, base::Value::Type::INTEGER }, @@ -912,7 +912,7 @@ { key::kEditBookmarksEnabled, bookmarks::prefs::kEditBookmarksEnabled, base::Value::Type::BOOLEAN }, -@@ -234,9 +228,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -239,9 +233,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kPrintingEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(ENABLE_PRINTING) @@ -922,7 +922,7 @@ { key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled, base::Value::Type::BOOLEAN }, -@@ -295,9 +286,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -300,9 +291,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdsSettingForIntrusiveAdsSites, prefs::kManagedDefaultAdsSetting, base::Value::Type::INTEGER }, @@ -932,7 +932,7 @@ { key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, base::Value::Type::BOOLEAN }, -@@ -503,15 +491,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -502,15 +490,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kPasswordDismissCompromisedAlertEnabled, password_manager::prefs::kPasswordDismissCompromisedAlertEnabled, base::Value::Type::BOOLEAN }, @@ -948,7 +948,7 @@ { key::kPolicyRefreshRate, policy_prefs::kUserPolicyRefreshRate, base::Value::Type::INTEGER }, -@@ -550,9 +529,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -549,9 +528,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRestoreOnStartupURLs, prefs::kURLsToRestoreOnStartup, base::Value::Type::LIST }, @@ -958,7 +958,7 @@ { key::kSafeSitesFilterBehavior, policy_prefs::kSafeSitesFilterBehavior, base::Value::Type::INTEGER }, -@@ -672,9 +648,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -674,9 +650,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdditionalDnsQueryTypesEnabled, prefs::kAdditionalDnsQueryTypesEnabled, base::Value::Type::BOOLEAN }, @@ -968,7 +968,7 @@ { key::kForceGoogleSafeSearch, prefs::kForceGoogleSafeSearch, base::Value::Type::BOOLEAN }, -@@ -1454,9 +1427,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1473,9 +1446,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kIdleProfileCloseTimeout, prefs::kIdleProfileCloseTimeout, base::Value::Type::INTEGER }, @@ -978,7 +978,7 @@ { key::kHardwareAccelerationModeEnabled, prefs::kHardwareAccelerationModeEnabled, base::Value::Type::BOOLEAN }, -@@ -1815,12 +1785,6 @@ std::unique_ptrAddHandler( std::make_unique(chrome_schema)); -@@ -1995,24 +1959,6 @@ std::unique_ptr> signin_legacy_policies; @@ -1018,7 +1018,7 @@ std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -134,7 +134,6 @@ +@@ -133,7 +133,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" @@ -1026,7 +1026,7 @@ #include "components/search_engines/template_url_prepopulate_data.h" #include "components/security_interstitials/content/insecure_form_blocking_page.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" -@@ -1068,7 +1067,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1036,7 +1035,6 @@ void RegisterLocalState(PrefRegistrySimp PushMessagingServiceImpl::RegisterPrefs(registry); #endif RegisterScreenshotPrefs(registry); @@ -1034,7 +1034,7 @@ secure_origin_allowlist::RegisterPrefs(registry); segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs( registry); -@@ -1327,8 +1325,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1293,8 +1291,6 @@ void RegisterProfilePrefs(user_prefs::Pr PushMessagingAppIdentifier::RegisterProfilePrefs(registry); QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); @@ -1200,7 +1200,7 @@ ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted); --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -144,7 +144,6 @@ +@@ -145,7 +145,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/profile_metrics/browser_profile_type.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" @@ -1218,7 +1218,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/sync/base/stop_source.h" -@@ -2276,8 +2275,7 @@ void ProfileManager::AddProfileToStorage +@@ -2275,8 +2274,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1228,7 +1228,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -2332,14 +2330,13 @@ void ProfileManager::AddProfileToStorage +@@ -2331,14 +2329,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsEphemeral(profile); init_params.is_signed_in_with_credential_provider = @@ -1582,14 +1582,14 @@ #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "components/safe_browsing/core/common/utils.h" #include "components/security_interstitials/content/unsafe_resource_util.h" -@@ -1212,14 +1211,6 @@ bool ChromePasswordProtectionService::Ha +@@ -1210,14 +1209,6 @@ bool ChromePasswordProtectionService::Ha } void ChromePasswordProtectionService::OnWarningTriggerChanged() { -- const base::Value* pref_value = pref_change_registrar_->prefs()->Get( +- const base::Value& pref_value = pref_change_registrar_->prefs()->GetValue( - prefs::kPasswordProtectionWarningTrigger); - // If password protection is not turned off, do nothing. -- if (static_cast(pref_value->GetInt()) != +- if (static_cast(pref_value.GetInt()) != - PASSWORD_PROTECTION_OFF) { - return; - } @@ -1597,7 +1597,7 @@ // Clears captured enterprise password hashes or GSuite sync password hashes. password_manager::PasswordReuseManager* reuse_manager = GetPasswordReuseManager(); -@@ -1378,7 +1369,7 @@ PrefService* ChromePasswordProtectionSer +@@ -1376,7 +1367,7 @@ PrefService* ChromePasswordProtectionSer } bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() { @@ -1606,7 +1606,7 @@ } bool ChromePasswordProtectionService::IsExtendedReporting() { -@@ -1398,44 +1389,7 @@ bool ChromePasswordProtectionService::Is +@@ -1396,44 +1387,7 @@ bool ChromePasswordProtectionService::Is bool ChromePasswordProtectionService::IsPingingEnabled( LoginReputationClientRequest::TriggerType trigger_type, ReusedPasswordAccountType password_type) { @@ -1652,7 +1652,7 @@ } RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason( -@@ -1664,22 +1618,6 @@ MaybeCreateCommitDeferringCondition( +@@ -1662,22 +1616,6 @@ MaybeCreateCommitDeferringCondition( : nullptr; } @@ -2456,7 +2456,7 @@ #include "components/variations/variations_associated_data.h" --- a/chrome/browser/ssl/sct_reporting_service.cc +++ b/chrome/browser/ssl/sct_reporting_service.cc -@@ -13,7 +13,6 @@ +@@ -14,7 +14,6 @@ #include "chrome/common/chrome_features.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" @@ -2464,7 +2464,7 @@ #include "content/public/browser/network_service_instance.h" #include "content/public/browser/storage_partition.h" #include "google_apis/google_api_keys.h" -@@ -200,18 +199,6 @@ void SetSCTAuditingEnabledForStoragePart +@@ -211,18 +210,6 @@ void SetSCTAuditingEnabledForStoragePart } // namespace network::mojom::SCTAuditingMode SCTReportingService::GetReportingMode() { @@ -2524,7 +2524,7 @@ supervised_users::kUserName, prefs::kProfileName, }, -@@ -127,7 +122,6 @@ void SupervisedUserPrefStore::OnNewSetti +@@ -126,7 +121,6 @@ void SupervisedUserPrefStore::OnNewSetti prefs_->SetInteger(prefs::kForceYouTubeRestrict, safe_search_util::YOUTUBE_RESTRICT_MODERATE); prefs_->SetBoolean(prefs::kHideWebStoreIcon, false); @@ -2683,7 +2683,7 @@ if (!SyncServiceFactory::IsSyncAllowed(profile)) { --- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc -@@ -61,7 +61,6 @@ +@@ -63,7 +63,6 @@ #include "components/google/core/common/google_util.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" @@ -2756,15 +2756,15 @@ #include "content/public/browser/render_process_host.h" --- a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc +++ b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc -@@ -22,7 +22,6 @@ +@@ -23,7 +23,6 @@ #include "chrome/common/webui_url_constants.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/user_education/common/tutorial_identifier.h" #include "components/user_education/common/tutorial_service.h" #include "ui/base/interaction/element_identifier.h" - #include "ui/base/page_transition_types.h" -@@ -68,13 +67,6 @@ void BrowserCommandHandler::CanExecuteCo +@@ -70,13 +69,6 @@ void BrowserCommandHandler::CanExecuteCo case Command::kOpenSafetyCheck: can_execute = !chrome::enterprise_util::IsBrowserManaged(profile_); break; @@ -2809,9 +2809,9 @@ --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -30,7 +30,6 @@ - #include "chrome/browser/profiles/profile.h" +@@ -33,7 +33,6 @@ #include "chrome/browser/ui/managed_ui.h" + #include "chrome/browser/ui/ui_features.h" #include "chrome/common/pref_names.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/strings/grit/components_strings.h" @@ -2869,7 +2869,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -302,10 +301,6 @@ void PeopleHandler::RegisterMessages() { +@@ -301,10 +300,6 @@ void PeopleHandler::RegisterMessages() { void PeopleHandler::OnJavascriptAllowed() { PrefService* prefs = profile_->GetPrefs(); profile_pref_registrar_.Init(prefs); @@ -2888,8 +2888,8 @@ #include "components/prefs/pref_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/strings/grit/components_strings.h" - #include "components/version_info/version_info.h" #include "content/public/browser/browser_context.h" + #include "content/public/browser/storage_partition.h" --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -66,7 +66,6 @@ @@ -2900,7 +2900,7 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/strings/grit/components_chromium_strings.h" #include "components/strings/grit/components_strings.h" -@@ -1465,44 +1464,6 @@ void AddPrivacyStrings(content::WebUIDat +@@ -1480,44 +1479,6 @@ void AddPrivacyStrings(content::WebUIDat {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, @@ -2945,7 +2945,7 @@ {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL}, {"syncAndGoogleServicesPrivacyDescription", IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT}, -@@ -2870,11 +2831,6 @@ void AddSiteSettingsStrings(content::Web +@@ -2886,11 +2847,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -2959,7 +2959,7 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -71,7 +71,6 @@ +@@ -73,7 +73,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2967,7 +2967,7 @@ #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -@@ -257,9 +256,7 @@ SettingsUI::SettingsUI(content::WebUI* w +@@ -263,9 +262,7 @@ SettingsUI::SettingsUI(content::WebUI* w std::make_unique()); #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -3030,15 +3030,15 @@ "profileBlockedAddPersonSuggestion", --- a/chrome/browser/ui/webui/signin/signin_utils_desktop.cc +++ b/chrome/browser/ui/webui/signin/signin_utils_desktop.cc -@@ -18,7 +18,6 @@ - #include "chrome/grit/chromium_strings.h" - #include "chrome/grit/generated_resources.h" - #include "components/guest_view/browser/guest_view_manager.h" +@@ -15,7 +15,6 @@ + #include "chrome/browser/signin/signin_util.h" + #include "chrome/browser/ui/webui/signin/signin_ui_error.h" + #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/identity_utils.h" #include "google_apis/gaia/gaia_auth_util.h" -@@ -30,7 +29,7 @@ SigninUIError CanOfferSignin(Profile* pr +@@ -26,7 +25,7 @@ SigninUIError CanOfferSignin(Profile* pr if (!profile) return SigninUIError::Other(email); @@ -3047,16 +3047,25 @@ return SigninUIError::Other(email); if (!ChromeSigninClient::ProfileAllowsSigninCookies(profile)) -@@ -103,8 +102,7 @@ SigninUIError CanOfferSignin(Profile* pr +@@ -99,8 +98,7 @@ SigninUIError CanOfferSignin(Profile* pr // With force sign in enabled, cross account sign in is not allowed. if (signin_util::IsForceSigninEnabled() && - IsCrossAccountError(profile, email, gaia_id)) { + IsCrossAccountError(profile, gaia_id)) { - std::string last_email = - profile->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername); + std::string last_email; return SigninUIError::ProfileWasUsedByAnotherAccount(email, last_email); } } +@@ -110,7 +108,5 @@ SigninUIError CanOfferSignin(Profile* pr + + bool IsCrossAccountError(Profile* profile, const std::string& gaia_id) { + DCHECK(!gaia_id.empty()); +- std::string last_gaia_id = +- profile->GetPrefs()->GetString(prefs::kGoogleServicesLastAccountId); +- return !last_gaia_id.empty() && gaia_id != last_gaia_id; ++ return false; + } --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc @@ -45,7 +45,6 @@ @@ -3067,7 +3076,7 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -223,8 +222,7 @@ TurnSyncOnHelper::TurnSyncOnHelper( +@@ -235,8 +234,7 @@ TurnSyncOnHelper::TurnSyncOnHelper( // last authenticated account of the current profile, then Chrome will show a // confirmation dialog before starting sync. // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754). @@ -3153,7 +3162,7 @@ #include "services/network/public/cpp/shared_url_loader_factory.h" namespace password_manager { -@@ -176,28 +175,7 @@ void LeakDetectionDelegate::OnError(Leak +@@ -175,28 +174,7 @@ void LeakDetectionDelegate::OnError(Leak bool CanStartLeakCheck(const PrefService& prefs, const PasswordManagerClient* client) { @@ -3386,9 +3395,9 @@ if (!local_state_prefs_) return; - -- const base::Value* event_dict = local_state_prefs_->GetDictionary( +- const base::Value::Dict& event_dict = local_state_prefs_->GetValueDict( - prefs::kSafeBrowsingTriggerEventTimestamps); -- for (auto trigger_pair : event_dict->DictItems()) { +- for (auto trigger_pair : event_dict) { - // Check that the first item in the pair is convertible to a trigger type - // and that the second item is a list. - int trigger_type_int; @@ -3401,7 +3410,7 @@ - continue; - - const TriggerType trigger_type = static_cast(trigger_type_int); -- for (const auto& timestamp : trigger_pair.second.GetListDeprecated()) { +- for (const auto& timestamp : trigger_pair.second.GetList()) { - if (timestamp.is_double()) - trigger_events_[trigger_type].push_back( - base::Time::FromDoubleT(timestamp.GetDouble())); @@ -3460,7 +3469,7 @@ #include "content/public/browser/global_routing_id.h" #include "services/network/public/mojom/cookie_manager.mojom.h" #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -1370,17 +1369,7 @@ std::string SerializeHitReport(const Hit +@@ -1374,17 +1373,7 @@ std::string SerializeHitReport(const Hit } hit_report_dict.Set("threat_source", threat_source); std::string extended_reporting_level; @@ -3478,7 +3487,7 @@ hit_report_dict.Set("extended_reporting_level", extended_reporting_level); hit_report_dict.Set("is_enhanced_protection", hit_report.is_enhanced_protection); -@@ -2258,18 +2247,13 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -2263,18 +2252,13 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); DCHECK(!args.empty()); std::string callback_id = args[0].GetString(); @@ -4014,17 +4023,17 @@ void SafeBrowsingMetricsCollector::RemoveOldEventsFromPref() { - DictionaryPrefUpdate update(pref_service_, - prefs::kSafeBrowsingEventTimestamps); -- base::Value* mutable_state_dict = update.Get(); -- bool is_pref_valid = mutable_state_dict->is_dict(); +- base::Value::Dict* mutable_state_dict = update->GetIfDict(); +- bool is_pref_valid = !!mutable_state_dict; - base::UmaHistogramBoolean("SafeBrowsing.MetricsCollector.IsPrefValid", - is_pref_valid); - if (!is_pref_valid) { - return; - } - -- for (auto state_map : mutable_state_dict->DictItems()) { -- for (auto event_map : state_map.second.DictItems()) { -- event_map.second.EraseListValueIf([&](const auto& timestamp) { +- for (auto state_map : *mutable_state_dict) { +- for (auto event_map : state_map.second.GetDict()) { +- event_map.second.GetList().EraseIf([&](const auto& timestamp) { - return base::Time::Now() - PrefValueToTime(timestamp) > - base::Days(kEventMaxDurationDay); - }); @@ -4060,32 +4069,21 @@ } absl::optional -@@ -240,55 +141,14 @@ SafeBrowsingMetricsCollector::GetLatestS +@@ -240,45 +141,15 @@ SafeBrowsingMetricsCollector::GetLatestS void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref( UserState user_state, EventType event_type) { - DictionaryPrefUpdate update(pref_service_, - prefs::kSafeBrowsingEventTimestamps); -- base::Value* mutable_state_dict = update.Get(); -- -- base::Value* event_dict = -- mutable_state_dict->FindDictKey(UserStateToPrefKey(user_state)); -- if (!event_dict) { -- event_dict = -- mutable_state_dict->SetKey(UserStateToPrefKey(user_state), -- base::Value(base::Value::Type::DICTIONARY)); -- } -- -- base::Value* timestamps = -- event_dict->FindListKey(EventTypeToPrefKey(event_type)); -- if (!timestamps) { -- timestamps = event_dict->SetKey(EventTypeToPrefKey(event_type), -- base::Value(base::Value::Type::LIST)); -- } +- base::Value::Dict& mutable_state_dict = update->GetDict(); +- base::Value::Dict* event_dict = +- mutable_state_dict.EnsureDict(UserStateToPrefKey(user_state)); +- base::Value::List* timestamps = +- event_dict->EnsureList(EventTypeToPrefKey(event_type)); - - // Remove the oldest timestamp if the length of the timestamps hits the limit. -- while (timestamps->GetListDeprecated().size() >= kTimestampsMaxLength) { -- timestamps->EraseListIter(timestamps->GetListDeprecated().begin()); +- while (timestamps->size() >= kTimestampsMaxLength) { +- timestamps->erase(timestamps->begin()); - } - - timestamps->Append(TimeToPrefValue(base::Time::Now())); @@ -4107,17 +4105,18 @@ - } } - const base::Value* SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary( + const base::Value::Dict* + SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary( UserState user_state) { -- const base::Value* state_dict = -- pref_service_->GetDictionary(prefs::kSafeBrowsingEventTimestamps); +- const base::Value::Dict& state_dict = +- pref_service_->GetValueDict(prefs::kSafeBrowsingEventTimestamps); - -- return state_dict->FindDictKey(UserStateToPrefKey(user_state)); +- return state_dict.FindDict(UserStateToPrefKey(user_state)); + return nullptr; } absl::optional -@@ -449,20 +309,7 @@ int SafeBrowsingMetricsCollector::GetEve +@@ -440,20 +311,7 @@ int SafeBrowsingMetricsCollector::GetEve } UserState SafeBrowsingMetricsCollector::GetUserState() { @@ -4139,6 +4138,32 @@ } bool SafeBrowsingMetricsCollector::IsBypassEventType(const EventType& type) { +--- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc ++++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc +@@ -20,7 +20,6 @@ + #include "components/prefs/pref_service.h" + #include "components/safe_browsing/core/browser/tailored_security_service/tailored_security_service_observer.h" + #include "components/safe_browsing/core/common/features.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/signin/public/identity_manager/access_token_info.h" + #include "components/signin/public/identity_manager/identity_manager.h" + #include "components/signin/public/identity_manager/primary_account_access_token_fetcher.h" +@@ -235,15 +234,6 @@ TailoredSecurityService::TailoredSecurit + signin::IdentityManager* identity_manager, + PrefService* prefs) + : identity_manager_(identity_manager), prefs_(prefs) { +- // `prefs` can be nullptr in unit tests. +- if (prefs_) { +- pref_registrar_.Init(prefs_); +- pref_registrar_.Add( +- prefs::kAccountTailoredSecurityUpdateTimestamp, +- base::BindRepeating( +- &TailoredSecurityService::TailoredSecurityTimestampUpdateCallback, +- weak_ptr_factory_.GetWeakPtr())); +- } + } + + TailoredSecurityService::~TailoredSecurityService() { --- a/components/safe_browsing/core/common/BUILD.gn +++ b/components/safe_browsing/core/common/BUILD.gn @@ -6,20 +6,8 @@ import("//build/config/features.gni") @@ -4500,7 +4525,7 @@ // Link to the help center. --- a/components/send_tab_to_self/entry_point_display_reason.cc +++ b/components/send_tab_to_self/entry_point_display_reason.cc -@@ -8,7 +8,6 @@ +@@ -9,7 +9,6 @@ #include "components/send_tab_to_self/features.h" #include "components/send_tab_to_self/send_tab_to_self_model.h" #include "components/send_tab_to_self/send_tab_to_self_sync_service.h" @@ -4508,14 +4533,17 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/sync/driver/sync_service.h" #include "url/gurl.h" -@@ -19,9 +18,7 @@ namespace { +@@ -20,13 +19,7 @@ namespace { bool ShouldOfferSignin(syncer::SyncService* sync_service, PrefService* pref_service) { +-#if BUILDFLAG(IS_CHROMEOS_LACROS) + return false; +-#else - return pref_service->GetBoolean(prefs::kSigninAllowed) && sync_service && - sync_service->GetAccountInfo().IsEmpty() && - !sync_service->IsLocalSyncEnabled(); -+ return false; +-#endif // BUILDFLAG(IS_CHROMEOS_LACROS) } } // namespace @@ -4625,54 +4653,6 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" ---- a/components/signin/core/browser/signin_investigator.cc -+++ b/components/signin/core/browser/signin_investigator.cc -@@ -7,7 +7,6 @@ - #include "base/check.h" - #include "base/metrics/histogram_macros.h" - #include "components/signin/public/base/signin_metrics.h" --#include "components/signin/public/base/signin_pref_names.h" - #include "google_apis/gaia/gaia_auth_util.h" - - using signin_metrics::AccountEquality; -@@ -26,13 +25,9 @@ SigninInvestigator::SigninInvestigator(c - SigninInvestigator::~SigninInvestigator() {} - - bool SigninInvestigator::AreAccountsEqualWithFallback() { -- const std::string last_id = -- provider_->GetPrefs()->GetString(prefs::kGoogleServicesLastAccountId); -- bool same_email = gaia::AreEmailsSame( -- current_email_, -- provider_->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername)); -- if (!current_id_.empty() && !last_id.empty()) { -- bool same_id = current_id_ == last_id; -+ bool same_email = false; -+ if (false) { -+ bool same_id = false; - if (same_email && same_id) { - LogAccountEquality(AccountEquality::BOTH_EQUAL); - } else if (same_email) { -@@ -51,9 +46,7 @@ bool SigninInvestigator::AreAccountsEqua - - InvestigatedScenario SigninInvestigator::Investigate() { - InvestigatedScenario scenario; -- if (provider_->GetPrefs() -- ->GetString(prefs::kGoogleServicesLastUsername) -- .empty()) { -+ if (true) { - scenario = InvestigatedScenario::kFirstSignIn; - } else if (AreAccountsEqualWithFallback()) { - scenario = InvestigatedScenario::kSameAccount; ---- a/components/signin/core/browser/signin_investigator_unittest.cc -+++ b/components/signin/core/browser/signin_investigator_unittest.cc -@@ -9,7 +9,6 @@ - #include "components/prefs/pref_registry_simple.h" - #include "components/signin/core/browser/signin_investigator.h" - #include "components/signin/public/base/signin_metrics.h" --#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/identity_manager/identity_test_environment.h" - #include "components/sync_preferences/testing_pref_service_syncable.h" - #include "testing/gtest/include/gtest/gtest.h" --- a/components/signin/internal/identity_manager/account_tracker_service.cc +++ b/components/signin/internal/identity_manager/account_tracker_service.cc @@ -32,7 +32,6 @@ @@ -4718,15 +4698,15 @@ - if (!success || !pref_service_) - return; - -- base::DictionaryValue* dict = nullptr; +- base::Value::Dict* dict = nullptr; - ListPrefUpdate update(pref_service_, prefs::kAccountInfo); -- for (size_t i = 0; i < update->GetListDeprecated().size(); -- ++i, dict = nullptr) { -- base::Value& dict_value = update->GetListDeprecated()[i]; -- if (dict_value.is_dict()) { -- dict = static_cast(&dict_value); -- const std::string* account_key = dict->FindStringKey(kAccountKeyPath); +- base::Value::List& list = update->GetList(); +- for (base::Value& value : list) { +- base::Value::Dict* maybe_dict = value.GetIfDict(); +- if (maybe_dict) { +- const std::string* account_key = maybe_dict->FindString(kAccountKeyKey); - if (account_key && *account_key == account_id.ToString()) { +- dict = maybe_dict; - break; - } - } @@ -4735,11 +4715,11 @@ - if (!dict) { - return; - } -- dict->SetString(kLastDownloadedImageURLWithSizePath, image_url_with_size); +- dict->Set(kLastDownloadedImageURLWithSizeKey, image_url_with_size); } void AccountTrackerService::RemoveAccountImageFromDisk( -@@ -584,186 +555,16 @@ void AccountTrackerService::RemoveAccoun +@@ -584,178 +555,16 @@ void AccountTrackerService::RemoveAccoun } void AccountTrackerService::LoadFromPrefs() { @@ -4747,12 +4727,9 @@ - pref_service_->GetValueList(prefs::kAccountInfo); - std::set to_remove; - for (size_t i = 0; i < list.size(); ++i) { -- const base::Value& dict_value = list[i]; -- if (dict_value.is_dict()) { -- const base::DictionaryValue& dict = -- base::Value::AsDictionaryValue(dict_value); -- if (const std::string* account_key = -- dict.FindStringKey(kAccountKeyPath)) { +- const base::Value::Dict* dict = list[i].GetIfDict(); +- if (dict) { +- if (const std::string* account_key = dict->FindString(kAccountKeyKey)) { - // Ignore incorrectly persisted non-canonical account ids. - if (account_key->find('@') != std::string::npos && - *account_key != gaia::CanonicalizeEmail(*account_key)) { @@ -4764,58 +4741,55 @@ - StartTrackingAccount(account_id); - AccountInfo& account_info = accounts_[account_id]; - -- GetString(dict, kAccountGaiaPath, account_info.gaia); -- GetString(dict, kAccountEmailPath, account_info.email); -- GetString(dict, kAccountHostedDomainPath, account_info.hosted_domain); -- GetString(dict, kAccountFullNamePath, account_info.full_name); -- GetString(dict, kAccountGivenNamePath, account_info.given_name); -- GetString(dict, kAccountLocalePath, account_info.locale); -- GetString(dict, kAccountPictureURLPath, account_info.picture_url); -- GetString(dict, kLastDownloadedImageURLWithSizePath, +- GetString(*dict, kAccountGaiaKey, account_info.gaia); +- GetString(*dict, kAccountEmailKey, account_info.email); +- GetString(*dict, kAccountHostedDomainKey, account_info.hosted_domain); +- GetString(*dict, kAccountFullNameKey, account_info.full_name); +- GetString(*dict, kAccountGivenNameKey, account_info.given_name); +- GetString(*dict, kAccountLocaleKey, account_info.locale); +- GetString(*dict, kAccountPictureURLKey, account_info.picture_url); +- GetString(*dict, kLastDownloadedImageURLWithSizeKey, - account_info.last_downloaded_image_url_with_size); - - if (absl::optional is_child_status = -- dict.FindBoolKey(kDeprecatedChildStatusPath)) { +- dict->FindBool(kDeprecatedChildStatusKey)) { - account_info.is_child_account = is_child_status.value() - ? signin::Tribool::kTrue - : signin::Tribool::kFalse; -- // Migrate to kAccountChildAttributePath. +- // Migrate to kAccountChildAttributeKey. - ListPrefUpdate update(pref_service_, prefs::kAccountInfo); -- base::Value* update_dict = &update->GetListDeprecated()[i]; -- DCHECK(update_dict->is_dict()); -- update_dict->SetIntPath( -- kAccountChildAttributePath, -- static_cast(account_info.is_child_account)); -- update_dict->RemoveKey(kDeprecatedChildStatusPath); +- base::Value::Dict& update_dict = update->GetList()[i].GetDict(); +- update_dict.Set(kAccountChildAttributeKey, +- static_cast(account_info.is_child_account)); +- update_dict.Remove(kDeprecatedChildStatusKey); - } else { - account_info.is_child_account = -- ParseTribool(dict.FindIntPath(kAccountChildAttributePath)); +- ParseTribool(dict->FindInt(kAccountChildAttributeKey)); - } - - absl::optional is_under_advanced_protection = -- dict.FindBoolKey(kAdvancedProtectionAccountStatusPath); +- dict->FindBool(kAdvancedProtectionAccountStatusKey); - if (is_under_advanced_protection.has_value()) { - account_info.is_under_advanced_protection = - is_under_advanced_protection.value(); - } - - if (absl::optional can_offer_extended_chrome_sync_promos = -- dict.FindIntPath( +- dict->FindIntByDottedPath( - kDeprecatedCanOfferExtendedChromeSyncPromosPrefPath)) { - // Migrate to Capability names based pref paths. - ListPrefUpdate update(pref_service_, prefs::kAccountInfo); -- base::Value* update_dict = &update->GetListDeprecated()[i]; -- DCHECK(update_dict->is_dict()); +- base::Value::Dict& update_dict = update->GetList()[i].GetDict(); - SetAccountCapabilityState( - update_dict, kCanOfferExtendedChromeSyncPromosCapabilityName, - ParseTribool(can_offer_extended_chrome_sync_promos)); -- update_dict->RemovePath( +- update_dict.RemoveByDottedPath( - kDeprecatedCanOfferExtendedChromeSyncPromosPrefPath); - } - - for (const std::string& name : - AccountCapabilities::GetSupportedAccountCapabilityNames()) { -- switch (FindAccountCapabilityState(dict, name)) { +- switch (FindAccountCapabilityState(*dict, name)) { - case signin::Tribool::kUnknown: - account_info.capabilities.capabilities_map_.erase(name); - break; @@ -4867,47 +4841,45 @@ - if (!pref_service_) - return; - -- base::DictionaryValue* dict = nullptr; +- base::Value::Dict* dict = nullptr; - ListPrefUpdate update(pref_service_, prefs::kAccountInfo); -- for (size_t i = 0; i < update->GetListDeprecated().size(); -- ++i, dict = nullptr) { -- base::Value& dict_value = update->GetListDeprecated()[i]; -- if (dict_value.is_dict()) { -- dict = static_cast(&dict_value); -- const std::string* account_key = dict->FindStringKey(kAccountKeyPath); +- base::Value::List& list = update->GetList(); +- for (base::Value& value : list) { +- base::Value::Dict* maybe_dict = value.GetIfDict(); +- if (maybe_dict) { +- const std::string* account_key = maybe_dict->FindString(kAccountKeyKey); - if (account_key && *account_key == account_info.account_id.ToString()) { +- dict = maybe_dict; - break; - } - } - } - - if (!dict) { -- update->Append(base::Value(base::Value::Type::DICTIONARY)); -- base::Value& dict_value = update->GetListDeprecated().back(); -- DCHECK(dict_value.is_dict()); -- dict = static_cast(&dict_value); -- dict->SetString(kAccountKeyPath, account_info.account_id.ToString()); +- list.Append(base::Value::Dict()); +- dict = &list.back().GetDict(); +- dict->Set(kAccountKeyKey, account_info.account_id.ToString()); - } - -- dict->SetString(kAccountEmailPath, account_info.email); -- dict->SetString(kAccountGaiaPath, account_info.gaia); -- dict->SetString(kAccountHostedDomainPath, account_info.hosted_domain); -- dict->SetString(kAccountFullNamePath, account_info.full_name); -- dict->SetString(kAccountGivenNamePath, account_info.given_name); -- dict->SetString(kAccountLocalePath, account_info.locale); -- dict->SetString(kAccountPictureURLPath, account_info.picture_url); -- dict->SetIntPath(kAccountChildAttributePath, -- static_cast(account_info.is_child_account)); -- dict->SetBoolean(kAdvancedProtectionAccountStatusPath, -- account_info.is_under_advanced_protection); -- // |kLastDownloadedImageURLWithSizePath| should only be set after the GAIA +- dict->Set(kAccountEmailKey, account_info.email); +- dict->Set(kAccountGaiaKey, account_info.gaia); +- dict->Set(kAccountHostedDomainKey, account_info.hosted_domain); +- dict->Set(kAccountFullNameKey, account_info.full_name); +- dict->Set(kAccountGivenNameKey, account_info.given_name); +- dict->Set(kAccountLocaleKey, account_info.locale); +- dict->Set(kAccountPictureURLKey, account_info.picture_url); +- dict->Set(kAccountChildAttributeKey, +- static_cast(account_info.is_child_account)); +- dict->Set(kAdvancedProtectionAccountStatusKey, +- account_info.is_under_advanced_protection); +- // |kLastDownloadedImageURLWithSizeKey| should only be set after the GAIA - // picture is successufly saved to disk. Otherwise, there is no guarantee that -- // |kLastDownloadedImageURLWithSizePath| matches the picture on disk. +- // |kLastDownloadedImageURLWithSizeKey| matches the picture on disk. - for (const std::string& name : - AccountCapabilities::GetSupportedAccountCapabilityNames()) { - signin::Tribool capability_state = - account_info.capabilities.GetCapabilityByName(name); -- SetAccountCapabilityState(dict, name, capability_state); +- SetAccountCapabilityState(*dict, name, capability_state); - } } @@ -4917,10 +4889,10 @@ - ListPrefUpdate update(pref_service_, prefs::kAccountInfo); const std::string account_id = account_info.account_id.ToString(); -- update->EraseListValueIf([&account_id](const base::Value& value) { +- update->GetList().EraseIf([&account_id](const base::Value& value) { - if (!value.is_dict()) - return false; -- const std::string* account_key = value.FindStringKey(kAccountKeyPath); +- const std::string* account_key = value.GetDict().FindString(kAccountKeyKey); - return account_key && *account_key == account_id; - }); } @@ -5341,7 +5313,7 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -95254,7 +95254,6 @@ Full version information for the fingerp +@@ -96156,7 +96156,6 @@ Full version information for the fingerp @@ -5349,7 +5321,7 @@ -@@ -95269,10 +95268,7 @@ Full version information for the fingerp +@@ -96171,10 +96170,7 @@ Full version information for the fingerp diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index 38415f55..60521cee 100644 --- a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch +++ b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch @@ -9,7 +9,7 @@ #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" -@@ -1795,6 +1796,8 @@ void RenderViewContextMenu::AppendPageIt +@@ -1804,6 +1805,8 @@ void RenderViewContextMenu::AppendPageIt if (has_sharing_menu_items) menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); @@ -18,7 +18,7 @@ ChromeTranslateClient* chrome_translate_client = ChromeTranslateClient::FromWebContents(embedder_web_contents_); const bool canTranslate = -@@ -1807,6 +1810,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -1816,6 +1819,7 @@ void RenderViewContextMenu::AppendPageIt l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, GetTargetLanguageDisplayName())); } 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 f48883aa..46381de6 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 -@@ -2408,6 +2408,7 @@ static_library("browser") { +@@ -2415,6 +2415,7 @@ static_library("browser") { "//third_party/libyuv", "//third_party/metrics_proto", "//third_party/re2", @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -236,6 +236,7 @@ source_set("browser") { +@@ -246,6 +246,7 @@ source_set("browser") { "//third_party/libyuv", "//third_party/re2", "//third_party/sqlite", @@ -62,7 +62,7 @@ #include "components/viz/common/switches.h" #include "components/viz/host/gpu_client.h" #include "content/browser/bad_message.h" -@@ -3259,6 +3260,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3273,6 +3274,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLImageChromium, switches::kEnableWebGPUDeveloperFeatures, switches::kFileUrlPathAlias, @@ -83,7 +83,7 @@ "//ui/events/blink", --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -33,6 +33,7 @@ +@@ -34,6 +34,7 @@ #include "third_party/blink/public/common/loader/referrer_utils.h" #include "third_party/blink/public/common/switches.h" #include "third_party/blink/public/platform/web_runtime_features.h" @@ -91,7 +91,7 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -493,6 +494,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -497,6 +498,10 @@ void SetRuntimeFeaturesFromCommandLine(c {wrf::EnableWebGPUDeveloperFeatures, switches::kEnableWebGPUDeveloperFeatures, true}, {wrf::EnableDirectSockets, switches::kIsolatedAppOrigins, true}, @@ -104,7 +104,7 @@ if (command_line.HasSwitch(mapping.switch_name)) --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -213,6 +213,8 @@ class WebRuntimeFeatures { +@@ -218,6 +218,8 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool); BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool); BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool); @@ -115,7 +115,7 @@ BLINK_PLATFORM_EXPORT static void EnableSubresourceWebBundles(bool); --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -43,6 +43,7 @@ +@@ -38,6 +38,7 @@ #include "base/debug/dump_without_crashing.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" @@ -123,7 +123,7 @@ #include "base/time/time.h" #include "cc/animation/animation_host.h" #include "cc/animation/animation_timeline.h" -@@ -909,6 +910,14 @@ Range* Document::CreateRangeAdjustedToTr +@@ -905,6 +906,14 @@ Range* Document::CreateRangeAdjustedToTr Position::BeforeNode(*shadow_host)); } @@ -138,7 +138,7 @@ SelectorQueryCache& Document::GetSelectorQueryCache() { if (!selector_query_cache_) selector_query_cache_ = std::make_unique(); -@@ -2232,6 +2241,15 @@ void Document::UpdateStyleAndLayoutTreeF +@@ -2228,6 +2237,15 @@ void Document::UpdateStyleAndLayoutTreeF #if DCHECK_IS_ON() AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */); #endif @@ -167,7 +167,7 @@ AtomicString visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -2264,6 +2268,9 @@ class CORE_EXPORT Document : public Cont +@@ -2271,6 +2275,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -179,7 +179,7 @@ --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2127,6 +2127,11 @@ DOMRectList* Element::getClientRects() { +@@ -2131,6 +2131,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads, *element_layout_object); @@ -191,7 +191,7 @@ return MakeGarbageCollected(quads); } -@@ -2144,6 +2149,9 @@ gfx::RectF Element::GetBoundingClientRec +@@ -2148,6 +2153,9 @@ gfx::RectF Element::GetBoundingClientRec DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -285,7 +285,7 @@ void CanvasRenderingContext2D::fillFormattedText( --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1649,6 +1649,7 @@ component("platform") { +@@ -1651,6 +1651,7 @@ component("platform") { "//components/paint_preview/common", "//components/power_scheduler", "//components/search_engines:search_engine_utils", @@ -295,8 +295,8 @@ "//components/webrtc:net_address_utils", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -683,4 +683,12 @@ void WebRuntimeFeatures::EnableGetDispla - enable); +@@ -703,4 +703,12 @@ void WebRuntimeFeatures::EnablePrefixedS + RuntimeEnabledFeatures::SetPrefixedStorageInfoEnabled(enable); } +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) { @@ -310,7 +310,7 @@ } // namespace blink --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1091,6 +1091,12 @@ +@@ -1056,6 +1056,12 @@ origin_trial_feature_name: "Focusgroup", }, { diff --git a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch index 55dd83c6..41e1209c 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 -@@ -3262,6 +3262,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3276,6 +3276,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 -@@ -498,6 +498,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -502,6 +502,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -55,7 +55,7 @@ approach to change color components. if (command_line.HasSwitch(mapping.switch_name)) --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -215,6 +215,7 @@ class WebRuntimeFeatures { +@@ -220,6 +220,7 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool); BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool); BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool); @@ -65,7 +65,7 @@ approach to change color components. BLINK_PLATFORM_EXPORT static void EnableSubresourceWebBundles(bool); --- 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 -@@ -29,6 +29,7 @@ +@@ -30,6 +30,7 @@ #include "third_party/blink/renderer/platform/graphics/bitmap_image.h" #include "third_party/blink/renderer/platform/graphics/graphics_context.h" #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" @@ -73,7 +73,7 @@ approach to change color components. #include "third_party/blink/renderer/platform/graphics/stroke_data.h" #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" -@@ -2047,6 +2048,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -2094,6 +2095,9 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -85,7 +85,7 @@ approach to change color components. return image_data; --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1607,7 +1607,9 @@ component("platform") { +@@ -1609,7 +1609,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -98,7 +98,7 @@ approach to change color components. "//third_party/blink/renderer/platform/blob", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -691,4 +691,8 @@ void WebRuntimeFeatures::EnableFingerpri +@@ -711,4 +711,8 @@ void WebRuntimeFeatures::EnableFingerpri RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable); } @@ -322,7 +322,7 @@ approach to change color components. // Methods overridden by all sub-classes --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1097,6 +1097,9 @@ +@@ -1062,6 +1062,9 @@ name: "FingerprintingCanvasMeasureTextNoise", }, { diff --git a/patches/extra/bromite/flag-max-connections-per-host.patch b/patches/extra/bromite/flag-max-connections-per-host.patch index 1628fc41..8c807a2f 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 -@@ -2149,6 +2149,7 @@ static_library("browser") { +@@ -2153,6 +2153,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -49,20 +49,21 @@ with limited CPU/memory resources and it is disabled by default. #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -20,10 +20,12 @@ +@@ -20,11 +20,13 @@ #include "base/debug/leak_annotations.h" #include "base/files/file_path.h" #include "base/location.h" +#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" + #include "base/notreached.h" #include "base/path_service.h" #include "base/run_loop.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" -@@ -103,6 +105,7 @@ +@@ -104,6 +106,7 @@ #include "components/metrics/metrics_service.h" #include "components/metrics_services_manager/metrics_services_manager.h" #include "components/metrics_services_manager/metrics_services_manager_client.h" @@ -70,7 +71,7 @@ with limited CPU/memory resources and it is disabled by default. #include "components/network_time/network_time_tracker.h" #include "components/permissions/permissions_client.h" #include "components/policy/core/common/policy_service.h" -@@ -135,6 +138,7 @@ +@@ -136,6 +139,7 @@ #include "media/media_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "net/log/net_log.h" @@ -78,7 +79,7 @@ with limited CPU/memory resources and it is disabled by default. #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/features.h" -@@ -349,6 +353,18 @@ void BrowserProcessImpl::Init() { +@@ -350,6 +354,18 @@ void BrowserProcessImpl::Init() { pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled, base::BindRepeating(&ApplyMetricsReportingPolicy)); @@ -99,7 +100,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1772,6 +1772,10 @@ const char kUnthrottledNestedTimeoutDesc +@@ -1789,6 +1789,10 @@ const char kUnthrottledNestedTimeoutDesc "websites abusing the API will still eventually have their setTimeouts " "clamped."; @@ -112,7 +113,7 @@ with limited CPU/memory resources and it is disabled by default. const char kMediaRouterCastAllowAllIPsDescription[] = --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -993,6 +993,9 @@ extern const char kLogJsConsoleMessagesD +@@ -1006,6 +1006,9 @@ extern const char kLogJsConsoleMessagesD extern const char kUnthrottledNestedTimeoutName[]; extern const char kUnthrottledNestedTimeoutDescription[]; diff --git a/patches/extra/debian/disable/welcome-page.patch b/patches/extra/debian/disable/welcome-page.patch index 5dfcb020..998cf61f 100644 --- a/patches/extra/debian/disable/welcome-page.patch +++ b/patches/extra/debian/disable/welcome-page.patch @@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1442,11 +1442,6 @@ void ProfileManager::InitProfileUserPref +@@ -1441,11 +1441,6 @@ void ProfileManager::InitProfileUserPref profile->GetPrefs()->SetString(prefs::kSupervisedUserId, supervised_user_id); } diff --git a/patches/extra/debian/gn/parallel.patch b/patches/extra/debian/gn/parallel.patch index 77e01102..b25e3865 100644 --- a/patches/extra/debian/gn/parallel.patch +++ b/patches/extra/debian/gn/parallel.patch @@ -11,7 +11,7 @@ author: Michael Gilbert parser.add_option( '--skip-generate-buildfiles', action='store_true', -@@ -121,8 +122,12 @@ def main(argv): +@@ -122,8 +123,12 @@ def main(argv): shutil.copy2( os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir) diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 46670732..b9c7524a 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 -@@ -1361,7 +1361,7 @@ void ChromeContentBrowserClient::Registe +@@ -1355,7 +1355,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 -@@ -345,7 +345,7 @@ void ProfileNetworkContextService::Updat +@@ -355,7 +355,7 @@ void ProfileNetworkContextService::Updat void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -94,7 +94,7 @@ registry->RegisterDictionaryPref(prefs::kAppWindowPlacement); --- a/components/autofill/core/common/autofill_prefs.cc +++ b/components/autofill/core/common/autofill_prefs.cc -@@ -120,10 +120,10 @@ const char kAutocompleteLastVersionReten +@@ -117,10 +117,10 @@ const char kAutocompleteLastVersionReten void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // Synced prefs. Used for cross-device choices, e.g., credit card Autofill. registry->RegisterBooleanPref( @@ -107,18 +107,18 @@ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterIntegerPref( prefs::kAutofillLastVersionDeduped, 0, -@@ -133,7 +133,7 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -130,7 +130,7 @@ void RegisterProfilePrefs(user_prefs::Pr prefs::kAutofillLastVersionDisusedAddressesDeleted, 0, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref( - prefs::kAutofillCreditCardEnabled, true, + prefs::kAutofillCreditCardEnabled, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - - // Non-synced prefs. Used for per-device choices, e.g., signin promo. + registry->RegisterBooleanPref( + prefs::kAutofillIBANEnabled, true, --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc -@@ -438,7 +438,7 @@ bool DoesBookmarkContainWords(const std: +@@ -436,7 +436,7 @@ bool DoesBookmarkContainWords(const std: void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch index c2ee57fc..c15546b4 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 -@@ -1649,8 +1649,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1631,8 +1631,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 a93133f3..eca39e6e 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 -@@ -241,7 +241,7 @@ bool GetTLSServerEndPointChannelBinding( +@@ -248,7 +248,7 @@ bool GetTLSServerEndPointChannelBinding( } // RSA keys created by CreateKeyAndSelfSignedCert will be of this length. diff --git a/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch b/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch index 41e42b88..0d3b68c5 100644 --- a/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch +++ b/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch @@ -10,12 +10,12 @@ Out with all those tracking cookies! --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -131,7 +131,7 @@ void ContentSettingsRegistry::Init() { - // PrefProvider::DiscardOrMigrateObsoletePreferences() and +@@ -132,7 +132,7 @@ void ContentSettingsRegistry::Init() { // DefaultProvider::DiscardOrMigrateObsoletePreferences() accordingly. -- Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_ALLOW, -+ Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY, - WebsiteSettingsInfo::SYNCABLE, - AllowlistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), - ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, + Register( +- ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_ALLOW, ++ ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY, + WebsiteSettingsInfo::SYNCABLE, + AllowlistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), + ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, diff --git a/patches/extra/iridium-browser/updater-disable-auto-update.patch b/patches/extra/iridium-browser/updater-disable-auto-update.patch index 471f8e7f..8db762dd 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 -@@ -826,7 +826,7 @@ class AppControllerNativeThemeObserver : +@@ -828,7 +828,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 85d0ad9e..dbaac66f 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -138,6 +138,8 @@ +@@ -139,6 +139,8 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_utils.h" #include "chrome/browser/ui/ui_features.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/browser/ui/web_applications/web_app_launch_utils.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" -@@ -476,6 +478,7 @@ Browser::Browser(const CreateParams& par +@@ -477,6 +479,7 @@ Browser::Browser(const CreateParams& par omit_from_session_restore_(params.omit_from_session_restore), should_trigger_session_restore_(params.should_trigger_session_restore), cancel_download_confirmation_state_(NOT_PROMPTED), @@ -17,7 +17,7 @@ override_bounds_(params.initial_bounds), initial_show_state_(params.initial_show_state), initial_workspace_(params.initial_workspace), -@@ -841,6 +844,7 @@ Browser::WarnBeforeClosingResult Browser +@@ -838,6 +841,7 @@ Browser::WarnBeforeClosingResult Browser // true or there are no pending downloads we need to prompt about) then // there's no need to warn. if (force_skip_warning_user_on_close_ || CanCloseWithInProgressDownloads()) @@ -25,7 +25,7 @@ return WarnBeforeClosingResult::kOkToClose; DCHECK(!warn_before_closing_callback_) -@@ -875,6 +879,7 @@ bool Browser::TryToCloseWindow( +@@ -872,6 +876,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = NOT_PROMPTED; @@ -33,7 +33,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -2774,6 +2779,62 @@ bool Browser::CanCloseWithInProgressDown +@@ -2769,6 +2774,62 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -96,7 +96,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -2792,6 +2853,22 @@ void Browser::InProgressDownloadResponse +@@ -2787,6 +2848,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -129,7 +129,7 @@ #include "chrome/browser/ui/signin_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/unload_controller.h" -@@ -1055,12 +1056,17 @@ class Browser : public TabStripModelObse +@@ -1056,12 +1057,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -147,7 +147,7 @@ // Called when all warnings have completed when attempting to close the // browser directly (e.g. via hotkey, close button, terminate signal, etc.) // Used as a WarnBeforeClosingCallback by ShouldCloseWindow(). -@@ -1230,6 +1236,8 @@ class Browser : public TabStripModelObse +@@ -1231,6 +1237,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 93d6d248..18824720 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 -@@ -820,10 +820,14 @@ bool HandleNewTabPageLocationOverride( +@@ -816,10 +816,14 @@ bool HandleNewTabPageLocationOverride( // Don't change the URL when incognito mode. if (profile->IsOffTheRecord()) 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 7c79aa3f..1f7e3b1a 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 @@ -11,9 +11,9 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -15,6 +15,8 @@ - namespace blink { - namespace features { +@@ -23,6 +23,8 @@ namespace features { + const base::Feature kAnonymousIframeOriginTrial{ + "AnonymousIframeOriginTrial", base::FEATURE_ENABLED_BY_DEFAULT}; +const base::Feature kDisableLinkDrag{"DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT}; + @@ -28,9 +28,9 @@ +BLINK_COMMON_EXPORT extern const base::Feature kDisableLinkDrag; + + BLINK_COMMON_EXPORT extern const base::Feature kAnonymousIframeOriginTrial; BLINK_COMMON_EXPORT extern const base::Feature kAutomaticLazyFrameLoadingToAds; - BLINK_COMMON_EXPORT extern const base::Feature - kAutomaticLazyFrameLoadingToEmbeds; + BLINK_COMMON_EXPORT extern const base::FeatureParam --- a/third_party/blink/renderer/core/editing/selection_controller.cc +++ b/third_party/blink/renderer/core/editing/selection_controller.cc @@ -1319,10 +1319,14 @@ FrameSelection& SelectionController::Sel 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 f028d2cf..1ff0d951 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 @@ -42,7 +42,7 @@ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/metrics/histogram_functions.h" -@@ -296,6 +298,15 @@ AutocompleteController::AutocompleteCont +@@ -319,6 +321,15 @@ AutocompleteController::AutocompleteCont search_service_worker_signal_sent_(false), template_url_service_(provider_client_->GetTemplateURLService()) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); @@ -60,7 +60,7 @@ // Providers run in the order they're added. Run these async providers 1st --- a/components/omnibox/browser/history_url_provider.cc +++ b/components/omnibox/browser/history_url_provider.cc -@@ -483,6 +483,9 @@ void HistoryURLProvider::Start(const Aut +@@ -474,6 +474,9 @@ void HistoryURLProvider::Start(const Aut if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY) matches_.push_back(what_you_typed_match); @@ -80,7 +80,7 @@ #include "base/feature_list.h" #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" -@@ -652,6 +653,9 @@ void SearchProvider::Run(bool query_is_p +@@ -680,6 +681,9 @@ void SearchProvider::Run(bool query_is_p } void SearchProvider::DoHistoryQuery(bool minimal_changes) { 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 0c09994e..577c303c 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch @@ -27,7 +27,7 @@ return true; --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -312,7 +312,8 @@ void LocationBarView::Init() { +@@ -305,7 +305,8 @@ void LocationBarView::Init() { } params.types_enabled.push_back(PageActionIconType::kSendTabToSelf); params.types_enabled.push_back(PageActionIconType::kClickToCall); @@ -36,7 +36,7 @@ + params.types_enabled.push_back(PageActionIconType::kQRCodeGenerator); if (base::FeatureList::IsEnabled(kWebOTPCrossDevice)) params.types_enabled.push_back(PageActionIconType::kSmsRemoteFetcher); - if (!base::FeatureList::IsEnabled( + params.types_enabled.push_back(PageActionIconType::kManagePasswords); --- a/chrome/browser/ungoogled_flag_entries.h +++ b/chrome/browser/ungoogled_flag_entries.h @@ -64,4 +64,8 @@ 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 104ac0fb..86d42d0c 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 @@ -48,7 +48,7 @@ #include "base/containers/contains.h" #include "base/debug/crash_logging.h" #include "base/format_macros.h" -@@ -201,6 +202,12 @@ bool IsCreatedByExtension(const Template +@@ -206,6 +207,12 @@ bool IsCreatedByExtension(const Template template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION; } @@ -61,7 +61,7 @@ } // namespace // TemplateURLService::LessWithPrefix ----------------------------------------- -@@ -286,6 +293,7 @@ TemplateURLService::TemplateURLService( +@@ -291,6 +298,7 @@ TemplateURLService::TemplateURLService( std::unique_ptr client, const base::RepeatingClosure& dsp_change_callback) : prefs_(prefs), @@ -69,7 +69,7 @@ search_terms_data_(std::move(search_terms_data)), web_data_service_(web_data_service), client_(std::move(client)), -@@ -367,8 +375,8 @@ bool TemplateURLService::CanAddAutogener +@@ -372,8 +380,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. @@ -80,7 +80,7 @@ } bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy( -@@ -1566,6 +1574,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -1599,6 +1607,8 @@ SyncDataMap TemplateURLService::CreateGU void TemplateURLService::Init(const Initializer* initializers, int num_initializers) { @@ -89,7 +89,7 @@ if (client_) client_->SetOwner(this); -@@ -1704,6 +1714,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -1737,6 +1747,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -101,7 +101,7 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -733,6 +733,8 @@ class TemplateURLService : public WebDat +@@ -738,6 +738,8 @@ class TemplateURLService : public WebDat // ---------- Browser state related members --------------------------------- raw_ptr prefs_ = nullptr; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch index 28b35eb6..b7bacd65 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 @@ -27,7 +27,7 @@ #include "base/compiler_specific.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" -@@ -1627,6 +1628,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -1636,6 +1637,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 6cb44b12..c7ca1c55 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch @@ -20,7 +20,7 @@ #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/themes/theme_properties.h" -@@ -140,7 +141,8 @@ TabStripRegionView::TabStripRegionView(s +@@ -139,7 +140,8 @@ TabStripRegionView::TabStripRegionView(s return; } 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 ace7e68f..85d12157 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 @@ -27,35 +27,33 @@ + chrome_browsing_data_remover::DATA_TYPE_SITE_DATA; +} + - uint64_t GetOriginTypeMask(const base::Value& data_types) { + uint64_t GetOriginTypeMask(const base::Value::List& data_types) { uint64_t result = 0; - for (const auto& data_type : data_types.GetListDeprecated()) { -@@ -307,8 +323,9 @@ void ChromeBrowsingDataLifetimeManager:: + for (const auto& data_type : data_types) { +@@ -305,7 +321,8 @@ void ChromeBrowsingDataLifetimeManager:: bool keep_browser_alive) { - auto* data_types = profile_->GetPrefs()->GetList( + const base::Value::List& data_types = profile_->GetPrefs()->GetValueList( browsing_data::prefs::kClearBrowsingDataOnExitList); -- if (data_types && !data_types->GetListDeprecated().empty() && -- !SyncServiceFactory::IsSyncAllowed(profile_)) { +- if (!data_types.empty() && !SyncServiceFactory::IsSyncAllowed(profile_)) { + bool cdoe = base::FeatureList::IsEnabled(browsing_data::features::kClearDataOnExit); -+ if (cdoe || (data_types && !data_types->GetListDeprecated().empty() && -+ !SyncServiceFactory::IsSyncAllowed(profile_))) { ++ if (cdoe || (!data_types.empty() && !SyncServiceFactory::IsSyncAllowed(profile_))) { profile_->GetPrefs()->SetBoolean( browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true); auto* remover = profile_->GetBrowsingDataRemover(); -@@ -319,8 +336,8 @@ void ChromeBrowsingDataLifetimeManager:: +@@ -316,8 +333,8 @@ void ChromeBrowsingDataLifetimeManager:: DCHECK(keep_browser_alive); #endif remover->RemoveAndReply(base::Time(), base::Time::Max(), -- GetRemoveMask(*data_types), -- GetOriginTypeMask(*data_types), -+ cdoe ? AllRemoveMask() : GetRemoveMask(*data_types), -+ cdoe ? AllOriginTypeMask() : GetOriginTypeMask(*data_types), +- GetRemoveMask(data_types), +- GetOriginTypeMask(data_types), ++ cdoe ? AllRemoveMask() : GetRemoveMask(data_types), ++ cdoe ? AllOriginTypeMask() : GetOriginTypeMask(data_types), BrowsingDataRemoverObserver::Create( remover, /*filterable_deletion=*/true, profile_, keep_browser_alive)); --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc -@@ -48,6 +48,8 @@ ChromeBrowsingDataLifetimeManagerFactory +@@ -43,6 +43,8 @@ ChromeBrowsingDataLifetimeManagerFactory KeyedService* ChromeBrowsingDataLifetimeManagerFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { if (!base::FeatureList::IsEnabled( @@ -63,7 +61,7 @@ + !base::FeatureList::IsEnabled( browsing_data::features::kEnableBrowsingDataLifetimeManager)) return nullptr; - Profile* profile = Profile::FromBrowserContext(context); + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) --- a/chrome/browser/ungoogled_flag_entries.h +++ b/chrome/browser/ungoogled_flag_entries.h @@ -56,4 +56,8 @@ @@ -77,14 +75,15 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/browsing_data/core/features.cc +++ b/components/browsing_data/core/features.cc -@@ -19,5 +19,7 @@ const base::Feature kEnableBrowsingDataL - const base::Feature kEnableBrowsingDataLifetimeManager{ - "BrowsingDataLifetimeManager", base::FEATURE_ENABLED_BY_DEFAULT}; - #endif -+ +@@ -9,6 +9,8 @@ + namespace browsing_data { + namespace features { + +const base::Feature kClearDataOnExit{"ClearDataOnExit", base::FEATURE_DISABLED_BY_DEFAULT}; - } // namespace features - } // namespace browsing_data ++ + const base::Feature kEnableRemovingAllThirdPartyCookies{ + "EnableRemovingAllThirdPartyCookies", base::FEATURE_DISABLED_BY_DEFAULT}; + --- a/components/browsing_data/core/features.h +++ b/components/browsing_data/core/features.h @@ -17,6 +17,7 @@ extern const base::Feature kEnableRemovi 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 27fd4843..d15c7d65 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -8,7 +8,7 @@ #include "base/containers/flat_map.h" #include "base/cxx17_backports.h" #include "base/memory/raw_ptr.h" -@@ -1862,6 +1863,10 @@ bool TabStripModel::CloseTabs(base::span +@@ -1813,6 +1814,10 @@ bool TabStripModel::CloseTabs(base::span if (items.empty()) return true; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index 7b32d632..348e9cf1 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 -@@ -1106,10 +1106,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1104,10 +1104,12 @@ DownloadConfirmationReason DownloadTarge return DownloadConfirmationReason::SAVE_AS; #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch index 21791ae9..e82258d4 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch @@ -11,9 +11,9 @@ + "Makes popups open in new tabs. ungoogled-chromium flag", + kOsAll, SINGLE_VALUE_TYPE("popups-to-tabs")}, #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ ---- a/content/renderer/render_view_impl.cc -+++ b/content/renderer/render_view_impl.cc -@@ -74,6 +74,9 @@ WindowOpenDisposition RenderViewImpl::Na +--- a/content/renderer/render_frame_impl.cc ++++ b/content/renderer/render_frame_impl.cc +@@ -1164,6 +1164,9 @@ WindowOpenDisposition NavigationPolicyTo case blink::kWebNavigationPolicyNewWindow: return WindowOpenDisposition::NEW_WINDOW; case blink::kWebNavigationPolicyNewPopup: @@ -22,7 +22,7 @@ + return WindowOpenDisposition::NEW_POPUP; case blink::kWebNavigationPolicyPictureInPicture: return WindowOpenDisposition::NEW_POPUP; - default: + } --- a/ui/base/mojom/window_open_disposition_mojom_traits.h +++ b/ui/base/mojom/window_open_disposition_mojom_traits.h @@ -5,6 +5,7 @@ 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 ccfd1244..19be6e0b 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/callback_helpers.h" #include "base/compiler_specific.h" #include "base/containers/flat_set.h" -@@ -1010,7 +1011,8 @@ void HistoryBackend::InitImpl( +@@ -1021,7 +1022,8 @@ void HistoryBackend::InitImpl( db_->GetStartDate(&first_recorded_time_); // Start expiring old stuff. diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch index 4bd82836..37cf7ccf 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -915,6 +915,7 @@ BrowserView::BrowserView(std::unique_ptr +@@ -921,6 +921,7 @@ BrowserView::BrowserView(std::unique_ptr AddChildView(std::make_unique()); side_panel_coordinator_ = std::make_unique(this); } else { 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 217ef2e8..248abd46 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,9 +1,9 @@ --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -282,14 +282,30 @@ void ToolbarView::Init() { +@@ -339,14 +339,30 @@ void ToolbarView::Init() { + side_panel_button_ = AddChildView(std::move(side_panel_button)); - std::unique_ptr - toolbar_account_icon_container; + avatar_ = AddChildView(std::make_unique(browser_view_)); + + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); @@ -30,9 +30,9 @@ + else if (flag_value == "never") + show_avatar_toolbar_button = false; + - if (base::FeatureList::IsEnabled( - autofill::features::kAutofillEnableToolbarStatusChip)) { - // The avatar button is contained inside the page-action container and + avatar_->SetVisible(show_avatar_toolbar_button); + + auto app_menu_button = std::make_unique(this); --- a/chrome/browser/ungoogled_flag_choices.h +++ b/chrome/browser/ungoogled_flag_choices.h @@ -13,4 +13,16 @@ const FeatureEntry::Choice kExtensionHan diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index 2d64493b..3f94a83e 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -19,8 +19,8 @@ +const base::Feature kSetIpv6ProbeFalse{"SetIpv6ProbeFalse", base::FEATURE_DISABLED_BY_DEFAULT}; + - const base::Feature kAcceptLanguageHeader{"AcceptLanguageHeader", - base::FEATURE_ENABLED_BY_DEFAULT}; + const base::Feature kAlpsForHttp2{"AlpsForHttp2", + base::FEATURE_ENABLED_BY_DEFAULT}; --- a/net/base/features.h +++ b/net/base/features.h @@ -30,9 +30,9 @@ +NET_EXPORT extern const base::Feature kSetIpv6ProbeFalse; + - // Toggles the `Accept-Language` HTTP request header, which - // https://github.com/WICG/lang-client-hint proposes that we deprecate. - NET_EXPORT extern const base::Feature kAcceptLanguageHeader; + // Enables ALPS extension of TLS 1.3 for HTTP/2, see + // https://vasilvv.github.io/tls-alps/draft-vvv-tls-alps.html and + // 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 @@ -153,11 +153,6 @@ const unsigned kMinimumTTLSeconds = kCac @@ -47,7 +47,7 @@ enum DnsResolveStatus { RESOLVE_STATUS_DNS_SUCCESS = 0, RESOLVE_STATUS_PROC_SUCCESS, -@@ -4093,7 +4088,7 @@ bool HostResolverManager::IsIPv6Reachabl +@@ -4075,7 +4070,7 @@ bool HostResolverManager::IsIPv6Reachabl (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { SetLastIPv6ProbeResult( diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index c149a607..187c40a6 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -33,17 +33,17 @@ queryUrl_: String, + suggestionsUrl_: String, dialogTitle_: String, - keywordFieldLabel_: String, actionButtonText_: String, -@@ -79,6 +81,7 @@ export class SettingsSearchEngineEditDia + }; +@@ -72,6 +74,7 @@ export class SettingsSearchEngineEditDia private searchEngine_: string; private keyword_: string; private queryUrl_: string; + private suggestionsUrl_: string; private dialogTitle_: string; - private keywordFieldLabel_: string; private actionButtonText_: string; -@@ -98,6 +101,7 @@ export class SettingsSearchEngineEditDia + private browserProxy_: SearchEnginesBrowserProxy = +@@ -89,6 +92,7 @@ export class SettingsSearchEngineEditDia this.searchEngine_ = this.model.name; this.keyword_ = this.model.keyword; this.queryUrl_ = this.model.url; @@ -51,7 +51,7 @@ } else { this.dialogTitle_ = loadTimeData.getString('searchEnginesAddSearchEngine'); -@@ -137,8 +141,12 @@ export class SettingsSearchEngineEditDia +@@ -124,8 +128,12 @@ export class SettingsSearchEngineEditDia } } @@ -66,7 +66,7 @@ } private cancel_() { -@@ -147,7 +155,8 @@ export class SettingsSearchEngineEditDia +@@ -134,7 +142,8 @@ export class SettingsSearchEngineEditDia private onActionButtonTap_() { this.browserProxy_.searchEngineEditCompleted( @@ -76,7 +76,7 @@ this.$.dialog.close(); } -@@ -178,8 +187,10 @@ export class SettingsSearchEngineEditDia +@@ -165,8 +174,10 @@ export class SettingsSearchEngineEditDia this.$.searchEngine, this.$.keyword, this.$.queryUrl, @@ -90,13 +90,13 @@ } --- a/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts +++ b/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts -@@ -31,6 +31,7 @@ export type SearchEngine = { - name: string, - shouldConfirmDeletion: boolean, - url: string, -+ suggestionsUrl: string, - urlLocked: boolean, - }; +@@ -31,6 +31,7 @@ export interface SearchEngine { + name: string; + shouldConfirmDeletion: boolean; + url: string; ++ suggestionsUrl: string; + urlLocked: boolean; + } @@ -73,7 +74,7 @@ export interface SearchEnginesBrowserPro searchEngineEditCancelled(): void; @@ -341,16 +341,16 @@ // Dummy number used for indicating that a new search engine is added. const int kNewSearchEngineIndex = -1; -@@ -207,6 +208,8 @@ base::Value::Dict SearchEnginesHandler:: +@@ -206,6 +207,8 @@ base::Value::Dict SearchEnginesHandler:: Profile* profile = Profile::FromWebUI(web_ui()); dict.Set("url", template_url->url_ref().DisplayURL(UIThreadSearchTermsData())); + dict.Set("suggestionsUrl", template_url->suggestions_url_ref().DisplayURL( + UIThreadSearchTermsData())); - dict.Set("urlLocked", template_url->prepopulate_id() > 0); + dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) || + (template_url->starter_pack_id() > 0))); GURL icon_url = template_url->favicon_url(); - if (icon_url.is_valid()) -@@ -314,12 +317,14 @@ void SearchEnginesHandler::HandleSearchE +@@ -313,12 +316,14 @@ void SearchEnginesHandler::HandleSearchE void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url, const std::u16string& title, const std::u16string& keyword, @@ -368,7 +368,7 @@ edit_controller_.reset(); } -@@ -347,6 +352,8 @@ bool SearchEnginesHandler::CheckFieldVal +@@ -346,6 +351,8 @@ bool SearchEnginesHandler::CheckFieldVal is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value)); else if (field_name.compare(kQueryUrlField) == 0) is_valid = edit_controller_->IsURLValid(field_value); @@ -377,7 +377,7 @@ else NOTREACHED(); -@@ -366,18 +373,21 @@ void SearchEnginesHandler::HandleSearchE +@@ -365,18 +372,21 @@ void SearchEnginesHandler::HandleSearchE if (!edit_controller_.get()) return; @@ -427,7 +427,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -654,7 +654,8 @@ void TemplateURLService::IncrementUsageC +@@ -659,7 +659,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()); -@@ -669,6 +670,7 @@ void TemplateURLService::ResetTemplateUR +@@ -674,6 +675,7 @@ void TemplateURLService::ResetTemplateUR data.safe_for_autoreplace = false; data.last_modified = clock_->Now(); data.is_active = TemplateURLData::ActiveStatus::kTrue; diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index 578404a3..b580c620 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 -@@ -3290,7 +3290,13 @@ const FeatureEntry::FeatureVariation +@@ -3331,7 +3331,13 @@ const FeatureEntry::FeatureVariation // calculate and verify checksum. // // When adding a new choice, add it to the end of the list. diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index 38350a7d..5a3c687c 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -150,7 +150,7 @@ } // namespace download --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -89,7 +89,6 @@ source_set("browser") { +@@ -98,7 +98,6 @@ source_set("browser") { "//components/permissions:permissions_common", "//components/power_scheduler", "//components/services/filesystem:lib", diff --git a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch index 71430168..3ec02d52 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 -@@ -3667,8 +3667,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3694,8 +3694,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -13,7 +13,7 @@ } SynthesizeGLError( GL_INVALID_ENUM, "getParameter", -@@ -3682,8 +3681,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3709,8 +3708,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 437f9ae6..08fa92ff 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 -@@ -502,7 +502,7 @@ const base::Feature kComputePressure{"Co +@@ -566,7 +566,7 @@ const base::Feature kComputePressure{"Co // Prefetch request properties are updated to be privacy-preserving. See // crbug.com/988956. const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges", diff --git a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch index c1ab04af..de9a7f3b 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 -@@ -440,11 +440,6 @@ int GetContentRestrictions(const Browser +@@ -441,11 +441,6 @@ int GetContentRestrictions(const Browser CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(current_tab); content_restrictions = core_tab_helper->content_restrictions(); 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 db136331..6fe1b98a 100644 --- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch +++ b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch @@ -13,7 +13,7 @@ AddChildView(std::make_unique()); --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -1902,8 +1902,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -1908,8 +1908,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { @@ -22,7 +22,7 @@ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); CHECK(clipboard); std::u16string clipboard_text; -@@ -1911,7 +1909,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -1917,7 +1915,6 @@ void TabStrip::NewTabButtonPressed(const /* data_dst = */ nullptr, &clipboard_text); if (!clipboard_text.empty()) controller_->CreateNewTabWithLocation(clipboard_text); diff --git a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch index d49a2c80..0879960e 100644 --- a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch +++ b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch @@ -20,7 +20,7 @@ --- a/components/search_engines/util.cc +++ b/components/search_engines/util.cc -@@ -483,7 +483,7 @@ void GetSearchProvidersUsingLoadedEngine +@@ -490,7 +490,7 @@ void GetSearchProvidersUsingLoadedEngine const int prepopulate_resource_keyword_version = TemplateURLPrepopulateData::GetDataVersion(prefs); diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 45b66cfc..bd9aff7f 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -102,7 +102,7 @@ @@ -139,7 +139,7 @@
-@@ -167,6 +168,7 @@ +@@ -179,6 +180,7 @@
$i18nRaw{managePasswordsLabel}
@@ -163,7 +163,7 @@ @@ -188,7 +188,7 @@ padding-inline-start: 0; } -- +- +