From 928898246b33062466bf8268db75cf90e06acb44 Mon Sep 17 00:00:00 2001 From: Ahrotahn <40727284+Ahrotahn@users.noreply.github.com> Date: Wed, 3 Aug 2022 15:33:55 -0500 Subject: [PATCH] Update to Chromium 104.0.5112.81 (#2029) * Update to Chromium 104.0.5112.65 * Update to Chromium 104.0.5112.81 --- chromium_version.txt | 2 +- domain_substitution.list | 185 +++++++------ flags.gn | 1 - ...01-fix-building-without-safebrowsing.patch | 67 ++--- .../0005-disable-default-extensions.patch | 4 +- ...refixes-to-possibly-evil-connections.patch | 20 +- ..._browsing-disable-incident-reporting.patch | 2 +- .../block-trk-and-subdomains.patch | 26 +- .../ungoogled-chromium/disable-gaia.patch | 7 +- .../disable-google-host-detection.patch | 6 +- .../disable-mei-preload.patch | 4 +- .../disable-network-time-tracker.patch | 2 +- .../ungoogled-chromium/disable-signin.patch | 2 +- .../disable-webstore-urls.patch | 24 +- .../core/ungoogled-chromium/doh-changes.patch | 4 +- ...ix-building-without-one-click-signin.patch | 32 --- .../fix-building-without-safebrowsing.patch | 118 ++++---- .../remove-unused-preferences-fields.patch | 262 +++++++----------- .../toggle-translation-via-switch.patch | 8 +- ...g-flags-client-rects-and-measuretext.patch | 38 +-- ...ngerprinting-canvas-image-data-noise.patch | 8 +- .../flag-max-connections-per-host.patch | 8 +- .../extra/debian/disable/welcome-page.patch | 2 +- .../0006-modify-default-prefs.patch | 16 +- .../0018-disable-first-run-behaviour.patch | 2 +- ...ble-profile-auto-import-on-first-run.patch | 2 +- .../updater-disable-auto-update.patch | 2 +- .../add-flag-for-close-confirmation.patch | 14 +- .../add-flag-for-custom-ntp.patch | 6 +- .../add-flag-for-grab-handle.patch | 2 +- ...g-for-omnibox-autocomplete-filtering.patch | 12 +- .../add-flag-for-qr-generator.patch | 8 +- ...dd-flag-for-search-engine-collection.patch | 38 +-- .../add-flag-for-tabsearch-button.patch | 4 +- ...dd-flag-to-change-http-accept-header.patch | 4 +- ...g-to-configure-extension-downloading.patch | 2 +- .../add-flag-to-disable-beforeunload.patch | 2 +- ...-to-disable-local-history-expiration.patch | 2 +- .../add-flag-to-disable-tls-grease.patch | 2 +- .../add-flag-to-hide-side-panel-button.patch | 2 +- .../add-ipv6-probing-option.patch | 14 +- .../add-suggestions-url-field.patch | 18 +- .../add-ungoogled-flag-headers.patch | 2 +- .../disable-webgl-renderer-info.patch | 4 +- ...ble-default-prefetch-privacy-changes.patch | 2 +- .../enable-page-saving-on-more-pages.patch | 4 +- .../keep-expired-flags.patch | 6 +- .../remove-uneeded-ui.patch | 40 ++- patches/series | 1 - pruning.list | 100 ++++++- 50 files changed, 563 insertions(+), 580 deletions(-) delete mode 100644 patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch diff --git a/chromium_version.txt b/chromium_version.txt index 1076eec39..d1e7e9007 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -103.0.5060.134 +104.0.5112.81 diff --git a/domain_substitution.list b/domain_substitution.list index bc03ae1dc..cc5fd93b6 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -38,6 +38,7 @@ ash/assistant/ui/main_stage/assistant_onboarding_view_unittest.cc ash/assistant/ui/main_stage/suggestion_chip_view_unittest.cc ash/assistant/util/deep_link_util.cc ash/assistant/util/deep_link_util_unittest.cc +ash/capture_mode/capture_mode_camera_unittests.cc ash/capture_mode/capture_mode_unittests.cc ash/child_accounts/parent_access_controller_impl_unittest.cc ash/components/arc/arc_util.h @@ -48,6 +49,7 @@ 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/multidevice/remote_device_test_util.cc ash/components/multidevice/stub_multidevice_util.cc @@ -61,6 +63,7 @@ ash/components/tpm/tpm_token_info_getter_unittest.cc ash/components/trial_group/trial_group_checker.cc ash/constants/ash_switches.cc ash/constants/url_constants.cc +ash/controls/contextual_nudge.cc ash/fast_ink/laser/laser_pointer_view.cc ash/login/ui/auth_icon_view.cc ash/login/ui/login_remove_account_dialog_unittest.cc @@ -94,12 +97,14 @@ ash/services/quick_pair/public/cpp/account_key_filter.h 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/contextual_nudge.cc ash/shelf/launcher_nudge_controller_unittest.cc ash/shelf/shelf_controller_unittest.cc +ash/style/dark_light_mode_nudge_controller_unittests.cc ash/system/diagnostics/diagnostics_log_controller_unittest.cc +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/notification_grouping_controller_unittest.cc ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc ash/system/pcie_peripheral/pcie_peripheral_notification_controller_unittest.cc @@ -128,10 +133,12 @@ ash/webui/os_feedback_ui/backend/feedback_service_provider_unittest.cc ash/webui/os_feedback_ui/backend/help_content_provider.cc ash/webui/os_feedback_ui/backend/help_content_provider_unittest.cc ash/webui/os_feedback_ui/resources/fake_data.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/print_management/resources/PRESUBMIT.py ash/webui/projector_app/projector_xhr_sender.cc +ash/webui/projector_app/projector_xhr_sender.h ash/webui/projector_app/test/mock_app_client.cc ash/webui/projector_app/test/projector_message_handler_unittest.cc ash/webui/projector_app/test/projector_oauth_token_fetcher_unittest.cc @@ -149,12 +156,19 @@ base/BUILD.gn base/PRESUBMIT.py base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc base/allocator/partition_allocator/address_space_randomization.h +base/allocator/partition_allocator/oom.cc +base/allocator/partition_allocator/oom.h base/allocator/partition_allocator/page_allocator_internals_win.h +base/allocator/partition_allocator/partition_alloc_base/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 base/allocator/partition_allocator/partition_alloc_unittest.cc base/allocator/partition_allocator/partition_ref_count.h @@ -202,7 +216,9 @@ base/mac/close_nocancel.cc base/mac/objc_release_properties_unittest.mm base/memory/aligned_memory.cc base/memory/discardable_shared_memory.cc +base/memory/raw_ptr.cc base/memory/raw_ptr.h +base/memory/raw_ptr_asan_service.cc base/memory/scoped_refptr.h base/memory/shared_memory_mapping_unittest.cc base/memory/shared_memory_security_policy.cc @@ -217,8 +233,6 @@ base/power_monitor/power_monitor_device_source_android.cc base/power_monitor/speed_limit_observer_win.cc base/process/launch.h base/process/launch_posix.cc -base/process/memory.cc -base/process/memory.h base/process/process_info.h base/process/process_metrics.h base/process/process_metrics_unittest.cc @@ -335,8 +349,10 @@ build/config/sanitizers/sanitizers.gni build/config/win/BUILD.gn build/config/win/control_flow_guard.gni build/fuchsia/PRESUBMIT.py +build/fuchsia/binary_size_differ.py build/fuchsia/binary_sizes.py build/fuchsia/pkg_repo.py +build/fuchsia/test/PRESUBMIT.py build/linux/install-chromeos-fonts.py build/linux/sysroot_scripts/install-sysroot.py build/linux/unbundle/remove_bundled_libraries.py @@ -359,7 +375,6 @@ buildtools/README.txt buildtools/clang_format/README.txt buildtools/third_party/libc++/trunk/CREDITS.TXT buildtools/third_party/libc++/trunk/src/chrono.cpp -buildtools/third_party/libc++/trunk/utils/google-benchmark/src/cycleclock.h buildtools/third_party/libc++abi/trunk/CREDITS.TXT cc/PRESUBMIT.py cc/base/features.h @@ -369,6 +384,7 @@ cc/input/scrollbar_controller.h cc/metrics/average_lag_tracker.h cc/metrics/ukm_smoothness_data.h cc/paint/paint_image.h +cc/raster/one_copy_raster_buffer_provider.cc cc/tiles/gpu_image_decode_cache.h cc/trees/layer_tree_host_impl.cc chrome/BUILD.gn @@ -449,6 +465,7 @@ chrome/browser/apps/app_service/metrics/app_service_metrics.h 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 +chrome/browser/apps/digital_goods/digital_goods_ash.cc chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc chrome/browser/apps/guest_view/web_view_browsertest.cc chrome/browser/apps/intent_helper/intent_picker_auto_display_prefs_unittest.cc @@ -504,6 +521,7 @@ 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 chrome/browser/ash/crosapi/browser_data_migrator_unittest.cc chrome/browser/ash/crosapi/browser_util_unittest.cc chrome/browser/ash/crosapi/network_settings_translation_unittest.cc @@ -626,6 +644,7 @@ chrome/browser/ash/settings/cros_settings_unittest.cc chrome/browser/ash/settings/device_settings_provider_unittest.cc chrome/browser/ash/smb_client/smb_service_helper.h chrome/browser/ash/system_token_cert_db_initializer.h +chrome/browser/ash/system_web_apps/types/system_web_app_type.h chrome/browser/ash/tpm_firmware_update.h chrome/browser/ash/u2f_notification.cc chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc @@ -647,6 +666,7 @@ chrome/browser/autofill/automated_tests/cache_replayer.cc chrome/browser/autofill/automated_tests/cache_replayer.h chrome/browser/autofill/automated_tests/cache_replayer_unittest.cc chrome/browser/autofill/captured_sites_test_utils.cc +chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator_impl.cc chrome/browser/background_sync/periodic_background_sync_permission_context.cc chrome/browser/bluetooth/web_bluetooth_browsertest.cc chrome/browser/bookmarks/managed_bookmark_service_unittest.cc @@ -725,7 +745,6 @@ chrome/browser/download/chrome_download_manager_delegate_unittest.cc chrome/browser/download/download_browsertest.cc chrome/browser/download/mixed_content_download_blocking.cc chrome/browser/download/save_page_browsertest.cc -chrome/browser/endpoint_fetcher/endpoint_fetcher_unittest.cc chrome/browser/engagement/important_sites_util_browsertest.cc chrome/browser/engagement/important_sites_util_unittest.cc chrome/browser/engagement/site_engagement_service_unittest.cc @@ -734,7 +753,6 @@ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_browsert chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_unittest.cc chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc chrome/browser/enterprise/connectors/connectors_manager_unittest.cc -chrome/browser/enterprise/connectors/connectors_service.cc chrome/browser/enterprise/connectors/connectors_service_unittest.cc chrome/browser/enterprise/connectors/device_trust/attestation/desktop/google_keys.cc chrome/browser/enterprise/connectors/device_trust/device_trust_browsertest.cc @@ -748,6 +766,7 @@ chrome/browser/enterprise/connectors/file_system/browsertest_helper.cc chrome/browser/enterprise/connectors/file_system/rename_handler_unittest.cc chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc chrome/browser/enterprise/connectors/reporting/reporting_service_settings_unittest.cc +chrome/browser/enterprise/connectors/service_provider_config.cc chrome/browser/enterprise/connectors/service_provider_config_unittest.cc chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc chrome/browser/enterprise/reporting/extension_request/extension_request_notification_unittest.cc @@ -818,6 +837,7 @@ chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest. chrome/browser/extensions/api/tab_capture/tab_capture_performance_test_base.cc chrome/browser/extensions/api/tabs/tabs_api_unittest.cc chrome/browser/extensions/api/tabs/tabs_test.cc +chrome/browser/extensions/api/tabs/windows_util_unittest.cc chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc chrome/browser/extensions/api/web_request/web_request_api_unittest.cc chrome/browser/extensions/api/web_request/web_request_apitest.cc @@ -1000,7 +1020,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/integration_tests/largest_contentful_paint_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 @@ -1043,6 +1062,7 @@ chrome/browser/performance_hints/rewrite_handler.h chrome/browser/performance_hints/rewrite_handler_unittest.cc chrome/browser/permissions/chrome_permission_manager_unittest.cc chrome/browser/permissions/chrome_permission_request_manager_unittest.cc +chrome/browser/permissions/notifications_engagement_service_unittest.cc chrome/browser/permissions/permission_context_base_permissions_policy_unittest.cc chrome/browser/permissions/permissions_security_model_interactive_uitest.cc chrome/browser/permissions/quiet_permission_prompt_model_android.cc @@ -1075,8 +1095,8 @@ chrome/browser/predictors/loading_stats_collector_unittest.cc 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/no_state_prefetch/no_state_prefetch_unittest.cc chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc -chrome/browser/prefetch/no_state_prefetch/prerender_unittest.cc chrome/browser/prefetch/no_state_prefetch/tools/prerender_test_server/index.html chrome/browser/prefetch/no_state_prefetch/tools/prerender_test_server/prerender_test_server.py chrome/browser/prefetch/prefetch_browsertest.cc @@ -1117,7 +1137,7 @@ chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc chrome/browser/renderer_host/chrome_navigation_ui_data.h chrome/browser/reputation/local_heuristics.cc -chrome/browser/reputation/safety_tip_message_delegate_unittest.cc +chrome/browser/reputation/safety_tip_message_delegate_android_unittest.cc chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc chrome/browser/resource_coordinator/tab_manager_web_contents_data_unittest.cc chrome/browser/resource_coordinator/tab_metrics_logger_unittest.cc @@ -1131,7 +1151,7 @@ chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/m chrome/browser/resources/chromeos/accessibility/chromevox/background/background_test.js chrome/browser/resources/chromeos/accessibility/chromevox/background/braille/braille_input_handler_test.js chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js -chrome/browser/resources/chromeos/accessibility/chromevox/common/editable_text_base_test.js +chrome/browser/resources/chromeos/accessibility/chromevox/background/editing/editable_text_base_test.js chrome/browser/resources/chromeos/accessibility/chromevox/common/locale_output_helper_test.js chrome/browser/resources/chromeos/accessibility/chromevox/common/spannable_test.js chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css @@ -1206,7 +1226,6 @@ chrome/browser/resources/inspect/inspect.html chrome/browser/resources/internals/query_tiles/query_tiles_internals.html chrome/browser/resources/internals/query_tiles/query_tiles_internals.js chrome/browser/resources/media/mei_preload/manifest.json -chrome/browser/resources/media_router/cast_feedback_ui.js chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html chrome/browser/resources/nearby_share/shared/nearby_shared_share_type_icons.html chrome/browser/resources/net_internals/domain_security_policy_view.js @@ -1239,7 +1258,6 @@ chrome/browser/resources/settings/icons.html chrome/browser/resources/settings/settings_shared_css.html chrome/browser/resources/usb_internals/descriptor_panel.js chrome/browser/resources/webstore_app/manifest.json -chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc chrome/browser/safe_browsing/certificate_reporting_service.cc chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win_unittest.cc @@ -1251,8 +1269,8 @@ chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc chrome/browser/safe_browsing/chrome_ping_manager_unittest.cc chrome/browser/safe_browsing/client_side_detection_host_unittest.cc -chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc -chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_unittest.cc +chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service.cc +chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service_unittest.cc chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc chrome/browser/safe_browsing/download_protection/deep_scanning_browsertest.cc chrome/browser/safe_browsing/download_protection/deep_scanning_request_unittest.cc @@ -1285,6 +1303,7 @@ chrome/browser/serial/chrome_serial_browsertest.cc chrome/browser/serial/serial_chooser_context_unittest.cc chrome/browser/serial/serial_policy_allowed_ports_unittest.cc chrome/browser/sessions/app_session_service_unittest.cc +chrome/browser/sessions/better_session_restore_browsertest.cc chrome/browser/sessions/session_restore_browsertest.cc chrome/browser/sessions/session_restore_observer_unittest.cc chrome/browser/sessions/session_service.h @@ -1332,6 +1351,7 @@ chrome/browser/supervised_user/kids_management_url_checker_client_unittest.cc chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html chrome/browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc chrome/browser/supervised_user/supervised_user_service.cc +chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc chrome/browser/supervised_user/supervised_user_test_util.cc chrome/browser/supervised_user/supervised_user_url_filter.cc chrome/browser/supervised_user/supervised_user_url_filter.h @@ -1398,13 +1418,18 @@ chrome/browser/ui/ash/assistant/assistant_state_client_unittest.cc chrome/browser/ui/ash/assistant/assistant_test_mixin.cc chrome/browser/ui/ash/calendar/calendar_keyed_service.cc chrome/browser/ui/ash/chrome_shell_delegate.cc -chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc +chrome/browser/ui/ash/desks/desks_client_browsertest.cc chrome/browser/ui/ash/in_session_auth_dialog_client.cc +chrome/browser/ui/ash/projector/pending_screencast_manager.cc +chrome/browser/ui/ash/projector/pending_screencast_manager_browsertest.cc chrome/browser/ui/ash/projector/projector_navigation_throttle_browsertest.cc chrome/browser/ui/ash/session_controller_client_impl_unittest.cc chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc chrome/browser/ui/ash/system_tray_client_impl.cc chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc +chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl_unittest.cc +chrome/browser/ui/autofill/payments/offer_notification_controller_android_browsertest.cc +chrome/browser/ui/autofill_assistant/password_change/assistant_onboarding_controller_impl_browsertest.cc chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h chrome/browser/ui/bookmarks/bookmark_browsertest.cc @@ -1459,7 +1484,6 @@ chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_brows chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_unittest.cc chrome/browser/ui/pdf/adobe_reader_info_win.cc chrome/browser/ui/profile_picker_unittest.cc -chrome/browser/ui/quick_answers/quick_answers_access_token_fetcher.cc chrome/browser/ui/quick_answers/quick_answers_state_ash_unittest.cc chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc chrome/browser/ui/search/ntp_user_data_logger_unittest.cc @@ -1475,6 +1499,7 @@ chrome/browser/ui/tab_helpers.h chrome/browser/ui/tabs/pinned_tab_codec_unittest.cc chrome/browser/ui/tabs/pinned_tab_service_browsertest.cc chrome/browser/ui/tabs/pinned_tab_service_unittest.cc +chrome/browser/ui/tabs/tab_strip_model_unittest.cc chrome/browser/ui/toolbar/location_bar_model_unittest.cc chrome/browser/ui/toolbar/media_router_contextual_menu.cc chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc @@ -1626,10 +1651,10 @@ chrome/browser/web_applications/preinstalled_web_apps/google_slides.cc chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc chrome/browser/web_applications/preinstalled_web_apps/youtube.cc chrome/browser/web_applications/preinstalled_web_apps_browsertest.cc -chrome/browser/web_applications/system_web_apps/system_web_app_types.h chrome/browser/web_applications/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 @@ -1766,6 +1791,7 @@ chrome/credential_provider/test/gls_runner_test_base.cc chrome/docs/devtools-pillar.html chrome/docs/index.html chrome/docs/platform-pillar.html +chrome/elevation_service/caller_validation.cc chrome/install_static/google_chrome_install_modes.cc chrome/install_static/install_constants.h chrome/install_static/install_details.h @@ -1907,7 +1933,6 @@ chrome/test/enterprise/e2e/policy/translate_enabled/translate_enabled.py chrome/test/enterprise/e2e/policy/url_allowlist/url_allowlist.py chrome/test/enterprise/e2e/policy/url_blocklist/url_blocklist.py chrome/test/enterprise/e2e/policy/user_data_dir/user_data_dir.py -chrome/test/enterprise/e2e/policy/webprotect_bulk_text_entry/webprotect_bulk_text_entry_webdriver.py chrome/test/enterprise/e2e/policy/webprotect_file_download/webprotect_file_download_webdriver.py chrome/test/enterprise/e2e/policy/youtube_restrict/youtube_restrict.py chrome/test/mini_installer/PRESUBMIT.py @@ -1972,6 +1997,9 @@ chromeos/BUILD.gn chromeos/ash/components/dbus/biod/fake_biod_client_unittest.cc chromeos/ash/components/dbus/hiberman/hiberman_client_unittest.cc chromeos/ash/components/dbus/rmad/fake_rmad_client.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/local_search_service/content_extraction_utils_unittest.cc chromeos/components/quick_answers/translation_result_loader.cc @@ -1989,6 +2017,7 @@ chromeos/lacros/BUILD.gn chromeos/network/geolocation_handler.cc chromeos/network/network_cert_loader.cc chromeos/network/network_util.h +chromeos/network/profile_policies.h chromeos/network/system_token_cert_db_storage.h chromeos/printing/ppd_provider.h chromeos/printing/printer_config_cache.cc @@ -2009,9 +2038,6 @@ chromeos/printing/uri_fuzzer_seed_corpus/uri3.txt chromeos/printing/uri_fuzzer_seed_corpus/uri4.txt chromeos/printing/uri_fuzzer_seed_corpus/uri49.txt chromeos/printing/uri_fuzzer_seed_corpus/uri5.txt -chromeos/services/assistant/assistant_manager_service_impl.cc -chromeos/services/assistant/service.cc -chromeos/services/assistant/service_unittest.cc chromeos/services/libassistant/public/cpp/assistant_suggestion.h components/BUILD.gn components/account_manager_core/account_manager_facade_impl_unittest.cc @@ -2032,6 +2058,7 @@ components/autofill/core/browser/autofill_download_manager.cc components/autofill/core/browser/autofill_download_manager_unittest.cc components/autofill/core/browser/autofill_experiments.cc components/autofill/core/browser/autofill_experiments_unittest.cc +components/autofill/core/browser/autofill_test_utils.cc components/autofill/core/browser/browser_autofill_manager_unittest.cc components/autofill/core/browser/data_model/test_data_creator.cc components/autofill/core/browser/form_data_importer_unittest.cc @@ -2087,6 +2114,7 @@ components/autofill_assistant/browser/service/server_url_fetcher.cc components/autofill_assistant/browser/service/server_url_fetcher_unittest.cc components/autofill_assistant/browser/starter_unittest.cc components/autofill_assistant/browser/trigger_scripts/trigger_script_coordinator_unittest.cc +components/autofill_assistant/browser/ui_controller_unittest.cc components/autofill_assistant/browser/user_data_util_unittest.cc components/autofill_assistant/browser/user_model_unittest.cc components/autofill_assistant/browser/web/keyboard_input_data.h @@ -2168,8 +2196,10 @@ components/desks_storage/core/desk_model_wrapper_unittests.cc components/desks_storage/core/desk_sync_bridge.cc components/desks_storage/core/desk_sync_bridge_unittest.cc components/desks_storage/core/desk_template_conversion_unittests.cc -components/desks_storage/core/desk_template_util_unittests.cc +components/desks_storage/core/desk_test_util_unittests.cc components/desks_storage/core/local_desks_data_manager_unittests.cc +components/device_signals/core/common/win/win_types.h +components/device_signals/core/common/win/wsc_client.h components/digital_asset_links/digital_asset_links_handler.cc components/digital_asset_links/digital_asset_links_handler.h components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc @@ -2187,6 +2217,7 @@ components/drive/drive_api_util.h components/drive/service/drive_api_service.cc components/drive/service/fake_drive_service.cc components/embedder_support/android/BUILD.gn +components/endpoint_fetcher/endpoint_fetcher_unittest.cc components/error_page/common/localized_error.cc components/error_page_strings.grdp components/exo/data_offer_unittest.cc @@ -2265,8 +2296,8 @@ components/history_clusters/core/history_clusters_util_unittest.cc components/history_clusters/core/on_device_clustering_backend_unittest.cc components/history_clusters/core/ranking_cluster_finalizer_unittest.cc components/history_clusters/core/similar_visit_deduper_cluster_finalizer_unittest.cc +components/history_clusters/core/single_domain_cluster_finalizer_unittest.cc components/history_clusters/core/single_visit_cluster_finalizer_unittest.cc -components/history_clusters/core/url_deduper_cluster_finalizer_unittest.cc components/history_clusters_strings.grdp components/history_strings.grdp components/image_fetcher/ios/webp_decoder.h @@ -2434,7 +2465,8 @@ components/omnibox/resources/omnibox_pedal_synonyms.grd_unused components/omnibox_pedal_ui_strings.grdp components/omnibox_strings.grdp components/optimization_guide/content/browser/page_content_annotations_model_manager_unittest.cc -components/optimization_guide/content/browser/page_content_annotations_service_unittest.cc +components/optimization_guide/core/entity_metadata.cc +components/optimization_guide/core/entity_metadata.h components/optimization_guide/core/hints_component_util_unittest.cc components/optimization_guide/core/hints_manager_unittest.cc components/optimization_guide/core/model_handler_unittest.cc @@ -2535,7 +2567,7 @@ components/password_manager/core/browser/password_reuse_detector_unittest.cc components/password_manager/core/browser/password_reuse_manager_impl_unittest.cc components/password_manager/core/browser/password_save_manager_impl_unittest.cc components/password_manager/core/browser/password_scripts_fetcher_impl.cc -components/password_manager/core/browser/password_scripts_fetcher_impl_unittests.cc +components/password_manager/core/browser/password_scripts_fetcher_impl_unittest.cc components/password_manager/core/browser/password_store_backend_migration_decorator_unittest.cc components/password_manager/core/browser/password_store_unittest.cc components/password_manager/core/browser/password_sync_util.cc @@ -2611,6 +2643,7 @@ 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_unittest.cc +components/policy/core/common/default_chrome_apps_migrator.cc components/policy/core/common/default_chrome_apps_migrator_unittest.cc components/policy/core/common/policy_loader_common.cc components/policy/core/common/policy_loader_common_unittest.cc @@ -2807,8 +2840,6 @@ components/signin/internal/identity_manager/ubertoken_fetcher_impl_unittest.cc components/signin/ios/browser/account_consistency_service.mm components/signin/ios/browser/account_consistency_service_unittest.mm components/signin/ios/browser/features.h -components/signin/public/base/signin_client.h -components/signin/public/base/test_signin_client.cc components/signin/public/identity_manager/access_token_fetcher.cc components/signin/public/identity_manager/access_token_fetcher_unittest.cc components/signin/public/identity_manager/account_info.h @@ -2846,7 +2877,6 @@ components/sync/test/engine/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_request_unittest.cc components/sync/trusted_vault/trusted_vault_server_constants.h components/sync_bookmarks/PRESUBMIT.py components/sync_device_info/device_info.cc @@ -2918,8 +2948,6 @@ components/webapps/browser/android/shortcut_info.cc components/webapps/browser/android/webapk/webapk_icon_hasher_unittest.cc components/webapps/browser/banners/app_banner_settings_helper_unittest.cc components/webapps/browser/installable/installable_logging.cc -components/webcrypto/algorithms/ed25519.cc -components/webcrypto/algorithms/x25519.cc components/webxr/android/arcore_install_helper.cc components/webxr/android/arcore_install_helper.h components/wifi/wifi_service_win.cc @@ -2928,7 +2956,6 @@ components/zucchini/disassembler_dex.h components/zucchini/type_dex.h content/app/android/content_child_process_service_delegate.cc content/app/content_main_runner_impl.cc -content/app/resources/README.txt content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm content/browser/accessibility/accessibility_action_browsertest.cc content/browser/accessibility/accessibility_auralinux_browsertest.cc @@ -3076,6 +3103,7 @@ content/browser/webauth/authenticator_mojom_traits_unittest.cc content/browser/webauth/client_data_json.cc content/browser/webauth/webauth_request_security_checker.cc content/browser/webauth/webauth_request_security_checker.h +content/browser/webid/idp_network_request_manager_unittest.cc content/browser/webrtc/resources/webrtc_internals.js content/browser/zygote_host/zygote_host_impl_linux.cc content/child/runtime_features.cc @@ -3136,7 +3164,6 @@ content/test/gpu/flake_suppressor/results_unittest.py content/test/gpu/gather_power_measurement_results.py content/test/gpu/gather_swarming_json_results.py content/test/gpu/gpu_tests/power_measurement_integration_test.py -content/test/gpu/gpu_tests/test_expectations/webgpu_cts_expectation_queries.js content/test/gpu/measure_power_intel.py content/test/gpu/power_measurement_results/analyze_power_measurement_results.py content/test/gpu/suppress_flakes.py @@ -3296,8 +3323,8 @@ extensions/renderer/script_context.cc extensions/shell/browser/shell_prefs.cc extensions/strings/extensions_strings.grd extensions/test/extension_background_page_waiter.h -fuchsia/engine/browser/frame_impl_browsertest.cc -fuchsia/engine/test/data/play_video.html +fuchsia_web/webengine/browser/frame_impl_browsertest.cc +fuchsia_web/webengine/test/data/play_video.html gin/v8_initializer.cc google_apis/calendar/calendar_api_requests.cc google_apis/calendar/calendar_api_requests.h @@ -3482,6 +3509,7 @@ ios/chrome/browser/app_launcher/app_launcher_abuse_detector_unittest.mm ios/chrome/browser/app_launcher/app_launcher_tab_helper_unittest.mm ios/chrome/browser/autofill/BUILD.gn ios/chrome/browser/autofill/automation/automation_action.mm +ios/chrome/browser/autofill/form_suggestion_controller_unittest.mm ios/chrome/browser/autofill/manual_fill/passwords_fetcher_unittest.mm ios/chrome/browser/browser_state/chrome_browser_state_impl.h ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm @@ -3607,6 +3635,7 @@ ios/chrome/test/providers/omaha/test_omaha.cc ios/chrome/test/xcuitest/device_check_xctest.mm ios/components/cookie_util/cookie_util_unittest.mm ios/components/credential_provider_extension/password_spec_fetcher.mm +ios/components/security_interstitials/https_only_mode/https_only_mode_blocking_page.mm ios/net/cookies/cookie_cache_unittest.cc ios/net/cookies/cookie_store_ios_test_util.mm ios/net/cookies/cookie_store_ios_unittest.mm @@ -4248,7 +4277,6 @@ 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 -net/ssl/ssl_platform_key_mac.cc net/ssl/ssl_platform_key_win_unittest.cc net/test/cert_test_util_nss.cc net/test/ct_test_util.cc @@ -4288,7 +4316,6 @@ net/third_party/quiche/src/quiche/quic/tools/quic_simple_server_stream_test.cc net/third_party/quiche/src/quiche/quic/tools/quic_toy_client.cc net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.h net/tools/print_certificates.py -net/tools/quic/quic_http_proxy_backend_test.cc net/tools/quic/quic_simple_client_bin.cc net/tools/testserver/testserver.py.vpython3 net/tools/transport_security_state_generator/transport_security_state_generator.cc @@ -4593,7 +4620,7 @@ third_party/abseil-cpp/absl/hash/internal/city.h third_party/abseil-cpp/absl/random/internal/platform.h third_party/abseil-cpp/absl/status/status.h third_party/abseil-cpp/absl/strings/string_view.cc -third_party/abseil-cpp/absl/synchronization/internal/waiter.cc +third_party/abseil-cpp/absl/synchronization/internal/waiter.h third_party/abseil-cpp/absl/time/time.h third_party/abseil-cpp/absl/types/optional_test.cc third_party/abseil-cpp/conanfile.py @@ -4835,7 +4862,6 @@ third_party/angle/src/libANGLE/renderer/gen_dxgi_support_tables.py third_party/angle/src/libANGLE/renderer/renderer_utils.cpp third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.cpp third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.h -third_party/angle/src/libANGLE/renderer/vulkan/ContextVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/ContextVk.h third_party/angle/src/libANGLE/renderer/vulkan/ImageVk.cpp third_party/angle/src/libANGLE/renderer/vulkan/PersistentCommandPool.cpp @@ -4906,7 +4932,6 @@ third_party/angle/third_party/rapidjson/src/test/unittest/valuetest.cpp third_party/angle/util/android/AndroidWindow.cpp third_party/angle/util/capture/frame_capture_test_utils.h third_party/angle/util/windows/third_party/StackWalker/src/StackWalker.cpp -third_party/apple_apsl/cssmapplePriv.h third_party/ashmem/ashmem-dev.c third_party/axe-core/axe.js third_party/axe-core/axe.min.js @@ -5013,8 +5038,7 @@ third_party/blink/public/common/scheduler/PRESUBMIT.py third_party/blink/public/common/storage_key/storage_key.h third_party/blink/public/common/widget/visual_properties.h third_party/blink/public/mojom/permissions_policy/PRESUBMIT.py -third_party/blink/public/mojom/use_counter/PRESUBMIT.py -third_party/blink/public/mojom/web_feature/PRESUBMIT.py +third_party/blink/public/mojom/use_counter/metrics/PRESUBMIT.py third_party/blink/public/platform/linux/web_sandbox_support.h third_party/blink/public/platform/platform.h third_party/blink/public/platform/web_url_response.h @@ -5158,6 +5182,7 @@ 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/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 @@ -5352,7 +5377,9 @@ third_party/blink/renderer/core/testing/data/hit_test.html third_party/blink/renderer/core/timing/memory_info.idl third_party/blink/renderer/core/timing/performance.idl third_party/blink/renderer/core/timing/performance_resource_timing.h +third_party/blink/renderer/core/timing/soft_navigation_heuristics.h third_party/blink/renderer/core/timing/window_performance.cc +third_party/blink/renderer/core/trustedtypes/generate_eventhandler_names.py third_party/blink/renderer/core/web_test/web_test_web_frame_widget_impl.h third_party/blink/renderer/core/workers/shared_worker_content_settings_proxy.cc third_party/blink/renderer/core/xml/xpath_expression.idl @@ -5369,7 +5396,6 @@ third_party/blink/renderer/modules/clipboard/clipboard_promise.cc third_party/blink/renderer/modules/credentialmanagement/authentication_extensions_client_inputs.idl third_party/blink/renderer/modules/credentialmanagement/credentials_container.cc third_party/blink/renderer/modules/crypto/crypto_histograms.h -third_party/blink/renderer/modules/crypto/normalize_algorithm.cc 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 @@ -5406,6 +5432,7 @@ third_party/blink/renderer/modules/vibration/vibration_controller.cc third_party/blink/renderer/modules/webaudio/audio_context.cc third_party/blink/renderer/modules/webgl/webgl_unowned_texture.h third_party/blink/renderer/modules/webgpu/gpu.cc +third_party/blink/renderer/modules/webgpu/gpu_external_texture.cc third_party/blink/renderer/modules/webgpu/gpu_render_pipeline.cc third_party/blink/renderer/modules/webmidi/navigator_web_midi.cc third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc @@ -5416,7 +5443,6 @@ third_party/blink/renderer/modules/xr/xr_system.cc third_party/blink/renderer/platform/PRESUBMIT.py third_party/blink/renderer/platform/animation/timing_function.h third_party/blink/renderer/platform/bindings/parkable_string.cc -third_party/blink/renderer/platform/exported/web_crypto_algorithm.cc third_party/blink/renderer/platform/fonts/bitmap_glyphs_block_list.cc third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc third_party/blink/renderer/platform/fonts/font_description.cc @@ -6990,6 +7016,7 @@ third_party/dawn/src/dawn/native/d3d12/ResourceAllocatorManagerD3D12.cpp third_party/dawn/src/dawn/native/d3d12/ResourceAllocatorManagerD3D12.h third_party/dawn/src/dawn/native/d3d12/SamplerD3D12.cpp third_party/dawn/src/dawn/native/d3d12/TextureD3D12.cpp +third_party/dawn/src/dawn/native/opengl/AdapterGL.cpp third_party/dawn/src/dawn/native/opengl/BackendGL.cpp third_party/dawn/src/dawn/native/opengl/CommandBufferGL.cpp third_party/dawn/src/dawn/native/opengl/TextureGL.cpp @@ -7021,6 +7048,15 @@ third_party/dawn/src/tint/reader/spirv/function_cfg_test.cc third_party/dawn/src/tint/reader/spirv/parser_impl.cc third_party/dawn/src/tint/transform/promote_side_effects_to_decl_test.cc third_party/dawn/src/tint/writer/hlsl/generator_impl.cc +third_party/dawn/third_party/glfw/deps/nuklear.h +third_party/dawn/third_party/glfw/include/GLFW/glfw3native.h +third_party/dawn/third_party/glfw/src/linux_joystick.h +third_party/dawn/third_party/glfw/src/wl_init.c +third_party/dawn/third_party/glfw/src/wl_monitor.c +third_party/dawn/third_party/glfw/src/wl_platform.h +third_party/dawn/third_party/glfw/src/wl_window.c +third_party/dawn/third_party/glfw/src/xkb_unicode.h +third_party/dawn/third_party/glfw/tests/triangle-vulkan.c third_party/dawn/third_party/webgpu-cts/standalone/index.html third_party/dawn/tools/src/cmd/cts/config.json third_party/depot_tools/PRESUBMIT.py @@ -8274,6 +8310,7 @@ third_party/devtools-frontend/src/test/e2e/resources/console/primitives.html third_party/devtools-frontend/src/third_party/blink/public/devtools_protocol/browser_protocol.json third_party/devtools-frontend/src/third_party/pyjson5/src/benchmarks/chromium.linux.json third_party/devtools-frontend/src/third_party/pyjson5/src/setup.py +third_party/devtools-frontend/src/third_party/typescript/typescript.gni third_party/dom_distiller_js/dist/js/domdistiller.js third_party/dom_distiller_js/dist/js/domdistiller_wrapped.js third_party/dom_distiller_js/protoc_plugins/util/plugin_protos.py @@ -9141,6 +9178,10 @@ third_party/ffmpeg/libavcodec/lagarith.c third_party/ffmpeg/libavcodec/lagarithrac.c third_party/ffmpeg/libavcodec/lagarithrac.h third_party/ffmpeg/libavcodec/libdavs2.c +third_party/ffmpeg/libavcodec/libjxl.c +third_party/ffmpeg/libavcodec/libjxl.h +third_party/ffmpeg/libavcodec/libjxldec.c +third_party/ffmpeg/libavcodec/libjxlenc.c third_party/ffmpeg/libavcodec/librsvgdec.c third_party/ffmpeg/libavcodec/libtheoraenc.c third_party/ffmpeg/libavcodec/libuavs3d.c @@ -9182,6 +9223,7 @@ third_party/ffmpeg/libavcodec/opusenc_psy.h third_party/ffmpeg/libavcodec/opusenc_utils.h third_party/ffmpeg/libavcodec/opustab.c third_party/ffmpeg/libavcodec/opustab.h +third_party/ffmpeg/libavcodec/pgs_frame_merge_bsf.c third_party/ffmpeg/libavcodec/roqvideoenc.c third_party/ffmpeg/libavcodec/rscc.c third_party/ffmpeg/libavcodec/s302m.c @@ -9197,6 +9239,7 @@ third_party/ffmpeg/libavcodec/tdsc.c third_party/ffmpeg/libavcodec/tests/jpeg2000dwt.c third_party/ffmpeg/libavcodec/texturedsp.c third_party/ffmpeg/libavcodec/texturedsp.h +third_party/ffmpeg/libavcodec/texturedsp_template.c third_party/ffmpeg/libavcodec/texturedspenc.c third_party/ffmpeg/libavcodec/vc2enc.c third_party/ffmpeg/libavcodec/vc2enc_dwt.c @@ -9293,6 +9336,8 @@ third_party/ffmpeg/libavformat/hevc.c third_party/ffmpeg/libavformat/hevc.h third_party/ffmpeg/libavformat/hevcdec.c third_party/ffmpeg/libavformat/iff.c +third_party/ffmpeg/libavformat/jpegxl_probe.c +third_party/ffmpeg/libavformat/jpegxl_probe.h third_party/ffmpeg/libavformat/libsmbclient.c third_party/ffmpeg/libavformat/libssh.c third_party/ffmpeg/libavformat/matroskaenc.c @@ -9385,14 +9430,6 @@ third_party/freetype/src/src/sfnt/ttsvg.c third_party/freetype/src/src/truetype/ttinterp.h third_party/gemmlowp/src/contrib/CMakeLists.txt third_party/gemmlowp/src/standalone/neon-gemm-kernel-benchmark.cc -third_party/glfw/src/deps/nuklear.h -third_party/glfw/src/src/linux_joystick.h -third_party/glfw/src/src/wl_init.c -third_party/glfw/src/src/wl_monitor.c -third_party/glfw/src/src/wl_platform.h -third_party/glfw/src/src/wl_window.c -third_party/glfw/src/src/xkb_unicode.h -third_party/glfw/src/tests/triangle-vulkan.c third_party/google-closure-library/closure-deps/lib/jsfile_parser.js third_party/google-closure-library/closure-deps/package.json third_party/google-closure-library/closure/bin/build/closurebuilder.py @@ -9731,6 +9768,7 @@ third_party/googletest/src/googletest/src/gtest.cc third_party/googletest/src/googletest/test/googletest-death-test-test.cc third_party/googletest/src/googletest/test/gtest_list_output_unittest_.cc third_party/googletest/src/googletest/test/gtest_skip_test.cc +third_party/grpc/src/CMakeLists.txt third_party/grpc/src/include/grpc/grpc.h third_party/grpc/src/include/grpc/grpc_security_constants.h third_party/grpc/src/include/grpcpp/create_channel_binder.h @@ -9741,6 +9779,7 @@ third_party/grpc/src/package.xml third_party/grpc/src/setup.py third_party/grpc/src/src/boringssl/gen_build_yaml.py third_party/grpc/src/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc +third_party/grpc/src/src/core/ext/filters/client_channel/retry_filter.cc third_party/grpc/src/src/core/ext/transport/binder/security_policy/security_policy.h third_party/grpc/src/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc third_party/grpc/src/src/core/ext/xds/xds_api.cc @@ -9749,6 +9788,7 @@ third_party/grpc/src/src/core/ext/xds/xds_listener.cc third_party/grpc/src/src/core/ext/xds/xds_route_config.cc third_party/grpc/src/src/core/lib/gpr/string.h third_party/grpc/src/src/core/lib/gprpp/status_helper.cc +third_party/grpc/src/src/core/lib/gprpp/time.h third_party/grpc/src/src/core/lib/iomgr/socket_windows.cc third_party/grpc/src/src/core/lib/json/json_util.h third_party/grpc/src/src/core/lib/security/authorization/cel_authorization_engine.h @@ -9773,6 +9813,7 @@ third_party/grpc/src/src/python/grpcio_testing/setup.py third_party/grpc/src/src/python/grpcio_tests/tests/unit/_api_test.py third_party/grpc/src/src/python/grpcio_tests/tests/unit/_auth_context_test.py third_party/grpc/src/src/python/grpcio_tests/tests_aio/unit/auth_context_test.py +third_party/grpc/src/test/core/client_channel/http_proxy_mapper_test.cc third_party/grpc/src/test/core/client_channel/resolvers/binder_resolver_test.cc third_party/grpc/src/test/core/client_channel/resolvers/dns_resolver_test.cc third_party/grpc/src/test/core/client_channel/resolvers/sockaddr_resolver_test.cc @@ -9792,6 +9833,7 @@ third_party/grpc/src/test/core/xds/xds_bootstrap_test.cc third_party/grpc/src/test/cpp/end2end/end2end_test.cc third_party/grpc/src/test/cpp/end2end/tls_key_export_test.cc third_party/grpc/src/test/cpp/end2end/xds/xds_end2end_test.cc +third_party/grpc/src/test/cpp/end2end/xds/xds_routing_end2end_test.cc third_party/grpc/src/test/cpp/end2end/xds/xds_server.h third_party/grpc/src/test/cpp/ios/CronetTests/CppCronetEnd2EndTests.mm third_party/grpc/src/test/cpp/qps/parse_json.cc @@ -9806,6 +9848,7 @@ third_party/grpc/src/tools/distrib/python/grpcio_tools/setup.py third_party/grpc/src/tools/distrib/python/xds_protos/setup.py third_party/grpc/src/tools/interop_matrix/run_interop_matrix_tests.py third_party/grpc/src/tools/run_tests/performance/bq_upload_result.py +third_party/grpc/src/tools/run_tests/python_utils/bazel_report_helper.py third_party/grpc/src/tools/run_tests/python_utils/port_server.py third_party/grpc/src/tools/run_tests/python_utils/upload_rbe_results.py third_party/grpc/src/tools/run_tests/python_utils/upload_test_results.py @@ -10071,7 +10114,6 @@ third_party/libdrm/src/tests/radeon/rbo.c third_party/libdrm/src/tests/radeon/rbo.h third_party/libdrm/src/xf86drmMode.c third_party/libdrm/src/xf86drmMode.h -third_party/libgav1/src/src/dsp/arm/distance_weighted_blend_neon.cc third_party/libgav1/src/src/dsp/x86/distance_weighted_blend_sse4.cc third_party/libgav1/src/src/utils/compiler_attributes.h third_party/libgav1/src/src/utils/cpu_test.cc @@ -10502,9 +10544,7 @@ third_party/llvm/pstl/test/std/numerics/numeric.ops/scan.pass.cpp third_party/llvm/third-party/benchmark/setup.py third_party/llvm/third-party/benchmark/src/cycleclock.h third_party/lottie/lottie_worker.js -third_party/mako/doc/_static/doctools.js -third_party/mako/doc/_static/jquery-3.5.1.js -third_party/mako/test/templates/internationalization.html +third_party/mako/mako/test/templates/internationalization.html third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc third_party/maldoca/src/maldoca/base/status.h third_party/maldoca/src/maldoca/base/status_payload_test.cc @@ -10535,8 +10575,6 @@ third_party/mozilla/NSString+Utils.mm third_party/mozilla/NSURL+Utils.h third_party/mozilla/NSWorkspace+Utils.h third_party/nearby/src/connections/clients/ios/Public/NearbyConnections/GNCConnection.h -third_party/nearby/src/connections/implementation/mediums/ble_v2.cc -third_party/nearby/src/connections/implementation/mediums/uuid.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/platform/bluetooth_adapter.h @@ -10548,7 +10586,6 @@ third_party/nearby/src/internal/platform/implementation/bluetooth_classic.h third_party/nearby/src/internal/platform/implementation/g3/bluetooth_adapter.h third_party/nearby/src/internal/platform/implementation/g3/bluetooth_classic.h third_party/nearby/src/internal/platform/implementation/platform.h -third_party/nearby/src/internal/platform/implementation/windows/ble.h third_party/nearby/src/internal/platform/implementation/windows/bluetooth_adapter.cc third_party/nearby/src/internal/platform/implementation/windows/bluetooth_adapter.h third_party/nearby/src/internal/platform/implementation/windows/bluetooth_classic_device.cc @@ -10562,9 +10599,9 @@ third_party/nearby/src/internal/platform/implementation/windows/bluetooth_classi third_party/nearby/src/internal/platform/implementation/windows/generated/winrt/Windows.Foundation.h 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/implementation/windows/thread_pool.cc third_party/nearby/src/internal/platform/nsd_service_info.h third_party/nearby/src/internal/platform/thread_check_nocompile.cc +third_party/nearby/src/internal/platform/uuid.h third_party/node/node_modules/@eslint/eslintrc/node_modules/globals/package.json third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope/lib/definition.js third_party/node/node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope/lib/index.js @@ -10892,7 +10929,6 @@ third_party/openscreen/src/cast/standalone_sender/streaming_video_encoder.h third_party/openscreen/src/cast/standalone_sender/streaming_vpx_encoder.cc third_party/openscreen/src/cast/streaming/capture_configs.h third_party/openscreen/src/cast/streaming/constants.h -third_party/openscreen/src/cast/streaming/receiver_message.h third_party/openscreen/src/cast/streaming/receiver_session.h third_party/openscreen/src/cast/streaming/remoting_capabilities.h third_party/openscreen/src/cast/streaming/rtp_defines.h @@ -11033,14 +11069,13 @@ third_party/perfetto/src/trace_processor/metrics/sql/android/unsymbolized_frames third_party/perfetto/src/trace_processor/metrics/sql/chrome/rail_modes.sql third_party/perfetto/src/trace_processor/types/task_state.cc third_party/perfetto/src/trace_processor/types/task_state.h +third_party/perfetto/src/traceconv/trace_to_hprof.cc third_party/perfetto/src/traced/probes/android_log/android_log_data_source.cc third_party/perfetto/test/cts/AndroidTest.xml third_party/perfetto/tools/get_perfetto_prebuilt.py -third_party/perfetto/tools/trace_to_text/trace_to_hprof.cc 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/tslint.json third_party/polymer/v1_0/PRESUBMIT.py third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior-extracted.js third_party/polymer/v1_0/components-chromium/iron-flex-layout/iron-flex-layout.html @@ -11054,7 +11089,6 @@ third_party/polymer/v1_0/components-chromium/paper-ripple/paper-ripple.html third_party/polymer/v1_0/components-chromium/paper-spinner/paper-spinner-lite.html third_party/polymer/v1_0/components-chromium/paper-tooltip/paper-tooltip.html third_party/polymer/v3_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior.js -third_party/polymer/v3_0/components-chromium/iron-flex-layout/iron-flex-layout.js third_party/polymer/v3_0/components-chromium/iron-overlay-behavior/iron-focusables-helper.js third_party/polymer/v3_0/components-chromium/iron-overlay-behavior/iron-overlay-manager.js third_party/polymer/v3_0/components-chromium/iron-test-helpers/mock-interactions.js @@ -11816,6 +11850,7 @@ third_party/rust/autocxx_gen/v0_22/BUILD.gn third_party/rust/autocxx_macro/v0_22/BUILD.gn third_party/rust/autocxx_parser/v0_22/BUILD.gn third_party/rust/bindgen/v0_59/BUILD.gn +third_party/rust/camino/v1/BUILD.gn third_party/rust/clap/v2/BUILD.gn third_party/rust/cxx/v1/BUILD.gn third_party/rust/cxx_gen/v0_7/BUILD.gn @@ -11924,6 +11959,7 @@ third_party/skia/infra/bots/assets/android_ndk_windows/create.py third_party/skia/infra/bots/assets/clang_linux/create.py third_party/skia/infra/bots/assets/clang_win/create.py third_party/skia/infra/bots/assets/gcloud_linux/create.py +third_party/skia/infra/bots/assets/gsutil/create.py third_party/skia/infra/bots/check_deps.py third_party/skia/infra/bots/git_utils.py third_party/skia/infra/bots/recipe_modules/build/api.py @@ -12064,15 +12100,10 @@ third_party/skia/third_party/freetype2/include/freetype-android/ftoption.h third_party/skia/third_party/freetype2/include/freetype-no-type1/ftoption.h third_party/skia/tools/abandon_gerrit_cls.py third_party/skia/tools/add_codereview_message.py -third_party/skia/tools/android/upload_to_android.py third_party/skia/tools/bloaty_treemap.py -third_party/skia/tools/compare_codereview.py third_party/skia/tools/copyright/main.py third_party/skia/tools/flags/CommandLineFlags.h -third_party/skia/tools/jsondiff.py third_party/skia/tools/perf-canvaskit-puppeteer/canvas_perf.js -third_party/skia/tools/rebaseline/toggle_legacy_flag.py -third_party/skia/tools/retrieve_from_googlesource.py third_party/skia/tools/run-wasm-gm-tests/run-wasm-gm-tests.html third_party/skia/tools/skdiff/skdiff_html.cpp third_party/skia/tools/skp/generate_page_set.py @@ -12219,6 +12250,7 @@ third_party/tflite/src/tensorflow/core/platform/cloud/oauth_client_test.cc third_party/tflite/src/tensorflow/core/platform/cloud/testdata/application_default_credentials.json third_party/tflite/src/tensorflow/core/platform/cloud/testdata/service_account_credentials.json third_party/tflite/src/tensorflow/core/platform/error_payloads.h +third_party/tflite/src/tensorflow/core/platform/file_system.cc third_party/tflite/src/tensorflow/core/platform/status.cc third_party/tflite/src/tensorflow/core/platform/status.h third_party/tflite/src/tensorflow/core/platform/windows/env.cc @@ -12316,6 +12348,7 @@ third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_validation.h third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_validation_error_enums.h third_party/vulkan-deps/vulkan-validation-layers/src/layers/descriptor_sets.cpp third_party/vulkan-deps/vulkan-validation-layers/src/layers/descriptor_sets.h +third_party/vulkan-deps/vulkan-validation-layers/src/layers/descriptor_validation.cpp third_party/vulkan-deps/vulkan-validation-layers/src/layers/device_memory_state.cpp third_party/vulkan-deps/vulkan-validation-layers/src/layers/device_memory_state.h third_party/vulkan-deps/vulkan-validation-layers/src/layers/device_state.h @@ -12797,6 +12830,7 @@ third_party/webrtc/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc third_party/webrtc/modules/video_coding/codecs/vp9/vp9.cc third_party/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc third_party/webrtc/modules/video_coding/packet_buffer.cc +third_party/webrtc/modules/video_coding/timing/timing.cc third_party/webrtc/modules/video_coding/utility/quality_scaler.cc third_party/webrtc/p2p/base/port_unittest.cc third_party/webrtc/p2p/base/stun_server_unittest.cc @@ -13302,7 +13336,6 @@ tools/omahaproxy.py tools/perf/PRESUBMIT.py tools/perf/benchmarks/blink_perf.py tools/perf/benchmarks/desktop_ui.py -tools/perf/benchmarks/dromaeo.py tools/perf/benchmarks/dummy_benchmark.py tools/perf/benchmarks/gp.py tools/perf/benchmarks/jetstream.py @@ -13366,33 +13399,22 @@ tools/perf/core/services/buildbucket_service.py tools/perf/core/services/dashboard_service.py tools/perf/core/services/pinpoint_service.py tools/perf/core/services/request.py -tools/perf/core/shard_maps/timing_data/android-pixel2-perf-pgo_timing.json tools/perf/core/shard_maps/timing_data/android-pixel2-perf_timing.json -tools/perf/core/shard_maps/timing_data/android-pixel2_webview-perf-pgo_timing.json tools/perf/core/shard_maps/timing_data/android-pixel2_webview-perf_timing.json -tools/perf/core/shard_maps/timing_data/android-pixel4-perf-pgo_timing.json tools/perf/core/shard_maps/timing_data/android-pixel4-perf_timing.json tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf_timing.json tools/perf/core/shard_maps/timing_data/lacros-eve-perf_timing.json -tools/perf/core/shard_maps/timing_data/linux-perf-pgo_timing.json tools/perf/core/shard_maps/timing_data/linux-perf_timing.json -tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf-pgo_timing.json tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf_timing.json -tools/perf/core/shard_maps/timing_data/mac-laptop_low_end-perf-pgo_timing.json tools/perf/core/shard_maps/timing_data/mac-laptop_low_end-perf_timing.json -tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf-pgo_timing.json tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json -tools/perf/core/shard_maps/timing_data/win-10-perf-pgo_timing.json tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json -tools/perf/core/shard_maps/timing_data/win-10_amd_laptop-perf-pgo_timing.json tools/perf/core/shard_maps/timing_data/win-10_amd_laptop-perf_timing.json -tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf-pgo_timing.json tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json tools/perf/core/test_data/benchmarks_to_shard.json tools/perf/core/test_data/test_timing_data.json tools/perf/core/test_data/test_timing_data_1_build.json tools/perf/download_proto_trace.py -tools/perf/experimental/representative_perf_test_limit_adjuster/adjust_upper_limits.py tools/perf/generate_legacy_perf_dashboard_json.py tools/perf/generate_perf_sharding.py tools/perf/page_sets/alexa1-10000-urls.json @@ -13405,7 +13427,6 @@ tools/perf/page_sets/data/top_10.json tools/perf/page_sets/data/top_25.json tools/perf/page_sets/data/v8_top_25.json tools/perf/page_sets/desktop_power.py -tools/perf/page_sets/desktop_ui/download_shelf_story.py tools/perf/page_sets/desktop_ui/new_tab_page_story.py tools/perf/page_sets/desktop_ui/omnibox_story.py tools/perf/page_sets/desktop_ui/side_search_story.py @@ -13645,7 +13666,6 @@ ui/base/clipboard/clipboard_util_mac_unittest.mm ui/base/clipboard/clipboard_util_win.cc ui/base/clipboard/clipboard_win.cc ui/base/clipboard/clipboard_win.h -ui/base/cocoa/base_view.mm ui/base/cocoa/constrained_window/constrained_window_animation.mm ui/base/cocoa/tool_tip_base_view.mm ui/base/cocoa/underlay_opengl_hosting_window.mm @@ -13739,6 +13759,7 @@ ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc ui/ozone/platform/x11/test/os_exchange_data_provider_x11_unittest.cc ui/ozone/platform/x11/x11_window.cc ui/resources/PRESUBMIT.py +ui/resources/README.txt ui/resources/resource_check/ico_files.py ui/resources/resource_check/resource_scale_factors.py ui/shell_dialogs/select_file_dialog.h diff --git a/flags.gn b/flags.gn index f2bf29cda..10cd77df2 100644 --- a/flags.gn +++ b/flags.gn @@ -7,7 +7,6 @@ enable_js_type_check=false enable_mdns=false enable_mse_mpeg2ts_stream_parser=true enable_nacl=false -enable_one_click_signin=false enable_reading_list=false enable_remoting=false enable_reporting=false 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 92bcf02a0..2a04867af 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 -@@ -2236,7 +2236,6 @@ static_library("browser") { +@@ -2229,7 +2229,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", -@@ -3792,8 +3791,6 @@ static_library("browser") { +@@ -3649,8 +3648,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.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" -@@ -393,8 +392,6 @@ void BrowserProcessImpl::StartTearDown() +@@ -406,8 +405,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) -@@ -1025,14 +1022,6 @@ StatusTray* BrowserProcessImpl::status_t +@@ -1038,14 +1035,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_); -@@ -1273,26 +1262,6 @@ void BrowserProcessImpl::CreateBackgroun +@@ -1286,26 +1275,6 @@ void BrowserProcessImpl::CreateBackgroun #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" -@@ -617,10 +616,6 @@ void ChromeBrowsingDataRemoverDelegate:: +@@ -625,10 +624,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 -@@ -962,34 +962,6 @@ void SetApplicationLocaleOnIOThread(cons +@@ -968,34 +968,6 @@ void SetApplicationLocaleOnIOThread(cons GetIOThreadApplicationLocale() = locale; } @@ -179,7 +179,7 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) AppLoadedInTabSource ClassifyAppLoadedInTabSource( -@@ -1499,7 +1471,6 @@ void ChromeContentBrowserClient::PostAft +@@ -1511,7 +1483,6 @@ void ChromeContentBrowserClient::PostAft InitNetworkContextsParentDirectory(); DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -187,7 +187,7 @@ } bool ChromeContentBrowserClient::IsBrowserStartupComplete() { -@@ -4351,14 +4322,9 @@ ChromeContentBrowserClient::CreateThrott +@@ -4378,14 +4349,9 @@ ChromeContentBrowserClient::CreateThrott throttles.push_back(std::make_unique( handle, handle->GetWebContents()->GetBrowserContext())); @@ -203,7 +203,7 @@ base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp), base::BindOnce( &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps))); -@@ -4393,16 +4359,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -4420,16 +4386,6 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -279,7 +279,7 @@ void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -89,7 +89,7 @@ class DownloadItemModelData : public bas +@@ -92,7 +92,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. @@ -288,7 +288,7 @@ // Whether the download is currently being revived. bool is_being_revived_; -@@ -126,7 +126,7 @@ DownloadItemModelData::DownloadItemModel +@@ -133,7 +133,7 @@ DownloadItemModelData::DownloadItemModel : should_show_in_shelf_(true), was_ui_notified_(false), should_prefer_opening_in_browser_(false), @@ -296,8 +296,8 @@ + danger_level_(safe_browsing::DownloadFileType::NOT_DANGEROUS), is_being_revived_(false) {} - } // namespace -@@ -410,13 +410,13 @@ void DownloadItemModel::SetShouldPreferO + #if BUILDFLAG(FULL_SAFE_BROWSING) +@@ -443,13 +443,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -314,7 +314,7 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -636,9 +636,6 @@ bool DownloadItemModel::IsCommandEnabled +@@ -669,9 +669,6 @@ bool DownloadItemModel::IsCommandEnabled // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -369,7 +369,7 @@ // If no mime type or explicitly specified a name, don't replace file // extension. if (sniffed_mime_type.empty() || !suggested_filename.empty()) -@@ -1128,30 +1121,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1129,30 +1122,7 @@ DownloadFileType::DangerLevel DownloadTa download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; @@ -505,7 +505,7 @@ class DownloadsShowFunction : public ExtensionFunction { --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc -@@ -54,38 +54,7 @@ SafeBrowsingPrivateGetReferrerChainFunct +@@ -54,39 +54,7 @@ SafeBrowsingPrivateGetReferrerChainFunct base::StringPrintf("Could not find tab with id %d.", params->tab_id))); } @@ -521,7 +521,8 @@ - safe_browsing::ReferrerChain referrer_chain; - SafeBrowsingNavigationObserverManager::AttributionResult result = - navigation_observer_manager->IdentifyReferrerChainByRenderFrameHost( -- contents->GetMainFrame(), kReferrerUserGestureLimit, &referrer_chain); +- contents->GetPrimaryMainFrame(), kReferrerUserGestureLimit, +- &referrer_chain); - - // If the referrer chain is incomplete we'll append the most recent - // navigations to referrer chain for diagnostic purposes. This only happens if @@ -694,7 +695,7 @@ // SimpleURLLoader -> (owned loader, extension id). --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -863,9 +863,6 @@ void ChromeMetricsServiceClient::Registe +@@ -865,9 +865,6 @@ void ChromeMetricsServiceClient::Registe metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -718,7 +719,7 @@ // static --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -330,7 +330,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -335,7 +335,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(IS_CHROMEOS_LACROS) CertDbInitializerFactory::GetInstance(); #endif @@ -736,7 +737,7 @@ #include "chrome/browser/sessions/exit_type_service.h" #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" -@@ -618,17 +617,6 @@ void ProfileImpl::LoadPrefsForNormalStar +@@ -620,17 +619,6 @@ void ProfileImpl::LoadPrefsForNormalStar mojo::PendingRemote pref_validation_delegate; @@ -756,7 +757,7 @@ CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false), --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc -@@ -256,9 +256,6 @@ void RemoveBrowsingDataForProfile(const +@@ -257,9 +257,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. @@ -784,7 +785,7 @@ if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode -@@ -455,6 +457,7 @@ static_library("advanced_protection") { +@@ -458,6 +460,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -792,7 +793,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -472,6 +475,7 @@ source_set("metrics_collector") { +@@ -475,6 +478,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -894,7 +895,7 @@ --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -4241,7 +4241,6 @@ static_library("ui") { +@@ -4270,7 +4270,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", @@ -904,7 +905,7 @@ "views/download/download_item_view.cc", --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -392,22 +392,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -400,22 +400,6 @@ void TabHelpers::AttachTabHelpers(WebCon // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); @@ -947,7 +948,7 @@ } void DownloadsDOMHandler::DiscardDangerous(const std::string& id) { -@@ -320,12 +316,6 @@ void DownloadsDOMHandler::RemoveDownload +@@ -321,12 +317,6 @@ void DownloadsDOMHandler::RemoveDownload IdSet ids; for (auto* download : to_remove) { @@ -960,7 +961,7 @@ DownloadItemModel item_model(download); if (!item_model.ShouldShowInShelf() || download->GetState() == download::DownloadItem::IN_PROGRESS) { -@@ -399,44 +389,6 @@ void DownloadsDOMHandler::FinalizeRemova +@@ -400,44 +390,6 @@ void DownloadsDOMHandler::FinalizeRemova } } @@ -1073,7 +1074,7 @@ - } - } - const content::GlobalRenderFrameHostId primary_main_frame_id = -- web_contents->GetMainFrame()->GetGlobalId(); +- web_contents->GetPrimaryMainFrame()->GetGlobalId(); - safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource; - resource.url = request_url; - resource.is_subresource = request_url != main_frame_url; @@ -1129,7 +1130,7 @@ - } - } - const content::GlobalRenderFrameHostId primary_main_frame_id = -- web_contents->GetMainFrame()->GetGlobalId(); +- web_contents->GetPrimaryMainFrame()->GetGlobalId(); - safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource; - resource.url = request_url; - resource.is_subresource = request_url != main_frame_url; @@ -1196,7 +1197,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" -@@ -424,12 +423,8 @@ void ChromeContentRendererClient::Render +@@ -425,12 +424,8 @@ void ChromeContentRendererClient::Render subresource_filter_ruleset_dealer_ = std::make_unique(); @@ -1207,8 +1208,8 @@ thread->AddObserver(subresource_filter_ruleset_dealer_.get()); - thread->AddObserver(phishing_model_setter_.get()); - thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); - + blink::WebScriptController::RegisterExtension( + extensions_v8::LoadTimesExtension::Get()); --- a/components/security_interstitials/content/cert_report_helper.cc +++ b/components/security_interstitials/content/cert_report_helper.cc @@ -177,7 +177,6 @@ void CertReportHelper::FinishCertCollect diff --git a/patches/core/inox-patchset/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index d922e33a1..f9be5324e 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 -@@ -356,11 +356,6 @@ void ComponentLoader::AddWebStoreApp() { +@@ -360,11 +360,6 @@ void ComponentLoader::AddWebStoreApp() { if (!IsNormalSession()) return; #endif @@ -57,7 +57,7 @@ } // http://crbug.com/165634 -@@ -709,21 +695,6 @@ void WebstoreInstaller::UpdateDownloadPr +@@ -714,21 +700,6 @@ void WebstoreInstaller::UpdateDownloadPr void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!crx_installer_.get()); 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 1f12fa4c5..b2c533c13 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 @@ -180,20 +180,8 @@ by default. ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index, --- a/chrome/browser/resources/default_apps/external_extensions.json +++ b/chrome/browser/resources/default_apps/external_extensions.json -@@ -23,17 +23,17 @@ - }, - // Google Sheets - "aapocclcgogkmnckokdopfmhonfmgoek" : { -- "external_update_url": "https://clients2.google.com/service/update2/crx", -+ "external_update_url": "trk:03:https://clients2.google.com/service/update2/crx", - "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite" - }, - // Google Slides - "felcaaldnbdncclmgdcncolpebgiejap" : { -- "external_update_url": "https://clients2.google.com/service/update2/crx", -+ "external_update_url": "trk:04:https://clients2.google.com/service/update2/crx", - "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite" - }, +@@ -3,7 +3,7 @@ + { // Drive extension "ghbmnnjooekpmoecnnnilnnbdlolhkhi" : { - "external_update_url": "https://clients2.google.com/service/update2/crx" @@ -510,8 +498,8 @@ by default. extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get(); --- a/google_apis/gaia/gaia_constants.cc +++ b/google_apis/gaia/gaia_constants.cc -@@ -25,149 +25,149 @@ const char kSyncService[] = "chromiumsyn - const char kRemotingService[] = "chromoting"; +@@ -17,149 +17,149 @@ const char kUnexpectedServiceResponse[] + const char kGaiaService[] = "gaia"; // OAuth scopes. -const char kOAuth1LoginScope[] = "https://www.google.com/accounts/OAuthLogin"; diff --git a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch index 4a81a5fc8..a5c2a3aac 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -16,7 +16,7 @@ the URL so we get notified if this happens again in the future). --- a/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc +++ b/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc -@@ -36,8 +36,7 @@ ChromeSafeBrowsingBlockingPageFactory::C +@@ -35,8 +35,7 @@ ChromeSafeBrowsingBlockingPageFactory::C Profile::FromBrowserContext(web_contents->GetBrowserContext()); // Create appropriate display options for this blocking page. PrefService* prefs = profile->GetPrefs(); diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index 992de73d4..61ec986a1 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -6,10 +6,10 @@ @@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetI if (base::IsStringASCII(scheme) && (ProfileIOData::IsHandledProtocol(scheme) || - base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) || -+ base::LowerCaseEqualsASCII(scheme, url::kTraceScheme) || - base::LowerCaseEqualsASCII(scheme, url::kJavaScriptScheme) || - base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) { + base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) || ++ base::EqualsCaseInsensitiveASCII(scheme, url::kTraceScheme) || + base::EqualsCaseInsensitiveASCII(scheme, url::kJavaScriptScheme) || + base::EqualsCaseInsensitiveASCII(scheme, url::kDataScheme))) { return metrics::OmniboxInputType::URL; --- a/chrome/browser/history/history_utils.cc +++ b/chrome/browser/history/history_utils.cc @@ -23,7 +23,7 @@ url.SchemeIs(dom_distiller::kDomDistillerScheme)) --- a/chrome/browser/ui/singleton_tabs.cc +++ b/chrome/browser/ui/singleton_tabs.cc -@@ -102,7 +102,8 @@ int GetIndexOfExistingTab(Browser* brows +@@ -97,7 +97,8 @@ int GetIndexOfExistingTab(Browser* brows // RewriteURLIfNecessary removes the "view-source:" scheme which could lead // to incorrect matching, so ensure that the target and the candidate are // either both view-source:, or neither is. @@ -35,13 +35,13 @@ --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc -@@ -560,7 +560,8 @@ void AutocompleteInput::ParseForEmphasiz +@@ -562,7 +562,8 @@ void AutocompleteInput::ParseForEmphasiz // For the view-source and blob schemes, we should emphasize the host of the // URL qualified by the view-source or blob prefix. - if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) || -- base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme)) && -+ base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme) || -+ base::LowerCaseEqualsASCII(scheme_str, url::kTraceScheme)) && + if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) || +- base::EqualsCaseInsensitiveASCII(scheme_str, url::kBlobScheme)) && ++ base::EqualsCaseInsensitiveASCII(scheme_str, url::kBlobScheme) || ++ base::EqualsCaseInsensitiveASCII(scheme_str, url::kTraceScheme)) && (static_cast(text.length()) > after_scheme_and_colon)) { // Obtain the URL prefixed by view-source or blob and parse it. std::u16string real_url(text.substr(after_scheme_and_colon)); @@ -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 -@@ -735,6 +735,7 @@ ChildProcessSecurityPolicyImpl::ChildPro +@@ -743,6 +743,7 @@ ChildProcessSecurityPolicyImpl::ChildPro RegisterWebSafeScheme(url::kWssScheme); #endif // BUILDFLAG(ENABLE_WEBSOCKETS) RegisterWebSafeScheme(url::kDataScheme); @@ -158,7 +158,7 @@ using base::Time; using std::string; -@@ -609,6 +611,12 @@ URLRequest::URLRequest(const GURL& url, +@@ -587,6 +589,12 @@ URLRequest::URLRequest(const GURL& url, // Sanity check out environment. DCHECK(base::ThreadTaskRunnerHandle::IsSet()); @@ -181,7 +181,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_job_factory.h" -@@ -631,6 +632,9 @@ std::unique_ptr URLRe +@@ -630,6 +631,9 @@ std::unique_ptr URLRe } protocol_handlers_.clear(); diff --git a/patches/core/ungoogled-chromium/disable-gaia.patch b/patches/core/ungoogled-chromium/disable-gaia.patch index 54606ca39..fa8431490 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,65 +292,6 @@ void GaiaAuthFetcher::CreateAndStartGaia +@@ -292,64 +292,6 @@ void GaiaAuthFetcher::CreateAndStartGaia network::mojom::CredentialsMode credentials_mode, const net::NetworkTrafficAnnotationTag& traffic_annotation) { DCHECK(!fetch_pending_) << "Tried to fetch two things at once!"; @@ -13,9 +13,8 @@ - original_url_ = gaia_gurl; - - if (credentials_mode != network::mojom::CredentialsMode::kOmit) { -- DCHECK_EQ(GaiaUrls::GetInstance()->gaia_url(), -- gaia_gurl.DeprecatedGetOriginAsURL()) -- << gaia_gurl; +- CHECK(gaia::HasGaiaSchemeHostPort(gaia_gurl)) << gaia_gurl; +- - url::Origin origin = GaiaUrls::GetInstance()->gaia_origin(); - resource_request->site_for_cookies = - net::SiteForCookies::FromOrigin(origin); diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index 5d0687659..b0abbe5c9 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -175,7 +175,7 @@ - if (!allowed_tlds.contains(tld)) - return false; - -- if (base::LowerCaseEqualsASCII(host_minus_tld, domain_in_lower_case)) +- if (base::EqualsCaseInsensitiveASCII(host_minus_tld, domain_in_lower_case)) - return true; - - if (subdomain_permission == ALLOW_SUBDOMAIN) { @@ -185,7 +185,7 @@ - } - - std::string www_domain = base::StrCat({"www.", domain_in_lower_case}); -- return base::LowerCaseEqualsASCII(host_minus_tld, www_domain); +- return base::EqualsCaseInsensitiveASCII(host_minus_tld, www_domain); -} - -// True if |url| is a valid URL with HTTP or HTTPS scheme. If |port_permission| @@ -421,7 +421,7 @@ - "googleweblight.com", - }; - for (size_t i = 0; i < std::size(kHostsToSetHeadersFor); ++i) { -- if (base::LowerCaseEqualsASCII(host, kHostsToSetHeadersFor[i])) +- if (base::EqualsCaseInsensitiveASCII(host, kHostsToSetHeadersFor[i])) - return true; - } - diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index 7a9f5d315..10f940794 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 -@@ -353,7 +353,6 @@ if (!is_android && !is_mac) { +@@ -356,7 +356,6 @@ if (!is_android && !is_mac) { } data_deps += [ @@ -15,7 +15,7 @@ "//third_party/widevine/cdm", ] } -@@ -1180,7 +1179,6 @@ if (is_win) { +@@ -1182,7 +1181,6 @@ if (is_win) { ":optimization_guide_library", ":swiftshader_library", ":widevine_cdm_library", diff --git a/patches/core/ungoogled-chromium/disable-network-time-tracker.patch b/patches/core/ungoogled-chromium/disable-network-time-tracker.patch index c2530a08b..1a47c6578 100644 --- a/patches/core/ungoogled-chromium/disable-network-time-tracker.patch +++ b/patches/core/ungoogled-chromium/disable-network-time-tracker.patch @@ -5,7 +5,7 @@ --- a/components/network_time/network_time_tracker.cc +++ b/components/network_time/network_time_tracker.cc -@@ -273,7 +273,7 @@ void NetworkTimeTracker::UpdateNetworkTi +@@ -291,7 +291,7 @@ void NetworkTimeTracker::UpdateNetworkTi } bool NetworkTimeTracker::AreTimeFetchesEnabled() const { diff --git a/patches/core/ungoogled-chromium/disable-signin.patch b/patches/core/ungoogled-chromium/disable-signin.patch index 9aea9ae16..2ba1d99f2 100644 --- a/patches/core/ungoogled-chromium/disable-signin.patch +++ b/patches/core/ungoogled-chromium/disable-signin.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -525,32 +525,6 @@ GURL GetOSSettingsUrl(const std::string& +@@ -527,32 +527,6 @@ GURL GetOSSettingsUrl(const std::string& void ShowBrowserSignin(Browser* browser, signin_metrics::AccessPoint access_point, signin::ConsentLevel consent_level) { diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index e71e46d20..47d28b0c0 100644 --- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch +++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc +++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc -@@ -561,10 +561,6 @@ std::vector ChromeContentBr +@@ -559,10 +559,6 @@ std::vector ChromeContentBr GetOriginsRequiringDedicatedProcess() { std::vector list; @@ -106,8 +106,8 @@ bool ShouldRetryRequest(const network::SimpleURLLoader* loader) { DCHECK(loader); -@@ -327,10 +318,6 @@ void ExtensionDownloader::DoStartAllPend - } +@@ -335,10 +326,6 @@ void ExtensionDownloader::DoStartAllPend + AddToFetches(fetches_preparing, std::move(task)); pending_tasks_.clear(); - for (auto& fetch_list : fetches_preparing) { @@ -117,7 +117,7 @@ } void ExtensionDownloader::SetIdentityManager( -@@ -351,9 +338,7 @@ void ExtensionDownloader::SetBackoffPoli +@@ -359,9 +346,7 @@ void ExtensionDownloader::SetBackoffPoli void ExtensionDownloader::UpdateURLStats(const GURL& update_url, Manifest::Type extension_type) { @@ -128,7 +128,7 @@ url_stats_.no_url_count++; } else { url_stats_.other_url_count++; -@@ -390,11 +375,6 @@ bool ExtensionDownloader::AddExtensionDa +@@ -398,11 +383,6 @@ bool ExtensionDownloader::AddExtensionDa return false; } @@ -140,7 +140,7 @@ // Skip extensions with empty IDs. if (task.id.empty()) { DLOG(WARNING) << "Found extension with empty ID"; -@@ -405,7 +385,7 @@ bool ExtensionDownloader::AddExtensionDa +@@ -413,7 +393,7 @@ bool ExtensionDownloader::AddExtensionDa UpdateURLStats(task.update_url, task.type); if (task.update_url.is_empty()) { // Fill in default update URL. @@ -149,8 +149,8 @@ } DCHECK(!task.update_url.is_empty()); -@@ -814,20 +794,6 @@ void ExtensionDownloader::HandleManifest - update->info); +@@ -826,20 +806,6 @@ void ExtensionDownloader::HandleManifest + update.second->info); } - // If the manifest response included a element, we want to save @@ -167,10 +167,10 @@ - } - } - - NotifyExtensionsDownloadStageChanged( - no_updates, ExtensionDownloaderDelegate::Stage::FINISHED); - NotifyExtensionsDownloadFailed( -@@ -1385,11 +1351,7 @@ bool ExtensionDownloader::IterateFetchCr + ExtensionIdSet extension_ids_with_errors; + for (const auto& failure : failures) + extension_ids_with_errors.insert(failure.first.id); +@@ -1409,11 +1375,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 f212beb6c..6e3dd4329 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 -@@ -326,12 +326,7 @@ const base::Feature kDmTokenDeletion{"Dm +@@ -328,12 +328,7 @@ const base::Feature kKeepForceInstalledP // Enable DNS over HTTPS (DoH). const base::Feature kDnsOverHttps { "DnsOverHttps", @@ -48,7 +48,7 @@ DohProviderIdForHistogram::kIij, /*ip_strs=*/{}, --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -92,12 +92,7 @@ const base::Feature kSplitAuthCacheByNet +@@ -93,12 +93,7 @@ const base::Feature kSplitAuthCacheByNet // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode. const base::Feature kDnsOverHttpsUpgrade { "DnsOverHttpsUpgrade", diff --git a/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch b/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch deleted file mode 100644 index c3c4de29d..000000000 --- a/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch +++ /dev/null @@ -1,32 +0,0 @@ -# Fix building without one click signin - ---- a/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc -+++ b/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc -@@ -16,9 +16,4 @@ OneClickSigninLinksDelegateImpl::OneClic - OneClickSigninLinksDelegateImpl::~OneClickSigninLinksDelegateImpl() {} - - void OneClickSigninLinksDelegateImpl::OnLearnMoreLinkClicked(bool is_dialog) { -- NavigateParams params(browser_, GURL(chrome::kChromeSyncLearnMoreURL), -- ui::PAGE_TRANSITION_LINK); -- params.disposition = is_dialog ? WindowOpenDisposition::NEW_WINDOW -- : WindowOpenDisposition::NEW_FOREGROUND_TAB; -- Navigate(¶ms); - } ---- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc -+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc -@@ -343,6 +343,7 @@ void InlineSigninHelper::OnClientOAuthSu - void InlineSigninHelper::OnClientOAuthSuccessAndBrowserOpened( - const ClientOAuthResult& result, - Profile* /*profile*/) { -+#if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) - HandlerSigninReason reason = GetHandlerSigninReason(current_url_); - if (reason == HandlerSigninReason::kFetchLstOnly) { - // Constants are only available on Windows for the Google Credential -@@ -419,6 +420,7 @@ void InlineSigninHelper::OnClientOAuthSu - } - - base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); -+#endif - } - - void InlineSigninHelper::UntrustedSigninConfirmed( diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index 35dede8d7..da0a87606 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") { +@@ -627,8 +627,6 @@ static_library("browser") { "internal_auth.h", "interstitials/chrome_settings_page_helper.cc", "interstitials/chrome_settings_page_helper.h", @@ -10,8 +10,8 @@ - "interstitials/enterprise_util.h", "invalidation/profile_invalidation_provider_factory.cc", "invalidation/profile_invalidation_provider_factory.h", - "language/language_model_manager_factory.cc", -@@ -1980,7 +1978,6 @@ static_library("browser") { + "language/accept_languages_service_factory.cc", +@@ -1975,7 +1973,6 @@ static_library("browser") { "//chrome/browser/net:probe_message_proto", "//chrome/browser/new_tab_page/modules/drive:mojo_bindings", "//chrome/browser/new_tab_page/modules/photos:mojo_bindings", @@ -19,7 +19,7 @@ "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings", "//chrome/browser/notifications", "//chrome/browser/notifications/scheduler:factory", -@@ -3812,10 +3809,6 @@ static_library("browser") { +@@ -3669,10 +3666,6 @@ static_library("browser") { "download/offline_item_model_manager_factory.h", "enterprise/connectors/analysis/analysis_service_settings.cc", "enterprise/connectors/analysis/analysis_service_settings.h", @@ -30,7 +30,7 @@ "enterprise/connectors/analysis/content_analysis_dialog.cc", "enterprise/connectors/analysis/content_analysis_dialog.h", "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc", -@@ -4066,10 +4059,6 @@ static_library("browser") { +@@ -3929,10 +3922,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", @@ -41,7 +41,7 @@ "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", -@@ -7463,9 +7452,14 @@ static_library("browser") { +@@ -7524,9 +7513,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", @@ -55,7 +55,7 @@ + "//components/safe_browsing/content/common/proto:download_file_types_proto", + ] - if (!is_fuchsia) { + if (build_with_tflite_lib) { sources += [ --- a/chrome/browser/accuracy_tips/accuracy_service_factory.cc +++ b/chrome/browser/accuracy_tips/accuracy_service_factory.cc @@ -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 -@@ -4359,11 +4359,13 @@ ChromeContentBrowserClient::CreateThrott +@@ -4386,11 +4386,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. -@@ -5760,26 +5762,7 @@ ChromeContentBrowserClient::GetSafeBrows +@@ -5783,26 +5785,7 @@ ChromeContentBrowserClient::GetSafeBrows const std::vector& allowlist_domains) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -115,7 +115,7 @@ } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -5800,11 +5783,6 @@ ChromeContentBrowserClient::GetUrlLookup +@@ -5823,11 +5806,6 @@ ChromeContentBrowserClient::GetUrlLookup GetForProfile(profile); } #endif @@ -275,7 +275,7 @@ void RecordOpenedDangerousConfirmDialog( --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -881,12 +881,14 @@ void DownloadTargetDeterminer::CheckVisi +@@ -882,12 +882,14 @@ void DownloadTargetDeterminer::CheckVisi bool visited_referrer_before) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); @@ -290,7 +290,7 @@ danger_level_ = GetDangerLevel( visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER); if (danger_level_ != DownloadFileType::NOT_DANGEROUS && -@@ -1126,6 +1128,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1127,6 +1129,7 @@ DownloadFileType::DangerLevel DownloadTa absl::optional DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { @@ -298,7 +298,7 @@ safe_browsing::SafeBrowsingMetricsCollector* metrics_collector = safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( GetProfile()); -@@ -1134,6 +1137,9 @@ DownloadTargetDeterminer::GetLastDownloa +@@ -1135,6 +1138,9 @@ DownloadTargetDeterminer::GetLastDownloa safe_browsing::SafeBrowsingMetricsCollector:: EventType::DANGEROUS_DOWNLOAD_BYPASS) : absl::nullopt; @@ -333,7 +333,7 @@ std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel() --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -470,19 +470,6 @@ absl::optional ConnectorsSe +@@ -400,19 +400,6 @@ absl::optional ConnectorsSe return absl::nullopt; } @@ -355,7 +355,7 @@ } --- a/chrome/browser/enterprise/connectors/connectors_service.h +++ b/chrome/browser/enterprise/connectors/connectors_service.h -@@ -83,12 +83,6 @@ class ConnectorsService : public KeyedSe +@@ -74,12 +74,6 @@ class ConnectorsService : public KeyedSe // is no token to use. absl::optional GetDMTokenForRealTimeUrlCheck() const; @@ -400,7 +400,7 @@ LogSignalsCollectionLatency(kLatencyHistogramWithCacheVariant, start_time); --- a/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc +++ b/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc -@@ -63,17 +63,6 @@ ReportingServiceSettings::ReportingServi +@@ -69,17 +69,6 @@ ReportingServiceSettings::ReportingServi else DVLOG(1) << "Enabled event name list contains a non string value!"; } @@ -568,7 +568,7 @@ --- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc +++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -124,7 +124,6 @@ void EnsureBrowserContextKeyedServiceFac +@@ -125,7 +125,6 @@ void EnsureBrowserContextKeyedServiceFac #endif extensions::PreferenceAPI::GetFactoryInstance(); extensions::ProcessesAPI::GetFactoryInstance(); @@ -578,7 +578,7 @@ extensions::SessionStateChangedEventDispatcher::GetFactoryInstance(); --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc -@@ -614,51 +614,22 @@ void ChromeExtensionsBrowserClient::Noti +@@ -621,52 +621,22 @@ void ChromeExtensionsBrowserClient::Noti content::BrowserContext* context, const ExtensionId& extension_id, const std::string& code) const { @@ -622,7 +622,8 @@ - auto* telemetry_service = - safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile( - Profile::FromBrowserContext(context)); -- if (!telemetry_service || !telemetry_service->enabled()) { +- if (!telemetry_service || !telemetry_service->enabled() || +- !IsExtensionTelemetryRemoteHostContactedSignalEnabled()) { - return; - } - auto remote_host_signal = @@ -642,7 +643,7 @@ #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/browser/extensions/shared_module_service.h" -@@ -208,7 +207,6 @@ void ExtensionService::BlocklistExtensio +@@ -192,7 +191,6 @@ void ExtensionService::BlocklistExtensio blocklist_prefs::SetSafeBrowsingExtensionBlocklistState( extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE, extension_prefs_); @@ -650,15 +651,17 @@ } bool ExtensionService::OnExternalExtensionUpdateUrlFound( -@@ -371,7 +369,6 @@ ExtensionService::ExtensionService(Profi +@@ -358,9 +356,6 @@ ExtensionService::ExtensionService(Profi safe_browsing_verdict_handler_(extension_prefs, ExtensionRegistry::Get(profile), this), -- omaha_attributes_handler_(extension_prefs, this), +- omaha_attributes_handler_(extension_prefs, +- ExtensionRegistry::Get(profile), +- this), registry_(ExtensionRegistry::Get(profile)), pending_extension_manager_(profile), install_directory_(install_directory), -@@ -870,100 +867,6 @@ bool ExtensionService::IsExtensionEnable +@@ -860,100 +855,6 @@ bool ExtensionService::IsExtensionEnable return extension_registrar_.IsExtensionEnabled(extension_id); } @@ -810,7 +813,7 @@ // Disables the extension. If the extension is already disabled, just adds // the |disable_reasons| (a bitmask of disable_reason::DisableReason - there // can be multiple DisableReasons e.g. when an extension comes in disabled -@@ -649,8 +619,6 @@ class ExtensionService : public Extensio +@@ -651,8 +621,6 @@ class ExtensionService : public Extensio SafeBrowsingVerdictHandler safe_browsing_verdict_handler_; @@ -866,7 +869,7 @@ } --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -35,8 +35,6 @@ +@@ -36,8 +36,6 @@ #include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h" #include "chrome/browser/installable/installable_utils.h" #include "chrome/browser/profiles/profile.h" @@ -874,8 +877,8 @@ -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/ui/file_system_access_dialogs.h" #include "chrome/common/chrome_paths.h" - #include "components/content_settings/core/browser/host_content_settings_map.h" -@@ -307,83 +305,6 @@ BindResultCallbackToCurrentSequence( + #include "chrome/grit/generated_resources.h" +@@ -312,83 +310,6 @@ BindResultCallbackToCurrentSequence( base::SequencedTaskRunnerHandle::Get(), std::move(callback)); } @@ -959,7 +962,7 @@ std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey : base::StrCat({kCustomLastPickedDirectoryKey, "-", id}); -@@ -1160,28 +1081,6 @@ void ChromeFileSystemAccessPermissionCon +@@ -1165,28 +1086,6 @@ void ChromeFileSystemAccessPermissionCon std::move(callback))); } @@ -990,7 +993,7 @@ const url::Origin& origin, --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h -@@ -86,10 +86,6 @@ class ChromeFileSystemAccessPermissionCo +@@ -87,10 +87,6 @@ class ChromeFileSystemAccessPermissionCo HandleType handle_type, content::GlobalRenderFrameHostId frame_id, base::OnceCallback callback) override; @@ -1053,8 +1056,8 @@ #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" -@@ -117,11 +116,11 @@ - #if BUILDFLAG(FULL_SAFE_BROWSING) +@@ -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 @@ -1066,7 +1069,7 @@ #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/android/tab_android.h" -@@ -875,6 +874,7 @@ autofill::LanguageCode ChromePasswordMan +@@ -882,6 +881,7 @@ autofill::LanguageCode ChromePasswordMan return autofill::LanguageCode(); } @@ -1074,7 +1077,7 @@ safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { return safe_browsing::ChromePasswordProtectionService:: -@@ -910,13 +910,9 @@ void ChromePasswordManagerClient::CheckP +@@ -917,13 +917,9 @@ void ChromePasswordManagerClient::CheckP web_contents(), web_contents()->GetLastCommittedURL(), username, password_type, matching_reused_credentials, password_field_exists); } @@ -1089,7 +1092,7 @@ } #if !BUILDFLAG(IS_ANDROID) -@@ -925,36 +921,10 @@ void ChromePasswordManagerClient::MaybeR +@@ -932,36 +928,10 @@ void ChromePasswordManagerClient::MaybeR bool is_federated, const url::Origin& federated_origin, const std::u16string& login_user_name) const { @@ -1126,7 +1129,7 @@ } #endif -@@ -1458,9 +1428,11 @@ void ChromePasswordManagerClient::OnPast +@@ -1464,7 +1434,9 @@ void ChromePasswordManagerClient::OnPast } was_on_paste_called_ = true; @@ -1134,12 +1137,9 @@ password_reuse_detection_manager_.OnPaste(std::move(text)); +#endif // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED) } --#endif -+#endif // !BUILDFLAG(IS_ANDROID) void ChromePasswordManagerClient::RenderFrameCreated( - content::RenderFrameHost* render_frame_host) { -@@ -1495,7 +1467,9 @@ void ChromePasswordManagerClient::OnInpu +@@ -1500,7 +1472,9 @@ void ChromePasswordManagerClient::OnInpu if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) { OnPaste(); } else { @@ -1149,7 +1149,7 @@ } #endif // BUILDFLAG(IS_ANDROID) } -@@ -1534,6 +1508,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1539,6 +1513,7 @@ bool ChromePasswordManagerClient::IsPass is_enabled = false; } @@ -1157,7 +1157,7 @@ // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Disable password -@@ -1544,6 +1519,7 @@ bool ChromePasswordManagerClient::IsPass +@@ -1549,6 +1524,7 @@ bool ChromePasswordManagerClient::IsPass observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -1319,7 +1319,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" -@@ -1737,8 +1738,6 @@ std::unique_ptrAddHandler( std::make_unique( chrome_schema)); @@ -1328,7 +1328,7 @@ handlers->AddHandler(std::make_unique()); handlers->AddHandler( std::make_unique(key::kURLBlocklist)); -@@ -1795,13 +1794,6 @@ std::unique_ptrSetVisible(mode_ == download::DownloadItemMode::kDeepScanning); if (deep_scanning_label_->GetVisible()) { @@ -1675,7 +1675,7 @@ ? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD : IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD; const std::u16string filename = ElidedFilename(*deep_scanning_label_); -@@ -885,11 +883,15 @@ void DownloadItemView::UpdateButtons() { +@@ -865,11 +863,15 @@ void DownloadItemView::UpdateButtons() { } const bool allow_open_during_deep_scan = @@ -1691,7 +1691,7 @@ open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) || prompt_to_scan || allow_open_during_deep_scan); -@@ -1423,7 +1425,9 @@ void DownloadItemView::ShowContextMenuIm +@@ -1363,7 +1365,9 @@ void DownloadItemView::ShowContextMenuIm } void DownloadItemView::OpenDownloadDuringAsyncScanning() { @@ -1703,7 +1703,7 @@ --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -361,7 +361,6 @@ void DownloadsDOMHandler::OpenDuringScan +@@ -362,7 +362,6 @@ void DownloadsDOMHandler::OpenDuringScan if (download) { DownloadItemModel model(download); model.SetOpenWhenComplete(true); @@ -1770,7 +1770,7 @@ std::move(callback), --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1333,7 +1333,6 @@ if (!is_android) { +@@ -1343,7 +1343,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1778,7 +1778,7 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:test_support", -@@ -5676,7 +5675,6 @@ test("unit_tests") { +@@ -5714,7 +5713,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -1978,7 +1978,7 @@ void DidFileSkipQuarantine(base::File::Error result); --- a/content/public/browser/file_system_access_permission_context.h +++ b/content/public/browser/file_system_access_permission_context.h -@@ -107,12 +107,6 @@ class FileSystemAccessPermissionContext +@@ -110,12 +110,6 @@ class FileSystemAccessPermissionContext base::OnceCallback callback) = 0; enum class AfterWriteCheckResult { kAllow, kBlock }; @@ -2025,6 +2025,6 @@ "//components/profile_metrics", "//components/safe_browsing/content/browser", - "//components/safe_browsing/content/browser:client_side_detection", + "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/content/common:interfaces", "//components/safe_browsing/content/renderer:throttles", - "//components/safe_browsing/content/renderer/phishing_classifier", diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 2ecaba4a0..b44d6beb5 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -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 -@@ -1845,69 +1845,9 @@ +@@ -1860,69 +1860,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. @@ -163,7 +163,7 @@ #include "extensions/browser/extension_system.h" namespace lock_screen_apps { -@@ -90,8 +89,6 @@ void LockScreenProfileCreatorImpl::OnPro +@@ -89,8 +88,6 @@ void LockScreenProfileCreatorImpl::OnPro // SafeBrowsingService when the user has safe browsing disabled (reasoning // similar to http://crbug.com/461493). // TODO(tbarzic): Revisit this if webviews get enabled for lock screen apps. @@ -174,7 +174,7 @@ --- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc +++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc -@@ -37,7 +37,6 @@ +@@ -38,7 +38,6 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "components/crx_file/id_util.h" #include "components/prefs/pref_service.h" @@ -224,7 +224,7 @@ user_manager::KnownUser known_user(g_browser_process->local_state()); --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -237,7 +237,6 @@ +@@ -232,7 +232,6 @@ #include "components/safe_browsing/core/browser/realtime/url_lookup_service.h" #include "components/safe_browsing/core/browser/url_checker_delegate.h" #include "components/safe_browsing/core/common/features.h" @@ -244,7 +244,7 @@ --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc -@@ -101,7 +101,6 @@ +@@ -100,7 +100,6 @@ #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h" #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -254,7 +254,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 -@@ -817,6 +817,7 @@ void DownloadItemModel::ExecuteCommand(D +@@ -840,6 +840,7 @@ void DownloadItemModel::ExecuteCommand(D DownloadUIModel::ExecuteCommand(download_commands, command); break; case DownloadCommands::DEEP_SCAN: @@ -262,7 +262,7 @@ safe_browsing::SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); if (!sb_service) -@@ -842,6 +843,7 @@ void DownloadItemModel::ExecuteCommand(D +@@ -865,6 +866,7 @@ void DownloadItemModel::ExecuteCommand(D safe_browsing::DeepScanningRequest::DeepScanTrigger:: TRIGGER_APP_PROMPT, safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings)); @@ -306,7 +306,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" -@@ -400,8 +399,7 @@ std::string ConnectorsService::GetManage +@@ -330,8 +329,7 @@ std::string ConnectorsService::GetManage absl::optional scope = absl::nullopt; for (const char* scope_pref : @@ -316,7 +316,7 @@ ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED), ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY), ConnectorScopePref(AnalysisConnector::PRINT), -@@ -453,20 +451,6 @@ std::string ConnectorsService::GetManage +@@ -383,20 +381,6 @@ std::string ConnectorsService::GetManage absl::optional ConnectorsService::GetDMTokenForRealTimeUrlCheck() const { @@ -495,7 +495,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" #include "extensions/browser/api/content_settings/content_settings_service.h" -@@ -114,11 +113,6 @@ const PrefMappingEntry kPrefMapping[] = +@@ -118,11 +117,6 @@ const PrefMappingEntry kPrefMapping[] = APIPermissionID::kPrivacy}, {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy, APIPermissionID::kPrivacy}, @@ -507,7 +507,7 @@ {"searchSuggestEnabled", prefs::kSearchSuggestEnabled, APIPermissionID::kPrivacy, APIPermissionID::kPrivacy}, {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, -@@ -1001,18 +995,6 @@ ExtensionFunction::ResponseAction SetPre +@@ -1139,18 +1133,6 @@ ExtensionFunction::ResponseAction SetPre base::Value(browser_pref_value->GetBool())); } @@ -526,7 +526,7 @@ base::Value val = base::Value::FromUniquePtrValue(std::move(browser_pref_value)); -@@ -1108,17 +1090,6 @@ ExtensionFunction::ResponseAction ClearP +@@ -1246,17 +1228,6 @@ ExtensionFunction::ResponseAction ClearP PreferenceAPI::Get(browser_context()) ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); @@ -608,7 +608,7 @@ #include "components/search_engines/default_search_manager.h" #include "components/spellcheck/browser/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" -@@ -301,16 +300,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -300,16 +299,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::PREF_TYPE_BOOLEAN; // Security page @@ -715,7 +715,7 @@ int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) { --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -47,7 +47,6 @@ +@@ -48,7 +48,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -723,7 +723,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/network_service_instance.h" -@@ -807,15 +806,8 @@ void ProfileNetworkContextService::Confi +@@ -829,15 +828,8 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; network_context_params->enable_expect_ct_reporting = true; @@ -926,7 +926,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/driver/sync_policy_handler.h" -@@ -206,9 +203,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -208,9 +205,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kDefaultPopupsSetting, prefs::kManagedDefaultPopupsSetting, base::Value::Type::INTEGER }, @@ -936,7 +936,7 @@ { key::kEditBookmarksEnabled, bookmarks::prefs::kEditBookmarksEnabled, base::Value::Type::BOOLEAN }, -@@ -226,9 +220,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -230,9 +224,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kPrintingEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(ENABLE_PRINTING) @@ -946,7 +946,7 @@ { key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled, base::Value::Type::BOOLEAN }, -@@ -287,9 +278,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -291,9 +282,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdsSettingForIntrusiveAdsSites, prefs::kManagedDefaultAdsSetting, base::Value::Type::INTEGER }, @@ -956,7 +956,7 @@ { key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, base::Value::Type::BOOLEAN }, -@@ -483,15 +471,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -487,15 +475,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kPasswordDismissCompromisedAlertEnabled, password_manager::prefs::kPasswordDismissCompromisedAlertEnabled, base::Value::Type::BOOLEAN }, @@ -972,7 +972,7 @@ { key::kPolicyRefreshRate, policy_prefs::kUserPolicyRefreshRate, base::Value::Type::INTEGER }, -@@ -527,9 +506,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -531,9 +510,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRestoreOnStartupURLs, prefs::kURLsToRestoreOnStartup, base::Value::Type::LIST }, @@ -982,7 +982,7 @@ { key::kSafeSitesFilterBehavior, policy_prefs::kSafeSitesFilterBehavior, base::Value::Type::INTEGER }, -@@ -649,12 +625,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -653,12 +629,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdditionalDnsQueryTypesEnabled, prefs::kAdditionalDnsQueryTypesEnabled, base::Value::Type::BOOLEAN }, @@ -995,7 +995,7 @@ { key::kForceGoogleSafeSearch, prefs::kForceGoogleSafeSearch, base::Value::Type::BOOLEAN }, -@@ -821,9 +791,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -825,9 +795,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kMaxConnectionsPerProxy, prefs::kMaxConnectionsPerProxy, base::Value::Type::INTEGER }, @@ -1005,7 +1005,7 @@ { key::kDefaultWebBluetoothGuardSetting, prefs::kManagedDefaultWebBluetoothGuardSetting, base::Value::Type::INTEGER }, -@@ -1787,12 +1754,6 @@ std::unique_ptrSetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1250,7 +1248,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -2319,14 +2317,13 @@ void ProfileManager::AddProfileToStorage +@@ -2326,14 +2324,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsEphemeral(profile); init_params.is_signed_in_with_credential_provider = @@ -1278,7 +1276,7 @@ #include "content/public/browser/browser_thread.h" --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc -@@ -43,7 +43,6 @@ +@@ -44,7 +44,6 @@ #include #include "chrome/browser/profiles/gaia_info_update_service.h" #include "chrome/browser/profiles/gaia_info_update_service_factory.h" @@ -1481,16 +1479,6 @@ }, { route: routes.SITE_SETTINGS_AR, ---- a/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc -+++ b/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc -@@ -19,7 +19,6 @@ - #include "components/prefs/testing_pref_service.h" - #include "components/safe_browsing/content/browser/triggers/ad_redirect_trigger.h" - #include "components/safe_browsing/core/common/features.h" --#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - #include "content/public/browser/render_frame_host.h" - #include "content/public/browser/web_contents.h" - #include "content/public/test/browser_test.h" --- a/chrome/browser/safe_browsing/advanced_protection_status_manager.cc +++ b/chrome/browser/safe_browsing/advanced_protection_status_manager.cc @@ -13,7 +13,6 @@ @@ -1586,7 +1574,7 @@ #include "net/http/http_status_code.h" --- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc -@@ -43,7 +43,6 @@ +@@ -42,7 +42,6 @@ #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/policy_constants.h" #include "components/prefs/pref_service.h" @@ -1614,7 +1602,7 @@ #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "components/safe_browsing/core/common/utils.h" #include "components/security_interstitials/content/unsafe_resource_util.h" -@@ -1212,14 +1211,6 @@ bool ChromePasswordProtectionService::Ha +@@ -1213,14 +1212,6 @@ bool ChromePasswordProtectionService::Ha } void ChromePasswordProtectionService::OnWarningTriggerChanged() { @@ -1629,7 +1617,7 @@ // Clears captured enterprise password hashes or GSuite sync password hashes. password_manager::PasswordReuseManager* reuse_manager = GetPasswordReuseManager(); -@@ -1378,7 +1369,7 @@ PrefService* ChromePasswordProtectionSer +@@ -1379,7 +1370,7 @@ PrefService* ChromePasswordProtectionSer } bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() { @@ -1638,7 +1626,7 @@ } bool ChromePasswordProtectionService::IsExtendedReporting() { -@@ -1398,44 +1389,7 @@ bool ChromePasswordProtectionService::Is +@@ -1399,44 +1390,7 @@ bool ChromePasswordProtectionService::Is bool ChromePasswordProtectionService::IsPingingEnabled( LoginReputationClientRequest::TriggerType trigger_type, ReusedPasswordAccountType password_type) { @@ -1684,7 +1672,7 @@ } RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason( -@@ -1664,22 +1618,6 @@ MaybeCreateCommitDeferringCondition( +@@ -1665,22 +1619,6 @@ MaybeCreateCommitDeferringCondition( : nullptr; } @@ -1745,16 +1733,6 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/identity_test_utils.h" #include "components/sync/driver/sync_service.h" ---- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc -+++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc -@@ -36,7 +36,6 @@ - #include "components/prefs/pref_service.h" - #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" - #include "components/safe_browsing/core/common/features.h" --#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - - #include "content/public/browser/browser_task_traits.h" - #include "content/public/browser/browser_thread.h" --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc @@ -37,7 +37,6 @@ @@ -1768,8 +1746,8 @@ --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc @@ -24,7 +24,6 @@ - #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/content/common/file_type_policies.h" + #include "components/safe_browsing/core/browser/sync/sync_utils.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/safe_browsing/core/common/utils.h" @@ -1996,7 +1974,7 @@ --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc -@@ -78,7 +78,6 @@ +@@ -77,7 +77,6 @@ #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" #include "components/safe_browsing/core/browser/verdict_cache_manager.h" #include "components/safe_browsing/core/common/features.h" @@ -2069,15 +2047,15 @@ Start(); --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h -@@ -27,7 +27,6 @@ - #include "components/safe_browsing/buildflags.h" - #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h" +@@ -29,7 +29,6 @@ #include "components/safe_browsing/core/browser/db/util.h" + #include "components/safe_browsing/core/browser/ping_manager.h" + #include "components/safe_browsing/core/common/proto/csd.pb.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 "services/network/public/mojom/network_context.mojom-forward.h" -@@ -94,15 +93,6 @@ class SafeBrowsingService : public SafeB +@@ -96,15 +95,6 @@ class SafeBrowsingService : public SafeB // Called on the main thread to let us know that the io_thread is going away. void ShutDown(); @@ -2093,7 +2071,7 @@ // Get current enabled status. Must be called on IO thread. bool enabled() const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); -@@ -267,10 +257,6 @@ class SafeBrowsingService : public SafeB +@@ -271,10 +261,6 @@ class SafeBrowsingService : public SafeB std::unique_ptr proxy_config_monitor_; @@ -2106,7 +2084,7 @@ --- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc +++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc -@@ -28,7 +28,6 @@ +@@ -27,7 +27,6 @@ #include "components/safe_browsing/core/browser/db/database_manager.h" #include "components/safe_browsing/core/browser/ping_manager.h" #include "components/safe_browsing/core/common/features.h" @@ -2114,7 +2092,7 @@ #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item_utils.h" -@@ -141,11 +140,9 @@ bool AndroidTelemetryService::CanSendPin +@@ -140,11 +139,9 @@ bool AndroidTelemetryService::CanSendPin return false; } @@ -2131,7 +2109,7 @@ RecordApkDownloadTelemetryOutcome( --- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc +++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc -@@ -19,7 +19,6 @@ +@@ -18,7 +18,6 @@ #include "components/download/public/common/mock_download_item.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2183,7 +2161,7 @@ -#if BUILDFLAG(ENABLE_DICE_SUPPORT) - if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) { - VLOG(1) << "Desktop Identity Consistency disabled as sign-in to Chrome" + VLOG(1) << "Desktop Identity Consistency disabled as sign-in to Chrome " "is not allowed"; - return AccountConsistencyMethod::kDisabled; - } @@ -2359,7 +2337,7 @@ PrefChangeRegistrar local_state_pref_registrar_; --- a/chrome/browser/signin/primary_account_policy_manager_unittest.cc +++ b/chrome/browser/signin/primary_account_policy_manager_unittest.cc -@@ -13,7 +13,6 @@ +@@ -14,7 +14,6 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" @@ -2594,7 +2572,7 @@ #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" -@@ -215,10 +214,6 @@ BrowserCommandController::BrowserCommand +@@ -247,10 +246,6 @@ BrowserCommandController::BrowserCommand &BrowserCommandController::UpdateCommandsForFullscreenMode, base::Unretained(this))); #endif @@ -2605,7 +2583,7 @@ InitCommandState(); -@@ -1611,7 +1606,7 @@ void BrowserCommandController::UpdateSho +@@ -1648,7 +1643,7 @@ void BrowserCommandController::UpdateSho return; command_updater_.UpdateCommandEnabled( @@ -2644,7 +2622,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif -@@ -529,13 +528,7 @@ void ShowBrowserSignin(Browser* browser, +@@ -531,13 +530,7 @@ void ShowBrowserSignin(Browser* browser, void ShowBrowserSigninOrSettings(Browser* browser, signin_metrics::AccessPoint access_point) { @@ -2715,7 +2693,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/strings/grit/components_strings.h" -@@ -511,7 +510,6 @@ void ProfileMenuView::BuildAutofillButto +@@ -512,7 +511,6 @@ void ProfileMenuView::BuildAutofillButto void ProfileMenuView::BuildSyncInfo() { Profile* profile = browser()->profile(); @@ -2832,15 +2810,15 @@ #include "content/public/browser/render_process_host.h" --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc -@@ -41,7 +41,6 @@ +@@ -40,7 +40,6 @@ + #include "components/history_clusters/core/features.h" #include "components/history_clusters/core/history_clusters_prefs.h" - #include "components/history_clusters/core/history_clusters_service.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/strings/grit/components_strings.h" #include "content/public/browser/web_ui.h" -@@ -124,8 +123,6 @@ content::WebUIDataSource* CreateHistoryU +@@ -119,8 +118,6 @@ content::WebUIDataSource* CreateHistoryU source->AddBoolean("allowDeletingHistory", allow_deleting_history); source->AddBoolean("isGuestSession", profile->IsGuestSession()); @@ -2942,7 +2920,7 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/strings/grit/components_chromium_strings.h" #include "components/strings/grit/components_strings.h" -@@ -1475,44 +1474,6 @@ void AddPrivacyStrings(content::WebUIDat +@@ -1481,44 +1480,6 @@ void AddPrivacyStrings(content::WebUIDat {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, @@ -2987,7 +2965,7 @@ {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL}, {"syncAndGoogleServicesPrivacyDescription", IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT}, -@@ -2833,11 +2794,6 @@ void AddSiteSettingsStrings(content::Web +@@ -2844,11 +2805,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -3059,7 +3037,7 @@ #include "components/strings/grit/components_strings.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" -@@ -119,9 +118,7 @@ void SigninErrorUI::Initialize(Browser* +@@ -121,9 +120,7 @@ void SigninErrorUI::Initialize(Browser* if (is_profile_blocked) { source->AddLocalizedString("profileBlockedMessage", IDS_OLD_PROFILES_DISABLED_MESSAGE); @@ -3423,7 +3401,7 @@ --- a/components/safe_browsing/content/browser/triggers/trigger_throttler.cc +++ b/components/safe_browsing/content/browser/triggers/trigger_throttler.cc -@@ -197,28 +197,6 @@ void TriggerThrottler::LoadTriggerEvents +@@ -158,28 +158,6 @@ void TriggerThrottler::LoadTriggerEvents trigger_events_.clear(); if (!local_state_prefs_) return; @@ -3452,7 +3430,7 @@ } void TriggerThrottler::WriteTriggerEventsToPref() { -@@ -234,9 +212,6 @@ void TriggerThrottler::WriteTriggerEvent +@@ -195,9 +173,6 @@ void TriggerThrottler::WriteTriggerEvent pref_timestamps->Append(base::Value(timestamp.ToDoubleT())); } } @@ -3494,7 +3472,7 @@ #include "components/security_interstitials/content/unsafe_resource_util.h" --- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc +++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc -@@ -33,7 +33,6 @@ +@@ -34,7 +34,6 @@ #include "components/safe_browsing/core/browser/referrer_chain_provider.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -3502,7 +3480,7 @@ #include "content/public/browser/global_routing_id.h" #include "services/network/public/mojom/cookie_manager.mojom.h" #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -1372,17 +1371,7 @@ std::string SerializeHitReport(const Hit +@@ -1385,17 +1384,7 @@ std::string SerializeHitReport(const Hit } hit_report_dict.Set("threat_source", threat_source); std::string extended_reporting_level; @@ -3520,7 +3498,7 @@ hit_report_dict.Set("extended_reporting_level", extended_reporting_level); hit_report_dict.Set("is_enhanced_protection", hit_report.is_enhanced_protection); -@@ -2274,18 +2263,13 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -2292,18 +2281,13 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); DCHECK(!args.empty()); std::string callback_id = args[0].GetString(); @@ -3598,7 +3576,7 @@ list_infos_(GetListInfos()), task_runner_(task_runner_for_tests ? task_runner_for_tests -@@ -1123,8 +1120,7 @@ void V4LocalDatabaseManager::SetupUpdate +@@ -1122,8 +1119,7 @@ void V4LocalDatabaseManager::SetupUpdate weak_factory_.GetWeakPtr()); v4_update_protocol_manager_ = V4UpdateProtocolManager::Create( @@ -3620,7 +3598,7 @@ V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete; V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete; -@@ -109,7 +108,6 @@ class V4LocalDatabaseManager : public Sa +@@ -108,7 +107,6 @@ class V4LocalDatabaseManager : public Sa // Must be initialized by calling StartOnIOThread() before using. V4LocalDatabaseManager( const base::FilePath& base_path, @@ -3628,7 +3606,7 @@ scoped_refptr ui_task_runner, scoped_refptr io_task_runner, scoped_refptr task_runner_for_tests); -@@ -369,10 +367,6 @@ class V4LocalDatabaseManager : public Sa +@@ -368,10 +366,6 @@ class V4LocalDatabaseManager : public Sa // ready to process next update. DatabaseUpdatedCallback db_updated_callback_; @@ -3851,7 +3829,7 @@ // policy. --- a/components/safe_browsing/core/browser/ping_manager.cc +++ b/components/safe_browsing/core/browser/ping_manager.cc -@@ -190,7 +190,7 @@ GURL PingManager::SafeBrowsingHitUrl( +@@ -228,7 +228,7 @@ GURL PingManager::SafeBrowsingHitUrl( hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING || hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE); std::string url = @@ -4717,7 +4695,7 @@ #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 -@@ -31,7 +31,6 @@ +@@ -32,7 +32,6 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/signin/internal/identity_manager/account_capabilities_constants.h" #include "components/signin/internal/identity_manager/account_info_util.h" @@ -4725,17 +4703,19 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_capabilities.h" #include "components/signin/public/identity_manager/tribool.h" -@@ -178,9 +177,6 @@ AccountTrackerService::~AccountTrackerSe +@@ -179,11 +178,6 @@ AccountTrackerService::~AccountTrackerSe // static void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) { - registry->RegisterListPref(prefs::kAccountInfo); +-#if BUILDFLAG(IS_CHROMEOS_ASH) - registry->RegisterIntegerPref(prefs::kAccountIdMigrationState, - AccountTrackerService::MIGRATION_NOT_STARTED); +-#endif } void AccountTrackerService::Initialize(PrefService* pref_service, -@@ -481,14 +477,12 @@ AccountTrackerService::ComputeNewMigrati +@@ -487,14 +481,12 @@ AccountTrackerService::ComputeNewMigrati void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) { DCHECK(state != MIGRATION_DONE || AreAllAccountsMigrated()); @@ -4749,9 +4729,9 @@ - pref_service->GetInteger(prefs::kAccountIdMigrationState)); + return MIGRATION_NOT_STARTED; } + #endif // BUILDFLAG(IS_CHROMEOS_ASH) - base::FilePath AccountTrackerService::GetImagePathFor( -@@ -545,27 +539,6 @@ void AccountTrackerService::OnAccountIma +@@ -552,27 +544,6 @@ void AccountTrackerService::OnAccountIma const CoreAccountId& account_id, const std::string& image_url_with_size, bool success) { @@ -4779,7 +4759,7 @@ } void AccountTrackerService::RemoveAccountImageFromDisk( -@@ -577,181 +550,16 @@ void AccountTrackerService::RemoveAccoun +@@ -584,185 +555,16 @@ void AccountTrackerService::RemoveAccoun } void AccountTrackerService::LoadFromPrefs() { @@ -4881,6 +4861,7 @@ - RemoveAccountImageFromDisk(account_id); - } - +-#if BUILDFLAG(IS_CHROMEOS_ASH) - if (GetMigrationState() != MIGRATION_DONE) { - const AccountIdMigrationState new_state = ComputeNewMigrationState(); - SetMigrationState(new_state); @@ -4889,10 +4870,13 @@ - MigrateToGaiaId(); - } - } -- - DCHECK(GetMigrationState() != MIGRATION_DONE || AreAllAccountsMigrated()); +- - UMA_HISTOGRAM_ENUMERATION("Signin.AccountTracker.GaiaIdMigrationState", - GetMigrationState(), NUM_MIGRATION_STATES); +-#else +- DCHECK(AreAllAccountsMigrated()); +-#endif // BUILDFLAG(IS_CHROMEOS_ASH) - - UMA_HISTOGRAM_COUNTS_100("Signin.AccountTracker.CountOfLoadedAccounts", - accounts_.size()); @@ -4961,20 +4945,9 @@ } CoreAccountId AccountTrackerService::PickAccountIdForAccount( ---- a/components/signin/internal/identity_manager/account_tracker_service.h -+++ b/components/signin/internal/identity_manager/account_tracker_service.h -@@ -235,6 +235,8 @@ class AccountTrackerService { - AccountInfoCallback on_account_updated_callback_; - AccountInfoCallback on_account_removed_callback_; - -+ AccountIdMigrationState migration_state_; -+ - // Task runner used for file operations on avatar images. - scoped_refptr image_storage_task_runner_; - --- a/components/signin/internal/identity_manager/account_tracker_service_unittest.cc +++ b/components/signin/internal/identity_manager/account_tracker_service_unittest.cc -@@ -28,7 +28,6 @@ +@@ -29,7 +29,6 @@ #include "components/signin/internal/identity_manager/fake_account_capabilities_fetcher_factory.h" #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h" #include "components/signin/public/base/avatar_icon_util.h" @@ -4992,7 +4965,7 @@ #include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_urls.h" -@@ -451,9 +450,7 @@ GaiaCookieManagerService::GaiaCookieMana +@@ -453,9 +452,7 @@ GaiaCookieManagerService::GaiaCookieMana listAccountsUnexpectedServerResponseRetried_(false), external_cc_result_fetched_(false), list_accounts_stale_(true) { @@ -5003,7 +4976,7 @@ if (!gaia_cookie_last_list_accounts_data.empty()) { if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data, -@@ -477,8 +474,6 @@ GaiaCookieManagerService::~GaiaCookieMan +@@ -479,8 +476,6 @@ GaiaCookieManagerService::~GaiaCookieMan // static void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) { @@ -5012,7 +4985,7 @@ } void GaiaCookieManagerService::InitCookieListener() { -@@ -896,16 +891,12 @@ void GaiaCookieManagerService::OnListAcc +@@ -898,16 +893,12 @@ void GaiaCookieManagerService::OnListAcc &signed_out_accounts_)) { listed_accounts_.clear(); signed_out_accounts_.clear(); @@ -5049,52 +5022,6 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/webdata/token_web_data.h" #include "components/webdata/common/web_data_service_base.h" -@@ -94,7 +93,7 @@ signin::LoadCredentialsState LoadCredent - bool ShouldMigrateToDice(signin::AccountConsistencyMethod account_consistency, - PrefService* prefs) { - return account_consistency == signin::AccountConsistencyMethod::kDice && -- !prefs->GetBoolean(prefs::kTokenServiceDiceCompatible); -+ true; - } - - } // namespace -@@ -243,7 +242,6 @@ MutableProfileOAuth2TokenServiceDelegate - // static - void MutableProfileOAuth2TokenServiceDelegate::RegisterProfilePrefs( - PrefRegistrySimple* registry) { -- registry->RegisterBooleanPref(prefs::kTokenServiceDiceCompatible, false); - } - - std::unique_ptr -@@ -602,9 +600,6 @@ void MutableProfileOAuth2TokenServiceDel - UpdateCredentials(loading_primary_account_id_, old_login_token); - } - } -- -- if (migrate_to_dice) -- client_->GetPrefs()->SetBoolean(prefs::kTokenServiceDiceCompatible, true); - } - - void MutableProfileOAuth2TokenServiceDelegate::UpdateCredentials( -@@ -795,8 +790,6 @@ void MutableProfileOAuth2TokenServiceDel - } - - void MutableProfileOAuth2TokenServiceDelegate::FinishLoadingCredentials() { -- if (account_consistency_ == signin::AccountConsistencyMethod::kDice) -- DCHECK(client_->GetPrefs()->GetBoolean(prefs::kTokenServiceDiceCompatible)); - FireRefreshTokensLoaded(); - } - -@@ -827,8 +820,7 @@ void MutableProfileOAuth2TokenServiceDel - LOAD_CREDENTIALS_FINISHED_WITH_DB_CANNOT_BE_OPENED); - - if (account_consistency_ == signin::AccountConsistencyMethod::kDice && -- !client_->GetPrefs()->GetBoolean(prefs::kTokenServiceDiceCompatible)) { -+ true) { - RevokeAllCredentials(); -- client_->GetPrefs()->SetBoolean(prefs::kTokenServiceDiceCompatible, true); - } - } --- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc +++ b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc @@ -25,7 +25,6 @@ @@ -5163,9 +5090,9 @@ - } + std::string pref_account_id; + #if BUILDFLAG(IS_CHROMEOS_ASH) if (!pref_account_id.empty()) { - if (account_tracker_service_->GetMigrationState() == -@@ -95,14 +64,11 @@ void PrimaryAccountManager::Initialize(P +@@ -96,15 +65,13 @@ void PrimaryAccountManager::Initialize(P // |account_info.gaia| could be empty if |account_id| is already gaia id. if (!account_info.gaia.empty()) { pref_account_id = account_info.gaia; @@ -5174,14 +5101,15 @@ } } } + #endif -- bool consented = + bool consented = - client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync); -+ bool consented = false; ++ false; CoreAccountId account_id = CoreAccountId::FromString(pref_account_id); CoreAccountInfo account_info = account_tracker_service_->GetAccountInfo(account_id); -@@ -176,8 +142,7 @@ void PrimaryAccountManager::SetSyncPrima +@@ -179,8 +146,7 @@ void PrimaryAccountManager::SetSyncPrima #if DCHECK_IS_ON() { @@ -5191,7 +5119,7 @@ bool consented_to_sync = client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync); -@@ -193,10 +158,6 @@ void PrimaryAccountManager::SetSyncPrima +@@ -196,10 +162,6 @@ void PrimaryAccountManager::SetSyncPrima // Go ahead and update the last signed in account info here as well. Once a // user is signed in the corresponding preferences should match. Doing it here // as opposed to on signin allows us to catch the upgrade scenario. @@ -5202,7 +5130,7 @@ // Commit primary sync account info immediately so that it does not get lost // if Chrome crashes before the next commit interval. -@@ -210,20 +171,11 @@ void PrimaryAccountManager::SetPrimaryAc +@@ -213,20 +175,11 @@ void PrimaryAccountManager::SetPrimaryAc PrefService* prefs = client_->GetPrefs(); const std::string& account_id = primary_account_info_.account_id.ToString(); @@ -5432,7 +5360,7 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -93076,7 +93076,6 @@ Full version information for the fingerp +@@ -93848,7 +93848,6 @@ Full version information for the fingerp @@ -5440,7 +5368,7 @@ -@@ -93091,10 +93090,7 @@ Full version information for the fingerp +@@ -93863,10 +93862,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 252b5cb72..529ae4ef9 100644 --- a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch +++ b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch @@ -1,7 +1,7 @@ # Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -140,6 +140,7 @@ +@@ -141,6 +141,7 @@ #include "components/spellcheck/common/spellcheck_common.h" #include "components/spellcheck/spellcheck_buildflags.h" #include "components/strings/grit/components_strings.h" @@ -9,7 +9,7 @@ #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" -@@ -1726,6 +1727,8 @@ void RenderViewContextMenu::AppendPageIt +@@ -1750,6 +1751,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 = -@@ -1747,6 +1750,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -1771,6 +1774,7 @@ void RenderViewContextMenu::AppendPageIt IDC_CONTENT_CONTEXT_TRANSLATE, l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language)); } @@ -56,7 +56,7 @@ request_pending_ = true; --- a/components/translate/core/browser/translate_manager.cc +++ b/components/translate/core/browser/translate_manager.cc -@@ -880,8 +880,9 @@ void TranslateManager::FilterIsTranslate +@@ -879,8 +879,9 @@ void TranslateManager::FilterIsTranslate ->LogAutofillAssistantDeferredTriggerDecision(); } 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 89404f2f1..f653e2ccf 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 -@@ -2412,6 +2412,7 @@ static_library("browser") { +@@ -2406,6 +2406,7 @@ static_library("browser") { "//third_party/libyuv", "//third_party/metrics_proto", "//third_party/re2", @@ -19,7 +19,7 @@ "//third_party/widevine/cdm:headers", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -146,6 +146,7 @@ +@@ -147,6 +147,7 @@ #include "components/translate/core/browser/translate_ranker_impl.h" #include "components/translate/core/common/translate_util.h" #include "components/ui_devtools/switches.h" @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -234,6 +234,7 @@ source_set("browser") { +@@ -232,6 +232,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" -@@ -3242,6 +3243,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3240,6 +3241,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLDraftExtensions, switches::kEnableWebGLImageChromium, switches::kFileUrlPathAlias, @@ -73,7 +73,7 @@ switches::kForceGpuMemAvailableMb, --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn -@@ -102,6 +102,7 @@ target(link_target_type, "child") { +@@ -101,6 +101,7 @@ target(link_target_type, "child") { "//third_party/blink/public/common", "//third_party/blink/public/strings", "//third_party/ced", @@ -91,10 +91,10 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -472,6 +473,10 @@ void SetRuntimeFeaturesFromCommandLine(c - {wrf::ForceOverlayFullscreenVideo, switches::kForceOverlayFullscreenVideo, +@@ -477,6 +478,10 @@ void SetRuntimeFeaturesFromCommandLine(c true}, - {wrf::EnableDirectSockets, switches::kIsolatedAppOrigins, false}, + {wrf::EnableWebGPU, switches::kEnableUnsafeWebGPU, true}, + {wrf::EnableDirectSockets, switches::kIsolatedAppOrigins, true}, + {wrf::EnableFingerprintingClientRectsNoise, + switches::kFingerprintingClientRectsNoise, true}, + {wrf::EnableFingerprintingCanvasMeasureTextNoise, @@ -123,7 +123,7 @@ #include "base/time/time.h" #include "cc/animation/animation_timeline.h" #include "cc/input/overscroll_behavior.h" -@@ -888,6 +889,14 @@ Range* Document::CreateRangeAdjustedToTr +@@ -902,6 +903,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(); -@@ -2197,6 +2206,15 @@ void Document::UpdateStyleAndLayoutTreeF +@@ -2223,6 +2232,15 @@ void Document::UpdateStyleAndLayoutTreeF #if DCHECK_IS_ON() AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */); #endif @@ -156,7 +156,7 @@ void Document::InvalidateStyleAndLayoutForFontUpdates() { --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -498,6 +498,10 @@ class CORE_EXPORT Document : public Cont +@@ -501,6 +501,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -167,7 +167,7 @@ AtomicString visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -2237,6 +2241,9 @@ class CORE_EXPORT Document : public Cont +@@ -2254,6 +2258,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -179,7 +179,7 @@ HeapVector> current_script_stack_; --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2118,6 +2118,11 @@ DOMRectList* Element::getClientRects() { +@@ -2128,6 +2128,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads, *element_layout_object); @@ -191,7 +191,7 @@ return MakeGarbageCollected(quads); } -@@ -2135,6 +2140,9 @@ gfx::RectF Element::GetBoundingClientRec +@@ -2145,6 +2150,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 -@@ -1637,6 +1637,7 @@ component("platform") { +@@ -1638,6 +1638,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 -@@ -659,4 +659,12 @@ void WebRuntimeFeatures::EnableWebAuthen - enable); +@@ -659,4 +659,12 @@ void WebRuntimeFeatures::EnableSpeculati + RuntimeEnabledFeatures::SetSpeculationRulesPrefetchProxyEnabled(enable); } +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) { @@ -310,8 +310,8 @@ } // namespace blink --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1099,6 +1099,12 @@ - status: "experimental", +@@ -1111,6 +1111,12 @@ + origin_trial_feature_name: "Focusgroup", }, { + name: "FingerprintingClientRectsNoise", 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 d0fa16dd5..440f20153 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 -@@ -3245,6 +3245,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3243,6 +3243,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 -@@ -477,6 +477,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -482,6 +482,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -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 -@@ -1595,7 +1595,9 @@ component("platform") { +@@ -1596,7 +1596,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -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 -@@ -1105,6 +1105,9 @@ +@@ -1117,6 +1117,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 e4706c2d4..21fe5e0a0 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 -@@ -2159,6 +2159,7 @@ static_library("browser") { +@@ -2151,6 +2151,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -78,7 +78,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" -@@ -343,6 +347,18 @@ void BrowserProcessImpl::Init() { +@@ -349,6 +353,18 @@ void BrowserProcessImpl::Init() { pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled, base::BindRepeating(&ApplyMetricsReportingPolicy)); @@ -99,7 +99,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1632,6 +1632,10 @@ const char kUnthrottledNestedTimeoutDesc +@@ -1667,6 +1667,10 @@ const char kUnthrottledNestedTimeoutDesc "websites abusing the API will still eventually have their setTimeouts " "clamped."; @@ -112,7 +112,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 -@@ -917,6 +917,9 @@ extern const char kLogJsConsoleMessagesD +@@ -938,6 +938,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 859021f73..d26cb1281 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 -@@ -1414,7 +1414,7 @@ void ProfileManager::InitProfileUserPref +@@ -1430,7 +1430,7 @@ void ProfileManager::InitProfileUserPref profile->GetPrefs()->SetString(prefs::kSupervisedUserId, supervised_user_id); } diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 672e8b778..ed503e439 100644 --- a/patches/extra/inox-patchset/0006-modify-default-prefs.patch +++ b/patches/extra/inox-patchset/0006-modify-default-prefs.patch @@ -1,7 +1,7 @@ --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc -@@ -376,7 +376,7 @@ void BackgroundModeManager::RegisterPref +@@ -377,7 +377,7 @@ void BackgroundModeManager::RegisterPref registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false); registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); #endif @@ -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 -@@ -1295,7 +1295,7 @@ void ChromeContentBrowserClient::Registe +@@ -1301,7 +1301,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 -@@ -339,7 +339,7 @@ void ProfileNetworkContextService::Updat +@@ -345,7 +345,7 @@ void ProfileNetworkContextService::Updat void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -34,7 +34,7 @@ registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled, --- a/chrome/browser/prefetch/prefetch_prefs.h +++ b/chrome/browser/prefetch/prefetch_prefs.h -@@ -22,7 +22,7 @@ enum class NetworkPredictionOptions { +@@ -25,7 +25,7 @@ enum class NetworkPredictionOptions { kWifiOnlyDeprecated = 1, kDisabled = 2, kExtended = 3, @@ -94,7 +94,7 @@ registry->RegisterDictionaryPref(prefs::kAppWindowPlacement); --- a/components/autofill/core/common/autofill_prefs.cc +++ b/components/autofill/core/common/autofill_prefs.cc -@@ -131,10 +131,10 @@ const char kAutocompleteLastVersionReten +@@ -120,10 +120,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,15 +107,15 @@ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterIntegerPref( prefs::kAutofillLastVersionDeduped, 0, -@@ -147,7 +147,7 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -133,7 +133,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); - registry->RegisterStringPref( - prefs::kAutofillProfileValidity, "", + + // Non-synced prefs. Used for per-device choices, e.g., signin promo. --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc @@ -436,7 +436,7 @@ bool DoesBookmarkContainWords(const std: diff --git a/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch b/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch index 7bbf3a07c..e578663d0 100644 --- a/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch +++ b/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/startup/startup_tab_provider.cc +++ b/chrome/browser/ui/startup/startup_tab_provider.cc -@@ -144,7 +144,7 @@ bool IsChromeControlledNtpUrl(const GURL +@@ -151,7 +151,7 @@ bool IsChromeControlledNtpUrl(const GURL StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const { // Chrome OS has its own welcome flow provided by OOBE. diff --git a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch index f044780e2..7ddafadf1 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 -@@ -1633,8 +1633,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1638,8 +1638,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/updater-disable-auto-update.patch b/patches/extra/iridium-browser/updater-disable-auto-update.patch index 570f05298..eee213795 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 -@@ -868,7 +868,7 @@ static base::mac::ScopedObjCClassSwizzle +@@ -846,7 +846,7 @@ class AppControllerProfileObserver : pub 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 ce416bd21..423fd135e 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -9,7 +9,7 @@ #include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/browser/ui/web_applications/web_app_launch_utils.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" -@@ -474,6 +476,7 @@ Browser::Browser(const CreateParams& par +@@ -476,6 +478,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), -@@ -836,7 +839,7 @@ Browser::WarnBeforeClosingResult Browser +@@ -842,7 +845,7 @@ Browser::WarnBeforeClosingResult Browser // If the browser can close right away (there are no pending downloads we need // to prompt about) then there's no need to warn. In the future, we might need // to check other conditions as well. @@ -26,7 +26,7 @@ return WarnBeforeClosingResult::kOkToClose; DCHECK(!warn_before_closing_callback_) -@@ -866,6 +869,7 @@ bool Browser::TryToCloseWindow( +@@ -872,6 +875,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = NOT_PROMPTED; @@ -34,7 +34,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -2732,6 +2736,62 @@ bool Browser::CanCloseWithInProgressDown +@@ -2742,6 +2746,62 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -97,7 +97,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -2750,6 +2810,22 @@ void Browser::InProgressDownloadResponse +@@ -2760,6 +2820,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -130,7 +130,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" -@@ -1030,12 +1031,17 @@ class Browser : public TabStripModelObse +@@ -1041,12 +1042,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -148,7 +148,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(). -@@ -1202,6 +1208,8 @@ class Browser : public TabStripModelObse +@@ -1213,6 +1219,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 0449b9bd0..bf079cf7c 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 -@@ -779,10 +779,14 @@ bool HandleNewTabPageLocationOverride( +@@ -785,10 +785,14 @@ bool HandleNewTabPageLocationOverride( // Don't change the URL when incognito mode. if (profile->IsOffTheRecord()) @@ -28,7 +28,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/flags_ui/flags_state.cc +++ b/components/flags_ui/flags_state.cc -@@ -208,6 +208,7 @@ std::string GetCombinedOriginListValue(c +@@ -218,6 +218,7 @@ std::string GetCombinedOriginListValue(c command_line.GetSwitchValueASCII(command_line_switch); const std::string new_value = flags_storage.GetOriginListFlag(internal_entry_name); @@ -36,7 +36,7 @@ return CombineAndSanitizeOriginLists(existing_value, new_value); } -@@ -396,6 +397,7 @@ void FlagsState::SetOriginListFlag(const +@@ -414,6 +415,7 @@ void FlagsState::SetOriginListFlag(const const std::string& value, FlagsStorage* flags_storage) { const std::string new_value = diff --git a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch index 5a279853d..69e477583 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -46,6 +46,7 @@ class FrameGrabHandle : public views::Vi +@@ -47,6 +47,7 @@ class FrameGrabHandle : public views::Vi // Reserve some space for the frame to be grabbed by, even if the tabstrip // is full. // TODO(tbergquist): Define this relative to the NTB insets again. diff --git a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch index 30d87a09c..f7f73c7e2 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.h" -@@ -292,6 +294,15 @@ AutocompleteController::AutocompleteCont +@@ -295,6 +297,15 @@ AutocompleteController::AutocompleteCont search_service_worker_signal_sent_(false), template_url_service_(provider_client_->GetTemplateURLService()) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); @@ -55,12 +55,12 @@ + if (!base::Contains(flag_value, "chrome")) + provider_types &= ~AutocompleteProvider::TYPE_BUILTIN; + } - if (provider_types & AutocompleteProvider::TYPE_BOOKMARK) - providers_.push_back(new BookmarkProvider(provider_client_.get())); - if (provider_types & AutocompleteProvider::TYPE_BUILTIN) + if (provider_types & AutocompleteProvider::TYPE_BOOKMARK) { + bookmark_provider_ = new BookmarkProvider(provider_client_.get()); + providers_.push_back(bookmark_provider_.get()); --- a/components/omnibox/browser/history_url_provider.cc +++ b/components/omnibox/browser/history_url_provider.cc -@@ -472,6 +472,9 @@ void HistoryURLProvider::Start(const Aut +@@ -480,6 +480,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" -@@ -658,6 +659,9 @@ void SearchProvider::Run(bool query_is_p +@@ -652,6 +653,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 710902520..f90fad99f 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch @@ -27,16 +27,16 @@ return true; --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -306,7 +306,8 @@ void LocationBarView::Init() { - params.types_enabled.push_back(PageActionIconType::kSideSearch); +@@ -309,7 +309,8 @@ void LocationBarView::Init() { + } params.types_enabled.push_back(PageActionIconType::kSendTabToSelf); params.types_enabled.push_back(PageActionIconType::kClickToCall); - params.types_enabled.push_back(PageActionIconType::kQRCodeGenerator); + if (!base::FeatureList::IsEnabled(kDisableQRGenerator)) + params.types_enabled.push_back(PageActionIconType::kQRCodeGenerator); - if (base::FeatureList::IsEnabled(kSharedClipboardUI)) - params.types_enabled.push_back(PageActionIconType::kSharedClipboard); if (base::FeatureList::IsEnabled(kWebOTPCrossDevice)) + params.types_enabled.push_back(PageActionIconType::kSmsRemoteFetcher); + if (!base::FeatureList::IsEnabled( --- 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 932626d3e..39a0324f5 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch @@ -13,19 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc -@@ -187,9 +187,10 @@ ChromeRenderFrameObserver::ChromeRenderF - if (!render_frame->IsMainFrame()) - return; - --#if BUILDFLAG(SAFE_BROWSING_AVAILABLE) - const base::CommandLine& command_line = - *base::CommandLine::ForCurrentProcess(); -+ should_autocollect_ = !command_line.HasSwitch("disable-search-engine-collection"); -+#if BUILDFLAG(SAFE_BROWSING_AVAILABLE) - if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection)) - SetClientSidePhishingDetection(); - #endif -@@ -248,14 +249,16 @@ void ChromeRenderFrameObserver::DidFinis +@@ -246,14 +246,16 @@ void ChromeRenderFrameObserver::DidFinis if (frame->Parent()) return; @@ -37,7 +25,7 @@ - &osdd_handler); - osdd_handler->PageHasOpenSearchDescriptionDocument( - frame->GetDocument().Url(), osdd_url); -+ if (should_autocollect_) { ++ if (!base::CommandLine::ForCurrentProcess()->HasSwitch("disable-search-engine-collection")) { + GURL osdd_url = frame->GetDocument().OpenSearchDescriptionURL(); + if (!osdd_url.is_empty()) { + mojo::AssociatedRemote @@ -50,16 +38,6 @@ } } ---- a/chrome/renderer/chrome_render_frame_observer.h -+++ b/chrome/renderer/chrome_render_frame_observer.h -@@ -140,6 +140,7 @@ class ChromeRenderFrameObserver : public - #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) - safe_browsing::PhishingClassifierDelegate* phishing_classifier_ = nullptr; - #endif -+ bool should_autocollect_; // Whether to autocollect search engines - - // Owned by ChromeContentRendererClient and outlive us. - web_cache::WebCacheImpl* web_cache_impl_; --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc @@ -12,6 +12,7 @@ @@ -70,7 +48,7 @@ #include "base/containers/contains.h" #include "base/debug/crash_logging.h" #include "base/format_macros.h" -@@ -200,6 +201,12 @@ bool IsCreatedByExtension(const Template +@@ -201,6 +202,12 @@ bool IsCreatedByExtension(const Template template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION; } @@ -83,7 +61,7 @@ } // namespace // TemplateURLService::LessWithPrefix ----------------------------------------- -@@ -285,6 +292,7 @@ TemplateURLService::TemplateURLService( +@@ -286,6 +293,7 @@ TemplateURLService::TemplateURLService( std::unique_ptr client, const base::RepeatingClosure& dsp_change_callback) : prefs_(prefs), @@ -91,7 +69,7 @@ search_terms_data_(std::move(search_terms_data)), web_data_service_(web_data_service), client_(std::move(client)), -@@ -366,8 +374,8 @@ bool TemplateURLService::CanAddAutogener +@@ -367,8 +375,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. @@ -102,7 +80,7 @@ } bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy( -@@ -1533,6 +1541,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -1565,6 +1573,8 @@ SyncDataMap TemplateURLService::CreateGU void TemplateURLService::Init(const Initializer* initializers, int num_initializers) { @@ -111,7 +89,7 @@ if (client_) client_->SetOwner(this); -@@ -1671,6 +1681,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -1703,6 +1713,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -123,7 +101,7 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -723,6 +723,8 @@ class TemplateURLService : public WebDat +@@ -733,6 +733,8 @@ class TemplateURLService : public WebDat // ---------- Browser state related members --------------------------------- raw_ptr prefs_ = nullptr; 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 16acf1bdf..db3d98101 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -1207,7 +1207,8 @@ void BrowserCommandController::InitComma +@@ -1242,7 +1242,8 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, normal_window); @@ -20,7 +20,7 @@ #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/themes/theme_properties.h" -@@ -139,7 +140,8 @@ TabStripRegionView::TabStripRegionView(s +@@ -140,7 +141,8 @@ TabStripRegionView::TabStripRegionView(s return; } diff --git a/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch b/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch index ede83e714..9068f6d6f 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/flags_ui/flags_state.cc +++ b/components/flags_ui/flags_state.cc -@@ -209,6 +209,7 @@ std::string GetCombinedOriginListValue(c +@@ -219,6 +219,7 @@ std::string GetCombinedOriginListValue(c const std::string new_value = flags_storage.GetOriginListFlag(internal_entry_name); if (command_line_switch == "custom-ntp") return existing_value.empty() ? new_value : existing_value; @@ -19,7 +19,7 @@ return CombineAndSanitizeOriginLists(existing_value, new_value); } -@@ -398,6 +399,7 @@ void FlagsState::SetOriginListFlag(const +@@ -416,6 +417,7 @@ void FlagsState::SetOriginListFlag(const FlagsStorage* flags_storage) { const std::string new_value = internal_name == "custom-ntp" ? value : diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index 564bcd175..779a652b0 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 -@@ -1074,10 +1074,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1075,10 +1075,12 @@ DownloadConfirmationReason DownloadTarge return DownloadConfirmationReason::SAVE_AS; #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch index c2678afc8..c6c270420 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch @@ -21,7 +21,7 @@ #include "base/i18n/rtl.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" -@@ -195,7 +196,8 @@ void AppModalDialogManager::RunBeforeUnl +@@ -196,7 +197,8 @@ void AppModalDialogManager::RunBeforeUnl ChromeJavaScriptDialogExtraData* extra_data = &javascript_dialog_extra_data_[web_contents]; 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 a07ec4036..280cbe408 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" -@@ -979,7 +980,8 @@ void HistoryBackend::InitImpl( +@@ -1008,7 +1009,8 @@ void HistoryBackend::InitImpl( db_->GetStartDate(&first_recorded_time_); // Start expiring old stuff. diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch index aa8b42c9d..49d41376e 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/net/socket/ssl_client_socket_impl.cc +++ b/net/socket/ssl_client_socket_impl.cc -@@ -312,7 +312,8 @@ class SSLClientSocketImpl::SSLContext { +@@ -310,7 +310,8 @@ class SSLClientSocketImpl::SSLContext { SSL_CTX_sess_set_new_cb(ssl_ctx_.get(), NewSessionCallback); SSL_CTX_set_timeout(ssl_ctx_.get(), 1 * 60 * 60 /* one hour */); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch index 4b4a6cdfa..3a48ed58a 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 -@@ -900,6 +900,7 @@ BrowserView::BrowserView(std::unique_ptr +@@ -898,6 +898,7 @@ BrowserView::BrowserView(std::unique_ptr contents_container_ = AddChildView(std::move(contents_container)); set_contents_view(contents_container_); diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index 6162af1cd..6d7077f76 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -13,9 +13,9 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -303,5 +303,7 @@ const base::Feature kStaticKeyPinningEnf - base::FEATURE_ENABLED_BY_DEFAULT); - #endif +@@ -318,5 +318,7 @@ const base::FeatureParam + &kOptimizeNetworkBuffers, "filter_source_stream_buffer_size", + 32 * 1024}; +const base::Feature kSetIpv6ProbeFalse{"SetIpv6ProbeFalse", base::FEATURE_DISABLED_BY_DEFAULT}; + @@ -23,9 +23,9 @@ } // namespace net --- a/net/base/features.h +++ b/net/base/features.h -@@ -433,6 +433,8 @@ NET_EXPORT extern const base::Feature kC - // Controls whether static key pinning is enforced. - NET_EXPORT extern const base::Feature kStaticKeyPinningEnforcement; +@@ -443,6 +443,8 @@ NET_EXPORT extern const base::FeaturePar + NET_EXPORT extern const base::FeatureParam + kOptimizeNetworkBuffersFilterSourceStreamBufferSize; +NET_EXPORT extern const base::Feature kSetIpv6ProbeFalse; + @@ -46,7 +46,7 @@ enum DnsResolveStatus { RESOLVE_STATUS_DNS_SUCCESS = 0, RESOLVE_STATUS_PROC_SUCCESS, -@@ -4103,7 +4098,7 @@ bool HostResolverManager::IsIPv6Reachabl +@@ -4093,7 +4088,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 0139fd778..4e6b726cf 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -19,7 +19,7 @@ --- a/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts +++ b/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts -@@ -28,6 +28,7 @@ export interface SettingsSearchEngineEdi +@@ -35,6 +35,7 @@ export interface SettingsSearchEngineEdi dialog: CrDialogElement, keyword: CrInputElement, queryUrl: CrInputElement, @@ -27,7 +27,7 @@ searchEngine: CrInputElement, }; } -@@ -56,6 +57,7 @@ export class SettingsSearchEngineEditDia +@@ -63,6 +64,7 @@ export class SettingsSearchEngineEditDia searchEngine_: String, keyword_: String, queryUrl_: String, @@ -35,7 +35,7 @@ dialogTitle_: String, keywordFieldLabel_: String, actionButtonText_: String, -@@ -72,6 +74,7 @@ export class SettingsSearchEngineEditDia +@@ -79,6 +81,7 @@ export class SettingsSearchEngineEditDia private searchEngine_: string; private keyword_: string; private queryUrl_: string; @@ -43,7 +43,7 @@ private dialogTitle_: string; private keywordFieldLabel_: string; private actionButtonText_: string; -@@ -103,6 +106,7 @@ export class SettingsSearchEngineEditDia +@@ -98,6 +101,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'); -@@ -142,8 +146,12 @@ export class SettingsSearchEngineEditDia +@@ -137,8 +141,12 @@ export class SettingsSearchEngineEditDia } } @@ -66,7 +66,7 @@ } private cancel_() { -@@ -152,7 +160,8 @@ export class SettingsSearchEngineEditDia +@@ -147,7 +155,8 @@ export class SettingsSearchEngineEditDia private onActionButtonTap_() { this.browserProxy_.searchEngineEditCompleted( @@ -76,7 +76,7 @@ this.$.dialog.close(); } -@@ -180,9 +189,11 @@ export class SettingsSearchEngineEditDia +@@ -175,9 +184,11 @@ export class SettingsSearchEngineEditDia private updateActionButtonState_() { const allValid = [ @@ -429,7 +429,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -653,7 +653,8 @@ void TemplateURLService::IncrementUsageC +@@ -654,7 +654,8 @@ void TemplateURLService::IncrementUsageC void TemplateURLService::ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -439,7 +439,7 @@ DCHECK(!IsCreatedByExtension(url)); DCHECK(!keyword.empty()); DCHECK(!search_url.empty()); -@@ -668,6 +669,7 @@ void TemplateURLService::ResetTemplateUR +@@ -669,6 +670,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 2dd9bb55b..a1fcf7082 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 -@@ -3131,7 +3131,13 @@ const FeatureEntry::FeatureVariation kDe +@@ -3270,7 +3270,13 @@ const FeatureEntry::FeatureVariation kDe // 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-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch index 3ec02d527..709b025dd 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 -@@ -3694,8 +3694,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3682,8 +3682,7 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -13,7 +13,7 @@ } SynthesizeGLError( GL_INVALID_ENUM, "getParameter", -@@ -3709,8 +3708,7 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3697,8 +3696,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 8c5703424..264c34b42 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 -@@ -490,7 +490,7 @@ const base::Feature kComputePressure{"Co +@@ -491,7 +491,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 fb1555904..ace586db6 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 -@@ -443,11 +443,6 @@ int GetContentRestrictions(const Browser +@@ -434,11 +434,6 @@ int GetContentRestrictions(const Browser CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(current_tab); content_restrictions = core_tab_helper->content_restrictions(); @@ -14,7 +14,7 @@ } return content_restrictions; } -@@ -1350,8 +1345,7 @@ bool CanSavePage(const Browser* browser) +@@ -1341,8 +1336,7 @@ bool CanSavePage(const Browser* browser) DownloadPrefs::DownloadRestriction::ALL_FILES) { return false; } diff --git a/patches/extra/ungoogled-chromium/keep-expired-flags.patch b/patches/extra/ungoogled-chromium/keep-expired-flags.patch index 04f9d6f6e..b61e45627 100644 --- a/patches/extra/ungoogled-chromium/keep-expired-flags.patch +++ b/patches/extra/ungoogled-chromium/keep-expired-flags.patch @@ -1,14 +1,14 @@ --- a/components/flags_ui/flags_state.cc +++ b/components/flags_ui/flags_state.cc @@ -22,6 +22,7 @@ + #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" - #include "build/chromeos_buildflags.h" +#include "chrome/browser/unexpire_flags.h" #include "components/flags_ui/feature_entry.h" #include "components/flags_ui/flags_storage.h" #include "components/flags_ui/flags_ui_switches.h" -@@ -556,14 +557,18 @@ void FlagsState::GetFlagFeatureEntries( +@@ -589,14 +590,18 @@ void FlagsState::GetFlagFeatureEntries( int current_platform = GetCurrentPlatform(); for (const FeatureEntry& entry : feature_entries_) { @@ -28,7 +28,7 @@ base::Value supported_platforms(base::Value::Type::LIST); AddOsStrings(entry.supported_platforms, &supported_platforms); -@@ -883,6 +888,7 @@ bool FlagsState::IsSupportedFeature(cons +@@ -959,6 +964,7 @@ bool FlagsState::IsSupportedFeature(cons if (!entry.InternalNameMatches(name)) continue; if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry)) diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 33a85eb84..998714f59 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -17,6 +17,7 @@ # the (?) learn more button on many settings pages # unneeded elements from the profile menu # the 'Learn more' link on crashed tabs +# the Privacy Guide promo and section on the privacy and security page --- a/chrome/browser/resources/extensions/item_list.html +++ b/chrome/browser/resources/extensions/item_list.html @@ -124,12 +125,12 @@ +
+
$i18n{themes}
[[themeSublabel_]]
+
- +