From 5316c0a1b231298aa9d56a7ded7ba1486479f28d Mon Sep 17 00:00:00 2001 From: Zoraver Kang Date: Wed, 8 Apr 2020 01:58:51 -0400 Subject: [PATCH] Upgrade to Chromium 81.0.4044.92 --- chromium_version.txt | 2 +- devutils/update_lists.py | 6 +- domain_substitution.list | 564 ++++--- .../disable-fetching-field-trials.patch | 6 +- patches/core/debian/disable/unrar.patch | 14 +- ...01-fix-building-without-safebrowsing.patch | 160 +- .../0005-disable-default-extensions.patch | 6 +- .../0010-disable-gcm-status-check.patch | 83 - .../0014-disable-translation-lang-fetch.patch | 2 +- .../0017-disable-new-avatar-menu.patch | 2 +- .../chromium-exclude_unwind_tables.patch | 31 - ...refixes-to-possibly-evil-connections.patch | 31 +- ..._browsing-disable-incident-reporting.patch | 4 +- ...sable-reporting-of-safebrowsing-over.patch | 99 +- .../block-trk-and-subdomains.patch | 43 +- .../disable-crash-reporter.patch | 4 +- .../disable-domain-reliability.patch | 2 +- .../disable-fonts-googleapis-references.patch | 4 +- .../ungoogled-chromium/disable-gaia.patch | 7 +- .../disable-google-host-detection.patch | 42 +- .../disable-mei-preload.patch | 6 +- .../ungoogled-chromium/disable-signin.patch | 2 +- .../disable-translate.patch | 21 +- .../disable-untraceable-urls.patch | 14 +- .../disable-webstore-urls.patch | 14 +- ...ix-building-without-one-click-signin.patch | 2 +- .../fix-building-without-safebrowsing.patch | 98 +- .../fix-learn-doubleclick-hsts.patch | 2 +- .../remove-unused-preferences-fields.patch | 1377 ++++++++--------- ...e-google-search-engine-with-nosearch.patch | 2 +- .../use-local-devtools-files.patch | 32 +- ...g-flags-client-rects-and-measuretext.patch | 40 +- ...ngerprinting-canvas-image-data-noise.patch | 24 +- .../flag-max-connections-per-host.patch | 16 +- patches/extra/debian/disable/android.patch | 2 +- patches/extra/debian/disable/fuzzers.patch | 8 +- .../debian/disable/google-api-warning.patch | 2 +- .../extra/debian/disable/welcome-page.patch | 2 +- .../debian/fixes/connection-message.patch | 4 +- patches/extra/debian/fixes/ps-print.patch | 13 - patches/extra/debian/gn/parallel.patch | 8 +- .../0006-modify-default-prefs.patch | 18 +- .../0008-restore-classic-ntp.patch | 6 +- .../0011-add-duckduckgo-search-engine.patch | 265 +++- .../0016-chromium-sandbox-pie.patch | 2 +- .../0018-disable-first-run-behaviour.patch | 2 +- .../0019-disable-battery-status-service.patch | 16 +- ...ble-profile-auto-import-on-first-run.patch | 2 +- ...e-default-key-length-for-newly-gener.patch | 2 +- .../prefs-only-keep-cookies-until-exit.patch | 2 +- .../updater-disable-auto-update.patch | 2 +- ...dd-flag-for-search-engine-collection.patch | 14 +- ...g-to-configure-extension-downloading.patch | 10 +- .../add-flag-to-disable-beforeunload.patch | 2 +- ...add-flag-to-force-punycode-hostnames.patch | 2 +- .../add-flag-to-hide-crashed-bubble.patch | 2 +- .../add-flag-to-scroll-tabs.patch | 16 +- .../add-flag-to-show-avatar-button.patch | 8 +- .../add-flag-to-stack-tabs.patch | 4 +- .../add-ipv6-probing-option.patch | 2 +- .../add-suggestions-url-field.patch | 6 +- .../default-to-https-scheme.patch | 2 +- .../disable-download-quarantine.patch | 4 +- .../disable-webgl-renderer-info.patch | 2 +- .../enable-page-saving-on-more-pages.patch | 10 +- .../enable-paste-and-go-new-tab-button.patch | 2 +- .../ungoogled-chromium/popups-to-tabs.patch | 2 +- patches/extra/ungoogled-chromium/searx.patch | 246 +-- patches/series | 3 - pruning.list | 319 ++-- 70 files changed, 1881 insertions(+), 1893 deletions(-) delete mode 100644 patches/core/inox-patchset/0010-disable-gcm-status-check.patch delete mode 100644 patches/core/inox-patchset/chromium-exclude_unwind_tables.patch delete mode 100644 patches/extra/debian/fixes/ps-print.patch diff --git a/chromium_version.txt b/chromium_version.txt index 2373166e..c9fc7b79 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -80.0.3987.163 +81.0.4044.92 diff --git a/devutils/update_lists.py b/devutils/update_lists.py index de55ad52..c36525c0 100755 --- a/devutils/update_lists.py +++ b/devutils/update_lists.py @@ -30,8 +30,8 @@ _ENCODING = 'UTF-8' PRUNING_INCLUDE_PATTERNS = [ 'components/domain_reliability/baked_in_configs/*', # Removals for patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch - 'components/safe_browsing/common/safe_browsing_prefs.cc', - 'components/safe_browsing/common/safe_browsing_prefs.h', + 'components/safe_browsing/core/common/safe_browsing_prefs.cc', + 'components/safe_browsing/core/common/safe_browsing_prefs.h', 'components/signin/public/base/signin_pref_names.cc', 'components/signin/public/base/signin_pref_names.h', ] @@ -95,7 +95,7 @@ DOMAIN_EXCLUDE_PREFIXES = [ 'components/test/', 'net/http/transport_security_state_static.json', # Exclusions for Visual Studio Project generation with GN (PR #445) - 'tools/gn/tools/gn/visual_studio_writer.cc', + 'tools/gn/src/gn/visual_studio_writer.cc', # Exclusions for files covered with other patches/unnecessary 'components/search_engines/prepopulated_engines.json', 'third_party/blink/renderer/core/dom/document.cc', diff --git a/domain_substitution.list b/domain_substitution.list index c8b58ff3..05cadb90 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -16,7 +16,6 @@ android_webview/browser/safe_browsing/aw_safe_browsing_whitelist_manager.h android_webview/browser/safe_browsing/aw_safe_browsing_whitelist_manager_unittest.cc android_webview/common/url_constants.cc android_webview/nonembedded/java/res_devui/values/strings.xml -android_webview/renderer/aw_content_renderer_client.cc android_webview/tools/cts_config/webview_cts_gcs_path.json android_webview/tools/record_netlog.py android_webview/tools/remove_preinstalled_webview.py @@ -89,8 +88,8 @@ base/native_library_win.cc base/optional.h base/process/launch.h base/process/launch_posix.cc +base/process/memory.cc base/process/memory.h -base/process/memory_win.cc base/process/process.h base/process/process_metrics.h base/process/process_unittest.cc @@ -120,7 +119,6 @@ base/third_party/nspr/prtime.h base/third_party/symbolize/symbolize.cc base/threading/platform_thread_unittest.cc base/threading/platform_thread_win.cc -base/threading/platform_thread_win.h base/time/time.h base/time/time_win.cc base/trace_event/cfi_backtrace_android_unittest.cc @@ -147,13 +145,14 @@ build/android/apk_operations.py build/android/dump_apk_resource_strings.py build/android/gradle/generate_gradle.py build/android/gyp/assert_static_initializers.py +build/android/gyp/compile_java.py build/android/gyp/compile_resources.py -build/android/gyp/javac.py build/android/gyp/lint.py build/android/gyp/main_dex_list.py build/android/gyp/merge_manifest.py build/android/gyp/proguard.py build/android/gyp/util/diff_utils.py +build/android/gyp/util/resources_parser.py build/android/incremental_install/installer.py build/android/lint/suppressions.xml build/android/pylib/constants/__init__.py @@ -218,15 +217,16 @@ cc/PRESUBMIT.py cc/animation/animation_delegate.h cc/input/browser_controls_offset_manager.cc cc/input/scroll_state.h +cc/input/scrollbar_controller.h cc/paint/paint_image.h cc/tiles/gpu_image_decode_cache.h cc/trees/layer_tree_host_impl.cc chrome/BUILD.gn chrome/PRESUBMIT.py +chrome/android/BUILD.gn chrome/android/examples/partner_browser_customizations_provider/res/values/strings.xml chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd chrome/android/java/res/layout/content_suggestions_card_modern_reversed.xml -chrome/android/java/res/layout/preference_compat.xml chrome/android/java/res/values-sw600dp/values.xml chrome/android/java/res/values/dimens.xml chrome/android/java/res/values/strings.xml @@ -248,6 +248,7 @@ chrome/browser/android/autofill_assistant/client_android.cc chrome/browser/android/color_helpers_unittest.cc chrome/browser/android/contextualsearch/contextual_search_context.h chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc +chrome/browser/android/customtabs/custom_tabs_browsertest.cc chrome/browser/android/customtabs/detached_resource_request_unittest.cc chrome/browser/android/digital_asset_links/digital_asset_links_handler.cc chrome/browser/android/digital_asset_links/digital_asset_links_handler.h @@ -267,6 +268,8 @@ chrome/browser/android/signin/signin_manager_android_unittest.cc chrome/browser/android/tab_android.cc chrome/browser/android/tab_state.cc chrome/browser/android/vr/PRESUBMIT.py +chrome/browser/android/vr/arcore_device/arcore_impl.cc +chrome/browser/android/vr/arcore_device/arcore_install_helper.cc chrome/browser/android/webapk/webapk_icon_hasher_unittest.cc chrome/browser/android/webapk/webapk_installer.cc chrome/browser/apps/app_service/app_icon_factory.cc @@ -282,6 +285,7 @@ chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier_unittest.cc chrome/browser/autocomplete/search_provider_unittest.cc chrome/browser/autofill/autofill_browsertest.cc +chrome/browser/autofill/autofill_captured_sites_interactive_uitest.cc chrome/browser/autofill/autofill_gstatic_reader.cc chrome/browser/autofill/autofill_interactive_uitest.cc chrome/browser/autofill/autofill_server_browsertest.cc @@ -290,6 +294,7 @@ 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/banners/app_banner_settings_helper_unittest.cc +chrome/browser/bluetooth/web_bluetooth_browsertest.cc chrome/browser/bookmarks/managed_bookmark_service_unittest.cc chrome/browser/browser_about_handler_unittest.cc chrome/browser/browser_commands_unittest.cc @@ -310,8 +315,6 @@ chrome/browser/browsing_data/counters/history_counter_browsertest.cc chrome/browser/browsing_data/counters/passwords_counter_browsertest.cc chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc chrome/browser/browsing_data/counters/site_settings_counter_unittest.cc -chrome/browser/captive_portal/captive_portal_service.h -chrome/browser/captive_portal/captive_portal_tab_helper.h chrome/browser/chrome_browser_application_mac.mm chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client_browsertest.cc @@ -331,6 +334,7 @@ chrome/browser/chromeos/arc/auth/arc_background_auth_code_fetcher.cc chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher.cc chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.h +chrome/browser/chromeos/arc/file_system_watcher/file_system_scanner.h chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog_unittest.cc chrome/browser/chromeos/arc/policy/arc_policy_bridge_unittest.cc chrome/browser/chromeos/arc/policy/arc_policy_util.h @@ -359,6 +363,7 @@ chrome/browser/chromeos/extensions/device_local_account_management_policy_provid chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc chrome/browser/chromeos/extensions/permissions_updater_delegate_chromeos_unittest.cc +chrome/browser/chromeos/extensions/printing/printing_api_utils.h chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc chrome/browser/chromeos/file_manager/file_browser_handlers.h @@ -377,6 +382,7 @@ chrome/browser/chromeos/login/easy_unlock/easy_unlock_screenlock_state_handler_u chrome/browser/chromeos/login/encryption_migration_browsertest.cc chrome/browser/chromeos/login/error_screen_browsertest.cc chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +chrome/browser/chromeos/login/help_app_launcher.h chrome/browser/chromeos/login/kiosk_browsertest.cc chrome/browser/chromeos/login/login_browsertest.cc chrome/browser/chromeos/login/login_ui_browsertest.cc @@ -406,7 +412,11 @@ chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc chrome/browser/chromeos/login/users/remove_supervised_users_browsertest.cc chrome/browser/chromeos/login/users/user_manager_hide_supervised_users_browsertest.cc +chrome/browser/chromeos/login/web_kiosk_controller.cc chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc +chrome/browser/chromeos/plugin_vm/plugin_vm_installer_unittest.cc +chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc +chrome/browser/chromeos/plugin_vm/plugin_vm_util_unittest.cc chrome/browser/chromeos/policy/active_directory_policy_manager.cc chrome/browser/chromeos/policy/android_management_client_unittest.cc chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc @@ -461,6 +471,7 @@ chrome/browser/devtools/devtools_ui_bindings_unittest.cc chrome/browser/devtools/url_constants.cc 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/engagement/important_sites_usage_counter_unittest.cc chrome/browser/engagement/important_sites_util_unittest.cc @@ -468,9 +479,11 @@ chrome/browser/engagement/site_engagement_helper.cc chrome/browser/engagement/site_engagement_helper_unittest.cc chrome/browser/engagement/site_engagement_score_unittest.cc chrome/browser/engagement/site_engagement_service_unittest.cc +chrome/browser/enterprise_reporting/notification/extension_request_notification.cc +chrome/browser/enterprise_reporting/notification/extension_request_notification_unittest.cc +chrome/browser/enterprise_reporting/notification/extension_request_observer_unittest.cc chrome/browser/extensions/active_tab_apitest.cc chrome/browser/extensions/active_tab_unittest.cc -chrome/browser/extensions/activity_log/activity_log_browsertest.cc chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc chrome/browser/extensions/activity_log/activity_log_unittest.cc chrome/browser/extensions/activity_log/counting_policy_unittest.cc @@ -564,6 +577,7 @@ chrome/browser/extensions/external_policy_loader_unittest.cc chrome/browser/extensions/external_pref_loader.cc chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc chrome/browser/extensions/external_provider_impl_unittest.cc +chrome/browser/extensions/forced_extensions/installation_tracker_unittest.cc chrome/browser/extensions/install_signer.cc chrome/browser/extensions/installed_loader_unittest.cc chrome/browser/extensions/lazy_background_page_apitest.cc @@ -585,7 +599,6 @@ chrome/browser/feature_engagement/new_tab/new_tab_tracker_browsertest.cc chrome/browser/feedback/feedback_uploader_chrome.cc chrome/browser/feedback/system_logs/log_sources/crash_ids_source.cc chrome/browser/flag-metadata.json -chrome/browser/flag_descriptions.cc chrome/browser/google/google_search_domain_mixing_metrics_emitter.h chrome/browser/google/google_search_domain_mixing_metrics_emitter_factory.h chrome/browser/google/google_search_domain_mixing_metrics_emitter_unittest.cc @@ -599,6 +612,7 @@ chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc chrome/browser/history/android/sqlite_cursor_unittest.cc chrome/browser/history/android/urls_sql_handler_unittest.cc chrome/browser/history/android/visit_sql_handler_unittest.cc +chrome/browser/history/domain_diversity_reporter_unittest.cc chrome/browser/history/redirect_browsertest.cc chrome/browser/importer/edge_importer_browsertest_win.cc chrome/browser/importer/firefox_importer_browsertest.cc @@ -643,11 +657,13 @@ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc chrome/browser/media/webrtc/webrtc_log_uploader.cc chrome/browser/media_galleries/fileapi/media_path_filter.cc chrome/browser/memory/swap_thrashing_monitor_delegate_win.cc +chrome/browser/metrics/testing/sync_metrics_test_utils.cc chrome/browser/metrics/thread_watcher_android.h -chrome/browser/metrics/ukm_browsertest.cc chrome/browser/nacl_host/nacl_infobar_delegate.cc chrome/browser/navigation_predictor/navigation_predictor_browsertest.cc chrome/browser/navigation_predictor/navigation_predictor_unittest.cc +chrome/browser/navigation_predictor/search_engine_preconnector.cc +chrome/browser/navigation_predictor/search_engine_preconnector_browsertest.cc chrome/browser/net/dns_probe_runner.cc chrome/browser/net/dns_probe_runner.h chrome/browser/net/nss_context_chromeos_browsertest.cc @@ -707,7 +723,6 @@ chrome/browser/permissions/mock_permission_request.cc chrome/browser/permissions/permission_context_base.cc chrome/browser/permissions/permission_context_base_feature_policy_unittest.cc chrome/browser/permissions/permission_context_base_unittest.cc -chrome/browser/permissions/permission_decision_auto_blocker_unittest.cc chrome/browser/permissions/permission_manager_unittest.cc chrome/browser/permissions/permission_request_manager_unittest.cc chrome/browser/permissions/permission_uma_util.h @@ -719,30 +734,6 @@ chrome/browser/plugins/plugin_info_host_impl_unittest.cc chrome/browser/plugins/plugins_resource_service.cc chrome/browser/policy/cloud/cloud_policy_browsertest.cc chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc -chrome/browser/policy/e2e_test/tests/allow_deleting_browser_history/allow_deleting_browser_history.py -chrome/browser/policy/e2e_test/tests/allow_deleting_browser_history/allow_deleting_browser_history_webdriver_test.py -chrome/browser/policy/e2e_test/tests/apps_shortcut/apps_shortcut.py -chrome/browser/policy/e2e_test/tests/bookmarkbar_enabled/bookmarkbar_enabled.py -chrome/browser/policy/e2e_test/tests/cloud_management_enrollment_token/cloud_enrollment_webdriver.py -chrome/browser/policy/e2e_test/tests/cloud_management_enrollment_token/cloud_management_enrollment_token.py -chrome/browser/policy/e2e_test/tests/default_search_provider/default_search_provider.py -chrome/browser/policy/e2e_test/tests/extension_blacklist/extension_blacklist.py -chrome/browser/policy/e2e_test/tests/extension_forcelist/extension_forcelist.py -chrome/browser/policy/e2e_test/tests/extension_whitelist/extension_whitelist.py -chrome/browser/policy/e2e_test/tests/force_google_safe_search/force_google_safe_search_webdriver_test.py -chrome/browser/policy/e2e_test/tests/fullscreen_allowed/fullscreen_allowed.py -chrome/browser/policy/e2e_test/tests/homepage/homepage.py -chrome/browser/policy/e2e_test/tests/install_extension.py -chrome/browser/policy/e2e_test/tests/password_manager_enabled/password_manager_enabled.py -chrome/browser/policy/e2e_test/tests/popups_allowed/popups_allowed.py -chrome/browser/policy/e2e_test/tests/restore_on_startup/restore_on_startup.py -chrome/browser/policy/e2e_test/tests/safe_browsing/safe_browsing.py -chrome/browser/policy/e2e_test/tests/safe_browsing/safe_browsing_ui_test.py -chrome/browser/policy/e2e_test/tests/translate_enabled/translate_enabled.py -chrome/browser/policy/e2e_test/tests/url_blacklist/url_blacklist.py -chrome/browser/policy/e2e_test/tests/url_whitelist/url_whitelist.py -chrome/browser/policy/e2e_test/tests/user_data_dir/user_data_dir.py -chrome/browser/policy/e2e_test/tests/youtube_restrict/youtube_restrict.py chrome/browser/policy/extension_policy_browsertest.cc chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc chrome/browser/policy/policy_browsertest.cc @@ -763,6 +754,7 @@ chrome/browser/prefs/chrome_command_line_pref_store_proxy_unittest.cc chrome/browser/prefs/pref_functional_browsertest.cc chrome/browser/prefs/pref_metrics_service.cc chrome/browser/prefs/session_startup_pref_unittest.cc +chrome/browser/prerender/isolated/isolated_prerender_tab_helper_unittest.cc chrome/browser/prerender/prerender_browsertest.cc chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc chrome/browser/prerender/prerender_unittest.cc @@ -818,6 +810,7 @@ chrome/browser/resources/chromeos/accessibility/chromevox/background/language_sw chrome/browser/resources/chromeos/accessibility/chromevox/background/options/options.css chrome/browser/resources/chromeos/accessibility/chromevox/background/options/options.js chrome/browser/resources/chromeos/accessibility/chromevox/background/panel/panel.html +chrome/browser/resources/chromeos/accessibility/chromevox/background/panel/panel.js chrome/browser/resources/chromeos/accessibility/chromevox/background/panel/tutorial.js chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js chrome/browser/resources/chromeos/accessibility/chromevox/braille/braille_input_handler_test.js @@ -828,15 +821,19 @@ chrome/browser/resources/chromeos/accessibility/chromevox/tools/webstore_extensi chrome/browser/resources/chromeos/accessibility/select_to_speak/manifest.json.jinja2 chrome/browser/resources/chromeos/accessibility/select_to_speak/mock_tts.js chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css +chrome/browser/resources/chromeos/accessibility/select_to_speak/paragraph_utils_unittest.js chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js +chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_unittest.js chrome/browser/resources/chromeos/accessibility/select_to_speak/strings/select_to_speak_strings.grd chrome/browser/resources/chromeos/accessibility/select_to_speak/test_support.js chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js +chrome/browser/resources/chromeos/accessibility/switch_access/switch_access_predicate_test.js chrome/browser/resources/chromeos/add_supervision/add_supervision.js chrome/browser/resources/chromeos/arc_support/background.js chrome/browser/resources/chromeos/arc_support/playstore.js chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js chrome/browser/resources/chromeos/camera/src/js/google-analytics-bundle.js +chrome/browser/resources/chromeos/camera/src/js/metrics.js chrome/browser/resources/chromeos/camera/src/js/util.js chrome/browser/resources/chromeos/camera/src/js/views/camera_intent.js chrome/browser/resources/chromeos/camera/src/manifest.json @@ -873,6 +870,7 @@ chrome/browser/resources/feedback/js/feedback_util.js chrome/browser/resources/gaia_auth_host/authenticator.js chrome/browser/resources/hangout_services/manifest.json chrome/browser/resources/hats/hats.html +chrome/browser/resources/identity_scope_approval_dialog/manifest.json chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js chrome/browser/resources/inspect/inspect.html chrome/browser/resources/local_ntp/customize.js @@ -902,6 +900,8 @@ chrome/browser/resources/net_internals/domain_security_policy_view.js chrome/browser/resources/net_internals/events_view.html chrome/browser/resources/network_speech_synthesis/manifest.json chrome/browser/resources/network_speech_synthesis/tts_extension.js +chrome/browser/resources/new_tab_page/customize_themes.js +chrome/browser/resources/new_tab_page/voice_search_overlay.js chrome/browser/resources/omnibox/omnibox.html chrome/browser/resources/omnibox/omnibox_output.js chrome/browser/resources/pdf/elements/icons.html @@ -914,23 +914,25 @@ chrome/browser/resources/print_preview/cloud_print_interface_manager.js chrome/browser/resources/print_preview/data/destination_store.js chrome/browser/resources/print_preview/ui/icons.html chrome/browser/resources/settings/a11y_page/a11y_page.js -chrome/browser/resources/settings/a11y_page/manage_a11y_page.html chrome/browser/resources/settings/about_page/about_page.html -chrome/browser/resources/settings/about_page/channel_switcher_dialog.html chrome/browser/resources/settings/appearance_page/appearance_page.js -chrome/browser/resources/settings/bluetooth_page/bluetooth_device_list_item.js chrome/browser/resources/settings/change_password_page/change_password_browser_proxy.js +chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_device_list_item.js +chrome/browser/resources/settings/chromeos/crostini_page/crostini_shared_paths.js +chrome/browser/resources/settings/chromeos/crostini_page/crostini_subpage.html +chrome/browser/resources/settings/chromeos/device_page/stylus.js +chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html +chrome/browser/resources/settings/chromeos/os_about_page/channel_switcher_dialog.html chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.html chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/icons.html chrome/browser/resources/settings/chromeos/os_icons.html chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js -chrome/browser/resources/settings/crostini_page/crostini_shared_paths.js -chrome/browser/resources/settings/device_page/stylus.js +chrome/browser/resources/settings/chromeos/os_people_page/users_add_user_dialog.js +chrome/browser/resources/settings/chromeos/plugin_vm_page/plugin_vm_shared_paths.js chrome/browser/resources/settings/icons.html chrome/browser/resources/settings/incompatible_applications_page/incompatible_application_item.js chrome/browser/resources/settings/languages_page/edit_dictionary_page.js -chrome/browser/resources/settings/people_page/users_add_user_dialog.js -chrome/browser/resources/settings/plugin_vm_page/plugin_vm_shared_paths.js +chrome/browser/resources/settings/privacy_page/security_page.js chrome/browser/resources/settings/settings_shared_css.html chrome/browser/resources/supervised_user_internals/supervised_user_internals.js chrome/browser/resources/usb_internals/descriptor_panel.js @@ -944,7 +946,6 @@ chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc chrome/browser/safe_browsing/chrome_password_protection_service.cc chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc -chrome/browser/safe_browsing/client_side_detection_host_unittest.cc chrome/browser/safe_browsing/client_side_detection_service.cc chrome/browser/safe_browsing/client_side_model_loader.cc chrome/browser/safe_browsing/client_side_model_loader_unittest.cc @@ -984,9 +985,16 @@ chrome/browser/serial/serial_chooser_context_unittest.cc chrome/browser/sessions/session_restore_browsertest.cc chrome/browser/sessions/session_restore_observer_unittest.cc chrome/browser/sessions/session_service_unittest.cc +chrome/browser/settings/android/java/res/layout/preference_compat.xml chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc chrome/browser/sharing/click_to_call/phone_number_regex.cc chrome/browser/sharing/vapid_key_manager.h +chrome/browser/sharing/web_push/json_web_token_util_unittest.cc +chrome/browser/sharing/web_push/web_push_sender.cc +chrome/browser/sharing/web_push/web_push_sender_unittest.cc +chrome/browser/sharing/webrtc/ice_config_fetcher.cc +chrome/browser/sharing/webrtc/ice_config_fetcher_unittest.cc +chrome/browser/sharing/webrtc/sharing_service_host_unittest.cc chrome/browser/shell_integration_linux_unittest.cc chrome/browser/signin/account_id_from_account_info_unittest.cc chrome/browser/signin/chrome_signin_helper_unittest.cc @@ -1002,7 +1010,6 @@ chrome/browser/signin/process_dice_header_delegate_impl_unittest.cc chrome/browser/signin/signin_promo_unittest.cc chrome/browser/signin/signin_ui_util.cc chrome/browser/signin/signin_util_win_browsertest.cc -chrome/browser/ssl/captive_portal_helper_win.cc chrome/browser/ssl/cert_verifier_platform_browser_test.h chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc chrome/browser/ssl/connection_help_tab_helper.cc @@ -1072,11 +1079,14 @@ chrome/browser/ui/app_list/search/search_result_ranker/search_ranking_event_logg chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker_unittest.cc chrome/browser/ui/ash/assistant/assistant_state_client_unittest.cc +chrome/browser/ui/ash/assistant/assistant_test_mixin.cc +chrome/browser/ui/ash/assistant/conversation_starters_client_impl.cc chrome/browser/ui/ash/assistant/proactive_suggestions_loader.cc chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc chrome/browser/ui/ash/chrome_shell_delegate.cc chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc chrome/browser/ui/ash/system_tray_client_browsertest.cc +chrome/browser/ui/autofill/sms_client_impl_unittest.cc chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker.h chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h @@ -1103,9 +1113,9 @@ chrome/browser/ui/crypto_module_password_dialog_nss.cc chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc chrome/browser/ui/extensions/installation_error_infobar_delegate.cc +chrome/browser/ui/gtk/gtk_util.cc chrome/browser/ui/hid/hid_chooser_controller_unittest.cc chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc -chrome/browser/ui/libgtkui/gtk_util.cc chrome/browser/ui/media_router/media_cast_mode.h chrome/browser/ui/media_router/media_cast_mode_unittest.cc chrome/browser/ui/media_router/media_router_ui_helper_unittest.cc @@ -1113,9 +1123,9 @@ chrome/browser/ui/media_router/query_result_manager.h chrome/browser/ui/omnibox/omnibox_view_browsertest.cc chrome/browser/ui/page_info/page_info.cc chrome/browser/ui/page_info/permission_menu_model_unittest.cc +chrome/browser/ui/passwords/bubble_controllers/generation_confirmation_bubble_controller.h chrome/browser/ui/passwords/google_password_manager_navigation_throttle.cc chrome/browser/ui/passwords/google_password_manager_navigation_throttle_browsertest.cc -chrome/browser/ui/passwords/manage_passwords_bubble_model.h chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc chrome/browser/ui/passwords/manage_passwords_view_utils.h chrome/browser/ui/passwords/passwords_model_delegate.h @@ -1169,7 +1179,6 @@ chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc chrome/browser/ui/views/passwords/password_bubble_browsertest.cc chrome/browser/ui/views/passwords/password_bubble_interactive_uitest.cc chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc -chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble_browsertest.cc chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc chrome/browser/ui/views/session_crashed_bubble_view.cc @@ -1191,7 +1200,7 @@ chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc chrome/browser/ui/webui/chromeos/sync/os_sync_handler_unittest.cc chrome/browser/ui/webui/chromeos/system_web_dialog_browsertest.cc -chrome/browser/ui/webui/components_ui.cc +chrome/browser/ui/webui/components/components_handler.cc chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc @@ -1232,6 +1241,8 @@ chrome/browser/usb/web_usb_detector_unittest.cc chrome/browser/usb/web_usb_service_impl_unittest.cc chrome/browser/vr/PRESUBMIT.py chrome/browser/web_applications/components/externally_installed_web_app_prefs.cc +chrome/browser/web_applications/components/web_app_file_handler_registration_win.cc +chrome/browser/web_applications/components/web_app_file_handler_registration_win_unittest.cc chrome/browser/web_applications/components/web_app_helpers_unittest.cc chrome/browser/web_applications/components/web_app_icon_downloader_unittest.cc chrome/browser/web_applications/components/web_app_install_utils_unittest.cc @@ -1240,7 +1251,6 @@ chrome/browser/web_applications/extensions/install_manager_bookmark_app_unittest chrome/browser/web_applications/external_web_app_manager.h chrome/browser/web_applications/external_web_app_manager_unittest.cc chrome/browser/web_applications/web_app_install_task.cc -chrome/browser/web_bluetooth_browsertest.cc chrome/browser/webauthn/chrome_authenticator_request_delegate.cc chrome/browser/win/conflicts/enumerate_shell_extensions.cc chrome/browser/win/conflicts/installed_applications.cc @@ -1348,10 +1358,14 @@ chrome/credential_provider/gaiacp/gaia_credential_base.cc chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc chrome/credential_provider/gaiacp/gaia_credential_provider_unittests.cc chrome/credential_provider/gaiacp/gaia_credential_unittests.cc +chrome/credential_provider/gaiacp/gcp_utils.cc chrome/credential_provider/gaiacp/gcp_utils.h chrome/credential_provider/gaiacp/gcp_utils_unittests.cc +chrome/credential_provider/gaiacp/gcpw_strings.cc chrome/credential_provider/gaiacp/internet_availability_checker.cc chrome/credential_provider/gaiacp/mdm_utils.cc +chrome/credential_provider/gaiacp/reauth_credential_unittests.cc +chrome/credential_provider/gaiacp/win_http_url_fetcher_unittests.cc chrome/credential_provider/test/gcp_gls_output_unittest.cc chrome/credential_provider/test/gls_runner_test_base.cc chrome/docs/devtools-pillar.html @@ -1442,10 +1456,9 @@ chrome/renderer/searchbox/searchbox.h chrome/renderer/searchbox/searchbox_extension.cc chrome/renderer/searchbox/searchbox_extension.h chrome/renderer/searchbox/searchbox_unittest.cc -chrome/renderer/subresource_redirect/subresource_redirect_experiments_unittest.cc chrome/renderer/subresource_redirect/subresource_redirect_params.cc chrome/renderer/subresource_redirect/subresource_redirect_util_unittest.cc -chrome/renderer/translate/translate_helper_browsertest.cc +chrome/renderer/translate/translate_agent_browsertest.cc chrome/service/cloud_print/cloud_print_connector.cc chrome/service/cloud_print/cloud_print_service_helpers_unittest.cc chrome/service/cloud_print/connector_settings_unittest.cc @@ -1472,12 +1485,37 @@ chrome/test/chromedriver/chrome/javascript_dialog_manager.cc chrome/test/chromedriver/client/chromedriver.py chrome/test/chromedriver/key_converter.cc chrome/test/chromedriver/logging.h +chrome/test/chromedriver/net/websocket.cc chrome/test/chromedriver/server/chromedriver_server.cc chrome/test/chromedriver/session_commands.cc chrome/test/chromedriver/test/run_java_tests.py chrome/test/chromedriver/test/run_py_tests.py chrome/test/chromedriver/test/run_webdriver_tests.py chrome/test/chromedriver/window_commands.cc +chrome/test/chromedriver/window_commands_unittest.cc +chrome/test/enterprise/e2e/policy/allow_deleting_browser_history/allow_deleting_browser_history.py +chrome/test/enterprise/e2e/policy/allow_deleting_browser_history/allow_deleting_browser_history_webdriver_test.py +chrome/test/enterprise/e2e/policy/apps_shortcut/apps_shortcut.py +chrome/test/enterprise/e2e/policy/bookmarkbar_enabled/bookmarkbar_enabled.py +chrome/test/enterprise/e2e/policy/cloud_management_enrollment_token/cloud_management_enrollment_token.py +chrome/test/enterprise/e2e/policy/default_search_provider/default_search_provider.py +chrome/test/enterprise/e2e/policy/extension_blacklist/extension_blacklist.py +chrome/test/enterprise/e2e/policy/extension_forcelist/extension_forcelist.py +chrome/test/enterprise/e2e/policy/extension_whitelist/extension_whitelist.py +chrome/test/enterprise/e2e/policy/force_google_safe_search/force_google_safe_search_webdriver_test.py +chrome/test/enterprise/e2e/policy/fullscreen_allowed/fullscreen_allowed.py +chrome/test/enterprise/e2e/policy/homepage/homepage.py +chrome/test/enterprise/e2e/policy/install_extension.py +chrome/test/enterprise/e2e/policy/password_manager_enabled/password_manager_enabled.py +chrome/test/enterprise/e2e/policy/popups_allowed/popups_allowed.py +chrome/test/enterprise/e2e/policy/restore_on_startup/restore_on_startup.py +chrome/test/enterprise/e2e/policy/safe_browsing/safe_browsing.py +chrome/test/enterprise/e2e/policy/safe_browsing/safe_browsing_ui_test.py +chrome/test/enterprise/e2e/policy/translate_enabled/translate_enabled.py +chrome/test/enterprise/e2e/policy/url_blacklist/url_blacklist.py +chrome/test/enterprise/e2e/policy/url_whitelist/url_whitelist.py +chrome/test/enterprise/e2e/policy/user_data_dir/user_data_dir.py +chrome/test/enterprise/e2e/policy/youtube_restrict/youtube_restrict.py chrome/test/ispy/client/boto_bucket.py chrome/test/ispy/ispy_api.py chrome/test/media_router/media_router_integration_browsertest.cc @@ -1497,6 +1535,7 @@ chrome/tools/build/win/makecab.py chrome/tools/webforms_aggregator_tests.py chrome/tools/weburl_links.txt chrome/updater/crash_reporter.cc +chrome/updater/tools/certificate_tag.cc chrome/updater/updater_constants.cc chrome/updater/updater_constants.h chrome/updater/win/install_app.cc @@ -1537,7 +1576,6 @@ chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager_unitt chromeos/components/proximity_auth/proximity_auth_system_unittest.cc chromeos/components/proximity_auth/proximity_monitor_impl_unittest.cc chromeos/components/quick_answers/search_result_loader.cc -chromeos/constants/chromeos_features.cc chromeos/constants/chromeos_switches.cc chromeos/dbus/arc_obb_mounter_client.h chromeos/dbus/biod/fake_biod_client_unittest.cc @@ -1562,11 +1600,11 @@ chromeos/services/device_sync/cryptauth_client_impl_unittest.cc chromeos/services/device_sync/device_sync_service_unittest.cc chromeos/services/device_sync/public/cpp/device_sync_client_impl_unittest.cc chromeos/services/device_sync/remote_device_loader_unittest.cc +chromeos/services/device_sync/remote_device_provider_impl_unittest.cc chromeos/services/device_sync/remote_device_v2_loader_impl_unittest.cc chromeos/services/device_sync/switches.cc chromeos/services/ime/constants.cc chromeos/services/ime/public/cpp/shared_lib/interfaces.h -chromeos/services/secure_channel/device_to_device_authenticator_unittest.cc chromeos/test/data/network/proxy_config.json chromeos/test/data/network/shill_wifi_proxy.json chromeos/timezone/timezone_request.cc @@ -1574,11 +1612,12 @@ chromeos/tpm/tpm_token_info_getter_unittest.cc cloud_print/virtual_driver/win/install/setup.cc cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +components/android_system_error_page/error_page_populator.cc components/arc/intent_helper/arc_intent_helper_bridge_unittest.cc components/arc/intent_helper/link_handler_model_unittest.cc -components/arc/session/arc_session_impl_unittest.cc components/arc/session/arc_upgrade_params.h components/assist_ranker/predictor_config_definitions.cc +components/autofill/PRESUBMIT.py components/autofill/content/renderer/PRESUBMIT.py components/autofill/content/renderer/form_cache.cc components/autofill/content/renderer/page_passwords_analyser.cc @@ -1639,7 +1678,9 @@ components/browser_sync/PRESUBMIT.py components/browser_watcher/postmortem_minidump_writer_win_unittest.cc components/browsing_data/core/counters/history_counter.cc components/browsing_data/core/history_notice_utils.cc -components/captive_portal/captive_portal_detector.cc +components/captive_portal/content/captive_portal_service.h +components/captive_portal/content/captive_portal_tab_helper.h +components/captive_portal/core/captive_portal_detector.cc components/cast_channel/enum_table.h components/certificate_transparency/chrome_ct_policy_enforcer.cc components/certificate_transparency/chrome_require_ct_delegate.h @@ -1721,19 +1762,13 @@ components/feedback/feedback_common_unittest.cc components/feedback/feedback_report.h components/feedback/feedback_uploader.cc components/feedback/feedback_uploader_dispatch_unittest.cc -components/feedback/feedback_util.cc -components/feedback/feedback_util.h components/flags_ui/resources/flags.html components/games/core/test/test_utils.cc -components/gcm_driver/crypto/json_web_token_util_unittest.cc components/gcm_driver/gcm_account_mapper.cc components/gcm_driver/gcm_account_mapper_unittest.cc components/gcm_driver/gcm_account_tracker.cc components/gcm_driver/gcm_client_impl.cc components/gcm_driver/gcm_client_impl_unittest.cc -components/gcm_driver/gcm_driver_unittest.cc -components/gcm_driver/web_push_sender.cc -components/gcm_driver/web_push_sender_unittest.cc components/google/core/common/google_util.cc components/google/core/common/google_util_unittest.cc components/history/core/browser/browsing_history_service.cc @@ -1771,9 +1806,10 @@ components/history/core/test/fake_web_history_service.cc components/image_fetcher/ios/webp_decoder.h components/invalidation/impl/gcm_invalidation_bridge.cc components/invalidation/impl/gcm_network_channel.cc -components/invalidation/impl/per_user_topic_registration_manager.cc -components/invalidation/impl/per_user_topic_registration_manager_unittest.cc +components/invalidation/impl/per_user_topic_subscription_manager.cc +components/invalidation/impl/per_user_topic_subscription_manager_unittest.cc components/invalidation/impl/push_client_channel.cc +components/keyed_service/core/keyed_service_base_factory.cc components/keyed_service/core/simple_keyed_service_factory.h components/metrics/net/net_metrics_log_uploader.cc components/metrics/persistent_histograms.cc @@ -1840,6 +1876,7 @@ components/omnibox/browser/scored_history_match.cc components/omnibox/browser/scored_history_match_unittest.cc components/omnibox/browser/search_provider.cc components/omnibox/browser/search_suggestion_parser.cc +components/omnibox/browser/search_suggestion_parser_unittest.cc components/omnibox/browser/shortcuts_backend_unittest.cc components/omnibox/browser/shortcuts_database_unittest.cc components/omnibox/browser/shortcuts_provider.cc @@ -1899,6 +1936,7 @@ components/password_manager/core/browser/leak_detection_dialog_utils.cc components/password_manager/core/browser/login_database_unittest.cc components/password_manager/core/browser/login_database_win.cc components/password_manager/core/browser/multi_store_form_fetcher_unittest.cc +components/password_manager/core/browser/multi_store_password_save_manager.cc components/password_manager/core/browser/multi_store_password_save_manager_unittest.cc components/password_manager/core/browser/password_feature_manager_impl.cc components/password_manager/core/browser/password_form_filling_unittest.cc @@ -1948,6 +1986,7 @@ components/pdf/renderer/pdf_accessibility_tree_browsertest.cc components/performance_manager/graph/frame_node_impl.cc components/performance_manager/public/graph/process_node.h components/performance_manager/public/graph/worker_node.h +components/permissions/permission_decision_auto_blocker_unittest.cc components/policy/core/browser/browser_policy_connector.cc components/policy/core/browser/browser_policy_connector.h components/policy/core/browser/browser_policy_connector_unittest.cc @@ -1966,6 +2005,7 @@ components/policy/core/common/policy_map_unittest.cc components/policy/core/common/policy_service_impl_unittest.cc components/policy/core/common/preg_parser.h components/policy/core/common/preg_parser_unittest.cc +components/policy/core/common/registry_dict_unittest.cc components/policy/resources/PRESUBMIT.py components/policy/resources/policy_templates.json components/policy/resources/webui/policy_base.js @@ -2053,23 +2093,23 @@ components/resources/terms/terms_vi.html components/resources/terms/terms_zh-CN.html components/resources/terms/terms_zh-TW.html components/rlz/rlz_tracker.h -components/safe_browsing/base_ui_manager.cc -components/safe_browsing/common/safebrowsing_constants.cc -components/safe_browsing/db/v4_get_hash_protocol_manager.cc -components/safe_browsing/db/v4_protocol_manager_util.cc -components/safe_browsing/db/v4_protocol_manager_util.h -components/safe_browsing/db/v4_protocol_manager_util_unittest.cc -components/safe_browsing/db/v4_store.cc -components/safe_browsing/db/v4_store_unittest.cc -components/safe_browsing/password_protection/password_protection_service.cc -components/safe_browsing/password_protection/password_protection_service_unittest.cc -components/safe_browsing/ping_manager_unittest.cc -components/safe_browsing/realtime/url_lookup_service.cc -components/safe_browsing/triggers/ad_popup_trigger_unittest.cc -components/safe_browsing/triggers/ad_sampler_trigger_unittest.cc -components/safe_browsing/triggers/trigger_util.cc -components/safe_browsing/verdict_cache_manager.cc -components/safe_browsing/verdict_cache_manager_unittest.cc +components/safe_browsing/content/base_ui_manager.cc +components/safe_browsing/content/password_protection/password_protection_service.cc +components/safe_browsing/content/password_protection/password_protection_service_unittest.cc +components/safe_browsing/content/triggers/ad_popup_trigger_unittest.cc +components/safe_browsing/content/triggers/ad_sampler_trigger_unittest.cc +components/safe_browsing/content/triggers/trigger_util.cc +components/safe_browsing/core/common/safebrowsing_constants.cc +components/safe_browsing/core/db/v4_get_hash_protocol_manager.cc +components/safe_browsing/core/db/v4_protocol_manager_util.cc +components/safe_browsing/core/db/v4_protocol_manager_util.h +components/safe_browsing/core/db/v4_protocol_manager_util_unittest.cc +components/safe_browsing/core/db/v4_store.cc +components/safe_browsing/core/db/v4_store_unittest.cc +components/safe_browsing/core/ping_manager_unittest.cc +components/safe_browsing/core/realtime/url_lookup_service.cc +components/safe_browsing/core/verdict_cache_manager.cc +components/safe_browsing/core/verdict_cache_manager_unittest.cc components/safe_search_api/safe_search/safe_search_url_checker_client.cc components/safe_search_api/safe_search/safe_search_url_checker_client_unittest.cc components/safe_search_api/stub_url_checker.cc @@ -2080,7 +2120,6 @@ components/search_engines/template_url.cc components/search_engines/template_url.h components/search_engines/template_url_data_unittest.cc components/search_engines/template_url_prepopulate_data_unittest.cc -components/search_engines/template_url_service.cc components/search_engines/template_url_unittest.cc components/search_engines/util.cc components/search_provider_logos/google_logo_api.cc @@ -2089,6 +2128,7 @@ components/search_provider_logos/google_logo_api_unittest.cc components/search_provider_logos/logo_cache_unittest.cc components/search_provider_logos/logo_service_impl_unittest.cc components/search_provider_logos/switches.cc +components/security_interstitials/content/captive_portal_helper_win.cc components/security_interstitials/content/ssl_blocking_page.h components/security_interstitials/core/browser/resources/interstitial_large.js components/security_interstitials/core/controller_client.cc @@ -2110,10 +2150,10 @@ components/signin/core/browser/resources/signin_internals.js components/signin/core/browser/signin_header_helper_unittest.cc components/signin/internal/identity_manager/account_tracker_service_unittest.cc components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc -components/signin/internal/identity_manager/oauth2_token_service_delegate_android.cc components/signin/internal/identity_manager/oauth_multilogin_helper_unittest.cc components/signin/internal/identity_manager/primary_account_manager_unittest.cc components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc +components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc components/signin/internal/identity_manager/profile_oauth2_token_service_unittest.cc components/signin/internal/identity_manager/ubertoken_fetcher_impl_unittest.cc @@ -2145,6 +2185,7 @@ components/sync/driver/sync_session_durations_metrics_recorder_unittest.cc components/sync/driver/sync_stopped_reporter_unittest.cc components/sync/driver/sync_util.cc components/sync/engine/net/http_bridge_unittest.cc +components/sync/engine_impl/bookmark_update_preprocessing.cc components/sync/engine_impl/directory_commit_contribution_unittest.cc components/sync/engine_impl/sync_manager_impl_unittest.cc components/sync/engine_impl/syncer_unittest.cc @@ -2205,6 +2246,7 @@ components/variations/variations_url_constants.cc components/visitedlink/test/visitedlink_perftest.cc components/visitedlink/test/visitedlink_unittest.cc components/viz/service/display/output_surface.h +components/viz/test/data/render_pass_data/readme.txt components/wifi/wifi_service_win.cc components/zucchini/disassembler_dex.h components/zucchini/type_dex.h @@ -2223,7 +2265,6 @@ content/browser/background_fetch/background_fetch_cross_origin_filter_unittest.c content/browser/background_fetch/background_fetch_service_unittest.cc content/browser/blob_storage/blob_url_browsertest.cc content/browser/bluetooth/bluetooth_device_chooser_controller.cc -content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_url_handler_impl.cc content/browser/browsing_data/browsing_data_filter_builder_impl.cc content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc @@ -2243,6 +2284,7 @@ content/browser/file_system/browser_file_system_helper.cc content/browser/file_system/browser_file_system_helper_unittest.cc content/browser/font_unique_name_lookup/font_unique_name_lookup_unittest.cc content/browser/frame_host/back_forward_cache_metrics.cc +content/browser/frame_host/clipboard_host_impl.cc content/browser/frame_host/form_submission_throttle_unittest.cc content/browser/frame_host/frame_tree_unittest.cc content/browser/frame_host/interstitial_page_impl.cc @@ -2264,6 +2306,7 @@ content/browser/hid/hid_service_unittest.cc content/browser/indexed_db/indexed_db_backing_store.cc content/browser/indexed_db/indexed_db_backing_store_unittest.cc content/browser/indexed_db/indexed_db_reporting.cc +content/browser/installedapp/installed_app_provider_impl_win.cc content/browser/loader/prefetch_browsertest.cc content/browser/media/media_devices_permission_checker_unittest.cc content/browser/media/session/media_session_impl_service_routing_unittest.cc @@ -2274,8 +2317,8 @@ content/browser/permissions/permission_controller_impl_unittest.cc content/browser/plugin_service_impl.cc content/browser/plugin_service_impl_browsertest.cc content/browser/plugin_service_impl_unittest.cc +content/browser/portal/portal_navigation_throttle.cc content/browser/push_messaging/push_messaging_manager.cc -content/browser/renderer_host/clipboard_host_impl.cc content/browser/renderer_host/compositor_impl_android.cc content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc content/browser/renderer_host/dwrite_font_proxy_impl_win.cc @@ -2291,8 +2334,8 @@ content/browser/resources/gpu/info_view.js content/browser/sandbox_ipc_linux.h content/browser/screen_orientation/screen_orientation_provider_unittest.cc content/browser/serial/serial_unittest.cc -content/browser/service_worker/service_worker_browsertest.cc content/browser/service_worker/service_worker_metrics.cc +content/browser/service_worker/service_worker_version_browsertest.cc content/browser/session_history_browsertest.cc content/browser/site_instance_impl.h content/browser/site_instance_impl_unittest.cc @@ -2341,6 +2384,7 @@ content/renderer/loader/resource_dispatcher_unittest.cc content/renderer/pepper/message_channel.cc content/renderer/pepper/pepper_media_device_manager.cc content/renderer/pepper/pepper_plugin_registry.cc +content/renderer/pepper/pepper_url_loader_host.cc content/renderer/pepper/pepper_url_request_unittest.cc content/renderer/render_frame_impl_browsertest.cc content/renderer/render_thread_impl.cc @@ -2360,7 +2404,6 @@ content/shell/test_runner/web_widget_test_proxy.h content/test/gpu/PRESUBMIT.py content/test/gpu/gather_power_measurement_results.py content/test/gpu/gather_swarming_json_results.py -content/test/gpu/gpu_tests/gpu_helper.py content/test/gpu/gpu_tests/power_measurement_integration_test.py content/test/gpu/measure_power_intel.py content/test/gpu/power_measurement_results/analyze_power_measurement_results.py @@ -2385,7 +2428,6 @@ crypto/rsa_private_key_unittest.cc crypto/secure_util.h device/bluetooth/bluetooth_adapter_android.cc device/bluetooth/bluetooth_adapter_mac.mm -device/bluetooth/bluetooth_adapter_mac_metrics.mm device/bluetooth/bluetooth_adapter_winrt.cc device/bluetooth/bluetooth_classic_device_mac.mm device/bluetooth/bluetooth_device_win.cc @@ -2448,6 +2490,7 @@ extensions/common/event_matcher.h extensions/common/extension.cc extensions/common/extension.h extensions/common/extension_builder_unittest.cc +extensions/common/extension_features.cc extensions/common/extension_l10n_util_unittest.cc extensions/common/extension_set_unittest.cc extensions/common/extension_urls.cc @@ -2540,15 +2583,21 @@ gpu/command_buffer/service/external_vk_image_dawn_representation.h gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc gpu/command_buffer/service/image_reader_gl_owner.cc gpu/command_buffer/service/shader_translator_unittest.cc -gpu/command_buffer/service/shared_image_backing_factory_d3d.cc gpu/command_buffer/service/shared_image_backing_factory_iosurface.mm +gpu/command_buffer/service/shared_image_representation_d3d.cc +gpu/command_buffer/service/shared_image_representation_d3d.h +gpu/command_buffer/service/shared_image_representation_dawn_ozone.cc +gpu/command_buffer/service/shared_image_video.cc gpu/command_buffer/service/webgpu_decoder_impl.cc +gpu/config/PRESUBMIT.py gpu/config/gpu_info_collector_win.cc gpu/ipc/common/PRESUBMIT.py gpu/vulkan/PRESUBMIT.py headless/app/headless_shell_switches.cc headless/lib/browser/protocol/headless_handler.cc headless/lib/dom_tree_extraction_expected_nodes.txt +headless/lib/headless_origin_trial_policy.cc +headless/lib/headless_origin_trial_policy.h headless/lib/resources/devtools_discovery_page.html headless/public/headless_browser.h headless/test/data/dom_tree_test.html @@ -2559,7 +2608,6 @@ ios/PRESUBMIT.py ios/README.txt ios/build/bots/scripts/test_runner.py ios/build/chrome_build.gni -ios/chrome/app/app_startup_parameters_unittest.mm ios/chrome/app/application_delegate/url_opener_unittest.mm ios/chrome/app/application_delegate/user_activity_handler_unittest.mm ios/chrome/app/startup/chrome_app_startup_parameters_unittest.mm @@ -2606,8 +2654,12 @@ ios/chrome/browser/ui/authentication/chrome_signin_view_controller_unittest.mm ios/chrome/browser/ui/authentication/re_signin_infobar_delegate_unittest.mm ios/chrome/browser/ui/authentication/signed_in_accounts_view_controller.mm ios/chrome/browser/ui/authentication/signin_earlgrey_utils.mm +ios/chrome/browser/ui/authentication/signin_earlgrey_utils_app_interface.mm ios/chrome/browser/ui/autofill/manual_fill/form_observer_helper_unittest.mm ios/chrome/browser/ui/autofill/save_card_infobar_egtest.mm +ios/chrome/browser/ui/bookmarks/bookmark_earl_grey.mm +ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_app_interface.mm +ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_ui.h ios/chrome/browser/ui/bookmarks/bookmarks_egtest.mm ios/chrome/browser/ui/browser_view/browser_view_controller_helper_unittest.mm ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_item_unittest.mm @@ -2623,7 +2675,6 @@ ios/chrome/browser/ui/ntp/incognito_view.mm ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm ios/chrome/browser/ui/ntp/notification_promo_whats_new_unittest.mm ios/chrome/browser/ui/omnibox/omnibox_egtest.mm -ios/chrome/browser/ui/omnibox/popup/autocomplete_match_formatter.mm ios/chrome/browser/ui/payments/cells/page_info_item.mm ios/chrome/browser/ui/payments/payment_request_manager.h ios/chrome/browser/ui/payments/payment_request_mediator_unittest.mm @@ -2632,6 +2683,7 @@ ios/chrome/browser/ui/reading_list/reading_list_list_item_factory_unittest.mm ios/chrome/browser/ui/reading_list/reading_list_mediator_unittest.mm ios/chrome/browser/ui/settings/cells/search_engine_item.h ios/chrome/browser/ui/settings/cells/search_engine_item_unittest.mm +ios/chrome/browser/ui/settings/google_services/accounts_table_egtest.mm ios/chrome/browser/ui/settings/import_data_table_view_controller_unittest.mm ios/chrome/browser/ui/settings/password/password_exporter_unittest.mm ios/chrome/browser/ui/settings/password/passwords_table_view_controller_unittest.mm @@ -2667,11 +2719,9 @@ ios/testing/data/http_server_files/window_open.html ios/third_party/firebase/BUILD.gn ios/web/browsing_data/browsing_data_remover_unittest.mm ios/web/browsing_data/system_cookie_store_util_unittest.mm -ios/web/common/origin_util_unittest.mm ios/web/favicon/favicon_util_unittest.mm ios/web/js_messaging/resources/setup_frame.js ios/web/js_messaging/resources/window_id.js -ios/web/navigation/crw_session_controller_unittest.mm ios/web/navigation/error_retry_state_machine.h ios/web/navigation/history_state_operations_inttest.mm ios/web/navigation/navigation_manager_impl.mm @@ -2682,12 +2732,14 @@ ios/web/web_state/js/context_menu_js_unittest.mm ios/web/web_state/js/resources/base.js ios/web/web_state/js/resources/plugin_placeholder.js ios/web/web_state/ui/crw_web_controller_unittest.mm +ios/web/web_state/web_state_context_menu_bridge_unittest.mm ios/web/web_state/web_state_unittest.mm ios/web/web_view/wk_security_origin_util_unittest.mm ios/web_view/internal/autofill/cwv_autofill_data_manager_unittest.mm ios/web_view/internal/autofill/cwv_credit_card_saver_unittest.mm ios/web_view/internal/cwv_favicon_unittest.mm ios/web_view/internal/cwv_flags.mm +ios/web_view/internal/cwv_web_view.mm ios/web_view/internal/passwords/cwv_password_unittest.mm ios/web_view/internal/signin/cwv_identity_unittest.mm ios/web_view/internal/sync/cwv_sync_controller_unittest.mm @@ -2709,15 +2761,16 @@ media/audio/win/audio_low_latency_output_win.h media/audio/win/core_audio_util_win.cc media/audio/win/core_audio_util_win.h media/base/android/media_drm_bridge.cc -media/base/android/media_drm_key_type.h media/base/android/media_player_bridge.h media/base/container_names.cc media/base/format_utils.cc media/base/key_systems.cc -media/base/media_log_unittest.cc +media/base/media_drm_key_type.h +media/base/media_error.h media/base/media_switches.cc media/base/test_random.h media/base/video_codecs.h +media/base/win/mf_helpers.cc media/capture/content/smooth_event_sampler_unittest.cc media/capture/video/android/video_capture_device_android.h media/capture/video/chromeos/camera_3a_controller.cc @@ -2737,6 +2790,7 @@ media/filters/source_buffer_stream_unittest.cc media/filters/video_cadence_estimator.h media/fuchsia/common/sysmem_buffer_writer_queue.cc media/gpu/android/android_video_encode_accelerator.h +media/gpu/chromeos/libyuv_image_processor_backend.cc media/gpu/vaapi/test_utils.h media/gpu/vaapi/vaapi_image_decoder_test_common.h media/gpu/vaapi/vaapi_jpeg_decoder_unittest.cc @@ -2747,6 +2801,7 @@ media/gpu/windows/d3d11_cdm_proxy.cc media/gpu/windows/d3d11_cdm_proxy.h media/gpu/windows/d3d11_decryptor.cc media/gpu/windows/d3d11_vp9_accelerator.cc +media/gpu/windows/display_helper.cc media/gpu/windows/dxva_video_decode_accelerator_win.cc media/gpu/windows/dxva_video_decode_accelerator_win.h media/gpu/windows/media_foundation_video_encode_accelerator_win.cc @@ -3072,6 +3127,8 @@ net/base/network_interfaces_win.cc net/base/registry_controlled_domains/registry_controlled_domain.cc net/base/registry_controlled_domains/registry_controlled_domain.h net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc +net/base/scheme_host_port_matcher_rule.h +net/base/scheme_host_port_matcher_rule_unittest.cc net/base/url_util.cc net/base/url_util_unittest.cc net/cert/cert_verifier.h @@ -3187,11 +3244,11 @@ net/proxy_resolution/dhcp_pac_file_adapter_fetcher_win.cc net/proxy_resolution/pac_file_decider.cc net/proxy_resolution/pac_file_decider_unittest.cc net/proxy_resolution/proxy_bypass_rules.cc -net/proxy_resolution/proxy_bypass_rules.h net/proxy_resolution/proxy_bypass_rules_unittest.cc net/proxy_resolution/proxy_config.h net/proxy_resolution/proxy_config_service_android.cc net/proxy_resolution/proxy_config_service_linux.cc +net/proxy_resolution/proxy_config_service_linux.h net/proxy_resolution/proxy_config_service_linux_unittest.cc net/proxy_resolution/proxy_config_service_win_unittest.cc net/proxy_resolution/proxy_config_unittest.cc @@ -3211,6 +3268,7 @@ net/quic/quic_stream_factory_test.cc net/socket/socket_options.h net/socket/socket_test_util.cc net/socket/socks5_client_socket_unittest.cc +net/socket/socks_connect_job_unittest.cc net/socket/ssl_client_socket_impl.cc net/socket/ssl_client_socket_unittest.cc net/socket/tcp_socket_win.cc @@ -3267,7 +3325,6 @@ net/tools/quic/quic_http_proxy_backend_test.cc net/tools/quic/quic_simple_client_bin.cc net/tools/testserver/echo_message.py net/tools/transport_security_state_generator/transport_security_state_generator.cc -net/url_request/redirect_util.cc net/url_request/url_fetcher.h net/url_request/url_request_context_builder_unittest.cc net/url_request/url_request_job_unittest.cc @@ -3440,9 +3497,9 @@ services/network/public/cpp/cors/cors_unittest.cc services/network/public/cpp/cors/origin_access_entry_unittest.cc services/network/public/cpp/cors/origin_access_list_unittest.cc services/network/public/cpp/cors/preflight_result_unittest.cc +services/network/public/cpp/features.cc services/network/public/cpp/is_potentially_trustworthy.cc services/network/public/cpp/network_switches.cc -services/network/public/cpp/resource_response.h services/network/udp_socket_unittest.cc services/network/websocket_throttler.h services/preferences/tracked/device_id_unittest.cc @@ -3491,10 +3548,10 @@ testing/buildbot/PRESUBMIT.py testing/buildbot/chromium.android.fyi.json testing/buildbot/chromium.android.json testing/buildbot/chromium.clang.json +testing/buildbot/chromium.dev.json testing/buildbot/chromium.fyi.json testing/buildbot/chromium.gpu.fyi.json testing/buildbot/chromium.memory.json -testing/buildbot/chromium.swarm.json testing/buildbot/chromium.webrtc.fyi.json testing/buildbot/chromium.webrtc.json testing/buildbot/filters/PRESUBMIT.py @@ -3594,6 +3651,7 @@ third_party/android_crazy_linker/src/src/crazy_linker_shared_library.cpp third_party/android_crazy_linker/src/src/crazy_linker_system_android.cpp third_party/android_crazy_linker/src/src/crazy_linker_wrappers.cpp third_party/android_deps/licenses/Android_SDK_License-December_9_2016.txt +third_party/android_platform/development/scripts/PRESUBMIT.py third_party/android_platform/development/scripts/stack.py third_party/angle/PRESUBMIT.py third_party/angle/extensions/ANGLE_base_vertex_base_instance.txt @@ -3618,6 +3676,7 @@ third_party/angle/extensions/EGL_ANGLE_device_cgl.txt third_party/angle/extensions/EGL_ANGLE_device_creation.txt third_party/angle/extensions/EGL_ANGLE_device_creation_d3d11.txt third_party/angle/extensions/EGL_ANGLE_device_d3d.txt +third_party/angle/extensions/EGL_ANGLE_device_eagl.txt third_party/angle/extensions/EGL_ANGLE_direct3d_display.txt third_party/angle/extensions/EGL_ANGLE_direct_composition.txt third_party/angle/extensions/EGL_ANGLE_display_texture_share_group.txt @@ -3634,7 +3693,7 @@ third_party/angle/extensions/EGL_ANGLE_stream_producer_d3d_texture.txt third_party/angle/extensions/EGL_ANGLE_swap_with_frame_token.txt third_party/angle/extensions/EGL_ANGLE_window_fixed_size.txt third_party/angle/extensions/EGL_CHROMIUM_create_context_bind_generates_resource.txt -third_party/angle/extensions/EGL_CHROMIUM_get_sync_values.txt +third_party/angle/extensions/EGL_CHROMIUM_sync_control.txt third_party/angle/extensions/EGL_EXT_device_query.txt third_party/angle/extensions/EXT_texture_storage.txt third_party/angle/extensions/KHR_parallel_shader_compile.txt @@ -3684,6 +3743,8 @@ third_party/angle/src/tests/gl_tests/TextureTest.cpp third_party/angle/src/tests/gl_tests/UniformBufferTest.cpp third_party/angle/src/tests/gles1_conformance_tests/ConformanceTests.cpp third_party/angle/src/tests/perf_tests/ANGLEPerfTest.h +third_party/angle/src/tests/test_utils/runner/TestSuite.cpp +third_party/angle/src/third_party/volk/volk.h third_party/angle/third_party/BUILD.gn third_party/angle/third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalClearAttachmentTests.cpp third_party/angle/third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalClearAttachmentTests.hpp @@ -3724,7 +3785,7 @@ third_party/angle/third_party/vulkan-tools/src/cube/gettime.h third_party/angle/third_party/vulkan-tools/src/icd/generated/vk_typemap_helper.h third_party/angle/third_party/vulkan-tools/src/scripts/mock_icd_generator.py third_party/angle/third_party/vulkan-tools/src/scripts/vulkan_tools_helper_file_generator.py -third_party/angle/third_party/vulkan-tools/src/winrt/VulkanRT-License.txt +third_party/angle/third_party/vulkan-tools/src/windows-runtime-installer/VulkanRT-License.txt third_party/angle/third_party/vulkan-validation-layers/src/cmake/Copyright_cmake.txt third_party/angle/third_party/vulkan-validation-layers/src/layers/core_validation.cpp third_party/angle/third_party/vulkan-validation-layers/src/layers/core_validation.h @@ -3859,12 +3920,13 @@ third_party/blink/perf_tests/sun_spider/tests/sunspider-0.9.1/string-base64.js third_party/blink/perf_tests/sun_spider/tests/sunspider-0.9/string-base64.js third_party/blink/perf_tests/sun_spider/tests/sunspider-1.0/string-base64.js third_party/blink/public/common/frame/user_activation_state.h +third_party/blink/public/common/input/web_keyboard_event.h third_party/blink/public/common/origin_trials/trial_token.h third_party/blink/public/mojom/feature_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/platform/linux/web_sandbox_support.h third_party/blink/public/platform/platform.h -third_party/blink/public/platform/web_keyboard_event.h third_party/blink/public/platform/web_url_response.h third_party/blink/public/strings/blink_strings.grd third_party/blink/public/web/web_node.h @@ -3916,6 +3978,7 @@ third_party/blink/renderer/bindings/tests/results/core/node_or_node_list.h third_party/blink/renderer/bindings/tests/results/core/string_or_array_buffer_or_array_buffer_view.h third_party/blink/renderer/bindings/tests/results/core/string_or_double.h third_party/blink/renderer/bindings/tests/results/core/string_or_string_sequence.h +third_party/blink/renderer/bindings/tests/results/core/string_or_test_dictionary.h third_party/blink/renderer/bindings/tests/results/core/string_treat_null_as_empty_string_or_long.h third_party/blink/renderer/bindings/tests/results/core/test_enum_or_double.h third_party/blink/renderer/bindings/tests/results/core/test_enum_or_test_enum_or_null_sequence.h @@ -3930,7 +3993,7 @@ third_party/blink/renderer/bindings/tests/results/modules/boolean_or_string.h third_party/blink/renderer/bindings/tests/results/modules/test_dictionary_or_long.h third_party/blink/renderer/build/scripts/core/style/make_computed_style_base.py third_party/blink/renderer/build/scripts/update_css_ranking.py -third_party/blink/renderer/controller/memory_usage_monitor_android.cc +third_party/blink/renderer/controller/memory_usage_monitor_posix.cc third_party/blink/renderer/core/BUILD.gn third_party/blink/renderer/core/animation/sampled_effect.cc third_party/blink/renderer/core/clipboard/data_transfer.h @@ -3953,7 +4016,6 @@ third_party/blink/renderer/core/css/invalidation/style_invalidator.h third_party/blink/renderer/core/css/parser/css_selector_parser.cc third_party/blink/renderer/core/css/remote_font_face_source.cc third_party/blink/renderer/core/css/resolver/style_adjuster.cc -third_party/blink/renderer/core/css/resolver/style_resolver.cc third_party/blink/renderer/core/css/rule_feature_set.cc third_party/blink/renderer/core/css/selector_checker.cc third_party/blink/renderer/core/css/style_engine.cc @@ -4039,9 +4101,8 @@ third_party/blink/renderer/core/exported/web_plugin_container_impl.cc third_party/blink/renderer/core/exported/web_searchable_form_data.cc third_party/blink/renderer/core/fetch/response.h third_party/blink/renderer/core/fileapi/file_reader_loader_client.h -third_party/blink/renderer/core/frame/PRESUBMIT.py +third_party/blink/renderer/core/frame/csp/content_security_policy.cc third_party/blink/renderer/core/frame/deprecation.cc -third_party/blink/renderer/core/frame/embedded_content_view.h third_party/blink/renderer/core/frame/frame.h third_party/blink/renderer/core/frame/frame_serializer.cc third_party/blink/renderer/core/frame/local_dom_window.h @@ -4254,6 +4315,7 @@ third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc third_party/blink/renderer/modules/accessibility/ax_layout_object.cc third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc third_party/blink/renderer/modules/bluetooth/bluetooth_error.cc +third_party/blink/renderer/modules/clipboard/clipboard_promise.cc third_party/blink/renderer/modules/credentialmanager/credentials_container.cc third_party/blink/renderer/modules/crypto/crypto_histograms.h third_party/blink/renderer/modules/encryptedmedia/encrypted_media_utils.h @@ -4278,6 +4340,7 @@ third_party/blink/renderer/modules/payments/skip_to_gpay_utils.cc third_party/blink/renderer/modules/payments/skip_to_gpay_utils.h third_party/blink/renderer/modules/payments/skip_to_gpay_utils_test.cc third_party/blink/renderer/modules/peerconnection/adapters/ice_transport_adapter_impl.cc +third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.h third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.idl third_party/blink/renderer/modules/presentation/presentation_connection_available_event.h third_party/blink/renderer/modules/scheduler/scheduler.idl @@ -4579,7 +4642,6 @@ third_party/catapult/dashboard/dashboard/edit_anomalies_test.py third_party/catapult/dashboard/dashboard/edit_anomaly_configs_test.py third_party/catapult/dashboard/dashboard/edit_bug_labels_test.py third_party/catapult/dashboard/dashboard/edit_config_handler.py -third_party/catapult/dashboard/dashboard/edit_sheriffs_test.py third_party/catapult/dashboard/dashboard/edit_site_config.py third_party/catapult/dashboard/dashboard/edit_site_config_test.py third_party/catapult/dashboard/dashboard/elements/alerts-page.html @@ -4603,8 +4665,6 @@ third_party/catapult/dashboard/dashboard/elements/speed-releasing-page.html third_party/catapult/dashboard/dashboard/elements/speed-releasing-table.html third_party/catapult/dashboard/dashboard/email_sheriff.py third_party/catapult/dashboard/dashboard/email_sheriff_test.py -third_party/catapult/dashboard/dashboard/email_summary.py -third_party/catapult/dashboard/dashboard/email_summary_test.py third_party/catapult/dashboard/dashboard/email_template.py third_party/catapult/dashboard/dashboard/email_template_test.py third_party/catapult/dashboard/dashboard/file_bug.py @@ -4618,7 +4678,6 @@ third_party/catapult/dashboard/dashboard/list_tests_test.py third_party/catapult/dashboard/dashboard/load_from_prod.py third_party/catapult/dashboard/dashboard/main_test.py third_party/catapult/dashboard/dashboard/mark_recovered_alerts.py -third_party/catapult/dashboard/dashboard/mark_recovered_alerts_test.py third_party/catapult/dashboard/dashboard/migrate_test_names.py third_party/catapult/dashboard/dashboard/migrate_test_names_test.py third_party/catapult/dashboard/dashboard/models/anomaly_test.py @@ -4666,22 +4725,13 @@ third_party/catapult/dashboard/dashboard/services/issue_tracker_service.py third_party/catapult/dashboard/dashboard/services/issue_tracker_service_test.py third_party/catapult/dashboard/dashboard/services/pinpoint_service.py third_party/catapult/dashboard/dashboard/services/swarming.py -third_party/catapult/dashboard/dashboard/sheriff_config/luci_config.py third_party/catapult/dashboard/dashboard/sheriff_config/service/__init__.py +third_party/catapult/dashboard/dashboard/sheriff_config/test_match_policy.py +third_party/catapult/dashboard/dashboard/sheriff_config/tests/auth-discovery.json third_party/catapult/dashboard/dashboard/sheriff_config/tests/config-discovery.json +third_party/catapult/dashboard/dashboard/sheriff_config/tests/test_luci_config_cases.py third_party/catapult/dashboard/dashboard/sheriff_config/tests/test_service_cases.py third_party/catapult/dashboard/dashboard/sheriff_config_client.py -third_party/catapult/dashboard/dashboard/spa/alerts-controls.js -third_party/catapult/dashboard/dashboard/spa/alerts-section.js -third_party/catapult/dashboard/dashboard/spa/alerts-section.test.js -third_party/catapult/dashboard/dashboard/spa/alerts-table.js -third_party/catapult/dashboard/dashboard/spa/chromeperf-app.js -third_party/catapult/dashboard/dashboard/spa/details-table.test.js -third_party/catapult/dashboard/dashboard/spa/report-cache-request.test.js -third_party/catapult/dashboard/dashboard/spa/report-controls.js -third_party/catapult/dashboard/dashboard/spa/report-section.test.js -third_party/catapult/dashboard/dashboard/spa/report-template.test.js -third_party/catapult/dashboard/dashboard/spa/utils.js third_party/catapult/dashboard/dashboard/speed_releasing_test.py third_party/catapult/dashboard/dashboard/static/alerts.html third_party/catapult/dashboard/dashboard/static/group_report.html @@ -4982,6 +5032,7 @@ third_party/catapult/third_party/graphy/graphy/backends/google_chart_api/base_en third_party/catapult/third_party/graphy/graphy/backends/google_chart_api/encoders.py third_party/catapult/third_party/gsutil/gslib/__main__.py third_party/catapult/third_party/gsutil/gslib/addlhelp/acls.py +third_party/catapult/third_party/gsutil/gslib/addlhelp/command_opts.py third_party/catapult/third_party/gsutil/gslib/addlhelp/crc32c.py third_party/catapult/third_party/gsutil/gslib/addlhelp/creds.py third_party/catapult/third_party/gsutil/gslib/addlhelp/dev.py @@ -4992,11 +5043,16 @@ third_party/catapult/third_party/gsutil/gslib/addlhelp/subdirs.py third_party/catapult/third_party/gsutil/gslib/addlhelp/support.py third_party/catapult/third_party/gsutil/gslib/addlhelp/versions.py third_party/catapult/third_party/gsutil/gslib/boto_resumable_upload.py +third_party/catapult/third_party/gsutil/gslib/command.py third_party/catapult/third_party/gsutil/gslib/commands/acl.py +third_party/catapult/third_party/gsutil/gslib/commands/bucketpolicyonly.py third_party/catapult/third_party/gsutil/gslib/commands/compose.py third_party/catapult/third_party/gsutil/gslib/commands/config.py +third_party/catapult/third_party/gsutil/gslib/commands/cors.py third_party/catapult/third_party/gsutil/gslib/commands/cp.py +third_party/catapult/third_party/gsutil/gslib/commands/defacl.py third_party/catapult/third_party/gsutil/gslib/commands/defstorageclass.py +third_party/catapult/third_party/gsutil/gslib/commands/hmac.py third_party/catapult/third_party/gsutil/gslib/commands/label.py third_party/catapult/third_party/gsutil/gslib/commands/lifecycle.py third_party/catapult/third_party/gsutil/gslib/commands/logging.py @@ -5005,23 +5061,29 @@ third_party/catapult/third_party/gsutil/gslib/commands/mb.py third_party/catapult/third_party/gsutil/gslib/commands/mv.py third_party/catapult/third_party/gsutil/gslib/commands/notification.py third_party/catapult/third_party/gsutil/gslib/commands/perfdiag.py +third_party/catapult/third_party/gsutil/gslib/commands/retention.py third_party/catapult/third_party/gsutil/gslib/commands/rsync.py third_party/catapult/third_party/gsutil/gslib/commands/signurl.py +third_party/catapult/third_party/gsutil/gslib/commands/ubla.py +third_party/catapult/third_party/gsutil/gslib/commands/versioning.py third_party/catapult/third_party/gsutil/gslib/commands/web.py -third_party/catapult/third_party/gsutil/gslib/copy_helper.py -third_party/catapult/third_party/gsutil/gslib/data/cacerts.txt third_party/catapult/third_party/gsutil/gslib/gcs_json_api.py third_party/catapult/third_party/gsutil/gslib/gcs_json_credentials.py -third_party/catapult/third_party/gsutil/gslib/hashing_helper.py -third_party/catapult/third_party/gsutil/gslib/iamhelpers.py +third_party/catapult/third_party/gsutil/gslib/iamcredentials_api.py third_party/catapult/third_party/gsutil/gslib/kms_api.py third_party/catapult/third_party/gsutil/gslib/metrics.py third_party/catapult/third_party/gsutil/gslib/pubsub_api.py +third_party/catapult/third_party/gsutil/gslib/tests/signurl_signatures.py +third_party/catapult/third_party/gsutil/gslib/tests/test_creds_config.py third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.json +third_party/catapult/third_party/gsutil/gslib/tests/test_hmac.py +third_party/catapult/third_party/gsutil/gslib/tests/test_kms.py third_party/catapult/third_party/gsutil/gslib/tests/test_ls.py third_party/catapult/third_party/gsutil/gslib/tests/test_perfdiag.py third_party/catapult/third_party/gsutil/gslib/tests/test_signurl.py third_party/catapult/third_party/gsutil/gslib/tests/testcase/integration_testcase.py +third_party/catapult/third_party/gsutil/gslib/third_party/iamcredentials_apitools/iamcredentials_v1_client.py +third_party/catapult/third_party/gsutil/gslib/third_party/iamcredentials_apitools/iamcredentials_v1_messages.py third_party/catapult/third_party/gsutil/gslib/third_party/kms_apitools/cloudkms_v1_client.py third_party/catapult/third_party/gsutil/gslib/third_party/kms_apitools/cloudkms_v1_messages.py third_party/catapult/third_party/gsutil/gslib/third_party/kms_apitools/resources.py @@ -5029,7 +5091,38 @@ third_party/catapult/third_party/gsutil/gslib/third_party/pubsub_apitools/pubsub third_party/catapult/third_party/gsutil/gslib/third_party/pubsub_apitools/pubsub_v1_messages.py third_party/catapult/third_party/gsutil/gslib/third_party/storage_apitools/storage_v1_client.py third_party/catapult/third_party/gsutil/gslib/third_party/storage_apitools/storage_v1_messages.py -third_party/catapult/third_party/gsutil/gslib/util.py +third_party/catapult/third_party/gsutil/gslib/utils/boto_util.py +third_party/catapult/third_party/gsutil/gslib/utils/constants.py +third_party/catapult/third_party/gsutil/gslib/utils/copy_helper.py +third_party/catapult/third_party/gsutil/gslib/utils/hashing_helper.py +third_party/catapult/third_party/gsutil/gslib/utils/iam_helper.py +third_party/catapult/third_party/gsutil/gslib/utils/system_util.py +third_party/catapult/third_party/gsutil/gslib/utils/text_util.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/cloudfront/__init__.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/cognito/identity/layer1.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/connection.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/ec2/connection.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/emr/emrobject.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/glacier/layer1.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/glacier/writer.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/gs/bucket.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/gs/connection.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/gs/key.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/gs/resumable_upload_handler.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/https_connection.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/iam/connection.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/rds/dbinstance.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/rds/dbsubnetgroup.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/s3/bucket.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/s3/key.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/boto/sts/connection.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/tests/integration/gs/test_resumable_uploads.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/tests/integration/rds/test_db_subnet_group.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/tests/integration/route53/test_health_check.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/tests/integration/s3/other_cacerts.txt +third_party/catapult/third_party/gsutil/gslib/vendored/boto/tests/integration/s3/test_https_cert_validation.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/tests/unit/auth/test_sigv4.py +third_party/catapult/third_party/gsutil/gslib/vendored/boto/tests/unit/emr/test_emr_responses.py third_party/catapult/third_party/gsutil/setup.py third_party/catapult/third_party/gsutil/third_party/apitools/apitools/base/protorpclite/messages.py third_party/catapult/third_party/gsutil/third_party/apitools/apitools/base/py/base_api_test.py @@ -5045,66 +5138,37 @@ third_party/catapult/third_party/gsutil/third_party/apitools/apitools/gen/messag third_party/catapult/third_party/gsutil/third_party/apitools/apitools/gen/service_registry.py third_party/catapult/third_party/gsutil/third_party/apitools/apitools/gen/testdata/dns/dns_v1.json third_party/catapult/third_party/gsutil/third_party/apitools/apitools/gen/util.py -third_party/catapult/third_party/gsutil/third_party/apitools/apitools/scripts/oauth2l.py -third_party/catapult/third_party/gsutil/third_party/apitools/apitools/scripts/oauth2l_test.py third_party/catapult/third_party/gsutil/third_party/apitools/apitools/scripts/testdata/fake_client_secrets.json third_party/catapult/third_party/gsutil/third_party/apitools/samples/bigquery_sample/bigquery_v2.json -third_party/catapult/third_party/gsutil/third_party/apitools/samples/bigquery_sample/bigquery_v2/bigquery_v2.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/bigquery_sample/bigquery_v2/bigquery_v2_client.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/bigquery_sample/bigquery_v2/bigquery_v2_messages.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/dns_sample/dns_v1.json -third_party/catapult/third_party/gsutil/third_party/apitools/samples/dns_sample/dns_v1/dns_v1.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/dns_sample/dns_v1/dns_v1_client.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/dns_sample/gen_dns_client_test.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/fusiontables_sample/fusiontables_v1.json -third_party/catapult/third_party/gsutil/third_party/apitools/samples/fusiontables_sample/fusiontables_v1/fusiontables_v1.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/fusiontables_sample/fusiontables_v1/fusiontables_v1_client.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/fusiontables_sample/fusiontables_v1/fusiontables_v1_messages.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/iam_sample/iam_client_test.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/iam_sample/iam_v1.json -third_party/catapult/third_party/gsutil/third_party/apitools/samples/iam_sample/iam_v1/iam_v1.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/iam_sample/iam_v1/iam_v1_client.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/iam_sample/iam_v1/iam_v1_messages.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/servicemanagement_sample/servicemanagement_v1.json -third_party/catapult/third_party/gsutil/third_party/apitools/samples/servicemanagement_sample/servicemanagement_v1/servicemanagement_v1.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/servicemanagement_sample/servicemanagement_v1/servicemanagement_v1_client.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/servicemanagement_sample/servicemanagement_v1/servicemanagement_v1_messages.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/storage_sample/storage_v1.json -third_party/catapult/third_party/gsutil/third_party/apitools/samples/storage_sample/storage_v1/storage_v1.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/storage_sample/storage_v1/storage_v1_client.py third_party/catapult/third_party/gsutil/third_party/apitools/samples/storage_sample/storage_v1/storage_v1_messages.py third_party/catapult/third_party/gsutil/third_party/apitools/setup.py third_party/catapult/third_party/gsutil/third_party/argcomplete/setup.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/cacerts/cacerts.txt -third_party/catapult/third_party/gsutil/third_party/boto/boto/cloudfront/__init__.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/cognito/identity/layer1.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/connection.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/ec2/connection.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/emr/emrobject.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/glacier/layer1.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/glacier/writer.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/gs/bucket.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/gs/connection.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/gs/key.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/gs/resumable_upload_handler.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/https_connection.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/iam/connection.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/rds/dbinstance.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/rds/dbsubnetgroup.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/s3/bucket.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/s3/key.py -third_party/catapult/third_party/gsutil/third_party/boto/boto/sts/connection.py -third_party/catapult/third_party/gsutil/third_party/boto/tests/integration/gs/test_resumable_uploads.py -third_party/catapult/third_party/gsutil/third_party/boto/tests/integration/rds/test_db_subnet_group.py -third_party/catapult/third_party/gsutil/third_party/boto/tests/integration/route53/test_health_check.py -third_party/catapult/third_party/gsutil/third_party/boto/tests/integration/s3/other_cacerts.txt -third_party/catapult/third_party/gsutil/third_party/boto/tests/integration/s3/test_https_cert_validation.py -third_party/catapult/third_party/gsutil/third_party/boto/tests/unit/auth/test_sigv4.py -third_party/catapult/third_party/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py third_party/catapult/third_party/gsutil/third_party/crcmod/setup.py third_party/catapult/third_party/gsutil/third_party/gcs-oauth2-boto-plugin/gcs_oauth2_boto_plugin/oauth2_client.py third_party/catapult/third_party/gsutil/third_party/gcs-oauth2-boto-plugin/gcs_oauth2_boto_plugin/oauth2_helper.py third_party/catapult/third_party/gsutil/third_party/gcs-oauth2-boto-plugin/setup.py +third_party/catapult/third_party/gsutil/third_party/google-reauth-python/google_reauth/_reauth_client.py +third_party/catapult/third_party/gsutil/third_party/google-reauth-python/google_reauth/challenges.py +third_party/catapult/third_party/gsutil/third_party/google-reauth-python/google_reauth/reauth.py +third_party/catapult/third_party/gsutil/third_party/google-reauth-python/setup.py +third_party/catapult/third_party/gsutil/third_party/google-reauth-python/tests/test_reauth.py third_party/catapult/third_party/gsutil/third_party/httplib2/Makefile third_party/catapult/third_party/gsutil/third_party/httplib2/index.html third_party/catapult/third_party/gsutil/third_party/httplib2/python2/httplib2/__init__.py @@ -5114,6 +5178,8 @@ third_party/catapult/third_party/gsutil/third_party/httplib2/python2/ssl_protoco third_party/catapult/third_party/gsutil/third_party/httplib2/python3/httplib2/__init__.py third_party/catapult/third_party/gsutil/third_party/httplib2/python3/httplib2/test/other_cacerts.txt third_party/catapult/third_party/gsutil/third_party/httplib2/python3/httplib2test.py +third_party/catapult/third_party/gsutil/third_party/httplib2/tests/test_external.py +third_party/catapult/third_party/gsutil/third_party/httplib2/tests/test_proxy.py third_party/catapult/third_party/gsutil/third_party/oauth2client/oauth2client/__init__.py third_party/catapult/third_party/gsutil/third_party/oauth2client/oauth2client/client.py third_party/catapult/third_party/gsutil/third_party/oauth2client/oauth2client/clientsecrets.py @@ -5254,14 +5320,7 @@ third_party/catapult/third_party/gsutil/third_party/pyasn1/tests/type/test_opent third_party/catapult/third_party/gsutil/third_party/pyasn1/tests/type/test_tag.py third_party/catapult/third_party/gsutil/third_party/pyasn1/tests/type/test_univ.py third_party/catapult/third_party/gsutil/third_party/pyasn1/tests/type/test_useful.py -third_party/catapult/third_party/gsutil/third_party/python-gflags/Makefile -third_party/catapult/third_party/gsutil/third_party/python-gflags/gflags.py -third_party/catapult/third_party/gsutil/third_party/python-gflags/gflags_validators.py -third_party/catapult/third_party/gsutil/third_party/python-gflags/setup.py -third_party/catapult/third_party/gsutil/third_party/python-gflags/tests/flags_modules_for_testing/module_bar.py -third_party/catapult/third_party/gsutil/third_party/python-gflags/tests/flags_modules_for_testing/module_foo.py -third_party/catapult/third_party/gsutil/third_party/python-gflags/tests/gflags_helpxml_test.py -third_party/catapult/third_party/gsutil/third_party/python-gflags/tests/gflags_validators_test.py +third_party/catapult/third_party/gsutil/third_party/pyu2f/setup.py third_party/catapult/third_party/gsutil/third_party/retry-decorator/setup.py third_party/catapult/third_party/gsutil/third_party/rsa/rsa/randnum.py third_party/catapult/third_party/html5lib-python/html5lib/serializer/htmlserializer.py @@ -5649,11 +5708,11 @@ third_party/chromevox/third_party/closure-library/closure/bin/build/treescan.py third_party/chromevox/third_party/closure-library/closure/goog/base.js third_party/chromite/.vscode/launch.json third_party/chromite/api/controller/controller_util.py -third_party/chromite/api/controller/controller_util_unittest.py third_party/chromite/api/gen/chromite/api/android_pb2.py third_party/chromite/api/gen/chromite/api/api_pb2.py third_party/chromite/api/gen/chromite/api/artifacts_pb2.py third_party/chromite/api/gen/chromite/api/binhost_pb2.py +third_party/chromite/api/gen/chromite/api/build_api_config_pb2.py third_party/chromite/api/gen/chromite/api/build_api_pb2.py third_party/chromite/api/gen/chromite/api/build_api_test_pb2.py third_party/chromite/api/gen/chromite/api/depgraph_pb2.py @@ -5665,6 +5724,7 @@ third_party/chromite/api/gen/chromite/api/sysroot_pb2.py third_party/chromite/api/gen/chromite/api/test_metadata_pb2.py third_party/chromite/api/gen/chromite/api/test_pb2.py third_party/chromite/api/gen/chromite/api/toolchain_pb2.py +third_party/chromite/api/gen/chromiumos/bot_scaling_pb2.py third_party/chromite/api/gen/chromiumos/branch_pb2.py third_party/chromite/api/gen/chromiumos/builder_config_pb2.py third_party/chromite/api/gen/chromiumos/common_pb2.py @@ -5672,6 +5732,16 @@ third_party/chromite/api/gen/chromiumos/generate_build_plan_pb2.py third_party/chromite/api/gen/chromiumos/metrics_pb2.py third_party/chromite/api/gen/chromiumos/payload_config_pb2.py third_party/chromite/api/gen/chromiumos/sign_image_pb2.py +third_party/chromite/api/gen/config/api/component_id_pb2.py +third_party/chromite/api/gen/config/api/component_pb2.py +third_party/chromite/api/gen/config/api/partner_id_pb2.py +third_party/chromite/api/gen/config/api/partner_pb2.py +third_party/chromite/api/gen/device/brand_id_pb2.py +third_party/chromite/api/gen/device/config_id_pb2.py +third_party/chromite/api/gen/device/config_pb2.py +third_party/chromite/api/gen/device/model_id_pb2.py +third_party/chromite/api/gen/device/platform_id_pb2.py +third_party/chromite/api/gen/device/variant_id_pb2.py third_party/chromite/api/gen/test_platform/autotest/dynamic_suite_pb2.py third_party/chromite/api/gen/test_platform/common/task_pb2.py third_party/chromite/api/gen/test_platform/config/config_pb2.py @@ -5679,6 +5749,7 @@ third_party/chromite/api/gen/test_platform/migration/scheduler/traffic_split_pb2 third_party/chromite/api/gen/test_platform/phosphorus/common_pb2.py third_party/chromite/api/gen/test_platform/phosphorus/prejob_pb2.py third_party/chromite/api/gen/test_platform/phosphorus/runtest_pb2.py +third_party/chromite/api/gen/test_platform/phosphorus/upload_to_gs_pb2.py third_party/chromite/api/gen/test_platform/phosphorus/upload_to_tko_pb2.py third_party/chromite/api/gen/test_platform/request_pb2.py third_party/chromite/api/gen/test_platform/side_effects/config_pb2.py @@ -5689,6 +5760,7 @@ third_party/chromite/api/gen/test_platform/skylab_local_state/multihost_pb2.py third_party/chromite/api/gen/test_platform/skylab_local_state/receive_pb2.py third_party/chromite/api/gen/test_platform/skylab_local_state/save_pb2.py third_party/chromite/api/gen/test_platform/skylab_local_state/serialize_pb2.py +third_party/chromite/api/gen/test_platform/skylab_test_runner/config_pb2.py third_party/chromite/api/gen/test_platform/skylab_test_runner/request_pb2.py third_party/chromite/api/gen/test_platform/skylab_test_runner/result_pb2.py third_party/chromite/api/gen/test_platform/skylab_tool/result_pb2.py @@ -5696,12 +5768,12 @@ third_party/chromite/api/gen/test_platform/steps/compute_backfill_pb2.py third_party/chromite/api/gen/test_platform/steps/enumeration_pb2.py third_party/chromite/api/gen/test_platform/steps/execution_pb2.py third_party/chromite/api/gen/test_platform/steps/scheduler_traffic_split_pb2.py +third_party/chromite/api/gen/test_platform/suite_scheduler/analytics_pb2.py third_party/chromite/api/gen/test_platform/taskstate_pb2.py third_party/chromite/cbuildbot/afdo.py third_party/chromite/cbuildbot/commands.py third_party/chromite/cbuildbot/commands_unittest.py third_party/chromite/cbuildbot/goma_util.py -third_party/chromite/cbuildbot/lkgm_manager_unittest.py third_party/chromite/cbuildbot/manifest_version_unittest.py third_party/chromite/cbuildbot/repository_unittest.py third_party/chromite/cbuildbot/stages/completion_stages.py @@ -6383,12 +6455,9 @@ third_party/chromite/lib/chrome_committer.py third_party/chromite/lib/chrome_committer_unittest.py third_party/chromite/lib/chrome_util.py third_party/chromite/lib/cipd.py -third_party/chromite/lib/clactions.py -third_party/chromite/lib/clactions_unittest.py third_party/chromite/lib/cloud_trace.py third_party/chromite/lib/config_lib.py third_party/chromite/lib/constants.py -third_party/chromite/lib/cq_config.py third_party/chromite/lib/cros_build_lib_unittest.py third_party/chromite/lib/gce.py third_party/chromite/lib/gclient.py @@ -6402,6 +6471,8 @@ third_party/chromite/lib/gs.py third_party/chromite/lib/gs_unittest.py third_party/chromite/lib/luci/prpc/client.py third_party/chromite/lib/metrics.py +third_party/chromite/lib/nebraska_wrapper.py +third_party/chromite/lib/nebraska_wrapper_unittest.py third_party/chromite/lib/patch.py third_party/chromite/lib/patch_unittest.py third_party/chromite/lib/paygen/paygen_build_lib_unittest.py @@ -6444,7 +6515,6 @@ third_party/chromite/scripts/upload_symbols.py third_party/chromite/signing/lib/firmware.py third_party/chromite/signing/lib/signer.py third_party/chromite/third_party/boto/boto/cacerts/cacerts.txt -third_party/chromite/third_party/digraph.py third_party/chromite/third_party/google/protobuf/__init__.py third_party/chromite/third_party/google/protobuf/descriptor.py third_party/chromite/third_party/google/protobuf/descriptor_database.py @@ -6678,8 +6748,9 @@ third_party/dawn/src/dawn_native/RenderPipeline.h third_party/dawn/src/dawn_native/Sampler.h third_party/dawn/src/dawn_native/ShaderModule.cpp third_party/dawn/src/dawn_native/ShaderModule.h +third_party/dawn/src/dawn_native/Surface.cpp +third_party/dawn/src/dawn_native/SwapChain.cpp third_party/dawn/src/dawn_native/Texture.h -third_party/dawn/src/dawn_native/Toggles.cpp third_party/dawn/src/dawn_native/d3d12/BindGroupD3D12.cpp third_party/dawn/src/dawn_native/d3d12/BufferD3D12.cpp third_party/dawn/src/dawn_native/d3d12/CommandBufferD3D12.cpp @@ -6693,6 +6764,7 @@ third_party/dawn/src/dawn_native/d3d12/TextureD3D12.cpp third_party/dawn/src/dawn_native/metal/CommandBufferMTL.mm third_party/dawn/src/dawn_native/metal/RenderPipelineMTL.mm third_party/dawn/src/dawn_native/metal/ShaderModuleMTL.mm +third_party/dawn/src/dawn_native/null/DeviceNull.cpp third_party/dawn/src/dawn_native/opengl/BackendGL.cpp third_party/dawn/src/dawn_native/opengl/BufferGL.cpp third_party/dawn/src/dawn_native/opengl/CommandBufferGL.cpp @@ -6714,8 +6786,8 @@ third_party/dawn/src/dawn_native/vulkan/VulkanInfo.h third_party/dawn/src/dawn_wire/client/ObjectAllocator.h third_party/dawn/src/dawn_wire/server/ObjectStorage.h third_party/dawn/src/fuzzers/DawnSPIRVCrossHLSLFastFuzzer.cpp +third_party/dawn/src/fuzzers/DawnSPVChlslFastFuzzer.cpp third_party/dawn/src/tests/DawnTest.cpp -third_party/dawn/src/tests/end2end/BindGroupTests.cpp third_party/dawn/src/tests/end2end/BufferTests.cpp third_party/dawn/src/tests/end2end/CompressedTextureFormatTests.cpp third_party/dawn/src/tests/end2end/ComputeCopyStorageBufferTests.cpp @@ -6723,6 +6795,7 @@ third_party/dawn/src/tests/end2end/IOSurfaceWrappingTests.cpp third_party/dawn/src/tests/end2end/IndexFormatTests.cpp third_party/dawn/src/tests/end2end/NonzeroTextureCreationTests.cpp third_party/dawn/src/tests/end2end/OpArrayLengthTests.cpp +third_party/dawn/src/tests/end2end/SwapChainValidationTests.cpp third_party/dawn/src/tests/end2end/TextureFormatTests.cpp third_party/dawn/src/tests/end2end/TextureViewTests.cpp third_party/dawn/src/tests/end2end/TextureZeroInitTests.cpp @@ -6975,7 +7048,8 @@ third_party/devtools-frontend/src/front_end/help/ReleaseNoteText.js third_party/devtools-frontend/src/front_end/inspector.html third_party/devtools-frontend/src/front_end/integration_test_runner.html third_party/devtools-frontend/src/front_end/js_app.html -third_party/devtools-frontend/src/front_end/main/Main.js +third_party/devtools-frontend/src/front_end/main/MainImpl.js +third_party/devtools-frontend/src/front_end/media/EventDisplayTable.js third_party/devtools-frontend/src/front_end/ndb_app.html third_party/devtools-frontend/src/front_end/network/NetworkConfigView.js third_party/devtools-frontend/src/front_end/network/NetworkLogView.js @@ -6991,6 +7065,7 @@ third_party/devtools-frontend/src/front_end/security/SecurityPanel.js third_party/devtools-frontend/src/front_end/settings/SettingsScreen.js third_party/devtools-frontend/src/front_end/sources/SourcesNavigator.js third_party/devtools-frontend/src/front_end/sources/SourcesView.js +third_party/devtools-frontend/src/front_end/third_party/fabricjs/fabric.js third_party/devtools-frontend/src/front_end/timeline/TimelinePanel.js third_party/devtools-frontend/src/front_end/timeline/TimelineUIUtils.js third_party/devtools-frontend/src/front_end/ui/SearchableView.js @@ -7007,6 +7082,14 @@ third_party/devtools-frontend/src/node_modules/@babel/parser/package.json third_party/devtools-frontend/src/node_modules/@babel/template/package.json third_party/devtools-frontend/src/node_modules/@babel/traverse/package.json third_party/devtools-frontend/src/node_modules/@babel/types/package.json +third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/lib/definition.js +third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/lib/index.js +third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/lib/pattern-visitor.js +third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/lib/reference.js +third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/lib/referencer.js +third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/lib/scope-manager.js +third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/lib/scope.js +third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/lib/variable.js third_party/devtools-frontend/src/node_modules/acorn-walk/package.json third_party/devtools-frontend/src/node_modules/acorn/dist/acorn.js third_party/devtools-frontend/src/node_modules/acorn/package.json @@ -7098,6 +7181,7 @@ third_party/devtools-frontend/src/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/decamelize/package.json third_party/devtools-frontend/src/node_modules/defaults/package.json third_party/devtools-frontend/src/node_modules/di/package.json +third_party/devtools-frontend/src/node_modules/diff-match-patch/index.js third_party/devtools-frontend/src/node_modules/diff/dist/diff.js third_party/devtools-frontend/src/node_modules/diff/dist/diff.min.js third_party/devtools-frontend/src/node_modules/diff/lib/convert/dmp.js @@ -7221,6 +7305,12 @@ third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-co third_party/devtools-frontend/src/node_modules/istanbul/package.json third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/package.json third_party/devtools-frontend/src/node_modules/js-yaml/package.json +third_party/devtools-frontend/src/node_modules/jsondiffpatch/dist/jsondiffpatch.cjs.js +third_party/devtools-frontend/src/node_modules/jsondiffpatch/dist/jsondiffpatch.esm.js +third_party/devtools-frontend/src/node_modules/jsondiffpatch/dist/jsondiffpatch.umd.js +third_party/devtools-frontend/src/node_modules/jsondiffpatch/dist/jsondiffpatch.umd.slim.js +third_party/devtools-frontend/src/node_modules/jsondiffpatch/dist/jsondiffpatch.umd.test.js +third_party/devtools-frontend/src/node_modules/jsondiffpatch/package.json third_party/devtools-frontend/src/node_modules/jsonfile/package.json third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/package.json third_party/devtools-frontend/src/node_modules/karma-coverage/examples/coffee-requirejs/package.json @@ -7332,6 +7422,7 @@ third_party/devtools-frontend/src/node_modules/read-pkg-up/package.json third_party/devtools-frontend/src/node_modules/read-pkg/package.json third_party/devtools-frontend/src/node_modules/readable-stream/errors-browser.js third_party/devtools-frontend/src/node_modules/readable-stream/errors.js +third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/package.json third_party/devtools-frontend/src/node_modules/redent/package.json third_party/devtools-frontend/src/node_modules/repeating/package.json third_party/devtools-frontend/src/node_modules/require-directory/package.json @@ -7516,6 +7607,7 @@ third_party/ffmpeg/libavcodec/aliaspixdec.c third_party/ffmpeg/libavcodec/aliaspixenc.c third_party/ffmpeg/libavcodec/atrac9dec.c third_party/ffmpeg/libavcodec/atrac9tab.h +third_party/ffmpeg/libavcodec/av1_frame_merge_bsf.c third_party/ffmpeg/libavcodec/av1_frame_split_bsf.c third_party/ffmpeg/libavcodec/av1_parser.c third_party/ffmpeg/libavcodec/avs2_parser.c @@ -7694,6 +7786,7 @@ third_party/ffmpeg/libavformat/apngdec.c third_party/ffmpeg/libavformat/asf.c third_party/ffmpeg/libavformat/async.c third_party/ffmpeg/libavformat/av1.c +third_party/ffmpeg/libavformat/av1dec.c third_party/ffmpeg/libavformat/c93.c third_party/ffmpeg/libavformat/dnxhddec.c third_party/ffmpeg/libavformat/ftp.c @@ -7889,24 +7982,12 @@ third_party/google_input_tools/third_party/closure_library/closure/goog/uri/util third_party/google_input_tools/third_party/closure_library/closure/goog/useragent/useragent.js third_party/google_input_tools/third_party/closure_library/third_party/closure/goog/mochikit/async/deferred.js third_party/googletest/src/googlemock/scripts/fuse_gmock_files.py -third_party/googletest/src/googlemock/scripts/generator/cpp/ast.py -third_party/googletest/src/googlemock/scripts/generator/cpp/gmock_class.py -third_party/googletest/src/googlemock/scripts/generator/cpp/gmock_class_test.py -third_party/googletest/src/googlemock/scripts/generator/cpp/keywords.py -third_party/googletest/src/googlemock/scripts/generator/cpp/tokenize.py -third_party/googletest/src/googlemock/scripts/generator/cpp/utils.py -third_party/googletest/src/googlemock/scripts/generator/gmock_gen.py -third_party/googletest/src/googlemock/scripts/gmock_doctor.py -third_party/googletest/src/googlemock/scripts/upload.py -third_party/googletest/src/googlemock/scripts/upload_gmock.py third_party/googletest/src/googlemock/src/gmock_main.cc third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h -third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h third_party/googletest/src/googletest/scripts/common.py third_party/googletest/src/googletest/scripts/fuse_gtest_files.py third_party/googletest/src/googletest/scripts/gen_gtest_pred_impl.py -third_party/googletest/src/googletest/scripts/pump.py third_party/googletest/src/googletest/scripts/release_docs.py third_party/googletest/src/googletest/scripts/upload.py third_party/googletest/src/googletest/scripts/upload_gtest.py @@ -7972,7 +8053,6 @@ third_party/harfbuzz-ng/src/docs/harfbuzz-docs.xml third_party/harfbuzz-ng/src/docs/usermanual-install-harfbuzz.xml third_party/harfbuzz-ng/src/docs/usermanual-opentype-features.xml third_party/harfbuzz-ng/src/docs/usermanual-what-is-harfbuzz.xml -third_party/harfbuzz-ng/src/src/HBIndicVowelConstraints.txt third_party/harfbuzz-ng/src/src/gen-os2-unicode-ranges.py third_party/harfbuzz-ng/src/src/hb-buffer.cc third_party/harfbuzz-ng/src/src/hb-common.cc @@ -8021,7 +8101,6 @@ third_party/harfbuzz-ng/src/src/hb-ot-shape-complex-myanmar.cc third_party/harfbuzz-ng/src/src/hb-ot-shape-complex-myanmar.hh third_party/harfbuzz-ng/src/src/hb-ot-shape-complex-use.cc third_party/harfbuzz-ng/src/src/hb-ot-shape-complex-use.hh -third_party/harfbuzz-ng/src/src/hb-ot-shape-complex-vowel-constraints.cc third_party/harfbuzz-ng/src/src/hb-ot-stat-table.hh third_party/harfbuzz-ng/src/src/hb-ot-tag.cc third_party/harfbuzz-ng/src/src/hb-ot-var-avar-table.hh @@ -8107,6 +8186,7 @@ third_party/icu/source/i18n/unicode/udat.h third_party/icu/source/tools/toolutil/pkg_genc.cpp third_party/inspector_protocol/crdtp/cbor.cc third_party/inspector_protocol/crdtp/json.cc +third_party/inspector_protocol/crdtp/serializer_traits_test.cc third_party/inspector_protocol/roll.py third_party/instrumented_libraries/scripts/unpack_binaries.py third_party/isimpledom/ISimpleDOMDocument.idl @@ -8236,7 +8316,6 @@ third_party/libjingle_xmpp/xmpp/constants.cc third_party/libjingle_xmpp/xmpp/xmppclient.cc third_party/libjingle_xmpp/xmpp/xmppengine_unittest.cc third_party/libjingle_xmpp/xmpp/xmpplogintask_unittest.cc -third_party/libjpeg/jconfig.h third_party/liblouis/src/liblouis/metadata.c third_party/liblouis/src/python/louis/__init__.py.in third_party/liblouis/src/tests/check_metadata.c @@ -8247,7 +8326,6 @@ third_party/liblouis/src/tools/brl_checks.c third_party/liblouis/src/tools/brl_checks.h third_party/liblouis/src/tools/gnulib/getprogname.c third_party/liblouis/src/tools/gnulib/msvc-inval.h -third_party/liblouis/wasm/liblouis_wasm.js third_party/libphonenumber/dist/cpp/src/phonenumbers/phonenumbermatcher.h third_party/libphonenumber/dist/cpp/test/phonenumbers/phonenumberutil_test.cc third_party/libphonenumber/dist/java/demo/war/WEB-INF/appengine-web.xml @@ -8475,6 +8553,7 @@ third_party/llvm/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cpp third_party/llvm/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.h third_party/llvm/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp third_party/llvm/compiler-rt/lib/sanitizer_common/scripts/cpplint.py +third_party/llvm/compiler-rt/lib/scudo/standalone/platform.h third_party/llvm/compiler-rt/test/asan/TestCases/Darwin/address-range-limit.mm third_party/llvm/compiler-rt/test/asan/TestCases/Darwin/cstring_literals_regtest.mm third_party/llvm/compiler-rt/test/asan/TestCases/Darwin/linked-only.cpp @@ -8545,7 +8624,6 @@ third_party/llvm/lldb/CODE_OWNERS.txt third_party/llvm/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py third_party/llvm/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/main.cpp third_party/llvm/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py -third_party/llvm/lldb/scripts/Python/remote-build.py third_party/llvm/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp third_party/llvm/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp third_party/llvm/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h @@ -8994,7 +9072,10 @@ third_party/openh264/src/module/task_utils.py third_party/openh264/src/module/task_utils_generated.h third_party/openh264/src/test/build/windowsphone/codec_ut/CodecUTApp/Properties/AppManifest.xml third_party/openh264/src/test/build/windowsphone/codec_ut/CodecUTApp/Properties/WMAppManifest.xml -third_party/openscreen/src/tools/clang/scripts/update.py +third_party/openscreen/src/build/config/BUILDCONFIG.gn +third_party/openscreen/src/build/scripts/install-sysroot.py +third_party/openscreen/src/build/toolchain/linux/BUILD.gn +third_party/openscreen/src/testing/libfuzzer/BUILD.gn third_party/openscreen/src/util/crypto/rsa_private_key_unittest.cc third_party/opus/src/doc/draft-ietf-codec-oggopus.xml third_party/opus/src/doc/draft-ietf-codec-opus-update.xml @@ -9045,6 +9126,7 @@ third_party/pdfium/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp third_party/pdfium/public/PRESUBMIT.py third_party/pdfium/skia/config/SkUserConfig.h third_party/pdfium/testing/gtest/BUILD.gn +third_party/pdfium/testing/tools/PRESUBMIT.py third_party/pdfium/testing/tools/gold.py third_party/pdfium/testing/tools/safetynet_compare.py third_party/pdfium/third_party/agg23/agg_math.h @@ -9056,6 +9138,7 @@ third_party/pdfium/third_party/libopenjpeg20/opj_includes.h third_party/pdfium/third_party/libopenjpeg20/opj_inttypes.h third_party/pdfium/third_party/libopenjpeg20/opj_stdint.h third_party/pdfium/third_party/libopenjpeg20/t2.c +third_party/pdfium/third_party/libtiff/tif_ojpeg.c third_party/pdfium/third_party/skia_shared/SkFloatToDecimal.cpp third_party/pdfium/tools/lsan/lsan_suppressions.txt third_party/pdfium/xfa/fgas/font/cfgas_fontmgr.cpp @@ -9082,6 +9165,7 @@ third_party/perfetto/src/android_internal/health_hal.cc third_party/perfetto/src/profiling/memory/client.cc third_party/perfetto/src/profiling/memory/proc_utils.cc third_party/perfetto/src/profiling/memory/sampler.h +third_party/perfetto/src/profiling/memory/shared_ring_buffer.cc third_party/perfetto/src/profiling/memory/system_property.h third_party/perfetto/src/trace_processor/forwarding_trace_parser.cc third_party/perfetto/src/trace_processor/ftrace_utils.cc @@ -9876,14 +9960,6 @@ third_party/s2cellid/src/s2/s2coords.h third_party/s2cellid/src/s2/s2latlng.cc third_party/s2cellid/src/s2/s2latlng.h third_party/s2cellid/src/s2/s2point.h -third_party/sfntly/src/cpp/data/fonts/cabin/OFL.txt -third_party/sfntly/src/cpp/data/fonts/cabinsketch/OFL.txt -third_party/sfntly/src/cpp/data/fonts/comfortaa/OFL.txt -third_party/sfntly/src/cpp/data/fonts/dancingscript/OFL.txt -third_party/sfntly/src/cpp/data/fonts/didactgothic/OFL.txt -third_party/sfntly/src/cpp/data/fonts/forum/OFL.txt -third_party/sfntly/src/cpp/src/sfntly/table/core/name_table.h -third_party/sfntly/src/java/quickstart.txt third_party/shaderc/src/libshaderc_util/include/libshaderc_util/universal_unistd.h third_party/simplejson/ordered_dict.py third_party/skia/PRESUBMIT.py @@ -9899,11 +9975,13 @@ third_party/skia/gm/addarc.cpp third_party/skia/gm/annotated_text.cpp third_party/skia/gm/bitmapshader.cpp third_party/skia/gm/blurroundrect.cpp +third_party/skia/gm/crbug_224618.cpp third_party/skia/gm/dashcubics.cpp third_party/skia/gm/labyrinth.cpp third_party/skia/gm/pictureshader.cpp third_party/skia/gm/postercircle.cpp third_party/skia/gm/smallarc.cpp +third_party/skia/gm/smallpaths.cpp third_party/skia/gm/stringart.cpp third_party/skia/gm/strokerect.cpp third_party/skia/gm/strokes.cpp @@ -10013,8 +10091,8 @@ third_party/skia/src/core/SkMipMap.cpp third_party/skia/src/core/SkPoint3.cpp third_party/skia/src/core/SkRecordDraw.cpp third_party/skia/src/core/SkRecordOpts.cpp -third_party/skia/src/core/SkVM.cpp third_party/skia/src/effects/imagefilters/SkDisplacementMapEffect.cpp +third_party/skia/src/gpu/GrDistanceFieldGenFromVector.cpp third_party/skia/src/gpu/GrDrawingManager.cpp third_party/skia/src/gpu/GrRenderTargetContext.cpp third_party/skia/src/gpu/GrRenderTask.h @@ -10057,6 +10135,7 @@ third_party/skia/third_party/dawn/BUILD.gn third_party/skia/third_party/etc1/etc1.cpp third_party/skia/third_party/etc1/etc1.h 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/add_codereview_message.py third_party/skia/tools/android/upload_to_android.py third_party/skia/tools/chrome_release_branch.py @@ -10107,12 +10186,12 @@ third_party/sqlite/patched/src/main.c third_party/sqlite/patched/src/os_unix.c third_party/sqlite/patched/src/pager.c third_party/sqlite/patched/vsixtest/MainPage.xaml.cpp -third_party/sqlite/sqlite-src-3300100/ext/misc/zipfile.c -third_party/sqlite/sqlite-src-3300100/src/date.c -third_party/sqlite/sqlite-src-3300100/src/main.c -third_party/sqlite/sqlite-src-3300100/src/os_unix.c -third_party/sqlite/sqlite-src-3300100/src/pager.c -third_party/sqlite/sqlite-src-3300100/vsixtest/MainPage.xaml.cpp +third_party/sqlite/sqlite-src-3310100/ext/misc/zipfile.c +third_party/sqlite/sqlite-src-3310100/src/date.c +third_party/sqlite/sqlite-src-3310100/src/main.c +third_party/sqlite/sqlite-src-3310100/src/os_unix.c +third_party/sqlite/sqlite-src-3310100/src/pager.c +third_party/sqlite/sqlite-src-3310100/vsixtest/MainPage.xaml.cpp third_party/swiftshader/.vscode/tasks.json third_party/swiftshader/AUTHORS.txt third_party/swiftshader/CONTRIBUTING.txt @@ -10646,6 +10725,7 @@ third_party/webgl/src/sdk/tests/deqp/temp_externs/w3c_xml.js third_party/webgl/src/sdk/tests/deqp/temp_externs/webkit_css.js third_party/webgl/src/sdk/tests/deqp/temp_externs/webkit_dom.js third_party/webgl/src/sdk/tests/deqp/temp_externs/window.js +third_party/webgl/src/sdk/tests/extra/workload-simulator.html third_party/webgl/src/sdk/tests/js/webgl-test-harness.js third_party/webgl/src/sdk/tests/js/webgl-test-utils.js third_party/webgl/src/specs/2.0.0/index.html @@ -10695,7 +10775,6 @@ third_party/webrtc/modules/audio_device/win/core_audio_utility_win.h third_party/webrtc/modules/audio_processing/agc2/rnn_vad/rnn.cc third_party/webrtc/modules/audio_processing/audio_processing_impl.cc third_party/webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc -third_party/webrtc/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc third_party/webrtc/modules/audio_processing/gain_control_unittest.cc third_party/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/export.py third_party/webrtc/modules/audio_processing/transient/file_utils.h @@ -10752,7 +10831,6 @@ third_party/webrtc/rtc_base/numerics/safe_minmax.h third_party/webrtc/rtc_base/physical_socket_server.cc third_party/webrtc/rtc_base/physical_socket_server_unittest.cc third_party/webrtc/rtc_base/platform_thread_types.cc -third_party/webrtc/rtc_base/socket_adapters.cc third_party/webrtc/rtc_base/ssl_roots.h third_party/webrtc/rtc_base/ssl_stream_adapter_unittest.cc third_party/webrtc/rtc_base/system/arch.h @@ -10786,7 +10864,6 @@ third_party/webrtc/tools_webrtc/autoroller/unittests/roll_deps_test.py third_party/webrtc/tools_webrtc/mb/gn_isolate_map.pyl third_party/webrtc/tools_webrtc/mb/mb.py third_party/webrtc/tools_webrtc/network_emulator/emulate.py -third_party/webrtc/tools_webrtc/perf/histogram_util_test.py third_party/webrtc/tools_webrtc/perf/webrtc_dashboard_upload.py third_party/webrtc/tools_webrtc/sanitizers/lsan_suppressions_webrtc.cc third_party/webrtc/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc @@ -10826,6 +10903,7 @@ third_party/wuffs/src/test/data/artificial/gif-frame-out-of-bounds.gif.make-arti third_party/xdg-utils/scripts/desc/xdg-settings.xml third_party/yasm/source/patched-yasm/Mkfiles/vc10/vsyasm.xml third_party/yasm/source/patched-yasm/Mkfiles/vc12/vsyasm.xml +third_party/zlib/deflate.c third_party/zlib/google/compression_utils_portable.cc third_party/zlib/google/zip_reader.h tools/accessibility/nvda/README.txt @@ -10847,7 +10925,6 @@ tools/android/tracing/systrace-extract-startup.py tools/binary_size/PRESUBMIT.py tools/binary_size/diagnose_bloat.py tools/binary_size/generate_milestone_reports.py -tools/binary_size/generate_official_build_report.py tools/binary_size/libsupersize/console.py tools/binary_size/libsupersize/html_report.py tools/binary_size/libsupersize/static/index.html @@ -10905,15 +10982,6 @@ tools/find_runtime_symbols/PRESUBMIT.py tools/flags/list_flags.py tools/generate_stubs/generate_stubs.py tools/git/suggest_owners.py -tools/gn/base/command_line.cc -tools/gn/base/compiler_specific.h -tools/gn/base/files/file_util_posix.cc -tools/gn/base/files/file_util_win.cc -tools/gn/base/memory/scoped_refptr.h -tools/gn/base/optional.h -tools/gn/base/values.h -tools/gn/base/win/registry.cc -tools/gn/base/win/registry.h tools/gn/bootstrap/bootstrap.py tools/gn/infra/recipe_modules/macos_sdk/__init__.py tools/gn/infra/recipes.py @@ -10926,14 +10994,22 @@ tools/gn/infra/recipes/gn.expected/cq_linux.json tools/gn/infra/recipes/gn.expected/cq_mac.json tools/gn/infra/recipes/gn.expected/cq_win.json tools/gn/infra/recipes/gn.py +tools/gn/misc/vim/gn-format.py tools/gn/roll_gn.py -tools/gn/tools/gn/args.cc -tools/gn/tools/gn/misc/vim/gn-format.py -tools/gn/tools/gn/standard_out.cc -tools/gn/tools/gn/xcode_object.h -tools/gn/util/build_config.h -tools/gn/util/semaphore.cc -tools/gn/util/semaphore.h +tools/gn/src/base/command_line.cc +tools/gn/src/base/compiler_specific.h +tools/gn/src/base/files/file_util_posix.cc +tools/gn/src/base/files/file_util_win.cc +tools/gn/src/base/memory/scoped_refptr.h +tools/gn/src/base/values.h +tools/gn/src/base/win/registry.cc +tools/gn/src/base/win/registry.h +tools/gn/src/gn/args.cc +tools/gn/src/gn/standard_out.cc +tools/gn/src/gn/xcode_object.h +tools/gn/src/util/build_config.h +tools/gn/src/util/semaphore.cc +tools/gn/src/util/semaphore.h tools/grit/PRESUBMIT.py tools/grit/grit/format/chrome_messages_json.py tools/grit/grit/format/rc.py @@ -11005,7 +11081,9 @@ tools/metrics/md2xml.py tools/metrics/rappor/PRESUBMIT.py tools/metrics/rappor/rappor.xml tools/metrics/rappor/rappor_model_test.py +tools/metrics/structured/PRESUBMIT.py tools/metrics/structured/structured.xml +tools/metrics/structured/validate_format.py tools/metrics/ukm/PRESUBMIT.py tools/metrics/ukm/ukm.xml tools/metrics/ukm/ukm_model_test.py @@ -11045,6 +11123,7 @@ tools/perf/cli_tools/update_wpr/update_wpr.py tools/perf/cli_tools/update_wpr/update_wpr_unittest.py tools/perf/contrib/blink_layoutng_perf/blink_layoutng_perf.py tools/perf/contrib/blink_layoutng_perf/loading_layout_ng.py +tools/perf/contrib/cluster_telemetry/ad_tagging_ct.py tools/perf/contrib/cluster_telemetry/ct_benchmarks_util.py tools/perf/contrib/cluster_telemetry/generic_trace.py tools/perf/contrib/cluster_telemetry/skpicture_printer.py @@ -11066,6 +11145,8 @@ tools/perf/core/results_dashboard.py tools/perf/core/results_dashboard_unittest.py tools/perf/core/results_merger.py tools/perf/core/results_processor/formatters/json3_output.py +tools/perf/core/results_processor/processor_test.py +tools/perf/core/results_processor/processor_unittest.py tools/perf/core/retrieve_story_timing.py tools/perf/core/services/buildbucket_service.py tools/perf/core/services/dashboard_service.py @@ -11073,16 +11154,15 @@ tools/perf/core/services/isolate_service.py tools/perf/core/services/pinpoint_service.py tools/perf/core/services/request.py tools/perf/core/shard_maps/timing_data/android-nexus5x-perf-fyi_timing.json -tools/perf/core/shard_maps/timing_data/android-nexus5x-perf_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_timing.json tools/perf/core/shard_maps/timing_data/android_nexus5_perf_timing.json tools/perf/core/shard_maps/timing_data/android_nexus5x_webview_perf_timing.json -tools/perf/core/shard_maps/timing_data/android_nexus6_webview_perf_timing.json tools/perf/core/shard_maps/timing_data/linux-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-10_12_laptop_low_end-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-10_13_laptop_high_end-perf_timing.json tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json +tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json tools/perf/core/shard_maps/timing_data/win_7_nvidia_gpu_perf_timing.json tools/perf/core/shard_maps/timing_data/win_7_perf_timing.json tools/perf/core/test_data/benchmarks_to_shard.json @@ -11091,6 +11171,7 @@ tools/perf/core/test_data/test_timing_data_1_build.json tools/perf/examples/pinpoint_cli/try_job.json 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 tools/perf/page_sets/cros_ui_cases.py tools/perf/page_sets/data/intl_ar_fa_he.json @@ -11274,6 +11355,7 @@ tools/swarming_client/tests/file_path_test.py tools/swarming_client/tests/isolate_storage_test.py tools/swarming_client/tests/isolateserver_smoke_test.py tools/swarming_client/tests/run_isolated_smoke_test.py +tools/swarming_client/tests/run_isolated_test.py tools/swarming_client/tests/subprocess42_test.py tools/swarming_client/third_party/README.txt tools/swarming_client/third_party/depot_tools/fix_encoding.py @@ -11333,8 +11415,9 @@ tools/swarming_client/third_party/googleapiclient/schema.py tools/swarming_client/third_party/httplib2/python2/httplib2/__init__.py tools/swarming_client/third_party/httplib2/python3/httplib2/__init__.py tools/swarming_client/third_party/infra_libs/bqh.py -tools/swarming_client/third_party/infra_libs/event_mon/config.py tools/swarming_client/third_party/infra_libs/httplib2_utils.py +tools/swarming_client/third_party/infra_libs/luci_auth.py +tools/swarming_client/third_party/infra_libs/luci_ctx.py tools/swarming_client/third_party/infra_libs/ts_mon/common/monitors.py tools/swarming_client/third_party/infra_libs/ts_mon/config.py tools/swarming_client/third_party/oauth2client/__init__.py @@ -11475,9 +11558,12 @@ ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js ui/accessibility/extensions/chromevoxclassic/manifest.json.jinja2 ui/accessibility/extensions/strings/accessibility_extensions_strings.grd ui/accessibility/platform/ax_platform_node_delegate_utils_win.cc +ui/accessibility/platform/ax_platform_node_textrangeprovider_win_unittest.cc +ui/accessibility/platform/ax_platform_node_win.cc ui/android/java/res/values/strings.xml ui/aura/native_window_occlusion_tracker_win.cc ui/base/clipboard/clipboard_format_type.h +ui/base/clipboard/clipboard_format_type_win.cc ui/base/clipboard/clipboard_test_template.h ui/base/clipboard/clipboard_util_mac_unittest.mm ui/base/clipboard/clipboard_util_win.cc @@ -11504,6 +11590,7 @@ ui/base/resource/resource_bundle.h ui/base/test/ui_controls_internal_win.cc ui/base/win/lock_state.cc ui/base/x/x11_window.cc +ui/display/display_transform.cc ui/events/android/motion_event_android_unittest.cc ui/events/blink/blink_event_util.cc ui/events/blink/prediction/linear_resampling.h @@ -11549,8 +11636,6 @@ ui/gfx/font_fallback_win.h ui/gfx/font_names_testing.cc ui/gfx/icon_util.cc ui/gfx/icon_util.h -ui/gfx/platform_font_win.cc -ui/gfx/platform_font_win.h ui/gfx/render_text_unittest.cc ui/gfx/text_elider_unittest.cc ui/gfx/transform.cc @@ -11567,7 +11652,7 @@ ui/login/account_picker/chromeos_user_pod_row.js ui/login/account_picker/chromeos_user_pod_template.html ui/login/account_picker/user_pod_template.html ui/native_theme/native_theme_win.h -ui/ozone/platform/wayland/host/wayland_window.cc +ui/ozone/platform/wayland/host/xdg_popup_wrapper_impl.cc ui/resources/PRESUBMIT.py ui/resources/resource_check/ico_files.py ui/resources/resource_check/resource_scale_factors.py @@ -11585,6 +11670,8 @@ ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard.html ui/webui/resources/cr_elements/chromeos/cr_picture/cr_png_behavior.js ui/webui/resources/cr_elements/icons.html ui/webui/resources/js/ios/web_ui.js +url/BUILD.gn +url/android/gurl_android_unittest.cc url/gurl.h url/gurl_unittest.cc url/ipc/url_param_traits_unittest.cc @@ -11633,6 +11720,7 @@ v8/src/inspector/v8-console.h v8/src/inspector/v8-regex.cc v8/src/libsampler/sampler.cc v8/src/objects/intl-objects.cc +v8/src/objects/js-array-buffer.h v8/src/objects/js-number-format.cc v8/src/objects/map.h v8/src/objects/maybe-object.h @@ -11660,9 +11748,11 @@ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h v8/src/wasm/baseline/x64/liftoff-assembler-x64.h v8/src/wasm/module-decoder.cc v8/src/wasm/wasm-code-manager.cc +v8/src/wasm/wasm-feature-flags.h v8/testing/gtest/BUILD.gn v8/third_party/inspector_protocol/crdtp/cbor.cc v8/third_party/inspector_protocol/crdtp/json.cc +v8/third_party/inspector_protocol/crdtp/serializer_traits_test.cc v8/third_party/inspector_protocol/roll.py v8/tools/SourceMap.js v8/tools/callstats.html @@ -11699,5 +11789,5 @@ v8/tools/unittests/testdata/test2.json v8/tools/unittests/testdata/test3.json v8/tools/v8.xcodeproj/README.txt v8/tools/visual_studio/README.txt -weblayer/renderer/content_renderer_client_impl.cc +weblayer/browser/ssl_error_handler.cc weblayer/shell/app/shell_main_params.cc diff --git a/patches/core/bromite/disable-fetching-field-trials.patch b/patches/core/bromite/disable-fetching-field-trials.patch index 449f5fcc..968b99d9 100644 --- a/patches/core/bromite/disable-fetching-field-trials.patch +++ b/patches/core/bromite/disable-fetching-field-trials.patch @@ -8,8 +8,8 @@ Subject: Disable fetching of all field trials components/variations/service/variations_service.cc | 4 ++++ 2 files changed, 7 insertions(+), 9 deletions(-) ---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java +--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java ++++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java @@ -108,10 +108,7 @@ public abstract class ChromeFeatureList */ public static int getFieldTrialParamByFeatureAsInt( @@ -48,7 +48,7 @@ Subject: Disable fetching of all field trials // Alphabetical: --- a/components/variations/service/variations_service.cc +++ b/components/variations/service/variations_service.cc -@@ -241,17 +241,7 @@ bool GetInstanceManipulations(const net: +@@ -242,17 +242,7 @@ bool GetInstanceManipulations(const net: // Variations seed fetching is only enabled in official Chrome builds, if a URL // is specified on the command line, and for testing. bool IsFetchingEnabled() { diff --git a/patches/core/debian/disable/unrar.patch b/patches/core/debian/disable/unrar.patch index ee39301b..e4c8b39c 100644 --- a/patches/core/debian/disable/unrar.patch +++ b/patches/core/debian/disable/unrar.patch @@ -15,8 +15,8 @@ bug: http://bugs.debian.org/914487 StartExtractDmgFeatures(); --- a/chrome/common/safe_browsing/BUILD.gn +++ b/chrome/common/safe_browsing/BUILD.gn -@@ -78,41 +78,6 @@ if (safe_browsing_mode == 1) { - ] +@@ -72,39 +72,6 @@ if (safe_browsing_mode == 1) { + public_deps = [ "//components/safe_browsing/core:csd_proto" ] } - source_set("rar_analyzer") { @@ -31,7 +31,7 @@ bug: http://bugs.debian.org/914487 - ":file_type_policies", - "//base", - "//base:i18n", -- "//components/safe_browsing:features", +- "//components/safe_browsing/core:features", - "//third_party/unrar:unrar", - ] - @@ -49,20 +49,18 @@ bug: http://bugs.debian.org/914487 - "UNRAR_NO_EXCEPTIONS", - ] - -- public_deps = [ -- "//components/safe_browsing:csd_proto", -- ] +- public_deps = [ "//components/safe_browsing/core:csd_proto" ] - } - source_set("disk_image_type_sniffer_mac") { sources = [ "disk_image_type_sniffer_mac.cc", -@@ -185,7 +150,6 @@ source_set("safe_browsing") { +@@ -171,7 +138,6 @@ source_set("safe_browsing") { ":archive_analyzer_results", ":binary_feature_extractor", ":download_type_util", - ":rar_analyzer", - "//components/safe_browsing:features", + "//components/safe_browsing/core:features", ] --- a/chrome/services/file_util/safe_archive_analyzer.cc 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 956c7091..6f965c09 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 -@@ -3097,8 +3097,6 @@ jumbo_static_library("browser") { +@@ -3105,8 +3105,6 @@ jumbo_static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -50,7 +50,7 @@ virtual subresource_filter::RulesetService* --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -69,7 +69,6 @@ +@@ -67,7 +67,6 @@ #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h" @@ -58,7 +58,7 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/site_isolation/prefs_observer.h" #include "chrome/browser/ssl/secure_origin_prefs_observer.h" -@@ -362,8 +361,6 @@ void BrowserProcessImpl::StartTearDown() +@@ -356,8 +355,6 @@ void BrowserProcessImpl::StartTearDown() metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -67,7 +67,7 @@ network_time_tracker_.reset(); #if BUILDFLAG(ENABLE_PLUGINS) plugins_resource_service_.reset(); -@@ -952,22 +949,6 @@ StatusTray* BrowserProcessImpl::status_t +@@ -957,22 +954,6 @@ StatusTray* BrowserProcessImpl::status_t return status_tray_.get(); } @@ -90,7 +90,7 @@ subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1223,26 +1204,6 @@ void BrowserProcessImpl::CreateBackgroun +@@ -1225,26 +1206,6 @@ void BrowserProcessImpl::CreateBackgroun #endif } @@ -146,10 +146,10 @@ #include "chrome/browser/previews/previews_service_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" - #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/translate/chrome_translate_client.h" - #include "chrome/browser/web_data_service_factory.h" -@@ -665,36 +664,6 @@ void ChromeBrowsingDataRemoverDelegate:: + #include "chrome/browser/ui/find_bar/find_bar_state.h" + #include "chrome/browser/ui/find_bar/find_bar_state_factory.h" +@@ -651,36 +650,6 @@ void ChromeBrowsingDataRemoverDelegate:: ContentSettingsType::CLIENT_HINTS, base::Time(), base::Time::Max(), website_settings_filter); @@ -183,12 +183,12 @@ - } - } - - MediaDeviceIDSalt::Reset(profile_->GetPrefs()); - } + if (filter_builder->GetMode() == BrowsingDataFilterBuilder::BLACKLIST) { + MediaDeviceIDSalt::Reset(profile_->GetPrefs()); --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -834,30 +834,6 @@ void SetApplicationLocaleOnIOThread(cons +@@ -874,30 +874,6 @@ void SetApplicationLocaleOnIOThread(cons GetIOThreadApplicationLocale() = locale; } @@ -219,7 +219,7 @@ #if defined(OS_ANDROID) float GetDeviceScaleAdjustment() { static const float kMinFSM = 1.05f; -@@ -1290,7 +1266,6 @@ void ChromeContentBrowserClient::PostAft +@@ -1337,7 +1313,6 @@ void ChromeContentBrowserClient::PostAft InitNetworkContextsParentDirectory(); DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -227,7 +227,7 @@ } bool ChromeContentBrowserClient::IsBrowserStartupComplete() { -@@ -2097,7 +2072,7 @@ void ChromeContentBrowserClient::AppendE +@@ -2130,7 +2105,7 @@ void ChromeContentBrowserClient::AppendE // Disable client-side phishing detection in the renderer if it is // disabled in the Profile preferences or the browser process. if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || @@ -236,16 +236,16 @@ command_line->AppendSwitch( switches::kDisableClientSidePhishingDetection); } -@@ -3959,7 +3934,7 @@ ChromeContentBrowserClient::CreateThrott - +@@ -3971,7 +3946,7 @@ ChromeContentBrowserClient::CreateThrott + base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent)); throttles.push_back(std::make_unique( handle, - std::make_unique(web_contents), + nullptr, - base::Bind(&SSLErrorHandler::HandleSSLError), - base::Bind(&IsInHostedApp))); + base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp))); -@@ -3981,12 +3956,6 @@ ChromeContentBrowserClient::CreateThrott + throttles.push_back(std::make_unique(handle)); +@@ -3992,12 +3967,6 @@ ChromeContentBrowserClient::CreateThrott GooglePasswordManagerNavigationThrottle::MaybeCreateThrottleFor(handle)); #endif @@ -283,7 +283,7 @@ } // namespace --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -321,13 +321,6 @@ ChromeDownloadManagerDelegate::~ChromeDo +@@ -327,13 +327,6 @@ ChromeDownloadManagerDelegate::~ChromeDo void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) { download_manager_ = dm; @@ -297,7 +297,7 @@ } #if defined(OS_ANDROID) -@@ -633,16 +626,6 @@ void ChromeDownloadManagerDelegate::Choo +@@ -638,16 +631,6 @@ void ChromeDownloadManagerDelegate::Choo void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( base::FilePath* filename) { @@ -316,7 +316,7 @@ void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -75,7 +75,7 @@ class DownloadItemModelData : public bas +@@ -78,7 +78,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. @@ -325,7 +325,7 @@ // Whether the download is currently being revived. bool is_being_revived_; -@@ -112,7 +112,7 @@ DownloadItemModelData::DownloadItemModel +@@ -115,7 +115,7 @@ DownloadItemModelData::DownloadItemModel : should_show_in_shelf_(true), was_ui_notified_(false), should_prefer_opening_in_browser_(false), @@ -334,7 +334,7 @@ is_being_revived_(false) {} } // namespace -@@ -388,13 +388,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -397,13 +397,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -351,7 +351,7 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -546,9 +546,6 @@ bool DownloadItemModel::IsCommandEnabled +@@ -560,9 +560,6 @@ bool DownloadItemModel::IsCommandEnabled // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -403,7 +403,7 @@ net::HttpContentDisposition content_disposition_header( download_->GetContentDisposition(), referrer_charset); bool should_replace_extension = -@@ -1063,29 +1061,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1068,29 +1066,7 @@ DownloadFileType::DangerLevel DownloadTa download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; @@ -444,7 +444,7 @@ #include "chrome/browser/download/download_file_icon_extractor.h" #include "chrome/browser/download/download_open_prompt.h" #include "chrome/browser/download/download_prefs.h" -@@ -1325,9 +1324,6 @@ DownloadsAcceptDangerFunction::Downloads +@@ -1327,9 +1326,6 @@ DownloadsAcceptDangerFunction::Downloads DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} @@ -454,7 +454,7 @@ bool DownloadsAcceptDangerFunction::RunAsync() { std::unique_ptr params( downloads::AcceptDanger::Params::Create(*args_)); -@@ -1365,40 +1361,7 @@ void DownloadsAcceptDangerFunction::Prom +@@ -1367,40 +1363,7 @@ void DownloadsAcceptDangerFunction::Prom return; } RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); @@ -574,7 +574,7 @@ referrer_entries))); --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -721,51 +721,9 @@ WebstorePrivateGetReferrerChainFunction: +@@ -732,51 +732,9 @@ WebstorePrivateGetReferrerChainFunction: ExtensionFunction::ResponseAction WebstorePrivateGetReferrerChainFunction::Run() { @@ -629,7 +629,7 @@ WebstorePrivateGetExtensionStatusFunction:: --- a/chrome/browser/extensions/blacklist_state_fetcher.cc +++ b/chrome/browser/extensions/blacklist_state_fetcher.cc -@@ -32,28 +32,8 @@ BlacklistStateFetcher::~BlacklistStateFe +@@ -31,28 +31,8 @@ BlacklistStateFetcher::~BlacklistStateFe void BlacklistStateFetcher::Request(const std::string& id, const RequestCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -660,7 +660,7 @@ } void BlacklistStateFetcher::SendRequest(const std::string& id) { -@@ -64,8 +44,7 @@ void BlacklistStateFetcher::SendRequest( +@@ -63,8 +43,7 @@ void BlacklistStateFetcher::SendRequest( std::string request_str; request.SerializeToString(&request_str); @@ -670,7 +670,7 @@ net::NetworkTrafficAnnotationTag traffic_annotation = net::DefineNetworkTrafficAnnotation("extension_blacklist", R"( semantics { -@@ -112,12 +91,6 @@ void BlacklistStateFetcher::SendRequest( +@@ -111,12 +90,6 @@ void BlacklistStateFetcher::SendRequest( base::Unretained(this), fetcher)); } @@ -704,7 +704,7 @@ // SimpleURLLoader -> (owned loader, extension id). --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -767,9 +767,6 @@ void ChromeMetricsServiceClient::Registe +@@ -776,9 +776,6 @@ void ChromeMetricsServiceClient::Registe metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -728,7 +728,7 @@ // static --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -224,7 +224,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -226,7 +226,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) CaptivePortalServiceFactory::GetInstance(); #endif @@ -738,7 +738,7 @@ ClientHintsFactory::GetInstance(); --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -91,7 +91,6 @@ +@@ -89,7 +89,6 @@ #include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/push_messaging/push_messaging_service_factory.h" #include "chrome/browser/push_messaging/push_messaging_service_impl.h" @@ -746,7 +746,7 @@ #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/signin_ui_util.h" -@@ -581,17 +580,6 @@ void ProfileImpl::LoadPrefsForNormalStar +@@ -583,17 +582,6 @@ void ProfileImpl::LoadPrefsForNormalStar mojo::PendingRemote pref_validation_delegate; @@ -766,7 +766,7 @@ CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false), --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc -@@ -227,9 +227,6 @@ void RemoveBrowsingDataForProfile(const +@@ -222,9 +222,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. @@ -794,32 +794,9 @@ if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode ---- a/chrome/browser/ssl/captive_portal_blocking_page.cc -+++ b/chrome/browser/ssl/captive_portal_blocking_page.cc -@@ -222,10 +222,7 @@ void CaptivePortalBlockingPage::Populate - load_time_data->SetString("recurrentErrorParagraph", ""); - load_time_data->SetBoolean("show_recurrent_error_paragraph", false); - -- if (cert_report_helper()) -- cert_report_helper()->PopulateExtendedReportingOption(load_time_data); -- else -- load_time_data->SetBoolean(security_interstitials::kDisplayCheckBox, false); -+ load_time_data->SetBoolean(security_interstitials::kDisplayCheckBox, false); - } - - void CaptivePortalBlockingPage::CommandReceived(const std::string& command) { -@@ -240,8 +237,6 @@ void CaptivePortalBlockingPage::CommandR - security_interstitials::SecurityInterstitialCommand cmd = - static_cast( - command_num); -- cert_report_helper()->HandleReportingCommands(cmd, -- controller()->GetPrefService()); - switch (cmd) { - case security_interstitials::CMD_OPEN_LOGIN: - captive_portal::CaptivePortalMetrics::LogCaptivePortalBlockingPageEvent( --- a/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc -@@ -251,92 +251,6 @@ bool SecurityStateTabHelper::UsedPolicyI +@@ -250,92 +250,6 @@ bool SecurityStateTabHelper::UsedPolicyI security_state::MaliciousContentStatus SecurityStateTabHelper::GetMaliciousContentStatus() const { @@ -936,7 +913,7 @@ void ChromeSubresourceFilterClient::OnReloadRequested() { --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -2764,7 +2764,6 @@ jumbo_static_library("ui") { +@@ -2814,7 +2814,6 @@ jumbo_static_library("ui") { "views/device_chooser_content_view.h", "views/devtools_process_observer.cc", "views/devtools_process_observer.h", @@ -946,7 +923,7 @@ "views/download/download_item_view.cc", --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -256,10 +256,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -272,10 +272,6 @@ void TabHelpers::AttachTabHelpers(WebCon PreviewsUITabHelper::CreateForWebContents(web_contents); RecentlyAudibleHelper::CreateForWebContents(web_contents); ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents); @@ -957,7 +934,7 @@ ReputationWebContentsObserver::CreateForWebContents(web_contents); SearchEngineTabHelper::CreateForWebContents(web_contents); SecurityStateTabHelper::CreateForWebContents(web_contents); -@@ -310,7 +306,6 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -333,7 +329,6 @@ void TabHelpers::AttachTabHelpers(WebCon pdf::PDFWebContentsHelper::CreateForWebContentsWithClient( web_contents, std::make_unique()); SadTabHelper::CreateForWebContents(web_contents); @@ -989,7 +966,7 @@ IdSet ids; for (auto* download : to_remove) { -- if (download->IsDangerous()) { +- if (download->IsDangerous() || download->IsMixedContent()) { - // Don't allow users to revive dangerous downloads; just nuke 'em. - download->Remove(); - continue; @@ -998,7 +975,7 @@ DownloadItemModel item_model(download); if (!item_model.ShouldShowInShelf() || download->GetState() == download::DownloadItem::IN_PROGRESS) { -@@ -379,32 +369,6 @@ void DownloadsDOMHandler::FinalizeRemova +@@ -379,44 +369,6 @@ void DownloadsDOMHandler::FinalizeRemova } } @@ -1025,6 +1002,18 @@ - if (!item || item->IsDone()) - return; - CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); +- +- // If a download is mixed content, validate that first. Is most cases, mixed +- // content warnings will occur first, but in the worst case scenario, we show +- // a dangerous warning twice. That's better than showing a mixed content +- // warning, then dismissing the dangerous download warning. Since mixed +- // content downloads triggering the UI are temporary and rare to begin with, +- // this should very rarely occur. +- if (item->IsMixedContent()) { +- item->ValidateMixedContentDownload(); +- return; +- } +- - item->ValidateDangerousDownload(); -} - @@ -1062,7 +1051,7 @@ bool IsDeletingHistoryAllowed(); --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -250,117 +250,6 @@ LookalikeUrlInterstitialPage* CreateLook +@@ -273,115 +273,6 @@ LookalikeUrlInterstitialPage* CreateLook safe_url)); } @@ -1105,10 +1094,9 @@ - resource.is_subresource = request_url != main_frame_url; - resource.is_subframe = false; - resource.threat_type = threat_type; -- resource.web_contents_getter = -- security_interstitials::UnsafeResource::GetWebContentsGetter( -- web_contents->GetMainFrame()->GetProcess()->GetID(), -- web_contents->GetMainFrame()->GetRoutingID()); +- resource.web_contents_getter = security_interstitials::GetWebContentsGetter( +- web_contents->GetMainFrame()->GetProcess()->GetID(), +- web_contents->GetMainFrame()->GetRoutingID()); - resource.threat_source = g_browser_process->safe_browsing_service() - ->database_manager() - ->GetThreatSource(); @@ -1157,10 +1145,9 @@ - resource.is_subresource = request_url != main_frame_url; - resource.is_subframe = false; - resource.threat_type = threat_type; -- resource.web_contents_getter = -- security_interstitials::UnsafeResource::GetWebContentsGetter( -- web_contents->GetMainFrame()->GetProcess()->GetID(), -- web_contents->GetMainFrame()->GetRoutingID()); +- resource.web_contents_getter = security_interstitials::GetWebContentsGetter( +- web_contents->GetMainFrame()->GetProcess()->GetID(), +- web_contents->GetMainFrame()->GetRoutingID()); - resource.threat_source = g_browser_process->safe_browsing_service() - ->database_manager() - ->GetThreatSource(); @@ -1180,16 +1167,16 @@ #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage( content::WebContents* web_contents) { -@@ -473,8 +362,6 @@ void InterstitialHTMLSource::StartDataRe - } else if (path_without_query == "/blocked-interception") { - interstitial_delegate.reset( +@@ -497,8 +388,6 @@ void InterstitialHTMLSource::StartDataRe CreateBlockedInterceptionBlockingPage(web_contents)); + } else if (path_without_query == "/legacy-tls") { + interstitial_delegate.reset(CreateLegacyTLSBlockingPage(web_contents)); - } else if (path_without_query == "/safebrowsing") { - interstitial_delegate.reset(CreateSafeBrowsingBlockingPage(web_contents)); } else if (path_without_query == "/clock") { interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents)); } else if (path_without_query == "/lookalike") { -@@ -486,13 +373,6 @@ void InterstitialHTMLSource::StartDataRe +@@ -510,13 +399,6 @@ void InterstitialHTMLSource::StartDataRe } else if (path_without_query == "/origin_policy") { interstitial_delegate.reset( CreateOriginPolicyInterstitialPage(web_contents)); @@ -1206,24 +1193,13 @@ --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -86,7 +86,6 @@ - #include "components/page_load_metrics/renderer/metrics_render_frame_observer.h" + #include "components/paint_preview/buildflags/buildflags.h" #include "components/pdf/renderer/pepper_pdf_host.h" #include "components/safe_browsing/buildflags.h" --#include "components/safe_browsing/renderer/threat_dom_details.h" +-#include "components/safe_browsing/content/renderer/threat_dom_details.h" #include "components/spellcheck/spellcheck_buildflags.h" - #include "components/startup_metric_utils/common/startup_metric.mojom.h" #include "components/subresource_filter/content/renderer/subresource_filter_agent.h" ---- a/components/safe_browsing/features.cc -+++ b/components/safe_browsing/features.cc -@@ -87,7 +87,7 @@ constexpr base::FeatureParam kShou - &kPasswordProtectionForSignedInUsers, "DeprecateOldProto", false}; - - const base::Feature kSuspiciousSiteTriggerQuotaFeature{ -- "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT}; -+ "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kThreatDomDetailsTagAndAttributeFeature{ - "ThreatDomDetailsTagAttributes", base::FEATURE_DISABLED_BY_DEFAULT}; + #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h" --- a/components/security_interstitials/content/cert_report_helper.cc +++ b/components/security_interstitials/content/cert_report_helper.cc @@ -160,7 +160,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 023601d2..b2382dd7 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 @@ #if defined(OS_CHROMEOS) --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc -@@ -338,11 +338,6 @@ void ComponentLoader::AddWebStoreApp() { +@@ -347,11 +347,6 @@ void ComponentLoader::AddWebStoreApp() { if (!IsNormalSession()) return; #endif @@ -22,7 +22,7 @@ } #if defined(OS_CHROMEOS) -@@ -447,11 +442,6 @@ void ComponentLoader::AddDefaultComponen +@@ -455,11 +450,6 @@ void ComponentLoader::AddDefaultComponen AddKeyboardApp(); #else // defined(OS_CHROMEOS) DCHECK(!skip_session_components); @@ -34,7 +34,7 @@ #endif // defined(OS_CHROMEOS) if (!skip_session_components) { -@@ -526,13 +516,6 @@ void ComponentLoader::AddDefaultComponen +@@ -533,13 +523,6 @@ void ComponentLoader::AddDefaultComponen AddHangoutServicesExtension(); #endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) diff --git a/patches/core/inox-patchset/0010-disable-gcm-status-check.patch b/patches/core/inox-patchset/0010-disable-gcm-status-check.patch deleted file mode 100644 index de257dd2..00000000 --- a/patches/core/inox-patchset/0010-disable-gcm-status-check.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- a/components/gcm_driver/gcm_channel_status_request.cc -+++ b/components/gcm_driver/gcm_channel_status_request.cc -@@ -23,8 +23,6 @@ namespace gcm { - - namespace { - --const char kRequestContentType[] = "application/octet-stream"; --const char kGCMChannelTag[] = "gcm_channel"; - const int kDefaultPollIntervalSeconds = 60 * 60; // 60 minutes. - const int kMinPollIntervalSeconds = 30 * 60; // 30 minutes. - -@@ -55,69 +53,8 @@ int GCMChannelStatusRequest::min_poll_in - } - - void GCMChannelStatusRequest::Start() { -- // url_loader_factory_ can be null for tests. -- if (!url_loader_factory_) -- return; -- -- DCHECK(!simple_url_loader_); -- -- GURL request_url(channel_status_request_url_); -- -- sync_pb::ExperimentStatusRequest proto_data; -- proto_data.add_experiment_name(kGCMChannelTag); -- std::string upload_data; -- if (!proto_data.SerializeToString(&upload_data)) { -- NOTREACHED(); -- } -- -- net::NetworkTrafficAnnotationTag traffic_annotation = -- net::DefineNetworkTrafficAnnotation("gcm_channel_status_request", R"( -- semantics { -- sender: "GCM Driver" -- description: -- "Google Chrome interacts with Google Cloud Messaging to receive " -- "push messages for various browser features, as well as on behalf " -- "of websites and extensions. The channel status request " -- "periodically confirms with Google servers whether the feature " -- "should be enabled." -- trigger: -- "Periodically when Chrome has established an active Google Cloud " -- "Messaging subscription. The first request will be issued a minute " -- "after the first subscription activates. Subsequent requests will " -- "be issued each hour with a jitter of 15 minutes. Google can " -- "adjust this interval when it deems necessary." -- data: -- "A user agent string containing the Chrome version, channel and " -- "platform will be sent to the server. No user identifier is sent " -- "along with the request." -- destination: GOOGLE_OWNED_SERVICE -- } -- policy { -- cookies_allowed: NO -- setting: -- "Support for interacting with Google Cloud Messaging is enabled by " -- "default, and there is no configuration option to completely " -- "disable it. Websites wishing to receive push messages must " -- "acquire express permission from the user for the 'Notification' " -- "permission." -- policy_exception_justification: -- "Not implemented, considered not useful." -- })"); -- -- auto resource_request = std::make_unique(); -- -- resource_request->url = request_url; -- resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit; -- resource_request->method = "POST"; -- resource_request->headers.SetHeader(net::HttpRequestHeaders::kUserAgent, -- user_agent_); -- simple_url_loader_ = network::SimpleURLLoader::Create( -- std::move(resource_request), traffic_annotation); -- simple_url_loader_->AttachStringForUpload(upload_data, kRequestContentType); -- simple_url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie( -- url_loader_factory_.get(), -- base::BindOnce(&GCMChannelStatusRequest::OnSimpleLoaderComplete, -- base::Unretained(this))); -+ // Simulate an empty response and disable GCM. -+ callback_.Run(false, false, 0); - } - - void GCMChannelStatusRequest::OnSimpleLoaderComplete( diff --git a/patches/core/inox-patchset/0014-disable-translation-lang-fetch.patch b/patches/core/inox-patchset/0014-disable-translation-lang-fetch.patch index f821cf44..87c85022 100644 --- a/patches/core/inox-patchset/0014-disable-translation-lang-fetch.patch +++ b/patches/core/inox-patchset/0014-disable-translation-lang-fetch.patch @@ -49,7 +49,7 @@ + is_previous_language_matches_override_enabled_(false) { if (is_query_enabled_ || is_enforcement_enabled_) { model_loader_ = std::make_unique( - base::Bind(&ValidateModel), + base::BindRepeating(&ValidateModel), @@ -237,6 +233,8 @@ bool TranslateRankerImpl::ShouldOfferTra // (or become False). const bool kDefaultResponse = true; diff --git a/patches/core/inox-patchset/0017-disable-new-avatar-menu.patch b/patches/core/inox-patchset/0017-disable-new-avatar-menu.patch index 28810744..46c0275a 100644 --- a/patches/core/inox-patchset/0017-disable-new-avatar-menu.patch +++ b/patches/core/inox-patchset/0017-disable-new-avatar-menu.patch @@ -1,6 +1,6 @@ --- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc +++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc -@@ -80,7 +80,7 @@ void PrimaryAccountPolicyManagerImpl::On +@@ -81,7 +81,7 @@ void PrimaryAccountPolicyManagerImpl::On } bool PrimaryAccountPolicyManagerImpl::IsSigninAllowed() const { diff --git a/patches/core/inox-patchset/chromium-exclude_unwind_tables.patch b/patches/core/inox-patchset/chromium-exclude_unwind_tables.patch deleted file mode 100644 index 1b91f32d..00000000 --- a/patches/core/inox-patchset/chromium-exclude_unwind_tables.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/build/config/compiler/compiler.gni -+++ b/build/config/compiler/compiler.gni -@@ -82,19 +82,19 @@ declare_args() { - # is_component_build=false. Very large debug symbols can have unwanted side - # effects so this is enforced by default for chromium. - forbid_non_component_debug_builds = build_with_chromium -+ -+ # Exclude unwind tables for official builds as unwinding can be done from stack -+ # dumps produced by Crashpad at a later time "offline" in the crash server. -+ # For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet -+ # which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able -+ # to unwind at runtime. -+ exclude_unwind_tables = -+ is_official_build || (is_chromecast && !is_cast_desktop_build && -+ !is_debug && !cast_is_debug && !is_fuchsia) - } - - assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO") - --# Exclude unwind tables for official builds as unwinding can be done from stack --# dumps produced by Crashpad at a later time "offline" in the crash server. --# For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet --# which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able --# to unwind at runtime. --exclude_unwind_tables = -- is_official_build || (is_chromecast && !is_cast_desktop_build && -- !is_debug && !cast_is_debug && !is_fuchsia) -- - # If true, optimize for size. Does not affect windows builds. - # Linux & Mac favor speed over size. - # TODO(brettw) it's weird that Mac and desktop Linux are different. We should 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 d80d000b..7c0c5e87 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 @@ -159,7 +159,7 @@ by default. // elements of |list| equals |hash|. --- a/chrome/browser/extensions/install_signer.cc +++ b/chrome/browser/extensions/install_signer.cc -@@ -65,7 +65,7 @@ const int kSignatureFormatVersion = 2; +@@ -66,7 +66,7 @@ const int kSignatureFormatVersion = 2; const size_t kSaltBytes = 32; const char kBackendUrl[] = @@ -170,13 +170,15 @@ by default. "-----BEGIN PUBLIC KEY-----" \ --- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc +++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc -@@ -42,5 +42,5 @@ base::string16 NaClInfoBarDelegate::GetL +@@ -32,7 +32,7 @@ base::string16 NaClInfoBarDelegate::GetL } GURL NaClInfoBarDelegate::GetLinkURL() const { - return GURL("https://support.google.com/chrome/?p=ib_nacl"); + return GURL("trk:143:https://support.google.com/chrome/?p=ib_nacl"); } + + base::string16 NaClInfoBarDelegate::GetMessageText() const { --- a/chrome/browser/profiles/profile_avatar_downloader.cc +++ b/chrome/browser/profiles/profile_avatar_downloader.cc @@ -18,7 +18,7 @@ @@ -190,7 +192,7 @@ by default. ProfileAvatarDownloader::ProfileAvatarDownloader( --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js -@@ -86,9 +86,9 @@ ChromeVoxPrefs.DEFAULT_PREFS = { +@@ -219,9 +219,9 @@ ChromeVoxPrefs.DEFAULT_PREFS = { 'position': '{}', 'siteSpecificEnhancements': true, 'siteSpecificScriptBase': @@ -225,15 +227,12 @@ by default. --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc -@@ -70,9 +70,9 @@ const int ClientSideDetectionService::kN +@@ -56,7 +56,7 @@ const int ClientSideDetectionService::kN const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30; const char ClientSideDetectionService::kClientReportPhishingUrl[] = - "https://sb-ssl.google.com/safebrowsing/clientreport/phishing"; + "trk:148:https://sb-ssl.google.com/safebrowsing/clientreport/phishing"; - const char ClientSideDetectionService::kClientReportMalwareUrl[] = -- "https://sb-ssl.google.com/safebrowsing/clientreport/malware-check"; -+ "trk:149:https://sb-ssl.google.com/safebrowsing/clientreport/malware-check"; struct ClientSideDetectionService::ClientPhishingReportInfo { std::unique_ptr loader; @@ -272,7 +271,7 @@ by default. --- a/chrome/browser/tracing/crash_service_uploader.cc +++ b/chrome/browser/tracing/crash_service_uploader.cc -@@ -41,7 +41,7 @@ using std::string; +@@ -40,7 +40,7 @@ using std::string; namespace { @@ -332,7 +331,7 @@ by default. --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc -@@ -249,7 +249,7 @@ const char kSyncErrorsHelpURL[] = +@@ -248,7 +248,7 @@ const char kSyncErrorsHelpURL[] = "https://support.google.com/chrome/?p=settings_sync_error"; const char kSyncGoogleDashboardURL[] = @@ -341,15 +340,15 @@ by default. const char kSyncLearnMoreURL[] = "https://support.google.com/chrome/?p=settings_sign_in"; -@@ -353,7 +353,7 @@ const char kNaturalScrollHelpURL[] = +@@ -355,7 +355,7 @@ const char kNaturalScrollHelpURL[] = const char kOemEulaURLPath[] = "oem"; const char kOnlineEulaURLPath[] = - "https://www.google.com/intl/%s/chrome/eula_text.html"; + "trk:250:https://www.google.com/intl/%s/chrome/eula_text.html"; - const char kTPMFirmwareUpdateLearnMoreURL[] = - "https://support.google.com/chromebook/?p=tpm_update"; + const char kOsSettingsSearchHelpURL[] = + "https://support.google.com/chromebook/?p=settings_search_help"; --- a/chrome/installer/setup/google_chrome_behaviors.cc +++ b/chrome/installer/setup/google_chrome_behaviors.cc @@ -44,7 +44,7 @@ base::string16 LocalizeUrl(const wchar_t @@ -523,7 +522,7 @@ by default. --- a/components/password_manager/core/browser/password_store.cc +++ b/components/password_manager/core/browser/password_store.cc -@@ -239,10 +239,10 @@ void PasswordStore::GetLogins(const Form +@@ -258,10 +258,10 @@ void PasswordStore::GetLogins(const Form // TODO(mdm): actually delete them at some point, say M24 or so. base::Time cutoff; // the null time if (form.scheme == PasswordForm::Scheme::kHtml && @@ -551,7 +550,7 @@ by default. --- a/components/policy/resources/policy_templates.json +++ b/components/policy/resources/policy_templates.json -@@ -3910,7 +3910,7 @@ +@@ -3937,7 +3937,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -560,7 +559,7 @@ by default. 'id': 34, 'caption': '''Configure the list of force-installed apps and extensions''', 'tags': ['full-admin-access'], -@@ -8174,7 +8174,7 @@ +@@ -8269,7 +8269,7 @@ 'features': { 'dynamic_refresh': True, }, @@ -593,7 +592,7 @@ by default. --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json -@@ -105,7 +105,7 @@ +@@ -115,7 +115,7 @@ "google": { "name": "Google", "keyword": "google.com", 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 308e3cee..224994aa 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -27,7 +27,7 @@ the URL so we get notified if this happens again in the future). kSafeBrowsingIncidentTrafficAnnotation = --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -311,11 +311,7 @@ IncidentReportingService::UploadContext: +@@ -301,11 +301,7 @@ IncidentReportingService::UploadContext: // static bool IncidentReportingService::IsEnabledForProfile(Profile* profile) { @@ -42,7 +42,7 @@ the URL so we get notified if this happens again in the future). IncidentReportingService::IncidentReportingService( --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc -@@ -62,8 +62,7 @@ class SafeBrowsingBlockingPageFactoryImp +@@ -64,8 +64,7 @@ class SafeBrowsingBlockingPageFactoryImp PrefService* prefs = Profile::FromBrowserContext(web_contents->GetBrowserContext()) ->GetPrefs(); diff --git a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch index 70b338a1..5482a38c 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch @@ -13,20 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware). --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc -@@ -61,12 +61,6 @@ enum MalwareReportTypes { - REPORT_RESULT_MAX - }; - --void UpdateEnumUMAHistogram(MalwareReportTypes report_type) { -- DCHECK(report_type >= 0 && report_type < REPORT_RESULT_MAX); -- UMA_HISTOGRAM_ENUMERATION("SBClientMalware.SentReports", report_type, -- REPORT_RESULT_MAX); --} -- - } // namespace - - const int ClientSideDetectionService::kInitialClientModelFetchDelayMs = 10000; -@@ -271,94 +265,8 @@ void ClientSideDetectionService::StartCl +@@ -218,94 +218,8 @@ void ClientSideDetectionService::StartCl DCHECK_CURRENTLY_ON(BrowserThread::UI); std::unique_ptr request(verdict); @@ -122,88 +109,4 @@ This prevents trk:148 (phishing) and trk:149 (malware). + callback.Run(GURL(request->url()), false); } - void ClientSideDetectionService::StartClientReportMalwareRequest( -@@ -367,81 +275,8 @@ void ClientSideDetectionService::StartCl - DCHECK_CURRENTLY_ON(BrowserThread::UI); - std::unique_ptr request(verdict); - -- if (!enabled_) { -- if (!callback.is_null()) -- callback.Run(GURL(request->url()), GURL(request->url()), false); -- return; -- } -- -- std::string request_data; -- if (!request->SerializeToString(&request_data)) { -- UpdateEnumUMAHistogram(REPORT_FAILED_SERIALIZATION); -- DVLOG(1) << "Unable to serialize the CSD request. Proto file changed?"; -- if (!callback.is_null()) -- callback.Run(GURL(request->url()), GURL(request->url()), false); -- return; -- } -- -- net::NetworkTrafficAnnotationTag traffic_annotation = -- net::DefineNetworkTrafficAnnotation( -- "safe_browsing_client_side_malware_detector", R"( -- semantics { -- sender: "Safe Browsing Client-Side Malware Detector" -- description: -- "If the client-side malware detector determines that a requested " -- "page's IP is in the blacklisted malware IPs, it will send a " -- "request to Safe Browsing to ask for a final verdict. If Safe " -- "Browsing agrees the page is dangerous, Chrome will show a " -- "full-page interstitial warning." -- trigger: -- "Whenever the IP of the page is in malware blacklist." -- data: -- "Top-level page URL without CGI parameters, its non-https " -- "referrer, URLs of resources that match IP blacklist." -- destination: GOOGLE_OWNED_SERVICE -- } -- policy { -- cookies_allowed: YES -- cookies_store: "Safe browsing cookie store" -- setting: -- "Users can enable or disable this feature by toggling 'Protect " -- "you and your device from dangerous sites' in Chrome settings " -- "under Privacy. This feature is enabled by default." -- chrome_policy { -- SafeBrowsingEnabled { -- policy_options {mode: MANDATORY} -- SafeBrowsingEnabled: false -- } -- } -- })"); -- auto resource_request = std::make_unique(); -- resource_request->url = GetClientReportUrl(kClientReportMalwareUrl); -- resource_request->method = "POST"; -- resource_request->load_flags = net::LOAD_DISABLE_CACHE; -- auto loader = network::SimpleURLLoader::Create(std::move(resource_request), -- traffic_annotation); -- loader->AttachStringForUpload(request_data, "application/octet-stream"); -- loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie( -- url_loader_factory_.get(), -- base::BindOnce(&ClientSideDetectionService::OnURLLoaderComplete, -- base::Unretained(this), loader.get())); -- -- // Remember which callback and URL correspond to the current fetcher object. -- std::unique_ptr info(new ClientMalwareReportInfo); -- auto* loader_ptr = loader.get(); -- info->loader = std::move(loader); -- info->callback = callback; -- info->original_url = GURL(request->url()); -- client_malware_reports_[loader_ptr] = std::move(info); -- -- UMA_HISTOGRAM_ENUMERATION("SBClientMalware.SentReports", REPORT_SENT, -- REPORT_RESULT_MAX); -- -- UMA_HISTOGRAM_COUNTS_1M("SBClientMalware.IPBlacklistRequestPayloadSize", -- request_data.size()); -- -- // Record that we made a malware request -- malware_report_times_.push(base::Time::Now()); -+ if (!callback.is_null()) -+ callback.Run(GURL(request->url()), GURL(request->url()), false); - } - void ClientSideDetectionService::HandlePhishingVerdict( diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index 297f4624..9dc4177f 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -23,7 +23,7 @@ url.SchemeIs(dom_distiller::kDomDistillerScheme) || --- a/chrome/browser/ui/singleton_tabs.cc +++ b/chrome/browser/ui/singleton_tabs.cc -@@ -100,7 +100,8 @@ int GetIndexOfExistingTab(Browser* brows +@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* brows // Skip view-source tabs. This is needed because RewriteURLIfNecessary // removes the "view-source:" scheme which leads to incorrect matching. @@ -33,35 +33,6 @@ continue; GURL rewritten_tab_url = tab_url; ---- a/chromecast/browser/url_request_context_factory.cc -+++ b/chromecast/browser/url_request_context_factory.cc -@@ -40,6 +40,7 @@ - #include "net/proxy_resolution/proxy_resolution_service.h" - #include "net/quic/quic_context.h" - #include "net/ssl/ssl_config_service_defaults.h" -+#include "net/url_request/trk_protocol_handler.h" - #include "net/url_request/url_request_context.h" - #include "net/url_request/url_request_context_builder.h" - #include "net/url_request/url_request_context_getter.h" -@@ -248,13 +249,17 @@ void URLRequestContextFactory::Initializ - new net::URLRequestJobFactoryImpl()); - // Keep ProtocolHandlers added in sync with - // CastContentBrowserClient::IsHandledURL(). -+ bool set_protocol = false; - for (content::ProtocolHandlerMap::iterator it = protocol_handlers->begin(); - it != protocol_handlers->end(); - ++it) { -- bool set_protocol = -+ set_protocol = - job_factory->SetProtocolHandler(it->first, std::move(it->second)); - DCHECK(set_protocol); - } -+ set_protocol = job_factory->SetProtocolHandler( -+ url::kTraceScheme, base::WrapUnique(new net::TrkProtocolHandler)); -+ DCHECK(set_protocol); - - // Set up interceptors in the reverse order. - std::unique_ptr top_job_factory = --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc @@ -496,7 +496,8 @@ void AutocompleteInput::ParseForEmphasiz @@ -87,7 +58,7 @@ return url::FindAndCompareScheme(utf8_input, url::kHttpScheme, nullptr); --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -552,6 +552,10 @@ GURL FixupURL(const std::string& text, c +@@ -566,6 +566,10 @@ GURL FixupURL(const std::string& text, c } } @@ -100,7 +71,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 -@@ -617,6 +617,7 @@ ChildProcessSecurityPolicyImpl::ChildPro +@@ -620,6 +620,7 @@ ChildProcessSecurityPolicyImpl::ChildPro #endif // BUILDFLAG(ENABLE_WEBSOCKETS) RegisterWebSafeScheme(url::kFtpScheme); RegisterWebSafeScheme(url::kDataScheme); @@ -110,7 +81,7 @@ // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1662,6 +1662,8 @@ component("net") { +@@ -1075,6 +1075,8 @@ component("net") { "url_request/report_sender.h", "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", @@ -225,7 +196,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_intercepting_job_factory.h" -@@ -629,6 +630,9 @@ std::unique_ptr URLRe +@@ -628,6 +629,9 @@ std::unique_ptr URLRe } protocol_handlers_.clear(); @@ -257,7 +228,7 @@ --- a/url/url_util.cc +++ b/url/url_util.cc -@@ -49,7 +49,7 @@ struct SchemeRegistry { +@@ -54,7 +54,7 @@ struct SchemeRegistry { // Schemes that do not trigger mixed content warning. std::vector secure_schemes = { @@ -266,7 +237,7 @@ }; // Schemes that normal pages cannot link to or access (i.e., with the same -@@ -64,6 +64,7 @@ struct SchemeRegistry { +@@ -69,6 +69,7 @@ struct SchemeRegistry { kAboutScheme, kJavaScriptScheme, kDataScheme, diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index ced4222f..c10c8d35 100644 --- a/patches/core/ungoogled-chromium/disable-crash-reporter.patch +++ b/patches/core/ungoogled-chromium/disable-crash-reporter.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/tracing/crash_service_uploader.cc +++ b/chrome/browser/tracing/crash_service_uploader.cc -@@ -130,11 +130,16 @@ void TraceCrashServiceUploader::DoUpload +@@ -129,11 +129,16 @@ void TraceCrashServiceUploader::DoUpload progress_callback_ = progress_callback; done_callback_ = std::move(done_callback); @@ -24,7 +24,7 @@ } void TraceCrashServiceUploader::DoCompressOnBackgroundThread( -@@ -307,6 +312,7 @@ bool TraceCrashServiceUploader::Compress +@@ -306,6 +311,7 @@ bool TraceCrashServiceUploader::Compress void TraceCrashServiceUploader::CreateAndStartURLLoader( const std::string& upload_url, const std::string& post_data) { diff --git a/patches/core/ungoogled-chromium/disable-domain-reliability.patch b/patches/core/ungoogled-chromium/disable-domain-reliability.patch index 9184bad0..5e597383 100644 --- a/patches/core/ungoogled-chromium/disable-domain-reliability.patch +++ b/patches/core/ungoogled-chromium/disable-domain-reliability.patch @@ -29,7 +29,7 @@ ] output_file = "$target_gen_dir/baked_in_configs.cc" -@@ -39,13 +19,21 @@ action("bake_in_configs") { +@@ -37,13 +17,21 @@ action("bake_in_configs") { # The JSON file list is too long for the command line on Windows, so put # them in a response file. diff --git a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch index 2a6c69c0..6bc15f77 100644 --- a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch +++ b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch @@ -2,7 +2,7 @@ --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc -@@ -295,7 +295,7 @@ bool DomDistillerViewerSource::ShouldSer +@@ -294,7 +294,7 @@ bool DomDistillerViewerSource::ShouldSer } std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() { @@ -24,7 +24,7 @@ .english :lang(zh) {display: none} --- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js +++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js -@@ -132,7 +132,7 @@ function maybeSetWebFont() { +@@ -116,7 +116,7 @@ function maybeSetWebFont() { } const e = document.createElement('link'); diff --git a/patches/core/ungoogled-chromium/disable-gaia.patch b/patches/core/ungoogled-chromium/disable-gaia.patch index cdf7894a..c9e093d9 100644 --- a/patches/core/ungoogled-chromium/disable-gaia.patch +++ b/patches/core/ungoogled-chromium/disable-gaia.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd -@@ -173,7 +173,6 @@ +@@ -142,7 +142,6 @@ @@ -23,7 +23,7 @@ source->AddLocalizedString( --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc -@@ -296,64 +296,6 @@ void GaiaAuthFetcher::CreateAndStartGaia +@@ -293,65 +293,6 @@ void GaiaAuthFetcher::CreateAndStartGaia network::mojom::CredentialsMode credentials_mode, const net::NetworkTrafficAnnotationTag& traffic_annotation) { DCHECK(!fetch_pending_) << "Tried to fetch two things at once!"; @@ -35,9 +35,10 @@ - if (credentials_mode != network::mojom::CredentialsMode::kOmit) { - DCHECK_EQ(GaiaUrls::GetInstance()->gaia_url(), gaia_gurl.GetOrigin()) - << gaia_gurl; -- resource_request->site_for_cookies = GaiaUrls::GetInstance()->gaia_url(); - url::Origin origin = - url::Origin::Create(GaiaUrls::GetInstance()->gaia_url()); +- resource_request->site_for_cookies = +- net::SiteForCookies::FromOrigin(origin); - resource_request->trusted_params = - network::ResourceRequest::TrustedParams(); - resource_request->trusted_params->network_isolation_key = diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index aef71a4c..13de50dc 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -2,18 +2,18 @@ --- a/chrome/common/google_url_loader_throttle.cc +++ b/chrome/common/google_url_loader_throttle.cc -@@ -9,10 +9,6 @@ - #include "services/network/public/cpp/resource_response.h" +@@ -10,10 +10,6 @@ + #include "components/variations/net/variations_http_headers.h" #include "services/network/public/mojom/url_response_head.mojom.h" -#if BUILDFLAG(ENABLE_EXTENSIONS) -#include "extensions/common/extension_urls.h" -#endif - - GoogleURLLoaderThrottle::GoogleURLLoaderThrottle( - bool is_off_the_record, - chrome::mojom::DynamicParams dynamic_params) -@@ -26,36 +22,6 @@ void GoogleURLLoaderThrottle::DetachFrom + namespace { + + #if defined(OS_ANDROID) +@@ -42,43 +38,6 @@ void GoogleURLLoaderThrottle::DetachFrom void GoogleURLLoaderThrottle::WillStartRequest( network::ResourceRequest* request, bool* defer) { @@ -47,10 +47,17 @@ - request->headers.SetHeader(safe_search_util::kGoogleAppsAllowedDomains, - dynamic_params_.allowed_domains_for_apps); - } +- +-#if defined(OS_ANDROID) +- if (!client_data_header_.empty() && +- google_util::IsGoogleAssociatedDomainUrl(request->url)) { +- request->headers.SetHeader(kClientDataHeader, client_data_header_); +- } +-#endif } void GoogleURLLoaderThrottle::WillRedirectRequest( -@@ -64,32 +30,6 @@ void GoogleURLLoaderThrottle::WillRedire +@@ -87,39 +46,6 @@ void GoogleURLLoaderThrottle::WillRedire bool* /* defer */, std::vector* to_be_removed_headers, net::HttpRequestHeaders* modified_headers) { @@ -80,10 +87,17 @@ - modified_headers->SetHeader(safe_search_util::kGoogleAppsAllowedDomains, - dynamic_params_.allowed_domains_for_apps); - } +- +-#if defined(OS_ANDROID) +- if (!client_data_header_.empty() && +- !google_util::IsGoogleAssociatedDomainUrl(redirect_info->new_url)) { +- to_be_removed_headers->push_back(kClientDataHeader); +- } +-#endif } #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -97,17 +37,5 @@ void GoogleURLLoaderThrottle::WillProces +@@ -127,17 +53,5 @@ void GoogleURLLoaderThrottle::WillProces const GURL& response_url, network::mojom::URLResponseHead* response_head, bool* defer) { @@ -458,7 +472,7 @@ bool IsGoogleHostname(const GURL& url) { --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -505,11 +505,7 @@ base::string16 TemplateURLRef::SearchTer +@@ -507,11 +507,7 @@ base::string16 TemplateURLRef::SearchTer bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); @@ -473,7 +487,7 @@ bool TemplateURLRef::ExtractSearchTermsFromURL( --- a/components/variations/net/variations_http_headers.cc +++ b/components/variations/net/variations_http_headers.cc -@@ -28,10 +28,6 @@ namespace variations { +@@ -27,10 +27,6 @@ namespace variations { namespace { @@ -484,7 +498,7 @@ // The result of checking if a URL should have variations headers appended. // This enum is used to record UMA histogram values, and should not be // reordered. -@@ -88,26 +84,7 @@ class VariationsHeaderHelper { +@@ -87,26 +83,7 @@ class VariationsHeaderHelper { } bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) { @@ -512,7 +526,7 @@ } private: -@@ -150,8 +127,6 @@ void RemoveVariationsHeaderIfNeeded( +@@ -149,8 +126,6 @@ void RemoveVariationsHeaderIfNeeded( const net::RedirectInfo& redirect_info, const network::mojom::URLResponseHead& response_head, std::vector* to_be_removed_headers) { @@ -521,7 +535,7 @@ } std::unique_ptr -@@ -181,11 +156,11 @@ CreateSimpleURLLoaderWithVariationsHeade +@@ -180,11 +155,11 @@ CreateSimpleURLLoaderWithVariationsHeade } bool IsVariationsHeader(const std::string& header_name) { @@ -535,7 +549,7 @@ } bool ShouldAppendVariationsHeaderForTesting(const GURL& url) { -@@ -194,7 +169,6 @@ bool ShouldAppendVariationsHeaderForTest +@@ -193,7 +168,6 @@ bool ShouldAppendVariationsHeaderForTest void UpdateCorsExemptHeaderForVariations( network::mojom::NetworkContextParams* params) { diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index a9a68500..984057e2 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 -@@ -358,7 +358,6 @@ if (!is_android && !is_mac) { +@@ -335,7 +335,6 @@ if (!is_android && !is_mac) { } data_deps += [ @@ -15,8 +15,8 @@ "//third_party/widevine/cdm", ] -@@ -1214,7 +1213,6 @@ if (is_win) { - ":packed_resources", +@@ -1109,7 +1108,6 @@ if (is_win) { + ":keystone_registration_framework", ":swiftshader_library", ":widevine_cdm_library", - "//chrome/browser/resources/media/mei_preload:component_bundle", diff --git a/patches/core/ungoogled-chromium/disable-signin.patch b/patches/core/ungoogled-chromium/disable-signin.patch index a4afa032..2a27cc90 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 -@@ -509,23 +509,6 @@ GURL GetOSSettingsUrl(const std::string& +@@ -492,23 +492,6 @@ GURL GetOSSettingsUrl(const std::string& #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) void ShowBrowserSignin(Browser* browser, signin_metrics::AccessPoint access_point) { diff --git a/patches/core/ungoogled-chromium/disable-translate.patch b/patches/core/ungoogled-chromium/disable-translate.patch index 63643c1b..c844cbd4 100644 --- a/patches/core/ungoogled-chromium/disable-translate.patch +++ b/patches/core/ungoogled-chromium/disable-translate.patch @@ -1,8 +1,8 @@ # Disables browser translation ---- a/components/translate/content/renderer/translate_helper.cc -+++ b/components/translate/content/renderer/translate_helper.cc -@@ -73,8 +73,7 @@ TranslateHelper::TranslateHelper(content +--- a/components/translate/content/renderer/translate_agent.cc ++++ b/components/translate/content/renderer/translate_agent.cc +@@ -73,8 +73,7 @@ TranslateAgent::TranslateAgent(content:: : content::RenderFrameObserver(render_frame), world_id_(world_id), extension_scheme_(extension_scheme) { @@ -11,10 +11,10 @@ + CancelPendingTranslation(); } - TranslateHelper::~TranslateHelper() { + TranslateAgent::~TranslateAgent() {} --- a/components/translate/core/browser/translate_manager.cc +++ b/components/translate/core/browser/translate_manager.cc -@@ -692,8 +692,7 @@ void TranslateManager::FilterIsTranslate +@@ -708,8 +708,7 @@ void TranslateManager::FilterIsTranslate TranslateBrowserMetrics::INITIATION_STATUS_NO_NETWORK); } @@ -26,14 +26,13 @@ // that settings syncs and we don't want to turn off translate everywhere --- a/components/translate/core/browser/translate_script.cc +++ b/components/translate/core/browser/translate_script.cc -@@ -149,9 +149,8 @@ void TranslateScript::OnScriptFetchCompl - base::StringAppendF(&data_, "var serverParams = '%s';\n", +@@ -142,8 +142,7 @@ void TranslateScript::OnScriptFetchCompl server_params.c_str()); -- GURL security_origin = translate::GetTranslateSecurityOrigin(); - base::StringAppendF( -- &data_, "var securityOrigin = '%s';", security_origin.spec().c_str()); -+ &data_, "var securityOrigin = '';"); + GURL security_origin = translate::GetTranslateSecurityOrigin(); +- base::StringAppendF(&data_, "var securityOrigin = '%s';", +- security_origin.spec().c_str()); ++ base::StringAppendF(&data_, "var securityOrigin = '';"); // Load embedded translate.js. data_.append(ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( diff --git a/patches/core/ungoogled-chromium/disable-untraceable-urls.patch b/patches/core/ungoogled-chromium/disable-untraceable-urls.patch index 3c488806..9bb0e967 100644 --- a/patches/core/ungoogled-chromium/disable-untraceable-urls.patch +++ b/patches/core/ungoogled-chromium/disable-untraceable-urls.patch @@ -23,7 +23,7 @@ } // namespace --- a/chrome/browser/safe_browsing/client_side_model_loader.cc +++ b/chrome/browser/safe_browsing/client_side_model_loader.cc -@@ -34,8 +34,6 @@ namespace safe_browsing { +@@ -33,8 +33,6 @@ namespace safe_browsing { // Model Loader strings const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024; const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000; @@ -32,15 +32,15 @@ const char ModelLoader::kClientModelNamePattern[] = "client_model_v5%s_variation_%d.pb"; const char ModelLoader::kClientModelFinchExperiment[] = -@@ -89,7 +87,7 @@ ModelLoader::ModelLoader( +@@ -88,7 +86,7 @@ ModelLoader::ModelLoader( scoped_refptr url_loader_factory, bool is_extended_reporting) : name_(FillInModelName(is_extended_reporting, GetModelNumber())), - url_(kClientModelUrlPrefix + name_), + url_("about:blank"), update_renderers_callback_(update_renderers_callback), - url_loader_factory_(url_loader_factory) { - DCHECK(url_.is_valid()); + url_loader_factory_(url_loader_factory), + last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) { @@ -101,7 +99,7 @@ ModelLoader::ModelLoader( scoped_refptr url_loader_factory, const std::string& model_name) @@ -48,8 +48,8 @@ - url_(kClientModelUrlPrefix + name_), + url_("about:blank"), update_renderers_callback_(update_renderers_callback), - url_loader_factory_(url_loader_factory) { - DCHECK(url_.is_valid()); + url_loader_factory_(url_loader_factory), + last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) { --- a/chrome/browser/safe_browsing/client_side_model_loader.h +++ b/chrome/browser/safe_browsing/client_side_model_loader.h @@ -42,7 +42,6 @@ class ModelLoader { @@ -59,7 +59,7 @@ - static const char kClientModelUrlPrefix[]; static const char kClientModelNamePattern[]; - // Constructs a model loader to fetch a model using |url_loader_factory|. + // Enum used to keep stats about why we fail to get the client model. This --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc @@ -339,7 +339,7 @@ FinancialPing::PingResponse FinancialPin diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index 42908c87..cdf2e10e 100644 --- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch +++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch @@ -15,7 +15,7 @@ --- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc +++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc -@@ -256,13 +256,7 @@ ChromeContentVerifierDelegate::GetVerify +@@ -286,13 +286,7 @@ bool ChromeContentVerifierDelegate::IsFr // between which extensions are considered in-store. // See https://crbug.com/766806 for details. if (!InstallVerifier::IsFromStore(extension)) { @@ -24,12 +24,12 @@ - // to be from the store as well. - if (ManifestURL::GetUpdateURL(&extension) != - extension_urls::GetDefaultWebstoreUpdateUrl()) { -- return NONE; +- return false; - } -+ return NONE; ++ return false; } - - return default_mode_; + return true; + } --- a/chrome/browser/extensions/extension_migrator.cc +++ b/chrome/browser/extensions/extension_migrator.cc @@ -18,7 +18,9 @@ namespace extensions { @@ -142,7 +142,7 @@ } else { url_stats_.other_url_count++; } -@@ -702,20 +680,6 @@ void ExtensionDownloader::HandleManifest +@@ -709,20 +687,6 @@ void ExtensionDownloader::HandleManifest fetch_data->request_ids())); } @@ -163,7 +163,7 @@ NotifyExtensionsDownloadStageChanged( no_updates, ExtensionDownloaderDelegate::Stage::FINISHED); NotifyExtensionsDownloadFailed( -@@ -1193,11 +1157,7 @@ bool ExtensionDownloader::IterateFetchCr +@@ -1218,11 +1182,7 @@ bool ExtensionDownloader::IterateFetchCr // fetch. switch (fetch->credentials) { case ExtensionFetch::CREDENTIALS_NONE: diff --git a/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch b/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch index c8a8af1a..9ff9b6b5 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -3446,8 +3446,6 @@ jumbo_static_library("ui") { +@@ -3523,8 +3523,6 @@ jumbo_static_library("ui") { "views/sync/dice_bubble_sync_promo_view.h", "views/sync/dice_signin_button_view.cc", "views/sync/dice_signin_button_view.h", diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index 0b256dc7..456da145 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch @@ -2,12 +2,11 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -4901,19 +4901,7 @@ ChromeContentBrowserClient::GetSafeBrows - content::ResourceContext* resource_context) { +@@ -4964,18 +4964,7 @@ ChromeContentBrowserClient::GetSafeBrows + bool safe_browsing_enabled_for_profile) { DCHECK_CURRENTLY_ON(BrowserThread::IO); -- ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); -- if (!io_data->safe_browsing_enabled()->GetValue()) +- if (!safe_browsing_enabled_for_profile) - return nullptr; - - // |safe_browsing_service_| may be unavailable in tests. @@ -25,7 +24,7 @@ base::Optional --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -23,9 +23,6 @@ +@@ -25,9 +25,6 @@ #include "chrome/browser/download/download_stats.h" #include "chrome/browser/download/offline_item_utils.h" #include "chrome/browser/profiles/profile.h" @@ -35,15 +34,15 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "components/download/public/common/download_danger_type.h" -@@ -43,7 +40,6 @@ - +@@ -46,7 +43,6 @@ using base::TimeDelta; using download::DownloadItem; + using MixedContentStatus = download::DownloadItem::MixedContentStatus; -using safe_browsing::DownloadFileType; namespace { -@@ -284,14 +280,7 @@ bool DownloadItemModel::IsMalicious() co +@@ -293,14 +289,7 @@ bool DownloadItemModel::IsMixedContent() } bool DownloadItemModel::ShouldAllowDownloadFeedback() const { @@ -65,12 +64,12 @@ #include "chrome/browser/native_file_system/native_file_system_permission_request_manager.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h" - #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/common/chrome_paths.h" -@@ -328,78 +327,6 @@ class ReadPermissionGrantImpl - PermissionStatus status_ = PermissionStatus::GRANTED; - }; + #include "components/content_settings/core/browser/host_content_settings_map.h" +@@ -208,79 +207,6 @@ BindResultCallbackToCurrentSequence( + base::SequencedTaskRunnerHandle::Get(), std::move(callback)); + } -void DoSafeBrowsingCheckOnUIThread( - int process_id, @@ -136,6 +135,7 @@ - case Result::SENSITIVE_CONTENT_WARNING: - case Result::SENSITIVE_CONTENT_BLOCK: - case Result::DEEP_SCANNED_SAFE: +- case Result::PROMPT_FOR_SCANNING: - NOTREACHED(); - return ChromeNativeFileSystemPermissionContext::AfterWriteCheckResult:: - kAllow; @@ -147,8 +147,8 @@ } // namespace ChromeNativeFileSystemPermissionContext::Grants::Grants() = default; -@@ -680,29 +607,6 @@ void ChromeNativeFileSystemPermissionCon - process_id, frame_id, std::move(callback))); +@@ -363,29 +289,6 @@ void ChromeNativeFileSystemPermissionCon + frame_id, std::move(callback))); } -void ChromeNativeFileSystemPermissionContext::PerformAfterWriteChecks( @@ -174,27 +174,26 @@ - base::SequencedTaskRunnerHandle::Get(), std::move(callback)))); -} - - ChromeNativeFileSystemPermissionContext::Grants - ChromeNativeFileSystemPermissionContext::GetPermissionGrants( - const url::Origin& origin, + void ChromeNativeFileSystemPermissionContext:: + DidConfirmSensitiveDirectoryAccess( + const url::Origin& origin, --- a/chrome/browser/native_file_system/chrome_native_file_system_permission_context.h +++ b/chrome/browser/native_file_system/chrome_native_file_system_permission_context.h -@@ -152,12 +152,6 @@ class ChromeNativeFileSystemPermissionCo +@@ -58,11 +58,6 @@ class ChromeNativeFileSystemPermissionCo + int process_id, int frame_id, base::OnceCallback callback) override; - - void PerformAfterWriteChecks( - std::unique_ptr item, - int process_id, - int frame_id, - base::OnceCallback callback) override; -- + bool CanRequestWritePermission(const url::Origin& origin) override; + // Returns a snapshot of the currently granted permissions. - // TODO(https://crbug.com/984769): Eliminate process_id and frame_id from this - // method when grants stop being scoped to a frame. --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -25,7 +25,6 @@ +@@ -26,7 +26,6 @@ #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/prerender/prerender_contents.h" #include "chrome/browser/profiles/profile.h" @@ -202,20 +201,20 @@ #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/site_isolation/site_isolation_policy.h" #include "chrome/browser/sync/profile_sync_service_factory.h" -@@ -93,11 +92,11 @@ +@@ -94,11 +93,11 @@ #if BUILDFLAG(FULL_SAFE_BROWSING) #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h" #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" +#endif - #include "ui/base/clipboard/clipboard.h" - #include "ui/events/keycodes/keyboard_codes.h" #include "services/service_manager/public/cpp/connector.h" #include "third_party/blink/public/mojom/clipboard/clipboard.mojom.h" + #include "ui/base/clipboard/clipboard.h" + #include "ui/events/keycodes/keyboard_codes.h" -#endif #if defined(OS_ANDROID) #include "chrome/browser/android/tab_android.h" -@@ -543,6 +542,7 @@ bool ChromePasswordManagerClient::IsIsol +@@ -558,6 +557,7 @@ bool ChromePasswordManagerClient::IsIsol return SiteIsolationPolicy::IsIsolationForPasswordSitesEnabled(); } @@ -223,7 +222,7 @@ #if defined(ON_FOCUS_PING_ENABLED) || \ defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED) safe_browsing::PasswordProtectionService* -@@ -565,6 +565,7 @@ void ChromePasswordManagerClient::CheckS +@@ -580,6 +580,7 @@ void ChromePasswordManagerClient::CheckS } } #endif // defined(ON_FOCUS_PING_ENABLED) @@ -231,7 +230,7 @@ #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED) void ChromePasswordManagerClient::CheckProtectedPasswordEntry( -@@ -572,24 +573,11 @@ void ChromePasswordManagerClient::CheckP +@@ -587,24 +588,11 @@ void ChromePasswordManagerClient::CheckP const std::string& username, const std::vector& matching_domains, bool password_field_exists) { @@ -256,7 +255,7 @@ } #endif // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED) -@@ -713,7 +701,9 @@ void ChromePasswordManagerClient::OnInpu +@@ -728,7 +716,9 @@ void ChromePasswordManagerClient::OnInpu if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) { OnPaste(); } else { @@ -266,7 +265,7 @@ } #endif // defined(OS_ANDROID) } -@@ -839,9 +829,11 @@ void ChromePasswordManagerClient::OnPast +@@ -854,9 +844,11 @@ void ChromePasswordManagerClient::OnPast base::string16 text; clipboard->ReadText(ui::ClipboardBuffer::kCopyPaste, &text); was_on_paste_called_ = true; @@ -281,7 +280,7 @@ const gfx::RectF& bounds) { --- a/chrome/browser/password_manager/chrome_password_manager_client.h +++ b/chrome/browser/password_manager/chrome_password_manager_client.h -@@ -184,7 +184,7 @@ class ChromePasswordManagerClient +@@ -192,7 +192,7 @@ class ChromePasswordManagerClient void OnImeFinishComposingTextEvent() override; #endif // defined(OS_ANDROID) @@ -292,13 +291,14 @@ safe_browsing::PasswordProtectionService* GetPasswordProtectionService() --- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc +++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc -@@ -18,9 +18,7 @@ - #include "chrome/browser/permissions/permission_request.h" +@@ -17,10 +17,8 @@ + #include "chrome/browser/permissions/crowd_deny_preload_data.h" #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h" #include "chrome/browser/permissions/quiet_notification_permission_ui_state.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_features.h" --#include "components/safe_browsing/db/database_manager.h" + #include "components/permissions/permission_request.h" +-#include "components/safe_browsing/core/db/database_manager.h" namespace { @@ -393,7 +393,7 @@ } --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc -@@ -1127,6 +1127,7 @@ void DownloadItemView::ShowDeepScanningD +@@ -1304,6 +1304,7 @@ void DownloadItemView::ShowDeepScanningD }, base::Unretained(this)))); @@ -401,7 +401,7 @@ int delay_delivery = g_browser_process->local_state()->GetInteger( prefs::kDelayDeliveryUntilVerdict); if (delay_delivery != safe_browsing::DELAY_DOWNLOADS && -@@ -1138,6 +1139,9 @@ void DownloadItemView::ShowDeepScanningD +@@ -1315,6 +1316,9 @@ void DownloadItemView::ShowDeepScanningD } else { open_button_->SetEnabled(false); } @@ -411,7 +411,7 @@ file_name_label_->SetVisible(false); status_label_->SetVisible(false); -@@ -1445,7 +1449,9 @@ base::string16 DownloadItemView::ElidedF +@@ -1625,7 +1629,9 @@ base::string16 DownloadItemView::ElidedF } void DownloadItemView::OpenDownloadDuringAsyncScanning() { @@ -423,7 +423,7 @@ --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc -@@ -159,10 +159,7 @@ PasswordReuseModalWarningDialog::Passwor +@@ -183,10 +183,7 @@ PasswordReuseModalWarningDialog::Passwor placeholder_offsets); } else { views::Label* message_body_label = CreateMessageBodyLabel( @@ -434,19 +434,19 @@ + l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS)); CreateGaiaPasswordReuseModalWarningDialog(message_body_label); } - } + modal_construction_start_time_ = base::TimeTicks::Now(); --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -78,8 +78,6 @@ +@@ -81,8 +81,6 @@ #include "components/nacl/common/buildflags.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/buildflags.h" --#include "components/safe_browsing/web_ui/constants.h" --#include "components/safe_browsing/web_ui/safe_browsing_ui.h" +-#include "components/safe_browsing/content/web_ui/safe_browsing_ui.h" +-#include "components/safe_browsing/core/web_ui/constants.h" #include "components/security_interstitials/content/connection_help_ui.h" #include "components/security_interstitials/content/known_interception_disclosure_ui.h" #include "components/security_interstitials/content/urls.h" -@@ -414,8 +412,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc +@@ -423,8 +421,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc return &NewWebUI; if (url.host_piece() == chrome::kChromeUIQuotaInternalsHost) return &NewWebUI; @@ -468,7 +468,7 @@ } --- a/components/password_manager/core/browser/password_manager_client.h +++ b/components/password_manager/core/browser/password_manager_client.h -@@ -279,7 +279,7 @@ class PasswordManagerClient { +@@ -290,7 +290,7 @@ class PasswordManagerClient { // Returns the current best guess as to the page's display language. virtual std::string GetPageLanguage() const; @@ -477,9 +477,9 @@ // Return the PasswordProtectionService associated with this instance. virtual safe_browsing::PasswordProtectionService* GetPasswordProtectionService() const = 0; ---- a/components/safe_browsing/common/safe_browsing.mojom -+++ b/components/safe_browsing/common/safe_browsing.mojom -@@ -127,7 +127,6 @@ enum PhishingDetectorResult { +--- a/components/safe_browsing/content/common/safe_browsing.mojom ++++ b/components/safe_browsing/content/common/safe_browsing.mojom +@@ -117,7 +117,6 @@ enum PhishingDetectorResult { INVALID_SCORE = 4, }; @@ -592,7 +592,7 @@ base::WeakPtrFactory weak_factory_{this}; --- a/content/public/browser/native_file_system_permission_context.h +++ b/content/public/browser/native_file_system_permission_context.h -@@ -95,13 +95,6 @@ class NativeFileSystemPermissionContext +@@ -100,13 +100,6 @@ class NativeFileSystemPermissionContext base::OnceCallback callback) = 0; enum class AfterWriteCheckResult { kAllow, kBlock }; diff --git a/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch b/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch index dbd49e3c..623320f8 100644 --- a/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch +++ b/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch @@ -2,7 +2,7 @@ --- a/net/tools/transport_security_state_generator/transport_security_state_generator.cc +++ b/net/tools/transport_security_state_generator/transport_security_state_generator.cc -@@ -124,7 +124,7 @@ bool CheckDuplicateEntries(const Transpo +@@ -125,7 +125,7 @@ bool CheckDuplicateEntries(const Transpo bool CheckNoopEntries(const TransportSecurityStateEntries& entries) { for (const auto& entry : entries) { if (!entry->force_https && entry->pinset.empty() && !entry->expect_ct) { diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 8d5ac30c..b2c58f6e 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -8,11 +8,11 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "components/prefs/pref_service_factory.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/url_formatter/url_fixer.h" #include "components/user_prefs/user_prefs.h" #include "components/variations/net/variations_http_headers.h" -@@ -438,8 +437,6 @@ void AwBrowserContext::RebuildTable( +@@ -439,8 +438,6 @@ void AwBrowserContext::RebuildTable( } void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) { @@ -23,7 +23,7 @@ // TODO(amalova): Make sure NetworkContext is configured correctly when --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -2994,18 +2994,6 @@ +@@ -3052,21 +3052,6 @@ Uses cookies to remember your preferences, even if you don’t visit those pages @@ -36,6 +36,9 @@ - - Help improve Chrome security - +- +- Safe Browsing +- - - To detect dangerous apps and sites, Chrome sends URLs of some pages you visit, limited system information, and some page content to Google - @@ -44,15 +47,15 @@ --- a/chrome/browser/android/preferences/prefs.h +++ b/chrome/browser/android/preferences/prefs.h -@@ -20,7 +20,6 @@ +@@ -21,7 +21,6 @@ #include "components/offline_pages/core/prefetch/prefetch_prefs.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/payments/core/payment_prefs.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/signin/public/base/signin_pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" -@@ -93,8 +92,6 @@ const char* const kPrefsExposedToJava[] +@@ -95,8 +94,6 @@ const char* const kPrefsExposedToJava[] autofill::prefs::kAutofillCreditCardEnabled, prefs::kUsageStatsEnabled, offline_pages::prefetch_prefs::kUserSettingEnabled, @@ -123,22 +126,23 @@ BooleanPrefMember force_browser_signin_; --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -233,14 +233,12 @@ - #include "components/safe_browsing/browser/browser_url_loader_throttle.h" - #include "components/safe_browsing/browser/url_checker_delegate.h" - #include "components/safe_browsing/buildflags.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/db/database_manager.h" - #include "components/safe_browsing/features.h" - #include "components/safe_browsing/password_protection/password_protection_navigation_throttle.h" - #include "components/security_interstitials/content/origin_policy_ui.h" +@@ -239,7 +239,6 @@ + #include "components/safe_browsing/content/browser/browser_url_loader_throttle.h" + #include "components/safe_browsing/content/password_protection/password_protection_navigation_throttle.h" + #include "components/safe_browsing/core/browser/url_checker_delegate.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/db/database_manager.h" + #include "components/safe_browsing/core/features.h" + #include "components/safe_browsing/core/realtime/policy_engine.h" +@@ -248,7 +247,6 @@ #include "components/security_interstitials/content/ssl_cert_reporter.h" + #include "components/security_interstitials/content/ssl_error_handler.h" #include "components/security_interstitials/content/ssl_error_navigation_throttle.h" -#include "components/signin/public/identity_manager/identity_manager.h" #include "components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h" #include "components/translate/core/common/translate_switches.h" #include "components/url_formatter/url_fixer.h" -@@ -2069,13 +2067,9 @@ void ChromeContentBrowserClient::AppendE +@@ -2102,13 +2100,9 @@ void ChromeContentBrowserClient::AppendE } } @@ -155,22 +159,36 @@ if (prefs->GetBoolean(prefs::kPrintPreviewDisabled)) command_line->AppendSwitch(switches::kDisablePrintPreview); -@@ -4257,7 +4251,7 @@ ChromeContentBrowserClient::CreateURLLoa +@@ -4290,7 +4284,7 @@ ChromeContentBrowserClient::CreateURLLoa signin::IdentityManager* identity_manager = IdentityManagerFactory::GetForProfile(profile); - bool is_signed_in = identity_manager && identity_manager->HasPrimaryAccount(); + bool is_signed_in = false; - chrome::mojom::DynamicParams dynamic_params = { - profile->GetPrefs()->GetBoolean(prefs::kForceGoogleSafeSearch), + #if defined(OS_ANDROID) + std::string client_data_header; +--- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc ++++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc +@@ -106,10 +106,7 @@ void MaybeCreateSafeBrowsingForRenderer( + if (!render_process_host) + return; + +- bool safe_browsing_enabled = +- Profile::FromBrowserContext(render_process_host->GetBrowserContext()) +- ->GetPrefs() +- ->GetBoolean(prefs::kSafeBrowsingEnabled); ++ bool safe_browsing_enabled = false; + base::CreateSingleThreadTaskRunner({content::BrowserThread::IO}) + ->PostTask( + FROM_HERE, --- a/chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl.cc +++ b/chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl.cc @@ -18,7 +18,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "extensions/browser/extension_system.h" namespace lock_screen_apps { @@ -188,7 +206,7 @@ #include "components/arc/session/arc_session.h" #include "components/crx_file/id_util.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "content/public/test/browser_task_environment.h" #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" @@ -258,10 +276,28 @@ #include "components/infobars/core/infobar.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/buildflags.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/proto/csd.pb.h" - #include "components/safe_browsing/safe_browsing_service_interface.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/proto/csd.pb.h" + #include "components/safe_browsing/core/safe_browsing_service_interface.h" #include "components/security_state/core/features.h" +--- a/chrome/browser/download/download_item_model.cc ++++ b/chrome/browser/download/download_item_model.cc +@@ -706,6 +706,7 @@ void DownloadItemModel::ExecuteCommand(D + DownloadUIModel::ExecuteCommand(download_commands, command); + break; + case DownloadCommands::DEEP_SCAN: ++#if BUILDFLAG(FULL_SAFE_BROWSING) + safe_browsing::SafeBrowsingService* sb_service = + g_browser_process->safe_browsing_service(); + if (!sb_service) +@@ -728,6 +729,7 @@ void DownloadItemModel::ExecuteCommand(D + delegate->GetWeakPtr(), download_->GetId()), + safe_browsing::DeepScanningRequest::DeepScanTrigger:: + TRIGGER_APP_PROMPT); ++#endif + break; + } + } --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc @@ -47,7 +47,6 @@ @@ -274,15 +310,15 @@ #include "components/signin/public/identity_manager/identity_test_utils.h" --- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc +++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc -@@ -24,7 +24,6 @@ +@@ -25,7 +25,6 @@ #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/extensions/api/identity.h" #include "components/prefs/pref_service.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" - #include "content/public/browser/browser_task_traits.h" -@@ -62,7 +61,7 @@ const char* const kExtensionsIdentityAPI +@@ -64,7 +63,7 @@ const char* const kExtensionsIdentityAPI "extensions_identity_api"; bool IsBrowserSigninAllowed(Profile* profile) { @@ -293,15 +329,15 @@ } // namespace --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc -@@ -30,7 +30,6 @@ +@@ -31,7 +31,6 @@ #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" #include "components/proxy_config/proxy_config_pref_names.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/spellcheck/browser/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" #include "extensions/browser/extension_pref_value_map.h" -@@ -111,11 +110,6 @@ const PrefMappingEntry kPrefMapping[] = +@@ -114,11 +113,6 @@ const PrefMappingEntry kPrefMapping[] = APIPermission::kPrivacy}, {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermission::kPrivacy, APIPermission::kPrivacy}, @@ -315,15 +351,15 @@ {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc -@@ -26,7 +26,6 @@ +@@ -27,7 +27,6 @@ #include "components/keep_alive_registry/scoped_keep_alive.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/translate/core/browser/translate_pref_names.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/extension_registry.h" -@@ -58,7 +57,6 @@ class ExtensionPreferenceApiTest : publi +@@ -60,7 +59,6 @@ class ExtensionPreferenceApiTest : publi prefs->GetInteger(prefs::kNetworkPredictionOptions)); EXPECT_TRUE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); @@ -331,7 +367,7 @@ EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); } -@@ -82,7 +80,6 @@ class ExtensionPreferenceApiTest : publi +@@ -85,7 +83,6 @@ class ExtensionPreferenceApiTest : publi prefs->GetInteger(prefs::kNetworkPredictionOptions)); EXPECT_FALSE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); @@ -339,7 +375,7 @@ EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); } -@@ -134,7 +131,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionPreferen +@@ -137,7 +134,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionPreferen prefs->SetInteger(prefs::kNetworkPredictionOptions, chrome_browser_net::NETWORK_PREDICTION_NEVER); prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false); @@ -349,15 +385,15 @@ prefs->SetBoolean(prefs::kWebRTCNonProxiedUdpEnabled, false); --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc -@@ -43,7 +43,6 @@ +@@ -44,7 +44,6 @@ #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_manager.h" #include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/proto/webprotect.pb.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/proto/webprotect.pb.h" #include "components/signin/public/identity_manager/identity_manager.h" #if defined(OS_CHROMEOS) -@@ -123,12 +122,6 @@ SafeBrowsingPrivateEventRouter::SafeBrow +@@ -139,12 +138,6 @@ SafeBrowsingPrivateEventRouter::SafeBrow // in tests. if (g_browser_process && g_browser_process->local_state()) { RealtimeReportingPrefChanged(std::string()); @@ -370,7 +406,7 @@ } } -@@ -610,9 +603,6 @@ void SafeBrowsingPrivateEventRouter::Ini +@@ -691,9 +684,6 @@ void SafeBrowsingPrivateEventRouter::Ini } if (g_browser_process) { @@ -380,7 +416,7 @@ IfAuthorized(base::BindOnce( &SafeBrowsingPrivateEventRouter::InitRealtimeReportingClientCallback, weak_ptr_factory_.GetWeakPtr(), device_management_service)); -@@ -707,9 +697,7 @@ void SafeBrowsingPrivateEventRouter::OnC +@@ -788,9 +778,7 @@ void SafeBrowsingPrivateEventRouter::OnC bool SafeBrowsingPrivateEventRouter::IsRealtimeReportingEnabled() { // g_browser_process and/or g_browser_process->local_state() may be null // in tests. @@ -391,7 +427,7 @@ } void SafeBrowsingPrivateEventRouter::RealtimeReportingPrefChanged( -@@ -721,9 +709,6 @@ void SafeBrowsingPrivateEventRouter::Rea +@@ -802,9 +790,6 @@ void SafeBrowsingPrivateEventRouter::Rea void SafeBrowsingPrivateEventRouter::IfAuthorized( base::OnceCallback cont) { @@ -411,7 +447,7 @@ namespace content { class BrowserContext; -@@ -249,7 +248,6 @@ class SafeBrowsingPrivateEventRouter : p +@@ -266,7 +265,6 @@ class SafeBrowsingPrivateEventRouter : p // The |private_client_| is used on platforms where we cannot just get a // client and we create our own (used through |client_|). std::unique_ptr private_client_; @@ -425,21 +461,21 @@ #include "chrome/test/base/testing_profile_manager.h" #include "components/policy/core/common/cloud/mock_cloud_policy_client.h" #include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/proto/webprotect.pb.h" #include "content/public/test/browser_task_environment.h" #include "extensions/browser/test_event_router.h" - #include "testing/gmock/include/gmock/gmock.h" --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -28,7 +28,6 @@ +@@ -29,7 +29,6 @@ #include "components/payments/core/payment_prefs.h" #include "components/prefs/pref_service.h" #include "components/proxy_config/proxy_config_pref_names.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/search_engines/default_search_manager.h" #include "components/spellcheck/browser/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" -@@ -243,10 +242,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -245,10 +244,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::PREF_TYPE_BOOLEAN; // Sync and personalization page. @@ -452,7 +488,7 @@ (*s_whitelist) --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc -@@ -539,9 +539,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore +@@ -538,9 +538,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, GetReferrerChainForNonSafeBrowsingUser) { PrefService* pref_service = browser()->profile()->GetPrefs(); @@ -468,7 +504,7 @@ #include "chrome/common/chrome_features.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "net/base/features.h" #include "net/cert/trial_comparison_cert_verifier.h" #include "net/net_buildflags.h" @@ -478,7 +514,7 @@ #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" #include "chrome/common/channel_info.h" #include "chrome/common/chrome_features.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/certificate_error_report.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" @@ -530,7 +566,7 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/cert_logger.pb.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "content/public/browser/browser_task_traits.h" @@ -597,18 +633,18 @@ } --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -68,10 +68,8 @@ +@@ -69,10 +69,8 @@ #include "components/policy/core/common/policy_pref_names.h" #include "components/policy/core/common/schema.h" #include "components/policy/policy_constants.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/search_engines/default_search_policy_handler.h" #include "components/security_state/core/security_state_pref_names.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/driver/sync_policy_handler.h" -@@ -173,12 +171,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -174,12 +172,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kQuicAllowed, prefs::kQuicAllowed, base::Value::Type::BOOLEAN }, @@ -621,7 +657,7 @@ { key::kUrlKeyedAnonymizedDataCollectionEnabled, unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, base::Value::Type::BOOLEAN }, -@@ -336,24 +328,9 @@ const PolicyToPreferenceMapEntry kSimple +@@ -334,24 +326,9 @@ const PolicyToPreferenceMapEntry kSimple { key::kGloballyScopeHTTPAuthCacheEnabled, prefs::kGloballyScopeHTTPAuthCacheEnabled, base::Value::Type::BOOLEAN }, @@ -646,7 +682,7 @@ { key::kWebComponentsV0Enabled, prefs::kWebComponentsV0Enabled, base::Value::Type::BOOLEAN }, -@@ -466,18 +443,12 @@ const PolicyToPreferenceMapEntry kSimple +@@ -464,18 +441,12 @@ const PolicyToPreferenceMapEntry kSimple { key::kURLWhitelist, policy_prefs::kUrlWhitelist, base::Value::Type::LIST }, @@ -665,10 +701,13 @@ { key::kSSLErrorOverrideAllowed, prefs::kSSLErrorOverrideAllowed, base::Value::Type::BOOLEAN }, -@@ -1175,27 +1146,6 @@ const PolicyToPreferenceMapEntry kSimple - { key::kBrowserSwitcherDelay, - browser_switcher::prefs::kDelay, - base::Value::Type::INTEGER }, +@@ -1207,36 +1178,6 @@ const PolicyToPreferenceMapEntry kSimple + { key::kBrowserGuestModeEnforced, + prefs::kBrowserGuestModeEnforced, + base::Value::Type::BOOLEAN }, +- { key::kUnsafeEventsReportingEnabled, +- prefs::kUnsafeEventsReportingEnabled, +- base::Value::Type::BOOLEAN }, - { key::kDelayDeliveryUntilVerdict, - prefs::kDelayDeliveryUntilVerdict, - base::Value::Type::INTEGER }, @@ -681,29 +720,36 @@ - { key::kCheckContentCompliance, - prefs::kCheckContentCompliance, - base::Value::Type::INTEGER }, +- { key::kBlockUnsupportedFiletypes, +- prefs::kBlockUnsupportedFiletypes, +- base::Value::Type::INTEGER }, - { key::kURLsToCheckComplianceOfDownloadedContent, - prefs::kURLsToCheckComplianceOfDownloadedContent, - base::Value::Type::LIST }, - { key::kURLsToCheckForMalwareOfUploadedContent, - prefs::kURLsToCheckForMalwareOfUploadedContent, - base::Value::Type::LIST }, +- { key::kURLsToNotCheckForMalwareOfDownloadedContent, +- prefs::kURLsToNotCheckForMalwareOfDownloadedContent, +- base::Value::Type::LIST }, - { key::kURLsToNotCheckComplianceOfUploadedContent, - prefs::kURLsToNotCheckComplianceOfUploadedContent, - base::Value::Type::LIST }, - #endif - #if defined(OS_WIN) - { key::kBrowserSwitcherUseIeSitelist, -@@ -1212,9 +1162,6 @@ const PolicyToPreferenceMapEntry kSimple - { key::kBrowserGuestModeEnforced, - prefs::kBrowserGuestModeEnforced, - base::Value::Type::BOOLEAN }, -- { key::kUnsafeEventsReportingEnabled, -- prefs::kUnsafeEventsReportingEnabled, -- base::Value::Type::BOOLEAN }, #endif { key::kPasswordLeakDetectionEnabled, password_manager::prefs::kPasswordLeakDetectionEnabled, -@@ -1461,22 +1408,6 @@ std::unique_ptr( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); @@ -746,15 +792,15 @@ std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -127,7 +127,6 @@ +@@ -125,7 +125,6 @@ #include "components/prefs/pref_service.h" #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "components/rappor/rappor_service_impl.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/security_state/core/security_state.h" #include "components/sessions/core/session_id_generator.h" -@@ -640,7 +639,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -654,7 +653,6 @@ void RegisterLocalState(PrefRegistrySimp profiles::RegisterPrefs(registry); rappor::RapporServiceImpl::RegisterPrefs(registry); RegisterScreenshotPrefs(registry); @@ -762,7 +808,7 @@ secure_origin_whitelist::RegisterPrefs(registry); sessions::SessionIdGenerator::RegisterPrefs(registry); SSLConfigServiceManager::RegisterPrefs(registry); -@@ -840,7 +838,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -853,7 +851,6 @@ void RegisterProfilePrefs(user_prefs::Pr PushMessagingAppIdentifier::RegisterProfilePrefs(registry); QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); @@ -776,7 +822,7 @@ #include "components/prefs/pref_service.h" #include "components/prefs/pref_store.h" #include "components/prefs/pref_value_store.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/search_engines_pref_names.h" -#include "components/signin/public/base/signin_pref_names.h" @@ -814,32 +860,32 @@ EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, --- a/chrome/browser/prefs/pref_functional_browsertest.cc +++ b/chrome/browser/prefs/pref_functional_browsertest.cc -@@ -22,7 +22,6 @@ - #include "components/content_settings/core/browser/website_settings_registry.h" +@@ -23,7 +23,6 @@ #include "components/content_settings/core/common/content_settings_types.h" #include "components/content_settings/core/common/pref_names.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" + #include "components/embedder_support/pref_names.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/sync_preferences/pref_service_syncable.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -@@ -217,9 +216,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe +@@ -218,9 +217,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe prefs->SetInteger(prefs::kNetworkPredictionOptions, chrome_browser_net::NETWORK_PREDICTION_NEVER); - EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); - prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false); - - EXPECT_TRUE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)); - prefs->SetBoolean(prefs::kAlternateErrorPagesEnabled, false); + EXPECT_TRUE(prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled)); + prefs->SetBoolean(embedder_support::kAlternateErrorPagesEnabled, false); -@@ -233,7 +229,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe +@@ -234,7 +230,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe EXPECT_EQ(chrome_browser_net::NETWORK_PREDICTION_NEVER, prefs->GetInteger(prefs::kNetworkPredictionOptions)); - EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); - EXPECT_FALSE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)); + EXPECT_FALSE( + prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled)); EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); - } --- a/chrome/browser/profiles/gaia_info_update_service.cc +++ b/chrome/browser/profiles/gaia_info_update_service.cc @@ -20,7 +20,6 @@ @@ -858,11 +904,11 @@ - base::UTF16ToUTF8(hosted_domain)); if (info.picture_url == kNoPictureURLFound) { - entry->SetGAIAPicture(gfx::Image()); -@@ -124,8 +121,6 @@ void GAIAInfoUpdateService::ClearProfile + entry->SetGAIAPicture(std::string(), gfx::Image()); +@@ -119,8 +116,6 @@ void GAIAInfoUpdateService::ClearProfile entry->SetGAIAName(base::string16()); entry->SetGAIAGivenName(base::string16()); - entry->SetGAIAPicture(gfx::Image()); + entry->SetGAIAPicture(std::string(), gfx::Image()); - // Unset the cached URL. - profile_prefs_->ClearPref(prefs::kGoogleServicesHostedDomain); } @@ -878,40 +924,19 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/sync_preferences/pref_service_syncable.h" #include "testing/gmock/include/gmock/gmock.h" ---- a/chrome/browser/profiles/off_the_record_profile_io_data.cc -+++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc -@@ -25,7 +25,6 @@ - #include "chrome/common/url_constants.h" - #include "components/net_log/chrome_net_log.h" - #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "content/public/browser/browser_task_traits.h" - #include "content/public/browser/browser_thread.h" - #include "content/public/browser/cookie_store_factory.h" -@@ -83,10 +82,6 @@ void OffTheRecordProfileIOData::Handle:: - // Set initialized_ to true at the beginning in case any of the objects - // below try to get the ResourceContext pointer. - initialized_ = true; -- io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled, -- profile_->GetPrefs()); -- io_data_->safe_browsing_enabled()->MoveToSequence( -- base::CreateSingleThreadTaskRunner({BrowserThread::IO})); - io_data_->InitializeOnUIThread(profile_); - } - --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -22,7 +22,6 @@ #include "components/language/core/browser/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/sync/base/sync_prefs.h" #include "components/sync/driver/sync_driver_switches.h" #include "components/sync/driver/sync_service.h" --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -135,7 +135,6 @@ +@@ -133,7 +133,6 @@ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/scoped_user_pref_update.h" @@ -919,30 +944,9 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/sync_preferences/pref_service_syncable.h" #include "components/url_formatter/url_fixer.h" ---- a/chrome/browser/profiles/profile_impl_io_data.cc -+++ b/chrome/browser/profiles/profile_impl_io_data.cc -@@ -43,7 +43,6 @@ - #include "components/prefs/pref_filter.h" - #include "components/prefs/pref_member.h" - #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "content/public/browser/browser_context.h" - #include "content/public/browser/browser_task_traits.h" - #include "content/public/browser/browser_thread.h" -@@ -116,10 +115,6 @@ void ProfileImplIOData::Handle::LazyInit - // below try to get the ResourceContext pointer. - initialized_ = true; - PrefService* pref_service = profile_->GetPrefs(); -- io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled, -- pref_service); -- io_data_->safe_browsing_enabled()->MoveToSequence( -- base::CreateSingleThreadTaskRunner({BrowserThread::IO})); - io_data_->InitializeOnUIThread(profile_); - } - --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc -@@ -52,7 +52,6 @@ +@@ -50,7 +50,6 @@ #include "components/metrics/metrics_service.h" #include "components/net_log/chrome_net_log.h" #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" @@ -952,7 +956,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -83,7 +83,6 @@ +@@ -85,7 +85,6 @@ #include "components/search_engines/default_search_manager.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -960,7 +964,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/sync/base/stop_source.h" -@@ -1666,7 +1665,6 @@ void ProfileManager::AddProfileToStorage +@@ -1677,7 +1676,6 @@ void ProfileManager::AddProfileToStorage void ProfileManager::SetNonPersonalProfilePrefs(Profile* profile) { PrefService* prefs = profile->GetPrefs(); @@ -998,7 +1002,7 @@ #endif namespace profiles { -@@ -178,10 +177,6 @@ bool IsProfileLocked(const base::FilePat +@@ -173,10 +172,6 @@ bool IsProfileLocked(const base::FilePat #if !defined(OS_CHROMEOS) void UpdateIsProfileLockEnabledIfNeeded(Profile* profile) { @@ -1009,90 +1013,37 @@ UpdateGaiaProfileInfoIfNeeded(profile); } ---- a/chrome/browser/resources/settings/privacy_page/personalization_options.html -+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html -@@ -59,11 +59,6 @@ - sub-label="$i18n{linkDoctorPrefDesc}"> - - - - ---- a/chrome/browser/resources/settings/privacy_page/personalization_options.js -+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.js -@@ -127,20 +127,7 @@ Polymer({ - - /** @private */ - onSafeBrowsingReportingPrefChange_: function() { -- if (this.prefs == undefined) { -- return; -- } -- const safeBrowsingScoutPref = -- this.getPref('safebrowsing.scout_reporting_enabled'); -- const prefValue = !!this.getPref('safebrowsing.enabled').value && -- !!safeBrowsingScoutPref.value; -- this.safeBrowsingReportingPref_ = { -- key: '', -- type: chrome.settingsPrivate.PrefType.BOOLEAN, -- value: prefValue, -- enforcement: safeBrowsingScoutPref.enforcement, -- controlledBy: safeBrowsingScoutPref.controlledBy, -- }; -+ return; - }, - - // --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -104,12 +104,6 @@ - class$="[[getIronCollapseCssClass_( - privacySettingsRedesignEnabled_)]]"> - - - @@ -1121,43 +1072,43 @@ search-label="$i18n{siteSettingsAllSitesSearch}" --- a/chrome/browser/resources/settings/privacy_page/privacy_page.js +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js -@@ -113,7 +113,7 @@ Polymer({ - enableSafeBrowsingSubresourceFilter_: { - type: Boolean, - value: function() { -- return loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter'); -+ return false; - } +@@ -103,7 +103,7 @@ cr.define('settings', function() { + enableSafeBrowsingSubresourceFilter_: { + type: Boolean, + value() { +- return loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter'); ++ return false; + } + }, + +@@ -281,20 +281,7 @@ cr.define('settings', function() { + + /** @private */ + onSafeBrowsingReportingPrefChange_() { +- if (this.prefs == undefined) { +- return; +- } +- const safeBrowsingScoutPref = +- this.getPref('safebrowsing.scout_reporting_enabled'); +- const prefValue = !!this.getPref('safebrowsing.enabled').value && +- !!safeBrowsingScoutPref.value; +- this.safeBrowsingReportingPref_ = { +- key: '', +- type: chrome.settingsPrivate.PrefType.BOOLEAN, +- value: prefValue, +- enforcement: safeBrowsingScoutPref.enforcement, +- controlledBy: safeBrowsingScoutPref.controlledBy, +- }; ++ return; }, -@@ -290,20 +290,7 @@ Polymer({ - - /** @private */ - onSafeBrowsingReportingPrefChange_: function() { -- if (this.prefs == undefined) { -- return; -- } -- const safeBrowsingScoutPref = -- this.getPref('safebrowsing.scout_reporting_enabled'); -- const prefValue = !!this.getPref('safebrowsing.enabled').value && -- !!safeBrowsingScoutPref.value; -- this.safeBrowsingReportingPref_ = { -- key: '', -- type: chrome.settingsPrivate.PrefType.BOOLEAN, -- value: prefValue, -- enforcement: safeBrowsingScoutPref.enforcement, -- controlledBy: safeBrowsingScoutPref.controlledBy, -- }; -+ return; - }, - - /** + /** --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js @@ -39,7 +39,7 @@ Polymer({ enableSafeBrowsingSubresourceFilter_: { type: Boolean, - value: function() { + value() { - return loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter'); + return false; } @@ -1165,25 +1116,25 @@ --- a/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc +++ b/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc -@@ -14,7 +14,6 @@ - #include "chrome/test/base/in_process_browser_test.h" - #include "chrome/test/base/ui_test_utils.h" +@@ -16,7 +16,6 @@ #include "components/prefs/testing_pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" - #include "components/safe_browsing/triggers/ad_redirect_trigger.h" - #include "components/safe_browsing/triggers/mock_trigger_manager.h" + #include "components/safe_browsing/content/triggers/ad_redirect_trigger.h" + #include "components/safe_browsing/content/triggers/mock_trigger_manager.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" + #include "content/public/browser/render_frame_host.h" + #include "content/public/browser/web_contents.h" --- a/chrome/browser/safe_browsing/advanced_protection_status_manager.cc +++ b/chrome/browser/safe_browsing/advanced_protection_status_manager.cc -@@ -11,7 +11,6 @@ +@@ -12,7 +12,6 @@ #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/primary_account_access_token_fetcher.h" -@@ -55,10 +54,7 @@ void AdvancedProtectionStatusManager::Ma +@@ -60,10 +59,7 @@ void AdvancedProtectionStatusManager::Ma is_under_advanced_protection_ = core_info.is_under_advanced_protection; @@ -1195,7 +1146,7 @@ if (is_under_advanced_protection_) ScheduleNextRefresh(); } else { -@@ -214,9 +210,6 @@ void AdvancedProtectionStatusManager::Ca +@@ -219,9 +215,6 @@ void AdvancedProtectionStatusManager::Ca void AdvancedProtectionStatusManager::UpdateLastRefreshTime() { last_refreshed_ = base::Time::Now(); @@ -1204,14 +1155,14 @@ - last_refreshed_.ToDeltaSinceWindowsEpoch().InMicroseconds()); } - bool AdvancedProtectionStatusManager::RequestsAdvancedProtectionVerdicts() { + bool AdvancedProtectionStatusManager::IsUnderAdvancedProtection() const { --- a/chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc +++ b/chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc @@ -9,7 +9,6 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_test_environment.h" #include "components/sync_preferences/testing_pref_service_syncable.h" @@ -1221,7 +1172,7 @@ #include "base/macros.h" #include "chrome/browser/safe_browsing/services_delegate.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" namespace safe_browsing { @@ -1231,7 +1182,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/certificate_error_report.h" #include "content/public/browser/browser_thread.h" #include "services/network/public/cpp/shared_url_loader_factory.h" @@ -1241,7 +1192,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/cert_report_helper.h" #include "components/security_interstitials/content/certificate_error_report.h" #include "components/variations/variations_params_manager.h" @@ -1251,7 +1202,7 @@ #include "components/component_updater/component_updater_service.h" #include "components/component_updater/pref_names.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.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" #include "extensions/browser/extension_registry.h" @@ -1261,7 +1212,7 @@ #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/policy_constants.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -1271,21 +1222,21 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/channel_info.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/version_info/version_info.h" namespace safe_browsing { --- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc -@@ -37,7 +37,6 @@ - #include "components/prefs/pref_change_registrar.h" - #include "components/prefs/pref_service.h" - #include "components/prefs/scoped_user_pref_update.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/common/utils.h" - #include "components/safe_browsing/db/database_manager.h" - #include "components/safe_browsing/features.h" -@@ -1182,14 +1181,6 @@ bool ChromePasswordProtectionService::Ha +@@ -41,7 +41,6 @@ + #include "components/safe_browsing/content/password_protection/password_protection_navigation_throttle.h" + #include "components/safe_browsing/content/password_protection/password_protection_request.h" + #include "components/safe_browsing/content/web_ui/safe_browsing_ui.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/utils.h" + #include "components/safe_browsing/core/db/database_manager.h" + #include "components/safe_browsing/core/features.h" +@@ -1210,14 +1209,6 @@ bool ChromePasswordProtectionService::Ha } void ChromePasswordProtectionService::OnWarningTriggerChanged() { @@ -1300,7 +1251,7 @@ // Clears captured enterprise password hashes or GSuite sync password hashes. scoped_refptr password_store = GetProfilePasswordStore(); -@@ -1356,7 +1347,7 @@ PrefService* ChromePasswordProtectionSer +@@ -1384,7 +1375,7 @@ PrefService* ChromePasswordProtectionSer } bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() { @@ -1309,7 +1260,7 @@ } bool ChromePasswordProtectionService::IsExtendedReporting() { -@@ -1387,10 +1378,8 @@ bool ChromePasswordProtectionService::Is +@@ -1415,10 +1406,8 @@ bool ChromePasswordProtectionService::Is return enabled; } @@ -1321,7 +1272,7 @@ *reason = RequestOutcome::TURNED_OFF_BY_ADMIN; return false; } -@@ -1555,24 +1544,6 @@ MaybeCreateNavigationThrottle(content::N +@@ -1595,24 +1584,6 @@ MaybeCreateNavigationThrottle(content::N : nullptr; } @@ -1348,7 +1299,7 @@ RequestOutcome* reason) const { --- a/chrome/browser/safe_browsing/chrome_password_protection_service.h +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h -@@ -210,13 +210,6 @@ class ChromePasswordProtectionService : +@@ -217,13 +217,6 @@ class ChromePasswordProtectionService : bool UserClickedThroughSBInterstitial( content::WebContents* web_contents) override; @@ -1364,22 +1315,21 @@ // policy. --- a/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc -@@ -25,7 +25,6 @@ - #include "components/password_manager/core/common/password_manager_pref_names.h" - #include "components/prefs/pref_service.h" +@@ -27,7 +27,6 @@ #include "components/prefs/scoped_user_pref_update.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" - #include "components/safe_browsing/password_protection/metrics_util.h" - #include "components/safe_browsing/password_protection/password_protection_request.h" + #include "components/safe_browsing/content/password_protection/metrics_util.h" + #include "components/safe_browsing/content/password_protection/password_protection_request.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" + #include "components/security_state/core/security_state.h" + #include "components/signin/public/identity_manager/account_info.h" --- a/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc -@@ -27,10 +27,8 @@ - #include "components/password_manager/core/common/password_manager_pref_names.h" +@@ -28,9 +28,7 @@ #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/password_protection/password_protection_request.h" + #include "components/safe_browsing/content/password_protection/password_protection_request.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_state/core/security_state.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/identity_manager.h" @@ -1389,23 +1339,23 @@ +++ b/chrome/browser/safe_browsing/client_side_detection_host.cc @@ -25,7 +25,6 @@ #include "components/prefs/pref_service.h" - #include "components/safe_browsing/common/safe_browsing.mojom-shared.h" - #include "components/safe_browsing/common/safe_browsing.mojom.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/db/allowlist_checker_client.h" - #include "components/safe_browsing/db/database_manager.h" - #include "components/safe_browsing/proto/csd.pb.h" + #include "components/safe_browsing/content/common/safe_browsing.mojom-shared.h" + #include "components/safe_browsing/content/common/safe_browsing.mojom.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/db/allowlist_checker_client.h" + #include "components/safe_browsing/core/db/database_manager.h" + #include "components/safe_browsing/core/proto/csd.pb.h" --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -25,7 +25,6 @@ #include "chrome/common/safe_browsing/client_model.pb.h" #include "components/prefs/pref_service.h" - #include "components/safe_browsing/common/safe_browsing.mojom.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/common/utils.h" - #include "components/safe_browsing/proto/csd.pb.h" + #include "components/safe_browsing/content/common/safe_browsing.mojom.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/utils.h" + #include "components/safe_browsing/core/proto/csd.pb.h" #include "content/public/browser/browser_thread.h" -@@ -228,20 +227,8 @@ void ClientSideDetectionService::SendMod +@@ -181,20 +180,8 @@ void ClientSideDetectionService::SendMod // and we select the model based on the extended reporting setting. Profile* profile = Profile::FromBrowserContext(process->GetBrowserContext()); std::string model; @@ -1430,62 +1380,62 @@ process->BindReceiver(phishing.BindNewPipeAndPassReceiver()); --- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc -@@ -23,7 +23,6 @@ +@@ -25,7 +25,6 @@ #include "chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h" #include "chrome/browser/safe_browsing/dm_token_utils.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/proto/webprotect.pb.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/proto/webprotect.pb.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 -@@ -35,7 +35,6 @@ +@@ -36,7 +36,6 @@ #include "components/policy/core/browser/url_util.h" #include "components/policy/core/common/policy_pref_names.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/common/utils.h" - #include "components/safe_browsing/features.h" - #include "components/safe_browsing/proto/csd.pb.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/utils.h" + #include "components/safe_browsing/core/features.h" + #include "components/safe_browsing/core/proto/csd.pb.h" --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc -@@ -24,7 +24,6 @@ - #include "chrome/browser/safe_browsing/download_protection/ppapi_download_request.h" +@@ -25,7 +25,6 @@ #include "chrome/common/safe_browsing/file_type_policies.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/common/utils.h" - #include "components/safe_browsing/web_ui/safe_browsing_ui.h" + #include "components/safe_browsing/content/web_ui/safe_browsing_ui.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/utils.h" #include "content/public/browser/browser_context.h" + #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc @@ -66,7 +66,6 @@ #include "components/password_manager/core/browser/test_password_store.h" #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/common/safebrowsing_switches.h" - #include "components/safe_browsing/db/database_manager.h" - #include "components/safe_browsing/db/test_database_manager.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/safebrowsing_switches.h" + #include "components/safe_browsing/core/db/database_manager.h" + #include "components/safe_browsing/core/db/test_database_manager.h" --- a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc @@ -20,7 +20,6 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/proto/csd.pb.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/proto/csd.pb.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "content/public/test/browser_task_environment.h" --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -39,7 +39,6 @@ - #include "chrome/common/chrome_features.h" +@@ -38,7 +38,6 @@ + #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/proto/csd.pb.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/proto/csd.pb.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item_utils.h" --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc @@ -1494,8 +1444,8 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/proto/csd.pb.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/proto/csd.pb.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "content/public/test/browser_task_environment.h" --- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc @@ -1504,8 +1454,8 @@ #include "components/history/core/browser/history_constants.h" #include "components/history/core/browser/history_database_params.h" #include "components/history/core/browser/history_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/proto/csd.pb.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/proto/csd.pb.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "content/public/test/browser_task_environment.h" --- a/chrome/browser/safe_browsing/incident_reporting/state_store.cc @@ -1514,7 +1464,7 @@ #include "chrome/browser/safe_browsing/incident_reporting/incident.h" #include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" namespace safe_browsing { @@ -1524,7 +1474,7 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "components/pref_registry/pref_registry_syncable.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/sync_preferences/pref_service_syncable.h" #include "components/sync_preferences/pref_service_syncable_factory.h" #include "content/public/test/browser_task_environment.h" @@ -1533,31 +1483,31 @@ @@ -21,7 +21,6 @@ #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" - #include "components/safe_browsing/browser/threat_details.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" - #include "components/safe_browsing/triggers/trigger_manager.h" + #include "components/safe_browsing/content/browser/threat_details.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" + #include "components/safe_browsing/core/triggers/trigger_manager.h" #include "components/security_interstitials/content/security_interstitial_controller_client.h" --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc -@@ -44,7 +44,6 @@ - #include "components/prefs/pref_service.h" - #include "components/safe_browsing/browser/threat_details.h" - #include "components/safe_browsing/common/safe_browsing.mojom.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/db/database_manager.h" - #include "components/safe_browsing/db/test_database_manager.h" - #include "components/safe_browsing/db/util.h" +@@ -45,7 +45,6 @@ + #include "components/safe_browsing/content/browser/threat_details.h" + #include "components/safe_browsing/content/common/safe_browsing.mojom.h" + #include "components/safe_browsing/content/renderer/threat_dom_details.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/db/database_manager.h" + #include "components/safe_browsing/core/db/test_database_manager.h" + #include "components/safe_browsing/core/db/util.h" --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc @@ -21,7 +21,6 @@ #include "chrome/test/base/testing_profile.h" #include "components/prefs/pref_service.h" - #include "components/safe_browsing/browser/threat_details.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" + #include "components/safe_browsing/content/browser/threat_details.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" #include "components/security_interstitials/content/security_interstitial_controller_client.h" - #include "components/security_interstitials/core/safe_browsing_quiet_error_ui.h" + #include "components/security_interstitials/content/unsafe_resource_util.h" --- a/chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.cc +++ b/chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.cc @@ -253,10 +253,7 @@ GURL SafeBrowsingNavigationObserverManag @@ -1591,7 +1541,7 @@ return nullptr; } -@@ -243,15 +240,11 @@ V4ProtocolConfig SafeBrowsingService::Ge +@@ -243,24 +240,17 @@ V4ProtocolConfig SafeBrowsingService::Ge VerdictCacheManager* SafeBrowsingService::GetVerdictCacheManager( Profile* profile) const { @@ -1600,14 +1550,24 @@ return nullptr; } - BinaryUploadService* SafeBrowsingService::GetBinaryUploadService( - Profile* profile) const { -- if (profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled)) -- return services_delegate_->GetBinaryUploadService(profile); + base::WeakPtr + SafeBrowsingService::GetVerdictCacheManagerWeakPtr(Profile* profile) const { +- if (profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled)) { +- VerdictCacheManager* cache_manager = +- services_delegate_->GetVerdictCacheManager(profile); +- return cache_manager ? cache_manager->GetWeakPtr() : nullptr; +- } return nullptr; } -@@ -340,9 +333,6 @@ void SafeBrowsingService::OnProfileAdded + BinaryUploadService* SafeBrowsingService::GetBinaryUploadService( + Profile* profile) const { +- return services_delegate_->GetBinaryUploadService(profile); ++ return nullptr; + } + + std::string SafeBrowsingService::GetProtocolConfigClientName() const { +@@ -347,9 +337,6 @@ void SafeBrowsingService::OnProfileAdded std::unique_ptr registrar = std::make_unique(); registrar->Init(pref_service); @@ -1617,7 +1577,7 @@ // ClientSideDetectionService will need to be refresh the models // renderers have if extended-reporting changes. registrar->Add( -@@ -354,9 +344,6 @@ void SafeBrowsingService::OnProfileAdded +@@ -361,9 +348,6 @@ void SafeBrowsingService::OnProfileAdded prefs_map_[pref_service] = std::move(registrar); RefreshState(); @@ -1627,7 +1587,7 @@ // Extended Reporting metrics are handled together elsewhere. RecordExtendedReportingMetrics(*pref_service); -@@ -395,16 +382,9 @@ void SafeBrowsingService::RefreshState() +@@ -421,16 +405,9 @@ void SafeBrowsingService::RefreshState() DCHECK_CURRENTLY_ON(BrowserThread::UI); // Check if any profile requires the service to be active. enabled_by_prefs_ = false; @@ -1651,9 +1611,9 @@ #include "chrome/browser/profiles/profile_observer.h" #include "chrome/browser/safe_browsing/services_delegate.h" #include "components/safe_browsing/buildflags.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/db/util.h" - #include "components/safe_browsing/safe_browsing_service_interface.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/db/util.h" + #include "components/safe_browsing/core/safe_browsing_service_interface.h" #include "content/public/browser/browser_thread.h" @@ -92,15 +91,6 @@ class SafeBrowsingService : public SafeB // Called on the main thread to let us know that the io_thread is going away. @@ -1671,7 +1631,7 @@ // Get current enabled status. Must be called on IO thread. bool enabled() const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); -@@ -268,10 +258,6 @@ class SafeBrowsingService : public SafeB +@@ -275,10 +265,6 @@ class SafeBrowsingService : public SafeB // Provides phishing and malware statistics. Accessed on UI thread. std::unique_ptr ping_manager_; @@ -1684,14 +1644,14 @@ --- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc +++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc -@@ -21,7 +21,6 @@ - #include "chrome/browser/safe_browsing/safe_browsing_service.h" +@@ -22,7 +22,6 @@ #include "components/keyed_service/core/service_access_type.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/db/database_manager.h" - #include "components/safe_browsing/features.h" - #include "components/safe_browsing/ping_manager.h" + #include "components/safe_browsing/content/web_ui/safe_browsing_ui.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/db/database_manager.h" + #include "components/safe_browsing/core/features.h" + #include "components/safe_browsing/core/ping_manager.h" @@ -168,7 +167,7 @@ const PrefService* AndroidTelemetryServi } @@ -1707,8 +1667,8 @@ #include "chrome/test/base/testing_profile.h" #include "components/download/public/common/mock_download_item.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" --- a/chrome/browser/safe_browsing/ui_manager.cc @@ -1716,31 +1676,31 @@ @@ -23,7 +23,6 @@ #include "chrome/common/url_constants.h" #include "components/prefs/pref_service.h" - #include "components/safe_browsing/browser/threat_details.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/ping_manager.h" + #include "components/safe_browsing/content/browser/threat_details.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/ping_manager.h" #include "components/security_interstitials/content/security_interstitial_tab_helper.h" - #include "content/public/browser/browser_thread.h" + #include "components/security_interstitials/content/unsafe_resource_util.h" --- a/chrome/browser/safe_browsing/ui_manager_unittest.cc +++ b/chrome/browser/safe_browsing/ui_manager_unittest.cc -@@ -15,7 +15,6 @@ +@@ -16,7 +16,6 @@ #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/db/util.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/db/util.h" + #include "components/security_interstitials/content/unsafe_resource_util.h" #include "components/security_interstitials/core/base_safe_browsing_error_ui.h" - #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/safe_browsing/url_checker_delegate_impl.cc +++ b/chrome/browser/safe_browsing/url_checker_delegate_impl.cc -@@ -14,7 +14,6 @@ - #include "chrome/browser/profiles/profile_io_data.h" +@@ -15,7 +15,6 @@ #include "chrome/browser/safe_browsing/ui_manager.h" #include "components/safe_browsing/buildflags.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/db/database_manager.h" - #include "components/safe_browsing/db/v4_protocol_manager_util.h" - #include "components/safe_browsing/features.h" + #include "components/safe_browsing/content/triggers/suspicious_site_trigger.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/db/database_manager.h" + #include "components/safe_browsing/core/db/v4_protocol_manager_util.h" + #include "components/safe_browsing/core/features.h" --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc @@ -18,7 +18,6 @@ @@ -1836,7 +1796,7 @@ #include "content/public/test/browser_test_utils.h" --- a/chrome/browser/signin/dice_browsertest.cc +++ b/chrome/browser/signin/dice_browsertest.cc -@@ -54,7 +54,6 @@ +@@ -55,7 +55,6 @@ #include "components/signin/public/base/account_consistency_method.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" @@ -1854,7 +1814,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/sync/base/pref_names.h" #include "components/sync/driver/sync_service.h" -@@ -71,7 +70,7 @@ void HeaderModificationDelegateImpl::Pro +@@ -63,7 +62,7 @@ void HeaderModificationDelegateImpl::Pro #endif #if BUILDFLAG(ENABLE_DICE_SUPPORT) sync_service && sync_service->IsSyncFeatureEnabled(), @@ -1912,7 +1872,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/identity_utils.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -217,7 +216,7 @@ void EnsurePrimaryAccountAllowedForProfi +@@ -216,7 +215,7 @@ void EnsurePrimaryAccountAllowedForProfi return; CoreAccountInfo primary_account = identity_manager->GetPrimaryAccountInfo(); @@ -1931,17 +1891,17 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -89,9 +88,6 @@ void FinishImportCredentialsFromProvider - signin_metrics::Reason::REASON_SIGNIN_PRIMARY_ACCOUNT, account_id, - DiceTurnSyncOnHelper::SigninAbortedMode::KEEP_ACCOUNT); +@@ -131,9 +130,6 @@ void ImportCredentialsFromProvider(Profi + account_id, nullptr)); + } } - - // Mark this profile as having been signed in with the credential provider. - profile->GetPrefs()->SetBoolean(prefs::kSignedInWithCredentialProvider, true); } - // Start the process of importing credentials from the credential provider given -@@ -230,8 +226,7 @@ bool ReauthWithCredentialProviderIfPossi + // Extracts preferences to consider while signing in through credential +@@ -309,8 +305,7 @@ bool ReauthWithCredentialProviderIfPossi // - The profile is already signed in. // - The profile is in an auth error state. auto* identity_manager = IdentityManagerFactory::GetForProfile(profile); @@ -1961,63 +1921,33 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/identity_test_utils.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" ---- a/chrome/browser/ssl/bad_clock_blocking_page.cc -+++ b/chrome/browser/ssl/bad_clock_blocking_page.cc -@@ -12,7 +12,6 @@ - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/ssl/chrome_security_blocking_page_factory.h" - #include "chrome/browser/ssl/ssl_error_controller_client.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/security_interstitials/content/cert_report_helper.h" - #include "components/security_interstitials/content/ssl_cert_reporter.h" - #include "components/security_interstitials/core/bad_clock_ui.h" ---- a/chrome/browser/ssl/captive_portal_blocking_page.cc -+++ b/chrome/browser/ssl/captive_portal_blocking_page.cc -@@ -18,7 +18,6 @@ - #include "chrome/browser/ssl/ssl_error_controller_client.h" - #include "components/captive_portal/captive_portal_detector.h" - #include "components/captive_portal/captive_portal_metrics.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/security_interstitials/content/cert_report_helper.h" - #include "components/security_interstitials/content/ssl_cert_reporter.h" - #include "components/security_interstitials/core/controller_client.h" --- a/chrome/browser/ssl/certificate_reporting_test_utils.cc +++ b/chrome/browser/ssl/certificate_reporting_test_utils.cc @@ -15,7 +15,6 @@ #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/cert_report_helper.h" #include "components/security_interstitials/content/certificate_error_report.h" #include "components/variations/variations_associated_data.h" ---- a/chrome/browser/ssl/mitm_software_blocking_page.cc -+++ b/chrome/browser/ssl/mitm_software_blocking_page.cc -@@ -10,7 +10,6 @@ - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/ssl/chrome_security_blocking_page_factory.h" - #include "chrome/browser/ssl/ssl_error_controller_client.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/security_interstitials/content/cert_report_helper.h" - #include "components/security_interstitials/content/ssl_cert_reporter.h" - #include "components/security_interstitials/core/metrics_helper.h" --- a/chrome/browser/ssl/ssl_browsertest.cc +++ b/chrome/browser/ssl/ssl_browsertest.cc -@@ -94,7 +94,6 @@ +@@ -88,7 +88,6 @@ #include "components/policy/core/common/policy_map.h" #include "components/policy/policy_constants.h" #include "components/prefs/testing_pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/security_interstitials/content/bad_clock_blocking_page.h" + #include "components/security_interstitials/content/captive_portal_blocking_page.h" #include "components/security_interstitials/content/cert_report_helper.h" - #include "components/security_interstitials/content/security_interstitial_controller_client.h" - #include "components/security_interstitials/content/security_interstitial_tab_helper.h" --- a/chrome/browser/ssl/ssl_error_controller_client.cc +++ b/chrome/browser/ssl/ssl_error_controller_client.cc @@ -22,7 +22,6 @@ #include "chrome/common/chrome_features.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" @@ -2071,7 +2001,7 @@ --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -52,7 +52,6 @@ +@@ -53,7 +53,6 @@ #include "components/feature_engagement/buildflags.h" #include "components/prefs/pref_service.h" #include "components/sessions/core/tab_restore_service.h" @@ -2079,7 +2009,7 @@ #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" -@@ -180,10 +179,6 @@ BrowserCommandController::BrowserCommand +@@ -181,10 +180,6 @@ BrowserCommandController::BrowserCommand base::Bind(&BrowserCommandController::UpdateCommandsForFullscreenMode, base::Unretained(this))); #endif @@ -2090,7 +2020,7 @@ InitCommandState(); -@@ -1406,7 +1401,7 @@ void BrowserCommandController::UpdateSho +@@ -1422,7 +1417,7 @@ void BrowserCommandController::UpdateSho return; command_updater_.UpdateCommandEnabled( @@ -2121,7 +2051,7 @@ #include "ui/events/keycodes/keyboard_codes.h" --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -70,7 +70,6 @@ +@@ -71,7 +71,6 @@ #if !defined(OS_ANDROID) #include "chrome/browser/signin/identity_manager_factory.h" @@ -2129,7 +2059,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif -@@ -513,13 +512,7 @@ void ShowBrowserSignin(Browser* browser, +@@ -496,13 +495,7 @@ void ShowBrowserSignin(Browser* browser, void ShowBrowserSigninOrSettings(Browser* browser, signin_metrics::AccessPoint access_point) { @@ -2146,12 +2076,12 @@ --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc -@@ -50,7 +50,6 @@ +@@ -52,7 +52,6 @@ #include "components/download/public/common/download_item.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/buildflags.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" #include "components/url_formatter/elide_url.h" #include "components/vector_icons/vector_icons.h" --- a/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc @@ -2159,7 +2089,7 @@ @@ -17,7 +17,6 @@ #include "chrome/test/base/ui_test_utils.h" #include "components/password_manager/core/browser/password_manager_metrics_util.h" - #include "components/safe_browsing/password_protection/metrics_util.h" + #include "components/safe_browsing/content/password_protection/metrics_util.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_manager.h" @@ -2174,34 +2104,21 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/strings/grit/components_strings.h" -@@ -539,11 +538,6 @@ void ProfileMenuView::BuildAutofillButto +@@ -438,11 +437,6 @@ void ProfileMenuView::BuildAutofillButto void ProfileMenuView::BuildSyncInfo() { Profile* profile = browser()->profile(); - // Only show the sync info if signin and sync are allowed. - if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed) || -- !profile->IsSyncAllowed()) { +- !ProfileSyncServiceFactory::IsSyncAllowed(profile)) { - return; - } signin::IdentityManager* identity_manager = IdentityManagerFactory::GetForProfile(profile); -@@ -910,12 +904,6 @@ void ProfileMenuView::AddCurrentProfileV - IDS_PROFILES_EDIT_SIGNED_IN_PROFILE_ACCESSIBLE_NAME, profile_name, - avatar_item.username)); - } else { -- bool is_signin_allowed = -- profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed); -- // For the dice promo equivalent, see AddDiceSigninPromo() call sites. -- if (!dice_enabled_ && is_signin_allowed) -- AddPreDiceSigninPromo(); -- - current_profile_card->SetAccessibleName(l10n_util::GetStringFUTF16( - IDS_PROFILES_EDIT_PROFILE_ACCESSIBLE_NAME, profile_name)); - } --- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc -@@ -48,7 +48,6 @@ +@@ -46,7 +46,6 @@ #include "chrome/test/base/ui_test_utils.h" #include "components/autofill/core/common/autofill_payments_features.h" #include "components/prefs/pref_service.h" @@ -2211,24 +2128,24 @@ #include "components/sync/driver/sync_user_settings.h" --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc -@@ -134,7 +134,6 @@ PasswordReuseModalWarningDialog::Passwor +@@ -135,7 +135,6 @@ PasswordReuseModalWarningDialog::Passwor OnWarningDone done_callback) : content::WebContentsObserver(web_contents), done_callback_(std::move(done_callback)), - service_(service), url_(web_contents->GetLastCommittedURL()), password_type_(password_type) { - DialogDelegate::set_button_label(ui::DIALOG_BUTTON_OK, -@@ -143,30 +142,14 @@ PasswordReuseModalWarningDialog::Passwor - ui::DIALOG_BUTTON_CANCEL, - l10n_util::GetStringUTF16(IDS_PAGE_INFO_IGNORE_PASSWORD_WARNING_BUTTON)); + DialogDelegate::set_buttons( +@@ -167,31 +166,13 @@ PasswordReuseModalWarningDialog::Passwor + make_done_callback(WarningAction::IGNORE_WARNING)); + DialogDelegate::set_close_callback(make_done_callback(WarningAction::CLOSE)); - // |service| maybe NULL in tests. - if (service_) - service_->AddObserver(this); - - std::vector placeholder_offsets; - +- std::vector placeholder_offsets; +- - if (password_type.account_type() == - ReusedPasswordAccountType::SAVED_PASSWORD) { - const base::string16 message_body = @@ -2245,17 +2162,18 @@ + views::Label* message_body_label = CreateMessageBodyLabel( + l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS)); + CreateGaiaPasswordReuseModalWarningDialog(message_body_label); + modal_construction_start_time_ = base::TimeTicks::Now(); } PasswordReuseModalWarningDialog::~PasswordReuseModalWarningDialog() { - if (service_) - service_->RemoveObserver(this); + LogModalWarningDialogLifetime(modal_construction_start_time_); } - void PasswordReuseModalWarningDialog:: --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h -@@ -63,7 +63,6 @@ class PasswordReuseModalWarningDialog +@@ -59,7 +59,6 @@ class PasswordReuseModalWarningDialog private: OnWarningDone done_callback_; @@ -2311,21 +2229,21 @@ #include "chrome/common/url_constants.h" #include "components/download/public/common/download_item.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/render_process_host.h" --- a/chrome/browser/ui/webui/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management_ui_handler.cc -@@ -24,7 +24,6 @@ - #include "chrome/browser/profiles/profile.h" +@@ -26,7 +26,6 @@ + #include "chrome/common/chrome_features.h" #include "chrome/common/pref_names.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/strings/grit/components_strings.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" -@@ -595,34 +594,6 @@ base::Value ManagementUIHandler::GetThre +@@ -633,34 +632,6 @@ base::Value ManagementUIHandler::GetThre const policy::PolicyService* policy_service = GetPolicyService(); const auto& chrome_policies = policy_service->GetPolicies( policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, std::string())); @@ -2393,14 +2311,14 @@ --- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc +++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc -@@ -14,7 +14,6 @@ - #include "chrome/browser/ui/webui/reset_password/reset_password.mojom.h" - #include "chrome/common/url_constants.h" +@@ -16,7 +16,6 @@ #include "chrome/grit/browser_resources.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/password_protection/metrics_util.h" - #include "components/safe_browsing/password_protection/password_protection_service.h" - #include "components/safe_browsing/proto/csd.pb.h" + #include "components/safe_browsing/content/password_protection/metrics_util.h" + #include "components/safe_browsing/content/password_protection/password_protection_service.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/proto/csd.pb.h" + #include "components/strings/grit/components_strings.h" + #include "components/url_formatter/url_formatter.h" --- a/chrome/browser/ui/webui/settings/change_password_handler.cc +++ b/chrome/browser/ui/webui/settings/change_password_handler.cc @@ -23,8 +23,7 @@ using safe_browsing::RequestOutcome; @@ -2463,7 +2381,7 @@ --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -37,7 +37,6 @@ +@@ -41,7 +41,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/public/base/signin_metrics.h" @@ -2471,7 +2389,7 @@ #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -342,9 +341,6 @@ void PeopleHandler::RegisterMessages() { +@@ -353,9 +352,6 @@ void PeopleHandler::RegisterMessages() { void PeopleHandler::OnJavascriptAllowed() { PrefService* prefs = profile_->GetPrefs(); profile_pref_registrar_.Init(prefs); @@ -2481,7 +2399,7 @@ signin::IdentityManager* identity_manager( IdentityManagerFactory::GetInstance()->GetForProfile(profile_)); -@@ -891,7 +887,7 @@ std::unique_ptr P +@@ -970,7 +966,7 @@ std::unique_ptr P service && service->HasDisableReason( syncer::SyncService::DISABLE_REASON_ENTERPRISE_POLICY); sync_status->SetBoolean( @@ -2496,11 +2414,11 @@ #include "components/omnibox/common/omnibox_features.h" #include "components/password_manager/core/browser/manage_passwords_referrer.h" #include "components/password_manager/core/common/password_manager_features.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/strings/grit/components_strings.h" #include "components/subresource_filter/core/browser/subresource_filter_features.h" -@@ -2557,14 +2556,6 @@ void AddPrivacyStrings(content::WebUIDat +@@ -1478,15 +1477,6 @@ void AddPrivacyStrings(content::WebUIDat {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, @@ -2512,10 +2430,11 @@ - IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION}, - {"safeBrowsingEnableProtectionDesc", - IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION_DESC}, +- {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL}, {"syncAndGoogleServicesPrivacyDescription", IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT}, {"urlKeyedAnonymizedDataCollection", -@@ -3140,11 +3131,6 @@ void AddSiteSettingsStrings(content::Web +@@ -2049,11 +2039,6 @@ void AddSiteSettingsStrings(content::Web AddLocalizedStringsBulk(html_source, kSensorsLocalizedStrings); html_source->AddBoolean( @@ -2567,7 +2486,7 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -@@ -130,8 +129,6 @@ void InlineLoginHandler::ContinueHandleI +@@ -129,8 +128,6 @@ void InlineLoginHandler::ContinueHandleI std::string default_email; if (reason == signin_metrics::Reason::REASON_SIGNIN_PRIMARY_ACCOUNT || reason == signin_metrics::Reason::REASON_FORCED_SIGNIN_PRIMARY_ACCOUNT) { @@ -2657,8 +2576,8 @@ -#include "components/signin/public/base/signin_pref_names.h" #include "components/strings/grit/components_strings.h" #include "net/base/url_util.h" - -@@ -189,7 +188,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web + #include "ui/base/webui/web_ui_util.h" +@@ -190,7 +189,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web "returningUserModules", welcome::GetModules(profile).FindKey("returning-user")->GetString()); html_source->AddBoolean( @@ -2669,18 +2588,18 @@ weak_ptr_factory_.GetWeakPtr()), --- a/chrome/browser/unified_consent/unified_consent_service_factory.cc +++ b/chrome/browser/unified_consent/unified_consent_service_factory.cc -@@ -12,7 +12,6 @@ - #include "chrome/common/pref_names.h" +@@ -13,7 +13,6 @@ + #include "components/embedder_support/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/prefs/pref_registry_simple.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/spellcheck/browser/pref_names.h" #include "components/sync_preferences/pref_service_syncable.h" #include "components/unified_consent/unified_consent_metrics.h" -@@ -34,7 +33,6 @@ namespace { +@@ -35,7 +34,6 @@ namespace { std::vector GetSyncedServicePrefNames() { return { - prefs::kSearchSuggestEnabled, prefs::kAlternateErrorPagesEnabled, + prefs::kSearchSuggestEnabled, embedder_support::kAlternateErrorPagesEnabled, - prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingScoutReportingEnabled, spellcheck::prefs::kSpellCheckUseSpellingService, #if defined(OS_ANDROID) @@ -2712,20 +2631,20 @@ # Android. -password_reuse_detection_support = !is_ios +password_reuse_detection_support = false - password_reuse_warning_support = !is_android && !is_ios + password_reuse_warning_support = !is_ios password_on_focus_ping_support = !is_ios --- a/components/password_manager/core/browser/leak_detection_delegate.cc +++ b/components/password_manager/core/browser/leak_detection_delegate.cc -@@ -19,7 +19,6 @@ +@@ -20,7 +20,6 @@ #include "components/password_manager/core/common/password_manager_features.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "services/network/public/cpp/shared_url_loader_factory.h" namespace password_manager { -@@ -51,12 +50,6 @@ void LeakDetectionDelegate::StartLeakChe +@@ -52,12 +51,6 @@ void LeakDetectionDelegate::StartLeakChe LogString(client_, Logger::STRING_LEAK_DETECTION_DISABLED_FEATURE); return; } @@ -2740,7 +2659,7 @@ --- a/components/password_manager/core/browser/password_bubble_experiment.cc +++ b/components/password_manager/core/browser/password_bubble_experiment.cc -@@ -14,7 +14,6 @@ +@@ -16,7 +16,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -2748,32 +2667,33 @@ #include "components/sync/driver/sync_service.h" #include "components/sync/driver/sync_user_settings.h" -@@ -61,8 +60,6 @@ bool ShouldShowChromeSignInPasswordPromo - #if defined(OS_CHROMEOS) - return false; - #else +@@ -71,9 +70,6 @@ bool ShouldShowChromeSignInPasswordPromo + return false; + } + - if (!prefs->GetBoolean(prefs::kSigninAllowed)) - return false; - +- if (!sync_service || sync_service->HasDisableReason( + syncer::SyncService::DISABLE_REASON_PLATFORM_OVERRIDE) || --- a/components/password_manager/core/browser/password_reuse_detector.cc +++ b/components/password_manager/core/browser/password_reuse_detector.cc @@ -13,7 +13,6 @@ #include "components/password_manager/core/browser/password_hash_data.h" #include "components/password_manager/core/browser/password_reuse_detector_consumer.h" #include "components/password_manager/core/browser/psl_matching_helper.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" #include "url/origin.h" --- a/components/password_manager/core/browser/password_store.cc +++ b/components/password_manager/core/browser/password_store.cc -@@ -41,7 +41,6 @@ +@@ -42,7 +42,6 @@ #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED) #include "base/strings/string16.h" #include "components/password_manager/core/browser/password_store_signin_notifier.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #endif using autofill::PasswordForm; @@ -2783,7 +2703,7 @@ #include "url/origin.h" #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED) --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #endif // SYNC_PASSWORD_REUSE_DETECTION_ENABLED using autofill::PasswordForm; @@ -2793,7 +2713,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED) --#include "components/safe_browsing/common/safe_browsing_prefs.h" // nogncheck +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" // nogncheck #endif // SYNC_PASSWORD_REUSE_DETECTION_ENABLED using autofill::PasswordForm; @@ -2803,7 +2723,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED) --#include "components/safe_browsing/common/safe_browsing_prefs.h" // nogncheck +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" // nogncheck #endif // SYNC_PASSWORD_REUSE_DETECTION_ENABLED using autofill::PasswordForm; @@ -2819,22 +2739,98 @@ }; // The list of possible errors that can occur while collecting information about ---- a/components/safe_browsing/base_blocking_page.cc -+++ b/components/safe_browsing/base_blocking_page.cc -@@ -11,7 +11,6 @@ - #include "base/lazy_instance.h" +--- a/components/safe_browsing/content/base_blocking_page.cc ++++ b/components/safe_browsing/content/base_blocking_page.cc +@@ -12,7 +12,6 @@ #include "base/strings/string_number_conversions.h" #include "base/time/time.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" - #include "components/safe_browsing/safe_browsing_controller_client.h" + #include "components/safe_browsing/content/safe_browsing_controller_client.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" #include "components/security_interstitials/content/security_interstitial_controller_client.h" ---- a/components/safe_browsing/common/BUILD.gn -+++ b/components/safe_browsing/common/BUILD.gn -@@ -32,20 +32,8 @@ source_set("common") { - ] + #include "components/security_interstitials/content/unsafe_resource_util.h" +--- a/components/safe_browsing/content/password_protection/password_protection_service.cc ++++ b/components/safe_browsing/content/password_protection/password_protection_service.cc +@@ -255,11 +255,6 @@ bool PasswordProtectionService::CanSendP + IsPingingEnabled(trigger_type, password_type, reason); + // Pinging is enabled for password_reuse trigger level; however we need to + // make sure *reason is set appropriately. +- PasswordProtectionTrigger trigger_level = +- GetPasswordProtectionWarningTriggerPref(password_type); +- if (trigger_level == PASSWORD_REUSE) { +- *reason = RequestOutcome::PASSWORD_ALERT_MODE; +- } + if (is_pinging_enabled && + !IsURLWhitelistedForPasswordEntry(main_frame_url, reason)) { + return true; +@@ -450,8 +445,7 @@ PasswordProtectionService::MaybeCreateNa + + bool PasswordProtectionService::IsWarningEnabled( + ReusedPasswordAccountType password_type) { +- return GetPasswordProtectionWarningTriggerPref(password_type) == +- PHISHING_REUSE; ++ return false; } + // static +--- a/components/safe_browsing/content/password_protection/password_protection_service.h ++++ b/components/safe_browsing/content/password_protection/password_protection_service.h +@@ -25,7 +25,6 @@ + #include "components/safe_browsing/content/common/safe_browsing.mojom.h" + #include "components/safe_browsing/content/password_protection/metrics_util.h" + #include "components/safe_browsing/core/browser/referrer_chain_provider.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/db/v4_protocol_manager_util.h" + #include "components/safe_browsing/core/proto/csd.pb.h" + #include "components/sessions/core/session_id.h" +@@ -197,10 +196,6 @@ class PasswordProtectionService : public + // Returns if the warning UI is enabled. + bool IsWarningEnabled(ReusedPasswordAccountType password_type); + +- // Returns the pref value of password protection warning trigger. +- virtual PasswordProtectionTrigger GetPasswordProtectionWarningTriggerPref( +- ReusedPasswordAccountType password_type) const = 0; +- + // If |url| matches Safe Browsing whitelist domains, password protection + // change password URL, or password protection login URLs in the enterprise + // policy. +--- a/components/safe_browsing/content/triggers/suspicious_site_trigger_unittest.cc ++++ b/components/safe_browsing/content/triggers/suspicious_site_trigger_unittest.cc +@@ -11,7 +11,6 @@ + #include "build/build_config.h" + #include "components/prefs/testing_pref_service.h" + #include "components/safe_browsing/content/triggers/mock_trigger_manager.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "content/public/test/browser_task_environment.h" + #include "content/public/test/navigation_simulator.h" + #include "content/public/test/test_renderer_host.h" +--- a/components/safe_browsing/content/web_ui/safe_browsing_ui.cc ++++ b/components/safe_browsing/content/web_ui/safe_browsing_ui.cc +@@ -29,7 +29,6 @@ + #include "components/password_manager/core/browser/hash_password_manager.h" + #include "components/safe_browsing/buildflags.h" + #include "components/safe_browsing/core/browser/referrer_chain_provider.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" + #include "components/safe_browsing/core/proto/csd.pb.h" + #include "components/safe_browsing/core/realtime/policy_engine.h" +@@ -1292,9 +1291,7 @@ void SafeBrowsingUIHandler::GetPrefs(con + AllowJavascript(); + std::string callback_id; + args->GetString(0, &callback_id); +- ResolveJavascriptCallback(base::Value(callback_id), +- safe_browsing::GetSafeBrowsingPreferencesList( +- user_prefs::UserPrefs::Get(browser_context_))); ++ ResolveJavascriptCallback(base::Value(callback_id), base::ListValue()); + } + + void SafeBrowsingUIHandler::GetCookie(const base::ListValue* args) { +--- a/components/safe_browsing/core/common/BUILD.gn ++++ b/components/safe_browsing/core/common/BUILD.gn +@@ -6,20 +6,8 @@ import("//build/config/features.gni") + import("//components/safe_browsing/buildflags.gni") + import("//mojo/public/tools/bindings/mojom.gni") + -static_library("safe_browsing_prefs") { - sources = [ - "safe_browsing_prefs.cc", @@ -2845,8 +2841,8 @@ - "//base:base", - "//components/pref_registry:pref_registry", - "//components/prefs", -- "//components/safe_browsing:features", -- "//content/public/browser:browser", +- "//components/safe_browsing/core:features", +- "//components/safe_browsing/core/common:thread_utils", - "//net:net", - ] +group("safe_browsing_prefs") { @@ -2854,24 +2850,24 @@ } source_set("unit_tests") { ---- a/components/safe_browsing/common/safe_browsing_prefs_unittest.cc -+++ b/components/safe_browsing/common/safe_browsing_prefs_unittest.cc +--- a/components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc ++++ b/components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc @@ -12,7 +12,6 @@ #include "build/build_config.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/testing_pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" - #include "content/public/test/browser_task_environment.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/test_task_environment.h" + #include "components/safe_browsing/core/features.h" #include "testing/gtest/include/gtest/gtest.h" ---- a/components/safe_browsing/db/hit_report.h -+++ b/components/safe_browsing/db/hit_report.h +--- a/components/safe_browsing/core/db/hit_report.h ++++ b/components/safe_browsing/core/db/hit_report.h @@ -7,7 +7,6 @@ - #ifndef COMPONENTS_SAFE_BROWSING_DB_HIT_REPORT_H_ - #define COMPONENTS_SAFE_BROWSING_DB_HIT_REPORT_H_ + #ifndef COMPONENTS_SAFE_BROWSING_CORE_DB_HIT_REPORT_H_ + #define COMPONENTS_SAFE_BROWSING_CORE_DB_HIT_REPORT_H_ --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/db/util.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/db/util.h" #include "url/gurl.h" @@ -44,7 +43,6 @@ struct HitReport { @@ -2882,19 +2878,19 @@ bool is_metrics_reporting_active; std::string post_data; ---- a/components/safe_browsing/db/util.h -+++ b/components/safe_browsing/db/util.h +--- a/components/safe_browsing/core/db/util.h ++++ b/components/safe_browsing/core/db/util.h @@ -18,7 +18,6 @@ #include "base/strings/string_piece.h" #include "base/time/time.h" #include "base/trace_event/traced_value.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/db/v4_protocol_manager_util.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/db/v4_protocol_manager_util.h" namespace safe_browsing { ---- a/components/safe_browsing/db/v4_local_database_manager.cc -+++ b/components/safe_browsing/db/v4_local_database_manager.cc -@@ -231,10 +231,9 @@ const V4LocalDatabaseManager* +--- a/components/safe_browsing/core/db/v4_local_database_manager.cc ++++ b/components/safe_browsing/core/db/v4_local_database_manager.cc +@@ -227,10 +227,9 @@ const V4LocalDatabaseManager* // static scoped_refptr V4LocalDatabaseManager::Create( @@ -2907,7 +2903,7 @@ } void V4LocalDatabaseManager::CollectDatabaseManagerInfo( -@@ -256,10 +255,8 @@ void V4LocalDatabaseManager::CollectData +@@ -252,10 +251,8 @@ void V4LocalDatabaseManager::CollectData V4LocalDatabaseManager::V4LocalDatabaseManager( const base::FilePath& base_path, @@ -2918,8 +2914,8 @@ list_infos_(GetListInfos()), task_runner_(task_runner_for_tests ? task_runner_for_tests -@@ -1017,8 +1014,7 @@ void V4LocalDatabaseManager::SetupUpdate - weak_factory_.GetWeakPtr()); +@@ -1001,8 +998,7 @@ void V4LocalDatabaseManager::SetupUpdate + weak_factory_.GetWeakPtr()); v4_update_protocol_manager_ = V4UpdateProtocolManager::Create( - url_loader_factory, config, update_callback, @@ -2928,9 +2924,9 @@ } void V4LocalDatabaseManager::UpdateRequestCompleted( ---- a/components/safe_browsing/db/v4_local_database_manager.h -+++ b/components/safe_browsing/db/v4_local_database_manager.h -@@ -34,8 +34,7 @@ class V4LocalDatabaseManager : public Sa +--- a/components/safe_browsing/core/db/v4_local_database_manager.h ++++ b/components/safe_browsing/core/db/v4_local_database_manager.h +@@ -33,8 +33,7 @@ class V4LocalDatabaseManager : public Sa // Create and return an instance of V4LocalDatabaseManager, if Finch trial // allows it; nullptr otherwise. static scoped_refptr Create( @@ -2940,7 +2936,7 @@ // Populates the protobuf with the database data. void CollectDatabaseManagerInfo( -@@ -102,7 +101,6 @@ class V4LocalDatabaseManager : public Sa +@@ -99,7 +98,6 @@ class V4LocalDatabaseManager : public Sa // Must be initialized by calling StartOnIOThread() before using. V4LocalDatabaseManager( const base::FilePath& base_path, @@ -2948,7 +2944,7 @@ scoped_refptr task_runner_for_tests); ~V4LocalDatabaseManager() override; -@@ -352,10 +350,6 @@ class V4LocalDatabaseManager : public Sa +@@ -345,10 +343,6 @@ class V4LocalDatabaseManager : public Sa // ready to process next update. DatabaseUpdatedCallback db_updated_callback_; @@ -2959,8 +2955,8 @@ // The client_state of each list currently being synced. This is updated each // time a database update completes, and used to send list client_state // information in the full hash request. ---- a/components/safe_browsing/db/v4_protocol_manager_util.cc -+++ b/components/safe_browsing/db/v4_protocol_manager_util.cc +--- a/components/safe_browsing/core/db/v4_protocol_manager_util.cc ++++ b/components/safe_browsing/core/db/v4_protocol_manager_util.cc @@ -88,8 +88,7 @@ void SetSbV4UrlPrefixForTesting(const ch } @@ -2980,8 +2976,8 @@ return url; } ---- a/components/safe_browsing/db/v4_protocol_manager_util.h -+++ b/components/safe_browsing/db/v4_protocol_manager_util.h +--- a/components/safe_browsing/core/db/v4_protocol_manager_util.h ++++ b/components/safe_browsing/core/db/v4_protocol_manager_util.h @@ -18,9 +18,10 @@ #include @@ -2989,9 +2985,9 @@ +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/strings/string_piece.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" +#include "base/time/time.h" - #include "components/safe_browsing/db/safebrowsing.pb.h" + #include "components/safe_browsing/core/db/safebrowsing.pb.h" #include "url/gurl.h" @@ -88,8 +89,7 @@ V4ProtocolConfig GetV4ProtocolConfig(con @@ -3004,9 +3000,9 @@ // Different types of threats that SafeBrowsing protects against. This is the // type that's returned to the clients of SafeBrowsing in Chromium. ---- a/components/safe_browsing/db/v4_update_protocol_manager.cc -+++ b/components/safe_browsing/db/v4_update_protocol_manager.cc -@@ -74,19 +74,8 @@ static const int kV4TimerStartIntervalSe +--- a/components/safe_browsing/core/db/v4_update_protocol_manager.cc ++++ b/components/safe_browsing/core/db/v4_update_protocol_manager.cc +@@ -75,19 +75,8 @@ static const int kV4TimerStartIntervalSe // Maximum time, in seconds, to wait for a response to an update request. static const int kV4TimerUpdateWaitSecMax = 15 * 60; // 15 minutes @@ -3028,7 +3024,7 @@ } // The default V4UpdateProtocolManagerFactory. -@@ -98,12 +87,10 @@ class V4UpdateProtocolManagerFactoryImpl +@@ -99,12 +88,10 @@ class V4UpdateProtocolManagerFactoryImpl std::unique_ptr CreateProtocolManager( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3036,14 +3032,14 @@ - ExtendedReportingLevelCallback extended_reporting_level_callback) + V4UpdateCallback update_callback) override { - return std::unique_ptr( + return base::WrapUnique( - new V4UpdateProtocolManager(url_loader_factory, config, update_callback, - extended_reporting_level_callback)); + new V4UpdateProtocolManager(url_loader_factory, config, update_callback)); } private: -@@ -119,14 +106,12 @@ V4UpdateProtocolManagerFactory* V4Update +@@ -120,14 +107,12 @@ V4UpdateProtocolManagerFactory* V4Update std::unique_ptr V4UpdateProtocolManager::Create( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3060,7 +3056,7 @@ } void V4UpdateProtocolManager::ResetUpdateErrors() { -@@ -137,8 +122,7 @@ void V4UpdateProtocolManager::ResetUpdat +@@ -138,8 +123,7 @@ void V4UpdateProtocolManager::ResetUpdat V4UpdateProtocolManager::V4UpdateProtocolManager( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3070,7 +3066,7 @@ : update_error_count_(0), update_back_off_mult_(1), next_update_interval_(base::TimeDelta::FromSeconds( -@@ -146,8 +130,7 @@ V4UpdateProtocolManager::V4UpdateProtoco +@@ -147,8 +131,7 @@ V4UpdateProtocolManager::V4UpdateProtoco kV4TimerStartIntervalSecMax))), config_(config), url_loader_factory_(url_loader_factory), @@ -3080,7 +3076,7 @@ // Do not auto-schedule updates. Let the owner (V4LocalDatabaseManager) do it // when it is ready to process updates. } -@@ -241,11 +224,6 @@ std::string V4UpdateProtocolManager::Get +@@ -242,11 +225,6 @@ std::string V4UpdateProtocolManager::Get RICE); } @@ -3092,26 +3088,27 @@ V4ProtocolManagerUtil::SetClientInfoFromConfig(request.mutable_client(), config_); ---- a/components/safe_browsing/db/v4_update_protocol_manager.h -+++ b/components/safe_browsing/db/v4_update_protocol_manager.h +--- a/components/safe_browsing/core/db/v4_update_protocol_manager.h ++++ b/components/safe_browsing/core/db/v4_update_protocol_manager.h @@ -21,7 +21,6 @@ #include "base/sequence_checker.h" #include "base/time/time.h" #include "base/timer/timer.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/db/safebrowsing.pb.h" - #include "components/safe_browsing/db/util.h" - #include "components/safe_browsing/db/v4_protocol_manager_util.h" -@@ -45,8 +44,6 @@ class V4UpdateProtocolManagerFactory; - typedef base::Callback)> - V4UpdateCallback; +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/db/safebrowsing.pb.h" + #include "components/safe_browsing/core/db/util.h" + #include "components/safe_browsing/core/db/v4_protocol_manager_util.h" +@@ -45,9 +44,6 @@ class V4UpdateProtocolManagerFactory; + using V4UpdateCallback = + base::RepeatingCallback)>; --typedef base::Callback ExtendedReportingLevelCallback; +-using ExtendedReportingLevelCallback = +- base::RepeatingCallback; - class V4UpdateProtocolManager { public: ~V4UpdateProtocolManager(); -@@ -61,8 +58,7 @@ class V4UpdateProtocolManager { +@@ -62,8 +58,7 @@ class V4UpdateProtocolManager { static std::unique_ptr Create( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3121,7 +3118,7 @@ void OnURLLoaderComplete(std::unique_ptr response_body); -@@ -80,8 +76,7 @@ class V4UpdateProtocolManager { +@@ -81,8 +76,7 @@ class V4UpdateProtocolManager { V4UpdateProtocolManager( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3131,7 +3128,7 @@ private: FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest, -@@ -96,8 +91,6 @@ class V4UpdateProtocolManager { +@@ -97,8 +91,6 @@ class V4UpdateProtocolManager { FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest, TestDisableAutoUpdates); FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest, TestGetUpdatesHasTimeout); @@ -3140,7 +3137,7 @@ friend class V4UpdateProtocolManagerFactoryImpl; void OnURLLoaderCompleteInternal(int net_error, -@@ -195,8 +188,6 @@ class V4UpdateProtocolManager { +@@ -196,8 +188,6 @@ class V4UpdateProtocolManager { // complete. base::OneShotTimer timeout_timer_; @@ -3149,7 +3146,7 @@ SEQUENCE_CHECKER(sequence_checker_); DISALLOW_COPY_AND_ASSIGN(V4UpdateProtocolManager); -@@ -210,8 +201,7 @@ class V4UpdateProtocolManagerFactory { +@@ -211,8 +201,7 @@ class V4UpdateProtocolManagerFactory { virtual std::unique_ptr CreateProtocolManager( scoped_refptr url_loader_factory, const V4ProtocolConfig& config, @@ -3159,53 +3156,8 @@ private: DISALLOW_COPY_AND_ASSIGN(V4UpdateProtocolManagerFactory); ---- a/components/safe_browsing/password_protection/password_protection_service.cc -+++ b/components/safe_browsing/password_protection/password_protection_service.cc -@@ -255,11 +255,6 @@ bool PasswordProtectionService::CanSendP - IsPingingEnabled(trigger_type, password_type, reason); - // Pinging is enabled for password_reuse trigger level; however we need to - // make sure *reason is set appropriately. -- PasswordProtectionTrigger trigger_level = -- GetPasswordProtectionWarningTriggerPref(password_type); -- if (trigger_level == PASSWORD_REUSE) { -- *reason = RequestOutcome::PASSWORD_ALERT_MODE; -- } - if (is_pinging_enabled && - !IsURLWhitelistedForPasswordEntry(main_frame_url, reason)) { - return true; -@@ -449,8 +444,7 @@ PasswordProtectionService::MaybeCreateNa - - bool PasswordProtectionService::IsWarningEnabled( - ReusedPasswordAccountType password_type) { -- return GetPasswordProtectionWarningTriggerPref(password_type) == -- PHISHING_REUSE; -+ return false; - } - - // static ---- a/components/safe_browsing/password_protection/password_protection_service.h -+++ b/components/safe_browsing/password_protection/password_protection_service.h -@@ -23,7 +23,6 @@ - #include "components/safe_browsing/browser/referrer_chain_provider.h" - #include "components/safe_browsing/buildflags.h" - #include "components/safe_browsing/common/safe_browsing.mojom.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/db/v4_protocol_manager_util.h" - #include "components/safe_browsing/password_protection/metrics_util.h" - #include "components/safe_browsing/proto/csd.pb.h" -@@ -190,10 +189,6 @@ class PasswordProtectionService : public - // Returns if the warning UI is enabled. - bool IsWarningEnabled(ReusedPasswordAccountType password_type); - -- // Returns the pref value of password protection warning trigger. -- virtual PasswordProtectionTrigger GetPasswordProtectionWarningTriggerPref( -- ReusedPasswordAccountType password_type) const = 0; -- - // If |url| matches Safe Browsing whitelist domains, password protection - // change password URL, or password protection login URLs in the enterprise - // policy. ---- a/components/safe_browsing/ping_manager.cc -+++ b/components/safe_browsing/ping_manager.cc +--- a/components/safe_browsing/core/ping_manager.cc ++++ b/components/safe_browsing/core/ping_manager.cc @@ -140,7 +140,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); @@ -3215,36 +3167,26 @@ std::string threat_list = "none"; switch (hit_report.threat_type) { case SB_THREAT_TYPE_URL_MALWARE: ---- a/components/safe_browsing/realtime/policy_engine.cc -+++ b/components/safe_browsing/realtime/policy_engine.cc +--- a/components/safe_browsing/core/realtime/policy_engine.cc ++++ b/components/safe_browsing/core/realtime/policy_engine.cc @@ -8,7 +8,6 @@ #include "base/metrics/histogram_macros.h" #include "build/build_config.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" #include "components/unified_consent/pref_names.h" #include "components/user_prefs/user_prefs.h" ---- a/components/safe_browsing/triggers/suspicious_site_trigger_unittest.cc -+++ b/components/safe_browsing/triggers/suspicious_site_trigger_unittest.cc -@@ -10,7 +10,6 @@ - #include "base/test/test_simple_task_runner.h" - #include "build/build_config.h" - #include "components/prefs/testing_pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/triggers/mock_trigger_manager.h" - #include "content/public/test/browser_task_environment.h" - #include "content/public/test/navigation_simulator.h" ---- a/components/safe_browsing/triggers/trigger_manager.cc -+++ b/components/safe_browsing/triggers/trigger_manager.cc +--- a/components/safe_browsing/core/triggers/trigger_manager.cc ++++ b/components/safe_browsing/core/triggers/trigger_manager.cc @@ -9,7 +9,6 @@ #include "components/prefs/pref_service.h" - #include "components/safe_browsing/base_ui_manager.h" - #include "components/safe_browsing/browser/threat_details.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" - #include "components/security_interstitials/content/unsafe_resource.h" - #include "content/public/browser/browser_context.h" + #include "components/safe_browsing/content/base_ui_manager.h" + #include "components/safe_browsing/content/browser/threat_details.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/common/thread_utils.h" + #include "components/safe_browsing/core/features.h" + #include "components/security_interstitials/core/unsafe_resource.h" @@ -82,10 +81,10 @@ SBErrorOptions TriggerManager::GetSBErro const PrefService& pref_service, content::WebContents* web_contents) { @@ -3259,14 +3201,14 @@ /*is_proceed_anyway_disabled=*/false, /*should_open_links_in_new_tab=*/false, /*show_back_to_safety_button=*/true, ---- a/components/safe_browsing/triggers/trigger_throttler.cc -+++ b/components/safe_browsing/triggers/trigger_throttler.cc +--- a/components/safe_browsing/core/triggers/trigger_throttler.cc ++++ b/components/safe_browsing/core/triggers/trigger_throttler.cc @@ -11,7 +11,6 @@ #include "base/time/default_clock.h" #include "base/time/time.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" namespace safe_browsing { @@ -217,28 +216,6 @@ void TriggerThrottler::LoadTriggerEvents @@ -3308,44 +3250,43 @@ } size_t TriggerThrottler::GetDailyQuotaForTrigger( ---- a/components/safe_browsing/triggers/trigger_throttler_unittest.cc -+++ b/components/safe_browsing/triggers/trigger_throttler_unittest.cc +--- a/components/safe_browsing/core/triggers/trigger_throttler_unittest.cc ++++ b/components/safe_browsing/core/triggers/trigger_throttler_unittest.cc @@ -8,7 +8,6 @@ #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" #include "components/prefs/testing_pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/safe_browsing/core/features.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" ---- a/components/safe_browsing/web_ui/safe_browsing_ui.cc -+++ b/components/safe_browsing/web_ui/safe_browsing_ui.cc -@@ -29,7 +29,6 @@ - #include "components/password_manager/core/browser/hash_password_manager.h" - #include "components/safe_browsing/browser/referrer_chain_provider.h" - #include "components/safe_browsing/buildflags.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" - #include "components/safe_browsing/features.h" - #include "components/safe_browsing/proto/csd.pb.h" - #include "components/safe_browsing/web_ui/constants.h" -@@ -1244,9 +1243,7 @@ void SafeBrowsingUIHandler::GetPrefs(con - AllowJavascript(); - std::string callback_id; - args->GetString(0, &callback_id); -- ResolveJavascriptCallback(base::Value(callback_id), -- safe_browsing::GetSafeBrowsingPreferencesList( -- user_prefs::UserPrefs::Get(browser_context_))); -+ ResolveJavascriptCallback(base::Value(callback_id), base::ListValue()); - } +--- a/components/security_interstitials/content/bad_clock_blocking_page.cc ++++ b/components/security_interstitials/content/bad_clock_blocking_page.cc +@@ -7,7 +7,6 @@ + #include - void SafeBrowsingUIHandler::GetCookie(const base::ListValue* args) { + #include "base/strings/string_number_conversions.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/security_interstitials/content/cert_report_helper.h" + #include "components/security_interstitials/content/security_interstitial_controller_client.h" + #include "components/security_interstitials/content/ssl_cert_reporter.h" +--- a/components/security_interstitials/content/captive_portal_blocking_page.cc ++++ b/components/security_interstitials/content/captive_portal_blocking_page.cc +@@ -15,7 +15,6 @@ + #include "build/build_config.h" + #include "components/captive_portal/core/captive_portal_detector.h" + #include "components/captive_portal/core/captive_portal_metrics.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/security_interstitials/content/cert_report_helper.h" + #include "components/security_interstitials/content/security_interstitial_controller_client.h" + #include "components/security_interstitials/content/ssl_cert_reporter.h" --- a/components/security_interstitials/content/cert_report_helper.cc +++ b/components/security_interstitials/content/cert_report_helper.cc @@ -15,7 +15,6 @@ #include "build/branding_buildflags.h" #include "build/build_config.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/ssl_cert_reporter.h" #include "components/security_interstitials/core/controller_client.h" #include "components/security_interstitials/core/metrics_helper.h" @@ -3394,13 +3335,23 @@ return base::FieldTrialList::FindFullName(kFinchExperimentName) == kFinchGroupShowPossiblySend && +--- a/components/security_interstitials/content/mitm_software_blocking_page.cc ++++ b/components/security_interstitials/content/mitm_software_blocking_page.cc +@@ -6,7 +6,6 @@ + + #include + +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + #include "components/security_interstitials/content/cert_report_helper.h" + #include "components/security_interstitials/content/security_interstitial_controller_client.h" + #include "components/security_interstitials/content/ssl_cert_reporter.h" --- a/components/security_interstitials/content/security_interstitial_controller_client.cc +++ b/components/security_interstitials/content/security_interstitial_controller_client.cc @@ -7,7 +7,6 @@ #include #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/core/metrics_helper.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/web_contents.h" @@ -3418,8 +3369,8 @@ return false; --- a/components/security_interstitials/content/security_interstitial_controller_client.h +++ b/components/security_interstitials/content/security_interstitial_controller_client.h -@@ -49,8 +49,6 @@ class SecurityInterstitialControllerClie - void LaunchDateAndTimeSettings() override; +@@ -50,8 +50,6 @@ class SecurityInterstitialControllerClie + bool CanGoBackBeforeNavigation() override; protected: - // security_interstitials::ControllerClient overrides. @@ -3433,7 +3384,7 @@ #include "base/values.h" #include "components/grit/components_resources.h" #include "components/prefs/pref_service.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/security_interstitial_controller_client.h" #include "components/security_interstitials/core/common_string_util.h" #include "content/public/browser/interstitial_page.h" @@ -3483,7 +3434,7 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" --#include "components/safe_browsing/common/safe_browsing_prefs.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/cert_report_helper.h" #include "components/security_interstitials/content/security_interstitial_controller_client.h" #include "components/security_interstitials/content/ssl_cert_reporter.h" @@ -3499,7 +3450,7 @@ : MetricsHelper::SET_EXTENDED_REPORTING_DISABLED); --- a/components/security_interstitials/core/controller_client.h +++ b/components/security_interstitials/core/controller_client.h -@@ -109,9 +109,6 @@ class ControllerClient { +@@ -112,9 +112,6 @@ class ControllerClient { void SetBaseHelpCenterUrlForTesting(const GURL& test_url); @@ -3593,7 +3544,7 @@ #include "components/sync_preferences/testing_pref_service_syncable.h" --- a/components/signin/core/browser/account_reconcilor_unittest.cc +++ b/components/signin/core/browser/account_reconcilor_unittest.cc -@@ -27,7 +27,6 @@ +@@ -26,7 +26,6 @@ #include "components/signin/public/base/list_accounts_test_utils.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -3671,15 +3622,15 @@ #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 -@@ -24,7 +24,6 @@ +@@ -25,7 +25,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/scoped_user_pref_update.h" #include "components/signin/internal/identity_manager/account_info_util.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" #include "ui/gfx/image/image.h" - #if defined(OS_ANDROID) -@@ -109,9 +108,6 @@ AccountTrackerService::~AccountTrackerSe +@@ -114,9 +113,6 @@ AccountTrackerService::~AccountTrackerSe // static void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) { @@ -3689,19 +3640,20 @@ } void AccountTrackerService::Initialize(PrefService* pref_service, -@@ -182,11 +178,7 @@ AccountInfo AccountTrackerService::FindA +@@ -187,11 +183,7 @@ AccountInfo AccountTrackerService::FindA // static bool AccountTrackerService::IsMigrationSupported() { -#if defined(OS_CHROMEOS) - return false; +- return base::FeatureList::IsEnabled(switches::kAccountIdMigration); -#else - return true; -#endif ++ return false; } AccountTrackerService::AccountIdMigrationState -@@ -387,14 +379,12 @@ AccountTrackerService::ComputeNewMigrati +@@ -399,14 +391,12 @@ AccountTrackerService::ComputeNewMigrati void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) { DCHECK(state != MIGRATION_DONE || IsMigrationDone()); @@ -3717,7 +3669,33 @@ } base::FilePath AccountTrackerService::GetImagePathFor( -@@ -447,11 +437,10 @@ void AccountTrackerService::RemoveAccoun +@@ -464,24 +454,7 @@ void AccountTrackerService::OnAccountIma + const CoreAccountId& account_id, + const std::string& image_url_with_size, + bool success) { +- if (!success || !pref_service_) +- return; +- +- base::DictionaryValue* dict = nullptr; +- ListPrefUpdate update(pref_service_, prefs::kAccountInfo); +- for (size_t i = 0; i < update->GetSize(); ++i, dict = nullptr) { +- if (update->GetDictionary(i, &dict)) { +- std::string value; +- if (dict->GetString(kAccountKeyPath, &value) && +- value == account_id.ToString()) +- break; +- } +- } +- +- if (!dict) { +- return; +- } +- dict->SetString(kLastDownloadedImageURLWithSizePath, image_url_with_size); ++ return; + } + + void AccountTrackerService::RemoveAccountImageFromDisk( +@@ -493,11 +466,10 @@ void AccountTrackerService::RemoveAccoun } void AccountTrackerService::LoadFromPrefs() { @@ -3731,7 +3709,7 @@ std::string value; if (dict->GetString(kAccountKeyPath, &value)) { // Ignore incorrectly persisted non-canonical account ids. -@@ -531,13 +520,11 @@ void AccountTrackerService::LoadFromPref +@@ -579,13 +551,11 @@ void AccountTrackerService::LoadFromPref } void AccountTrackerService::SaveToPrefs(const AccountInfo& account_info) { @@ -3748,7 +3726,7 @@ std::string value; if (dict->GetString(kAccountKeyPath, &value) && value == account_info.account_id.ToString()) -@@ -547,9 +534,6 @@ void AccountTrackerService::SaveToPrefs( +@@ -595,9 +565,6 @@ void AccountTrackerService::SaveToPrefs( if (!dict) { dict = new base::DictionaryValue(); @@ -3758,7 +3736,7 @@ dict->SetString(kAccountKeyPath, account_info.account_id.ToString()); } -@@ -570,14 +554,12 @@ void AccountTrackerService::RemoveFromPr +@@ -621,14 +588,12 @@ void AccountTrackerService::RemoveFromPr if (!pref_service_) return; @@ -3777,7 +3755,7 @@ } --- a/components/signin/internal/identity_manager/account_tracker_service.h +++ b/components/signin/internal/identity_manager/account_tracker_service.h -@@ -222,6 +222,8 @@ class AccountTrackerService { +@@ -234,6 +234,8 @@ class AccountTrackerService { AccountInfoCallback on_account_updated_callback_; AccountInfoCallback on_account_removed_callback_; @@ -4086,21 +4064,22 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_utils.h" -@@ -27,17 +26,7 @@ void PrimaryAccountPolicyManagerImpl::In +@@ -27,18 +26,7 @@ void PrimaryAccountPolicyManagerImpl::In // local_state can be null during unit tests. if (local_state) { local_state_pref_registrar_.Init(local_state); - local_state_pref_registrar_.Add( - prefs::kGoogleServicesUsernamePattern, -- base::Bind(&PrimaryAccountPolicyManagerImpl:: -- OnGoogleServicesUsernamePatternChanged, -- weak_pointer_factory_.GetWeakPtr(), -- primary_account_manager)); +- base::BindRepeating(&PrimaryAccountPolicyManagerImpl:: +- OnGoogleServicesUsernamePatternChanged, +- weak_pointer_factory_.GetWeakPtr(), +- primary_account_manager)); } - signin_allowed_.Init( - prefs::kSigninAllowed, client_->GetPrefs(), -- base::Bind(&PrimaryAccountPolicyManagerImpl::OnSigninAllowedPrefChanged, -- base::Unretained(this), primary_account_manager)); +- base::BindRepeating( +- &PrimaryAccountPolicyManagerImpl::OnSigninAllowedPrefChanged, +- base::Unretained(this), primary_account_manager)); CoreAccountInfo account_info = primary_account_manager->GetAuthenticatedAccountInfo(); @@ -4170,7 +4149,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/ios/device_accounts_provider.h" #include "google_apis/gaia/oauth2_access_token_fetcher.h" -@@ -369,7 +368,4 @@ void ProfileOAuth2TokenServiceIOSDelegat +@@ -368,7 +367,4 @@ void ProfileOAuth2TokenServiceIOSDelegat } void ProfileOAuth2TokenServiceIOSDelegate::ClearExcludedSecondaryAccounts() { @@ -4338,7 +4317,7 @@ #include "components/sync_preferences/testing_pref_service_syncable.h" --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -62697,7 +62697,6 @@ Full version information for the fingerp +@@ -64148,7 +64148,6 @@ Full version information for the fingerp @@ -4346,7 +4325,7 @@ -@@ -62712,10 +62711,7 @@ Full version information for the fingerp +@@ -64163,10 +64162,7 @@ Full version information for the fingerp diff --git a/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch b/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch index 21e19080..a9e7f2aa 100644 --- a/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch +++ b/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch @@ -1,6 +1,6 @@ --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json -@@ -103,21 +103,11 @@ +@@ -113,21 +113,11 @@ }, "google": { diff --git a/patches/core/ungoogled-chromium/use-local-devtools-files.patch b/patches/core/ungoogled-chromium/use-local-devtools-files.patch index 5ab5ab74..9c46ac5d 100644 --- a/patches/core/ungoogled-chromium/use-local-devtools-files.patch +++ b/patches/core/ungoogled-chromium/use-local-devtools-files.patch @@ -5,14 +5,13 @@ --- a/third_party/devtools-frontend/src/BUILD.gn +++ b/third_party/devtools-frontend/src/BUILD.gn -@@ -1780,15 +1780,14 @@ generated_non_autostart_non_remote_modul +@@ -2144,14 +2144,13 @@ generated_non_autostart_non_remote_modul "$resources_out_dir/timeline/timeline_module.js", "$resources_out_dir/web_audio/web_audio_module.js", "$resources_out_dir/workspace_diff/workspace_diff_module.js", -] - -generated_remote_modules = [ - "$resources_out_dir/accessibility/accessibility_module.js", "$resources_out_dir/audits_worker/audits_worker_module.js", "$resources_out_dir/dagre_layout/dagre_layout_module.js", "$resources_out_dir/emulated_devices/emulated_devices_module.js", @@ -23,16 +22,16 @@ generated_test_modules = [ "$resources_out_dir/accessibility_test_runner/accessibility_test_runner_module.js", "$resources_out_dir/application_test_runner/application_test_runner_module.js", -@@ -1855,7 +1854,6 @@ devtools_frontend_resources_deps = [ - ":copy_htaccess", - ":copy_inspector_images", - ":copy_lighthouse_locale_files", -- ":copy_wasm_deps", - ":devtools_extension_api", - ":frontend_protocol_sources", - ":supported_css_properties", -@@ -1938,7 +1936,6 @@ action("generate_devtools_grd") { - generated_scripts + generated_worker_bundles + +@@ -2227,7 +2226,6 @@ devtools_frontend_resources_deps = devto + ":copy_htaccess", + ":copy_inspector_images", + ":copy_lighthouse_locale_files", +- ":copy_wasm_deps", + ":devtools_extension_api", + ":frontend_protocol_sources", + ":supported_css_properties", +@@ -2294,7 +2292,6 @@ action("generate_devtools_grd") { + devtools_embedder_scripts + generated_scripts + generated_worker_bundles + [ "$resources_out_dir/devtools_extension_api.js", - "$resources_out_dir/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm", @@ -51,14 +50,7 @@ } --- a/third_party/devtools-frontend/src/front_end/devtools_app.json +++ b/third_party/devtools-frontend/src/front_end/devtools_app.json -@@ -4,16 +4,16 @@ - { "name": "inspector_main", "type": "autostart" }, - { "name": "mobile_throttling", "type": "autostart" }, - -- { "name": "accessibility", "type": "remote" }, -+ { "name": "accessibility" }, - { "name": "animation" }, - { "name": "audits" }, +@@ -10,10 +10,10 @@ { "name": "browser_debugger" }, { "name": "css_overview" }, { "name": "cookie_table" }, 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 d7f56d91..ed2dcf6c 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 -@@ -2226,6 +2226,7 @@ jumbo_static_library("browser") { +@@ -2237,6 +2237,7 @@ jumbo_static_library("browser") { "//third_party/metrics_proto", "//third_party/re2", "//third_party/smhasher:cityhash", @@ -19,7 +19,7 @@ "//third_party/zlib", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -150,6 +150,7 @@ +@@ -154,6 +154,7 @@ #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/forcedark/forcedark_switches.h" #include "third_party/leveldatabase/leveldb_features.h" @@ -27,7 +27,7 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/accessibility/accessibility_switches.h" #include "ui/base/ui_base_features.h" -@@ -1517,6 +1518,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1580,6 +1581,14 @@ const FeatureEntry kFeatureEntries[] = { "Force punycode hostnames", "Force punycode in hostnames instead of Unicode when displaying Internationalized Domain Names (IDNs).", kOsAll, SINGLE_VALUE_TYPE("force-punycode-hostnames")}, @@ -44,7 +44,7 @@ SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)}, --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -208,6 +208,7 @@ jumbo_source_set("browser") { +@@ -204,6 +204,7 @@ jumbo_source_set("browser") { "//third_party/libyuv", "//third_party/re2", "//third_party/sqlite", @@ -54,7 +54,7 @@ "//third_party/zlib/google:zip", --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -225,6 +225,7 @@ +@@ -223,6 +223,7 @@ #include "third_party/blink/public/common/page/launching_process_state.h" #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" #include "third_party/blink/public/public_buildflags.h" @@ -62,7 +62,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/accessibility/accessibility_switches.h" #include "ui/base/ui_base_switches.h" -@@ -3150,6 +3151,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3149,6 +3150,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLDraftExtensions, switches::kEnableWebGLImageChromium, switches::kFileUrlPathAlias, @@ -73,7 +73,7 @@ switches::kForceDisableWebRtcApmInAudioService, --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn -@@ -125,6 +125,7 @@ target(link_target_type, "child") { +@@ -124,6 +124,7 @@ target(link_target_type, "child") { "//third_party/blink/public/common", "//third_party/blink/public/strings", "//third_party/ced", @@ -91,7 +91,7 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -447,6 +448,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -442,6 +443,10 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kEnableAccessibilityObjectModel, true}, {wrf::EnableAllowSyncXHRInPageDismissal, switches::kAllowSyncXHRInPageDismissal, true}, @@ -123,7 +123,7 @@ #include "base/time/time.h" #include "cc/input/overscroll_behavior.h" #include "cc/input/scroll_snap_data.h" -@@ -1307,6 +1308,14 @@ Range* Document::CreateRangeAdjustedToTr +@@ -866,6 +867,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(); -@@ -2872,6 +2881,15 @@ void Document::UpdateStyleAndLayoutTree( +@@ -2436,6 +2445,15 @@ void Document::UpdateStyleAndLayoutTree( #if DCHECK_IS_ON() AssertLayoutTreeUpdated(*this); #endif @@ -156,7 +156,7 @@ void Document::UpdateActiveStyle() { --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -416,6 +416,10 @@ class CORE_EXPORT Document : public Cont +@@ -417,6 +417,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -167,7 +167,7 @@ String visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -1968,6 +1972,9 @@ class CORE_EXPORT Document : public Cont +@@ -1957,6 +1961,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 -@@ -1902,6 +1902,11 @@ DOMRectList* Element::getClientRects() { +@@ -1948,6 +1948,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom( quads, *element_layout_object); @@ -188,10 +188,10 @@ + quad.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY()); + } + } - return DOMRectList::Create(quads); + return MakeGarbageCollected(quads); } -@@ -1919,6 +1924,9 @@ DOMRect* Element::getBoundingClientRect( +@@ -1965,6 +1970,9 @@ DOMRect* Element::getBoundingClientRect( DCHECK(element_layout_object); GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -213,7 +213,7 @@ + } + } + - return DOMRectList::Create(quads); + return MakeGarbageCollected(quads); } DOMRect* Range::getBoundingClientRect() const { @@ -266,7 +266,7 @@ const TextDirection&, --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -821,9 +821,15 @@ TextMetrics* CanvasRenderingContext2D::m +@@ -822,9 +822,15 @@ TextMetrics* CanvasRenderingContext2D::m else direction = ToTextDirection(GetState().GetDirection(), canvas()); @@ -285,7 +285,7 @@ void CanvasRenderingContext2D::DrawTextInternal( --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1519,6 +1519,7 @@ jumbo_component("platform") { +@@ -1524,6 +1524,7 @@ jumbo_component("platform") { "//third_party/emoji-segmenter", "//third_party/icu", "//third_party/libyuv", @@ -295,7 +295,7 @@ "//ui/base:base", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -696,4 +696,12 @@ void WebRuntimeFeatures::EnableAccelerat +@@ -690,4 +690,12 @@ void WebRuntimeFeatures::EnableAccelerat RuntimeEnabledFeatures::SetAcceleratedSmallCanvasesEnabled(enable); } @@ -310,7 +310,7 @@ } // namespace blink --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -724,6 +724,12 @@ +@@ -738,6 +738,12 @@ name: "FileSystem", status: "stable", }, diff --git a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch index 65e7bbda..b87ae05f 100644 --- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch +++ b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch @@ -23,7 +23,7 @@ approach to change color components. --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1531,6 +1531,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1594,6 +1594,10 @@ const FeatureEntry kFeatureEntries[] = { "Enable Canvas::measureText() fingerprint deception", "Scale the output values of Canvas::measureText() with a randomly selected factor in the range -0.0003% to 0.0003%, which are recomputed on every document initialization.", kOsAll, SINGLE_VALUE_TYPE(switches::kFingerprintingCanvasMeasureTextNoise)}, @@ -36,7 +36,7 @@ approach to change color components. SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)}, --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3153,6 +3153,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3152,6 +3152,7 @@ void RenderProcessHostImpl::PropagateBro switches::kFileUrlPathAlias, switches::kFingerprintingClientRectsNoise, switches::kFingerprintingCanvasMeasureTextNoise, @@ -46,7 +46,7 @@ approach to change color components. switches::kForceDisableWebRtcApmInAudioService, --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -452,6 +452,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -447,6 +447,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -67,7 +67,7 @@ approach to change color components. BLINK_PLATFORM_EXPORT static void EnableHTMLImports(bool); --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1478,7 +1478,9 @@ jumbo_component("platform") { +@@ -1482,7 +1482,9 @@ jumbo_component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -80,7 +80,7 @@ approach to change color components. ":blink_platform_public_deps", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -704,4 +704,8 @@ void WebRuntimeFeatures::EnableFingerpri +@@ -698,4 +698,8 @@ void WebRuntimeFeatures::EnableFingerpri RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable); } @@ -137,7 +137,7 @@ approach to change color components. #include "v8/include/v8.h" namespace blink { -@@ -117,9 +121,164 @@ bool StaticBitmapImage::CopyToByteArray( +@@ -128,7 +132,162 @@ bool StaticBitmapImage::CopyToByteArray( DCHECK(read_pixels_successful || !sk_image->bounds().intersect(SkIRect::MakeXYWH( rect.X(), rect.Y(), info.width(), info.height()))); @@ -299,14 +299,12 @@ approach to change color components. +#undef writable_addr +#undef shuffleComponent + - const gpu::SyncToken& StaticBitmapImage::GetSyncToken() const { - static const gpu::SyncToken sync_token; - return sync_token; + } // namespace blink --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h -@@ -30,6 +30,8 @@ class PLATFORM_EXPORT StaticBitmapImage - static scoped_refptr Create(sk_sp data, - const SkImageInfo&); +@@ -34,6 +34,8 @@ class PLATFORM_EXPORT StaticBitmapImage + + StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {} + static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY); + @@ -315,7 +313,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 -@@ -730,6 +730,9 @@ +@@ -744,6 +744,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 03636a3f..c74af909 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 -@@ -2063,6 +2063,7 @@ jumbo_static_library("browser") { +@@ -2068,6 +2068,7 @@ jumbo_static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -27,7 +27,7 @@ with limited CPU/memory resources and it is disabled by default. "//components/offline_items_collection/core", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -739,6 +739,11 @@ const FeatureEntry::Choice kForceEffecti +@@ -769,6 +769,11 @@ const FeatureEntry::Choice kForceEffecti net::kEffectiveConnectionType4G}, }; @@ -39,7 +39,7 @@ with limited CPU/memory resources and it is disabled by default. // Ensure that all effective connection types returned by Network Quality // Estimator (NQE) are also exposed via flags. static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 == -@@ -2508,6 +2513,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2524,6 +2529,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAutofillCreditCardUploadDescription, kOsAll, FEATURE_VALUE_TYPE(autofill::features::kAutofillUpstream)}, #endif // TOOLKIT_VIEWS || OS_ANDROID @@ -66,7 +66,7 @@ with limited CPU/memory resources and it is disabled by default. #include "base/synchronization/waitable_event.h" #include "base/task/post_task.h" #include "base/task/task_traits.h" -@@ -96,6 +98,7 @@ +@@ -94,6 +96,7 @@ #include "components/metrics/metrics_service.h" #include "components/metrics_services_manager/metrics_services_manager.h" #include "components/metrics_services_manager/metrics_services_manager_client.h" @@ -74,7 +74,7 @@ with limited CPU/memory resources and it is disabled by default. #include "components/network_time/network_time_tracker.h" #include "components/optimization_guide/optimization_guide_features.h" #include "components/optimization_guide/optimization_guide_service.h" -@@ -132,6 +135,7 @@ +@@ -129,6 +132,7 @@ #include "extensions/common/constants.h" #include "media/media_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" @@ -82,7 +82,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" -@@ -314,6 +318,18 @@ void BrowserProcessImpl::Init() { +@@ -308,6 +312,18 @@ void BrowserProcessImpl::Init() { base::Bind(&ApplyMetricsReportingPolicy)); #endif @@ -103,7 +103,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1266,6 +1266,10 @@ extern const char kMediaInspectorLogging +@@ -1168,6 +1168,10 @@ const char kMediaInspectorLoggingDescrip "project; #enable-devtools-experiments must also be enabled as well on " "desktop platforms"; @@ -116,7 +116,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 -@@ -766,6 +766,9 @@ extern const char kMarkHttpAsWarningAndD +@@ -694,6 +694,9 @@ extern const char kMarkHttpAsWarningAndD extern const char kMediaInspectorLoggingName[]; extern const char kMediaInspectorLoggingDescription[]; diff --git a/patches/extra/debian/disable/android.patch b/patches/extra/debian/disable/android.patch index ac30ce0a..f1f3decf 100644 --- a/patches/extra/debian/disable/android.patch +++ b/patches/extra/debian/disable/android.patch @@ -3,7 +3,7 @@ author: Michael Gilbert --- a/BUILD.gn +++ b/BUILD.gn -@@ -397,7 +397,7 @@ group("gn_all") { +@@ -404,7 +404,7 @@ group("gn_all") { # seems currently broken for this platform at the moment, and the # corresponding code build and works on Linux unmodified. # See instructions in the corresponding BUILD.gn. diff --git a/patches/extra/debian/disable/fuzzers.patch b/patches/extra/debian/disable/fuzzers.patch index c0f756b1..e40c79a9 100644 --- a/patches/extra/debian/disable/fuzzers.patch +++ b/patches/extra/debian/disable/fuzzers.patch @@ -3,7 +3,7 @@ author: Michael Gilbert --- a/BUILD.gn +++ b/BUILD.gn -@@ -747,8 +747,7 @@ group("gn_all") { +@@ -759,8 +759,7 @@ group("gn_all") { } } @@ -15,14 +15,12 @@ author: Michael Gilbert "//testing/libfuzzer/fuzzers", --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn -@@ -2308,12 +2308,6 @@ test("content_perftests") { +@@ -2306,10 +2306,6 @@ test("content_perftests") { } } -group("fuzzers") { -- deps = [ -- "//content/test/fuzzer", -- ] +- deps = [ "//content/test/fuzzer" ] -} - # This group defines the isolate files needed to run diff --git a/patches/extra/debian/disable/google-api-warning.patch b/patches/extra/debian/disable/google-api-warning.patch index fab856fd..d76c8e49 100644 --- a/patches/extra/debian/disable/google-api-warning.patch +++ b/patches/extra/debian/disable/google-api-warning.patch @@ -3,7 +3,7 @@ author: Michael Gilbert --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -855,10 +855,6 @@ void StartupBrowserCreatorImpl::AddInfoB +@@ -876,10 +876,6 @@ void StartupBrowserCreatorImpl::AddInfoB InfoBarService* infobar_service = InfoBarService::FromWebContents(web_contents); diff --git a/patches/extra/debian/disable/welcome-page.patch b/patches/extra/debian/disable/welcome-page.patch index 7cf72626..4c0085c5 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 -@@ -1055,7 +1055,7 @@ void ProfileManager::InitProfileUserPref +@@ -1063,7 +1063,7 @@ void ProfileManager::InitProfileUserPref profile->GetPrefs()->SetString(prefs::kSupervisedUserId, supervised_user_id); } diff --git a/patches/extra/debian/fixes/connection-message.patch b/patches/extra/debian/fixes/connection-message.patch index 15f8ee63..882605f2 100644 --- a/patches/extra/debian/fixes/connection-message.patch +++ b/patches/extra/debian/fixes/connection-message.patch @@ -11,5 +11,5 @@ bug-debian: http://bugs.debian.org/864539 - devices you may be using. + devices you may be using. Also check that any proxy server currently in use is reachable and configured correctly. - - + + diff --git a/patches/extra/debian/fixes/ps-print.patch b/patches/extra/debian/fixes/ps-print.patch deleted file mode 100644 index e3fd1540..00000000 --- a/patches/extra/debian/fixes/ps-print.patch +++ /dev/null @@ -1,13 +0,0 @@ -description: add postscript (ps) printing capability -author: Salvatore Bonaccorso - ---- a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc -+++ b/chrome/browser/ui/libgtkui/print_dialog_gtk.cc -@@ -336,6 +336,7 @@ void PrintDialogGtk::ShowDialog( - // Since we only generate PDF, only show printers that support PDF. - // TODO(thestig) Add more capabilities to support? - GtkPrintCapabilities cap = static_cast( -+ GTK_PRINT_CAPABILITY_GENERATE_PS | - GTK_PRINT_CAPABILITY_GENERATE_PDF | - GTK_PRINT_CAPABILITY_PAGE_SET | - GTK_PRINT_CAPABILITY_COPIES | diff --git a/patches/extra/debian/gn/parallel.patch b/patches/extra/debian/gn/parallel.patch index 2ca5b6a0..8e04c418 100644 --- a/patches/extra/debian/gn/parallel.patch +++ b/patches/extra/debian/gn/parallel.patch @@ -11,18 +11,18 @@ author: Michael Gilbert parser.add_option( '--skip-generate-buildfiles', action='store_true', -@@ -119,8 +120,12 @@ def main(argv): +@@ -120,8 +121,12 @@ def main(argv): shutil.copy2( os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir) - subprocess.check_call( -- ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err']) +- [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn']) + if options.jobs: + subprocess.check_call( -+ ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err', '-j'+str(options.jobs)]) ++ [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', '-j'+str(options.jobs), 'gn']) + else: + subprocess.check_call( -+ ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err']) ++ [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn']) shutil.copy2(os.path.join(gn_build_dir, 'gn'), gn_path) if not options.skip_generate_buildfiles: diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 06455e69..50da3af3 100644 --- a/patches/extra/inox-patchset/0006-modify-default-prefs.patch +++ b/patches/extra/inox-patchset/0006-modify-default-prefs.patch @@ -12,7 +12,7 @@ void BackgroundModeManager::RegisterProfile(Profile* profile) { --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1144,7 +1144,7 @@ void ChromeContentBrowserClient::Registe +@@ -1191,7 +1191,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -94,19 +94,19 @@ registry->RegisterDictionaryPref(prefs::kAppWindowPlacement); --- a/chrome/browser/ui/navigation_correction_tab_observer.cc +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc -@@ -57,7 +57,7 @@ void NavigationCorrectionTabObserver::Se - // static +@@ -59,7 +59,7 @@ void NavigationCorrectionTabObserver::Se void NavigationCorrectionTabObserver::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* prefs) { -- prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true, -+ prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, false, + prefs->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled, +- true, ++ false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); } --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc -@@ -107,10 +107,6 @@ void LocalDiscoveryUI::RegisterProfilePr - user_prefs::PrefRegistrySyncable* registry) { +@@ -109,10 +109,6 @@ void LocalDiscoveryUI::RegisterProfilePr + registry->RegisterBooleanPref(prefs::kLocalDiscoveryEnabled, true); registry->RegisterBooleanPref( prefs::kLocalDiscoveryNotificationsEnabled, -#if defined(OS_WIN) @@ -170,7 +170,7 @@ prefs::kShowManagedBookmarksInBookmarkBar, --- a/components/content_settings/core/browser/cookie_settings.cc +++ b/components/content_settings/core/browser/cookie_settings.cc -@@ -58,7 +58,7 @@ void CookieSettings::GetCookieSettings( +@@ -59,7 +59,7 @@ void CookieSettings::GetCookieSettings( void CookieSettings::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -181,7 +181,7 @@ prefs::kCookieControlsMode, --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -178,10 +178,10 @@ void AddLocallySavedPredictions(FieldInf +@@ -185,10 +185,10 @@ void AddLocallySavedPredictions(FieldInf void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/patches/extra/inox-patchset/0008-restore-classic-ntp.patch b/patches/extra/inox-patchset/0008-restore-classic-ntp.patch index c590c386..f38941c0 100644 --- a/patches/extra/inox-patchset/0008-restore-classic-ntp.patch +++ b/patches/extra/inox-patchset/0008-restore-classic-ntp.patch @@ -1,8 +1,8 @@ --- a/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc -@@ -176,26 +176,7 @@ struct NewTabURLDetails { - - const GURL local_url(chrome::kChromeSearchLocalNtpUrl); +@@ -182,26 +182,7 @@ struct NewTabURLDetails { + : chrome::kChromeSearchLocalNtpUrl); + #endif - if (ShouldShowLocalNewTab(profile)) - return NewTabURLDetails(local_url, NEW_TAB_URL_VALID); diff --git a/patches/extra/inox-patchset/0011-add-duckduckgo-search-engine.patch b/patches/extra/inox-patchset/0011-add-duckduckgo-search-engine.patch index 58844657..b97862a2 100644 --- a/patches/extra/inox-patchset/0011-add-duckduckgo-search-engine.patch +++ b/patches/extra/inox-patchset/0011-add-duckduckgo-search-engine.patch @@ -8,7 +8,7 @@ &google, &bing, &yahoo, -@@ -41,14 +42,15 @@ const PrepopulatedEngine* const engines_ +@@ -41,78 +42,79 @@ const PrepopulatedEngine* const engines_ // Engine selection by country ------------------------------------------------ // United Arab Emirates const PrepopulatedEngine* const engines_AE[] = { @@ -17,6 +17,7 @@ &bing, &yahoo, - &duckduckgo, + &yandex_ru, }; // Albania @@ -25,7 +26,9 @@ &google, &yahoo, &bing, -@@ -57,30 +59,31 @@ const PrepopulatedEngine* const engines_ +- &duckduckgo, + &yandex_ru, + }; // Argentina const PrepopulatedEngine* const engines_AR[] = { @@ -34,6 +37,7 @@ &bing, &yahoo_ar, - &duckduckgo, + &ecosia, }; // Austria @@ -41,8 +45,9 @@ + &duckduckgo, &google, &bing, - &yahoo_at, - &duckduckgo, + &yahoo_at, + &ecosia, }; // Australia @@ -50,17 +55,20 @@ + &duckduckgo, &google, &bing, - &yahoo_au, - &duckduckgo, + &yahoo_au, + &ecosia, }; // Bosnia and Herzegovina const PrepopulatedEngine* const engines_BA[] = { + &duckduckgo, &google, - &yahoo, &bing, -@@ -89,14 +92,15 @@ const PrepopulatedEngine* const engines_ + &yahoo, +- &duckduckgo, + &ask, + }; // Belgium const PrepopulatedEngine* const engines_BE[] = { @@ -68,6 +76,7 @@ &google, &bing, &yahoo, + &ecosia, - &duckduckgo, }; @@ -77,7 +86,9 @@ &google, &bing, &yahoo, -@@ -105,6 +109,7 @@ const PrepopulatedEngine* const engines_ +- &duckduckgo, + &yandex_ru, + }; // Bahrain const PrepopulatedEngine* const engines_BH[] = { @@ -85,7 +96,7 @@ &google, &bing, &yahoo, -@@ -113,6 +118,7 @@ const PrepopulatedEngine* const engines_ +@@ -122,6 +124,7 @@ const PrepopulatedEngine* const engines_ // Burundi const PrepopulatedEngine* const engines_BI[] = { @@ -93,7 +104,7 @@ &google, &bing, &yahoo, -@@ -121,30 +127,31 @@ const PrepopulatedEngine* const engines_ +@@ -131,33 +134,34 @@ const PrepopulatedEngine* const engines_ // Brunei const PrepopulatedEngine* const engines_BN[] = { @@ -102,6 +113,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Bolivia @@ -111,6 +123,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Brazil @@ -120,6 +133,7 @@ &bing, &yahoo_br, - &duckduckgo, + &ecosia, }; // Belarus @@ -128,7 +142,7 @@ &google, &yandex_by, &mail_ru, -@@ -153,56 +160,57 @@ const PrepopulatedEngine* const engines_ +@@ -167,42 +171,43 @@ const PrepopulatedEngine* const engines_ // Belize const PrepopulatedEngine* const engines_BZ[] = { @@ -137,12 +151,17 @@ &bing, &yahoo, - &duckduckgo, + &ask, }; // Canada const PrepopulatedEngine* const engines_CA[] = { -- &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, -+ &duckduckgo, &google, &bing, &yahoo_ca, &yahoo_qc, ++ &duckduckgo, + &google, + &bing, + &yahoo_ca, +- &duckduckgo, + &ecosia, }; // Switzerland @@ -152,6 +171,7 @@ &bing, - &duckduckgo, &yahoo_ch, + &ecosia, }; // Chile @@ -161,20 +181,24 @@ &bing, &yahoo_cl, - &duckduckgo, + &ecosia, }; // China const PrepopulatedEngine* const engines_CN[] = { -- &baidu, &so_360, &google, &sogou, &bing, -+ &duckduckgo, &baidu, &so_360, &google, &sogou, &bing, - }; ++ &duckduckgo, + &baidu, + &sogou, + &google, +@@ -212,78 +217,79 @@ const PrepopulatedEngine* const engines_ // Colombia const PrepopulatedEngine* const engines_CO[] = { + &duckduckgo, &google, - &yahoo_co, &bing, + &yahoo_co, + &ecosia, - &duckduckgo, }; @@ -185,6 +209,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Czech Republic @@ -193,7 +218,9 @@ &google, &seznam_cz, &bing, -@@ -211,30 +219,31 @@ const PrepopulatedEngine* const engines_ + &yahoo, +- &duckduckgo, + }; // Germany const PrepopulatedEngine* const engines_DE[] = { @@ -202,6 +229,7 @@ &bing, &yahoo_de, - &duckduckgo, + &ecosia, }; // Denmark @@ -211,6 +239,7 @@ &bing, &yahoo_dk, - &duckduckgo, + &ecosia, }; // Dominican Republic @@ -220,6 +249,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Algeria @@ -228,7 +258,9 @@ &google, &yahoo, &bing, -@@ -243,14 +252,15 @@ const PrepopulatedEngine* const engines_ + &yandex_ru, +- &duckduckgo, + }; // Ecuador const PrepopulatedEngine* const engines_EC[] = { @@ -236,6 +268,7 @@ &google, &bing, &yahoo, + &ecosia, - &duckduckgo, }; @@ -245,7 +278,7 @@ &google, &bing, &yandex_ru, -@@ -259,6 +269,7 @@ const PrepopulatedEngine* const engines_ +@@ -293,42 +299,43 @@ const PrepopulatedEngine* const engines_ // Egypt const PrepopulatedEngine* const engines_EG[] = { @@ -253,7 +286,9 @@ &google, &yahoo, &bing, -@@ -267,30 +278,31 @@ const PrepopulatedEngine* const engines_ + &yandex_ru, +- &duckduckgo, + }; // Spain const PrepopulatedEngine* const engines_ES[] = { @@ -262,6 +297,7 @@ &bing, &yahoo_es, - &duckduckgo, + &ecosia, }; // Finland @@ -271,6 +307,7 @@ &bing, &yahoo_fi, - &duckduckgo, + &yandex_ru, }; // Faroe Islands @@ -278,8 +315,9 @@ + &duckduckgo, &google, &bing, - &yahoo, + &yahoo_dk, - &duckduckgo, + &ecosia, }; // France @@ -288,7 +326,7 @@ &google, &bing, &yahoo_fr, -@@ -299,30 +311,31 @@ const PrepopulatedEngine* const engines_ +@@ -338,33 +345,34 @@ const PrepopulatedEngine* const engines_ // United Kingdom const PrepopulatedEngine* const engines_GB[] = { @@ -297,6 +335,7 @@ &bing, &yahoo_uk, - &duckduckgo, + &ecosia, }; // Greece @@ -306,6 +345,7 @@ &bing, &yahoo, - &duckduckgo, + &yandex_ru, }; // Guatemala @@ -314,6 +354,7 @@ &google, &bing, &yahoo, + &ecosia, - &duckduckgo, }; @@ -323,7 +364,7 @@ &google, &yahoo_hk, &bing, -@@ -331,46 +344,47 @@ const PrepopulatedEngine* const engines_ +@@ -374,78 +382,79 @@ const PrepopulatedEngine* const engines_ // Honduras const PrepopulatedEngine* const engines_HN[] = { @@ -331,6 +372,7 @@ &google, &bing, &yahoo, + &yandex_ru, - &duckduckgo, }; @@ -341,15 +383,17 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Hungary const PrepopulatedEngine* const engines_HU[] = { + &duckduckgo, &google, - &yahoo, &bing, + &yahoo, - &duckduckgo, + &ecosia, }; // Indonesia @@ -359,6 +403,7 @@ &yahoo_id, &bing, - &duckduckgo, + &yandex_com, }; // Ireland @@ -368,6 +413,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Israel @@ -376,7 +422,9 @@ &google, &bing, &yahoo, -@@ -379,14 +393,15 @@ const PrepopulatedEngine* const engines_ + &yandex_ru, +- &duckduckgo, + }; // India const PrepopulatedEngine* const engines_IN[] = { @@ -385,6 +433,7 @@ &yahoo_in, &bing, - &duckduckgo, + &yandex_ru, }; // Iraq @@ -393,7 +442,9 @@ &google, &yahoo, &bing, -@@ -395,6 +410,7 @@ const PrepopulatedEngine* const engines_ + &yandex_ru, +- &duckduckgo, + }; // Iran const PrepopulatedEngine* const engines_IR[] = { @@ -401,15 +452,16 @@ &google, &bing, &yahoo, -@@ -402,30 +418,31 @@ const PrepopulatedEngine* const engines_ +@@ -455,42 +464,43 @@ const PrepopulatedEngine* const engines_ // Iceland const PrepopulatedEngine* const engines_IS[] = { + &duckduckgo, &google, &bing, - &yahoo, - &duckduckgo, + &yahoo, + &ecosia, }; // Italy @@ -419,6 +471,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Jamaica @@ -428,15 +481,18 @@ &bing, &yahoo, - &duckduckgo, + &ask, }; // Jordan const PrepopulatedEngine* const engines_JO[] = { + &duckduckgo, &google, - &yahoo, &bing, -@@ -434,6 +451,7 @@ const PrepopulatedEngine* const engines_ + &yahoo, +- &duckduckgo, + &yandex_com, + }; // Japan const PrepopulatedEngine* const engines_JP[] = { @@ -444,15 +500,16 @@ &google, &yahoo_jp, &bing, -@@ -442,14 +460,15 @@ const PrepopulatedEngine* const engines_ +@@ -500,15 +510,16 @@ const PrepopulatedEngine* const engines_ // Kenya const PrepopulatedEngine* const engines_KE[] = { + &duckduckgo, &google, - &yahoo, &bing, + &yahoo, - &duckduckgo, + &yandex_ru, }; // South Korea @@ -460,8 +517,8 @@ + &duckduckgo, &google, &naver, - &daum, -@@ -458,6 +477,7 @@ const PrepopulatedEngine* const engines_ + &bing, +@@ -518,15 +529,16 @@ const PrepopulatedEngine* const engines_ // Kuwait const PrepopulatedEngine* const engines_KW[] = { @@ -469,7 +526,9 @@ &google, &bing, &yahoo, -@@ -466,6 +486,7 @@ const PrepopulatedEngine* const engines_ +- &duckduckgo, + &yandex_com, + }; // Kazakhstan const PrepopulatedEngine* const engines_KZ[] = { @@ -477,7 +536,7 @@ &google, &yandex_kz, &mail_ru, -@@ -474,22 +495,23 @@ const PrepopulatedEngine* const engines_ +@@ -536,267 +548,268 @@ const PrepopulatedEngine* const engines_ // Lebanon const PrepopulatedEngine* const engines_LB[] = { @@ -486,6 +545,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Liechtenstein @@ -495,6 +555,7 @@ &bing, - &duckduckgo, &yahoo, + &ecosia, }; // Lithuania @@ -503,7 +564,9 @@ &google, &bing, &yahoo, -@@ -498,14 +520,15 @@ const PrepopulatedEngine* const engines_ + &yandex_ru, +- &duckduckgo, + }; // Luxembourg const PrepopulatedEngine* const engines_LU[] = { @@ -512,15 +575,18 @@ &bing, - &duckduckgo, &yahoo, + &ecosia, }; // Latvia const PrepopulatedEngine* const engines_LV[] = { + &duckduckgo, &google, - &bing, &yandex_ru, -@@ -514,6 +537,7 @@ const PrepopulatedEngine* const engines_ + &bing, + &yahoo, +- &duckduckgo, + }; // Libya const PrepopulatedEngine* const engines_LY[] = { @@ -528,7 +594,9 @@ &google, &yahoo, &bing, -@@ -522,6 +546,7 @@ const PrepopulatedEngine* const engines_ + &yandex_com, +- &duckduckgo, + }; // Morocco const PrepopulatedEngine* const engines_MA[] = { @@ -536,15 +604,18 @@ &google, &yahoo, &bing, -@@ -530,22 +555,23 @@ const PrepopulatedEngine* const engines_ +- &duckduckgo, + &yandex_com, + }; // Monaco const PrepopulatedEngine* const engines_MC[] = { + &duckduckgo, &google, &bing, - &yahoo, - &duckduckgo, + &yahoo, + &qwant, }; // Moldova @@ -554,23 +625,27 @@ &yandex_ru, &mail_ru, - &duckduckgo, + &bing, }; // Montenegro const PrepopulatedEngine* const engines_ME[] = { + &duckduckgo, &google, - &yahoo, &bing, -@@ -554,22 +580,23 @@ const PrepopulatedEngine* const engines_ + &yahoo, + &yandex_ru, +- &duckduckgo, + }; // Macedonia const PrepopulatedEngine* const engines_MK[] = { + &duckduckgo, &google, - &yahoo, &bing, + &yahoo, - &duckduckgo, + &yandex_ru, }; // Mexico @@ -579,6 +654,7 @@ &google, &bing, &yahoo_mx, + &ecosia, - &duckduckgo, }; @@ -586,9 +662,11 @@ const PrepopulatedEngine* const engines_MY[] = { + &duckduckgo, &google, - &yahoo_my, &bing, -@@ -578,38 +605,39 @@ const PrepopulatedEngine* const engines_ + &yahoo_my, +- &duckduckgo, + &baidu, + }; // Nicaragua const PrepopulatedEngine* const engines_NI[] = { @@ -597,6 +675,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Netherlands @@ -606,6 +685,7 @@ &bing, &yahoo_nl, - &duckduckgo, + &yandex_ru, }; // Norway @@ -615,6 +695,7 @@ &bing, &yahoo, - &duckduckgo, + &yandex_ru, }; // New Zealand @@ -624,6 +705,7 @@ &bing, - &duckduckgo, &yahoo_nz, + &ecosia, }; // Oman @@ -632,7 +714,9 @@ &google, &bing, &yahoo, -@@ -618,30 +646,31 @@ const PrepopulatedEngine* const engines_ +- &duckduckgo, + &ecosia, + }; // Panama const PrepopulatedEngine* const engines_PA[] = { @@ -641,14 +725,16 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Peru const PrepopulatedEngine* const engines_PE[] = { + &duckduckgo, &google, - &yahoo_pe, &bing, + &yahoo_pe, + &ecosia, - &duckduckgo, }; @@ -658,6 +744,7 @@ &google, &yahoo_ph, &bing, + &ecosia, - &duckduckgo, }; @@ -667,7 +754,9 @@ &google, &yahoo, &bing, -@@ -650,38 +679,39 @@ const PrepopulatedEngine* const engines_ +- &duckduckgo, + &yandex_com, + }; // Poland const PrepopulatedEngine* const engines_PL[] = { @@ -676,6 +765,7 @@ &bing, &yahoo, - &duckduckgo, + &yandex_ru, }; // Puerto Rico @@ -685,6 +775,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Portugal @@ -694,6 +785,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Paraguay @@ -703,6 +795,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Qatar @@ -711,7 +804,9 @@ &google, &bing, &yahoo, -@@ -690,22 +720,23 @@ const PrepopulatedEngine* const engines_ +- &duckduckgo, + &yandex_com, + }; // Romania const PrepopulatedEngine* const engines_RO[] = { @@ -720,6 +815,7 @@ &bing, &yahoo, - &duckduckgo, + &yandex_ru, }; // Serbia @@ -729,15 +825,16 @@ &yahoo, &bing, - &duckduckgo, + &yandex_ru, }; // Russia const PrepopulatedEngine* const engines_RU[] = { + &duckduckgo, - &yandex_ru, &google, + &yandex_ru, &mail_ru, -@@ -714,6 +745,7 @@ const PrepopulatedEngine* const engines_ +@@ -806,33 +819,34 @@ const PrepopulatedEngine* const engines_ // Rwanda const PrepopulatedEngine* const engines_RW[] = { @@ -745,7 +842,9 @@ &google, &bing, &yahoo, -@@ -722,6 +754,7 @@ const PrepopulatedEngine* const engines_ +- &duckduckgo, + &mail_ru, + }; // Saudi Arabia const PrepopulatedEngine* const engines_SA[] = { @@ -753,7 +852,9 @@ &google, &bing, &yahoo, -@@ -730,14 +763,15 @@ const PrepopulatedEngine* const engines_ + &yandex_com, +- &duckduckgo, + }; // Sweden const PrepopulatedEngine* const engines_SE[] = { @@ -762,6 +863,7 @@ &bing, &yahoo_se, - &duckduckgo, + &ecosia, }; // Singapore @@ -769,16 +871,17 @@ + &duckduckgo, &google, &bing, - &yahoo_sg, -@@ -746,30 +780,31 @@ const PrepopulatedEngine* const engines_ + &yandex_com, +@@ -842,78 +856,79 @@ const PrepopulatedEngine* const engines_ // Slovenia const PrepopulatedEngine* const engines_SI[] = { + &duckduckgo, &google, &bing, - &yahoo, - &duckduckgo, + &yahoo, + &yandex_ru, }; // Slovakia @@ -788,6 +891,7 @@ &bing, &yahoo, - &duckduckgo, + &seznam_cz, }; // El Salvador @@ -797,6 +901,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Syria @@ -805,7 +910,9 @@ &google, &bing, &yahoo, -@@ -778,6 +813,7 @@ const PrepopulatedEngine* const engines_ + &yandex_ru, +- &duckduckgo, + }; // Thailand const PrepopulatedEngine* const engines_TH[] = { @@ -813,7 +920,9 @@ &google, &yahoo_th, &bing, -@@ -786,6 +822,7 @@ const PrepopulatedEngine* const engines_ +- &duckduckgo, + &baidu, + }; // Tunisia const PrepopulatedEngine* const engines_TN[] = { @@ -821,7 +930,9 @@ &google, &yahoo, &bing, -@@ -794,6 +831,7 @@ const PrepopulatedEngine* const engines_ + &yandex_ru, +- &duckduckgo, + }; // Turkey const PrepopulatedEngine* const engines_TR[] = { @@ -829,7 +940,9 @@ &google, &yandex_tr, &yahoo_tr, -@@ -802,14 +840,15 @@ const PrepopulatedEngine* const engines_ + &bing, +- &duckduckgo, + }; // Trinidad and Tobago const PrepopulatedEngine* const engines_TT[] = { @@ -838,6 +951,7 @@ &bing, &yahoo, - &duckduckgo, + &ask, }; // Taiwan @@ -846,7 +960,7 @@ &google, &yahoo_tw, &bing, -@@ -818,6 +857,7 @@ const PrepopulatedEngine* const engines_ +@@ -923,15 +938,16 @@ const PrepopulatedEngine* const engines_ // Tanzania const PrepopulatedEngine* const engines_TZ[] = { @@ -854,15 +968,17 @@ &google, &bing, &yahoo, -@@ -826,6 +866,7 @@ const PrepopulatedEngine* const engines_ +- &duckduckgo, + &yandex_ru, + }; // Ukraine const PrepopulatedEngine* const engines_UA[] = { + &duckduckgo, &google, &yandex_ua, - &mail_ru, -@@ -834,30 +875,31 @@ const PrepopulatedEngine* const engines_ + &bing, +@@ -941,33 +957,34 @@ const PrepopulatedEngine* const engines_ // United States const PrepopulatedEngine* const engines_US[] = { @@ -871,6 +987,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Uruguay @@ -880,6 +997,7 @@ &bing, &yahoo, - &duckduckgo, + &ecosia, }; // Venezuela @@ -889,6 +1007,7 @@ &yahoo_ve, &bing, - &duckduckgo, + &ecosia, }; // Vietnam @@ -896,8 +1015,8 @@ + &duckduckgo, &google, &coccoc, - &bing, -@@ -866,6 +908,7 @@ const PrepopulatedEngine* const engines_ + &yahoo, +@@ -977,29 +994,29 @@ const PrepopulatedEngine* const engines_ // Yemen const PrepopulatedEngine* const engines_YE[] = { @@ -905,7 +1024,9 @@ &google, &bing, &yahoo, -@@ -874,14 +917,15 @@ const PrepopulatedEngine* const engines_ + &yandex_ru, +- &duckduckgo, + }; // South Africa const PrepopulatedEngine* const engines_ZA[] = { @@ -914,6 +1035,7 @@ &bing, &yahoo, - &duckduckgo, + &baidu, }; // Zimbabwe @@ -922,3 +1044,8 @@ &google, &bing, &yahoo, + &ask, +- &duckduckgo, + }; + // ---------------------------------------------------------------------------- + diff --git a/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch b/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch index 08de6545..64a106e9 100644 --- a/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch +++ b/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch @@ -1,6 +1,6 @@ --- a/sandbox/linux/BUILD.gn +++ b/sandbox/linux/BUILD.gn -@@ -318,6 +318,12 @@ if (is_linux) { +@@ -311,6 +311,12 @@ if (is_linux) { # These files have a suspicious comparison. # TODO fix this and re-enable this warning. "-Wno-sign-compare", 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 a0e4ae87..200a6118 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 -@@ -46,7 +46,7 @@ bool ProfileHasOtherTabbedBrowser(Profil +@@ -47,7 +47,7 @@ bool ProfileHasOtherTabbedBrowser(Profil StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const { // Chrome OS has its own welcome flow provided by OOBE. diff --git a/patches/extra/inox-patchset/0019-disable-battery-status-service.patch b/patches/extra/inox-patchset/0019-disable-battery-status-service.patch index 89891fae..8ec9e26b 100644 --- a/patches/extra/inox-patchset/0019-disable-battery-status-service.patch +++ b/patches/extra/inox-patchset/0019-disable-battery-status-service.patch @@ -1,17 +1,17 @@ --- a/services/device/battery/battery_status_service.cc +++ b/services/device/battery/battery_status_service.cc -@@ -21,10 +21,7 @@ BatteryStatusService::BatteryStatusServi - : main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()), - update_callback_(base::Bind(&BatteryStatusService::NotifyConsumers, - base::Unretained(this))), +@@ -22,10 +22,7 @@ BatteryStatusService::BatteryStatusServi + update_callback_( + base::BindRepeating(&BatteryStatusService::NotifyConsumers, + base::Unretained(this))), - status_updated_(false), is_shutdown_(false) { -- callback_list_.set_removal_callback(base::Bind( +- callback_list_.set_removal_callback(base::BindRepeating( - &BatteryStatusService::ConsumersChanged, base::Unretained(this))); } - BatteryStatusService::~BatteryStatusService() { -@@ -67,58 +64,16 @@ BatteryStatusService::AddCallback(const + BatteryStatusService::~BatteryStatusService() = default; +@@ -40,58 +37,16 @@ BatteryStatusService::AddCallback(const DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); DCHECK(!is_shutdown_); @@ -72,7 +72,7 @@ is_shutdown_ = true; } -@@ -129,9 +84,6 @@ BatteryStatusService::GetUpdateCallbackF +@@ -102,9 +57,6 @@ BatteryStatusService::GetUpdateCallbackF void BatteryStatusService::SetBatteryManagerForTesting( std::unique_ptr test_battery_manager) { 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 39c54d03..6194f6b6 100644 --- a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch +++ b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch @@ -9,7 +9,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1580,8 +1580,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1576,8 +1576,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { diff --git a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch b/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch index 1ba8e183..e823c0e7 100644 --- a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch +++ b/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch @@ -12,7 +12,7 @@ it as hidden as it was before? --- a/net/cert/x509_util.cc +++ b/net/cert/x509_util.cc -@@ -191,7 +191,7 @@ bool GetTLSServerEndPointChannelBinding( +@@ -238,7 +238,7 @@ bool GetTLSServerEndPointChannelBinding( } // RSA keys created by CreateKeyAndSelfSignedCert will be of this length. diff --git a/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch b/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch index f292e730..49c1a561 100644 --- a/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch +++ b/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch @@ -10,7 +10,7 @@ Out with all those tracking cookies! --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -135,7 +135,7 @@ void ContentSettingsRegistry::Init() { +@@ -140,7 +140,7 @@ void ContentSettingsRegistry::Init() { // WARNING: The string names of the permissions passed in below are used to // generate preference names and should never be changed! diff --git a/patches/extra/iridium-browser/updater-disable-auto-update.patch b/patches/extra/iridium-browser/updater-disable-auto-update.patch index cb4184b4..c3e84a33 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 -@@ -661,7 +661,7 @@ static base::mac::ScopedObjCClassSwizzle +@@ -660,7 +660,7 @@ static base::mac::ScopedObjCClassSwizzle CFStringRef checkInterval = CFSTR("checkInterval"); CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app); if (!plist) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch index 45a5ba4b..5de771ac 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1486,6 +1486,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1549,6 +1549,10 @@ const FeatureEntry kFeatureEntries[] = { "Enable stacking in tab strip", "Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.", kOsAll, SINGLE_VALUE_TYPE("enable-stacked-tab-strip")}, @@ -15,7 +15,7 @@ SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)}, --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc -@@ -152,9 +152,10 @@ ChromeRenderFrameObserver::ChromeRenderF +@@ -165,9 +165,10 @@ ChromeRenderFrameObserver::ChromeRenderF if (!render_frame->IsMainFrame()) return; @@ -27,7 +27,7 @@ if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection)) SetClientSidePhishingDetection(true); #endif -@@ -342,14 +343,16 @@ void ChromeRenderFrameObserver::DidFinis +@@ -367,14 +368,16 @@ void ChromeRenderFrameObserver::DidFinis if (frame->Parent()) return; @@ -54,9 +54,9 @@ --- a/chrome/renderer/chrome_render_frame_observer.h +++ b/chrome/renderer/chrome_render_frame_observer.h -@@ -107,6 +107,7 @@ class ChromeRenderFrameObserver : public +@@ -115,6 +115,7 @@ class ChromeRenderFrameObserver : public // Have the same lifetime as us. - translate::TranslateHelper* translate_helper_; + translate::TranslateAgent* translate_agent_; safe_browsing::PhishingClassifierDelegate* phishing_classifier_; + bool should_autocollect_; // Whether to autocollect search engines @@ -122,7 +122,7 @@ if (client_) client_->SetOwner(this); -@@ -1620,6 +1630,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -1617,6 +1627,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -132,7 +132,7 @@ const TemplateURLSet* urls = provider_map_->GetURLsForHost(host); if (!urls) return true; -@@ -1630,7 +1643,8 @@ bool TemplateURLService::CanAddAutogener +@@ -1627,7 +1640,8 @@ bool TemplateURLService::CanAddAutogener } bool TemplateURLService::CanReplace(const TemplateURL* t_url) const { 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 9e389666..89b05817 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 @@ -3,7 +3,7 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -243,6 +243,16 @@ const unsigned kOsDesktop = kOsMac | kOs +@@ -247,6 +247,16 @@ const unsigned kOsDesktop = kOsMac | kOs const unsigned kOsAura = kOsWin | kOsLinux | kOsCrOS; #endif // USE_AURA || OS_ANDROID @@ -20,7 +20,7 @@ const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flags_ui::kGenericExperimentChoiceEnabled, -@@ -1468,6 +1478,10 @@ const FeatureEntry::Choice kEnableCrOSAc +@@ -1531,6 +1541,10 @@ const FeatureEntry::Choice kEnableCrOSAc // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { @@ -41,7 +41,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" -@@ -126,6 +127,14 @@ scoped_refptr +@@ -126,6 +127,14 @@ scoped_refptr return installer; } @@ -67,7 +67,7 @@ } --- a/chrome/browser/download/download_crx_util.h +++ b/chrome/browser/download/download_crx_util.h -@@ -43,6 +43,10 @@ scoped_refptr +@@ -43,6 +43,10 @@ scoped_refptr Profile* profile, const download::DownloadItem& download_item); @@ -80,7 +80,7 @@ bool IsExtensionDownload(const download::DownloadItem& download_item); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1013,10 +1013,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1018,10 +1018,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 54a92c98..d88abccd 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch @@ -10,7 +10,7 @@ #include "base/i18n/rtl.h" #include "base/macros.h" #include "base/metrics/histogram_macros.h" -@@ -201,7 +202,8 @@ void JavaScriptDialogManager::RunBeforeU +@@ -200,7 +201,8 @@ void JavaScriptDialogManager::RunBeforeU ChromeJavaScriptDialogExtraData* extra_data = &javascript_dialog_extra_data_[web_contents]; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch b/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch index 7e964446..0ac59bf5 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1490,6 +1490,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1553,6 +1553,10 @@ const FeatureEntry kFeatureEntries[] = { "Disable search engine collection", "Prevents search engines from being added automatically.", kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")}, diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch index bfb44507..f6f53019 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -827,7 +827,8 @@ void StartupBrowserCreatorImpl::AddInfoB +@@ -848,7 +848,8 @@ void StartupBrowserCreatorImpl::AddInfoB if (!browser || !profile_ || browser->tab_strip_model()->count() == 0) return; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch index 7f45f8e2..2fb88b49 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -266,6 +266,16 @@ const FeatureEntry::Choice kShowAvatarBu +@@ -270,6 +270,16 @@ const FeatureEntry::Choice kShowAvatarBu "never"} }; @@ -17,7 +17,7 @@ const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flags_ui::kGenericExperimentChoiceEnabled, -@@ -3698,6 +3708,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3708,6 +3718,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( autofill::features::kAutofillEnableAccountWalletStorage)}, @@ -31,15 +31,15 @@ flag_descriptions::kEnableZeroStateSuggestionsName, --- a/chrome/browser/ui/views/frame/browser_root_view.cc +++ b/chrome/browser/ui/views/frame/browser_root_view.cc -@@ -8,6 +8,7 @@ - #include +@@ -9,6 +9,7 @@ + #include #include "base/bind.h" +#include "base/command_line.h" #include "base/metrics/user_metrics.h" #include "base/task/post_task.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" -@@ -90,6 +91,18 @@ int GetDropEffect(const ui::DropTargetEv +@@ -99,6 +100,18 @@ int GetDropEffect(const ui::DropTargetEv return ui::DragDropTypes::DRAG_MOVE; } @@ -58,7 +58,7 @@ } // namespace BrowserRootView::DropInfo::DropInfo() = default; -@@ -104,7 +117,9 @@ const char BrowserRootView::kViewClassNa +@@ -113,7 +126,9 @@ const char BrowserRootView::kViewClassNa BrowserRootView::BrowserRootView(BrowserView* browser_view, views::Widget* widget) @@ -69,7 +69,7 @@ BrowserRootView::~BrowserRootView() { // It's possible to destroy the browser while a drop is active. In this case, -@@ -251,7 +266,7 @@ const char* BrowserRootView::GetClassNam +@@ -260,7 +275,7 @@ const char* BrowserRootView::GetClassNam } bool BrowserRootView::OnMouseWheel(const ui::MouseWheelEvent& event) { @@ -80,7 +80,7 @@ views::View* hit_view = GetEventHandlerForPoint(event.location()); --- a/chrome/browser/ui/views/frame/browser_root_view.h +++ b/chrome/browser/ui/views/frame/browser_root_view.h -@@ -127,6 +127,8 @@ class BrowserRootView : public views::in +@@ -129,6 +129,8 @@ class BrowserRootView : public views::in int scroll_remainder_x_ = 0; int scroll_remainder_y_ = 0; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch index 1a4b39b1..934852d5 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -253,6 +253,19 @@ const FeatureEntry::Choice kExtensionHan +@@ -257,6 +257,19 @@ const FeatureEntry::Choice kExtensionHan "always-prompt-for-install"}, }; @@ -20,7 +20,7 @@ const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flags_ui::kGenericExperimentChoiceEnabled, -@@ -3792,6 +3805,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3809,6 +3822,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(arc::kEnableUnifiedAudioFocusFeature)}, #endif // defined(OS_CHROMEOS) @@ -34,7 +34,7 @@ flag_descriptions::kUseAngleDescription, kOsWin, --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -217,6 +217,15 @@ void ToolbarView::Init() { +@@ -218,6 +218,15 @@ void ToolbarView::Init() { std::unique_ptr toolbar_account_icon_container; @@ -50,7 +50,7 @@ bool show_avatar_toolbar_button = true; if (base::FeatureList::IsEnabled( autofill::features::kAutofillEnableToolbarStatusChip)) { -@@ -228,11 +237,17 @@ void ToolbarView::Init() { +@@ -229,11 +238,17 @@ void ToolbarView::Init() { } else { #if defined(OS_CHROMEOS) // ChromeOS only badges Incognito and Guest icons in the browser window. diff --git a/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch index c9f43ac7..92738b09 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1468,6 +1468,10 @@ const FeatureEntry::Choice kEnableCrOSAc +@@ -1531,6 +1531,10 @@ const FeatureEntry::Choice kEnableCrOSAc // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { @@ -15,7 +15,7 @@ SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)}, --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc -@@ -71,14 +71,13 @@ using content::WebContents; +@@ -75,14 +75,13 @@ using content::WebContents; namespace { bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) { diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index 3a6f1234..3348cc14 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -23,7 +23,7 @@ enum DnsResolveStatus { RESOLVE_STATUS_DNS_SUCCESS = 0, RESOLVE_STATUS_PROC_SUCCESS, -@@ -3565,7 +3561,7 @@ bool HostResolverManager::IsIPv6Reachabl +@@ -3594,7 +3590,7 @@ bool HostResolverManager::IsIPv6Reachabl if ((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 a5d2044c..a360f80b 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -54,7 +54,7 @@ /** @private */ @@ -111,7 +119,8 @@ Polymer({ /** @private */ - onActionButtonTap_: function() { + onActionButtonTap_() { this.browserProxy_.searchEngineEditCompleted( - this.searchEngine_, this.keyword_, this.queryUrl_); + this.searchEngine_, this.keyword_, this.queryUrl_, @@ -64,7 +64,7 @@ @@ -148,9 +157,11 @@ Polymer({ /** @private */ - updateActionButtonState_: function() { + updateActionButtonState_() { const allValid = [ - this.$.searchEngine, this.$.keyword, this.$.queryUrl + this.$.searchEngine, this.$.keyword, this.$.queryUrl, @@ -435,7 +435,7 @@ Update(url, TemplateURL(data)); } -@@ -1980,7 +1982,7 @@ TemplateURL* TemplateURLService::Add(std +@@ -1979,7 +1981,7 @@ TemplateURL* TemplateURLService::Add(std // Neither engine can be replaced. Uniquify the existing keyword. base::string16 new_keyword = UniquifyKeyword(*existing_turl, false); ResetTemplateURL(existing_turl, existing_turl->short_name(), diff --git a/patches/extra/ungoogled-chromium/default-to-https-scheme.patch b/patches/extra/ungoogled-chromium/default-to-https-scheme.patch index 005c6518..0cc29531 100644 --- a/patches/extra/ungoogled-chromium/default-to-https-scheme.patch +++ b/patches/extra/ungoogled-chromium/default-to-https-scheme.patch @@ -73,7 +73,7 @@ ++prefix_end; --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -438,9 +438,9 @@ std::string SegmentURLInternal(std::stri +@@ -452,9 +452,9 @@ std::string SegmentURLInternal(std::stri (*text)[semicolon] = ';'; } if (!found_scheme) { diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index ef7bc64c..a66afd9f 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -194,7 +194,7 @@ // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -453,7 +453,7 @@ void PepperFileIOHost::OnLocalFileOpened +@@ -454,7 +454,7 @@ void PepperFileIOHost::OnLocalFileOpened #endif } @@ -213,7 +213,7 @@ #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_platform_file.h" -@@ -92,10 +91,6 @@ class PepperFileIOHost : public ppapi::h +@@ -90,10 +89,6 @@ class PepperFileIOHost : public ppapi::h const base::FilePath& path, base::File::Error error_code); diff --git a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch index c809f139..d9ae55a2 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 -@@ -3343,16 +3343,14 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3368,16 +3368,14 @@ ScriptValue WebGLRenderingContextBase::g return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: if (ExtensionEnabled(kWebGLDebugRendererInfoName)) 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 dee9a846..e54220b8 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 -@@ -382,12 +382,6 @@ int GetContentRestrictions(const Browser +@@ -413,12 +413,6 @@ int GetContentRestrictions(const Browser CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(current_tab); content_restrictions = core_tab_helper->content_restrictions(); @@ -15,7 +15,7 @@ if (current_tab->ShowingInterstitialPage()) content_restrictions |= CONTENT_RESTRICTION_PRINT; } -@@ -1055,8 +1049,7 @@ bool CanSavePage(const Browser* browser) +@@ -1111,8 +1105,7 @@ bool CanSavePage(const Browser* browser) prefs::kAllowFileSelectionDialogs)) { return false; } @@ -38,8 +38,8 @@ OfflinePageModel::OfflinePageModel() = default; --- a/content/common/url_schemes.cc +++ b/content/common/url_schemes.cc -@@ -20,6 +20,9 @@ namespace content { - namespace { +@@ -22,6 +22,9 @@ namespace { + bool g_registered_url_schemes = false; const char* const kDefaultSavableSchemes[] = { + url::kAboutScheme, @@ -48,7 +48,7 @@ url::kHttpScheme, url::kHttpsScheme, url::kFileScheme, -@@ -27,7 +30,13 @@ const char* const kDefaultSavableSchemes +@@ -29,7 +32,13 @@ const char* const kDefaultSavableSchemes url::kFtpScheme, kChromeDevToolsScheme, kChromeUIScheme, diff --git a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch index d1341ad0..be14cf0c 100644 --- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch +++ b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch @@ -13,7 +13,7 @@ AddChildView(std::make_unique()); --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -3219,15 +3219,12 @@ void TabStrip::ButtonPressed(views::Butt +@@ -3422,15 +3422,12 @@ void TabStrip::ButtonPressed(views::Butt const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { diff --git a/patches/extra/ungoogled-chromium/popups-to-tabs.patch b/patches/extra/ungoogled-chromium/popups-to-tabs.patch index 7a3a68a6..0bc8a82c 100644 --- a/patches/extra/ungoogled-chromium/popups-to-tabs.patch +++ b/patches/extra/ungoogled-chromium/popups-to-tabs.patch @@ -2,7 +2,7 @@ --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc -@@ -275,7 +275,7 @@ WindowOpenDisposition RenderViewImpl::Na +@@ -260,7 +260,7 @@ WindowOpenDisposition RenderViewImpl::Na case blink::kWebNavigationPolicyNewWindow: return WindowOpenDisposition::NEW_WINDOW; case blink::kWebNavigationPolicyNewPopup: diff --git a/patches/extra/ungoogled-chromium/searx.patch b/patches/extra/ungoogled-chromium/searx.patch index a7350051..0f8a1ff7 100644 --- a/patches/extra/ungoogled-chromium/searx.patch +++ b/patches/extra/ungoogled-chromium/searx.patch @@ -48,7 +48,7 @@ &duckduckgo, &google, &bing, -@@ -50,6 +52,7 @@ const PrepopulatedEngine* const engines_ +@@ -51,6 +53,7 @@ const PrepopulatedEngine* const engines_ // Albania const PrepopulatedEngine* const engines_AL[] = { @@ -56,7 +56,7 @@ &duckduckgo, &google, &yahoo, -@@ -59,6 +62,7 @@ const PrepopulatedEngine* const engines_ +@@ -60,6 +63,7 @@ const PrepopulatedEngine* const engines_ // Argentina const PrepopulatedEngine* const engines_AR[] = { @@ -64,7 +64,7 @@ &duckduckgo, &google, &bing, -@@ -67,6 +71,7 @@ const PrepopulatedEngine* const engines_ +@@ -69,6 +73,7 @@ const PrepopulatedEngine* const engines_ // Austria const PrepopulatedEngine* const engines_AT[] = { @@ -72,7 +72,7 @@ &duckduckgo, &google, &bing, -@@ -75,6 +80,7 @@ const PrepopulatedEngine* const engines_ +@@ -78,6 +83,7 @@ const PrepopulatedEngine* const engines_ // Australia const PrepopulatedEngine* const engines_AU[] = { @@ -80,15 +80,15 @@ &duckduckgo, &google, &bing, -@@ -83,6 +89,7 @@ const PrepopulatedEngine* const engines_ +@@ -87,6 +93,7 @@ const PrepopulatedEngine* const engines_ // Bosnia and Herzegovina const PrepopulatedEngine* const engines_BA[] = { + &searx, &duckduckgo, &google, - &yahoo, -@@ -92,6 +99,7 @@ const PrepopulatedEngine* const engines_ + &bing, +@@ -96,6 +103,7 @@ const PrepopulatedEngine* const engines_ // Belgium const PrepopulatedEngine* const engines_BE[] = { @@ -96,7 +96,7 @@ &duckduckgo, &google, &bing, -@@ -100,6 +108,7 @@ const PrepopulatedEngine* const engines_ +@@ -105,6 +113,7 @@ const PrepopulatedEngine* const engines_ // Bulgaria const PrepopulatedEngine* const engines_BG[] = { @@ -104,7 +104,7 @@ &duckduckgo, &google, &bing, -@@ -109,6 +118,7 @@ const PrepopulatedEngine* const engines_ +@@ -114,6 +123,7 @@ const PrepopulatedEngine* const engines_ // Bahrain const PrepopulatedEngine* const engines_BH[] = { @@ -112,7 +112,7 @@ &duckduckgo, &google, &bing, -@@ -118,6 +128,7 @@ const PrepopulatedEngine* const engines_ +@@ -124,6 +134,7 @@ const PrepopulatedEngine* const engines_ // Burundi const PrepopulatedEngine* const engines_BI[] = { @@ -120,7 +120,7 @@ &duckduckgo, &google, &bing, -@@ -127,6 +138,7 @@ const PrepopulatedEngine* const engines_ +@@ -134,6 +145,7 @@ const PrepopulatedEngine* const engines_ // Brunei const PrepopulatedEngine* const engines_BN[] = { @@ -128,7 +128,7 @@ &duckduckgo, &google, &bing, -@@ -135,6 +147,7 @@ const PrepopulatedEngine* const engines_ +@@ -143,6 +155,7 @@ const PrepopulatedEngine* const engines_ // Bolivia const PrepopulatedEngine* const engines_BO[] = { @@ -136,7 +136,7 @@ &duckduckgo, &google, &bing, -@@ -143,6 +156,7 @@ const PrepopulatedEngine* const engines_ +@@ -152,6 +165,7 @@ const PrepopulatedEngine* const engines_ // Brazil const PrepopulatedEngine* const engines_BR[] = { @@ -144,7 +144,7 @@ &duckduckgo, &google, &bing, -@@ -151,6 +165,7 @@ const PrepopulatedEngine* const engines_ +@@ -161,6 +175,7 @@ const PrepopulatedEngine* const engines_ // Belarus const PrepopulatedEngine* const engines_BY[] = { @@ -152,7 +152,7 @@ &duckduckgo, &google, &yandex_by, -@@ -160,6 +175,7 @@ const PrepopulatedEngine* const engines_ +@@ -171,6 +186,7 @@ const PrepopulatedEngine* const engines_ // Belize const PrepopulatedEngine* const engines_BZ[] = { @@ -160,13 +160,15 @@ &duckduckgo, &google, &bing, -@@ -168,11 +184,12 @@ const PrepopulatedEngine* const engines_ +@@ -180,6 +196,7 @@ const PrepopulatedEngine* const engines_ // Canada const PrepopulatedEngine* const engines_CA[] = { -- &duckduckgo, &google, &bing, &yahoo_ca, &yahoo_qc, -+ &searx, &duckduckgo, &google, &bing, &yahoo_ca, &yahoo_qc, - }; ++ &searx, + &duckduckgo, + &google, + &bing, +@@ -189,6 +206,7 @@ const PrepopulatedEngine* const engines_ // Switzerland const PrepopulatedEngine* const engines_CH[] = { @@ -174,7 +176,7 @@ &duckduckgo, &google, &bing, -@@ -181,6 +198,7 @@ const PrepopulatedEngine* const engines_ +@@ -198,6 +216,7 @@ const PrepopulatedEngine* const engines_ // Chile const PrepopulatedEngine* const engines_CL[] = { @@ -182,21 +184,23 @@ &duckduckgo, &google, &bing, -@@ -189,11 +207,12 @@ const PrepopulatedEngine* const engines_ +@@ -207,6 +226,7 @@ const PrepopulatedEngine* const engines_ // China const PrepopulatedEngine* const engines_CN[] = { -- &duckduckgo, &baidu, &so_360, &google, &sogou, &bing, -+ &searx, &duckduckgo, &baidu, &so_360, &google, &sogou, &bing, - }; ++ &searx, + &duckduckgo, + &baidu, + &sogou, +@@ -217,6 +237,7 @@ const PrepopulatedEngine* const engines_ // Colombia const PrepopulatedEngine* const engines_CO[] = { + &searx, &duckduckgo, &google, - &yahoo_co, -@@ -202,6 +221,7 @@ const PrepopulatedEngine* const engines_ + &bing, +@@ -226,6 +247,7 @@ const PrepopulatedEngine* const engines_ // Costa Rica const PrepopulatedEngine* const engines_CR[] = { @@ -204,7 +208,7 @@ &duckduckgo, &google, &bing, -@@ -210,6 +230,7 @@ const PrepopulatedEngine* const engines_ +@@ -235,6 +257,7 @@ const PrepopulatedEngine* const engines_ // Czech Republic const PrepopulatedEngine* const engines_CZ[] = { @@ -212,7 +216,7 @@ &duckduckgo, &google, &seznam_cz, -@@ -219,6 +240,7 @@ const PrepopulatedEngine* const engines_ +@@ -244,6 +267,7 @@ const PrepopulatedEngine* const engines_ // Germany const PrepopulatedEngine* const engines_DE[] = { @@ -220,7 +224,7 @@ &duckduckgo, &google, &bing, -@@ -227,6 +249,7 @@ const PrepopulatedEngine* const engines_ +@@ -253,6 +277,7 @@ const PrepopulatedEngine* const engines_ // Denmark const PrepopulatedEngine* const engines_DK[] = { @@ -228,7 +232,7 @@ &duckduckgo, &google, &bing, -@@ -235,6 +258,7 @@ const PrepopulatedEngine* const engines_ +@@ -262,6 +287,7 @@ const PrepopulatedEngine* const engines_ // Dominican Republic const PrepopulatedEngine* const engines_DO[] = { @@ -236,7 +240,7 @@ &duckduckgo, &google, &bing, -@@ -243,6 +267,7 @@ const PrepopulatedEngine* const engines_ +@@ -271,6 +297,7 @@ const PrepopulatedEngine* const engines_ // Algeria const PrepopulatedEngine* const engines_DZ[] = { @@ -244,7 +248,7 @@ &duckduckgo, &google, &yahoo, -@@ -252,6 +277,7 @@ const PrepopulatedEngine* const engines_ +@@ -280,6 +307,7 @@ const PrepopulatedEngine* const engines_ // Ecuador const PrepopulatedEngine* const engines_EC[] = { @@ -252,7 +256,7 @@ &duckduckgo, &google, &bing, -@@ -260,6 +286,7 @@ const PrepopulatedEngine* const engines_ +@@ -289,6 +317,7 @@ const PrepopulatedEngine* const engines_ // Estonia const PrepopulatedEngine* const engines_EE[] = { @@ -260,7 +264,7 @@ &duckduckgo, &google, &bing, -@@ -269,6 +296,7 @@ const PrepopulatedEngine* const engines_ +@@ -299,6 +328,7 @@ const PrepopulatedEngine* const engines_ // Egypt const PrepopulatedEngine* const engines_EG[] = { @@ -268,7 +272,7 @@ &duckduckgo, &google, &yahoo, -@@ -278,6 +306,7 @@ const PrepopulatedEngine* const engines_ +@@ -308,6 +338,7 @@ const PrepopulatedEngine* const engines_ // Spain const PrepopulatedEngine* const engines_ES[] = { @@ -276,7 +280,7 @@ &duckduckgo, &google, &bing, -@@ -286,6 +315,7 @@ const PrepopulatedEngine* const engines_ +@@ -317,6 +348,7 @@ const PrepopulatedEngine* const engines_ // Finland const PrepopulatedEngine* const engines_FI[] = { @@ -284,7 +288,7 @@ &duckduckgo, &google, &bing, -@@ -294,6 +324,7 @@ const PrepopulatedEngine* const engines_ +@@ -326,6 +358,7 @@ const PrepopulatedEngine* const engines_ // Faroe Islands const PrepopulatedEngine* const engines_FO[] = { @@ -292,7 +296,7 @@ &duckduckgo, &google, &bing, -@@ -302,6 +333,7 @@ const PrepopulatedEngine* const engines_ +@@ -335,6 +368,7 @@ const PrepopulatedEngine* const engines_ // France const PrepopulatedEngine* const engines_FR[] = { @@ -300,7 +304,7 @@ &duckduckgo, &google, &bing, -@@ -311,6 +343,7 @@ const PrepopulatedEngine* const engines_ +@@ -345,6 +379,7 @@ const PrepopulatedEngine* const engines_ // United Kingdom const PrepopulatedEngine* const engines_GB[] = { @@ -308,7 +312,7 @@ &duckduckgo, &google, &bing, -@@ -319,6 +352,7 @@ const PrepopulatedEngine* const engines_ +@@ -354,6 +389,7 @@ const PrepopulatedEngine* const engines_ // Greece const PrepopulatedEngine* const engines_GR[] = { @@ -316,7 +320,7 @@ &duckduckgo, &google, &bing, -@@ -327,6 +361,7 @@ const PrepopulatedEngine* const engines_ +@@ -363,6 +399,7 @@ const PrepopulatedEngine* const engines_ // Guatemala const PrepopulatedEngine* const engines_GT[] = { @@ -324,7 +328,7 @@ &duckduckgo, &google, &bing, -@@ -335,6 +370,7 @@ const PrepopulatedEngine* const engines_ +@@ -372,6 +409,7 @@ const PrepopulatedEngine* const engines_ // Hong Kong const PrepopulatedEngine* const engines_HK[] = { @@ -332,7 +336,7 @@ &duckduckgo, &google, &yahoo_hk, -@@ -344,6 +380,7 @@ const PrepopulatedEngine* const engines_ +@@ -382,6 +420,7 @@ const PrepopulatedEngine* const engines_ // Honduras const PrepopulatedEngine* const engines_HN[] = { @@ -340,7 +344,7 @@ &duckduckgo, &google, &bing, -@@ -352,6 +389,7 @@ const PrepopulatedEngine* const engines_ +@@ -391,6 +430,7 @@ const PrepopulatedEngine* const engines_ // Croatia const PrepopulatedEngine* const engines_HR[] = { @@ -348,15 +352,15 @@ &duckduckgo, &google, &bing, -@@ -360,6 +398,7 @@ const PrepopulatedEngine* const engines_ +@@ -400,6 +440,7 @@ const PrepopulatedEngine* const engines_ // Hungary const PrepopulatedEngine* const engines_HU[] = { + &searx, &duckduckgo, &google, - &yahoo, -@@ -368,6 +407,7 @@ const PrepopulatedEngine* const engines_ + &bing, +@@ -409,6 +450,7 @@ const PrepopulatedEngine* const engines_ // Indonesia const PrepopulatedEngine* const engines_ID[] = { @@ -364,7 +368,7 @@ &duckduckgo, &google, &yahoo_id, -@@ -376,6 +416,7 @@ const PrepopulatedEngine* const engines_ +@@ -418,6 +460,7 @@ const PrepopulatedEngine* const engines_ // Ireland const PrepopulatedEngine* const engines_IE[] = { @@ -372,7 +376,7 @@ &duckduckgo, &google, &bing, -@@ -384,6 +425,7 @@ const PrepopulatedEngine* const engines_ +@@ -427,6 +470,7 @@ const PrepopulatedEngine* const engines_ // Israel const PrepopulatedEngine* const engines_IL[] = { @@ -380,7 +384,7 @@ &duckduckgo, &google, &bing, -@@ -393,6 +435,7 @@ const PrepopulatedEngine* const engines_ +@@ -436,6 +480,7 @@ const PrepopulatedEngine* const engines_ // India const PrepopulatedEngine* const engines_IN[] = { @@ -388,7 +392,7 @@ &duckduckgo, &google, &yahoo_in, -@@ -401,6 +444,7 @@ const PrepopulatedEngine* const engines_ +@@ -445,6 +490,7 @@ const PrepopulatedEngine* const engines_ // Iraq const PrepopulatedEngine* const engines_IQ[] = { @@ -396,7 +400,7 @@ &duckduckgo, &google, &yahoo, -@@ -410,6 +454,7 @@ const PrepopulatedEngine* const engines_ +@@ -454,6 +500,7 @@ const PrepopulatedEngine* const engines_ // Iran const PrepopulatedEngine* const engines_IR[] = { @@ -404,7 +408,7 @@ &duckduckgo, &google, &bing, -@@ -418,6 +463,7 @@ const PrepopulatedEngine* const engines_ +@@ -464,6 +511,7 @@ const PrepopulatedEngine* const engines_ // Iceland const PrepopulatedEngine* const engines_IS[] = { @@ -412,7 +416,7 @@ &duckduckgo, &google, &bing, -@@ -426,6 +472,7 @@ const PrepopulatedEngine* const engines_ +@@ -473,6 +521,7 @@ const PrepopulatedEngine* const engines_ // Italy const PrepopulatedEngine* const engines_IT[] = { @@ -420,7 +424,7 @@ &duckduckgo, &google, &bing, -@@ -434,6 +481,7 @@ const PrepopulatedEngine* const engines_ +@@ -482,6 +531,7 @@ const PrepopulatedEngine* const engines_ // Jamaica const PrepopulatedEngine* const engines_JM[] = { @@ -428,15 +432,15 @@ &duckduckgo, &google, &bing, -@@ -442,6 +490,7 @@ const PrepopulatedEngine* const engines_ +@@ -491,6 +541,7 @@ const PrepopulatedEngine* const engines_ // Jordan const PrepopulatedEngine* const engines_JO[] = { + &searx, &duckduckgo, &google, - &yahoo, -@@ -451,6 +500,7 @@ const PrepopulatedEngine* const engines_ + &bing, +@@ -500,6 +551,7 @@ const PrepopulatedEngine* const engines_ // Japan const PrepopulatedEngine* const engines_JP[] = { @@ -444,15 +448,15 @@ &duckduckgo, &google, &yahoo_jp, -@@ -460,6 +510,7 @@ const PrepopulatedEngine* const engines_ +@@ -510,6 +562,7 @@ const PrepopulatedEngine* const engines_ // Kenya const PrepopulatedEngine* const engines_KE[] = { + &searx, &duckduckgo, &google, - &yahoo, -@@ -468,6 +519,7 @@ const PrepopulatedEngine* const engines_ + &bing, +@@ -519,6 +572,7 @@ const PrepopulatedEngine* const engines_ // South Korea const PrepopulatedEngine* const engines_KR[] = { @@ -460,7 +464,7 @@ &duckduckgo, &google, &naver, -@@ -477,6 +529,7 @@ const PrepopulatedEngine* const engines_ +@@ -529,6 +583,7 @@ const PrepopulatedEngine* const engines_ // Kuwait const PrepopulatedEngine* const engines_KW[] = { @@ -468,7 +472,7 @@ &duckduckgo, &google, &bing, -@@ -486,6 +539,7 @@ const PrepopulatedEngine* const engines_ +@@ -538,6 +593,7 @@ const PrepopulatedEngine* const engines_ // Kazakhstan const PrepopulatedEngine* const engines_KZ[] = { @@ -476,7 +480,7 @@ &duckduckgo, &google, &yandex_kz, -@@ -495,6 +549,7 @@ const PrepopulatedEngine* const engines_ +@@ -548,6 +604,7 @@ const PrepopulatedEngine* const engines_ // Lebanon const PrepopulatedEngine* const engines_LB[] = { @@ -484,7 +488,7 @@ &duckduckgo, &google, &bing, -@@ -503,6 +558,7 @@ const PrepopulatedEngine* const engines_ +@@ -557,6 +614,7 @@ const PrepopulatedEngine* const engines_ // Liechtenstein const PrepopulatedEngine* const engines_LI[] = { @@ -492,7 +496,7 @@ &duckduckgo, &google, &bing, -@@ -511,6 +567,7 @@ const PrepopulatedEngine* const engines_ +@@ -566,6 +624,7 @@ const PrepopulatedEngine* const engines_ // Lithuania const PrepopulatedEngine* const engines_LT[] = { @@ -500,7 +504,7 @@ &duckduckgo, &google, &bing, -@@ -520,6 +577,7 @@ const PrepopulatedEngine* const engines_ +@@ -575,6 +634,7 @@ const PrepopulatedEngine* const engines_ // Luxembourg const PrepopulatedEngine* const engines_LU[] = { @@ -508,15 +512,15 @@ &duckduckgo, &google, &bing, -@@ -528,6 +586,7 @@ const PrepopulatedEngine* const engines_ +@@ -584,6 +644,7 @@ const PrepopulatedEngine* const engines_ // Latvia const PrepopulatedEngine* const engines_LV[] = { + &searx, &duckduckgo, &google, - &bing, -@@ -537,6 +596,7 @@ const PrepopulatedEngine* const engines_ + &yandex_ru, +@@ -593,6 +654,7 @@ const PrepopulatedEngine* const engines_ // Libya const PrepopulatedEngine* const engines_LY[] = { @@ -524,7 +528,7 @@ &duckduckgo, &google, &yahoo, -@@ -546,6 +606,7 @@ const PrepopulatedEngine* const engines_ +@@ -602,6 +664,7 @@ const PrepopulatedEngine* const engines_ // Morocco const PrepopulatedEngine* const engines_MA[] = { @@ -532,7 +536,7 @@ &duckduckgo, &google, &yahoo, -@@ -555,6 +616,7 @@ const PrepopulatedEngine* const engines_ +@@ -611,6 +674,7 @@ const PrepopulatedEngine* const engines_ // Monaco const PrepopulatedEngine* const engines_MC[] = { @@ -540,7 +544,7 @@ &duckduckgo, &google, &bing, -@@ -563,6 +625,7 @@ const PrepopulatedEngine* const engines_ +@@ -620,6 +684,7 @@ const PrepopulatedEngine* const engines_ // Moldova const PrepopulatedEngine* const engines_MD[] = { @@ -548,23 +552,23 @@ &duckduckgo, &google, &yandex_ru, -@@ -571,6 +634,7 @@ const PrepopulatedEngine* const engines_ +@@ -629,6 +694,7 @@ const PrepopulatedEngine* const engines_ // Montenegro const PrepopulatedEngine* const engines_ME[] = { + &searx, &duckduckgo, &google, - &yahoo, -@@ -580,6 +644,7 @@ const PrepopulatedEngine* const engines_ + &bing, +@@ -638,6 +704,7 @@ const PrepopulatedEngine* const engines_ // Macedonia const PrepopulatedEngine* const engines_MK[] = { + &searx, &duckduckgo, &google, - &yahoo, -@@ -588,6 +653,7 @@ const PrepopulatedEngine* const engines_ + &bing, +@@ -647,6 +714,7 @@ const PrepopulatedEngine* const engines_ // Mexico const PrepopulatedEngine* const engines_MX[] = { @@ -572,15 +576,15 @@ &duckduckgo, &google, &bing, -@@ -596,6 +662,7 @@ const PrepopulatedEngine* const engines_ +@@ -656,6 +724,7 @@ const PrepopulatedEngine* const engines_ // Malaysia const PrepopulatedEngine* const engines_MY[] = { + &searx, &duckduckgo, &google, - &yahoo_my, -@@ -605,6 +672,7 @@ const PrepopulatedEngine* const engines_ + &bing, +@@ -665,6 +734,7 @@ const PrepopulatedEngine* const engines_ // Nicaragua const PrepopulatedEngine* const engines_NI[] = { @@ -588,7 +592,7 @@ &duckduckgo, &google, &bing, -@@ -613,6 +681,7 @@ const PrepopulatedEngine* const engines_ +@@ -674,6 +744,7 @@ const PrepopulatedEngine* const engines_ // Netherlands const PrepopulatedEngine* const engines_NL[] = { @@ -596,7 +600,7 @@ &duckduckgo, &google, &bing, -@@ -621,6 +690,7 @@ const PrepopulatedEngine* const engines_ +@@ -683,6 +754,7 @@ const PrepopulatedEngine* const engines_ // Norway const PrepopulatedEngine* const engines_NO[] = { @@ -604,7 +608,7 @@ &duckduckgo, &google, &bing, -@@ -629,6 +699,7 @@ const PrepopulatedEngine* const engines_ +@@ -692,6 +764,7 @@ const PrepopulatedEngine* const engines_ // New Zealand const PrepopulatedEngine* const engines_NZ[] = { @@ -612,7 +616,7 @@ &duckduckgo, &google, &bing, -@@ -637,6 +708,7 @@ const PrepopulatedEngine* const engines_ +@@ -701,6 +774,7 @@ const PrepopulatedEngine* const engines_ // Oman const PrepopulatedEngine* const engines_OM[] = { @@ -620,7 +624,7 @@ &duckduckgo, &google, &bing, -@@ -646,6 +718,7 @@ const PrepopulatedEngine* const engines_ +@@ -710,6 +784,7 @@ const PrepopulatedEngine* const engines_ // Panama const PrepopulatedEngine* const engines_PA[] = { @@ -628,15 +632,15 @@ &duckduckgo, &google, &bing, -@@ -654,6 +727,7 @@ const PrepopulatedEngine* const engines_ +@@ -719,6 +794,7 @@ const PrepopulatedEngine* const engines_ // Peru const PrepopulatedEngine* const engines_PE[] = { + &searx, &duckduckgo, &google, - &yahoo_pe, -@@ -662,6 +736,7 @@ const PrepopulatedEngine* const engines_ + &bing, +@@ -728,6 +804,7 @@ const PrepopulatedEngine* const engines_ // Philippines const PrepopulatedEngine* const engines_PH[] = { @@ -644,7 +648,7 @@ &duckduckgo, &google, &yahoo_ph, -@@ -670,6 +745,7 @@ const PrepopulatedEngine* const engines_ +@@ -737,6 +814,7 @@ const PrepopulatedEngine* const engines_ // Pakistan const PrepopulatedEngine* const engines_PK[] = { @@ -652,7 +656,7 @@ &duckduckgo, &google, &yahoo, -@@ -679,6 +755,7 @@ const PrepopulatedEngine* const engines_ +@@ -746,6 +824,7 @@ const PrepopulatedEngine* const engines_ // Poland const PrepopulatedEngine* const engines_PL[] = { @@ -660,7 +664,7 @@ &duckduckgo, &google, &bing, -@@ -687,6 +764,7 @@ const PrepopulatedEngine* const engines_ +@@ -755,6 +834,7 @@ const PrepopulatedEngine* const engines_ // Puerto Rico const PrepopulatedEngine* const engines_PR[] = { @@ -668,7 +672,7 @@ &duckduckgo, &google, &bing, -@@ -695,6 +773,7 @@ const PrepopulatedEngine* const engines_ +@@ -764,6 +844,7 @@ const PrepopulatedEngine* const engines_ // Portugal const PrepopulatedEngine* const engines_PT[] = { @@ -676,7 +680,7 @@ &duckduckgo, &google, &bing, -@@ -703,6 +782,7 @@ const PrepopulatedEngine* const engines_ +@@ -773,6 +854,7 @@ const PrepopulatedEngine* const engines_ // Paraguay const PrepopulatedEngine* const engines_PY[] = { @@ -684,7 +688,7 @@ &duckduckgo, &google, &bing, -@@ -711,6 +791,7 @@ const PrepopulatedEngine* const engines_ +@@ -782,6 +864,7 @@ const PrepopulatedEngine* const engines_ // Qatar const PrepopulatedEngine* const engines_QA[] = { @@ -692,7 +696,7 @@ &duckduckgo, &google, &bing, -@@ -720,6 +801,7 @@ const PrepopulatedEngine* const engines_ +@@ -791,6 +874,7 @@ const PrepopulatedEngine* const engines_ // Romania const PrepopulatedEngine* const engines_RO[] = { @@ -700,7 +704,7 @@ &duckduckgo, &google, &bing, -@@ -728,6 +810,7 @@ const PrepopulatedEngine* const engines_ +@@ -800,6 +884,7 @@ const PrepopulatedEngine* const engines_ // Serbia const PrepopulatedEngine* const engines_RS[] = { @@ -708,15 +712,15 @@ &duckduckgo, &google, &yahoo, -@@ -736,6 +819,7 @@ const PrepopulatedEngine* const engines_ +@@ -809,6 +894,7 @@ const PrepopulatedEngine* const engines_ // Russia const PrepopulatedEngine* const engines_RU[] = { + &searx, &duckduckgo, - &yandex_ru, &google, -@@ -745,6 +829,7 @@ const PrepopulatedEngine* const engines_ + &yandex_ru, +@@ -819,6 +905,7 @@ const PrepopulatedEngine* const engines_ // Rwanda const PrepopulatedEngine* const engines_RW[] = { @@ -724,7 +728,7 @@ &duckduckgo, &google, &bing, -@@ -754,6 +839,7 @@ const PrepopulatedEngine* const engines_ +@@ -828,6 +915,7 @@ const PrepopulatedEngine* const engines_ // Saudi Arabia const PrepopulatedEngine* const engines_SA[] = { @@ -732,7 +736,7 @@ &duckduckgo, &google, &bing, -@@ -763,6 +849,7 @@ const PrepopulatedEngine* const engines_ +@@ -837,6 +925,7 @@ const PrepopulatedEngine* const engines_ // Sweden const PrepopulatedEngine* const engines_SE[] = { @@ -740,7 +744,7 @@ &duckduckgo, &google, &bing, -@@ -771,6 +858,7 @@ const PrepopulatedEngine* const engines_ +@@ -846,6 +935,7 @@ const PrepopulatedEngine* const engines_ // Singapore const PrepopulatedEngine* const engines_SG[] = { @@ -748,7 +752,7 @@ &duckduckgo, &google, &bing, -@@ -780,6 +868,7 @@ const PrepopulatedEngine* const engines_ +@@ -856,6 +946,7 @@ const PrepopulatedEngine* const engines_ // Slovenia const PrepopulatedEngine* const engines_SI[] = { @@ -756,7 +760,7 @@ &duckduckgo, &google, &bing, -@@ -788,6 +877,7 @@ const PrepopulatedEngine* const engines_ +@@ -865,6 +956,7 @@ const PrepopulatedEngine* const engines_ // Slovakia const PrepopulatedEngine* const engines_SK[] = { @@ -764,7 +768,7 @@ &duckduckgo, &google, &bing, -@@ -796,6 +886,7 @@ const PrepopulatedEngine* const engines_ +@@ -874,6 +966,7 @@ const PrepopulatedEngine* const engines_ // El Salvador const PrepopulatedEngine* const engines_SV[] = { @@ -772,7 +776,7 @@ &duckduckgo, &google, &bing, -@@ -804,6 +895,7 @@ const PrepopulatedEngine* const engines_ +@@ -883,6 +976,7 @@ const PrepopulatedEngine* const engines_ // Syria const PrepopulatedEngine* const engines_SY[] = { @@ -780,7 +784,7 @@ &duckduckgo, &google, &bing, -@@ -813,6 +905,7 @@ const PrepopulatedEngine* const engines_ +@@ -892,6 +986,7 @@ const PrepopulatedEngine* const engines_ // Thailand const PrepopulatedEngine* const engines_TH[] = { @@ -788,7 +792,7 @@ &duckduckgo, &google, &yahoo_th, -@@ -822,6 +915,7 @@ const PrepopulatedEngine* const engines_ +@@ -901,6 +996,7 @@ const PrepopulatedEngine* const engines_ // Tunisia const PrepopulatedEngine* const engines_TN[] = { @@ -796,7 +800,7 @@ &duckduckgo, &google, &yahoo, -@@ -831,6 +925,7 @@ const PrepopulatedEngine* const engines_ +@@ -910,6 +1006,7 @@ const PrepopulatedEngine* const engines_ // Turkey const PrepopulatedEngine* const engines_TR[] = { @@ -804,7 +808,7 @@ &duckduckgo, &google, &yandex_tr, -@@ -840,6 +935,7 @@ const PrepopulatedEngine* const engines_ +@@ -919,6 +1016,7 @@ const PrepopulatedEngine* const engines_ // Trinidad and Tobago const PrepopulatedEngine* const engines_TT[] = { @@ -812,7 +816,7 @@ &duckduckgo, &google, &bing, -@@ -848,6 +944,7 @@ const PrepopulatedEngine* const engines_ +@@ -928,6 +1026,7 @@ const PrepopulatedEngine* const engines_ // Taiwan const PrepopulatedEngine* const engines_TW[] = { @@ -820,7 +824,7 @@ &duckduckgo, &google, &yahoo_tw, -@@ -857,6 +954,7 @@ const PrepopulatedEngine* const engines_ +@@ -938,6 +1037,7 @@ const PrepopulatedEngine* const engines_ // Tanzania const PrepopulatedEngine* const engines_TZ[] = { @@ -828,7 +832,7 @@ &duckduckgo, &google, &bing, -@@ -866,6 +964,7 @@ const PrepopulatedEngine* const engines_ +@@ -947,6 +1047,7 @@ const PrepopulatedEngine* const engines_ // Ukraine const PrepopulatedEngine* const engines_UA[] = { @@ -836,7 +840,7 @@ &duckduckgo, &google, &yandex_ua, -@@ -875,6 +974,7 @@ const PrepopulatedEngine* const engines_ +@@ -957,6 +1058,7 @@ const PrepopulatedEngine* const engines_ // United States const PrepopulatedEngine* const engines_US[] = { @@ -844,7 +848,7 @@ &duckduckgo, &google, &bing, -@@ -883,6 +983,7 @@ const PrepopulatedEngine* const engines_ +@@ -966,6 +1068,7 @@ const PrepopulatedEngine* const engines_ // Uruguay const PrepopulatedEngine* const engines_UY[] = { @@ -852,7 +856,7 @@ &duckduckgo, &google, &bing, -@@ -891,6 +992,7 @@ const PrepopulatedEngine* const engines_ +@@ -975,6 +1078,7 @@ const PrepopulatedEngine* const engines_ // Venezuela const PrepopulatedEngine* const engines_VE[] = { @@ -860,7 +864,7 @@ &duckduckgo, &google, &yahoo_ve, -@@ -899,6 +1001,7 @@ const PrepopulatedEngine* const engines_ +@@ -984,6 +1088,7 @@ const PrepopulatedEngine* const engines_ // Vietnam const PrepopulatedEngine* const engines_VN[] = { @@ -868,7 +872,7 @@ &duckduckgo, &google, &coccoc, -@@ -908,6 +1011,7 @@ const PrepopulatedEngine* const engines_ +@@ -994,6 +1099,7 @@ const PrepopulatedEngine* const engines_ // Yemen const PrepopulatedEngine* const engines_YE[] = { @@ -876,7 +880,7 @@ &duckduckgo, &google, &bing, -@@ -917,6 +1021,7 @@ const PrepopulatedEngine* const engines_ +@@ -1003,6 +1109,7 @@ const PrepopulatedEngine* const engines_ // South Africa const PrepopulatedEngine* const engines_ZA[] = { @@ -884,7 +888,7 @@ &duckduckgo, &google, &bing, -@@ -925,6 +1030,7 @@ const PrepopulatedEngine* const engines_ +@@ -1012,6 +1119,7 @@ const PrepopulatedEngine* const engines_ // Zimbabwe const PrepopulatedEngine* const engines_ZW[] = { diff --git a/patches/series b/patches/series index 66430c4c..81621564 100644 --- a/patches/series +++ b/patches/series @@ -1,10 +1,8 @@ -core/inox-patchset/chromium-exclude_unwind_tables.patch core/inox-patchset/0001-fix-building-without-safebrowsing.patch core/inox-patchset/0003-disable-autofill-download-manager.patch core/inox-patchset/0005-disable-default-extensions.patch core/inox-patchset/0007-disable-web-resource-service.patch core/inox-patchset/0009-disable-google-ipv6-probes.patch -core/inox-patchset/0010-disable-gcm-status-check.patch core/inox-patchset/0014-disable-translation-lang-fetch.patch core/inox-patchset/0015-disable-update-pings.patch core/inox-patchset/0017-disable-new-avatar-menu.patch @@ -44,7 +42,6 @@ extra/inox-patchset/0016-chromium-sandbox-pie.patch extra/inox-patchset/0018-disable-first-run-behaviour.patch extra/inox-patchset/0019-disable-battery-status-service.patch extra/debian/gn/parallel.patch -extra/debian/fixes/ps-print.patch extra/debian/fixes/connection-message.patch extra/debian/disable/android.patch extra/debian/disable/fuzzers.patch diff --git a/pruning.list b/pruning.list index b593eb3c..f27255bd 100644 --- a/pruning.list +++ b/pruning.list @@ -13,6 +13,9 @@ base/test/data/file_version_info_unittest/no_version_info.dll base/test/data/pe_image/pe_image_test_32.dll base/test/data/pe_image/pe_image_test_64.dll base/test/data/pe_image/pe_image_test_arm64.dll +base/test/data/tzdata/2019a/44/le/metaZones.res +base/test/data/tzdata/2019a/44/le/timezoneTypes.res +base/test/data/tzdata/2019a/44/le/zoneinfo64.res build/android/CheckInstallApk-debug.apk build/android/chromium-debug.keystore build/android/tests/symbolize/liba.so @@ -79,6 +82,7 @@ chrome/credential_provider/eventlog/gcp_eventlog_messages.mc chrome/installer/linux/debian/repo_signing_keys.gpg chrome/installer/test/data/SETUP.EX_ chrome/services/cups_proxy/test/data/basic_handshake.bin +chrome/updater/test/data/signed.exe.gz cloud_print/virtual_driver/win/install/inf/gcp_driver.inf components/cast_channel/fuzz_corpus/cast_message0 components/cast_channel/fuzz_corpus/cast_message1 @@ -155,12 +159,11 @@ components/domain_reliability/baked_in_configs/gvt2_com.json components/domain_reliability/baked_in_configs/gvt6_com.json components/domain_reliability/baked_in_configs/ssl_gstatic_com.json components/domain_reliability/baked_in_configs/www_google_com.json -components/safe_browsing/common/safe_browsing_prefs.cc -components/safe_browsing/common/safe_browsing_prefs.h +components/safe_browsing/core/common/safe_browsing_prefs.cc +components/safe_browsing/core/common/safe_browsing_prefs.h components/services/storage/test_data/legacy_dom_storage_database.localstorage components/signin/public/base/signin_pref_names.cc components/signin/public/base/signin_pref_names.h -components/subresource_filter/core/common/perftests/data/UnindexedRules_8.0 components/test/data/autofill/automated_integration/testdata/Default/Web Data components/test/data/cast_certificate/testsuite/testsuite1.pb components/test/data/crx_file/sample.zip @@ -191,6 +194,29 @@ components/test/data/update_client/jebgalgnebhfojomionfpkfelancnnkf.crx components/test/data/update_client/jebgalgnebhfojomionfpkfelancnnkf/component1.dll components/test/data/update_client/runaction_test_win.crx3 components/test/data/webp_transcode/test_small.tiff +components/viz/test/data/render_pass_data/top_real_world_desktop/accu_weather_2018/accu_weather_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/amazon_2018/amazon_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/blogspot_2018/blogspot_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/booking.com_2018/booking.com_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/cnn_2018/cnn_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/ebay_2018/ebay_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/espn_2018/espn_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/facebook_2018/facebook_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/gmail_2018/gmail_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/google_calendar_2018/google_calendar_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/google_docs_2018/google_docs_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/google_image_search_2018/google_image_search_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/google_plus_2018/google_plus_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/google_web_search_2018/google_web_search_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/linkedin_2018/linkedin_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/pinterest_2018/pinterest_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/techcrunch_2018/techcrunch_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/twitch_2018/twitch_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/twitter_2018/twitter_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/wikipedia_2018/wikipedia_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/wordpress_2018/wordpress_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/yahoo_answers_2018/yahoo_answers_2018.zip +components/viz/test/data/render_pass_data/top_real_world_desktop/yahoo_sports_2018/yahoo_sports_2018.zip components/zucchini/fuzzers/testdata/imposed_ensemble_matcher_fuzzer/seed.asciipb components/zucchini/fuzzers/testdata/patch_fuzzer/empty.zuc components/zucchini/fuzzers/testdata/raw_or_ztf_gen_fuzzer/seed_proto.bin @@ -249,6 +275,7 @@ media/midi/fuzz/usb_midi_descriptor_corpus/b media/midi/fuzz/usb_midi_descriptor_corpus/c media/midi/fuzz/usb_midi_descriptor_corpus/d media/midi/fuzz/usb_midi_descriptor_corpus/e +mojo/public/tools/fuzzers/message_corpus/array_bool.mojomsg mojo/public/tools/fuzzers/message_corpus/message_0.mojomsg mojo/public/tools/fuzzers/message_corpus/message_1.mojomsg mojo/public/tools/fuzzers/message_corpus/message_10.mojomsg @@ -9414,6 +9441,7 @@ third_party/catapult/third_party/google-endpoints/setuptools/cli.exe third_party/catapult/third_party/google-endpoints/setuptools/gui-32.exe third_party/catapult/third_party/google-endpoints/setuptools/gui-64.exe third_party/catapult/third_party/google-endpoints/setuptools/gui.exe +third_party/catapult/third_party/gsutil/gslib/tests/test_data/favicon.ico.gz third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.p12 third_party/catapult/third_party/gsutil/third_party/crcmod_osx/crcmod/_crcfunext.so third_party/catapult/third_party/gsutil/third_party/httplib2/ref/img1.old @@ -14092,6 +14120,8 @@ third_party/grpc/src/test/core/transport/chttp2/hpack_parser_corpus/fdf548cde981 third_party/grpc/src/test/core/transport/chttp2/hpack_parser_corpus/ff2097734bd7bb8451aece13c9336c4624735170 third_party/grpc/src/test/core/transport/chttp2/hpack_parser_corpus/ff2c949863eb4e14d9e835c51591304403d91b6c third_party/grpc/src/test/core/transport/chttp2/hpack_parser_corpus/ff7d6ff060e63355701b2e655c802902338497de +third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.WA.gpos.otf +third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.WAV.gpos.otf third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.abc.otf third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.ac.nohints.otf third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.ac.nosubrs.nohints.otf @@ -14106,6 +14136,7 @@ third_party/harfbuzz-ng/src/test/api/fonts/MathTestFontPartial1.otf third_party/harfbuzz-ng/src/test/api/fonts/MathTestFontPartial2.otf third_party/harfbuzz-ng/src/test/api/fonts/MathTestFontPartial3.otf third_party/harfbuzz-ng/src/test/api/fonts/MathTestFontPartial4.otf +third_party/harfbuzz-ng/src/test/api/fonts/RanaKufi-Regular.subset.otf third_party/harfbuzz-ng/src/test/api/fonts/SourceHanSans-Regular.41,3041,4C2E.otf third_party/harfbuzz-ng/src/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf third_party/harfbuzz-ng/src/test/api/fonts/SourceHanSans-Regular.41,4C2E.nosubrs.nohints.otf @@ -14156,6 +14187,7 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuz third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5728971283496960 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5746142327865344 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5750379279548416 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5641053680173056 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5643036478930944 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5686186874503168 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5717414645334016 @@ -14264,13 +14296,19 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5768601332613120 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5067936541179904 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5077547978588160 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5148388450631680 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5167653459329024 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5169035432165376 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5206191479455744 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5359635656605696 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5521982557782016 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5542653037903872 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5609911946838016 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5629878397829120 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5634197349203968 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5642531954229248 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5643107869917184 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5650879734874112 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5651059347816448 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5659903036751872 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5660711141769216 @@ -14285,10 +14323,13 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5680398559870976 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5690658895953920 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5695279609675776 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5695925913911296 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5696607199166464 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5696825891225600 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5708764082864128 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5710107829075968 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5711951464759296 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5715299773186048 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5716947896893440 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5718215406125056 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5721073428987904 @@ -14296,10 +14337,14 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5728664968232960 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5738978499624960 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5739000398086144 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5741295280848896 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5743250149736448 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5747028458209280 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5747265633779712 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5747280156295168 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750092395970560 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750420593442816 +third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5753173985984512 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5754526379802624 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5758598970343424 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5760768497156096 @@ -14658,39 +14703,59 @@ third_party/harfbuzz-ng/src/test/subset/data/expected/cmap14/cmap14_font1.retain third_party/harfbuzz-ng/src/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41,46.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.42,44.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.43,46.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.retain-all-codepoint.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41,43.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41,46.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.42,44.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.43,46.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.21,23,25.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.21,23.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.21,23,25.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.21,23.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23,25.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23,25.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.28,29.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.28,2B.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.29,2B.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.28,29.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.28,2B.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.29,2B.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.30,31,32,33.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.30,31,32,33.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.30,31,32,33.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.30,31,32,33.otf +third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.41,42,43.otf third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.retain-all-codepoint.otf third_party/harfbuzz-ng/src/test/subset/data/fonts/SourceHanSans-Regular_subset.otf third_party/harfbuzz-ng/src/test/subset/data/fonts/SourceSansPro-Regular.otf @@ -14750,6 +14815,7 @@ third_party/icu/source/data/in/uts46.nrm third_party/icu/tzres/metaZones.res third_party/icu/tzres/timezoneTypes.res third_party/icu/tzres/zoneinfo64.res +third_party/jetifier_standalone/lib/jetifier-standalone.jar third_party/libdrm/src/intel/tests/gen4-3d.batch third_party/libdrm/src/intel/tests/gen5-3d.batch third_party/libdrm/src/intel/tests/gen6-3d.batch @@ -17092,6 +17158,7 @@ third_party/llvm/llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph-com third_party/llvm/llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph-pgo-combined.1.bc third_party/llvm/llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph-pgo.1.bc third_party/llvm/llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph.1.bc +third_party/llvm/llvm/test/Bitcode/aarch64-addp-upgrade.bc third_party/llvm/llvm/test/Bitcode/aggregateInstructions.3.2.ll.bc third_party/llvm/llvm/test/Bitcode/atomic-no-syncscope.ll.bc third_party/llvm/llvm/test/Bitcode/attributes-3.3.ll.bc @@ -17162,6 +17229,7 @@ third_party/llvm/llvm/test/Bitcode/vectorInstructions.3.2.ll.bc third_party/llvm/llvm/test/Bitcode/visibility-styles.3.2.ll.bc third_party/llvm/llvm/test/Bitcode/weak-cmpxchg-upgrade.ll.bc third_party/llvm/llvm/test/Bitcode/weak-macho-3.5.ll.bc +third_party/llvm/llvm/test/DebugInfo/Inputs/.build-id/ab/b50d82b6bdc861.debug third_party/llvm/llvm/test/DebugInfo/Inputs/arange-overlap.elf-x86_64 third_party/llvm/llvm/test/DebugInfo/Inputs/arm-relocs.elf-arm third_party/llvm/llvm/test/DebugInfo/Inputs/cross-cu-inlining.x86_64-macho.o @@ -17172,6 +17240,7 @@ third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-gdbindex-v7.elf-x86-64 third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-inl-test.elf-x86-64 third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-inl-test.high_pc.elf-x86-64 third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-macho-relocs.macho.x86_64.o +third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-macro.dwo third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-macro.o third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-pubnames.elf-x86-64 @@ -17254,8 +17323,6 @@ third_party/llvm/llvm/test/Object/Inputs/dext-test.elf-mips64r2 third_party/llvm/llvm/test/Object/Inputs/dyn-rel.so.elf-mips third_party/llvm/llvm/test/Object/Inputs/dynamic-reloc.so third_party/llvm/llvm/test/Object/Inputs/elf-mip64-reloc.o -third_party/llvm/llvm/test/Object/Inputs/elf-versioning-test.i386 -third_party/llvm/llvm/test/Object/Inputs/elf-versioning-test.x86_64 third_party/llvm/llvm/test/Object/Inputs/hello-world.elf-x86-64 third_party/llvm/llvm/test/Object/Inputs/hello-world.macho-x86_64 third_party/llvm/llvm/test/Object/Inputs/invalid-bad-section-address.coff @@ -17444,8 +17511,6 @@ third_party/llvm/llvm/test/Object/Inputs/macho64-invalid-too-small-segment-load- third_party/llvm/llvm/test/Object/Inputs/main-ret-zero-pe-i386.dll third_party/llvm/llvm/test/Object/Inputs/main-ret-zero-pe-i386.exe third_party/llvm/llvm/test/Object/Inputs/micro-mips.elf-mipsel -third_party/llvm/llvm/test/Object/Inputs/no-section-header-string-table.elf-x86-64 -third_party/llvm/llvm/test/Object/Inputs/no-section-table.so third_party/llvm/llvm/test/Object/Inputs/no-sections.elf-x86-64 third_party/llvm/llvm/test/Object/Inputs/phdr-note.elf-x86-64 third_party/llvm/llvm/test/Object/Inputs/phdrs.elf-x86-64 @@ -17575,6 +17640,7 @@ third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/baseaddr/loc1.x86_6 third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/common/common.x86_64 third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/common/common1.o third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/common/common2.o +third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/basic.macho.remarks.archive.x86_64 third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/basic.macho.remarks.empty.x86_64 third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/basic.macho.remarks.x86_64 third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/basic1.macho.remarks.empty.x86_64.o @@ -17592,6 +17658,7 @@ third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/fat.macho.remarks.x86.o third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/fat.macho.remarks.x86.opt.bitstream third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/fat.macho.remarks.x86_64.opt.bitstream third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/fat.macho.remarks.x86_64h.opt.bitstream +third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/libbasic.a third_party/llvm/llvm/test/tools/dsymutil/Inputs/scattered-reloc/1.o third_party/llvm/llvm/test/tools/dsymutil/Inputs/sibling.o third_party/llvm/llvm/test/tools/dsymutil/Inputs/submodules/1.o @@ -17601,6 +17668,8 @@ third_party/llvm/llvm/test/tools/dsymutil/Inputs/swift-dwarf-loc.macho.x86_64 third_party/llvm/llvm/test/tools/dsymutil/Inputs/swift-dwarf-loc.macho.x86_64.o third_party/llvm/llvm/test/tools/dsymutil/Inputs/thumb.armv7m third_party/llvm/llvm/test/tools/dsymutil/Inputs/thumb.o +third_party/llvm/llvm/test/tools/dsymutil/X86/Inputs/call-site-entry.macho.x86_64 +third_party/llvm/llvm/test/tools/dsymutil/X86/Inputs/call-site-entry.macho.x86_64.o third_party/llvm/llvm/test/tools/gold/X86/Inputs/drop-debug.bc third_party/llvm/llvm/test/tools/gold/X86/Inputs/invalid.bc third_party/llvm/llvm/test/tools/llvm-ar/Inputs/absolute-paths.lib @@ -17822,6 +17891,7 @@ third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-set-type-imm third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-malformed-uleb128 third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-times third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-times-skipping-uleb +third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-stabs-x86_64 third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-export-info-malformed-uleb128 third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-export-info-malformed-uleb128_too_big third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-kind @@ -17952,105 +18022,92 @@ third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/compressed.profraw third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/gcc-sample-profile.gcov third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/weight-instr-bar.profdata third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/weight-instr-foo.profdata -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/abiflags.obj.elf-mips -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/abiflags.obj.elf-mipsel -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/aix_xcoff_xlc_test8.o -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/arm64-win1.obj -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/arm64-win2.obj -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/bad-relocs.obj.coff-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/basereloc.obj.coff-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/bigobj.coff-x86-64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-cycle.obj -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-inlinees.obj -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-inlining.obj.coff -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-label.obj -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-merging-1.obj -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-merging-2.obj -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-merging-anon.obj -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-types.obj -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-unsorted.obj -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-vftable.obj.coff -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/coff-load-config-data-end.exe -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/coff-load-config-x64.dll -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/coff-load-config-x86.dll -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/coff-no-load-config.exe -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/comdat-function-linetables.obj.coff-2012-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/comdat-function-linetables.obj.coff-2013-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/compression.zlib.style.elf-x86-64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/const-import.lib -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/cxx-cli-aux.obj.coff-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/directives.obj.coff-x86_64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/dynamic-table-exe.mips -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/dynamic-table-so.mips -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/dynamic-table-so.x86 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/export-arm.dll -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/export-x64.dll -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/export-x86.dll -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-ppc -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-ppc64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-x86_64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/got-empty.exe.mipsel -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/got-over.exe.elf-mips -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/got-plt.exe.elf-mipsel -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/got-static.exe.mips -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/got-tls.so.elf-mips64el -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/has_pdb.exe -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/imports.exe.coff-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/imports.exe.coff-x86-64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/library.lib -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/macho-universal-archive.x86_64.i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/macho-universal.x86_64.i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/magic.coff-importlib -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/mips-options.elf-mips64el -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/mips-rld-map-rel.elf-mipsel -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifile-linetables.obj.coff-2012-i368 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifile-linetables.obj.coff-2012-x86_64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifile-linetables.obj.coff-2013-i368 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifile-linetables.obj.coff-2013-x86_64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifunction-linetables.obj.coff-2012-i368 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifunction-linetables.obj.coff-2012-x86_64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifunction-linetables.obj.coff-2013-i368 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifunction-linetables.obj.coff-2013-x86_64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/needed-libs.obj.coff-am64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/nop.exe.coff-x86-64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/options.obj.elf-mipsel -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/phdrs-elf.exe-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/phdrs-elf.exe-x86_64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/ppc64.exe -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/reginfo.obj.elf-mipsel -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs-no-symtab.obj.coff-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.elf-mips -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.elf-x86_64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.macho-arm -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.macho-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.macho-x86_64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/resources/test_resource.obj.coff -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/resources/test_resource.res -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/rpath.exe.elf-x86_64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/st-other.obj.elf-mips -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/st-other.obj.elf-mips16 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/symbols-proc-specific.elf-hexagon -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.exe.coff-arm -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.coff-arm -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.coff-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.coff-x86-64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-amdhsa-gfx803 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-mipsel -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-x86-64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.macho-arm -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.macho-i386 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.macho-ppc -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.macho-ppc64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.macho-x86-64 -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.wasm -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/xcoff-basic-64.o -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/xcoff-basic-neg-sym-count.o -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/xcoff-basic-neg-time.o -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/xcoff-basic.o -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/xcoff-reloc-overflow.o -third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/zero-string-table.obj.coff-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/aix_xcoff_xlc_test8.o +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/arm64-win1.obj +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/arm64-win2.obj +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/bad-relocs.obj.coff-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/basereloc.obj.coff-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/bigobj.coff-x86-64 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-cycle.obj +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-inlinees.obj +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-inlining.obj.coff +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-label.obj +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-merging-1.obj +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-merging-2.obj +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-merging-anon.obj +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-types.obj +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-unsorted.obj +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-vftable.obj.coff +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/coff-load-config-data-end.exe +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/coff-load-config-x64.dll +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/coff-load-config-x86.dll +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/coff-no-load-config.exe +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/comdat-function-linetables.obj.coff-2012-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/comdat-function-linetables.obj.coff-2013-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/const-import.lib +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/cxx-cli-aux.obj.coff-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/directives.obj.coff-x86_64 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/export-arm.dll +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/export-x64.dll +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/export-x86.dll +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/has_pdb.exe +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/imports.exe.coff-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/imports.exe.coff-x86-64 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/library.lib +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/magic.coff-importlib +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifile-linetables.obj.coff-2012-i368 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifile-linetables.obj.coff-2012-x86_64 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifile-linetables.obj.coff-2013-i368 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifile-linetables.obj.coff-2013-x86_64 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifunction-linetables.obj.coff-2012-i368 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifunction-linetables.obj.coff-2012-x86_64 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifunction-linetables.obj.coff-2013-i368 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifunction-linetables.obj.coff-2013-x86_64 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/needed-libs.obj.coff-am64 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/nop.exe.coff-x86-64 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/relocs-no-symtab.obj.coff-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/resources/test_resource.obj.coff +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/resources/test_resource.res +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/trivial.exe.coff-arm +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/trivial.obj.coff-arm +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/trivial.obj.coff-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/trivial.obj.coff-x86-64 +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/xcoff-basic-64.o +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/xcoff-basic-neg-sym-count.o +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/xcoff-basic-neg-time.o +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/xcoff-basic.o +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/xcoff-reloc-overflow.o +third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/zero-string-table.obj.coff-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/abiflags.obj.elf-mips +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/abiflags.obj.elf-mipsel +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/dynamic-table-exe.mips +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/dynamic-table-so.mips +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/got-empty.exe.mipsel +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/got-over.exe.elf-mips +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/got-plt.exe.elf-mipsel +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/got-static.exe.mips +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/got-tls.so.elf-mips64el +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/mips-options.elf-mips64el +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/mips-rld-map-rel.elf-mipsel +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/options.obj.elf-mipsel +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/phdrs-elf.exe-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/phdrs-elf.exe-x86_64 +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/ppc64.exe +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/reginfo.obj.elf-mipsel +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/trivial.obj.elf-amdhsa-gfx803 +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/trivial.obj.elf-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/trivial.obj.elf-mipsel +third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/macho-universal-archive.x86_64.i386 +third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/macho-universal.x86_64.i386 +third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/relocs.obj.macho-arm +third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/relocs.obj.macho-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/relocs.obj.macho-x86_64 +third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-arm +third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-i386 +third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-ppc +third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-ppc64 +third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-x86-64 +third_party/llvm/llvm/test/tools/llvm-readobj/wasm/Inputs/trivial.obj.wasm third_party/llvm/llvm/test/tools/llvm-symbolizer/Inputs/addr.exe third_party/llvm/llvm/test/tools/llvm-symbolizer/Inputs/coff-dwarf.exe third_party/llvm/llvm/test/tools/llvm-symbolizer/Inputs/coff-exports.exe @@ -18236,6 +18293,16 @@ third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/rtcp third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/sender_report_with_report_block.bin third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/sender_report_without_report_block.bin third_party/openscreen/src/test/data/cast/common/certificate/testsuite/testsuite1.pb +third_party/openscreen/src/test/data/cast/receiver/channel/auth_challenge.pb +third_party/openscreen/src/test/data/cast/receiver/channel/auth_response.pb +third_party/openscreen/src/test/data/cast/receiver/channel/bad_signature_crl.pb +third_party/openscreen/src/test/data/cast/receiver/channel/bad_signer_cert_crl.pb +third_party/openscreen/src/test/data/cast/receiver/channel/device_revoked_crl.pb +third_party/openscreen/src/test/data/cast/receiver/channel/device_serial_revoked_crl.pb +third_party/openscreen/src/test/data/cast/receiver/channel/good_crl.pb +third_party/openscreen/src/test/data/cast/receiver/channel/invalid_time_crl.pb +third_party/openscreen/src/test/data/cast/receiver/channel/issuer_revoked_crl.pb +third_party/openscreen/src/test/data/cast/receiver/channel/issuer_serial_revoked_crl.pb third_party/pdfium/testing/resources/bug_552046.in third_party/pdfium/testing/resources/bug_861842.in third_party/pdfium/testing/resources/hint_table_102p.bin @@ -18251,6 +18318,7 @@ third_party/perfetto/src/profiling/memory/shared_ring_buffer_fuzzer_corpus/empty third_party/perfetto/src/profiling/memory/shared_ring_buffer_fuzzer_corpus/overflow third_party/perfetto/src/profiling/memory/shared_ring_buffer_fuzzer_corpus/read third_party/perfetto/src/traced/probes/ftrace/cpu_reader_fuzzer_corpus/one_page_sched_switch +third_party/perfetto/test/trace_processor/track_event_typed_args.pb third_party/protobuf/benchmarks/datasets/google_message1/proto2/dataset.google_message1_proto2.pb third_party/protobuf/benchmarks/datasets/google_message1/proto3/dataset.google_message1_proto3.pb third_party/protobuf/benchmarks/datasets/google_message2/dataset.google_message2.pb @@ -18297,15 +18365,12 @@ third_party/pyelftools/test/testfiles_for_unittests/simple_gcc.elf.arm third_party/pywebsocket/src/test/cert/client_cert.p12 third_party/quic_trace/src/examples/example.json.gz third_party/quic_trace/src/examples/example.qtr -third_party/sfntly/src/cpp/ext/redist/cmake-2.8.5-win32-x86.zip -third_party/sfntly/src/cpp/ext/redist/gtest-1.6.0.zip -third_party/sfntly/src/cpp/ext/redist/icu4c-4_6_1-Win32-msvc10.zip -third_party/sfntly/src/java/lib/icu4j-4_8_1_1.jar -third_party/sfntly/src/java/lib/icu4j-charset-4_8_1_1.jar -third_party/sfntly/src/java/lib/jcommander-1.27.jar -third_party/sfntly/src/java/lib/junit-4.10.jar third_party/skia/experimental/wasm-skp-debugger/debugger/anim.mskp third_party/skia/experimental/wasm-skp-debugger/debugger/sample.skp +third_party/skia/modules/canvaskit/canvaskit/red_line.skp +third_party/skia/modules/canvaskit/tests/assets/Roboto-Regular.otf +third_party/skia/modules/canvaskit/tests/assets/red_line.skp +third_party/skia/modules/canvaskit/tests/assets/test.ttc third_party/skia/platform_tools/android/apps/gradle/wrapper/gradle-wrapper.jar third_party/skia/platform_tools/android/bin/linux/perfhost third_party/skia/platform_tools/android/bin/mac/perfhost @@ -18341,6 +18406,7 @@ third_party/skia/site/dev/design/conical/lemma3.1.ggb third_party/skia/site/dev/design/conical/lemma3.2.ggb third_party/skia/site/dev/design/conical/lemma3.ggb third_party/skia/site/dev/design/conical/lemma4.ggb +third_party/skia/site/dev/tools/calendar.mskp third_party/snappy/src/testdata/baddata1.snappy third_party/snappy/src/testdata/baddata2.snappy third_party/snappy/src/testdata/baddata3.snappy @@ -18348,6 +18414,7 @@ third_party/snappy/src/testdata/fireworks.jpeg third_party/snappy/src/testdata/geo.protodata third_party/snappy/src/testdata/kppkn.gtb third_party/spirv-cross/spirv-cross/tests-other/c_api_test.spv +third_party/spirv-cross/spirv-cross/tests-other/hlsl_resource_binding.spv third_party/spirv-cross/spirv-cross/tests-other/msl_constexpr_test.spv third_party/spirv-cross/spirv-cross/tests-other/msl_resource_binding.spv third_party/spirv-cross/spirv-cross/tests-other/msl_ycbcr_conversion_test.spv @@ -18382,18 +18449,18 @@ third_party/sqlite/fuzz/lpm_fuzzer_seed_corpus/corpus_queries8 third_party/sqlite/fuzz/lpm_fuzzer_seed_corpus/corpus_queries9 third_party/sqlite/patched/tool/win/sqlite.vsix third_party/sqlite/patched/vsixtest/vsixtest_TemporaryKey.pfx -third_party/sqlite/sqlite-src-3300100/test/dbfuzz2-seed1.db -third_party/sqlite/sqlite-src-3300100/test/fuzzdata1.db -third_party/sqlite/sqlite-src-3300100/test/fuzzdata2.db -third_party/sqlite/sqlite-src-3300100/test/fuzzdata3.db -third_party/sqlite/sqlite-src-3300100/test/fuzzdata4.db -third_party/sqlite/sqlite-src-3300100/test/fuzzdata5.db -third_party/sqlite/sqlite-src-3300100/test/fuzzdata6.db -third_party/sqlite/sqlite-src-3300100/test/fuzzdata7.db -third_party/sqlite/sqlite-src-3300100/test/fuzzdata8.db -third_party/sqlite/sqlite-src-3300100/test/sessionfuzz-data1.db -third_party/sqlite/sqlite-src-3300100/tool/win/sqlite.vsix -third_party/sqlite/sqlite-src-3300100/vsixtest/vsixtest_TemporaryKey.pfx +third_party/sqlite/sqlite-src-3310100/test/dbfuzz2-seed1.db +third_party/sqlite/sqlite-src-3310100/test/fuzzdata1.db +third_party/sqlite/sqlite-src-3310100/test/fuzzdata2.db +third_party/sqlite/sqlite-src-3310100/test/fuzzdata3.db +third_party/sqlite/sqlite-src-3310100/test/fuzzdata4.db +third_party/sqlite/sqlite-src-3310100/test/fuzzdata5.db +third_party/sqlite/sqlite-src-3310100/test/fuzzdata6.db +third_party/sqlite/sqlite-src-3310100/test/fuzzdata7.db +third_party/sqlite/sqlite-src-3310100/test/fuzzdata8.db +third_party/sqlite/sqlite-src-3310100/test/sessionfuzz-data1.db +third_party/sqlite/sqlite-src-3310100/tool/win/sqlite.vsix +third_party/sqlite/sqlite-src-3310100/vsixtest/vsixtest_TemporaryKey.pfx third_party/swiftshader/third_party/PowerVR_SDK/Builds/Windows/x86_32/Lib/libEGL.lib third_party/swiftshader/third_party/PowerVR_SDK/Builds/Windows/x86_32/Lib/libGLES_CM.lib third_party/swiftshader/third_party/PowerVR_SDK/Builds/Windows/x86_32/Lib/libGLESv2.lib @@ -19525,6 +19592,7 @@ third_party/webgl/src/sdk/tests/resources/red-green.mp4 third_party/webgl/src/sdk/tests/resources/red-green.theora.ogv third_party/webgl/src/sdk/tests/resources/red-green.webmvp8.webm third_party/webgl/src/sdk/tests/resources/transparent-2frames.webm +third_party/webgpu-cts/src/deploy_key.enc third_party/webrtc/data/audio_processing/android/output_data_fixed.pb third_party/webrtc/data/audio_processing/android/output_data_float.pb third_party/webrtc/data/voice_engine/audio_long16big_endian.pcm @@ -19844,6 +19912,7 @@ tools/clang/scripts/update.pyc tools/grit/grit/testdata/klonk-alternate-skeleton.rc tools/grit/grit/testdata/klonk.rc tools/origin_trials/eftest.key +tools/origin_trials/eftest2.key tools/perf/contrib/media_router_benchmarks/test_site/bear-vp9-opus.webm tools/skia_goldctl/linux/goldctl tools/swarming_client/tests/archive.tar