From 89fd3b5d8c4fa98158ab6662cf4747a412078904 Mon Sep 17 00:00:00 2001 From: Blaise Date: Wed, 19 Mar 2025 14:00:21 -0500 Subject: [PATCH 01/11] Update to Chromium 134.0.6998.117 --- chromium_version.txt | 2 +- domain_substitution.list | 1 + patches/extra/ungoogled-chromium/remove-uneeded-ui.patch | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/chromium_version.txt b/chromium_version.txt index 2102778a..a18208eb 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -134.0.6998.88 +134.0.6998.117 diff --git a/domain_substitution.list b/domain_substitution.list index 013fef87..a7ab38f3 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -13082,6 +13082,7 @@ 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/gradients.cpp third_party/skia/gm/labyrinth.cpp third_party/skia/gm/pictureshader.cpp third_party/skia/gm/png_codec.cpp diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 410932cf..a68ada82 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -424,7 +424,7 @@ //////////////////////////////////////////////////////////////////////////////// --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc -@@ -1206,15 +1206,4 @@ void BookmarkMenuDelegate::BuildOtherNod +@@ -1210,15 +1210,4 @@ void BookmarkMenuDelegate::BuildOtherNod ui::ImageModel bookmarks_side_panel_icon = ui::ImageModel::FromVectorIcon( kBookmarksSidePanelIcon, ui::kColorMenuIcon, ui::SimpleMenuModel::kDefaultIconSize); From 04870c51c7d5c091e70e73dc10151ed620802808 Mon Sep 17 00:00:00 2001 From: Blaise Date: Fri, 21 Mar 2025 14:40:37 -0500 Subject: [PATCH 02/11] Update to Chromium 134.0.6998.165 --- chromium_version.txt | 2 +- .../fingerprinting-flags-client-rects-and-measuretext.patch | 2 +- .../bromite/flag-fingerprinting-canvas-image-data-noise.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium_version.txt b/chromium_version.txt index a18208eb..391628c8 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -134.0.6998.117 +134.0.6998.165 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 afbe3bd0..6e5371f8 100644 --- a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch +++ b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch @@ -338,7 +338,7 @@ #include "third_party/blink/renderer/platform/wtf/vector.h" --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2053,6 +2053,12 @@ +@@ -2056,6 +2056,12 @@ status: "experimental", }, { 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 53c11538..8945dba8 100644 --- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch +++ b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch @@ -314,7 +314,7 @@ approach to change color components. // Methods overridden by all sub-classes --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2059,6 +2059,9 @@ +@@ -2062,6 +2062,9 @@ name: "FingerprintingCanvasMeasureTextNoise", }, { From ddd06231e5fb81e38f53e207f5b149605a1febba Mon Sep 17 00:00:00 2001 From: dot-gov Date: Sun, 23 Mar 2025 12:33:02 +0000 Subject: [PATCH 03/11] Enable Certificate Transparency Enforcement (#3243) --- ...ertificate-transparency-and-add-flag.patch | 22 +++++++++++++++++++ patches/series | 1 + 2 files changed, 23 insertions(+) create mode 100644 patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch diff --git a/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch b/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch new file mode 100644 index 00000000..26409ebd --- /dev/null +++ b/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch @@ -0,0 +1,22 @@ +--- a/chrome/browser/browser_features.cc ++++ b/chrome/browser/browser_features.cc +@@ -50,7 +50,7 @@ BASE_FEATURE(kBookmarkTriggerForPrerender2, + // switch. + BASE_FEATURE(kCertificateTransparencyAskBeforeEnabling, + "CertificateTransparencyAskBeforeEnabling", +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#if true + base::FEATURE_ENABLED_BY_DEFAULT); + #else + base::FEATURE_DISABLED_BY_DEFAULT); +--- a/chrome/browser/ungoogled_flag_entries.h ++++ b/chrome/browser/ungoogled_flag_entries.h +@@ -140,4 +140,8 @@ + "Spoof WebGL Info", + "Return generic values for WebGLDebugRendererInfo to remove a potential data leak while preventing potential website breakage. ungoogled-chromium flag.", + kOsAll, FEATURE_VALUE_TYPE(blink::features::kSpoofWebGLInfo)}, ++ {"enforce-certificate-transparency", ++ "Enforce Certificate Transparency", ++ "Enforce Certificate Transparency for certificates that sites present. This is enabled by default. ungoogled-chromium flag.", ++ kOsAll, FEATURE_VALUE_TYPE(features::kCertificateTransparencyAskBeforeEnabling)}, + #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ diff --git a/patches/series b/patches/series index b4ab9b23..dc0f4ec7 100644 --- a/patches/series +++ b/patches/series @@ -110,3 +110,4 @@ extra/ungoogled-chromium/enable-extra-locales.patch extra/ungoogled-chromium/disable-chromelabs.patch extra/ungoogled-chromium/remove-pac-size-limit.patch extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch +extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch From 40c3cf48b8e5685d316e07cbd3d5c65b4968cbda Mon Sep 17 00:00:00 2001 From: Blaise Date: Tue, 11 Mar 2025 14:29:58 -0500 Subject: [PATCH 04/11] Add other options for SpoofWebGLInfo flag Co-authored-by: MVDW --- ...dd-flag-to-spoof-webgl-renderer-info.patch | 70 ++++++++++++++++--- ...ertificate-transparency-and-add-flag.patch | 10 +-- patches/series | 2 +- 3 files changed, 67 insertions(+), 15 deletions(-) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch index 74ca852c..9e0dc1d6 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch @@ -1,34 +1,86 @@ # Return generic values for WebGLDebugRendererInfo to remove a potential data # leak while preventing potential website breakage +--- a/chrome/browser/ungoogled_flag_choices.h ++++ b/chrome/browser/ungoogled_flag_choices.h +@@ -79,4 +79,41 @@ const FeatureEntry::Choice kTabHoverCard + "tab-hover-cards", + "tooltip"}, + }; ++const FeatureEntry::FeatureParam kSpoofWebGL_Blank[] = { ++ {blink::features::kSpoofWebGLRenderer, " "}, ++ {blink::features::kSpoofWebGLVendor, " "}, ++}; ++const FeatureEntry::FeatureParam kSpoofWebGL_Amd[] = { ++ {blink::features::kSpoofWebGLRenderer, "Radeon R9 200 Series, or similar"}, ++ {blink::features::kSpoofWebGLVendor, "AMD"}, ++}; ++const FeatureEntry::FeatureParam kSpoofWebGL_Apple[] = { ++ {blink::features::kSpoofWebGLRenderer, "Apple GPU"}, ++ {blink::features::kSpoofWebGLVendor, "Apple Inc."}, ++}; ++const FeatureEntry::FeatureParam kSpoofWebGL_Intel[] = { ++ {blink::features::kSpoofWebGLRenderer, "Intel(R) HD Graphics, or similar"}, ++ {blink::features::kSpoofWebGLVendor, "Intel"}, ++}; ++const FeatureEntry::FeatureParam kSpoofWebGL_Mesa[] = { ++ {blink::features::kSpoofWebGLRenderer, "llvmpipe"}, ++ {blink::features::kSpoofWebGLVendor, "Mesa"}, ++}; ++const FeatureEntry::FeatureParam kSpoofWebGL_Nvidia[] = { ++ {blink::features::kSpoofWebGLRenderer, "NVIDIA GeForce GTX 980, or similar"}, ++ {blink::features::kSpoofWebGLVendor, "NVIDIA Corporation"}, ++}; ++const FeatureEntry::FeatureParam kSpoofWebGL_Qualcomm[] = { ++ {blink::features::kSpoofWebGLRenderer, "Adreno (TM) 610"}, ++ {blink::features::kSpoofWebGLVendor, "Qualcomm"}, ++}; ++const FeatureEntry::FeatureVariation kSpoofWebGLChoices[] = { ++ {"Blank", kSpoofWebGL_Blank, std::size(kSpoofWebGL_Blank), nullptr}, ++ {"AMD Radeon R9 200", kSpoofWebGL_Amd, std::size(kSpoofWebGL_Amd), nullptr}, ++ {"Apple", kSpoofWebGL_Apple, std::size(kSpoofWebGL_Apple), nullptr}, ++ {"Intel", kSpoofWebGL_Intel, std::size(kSpoofWebGL_Intel), nullptr}, ++ {"Mesa LLVMpipe", kSpoofWebGL_Mesa, std::size(kSpoofWebGL_Mesa), nullptr}, ++ {"NVIDIA GeForce GTX 980", kSpoofWebGL_Nvidia, std::size(kSpoofWebGL_Nvidia), nullptr}, ++ {"Qualcomm Adreno 610", kSpoofWebGL_Qualcomm, std::size(kSpoofWebGL_Qualcomm), nullptr}, ++}; + #endif // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_ --- a/chrome/browser/ungoogled_flag_entries.h +++ b/chrome/browser/ungoogled_flag_entries.h -@@ -136,4 +136,8 @@ - "Remove Client Hints", - "Removes client hints (information sent to servers about your system, similar to a user agent). ungoogled-chromium flag.", - kOsAll, FEATURE_VALUE_TYPE(blink::features::kRemoveClientHints)}, +@@ -140,4 +140,8 @@ + "Enforce Certificate Transparency", + "Enforce Certificate Transparency for certificates that sites present. This is enabled by default. ungoogled-chromium flag.", + kOsAll, FEATURE_VALUE_TYPE(features::kCertificateTransparencyAskBeforeEnabling)}, + {"spoof-webgl-info", + "Spoof WebGL Info", + "Return generic values for WebGLDebugRendererInfo to remove a potential data leak while preventing potential website breakage. ungoogled-chromium flag.", -+ kOsAll, FEATURE_VALUE_TYPE(blink::features::kSpoofWebGLInfo)}, ++ kOsAll, FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kSpoofWebGLInfo, kSpoofWebGLChoices, "SpoofWebGLInfo")}, #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -23,6 +23,7 @@ namespace blink::features { +@@ -23,6 +23,11 @@ namespace blink::features { BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kRemoveClientHints, "RemoveClientHints", base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kSpoofWebGLInfo, "SpoofWebGLInfo", base::FEATURE_DISABLED_BY_DEFAULT); ++const char kSpoofWebGLRenderer[] = "renderer"; ++const char kSpoofWebGLVendor[] = "vendor"; ++const base::FeatureParam kSpoofWebGLRendererParam{&kSpoofWebGLInfo, kSpoofWebGLRenderer, " "}; ++const base::FeatureParam kSpoofWebGLVendorParam{&kSpoofWebGLInfo, kSpoofWebGLVendor, " "}; // ----------------------------------------------------------------------------- // Feature definitions and associated constants (feature params, et cetera) --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h -@@ -23,6 +23,7 @@ namespace features { +@@ -23,6 +23,11 @@ namespace features { BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableLinkDrag); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kReducedSystemInfo); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kRemoveClientHints); +BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kSpoofWebGLInfo); ++extern const char kSpoofWebGLRenderer[]; ++extern const char kSpoofWebGLVendor[]; ++extern const base::FeatureParam kSpoofWebGLRendererParam; ++extern const base::FeatureParam kSpoofWebGLVendorParam; // ----------------------------------------------------------------------------- // Feature declarations and associated constants (feature params, et cetera) @@ -39,7 +91,7 @@ String(ContextGL()->GetString(GL_RENDERER)))); } + if (base::FeatureList::IsEnabled(blink::features::kSpoofWebGLInfo)) -+ return WebGLAny(script_state, String("ANGLE (Google, Vulkan 1.3.0 (SwiftShader Device (Subzero) (0x0000C0DE)), SwiftShader driver-5.0.0)")); ++ return WebGLAny(script_state, String(blink::features::kSpoofWebGLRendererParam.Get())); return WebGLAny(script_state, String(ContextGL()->GetString(GL_RENDERER))); } @@ -48,7 +100,7 @@ String(ContextGL()->GetString(GL_VENDOR)))); } + if (base::FeatureList::IsEnabled(blink::features::kSpoofWebGLInfo)) -+ return WebGLAny(script_state, String("Google Inc. (Google)")); ++ return WebGLAny(script_state, String(blink::features::kSpoofWebGLVendorParam.Get())); return WebGLAny(script_state, String(ContextGL()->GetString(GL_VENDOR))); } diff --git a/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch b/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch index 26409ebd..6730dc31 100644 --- a/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch +++ b/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/browser_features.cc +++ b/chrome/browser/browser_features.cc -@@ -50,7 +50,7 @@ BASE_FEATURE(kBookmarkTriggerForPrerender2, +@@ -50,7 +50,7 @@ BASE_FEATURE(kBookmarkTriggerForPrerende // switch. BASE_FEATURE(kCertificateTransparencyAskBeforeEnabling, "CertificateTransparencyAskBeforeEnabling", @@ -11,10 +11,10 @@ base::FEATURE_DISABLED_BY_DEFAULT); --- a/chrome/browser/ungoogled_flag_entries.h +++ b/chrome/browser/ungoogled_flag_entries.h -@@ -140,4 +140,8 @@ - "Spoof WebGL Info", - "Return generic values for WebGLDebugRendererInfo to remove a potential data leak while preventing potential website breakage. ungoogled-chromium flag.", - kOsAll, FEATURE_VALUE_TYPE(blink::features::kSpoofWebGLInfo)}, +@@ -136,4 +136,8 @@ + "Remove Client Hints", + "Removes client hints (information sent to servers about your system, similar to a user agent). ungoogled-chromium flag.", + kOsAll, FEATURE_VALUE_TYPE(blink::features::kRemoveClientHints)}, + {"enforce-certificate-transparency", + "Enforce Certificate Transparency", + "Enforce Certificate Transparency for certificates that sites present. This is enabled by default. ungoogled-chromium flag.", diff --git a/patches/series b/patches/series index dc0f4ec7..4092894e 100644 --- a/patches/series +++ b/patches/series @@ -109,5 +109,5 @@ extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch extra/ungoogled-chromium/enable-extra-locales.patch extra/ungoogled-chromium/disable-chromelabs.patch extra/ungoogled-chromium/remove-pac-size-limit.patch -extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch +extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch From 2df1bec2b4c140381f42ecae2acc5eaebcf28f92 Mon Sep 17 00:00:00 2001 From: Albert Tang Date: Tue, 25 Mar 2025 13:07:27 -0500 Subject: [PATCH 05/11] Windows-specific improvements (ARM64 and Python) (#3255) --- utils/clone.py | 2 +- utils/depot_tools.patch | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/utils/clone.py b/utils/clone.py index 92082064..75197928 100755 --- a/utils/clone.py +++ b/utils/clone.py @@ -268,7 +268,7 @@ def main(): parser.add_argument('-p', '--pgo', default='linux', - choices=('linux', 'mac', 'mac-arm', 'win32', 'win64'), + choices=('linux', 'mac', 'mac-arm', 'win32', 'win64', 'win-arm64'), help='Specifiy which pgo profile to download. Default: %(default)s') parser.add_argument('-s', '--sysroot', diff --git a/utils/depot_tools.patch b/utils/depot_tools.patch index f03cfae7..7b7b1638 100644 --- a/utils/depot_tools.patch +++ b/utils/depot_tools.patch @@ -115,3 +115,11 @@ # Google OAuth Context required by gsutil. LUCI_AUTH_SCOPES = [ +--- a/gclient.bat ++++ b/gclient.bat +@@ -20,4 +20,4 @@ IF %ERRORLEVEL% NEQ 0 ( + set PATH=%PATH%;%~dp0 + + :: Defer control. +-call vpython3 "%~dp0gclient.py" %* ++call python3 "%~dp0gclient.py" %* From 416108b67dd5b3ce68243e5ccf357296e7ba956f Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 25 Mar 2025 23:25:14 +0100 Subject: [PATCH 06/11] Update to Chromium 134.0.6998.177 --- chromium_version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium_version.txt b/chromium_version.txt index 391628c8..864e5b83 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -134.0.6998.165 +134.0.6998.177 From c46cb88710103915c9fdcb26b968fb81dfda9ca4 Mon Sep 17 00:00:00 2001 From: Blaise Date: Tue, 25 Mar 2025 18:37:15 -0500 Subject: [PATCH 07/11] Update to Chromium 135.0.7049.41 --- chromium_version.txt | 2 +- domain_substitution.list | 1243 +++++++---- ...01-fix-building-without-safebrowsing.patch | 249 +-- ...03-disable-autofill-download-manager.patch | 2 +- .../0005-disable-default-extensions.patch | 6 +- .../core/inox-patchset/0021-disable-rlz.patch | 2 +- ...refixes-to-possibly-evil-connections.patch | 10 +- ..._browsing-disable-incident-reporting.patch | 2 +- ...sable-reporting-of-safebrowsing-over.patch | 4 +- .../ungoogled-chromium/block-requests.patch | 4 +- .../block-trk-and-subdomains.patch | 8 +- .../disable-crash-reporter.patch | 4 +- .../ungoogled-chromium/disable-gaia.patch | 2 +- .../disable-google-host-detection.patch | 4 +- .../disable-privacy-sandbox.patch | 33 +- .../disable-webrtc-log-uploader.patch | 6 +- .../extensions-manifestv2.patch | 22 +- .../fix-building-with-prunned-binaries.patch | 154 +- .../fix-building-without-safebrowsing.patch | 1559 ++----------- .../remove-unused-preferences-fields.patch | 589 ++--- ...e-google-search-engine-with-nosearch.patch | 2 +- .../toggle-translation-via-switch.patch | 4 +- ...g-flags-client-rects-and-measuretext.patch | 64 +- ...ngerprinting-canvas-image-data-noise.patch | 21 +- .../flag-max-connections-per-host.patch | 12 +- .../0006-modify-default-prefs.patch | 14 +- .../0016-chromium-sandbox-pie.patch | 2 +- ...ble-profile-auto-import-on-first-run.patch | 2 +- ...mpt-for-download-directory-by-defaul.patch | 2 +- .../add-flag-for-close-confirmation.patch | 8 +- .../add-flag-for-custom-ntp.patch | 10 +- .../add-flag-for-disabling-link-drag.patch | 22 +- .../add-flag-for-grab-handle.patch | 2 +- .../add-flag-for-incognito-themes.patch | 6 +- ...g-for-omnibox-autocomplete-filtering.patch | 2 +- ...dd-flag-for-search-engine-collection.patch | 26 +- .../add-flag-for-tab-hover-cards.patch | 4 +- .../add-flag-for-tabsearch-button.patch | 4 +- ...dd-flag-to-change-http-accept-header.patch | 8 +- .../add-flag-to-clear-data-on-exit.patch | 4 +- ...d-flag-to-close-window-with-last-tab.patch | 4 +- ...g-to-configure-extension-downloading.patch | 2 +- .../add-flag-to-convert-popups-to-tabs.patch | 2 +- ...-to-disable-local-history-expiration.patch | 4 +- .../add-flag-to-hide-fullscreen-exit-ui.patch | 2 +- .../add-flag-to-hide-tab-close-buttons.patch | 4 +- .../add-flag-to-reduce-system-info.patch | 8 +- .../add-flag-to-remove-client-hints.patch | 14 +- .../add-flag-to-show-avatar-button.patch | 2 +- ...dd-flag-to-spoof-webgl-renderer-info.patch | 6 +- .../add-flags-for-existing-switches.patch | 2 +- ...add-flags-for-referrer-customization.patch | 16 +- .../add-ipv6-probing-option.patch | 2 +- .../add-suggestions-url-field.patch | 20 +- .../add-ungoogled-flag-headers.patch | 2 +- .../disable-capture-all-screens.patch | 4 +- .../disable-download-quarantine.patch | 4 +- ...ertificate-transparency-and-add-flag.patch | 2 +- ...ble-default-prefetch-privacy-changes.patch | 2 +- .../enable-page-saving-on-more-pages.patch | 2 +- .../enable-paste-and-go-new-tab-button.patch | 6 +- .../ungoogled-chromium/first-run-page.patch | 6 +- .../keep-expired-flags.patch | 34 +- .../remove-uneeded-ui.patch | 68 +- patches/series | 1 - .../fix-building-without-safe-browsing.patch | 29 - .../upstream-fixes/missing-dependencies.patch | 27 +- pruning.list | 1942 +---------------- utils/clone.py | 2 +- utils/depot_tools.patch | 27 +- 70 files changed, 1760 insertions(+), 4610 deletions(-) delete mode 100644 patches/upstream-fixes/fix-building-without-safe-browsing.patch diff --git a/chromium_version.txt b/chromium_version.txt index 864e5b83..37d5e840 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -134.0.6998.177 +135.0.7049.41 diff --git a/domain_substitution.list b/domain_substitution.list index a7ab38f3..ec04c6fa 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -152,7 +152,6 @@ ash/system/video_conference/video_conference_tray_unittest.cc ash/wallpaper/test_wallpaper_controller_client.cc ash/wallpaper/wallpaper_image_downloader.cc ash/webui/boca_ui/boca_app_page_handler_unittest.cc -ash/webui/boca_ui/boca_ui.cc ash/webui/boca_ui/provider/classroom_page_handler_impl.cc ash/webui/boca_ui/webview_auth_handler_unittest.cc ash/webui/camera_app_ui/camera_app_untrusted_ui.cc @@ -213,7 +212,7 @@ ash/webui/projector_app/test/projector_oauth_token_fetcher_unittest.cc ash/webui/projector_app/test/projector_xhr_sender_unittest.cc ash/webui/projector_app/test/untrusted_projector_page_handler_impl_unittest.cc ash/webui/projector_app/untrusted_projector_ui.cc -ash/webui/recorder_app_ui/resources/components/onboarding-dialog.ts +ash/webui/recorder_app_ui/resources/components/unescapable-dialog.ts ash/webui/recorder_app_ui/resources/core/externs.d.ts ash/webui/recorder_app_ui/resources/core/platform_handler.ts ash/webui/recorder_app_ui/resources/core/recording_session.ts @@ -241,6 +240,7 @@ base/BUILD.gn base/PRESUBMIT.py base/allocator/partition_alloc_support.cc base/allocator/partition_allocator/PRESUBMIT.py +base/allocator/partition_allocator/src/partition_alloc/BUILD.gn base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h base/allocator/partition_allocator/src/partition_alloc/build_config.h base/allocator/partition_allocator/src/partition_alloc/in_slot_metadata.h @@ -501,6 +501,7 @@ cc/metrics/average_lag_tracker.h cc/metrics/ukm_smoothness_data.h cc/paint/paint_image.h cc/raster/one_copy_raster_buffer_provider.cc +cc/scheduler/scheduler_state_machine.cc cc/tiles/gpu_image_decode_cache.h cc/trees/layer_tree_host_impl.cc cc/trees/layer_tree_host_unittest_animation.cc @@ -511,6 +512,7 @@ chrome/app/PRESUBMIT.py chrome/app/app_management_strings.grdp chrome/app/chrome_command_ids.h chrome/app/chrome_main.cc +chrome/app/chrome_main_delegate.cc chrome/app/chromeos_strings.grdp chrome/app/chromium_strings.grd chrome/app/delay_load_failure_hook_win.cc @@ -578,7 +580,6 @@ chrome/browser/apps/app_service/publishers/arc_apps_unittest.cc chrome/browser/apps/app_service/publishers/publisher_unittest.cc chrome/browser/apps/app_service/web_contents_app_id_utils.h chrome/browser/apps/app_service/webapk/webapk_install_task.cc -chrome/browser/apps/digital_goods/digital_goods_ash.cc chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc chrome/browser/apps/guest_view/web_view_browsertest.cc chrome/browser/apps/intent_helper/intent_chip_display_prefs_unittest.cc @@ -658,7 +659,7 @@ chrome/browser/ash/attestation/tpm_challenge_key_subtle_unittest.cc chrome/browser/ash/bluetooth/bluetooth_log_controller_unittest.cc chrome/browser/ash/bluetooth/debug_logs_manager_unittest.cc chrome/browser/ash/boca/on_task/on_task_locked_session_navigation_throttle.cc -chrome/browser/ash/boca/on_task/on_task_locked_session_navigation_throttle_browsertest.cc +chrome/browser/ash/boca/on_task/on_task_locked_session_navigation_throttle_interactive_ui_test.cc chrome/browser/ash/boca/on_task/on_task_locked_session_window_tracker_browsertest.cc chrome/browser/ash/boca/spotlight/spotlight_crd_manager_impl_unittest.cc chrome/browser/ash/bruschetta/bruschetta_download.cc @@ -669,7 +670,6 @@ chrome/browser/ash/calendar/calendar_keyed_service_unittest.cc chrome/browser/ash/cert_provisioning/cert_provisioning_test_helpers.cc chrome/browser/ash/certs/system_token_cert_db_initializer.h chrome/browser/ash/child_accounts/constants/child_account_constants.h -chrome/browser/ash/child_accounts/family_user_device_metrics_browsertest.cc chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc chrome/browser/ash/child_accounts/time_limits/app_time_limit_utils_unittest.cc chrome/browser/ash/child_accounts/website_approval_notifier_unittest.cc @@ -717,6 +717,7 @@ chrome/browser/ash/input_method/ime_service_connector.cc chrome/browser/ash/integration_tests/featured_integration_test.cc chrome/browser/ash/kerberos/kerberos_credentials_manager_unittest.cc chrome/browser/ash/lobster/lobster_feedback_unittest.cc +chrome/browser/ash/lobster/lobster_system_state_provider_impl_unittest.cc chrome/browser/ash/login/app_mode/kiosk_launch_controller_unittest.cc chrome/browser/ash/login/app_mode/test/kiosk_enterprise_browsertest.cc chrome/browser/ash/login/ash_hud_login_browsertest.cc @@ -833,9 +834,10 @@ chrome/browser/ash/system_web_apps/apps/personalization_app/personalization_app_ chrome/browser/ash/system_web_apps/apps/personalization_app/personalization_app_utils_unittest.cc chrome/browser/ash/tpm/tpm_firmware_update.h chrome/browser/ash/u2f/u2f_notification.cc +chrome/browser/ash/wallpaper_handlers/google_photos_wallpaper_handlers.cc +chrome/browser/ash/wallpaper_handlers/google_photos_wallpaper_handlers_unittest.cc chrome/browser/ash/wallpaper_handlers/sea_pen_fetcher.cc chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc -chrome/browser/ash/wallpaper_handlers/wallpaper_handlers_unittest.cc chrome/browser/autocomplete/autocomplete_browsertest.cc chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier_unittest.cc @@ -850,7 +852,6 @@ chrome/browser/autofill/automated_tests/cache_replayer.cc chrome/browser/autofill/automated_tests/cache_replayer.h chrome/browser/autofill/automated_tests/cache_replayer_unittest.cc chrome/browser/autofill/captured_sites_test_utils.cc -chrome/browser/autofill_ai/autofill_ai_browsertest.cc chrome/browser/autofill_ai/chrome_autofill_ai_client_unittest.cc chrome/browser/background/background_contents_service.cc chrome/browser/background_sync/periodic_background_sync_permission_context.cc @@ -878,6 +879,8 @@ chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc chrome/browser/browsing_data/counters/site_settings_counter_unittest.cc chrome/browser/browsing_topics/browsing_topics_service_browsertest.cc chrome/browser/browsing_topics/browsing_topics_service_factory.cc +chrome/browser/btm/btm_browser_signin_detector.cc +chrome/browser/btm/btm_browser_signin_detector_unittest.cc chrome/browser/chrome_browser_application_mac.mm chrome/browser/chrome_browser_main_win.cc chrome/browser/chrome_browser_main_win_unittest.cc @@ -919,6 +922,7 @@ chrome/browser/content_settings/content_settings_origin_value_map_unittest.cc chrome/browser/content_settings/content_settings_policy_provider_unittest.cc chrome/browser/content_settings/content_settings_pref_provider_unittest.cc chrome/browser/content_settings/host_content_settings_map_unittest.cc +chrome/browser/content_settings/javascript_optimizer_provider_android_unittest.cc chrome/browser/content_settings/sound_content_setting_observer_unittest.cc chrome/browser/contextual_cueing/contextual_cueing_helper_interactive_uitest.cc chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc @@ -932,12 +936,11 @@ chrome/browser/devtools/device/adb/mock_adb_server.cc chrome/browser/devtools/devtools_browsertest.cc chrome/browser/devtools/devtools_ui_bindings.cc chrome/browser/devtools/devtools_ui_bindings_unittest.cc +chrome/browser/devtools/features.cc chrome/browser/devtools/process_sharing_infobar_delegate.cc chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc chrome/browser/devtools/protocol/devtools_pwa_browsertest.cc chrome/browser/devtools/url_constants.cc -chrome/browser/dips/dips_browser_signin_detector.cc -chrome/browser/dips/dips_browser_signin_detector_unittest.cc chrome/browser/download/chrome_download_manager_delegate_unittest.cc chrome/browser/download/download_browsertest.cc chrome/browser/download/insecure_download_blocking.cc @@ -950,6 +953,7 @@ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_unittest chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate_unittest.cc chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate_unittest.cc +chrome/browser/enterprise/connectors/analysis/page_print_request_handler_unittest.cc chrome/browser/enterprise/connectors/device_trust/attestation/ash/ash_attestation_cleanup_manager_unittest.cc chrome/browser/enterprise/connectors/device_trust/attestation/ash/ash_attestation_service_impl_unittest.cc chrome/browser/enterprise/connectors/device_trust/attestation/browser/google_keys.cc @@ -962,6 +966,7 @@ chrome/browser/enterprise/connectors/device_trust/signals/decorators/ash/ash_sig chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator_unittest.cc chrome/browser/enterprise/connectors/device_trust/test/test_constants.cc chrome/browser/enterprise/connectors/reporting/extension_telemetry_event_router_unittest.cc +chrome/browser/enterprise/connectors/reporting/reporting_event_router_unittest.cc chrome/browser/enterprise/connectors/test/deep_scanning_test_utils.cc chrome/browser/enterprise/data_controls/chrome_rules_service_unittest.cc chrome/browser/enterprise/data_controls/reporting_service_unittest.cc @@ -990,7 +995,6 @@ chrome/browser/extensions/activity_log/counting_policy_unittest.cc chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_unittest.cc -chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc chrome/browser/extensions/api/content_settings/content_settings_apitest.cc @@ -1029,6 +1033,7 @@ chrome/browser/extensions/api/page_capture/page_capture_api_unittest.cc chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc chrome/browser/extensions/api/passwords_private/passwords_private_utils_unittest.cc +chrome/browser/extensions/api/permissions/permissions_api_helpers.cc chrome/browser/extensions/api/permissions/permissions_api_unittest.cc chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc chrome/browser/extensions/api/printing/printing_api_utils.h @@ -1049,6 +1054,7 @@ chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc chrome/browser/extensions/api/webstore_private/extension_install_status_unittest.cc chrome/browser/extensions/background_xhr_browsertest.cc +chrome/browser/extensions/bookmarks/bookmarks_helpers_unittest.cc chrome/browser/extensions/chrome_extension_function_details.cc chrome/browser/extensions/component_extensions_allowlist/allowlist.h chrome/browser/extensions/content_script_apitest.cc @@ -1088,7 +1094,6 @@ chrome/browser/extensions/orb_and_cors_extension_browsertest.cc chrome/browser/extensions/permission_message_combinations_unittest.cc chrome/browser/extensions/permissions/active_tab_apitest.cc chrome/browser/extensions/permissions/active_tab_unittest.cc -chrome/browser/extensions/permissions/permissions_helpers.cc chrome/browser/extensions/permissions/permissions_updater.cc chrome/browser/extensions/permissions/permissions_updater_unittest.cc chrome/browser/extensions/permissions/scripting_permissions_modifier.h @@ -1123,15 +1128,12 @@ chrome/browser/flag-metadata.json chrome/browser/flag_descriptions.cc chrome/browser/flags/android/chrome_session_state.h chrome/browser/font_prewarmer_tab_helper_browsertest.cc -chrome/browser/glic/border_view_interactive_uitest.cc chrome/browser/glic/glic_cookie_synchronizer.cc chrome/browser/glic/glic_cookie_synchronizer_unittest.cc chrome/browser/glic/glic_fre_page_handler.cc +chrome/browser/glic/glic_metrics_unittest.cc chrome/browser/glic/glic_page_handler.cc -chrome/browser/glic/glic_policy_browsertest.cc -chrome/browser/glic/glic_window_resize_animation_browsertest.cc -chrome/browser/glic/guest_util_browsertest.cc -chrome/browser/glic/interactive_glic_test.h +chrome/browser/glic/glic_ui.cc chrome/browser/google/google_update_win.cc chrome/browser/guest_view/web_view/context_menu_content_type_web_view.cc chrome/browser/hid/chrome_hid_delegate_unittest.cc @@ -1300,6 +1302,7 @@ chrome/browser/password_manager/android/password_checkup_launcher_helper.h chrome/browser/password_manager/android/password_checkup_launcher_helper_impl.h chrome/browser/password_manager/android/password_manager_android_util_unittest.cc chrome/browser/password_manager/android/password_manager_settings_service_android_impl_unittest.cc +chrome/browser/password_manager/android/password_manager_settings_service_android_migration_impl_unittest.cc chrome/browser/password_manager/android/password_settings_updater_android_bridge_helper_impl_unittest.cc chrome/browser/password_manager/android/password_store_android_account_backend_unittest.cc chrome/browser/password_manager/android/password_store_android_backend_bridge_helper_impl_unittest.cc @@ -1371,6 +1374,7 @@ chrome/browser/preloading/preview/preview_navigation_throttle.h chrome/browser/preloading/preview/preview_zoom_controller.h chrome/browser/printing/print_preview_dialog_controller_unittest.cc chrome/browser/privacy/secure_dns_bridge.cc +chrome/browser/privacy_sandbox/PRESUBMIT.py chrome/browser/privacy_sandbox/privacy_sandbox_activity_types_service.h chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc chrome/browser/privacy_sandbox/privacy_sandbox_service_impl_unittest.cc @@ -1466,9 +1470,12 @@ chrome/browser/resources/chromeos/accessibility/common/paragraph_utils_unittest. chrome/browser/resources/chromeos/accessibility/common/testing/mock_tts.js chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js chrome/browser/resources/chromeos/accessibility/definitions/command_line_private.d.ts -chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.ts -chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_navigation_control_test.js -chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_unittest.js +chrome/browser/resources/chromeos/accessibility/select_to_speak/mv2/select_to_speak.ts +chrome/browser/resources/chromeos/accessibility/select_to_speak/mv2/select_to_speak_navigation_control_test.js +chrome/browser/resources/chromeos/accessibility/select_to_speak/mv2/select_to_speak_unittest.js +chrome/browser/resources/chromeos/accessibility/select_to_speak/mv3/select_to_speak.ts +chrome/browser/resources/chromeos/accessibility/select_to_speak/mv3/select_to_speak_navigation_control_test.js +chrome/browser/resources/chromeos/accessibility/select_to_speak/mv3/select_to_speak_unittest.js chrome/browser/resources/chromeos/accessibility/select_to_speak_manifest.json.jinja2 chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp chrome/browser/resources/chromeos/accessibility/switch_access/mv2/item_scan_manager_test.js @@ -1516,8 +1523,8 @@ chrome/browser/resources/gaia_auth_host/authenticator.js chrome/browser/resources/gaia_auth_host/password_change_authenticator.js chrome/browser/resources/gaia_auth_host/saml_handler.js chrome/browser/resources/gaia_auth_host/saml_password_attributes.js -chrome/browser/resources/glic/glic_api/glic_api.ts -chrome/browser/resources/glic/glic_app_controller.ts +chrome/browser/resources/glic/url_pattern.d.ts +chrome/browser/resources/glic/webview.ts chrome/browser/resources/hangout_services/manifest_v2.json chrome/browser/resources/hangout_services/manifest_v3.json chrome/browser/resources/inspect/inspect.html @@ -1556,7 +1563,6 @@ chrome/browser/resources/settings/a11y_page/captions_subpage.ts chrome/browser/resources/settings/about_page/about_page.html chrome/browser/resources/settings/about_page/about_page.ts chrome/browser/resources/settings/appearance_page/appearance_page.ts -chrome/browser/resources/settings/autofill_page/payments_section.ts chrome/browser/resources/settings/icons.html chrome/browser/resources/settings/incompatible_applications_page/incompatible_application_item.ts chrome/browser/resources/settings/languages_page/edit_dictionary_page.ts @@ -1589,6 +1595,7 @@ chrome/browser/safe_browsing/download_protection/check_client_download_request_b chrome/browser/safe_browsing/download_protection/deep_scanning_browsertest.cc chrome/browser/safe_browsing/download_protection/deep_scanning_request_unittest.cc chrome/browser/safe_browsing/download_protection/download_feedback.cc +chrome/browser/safe_browsing/download_protection/download_protection_delegate_desktop.cc chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service_browsertest.cc @@ -1619,7 +1626,6 @@ chrome/browser/serial/chrome_serial_browsertest.cc chrome/browser/serial/serial_chooser_context_unittest.cc chrome/browser/serial/serial_policy_allowed_ports_unittest.cc chrome/browser/sessions/app_session_service_unittest.cc -chrome/browser/sessions/better_session_restore_browsertest.cc chrome/browser/sessions/session_restore_browsertest.cc chrome/browser/sessions/session_restore_observer_unittest.cc chrome/browser/sessions/session_service.h @@ -1634,7 +1640,6 @@ chrome/browser/sharing_hub/sharing_hub_model_unittest.cc chrome/browser/shell_integration_linux_unittest.cc chrome/browser/signin/account_id_from_account_info_unittest.cc chrome/browser/signin/accounts_policy_manager_unittest.cc -chrome/browser/signin/android/web_signin_bridge_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_cookie_observer_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_cookie_refresh_service_impl_browsertest.cc @@ -1686,14 +1691,14 @@ chrome/browser/ssl/typed_navigation_upgrade_throttle_browsertest.cc chrome/browser/startup_data.h chrome/browser/storage/durable_storage_permission_context_unittest.cc chrome/browser/storage/shared_storage_browsertest.cc -chrome/browser/storage_access_api/api_browsertest.cc chrome/browser/storage_access_api/storage_access_header_service_browsertest.cc chrome/browser/subresource_filter/subresource_filter_browsertest.cc chrome/browser/subresource_filter/subresource_filter_fenced_frame_browsertest.cc chrome/browser/supervised_user/android/java/res/drawable/ic_family_link.xml chrome/browser/supervised_user/android/supervised_user_settings_test_bridge.cc chrome/browser/supervised_user/kids_profile_interactive_uitest.cc -chrome/browser/supervised_user/linux_mac_windows/parent_access_dialog_web_contents_observer_browsertest.cc +chrome/browser/supervised_user/linux_mac_windows/parent_access_dialog_result_observer_browsertest.cc +chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl_browsertest.cc chrome/browser/supervised_user/supervised_user_browser_utils.cc chrome/browser/supervised_user/supervised_user_browser_utils_unittest.cc chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc @@ -1793,7 +1798,6 @@ chrome/browser/ui/ash/wallpaper/wallpaper_controller_client_impl.cc chrome/browser/ui/ash/web_view/ash_web_view_impl_browsertest.cc chrome/browser/ui/ash/wm/coral_browsertest.cc chrome/browser/ui/autofill/address_editor_controller_unittest.cc -chrome/browser/ui/autofill/autofill_signin_promo_tab_helper_browsertest.cc chrome/browser/ui/autofill/delete_address_profile_dialog_controller_impl_unittest.cc chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl_unittest.cc chrome/browser/ui/autofill/payments/offer_notification_controller_android_browsertest.cc @@ -1871,12 +1875,14 @@ chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_brows chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_unittest.cc chrome/browser/ui/plus_addresses/plus_address_menu_model_unittest.cc chrome/browser/ui/profiles/profile_picker_unittest.cc +chrome/browser/ui/safety_hub/disruptive_notification_permissions_manager_unittest.cc chrome/browser/ui/safety_hub/notification_permission_review_service_unittest.cc chrome/browser/ui/safety_hub/password_status_check_service_unittest.cc chrome/browser/ui/search/ntp_user_data_logger_unittest.cc chrome/browser/ui/search/search_tab_helper.h chrome/browser/ui/search/third_party_ntp_browsertest.cc chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice_browsertest.cc +chrome/browser/ui/signin/promos/signin_promo_tab_helper_browsertest.cc chrome/browser/ui/signin/signin_view_controller.cc chrome/browser/ui/signin/signin_view_controller_browsertest.cc chrome/browser/ui/signin/signin_view_controller_interactive_uitest.cc @@ -1890,7 +1896,7 @@ chrome/browser/ui/startup/startup_tab_provider_unittest.cc chrome/browser/ui/tab_helpers.cc chrome/browser/ui/tab_helpers.h chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate_unittest.cc -chrome/browser/ui/tabs/pinned_tab_codec_unittest.cc +chrome/browser/ui/tabs/pinned_tab_codec_browsertest.cc chrome/browser/ui/tabs/pinned_tab_service_browsertest.cc chrome/browser/ui/tabs/pinned_tab_service_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data_unittest.cc @@ -1901,7 +1907,6 @@ chrome/browser/ui/test/popup_browsertest.cc chrome/browser/ui/toolbar/app_menu_model_interactive_uitest.cc chrome/browser/ui/toolbar/cast/cast_contextual_menu.cc chrome/browser/ui/toolbar/location_bar_model_unittest.cc -chrome/browser/ui/ui_features.cc chrome/browser/ui/url_identity_unittest.cc chrome/browser/ui/views/accelerator_table.cc chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc @@ -1932,9 +1937,7 @@ chrome/browser/ui/views/download/bubble/download_bubble_contents_view_unittest.c chrome/browser/ui/views/download/bubble/download_bubble_security_view_unittest.cc chrome/browser/ui/views/download/bubble/download_toolbar_button_view_unittest.cc chrome/browser/ui/views/extensions/device_chooser_extension_browsertest.cc -chrome/browser/ui/views/extensions/dialogs/upload_extension_to_account_dialog_browsertest.cc chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc -chrome/browser/ui/views/extensions/extension_installed_bubble_view_signin_browsertest.cc chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc chrome/browser/ui/views/extensions/web_file_handlers/web_file_handlers_file_launch_dialog.cc chrome/browser/ui/views/file_system_access/file_system_access_usage_bubble_view_browsertest.cc @@ -1952,7 +1955,6 @@ chrome/browser/ui/views/omnibox/omnibox_view_views.h chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc chrome/browser/ui/views/overlay/video_overlay_window_views_unittest.cc -chrome/browser/ui/views/page_action/pwa_install.cc chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator.cc chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator_browsertest.cc chrome/browser/ui/views/page_info/merchant_trust_side_panel_coordinator.cc @@ -1978,6 +1980,7 @@ chrome/browser/ui/views/profiles/profile_picker_ui_browsertest.cc chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc chrome/browser/ui/views/profiles/profiles_pixel_test_utils.cc chrome/browser/ui/views/profiles/sync_confirmation_ui_browsertest.cc +chrome/browser/ui/views/promos/ios_promo_constants.h chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble_unittest.cc chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension_browsertest.cc chrome/browser/ui/views/session_crashed_bubble_view.cc @@ -1987,17 +1990,14 @@ chrome/browser/ui/views/sharing_hub/preview_view_unittest.cc chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_view_impl_unittest.cc chrome/browser/ui/views/site_data/page_specific_site_data_dialog_unittest.cc chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc -chrome/browser/ui/views/tabs/collaboration_messaging_page_action_icon_view_interactive_uitest.cc chrome/browser/ui/views/tabs/recent_activity_bubble_dialog_view_browsertest.cc chrome/browser/ui/views/tabs/recent_activity_bubble_dialog_view_interactive_uitest.cc chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc -chrome/browser/ui/views/tabs/tab_strip_action_container_browsertest.cc chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc chrome/browser/ui/views/user_education/browser_user_education_service.cc -chrome/browser/ui/views/user_education/low_usage_promo.cc chrome/browser/ui/views/web_apps/force_installed_preinstalled_deprecated_app_dialog_view.cc chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_browsertest.cc -chrome/browser/ui/views/webid/account_selection_view_base.cc +chrome/browser/ui/views/webauthn/passkey_upgrade_bubble_view.cc chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop_browsertest.cc chrome/browser/ui/web_applications/sub_apps_admin_policy_browsertest.cc chrome/browser/ui/web_applications/web_app_browsertest.cc @@ -2104,18 +2104,18 @@ chrome/browser/ui/webui/whats_new/whats_new_ui.cc chrome/browser/ui/window_sizer/window_sizer_chromeos.cc chrome/browser/unified_consent/unified_consent_sync_to_signin_browsertest.cc chrome/browser/updates/announcement_notification/announcement_notification_service_unittest.cc +chrome/browser/upgrade_detector/version_history_client.cc +chrome/browser/upgrade_detector/version_history_client_unittest.cc chrome/browser/usb/chrome_usb_browsertest.cc chrome/browser/usb/chrome_usb_delegate_unittest.cc chrome/browser/usb/usb_chooser_context_unittest.cc chrome/browser/usb/usb_chooser_controller_unittest.cc chrome/browser/usb/usb_policy_allowed_devices_unittest.cc chrome/browser/usb/web_usb_detector_unittest.cc -chrome/browser/user_annotations/user_annotations_service_browsertest.cc chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher_unittest.cc chrome/browser/vr/PRESUBMIT.py chrome/browser/vr/test/gl_test_environment_unittest.cc chrome/browser/wallet/android/boarding_pass_detector_unittest.cc -chrome/browser/web_applications/chromeos_web_app_experiments_browsertest.cc chrome/browser/web_applications/commands/fetch_manifest_and_install_command.cc chrome/browser/web_applications/commands/install_app_from_verified_manifest_command.cc chrome/browser/web_applications/commands/install_app_from_verified_manifest_command_browsertest.cc @@ -2385,6 +2385,7 @@ chrome/test/chromedriver/test/run_py_tests.py chrome/test/chromedriver/window_commands.cc chrome/test/chromedriver/window_commands_unittest.cc chrome/test/enterprise/e2e/connector/chrome_reporting_connector_test_case.py +chrome/test/enterprise/e2e/connector/client_certs/client_certs_test.py chrome/test/enterprise/e2e/connector/common/realtime_reporting_ui_test.py chrome/test/enterprise/e2e/connector/identity_connector/managed_profile_test.py chrome/test/enterprise/e2e/connector/local_content_analysis_connector/local_content_analysis_connector_test.py @@ -2490,6 +2491,7 @@ chromeos/ash/components/boca/babelorca/tachyon_constants.h chromeos/ash/components/boca/babelorca/tachyon_registrar.cc chromeos/ash/components/boca/babelorca/transcript_receiver.cc chromeos/ash/components/boca/babelorca/transcript_sender_impl.cc +chromeos/ash/components/boca/boca_app_client.cc chromeos/ash/components/boca/boca_metrics_manager_unittest.cc chromeos/ash/components/boca/boca_role_util_unittest.cc chromeos/ash/components/boca/boca_session_manager_unittest.cc @@ -2637,14 +2639,14 @@ components/autofill/content/renderer/html_based_username_detector_browsertest.cc components/autofill/content/renderer/page_passwords_analyser.cc components/autofill/content/renderer/password_form_conversion_utils.cc components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc -components/autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals.js +components/autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals.ts components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager_unittest.cc components/autofill/core/browser/crowdsourcing/determine_possible_field_types_unittest.cc components/autofill/core/browser/data_manager/addresses/address_data_cleaner_unittest.cc components/autofill/core/browser/data_manager/addresses/address_data_manager_unittest.cc components/autofill/core/browser/data_manager/payments/payments_data_manager_unittest.cc -components/autofill/core/browser/data_model/autofill_profile_unittest.cc +components/autofill/core/browser/data_model/addresses/autofill_profile_unittest.cc components/autofill/core/browser/form_import/form_data_importer_unittest.cc components/autofill/core/browser/form_structure_unittest.cc components/autofill/core/browser/foundations/browser_autofill_manager_unittest.cc @@ -2665,16 +2667,20 @@ components/autofill/core/browser/payments/credit_card_otp_authenticator_unittest components/autofill/core/browser/payments/credit_card_risk_based_authenticator_unittest.cc components/autofill/core/browser/payments/credit_card_save_manager_unittest.cc components/autofill/core/browser/payments/full_card_request_unittest.cc +components/autofill/core/browser/payments/multiple_request_payments_network_interface_base.cc components/autofill/core/browser/payments/payments_network_interface_base.cc components/autofill/core/browser/payments/payments_network_interface_test_base.cc components/autofill/core/browser/payments/payments_network_interface_unittest.cc components/autofill/core/browser/payments/payments_requests/unmask_card_request_unittest.cc components/autofill/core/browser/payments/payments_service_url.cc components/autofill/core/browser/payments/payments_service_url_unittest.cc +components/autofill/core/browser/strike_databases/autofill_ai/autofill_ai_save_strike_database_by_host_unittest.cc components/autofill/core/browser/suggestions/addresses/address_suggestion_generator_unittest.cc components/autofill/core/browser/test_utils/autofill_test_utils.cc components/autofill/core/browser/ui/autofill_external_delegate_unittest.cc components/autofill/core/browser/ui/autofill_image_fetcher.cc +components/autofill/core/browser/ui/payments/bnpl_tos_controller_impl.cc +components/autofill/core/browser/ui/payments/bnpl_tos_controller_impl_unittest.cc components/autofill/core/browser/webdata/addresses/autofill_profile_sync_bridge.h components/autofill/core/browser/webdata/payments/autofill_wallet_sync_bridge.h components/autofill/core/browser/webdata/payments/autofill_wallet_sync_bridge_unittest.cc @@ -2722,6 +2728,7 @@ components/certificate_transparency/tools/testdata/input.json components/cloud_devices/common/cloud_device_description.h components/cloud_devices/common/printer_description.h components/collaboration/internal/android/messaging/messaging_backend_service_bridge_unittest.cc +components/collaboration/internal/collaboration_service_impl_unittest.cc components/collaboration/internal/messaging/messaging_backend_service_impl_unittest.cc components/collaboration_strings.grdp components/commerce/core/account_checker.cc @@ -2817,6 +2824,7 @@ components/enterprise/data_controls/core/browser/conditions/attributes_condition components/enterprise/data_controls/core/browser/data_controls_policy_handler_unittest.cc components/enterprise/data_controls/core/browser/rule_unittest.cc components/enterprise/obfuscation/core/utils.h +components/enterprise/signin/enterprise_identity_service_unittest.cc components/error_page/common/localized_error.cc components/error_page_strings.grdp components/exo/keyboard_unittest.cc @@ -2854,8 +2862,6 @@ components/fingerprinting_protection_filter/browser/fingerprinting_protection_we components/fingerprinting_protection_filter/common/fingerprinting_protection_breakage_exception_unittest.cc components/fingerprinting_protection_filter/common/fingerprinting_protection_filter_constants.h components/fingerprinting_protection_filter/interventions/browser/interventions_web_contents_helper_unittest.cc -components/flags_ui/flags_test_helpers.cc -components/flags_ui/resources/app.html.ts components/gcm_driver/gcm_account_mapper.cc components/gcm_driver/gcm_account_mapper_unittest.cc components/gcm_driver/gcm_client_impl.cc @@ -2921,7 +2927,7 @@ components/invalidation/impl/fcm_invalidation_service_unittest.cc components/invalidation/impl/per_user_topic_subscription_manager.cc components/invalidation/impl/per_user_topic_subscription_manager_unittest.cc components/ip_protection/common/ip_protection_config_http.cc -components/ip_protection/common/ip_protection_issuer_token_direct_fetcher.cc +components/ip_protection/common/ip_protection_probabilistic_reveal_token_direct_fetcher.cc components/ip_protection/common/ip_protection_proxy_config_direct_fetcher.cc components/ip_protection/common/ip_protection_token_manager_impl.cc components/ip_protection/common/masked_domain_list_manager_unittest.cc @@ -2945,6 +2951,7 @@ components/manta/mahi_provider.cc components/manta/manta_service_callbacks.cc components/manta/orca_provider.cc components/manta/orca_provider_unittest.cc +components/manta/scanner_provider.cc components/manta/scanner_provider.h components/manta/scanner_provider_unittest.cc components/media_router/browser/android/flinging_controller_bridge.cc @@ -3001,6 +3008,7 @@ components/omnibox/browser/autocomplete_controller.h components/omnibox/browser/autocomplete_controller_metrics_unittest.cc components/omnibox/browser/autocomplete_controller_unittest.cc components/omnibox/browser/autocomplete_input.cc +components/omnibox/browser/autocomplete_match.cc components/omnibox/browser/autocomplete_match.h components/omnibox/browser/autocomplete_match_test_util.cc components/omnibox/browser/autocomplete_match_type_unittest.cc @@ -3015,6 +3023,8 @@ components/omnibox/browser/document_provider.cc components/omnibox/browser/document_provider_unittest.cc components/omnibox/browser/document_suggestions_service.cc components/omnibox/browser/document_suggestions_service_unittest.cc +components/omnibox/browser/enterprise_search_aggregator_provider.cc +components/omnibox/browser/enterprise_search_aggregator_provider_unittest.cc components/omnibox/browser/enterprise_search_aggregator_suggestions_service.cc components/omnibox/browser/enterprise_search_aggregator_suggestions_service_unittest.cc components/omnibox/browser/fake_autocomplete_provider_client.cc @@ -3512,6 +3522,7 @@ components/safety_check/url_constants.cc components/saved_tab_groups/internal/android/tab_group_sync_service_android_unittest.cc components/saved_tab_groups/internal/saved_tab_group_sync_bridge_unittest.cc components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge_unittest.cc +components/saved_tab_groups/internal/shared_tab_group_precondition_checker.cc components/saved_tab_groups/internal/tab_group_sync_bridge_mediator_unittest.cc components/saved_tab_groups/internal/tab_group_sync_service_unittest.cc components/saved_tab_groups/public/saved_tab_group_unittest.cc @@ -3524,6 +3535,7 @@ components/search_engines/keyword_table_unittest.cc components/search_engines/template_url.cc components/search_engines/template_url_data_unittest.cc components/search_engines/template_url_prepopulate_data_unittest.cc +components/search_engines/template_url_service.cc components/search_engines/template_url_service_unittest.cc components/search_engines/template_url_starter_pack_data.cc components/search_engines/template_url_unittest.cc @@ -3614,6 +3626,7 @@ components/signin/public/base/consent_level.h components/signin/public/base/hybrid_encryption_key.cc components/signin/public/base/session_binding_utils.cc components/signin/public/base/session_binding_utils_unittest.cc +components/signin/public/browser/web_signin_tracker_unittest.cc components/signin/public/identity_manager/access_token_fetcher.cc components/signin/public/identity_manager/access_token_fetcher_unittest.cc components/signin/public/identity_manager/account_info.h @@ -3783,6 +3796,8 @@ components/webapps/browser/android/webapk/webapk_single_icon_hasher_unittest.cc components/webapps/browser/banners/app_banner_settings_helper_unittest.cc components/webapps/browser/installable/installable_evaluator_unittest.cc components/webauthn/core/browser/passkey_change_quota_tracker_unittest.cc +components/webui/flags/flags_test_helpers.cc +components/webui/flags/resources/app.html.ts components/webxr/android/arcore_install_helper.cc components/webxr/android/arcore_install_helper.h components/wifi/wifi_service_win.cc @@ -3813,6 +3828,10 @@ 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 content/browser/browsing_topics/browsing_topics_url_loader_unittest.cc +content/browser/btm/btm_bounce_detector_browsertest.cc +content/browser/btm/btm_database_unittest.cc +content/browser/btm/btm_storage_unittest.cc +content/browser/btm/cookie_access_filter_unittest.cc content/browser/buckets/bucket_manager_host_unittest.cc content/browser/cache_storage/cache_storage_context_unittest.cc content/browser/child_process_sandbox_support_win_unittest.cc @@ -3827,10 +3846,6 @@ content/browser/devtools/devtools_protocol_encoding_cbor_fuzzer.cc content/browser/devtools/protocol/bluetooth_emulation_handler.h content/browser/devtools/protocol/devtools_protocol_browsertest.cc content/browser/devtools/shared_storage_worklet_devtools_agent_host_unittest.cc -content/browser/dips/cookie_access_filter_unittest.cc -content/browser/dips/dips_bounce_detector_browsertest.cc -content/browser/dips/dips_database_unittest.cc -content/browser/dips/dips_storage_unittest.cc content/browser/download/mhtml_generation_browsertest.cc content/browser/download/save_package.h content/browser/download/save_package_unittest.cc @@ -3862,7 +3877,6 @@ content/browser/interest_group/bidding_and_auction_server_key_fetcher.cc content/browser/interest_group/bidding_and_auction_server_key_fetcher.h content/browser/interest_group/interest_group_browsertest.cc content/browser/interest_group/interest_group_update_manager.cc -content/browser/interest_group/trusted_signals_fetcher.cc content/browser/loader/file_url_loader_factory_unittest.cc content/browser/loader/keep_alive_url_loader.cc content/browser/loader/keep_alive_url_loader.h @@ -3919,6 +3933,7 @@ content/browser/renderer_host/navigation_request_unittest.cc content/browser/renderer_host/navigator.cc content/browser/renderer_host/navigator_unittest.cc content/browser/renderer_host/policy_container_host_browsertest.cc +content/browser/renderer_host/randomized_confidence_utils.cc content/browser/renderer_host/recently_destroyed_hosts_unittest.cc content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl_browsertest.cc @@ -3942,6 +3957,7 @@ content/browser/sandbox_support_win_impl.cc content/browser/screen_orientation/screen_orientation_provider_unittest.cc content/browser/security/dip/document_isolation_policy_browsertest.cc content/browser/serial/serial_unittest.cc +content/browser/service_host/utility_sandbox_delegate_win.cc content/browser/service_worker/service_worker_hid_delegate_observer_unittest.cc content/browser/service_worker/service_worker_main_resource_loader.h content/browser/service_worker/service_worker_security_utils.cc @@ -3966,10 +3982,10 @@ content/browser/text_fragment_browsertest.cc content/browser/tpcd_heuristics/opener_heuristic_browsertest.cc content/browser/tpcd_heuristics/opener_heuristic_utils.cc content/browser/tpcd_heuristics/opener_heuristic_utils_unittest.cc +content/browser/tracing/tracing_end_to_end_browsertest.cc content/browser/url_info.h content/browser/url_loader_factory_params_helper.cc content/browser/usb/web_usb_service_impl_unittest.cc -content/browser/utility_sandbox_delegate_win.cc content/browser/web_contents/aura/gesture_nav_simple_unittest.cc content/browser/web_contents/web_contents_android.cc content/browser/web_contents/web_contents_impl.cc @@ -4470,11 +4486,14 @@ media/capture/video/win/video_capture_device_mf_win.cc media/capture/video/win/video_capture_device_utils_win.cc media/capture/video/win/video_capture_device_utils_win.h media/capture/video/win/video_capture_device_win.cc +media/cast/encoding/external_video_encoder.cc media/cast/encoding/media_video_encoder_wrapper_unittest.cc +media/cast/encoding/size_adaptable_video_encoder_base_unittest.cc media/cast/encoding/vpx_encoder.cc media/cast/encoding/vpx_quantizer_parser_unittest.cc media/cast/sender/openscreen_frame_sender.h media/cast/sender/video_bitrate_suggester.h +media/cast/sender/video_sender_unittest.cc media/cdm/win/media_foundation_cdm.cc media/cdm/win/test/media_foundation_clear_key_decryptor.cc media/cdm/win/test/mock_media_protection_pmp_server.h @@ -4519,6 +4538,7 @@ media/gpu/vaapi/vaapi_unittest.cc media/gpu/vaapi/vaapi_webp_decoder_unittest.cc media/gpu/windows/d3d11_video_decoder_wrapper.cc media/gpu/windows/d3d12_copy_command_list_wrapper.cc +media/gpu/windows/d3d12_video_encode_h264_delegate.cc media/gpu/windows/media_foundation_video_encode_accelerator_win.cc media/gpu/windows/mf_audio_encoder.cc media/gpu/windows/mf_audio_encoder.h @@ -4787,7 +4807,6 @@ net/tools/print_certificates.py net/tools/quic/quic_simple_client_bin.cc net/tools/testserver/testserver.py.vpython3 net/tools/transport_security_state_generator/transport_security_state_generator.cc -net/url_request/url_request_context_builder.cc net/url_request/url_request_context_builder_unittest.cc net/url_request/url_request_http_job_unittest.cc net/url_request/url_request_job_unittest.cc @@ -4851,8 +4870,11 @@ printing/metafile_skia.cc printing/print_settings_initializer_win.cc printing/printing_context.h printing/test/PRESUBMIT.py +remoting/base/compute_engine_service_client.cc +remoting/base/compute_engine_service_client.h remoting/base/corp_auth_util.cc remoting/base/crash/crashpad_linux.cc +remoting/base/instance_identity_token_getter_unittest.cc remoting/base/is_google_email.cc remoting/base/service_urls.cc remoting/base/session_policies.h @@ -4870,7 +4892,6 @@ remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc remoting/host/it2me/it2me_constants.cc remoting/host/it2me/it2me_host_unittest.cc remoting/host/it2me/it2me_native_messaging_host_unittest.cc -remoting/host/linux/input_injector_wayland.cc remoting/host/linux/input_injector_x11.cc remoting/host/linux/linux_me2me_host.py remoting/host/linux/remoting_user_session.cc @@ -4980,6 +5001,7 @@ services/network/public/cpp/cors/origin_access_entry_unittest.cc services/network/public/cpp/cors/origin_access_list_unittest.cc services/network/public/cpp/is_potentially_trustworthy.cc services/network/public/cpp/network_switches.cc +services/network/public/cpp/permissions_policy/origin_with_possible_wildcards_unittest.cc services/network/public/cpp/resource_request.h services/network/public/cpp/transferable_socket.cc services/network/public/mojom/permissions_policy/PRESUBMIT.py @@ -5134,6 +5156,7 @@ third_party/afl/src/qemu_mode/patches/afl-qemu-cpu-inl.h third_party/afl/src/test-instr.c third_party/afl/src/types.h third_party/android_build_tools/aapt2/3pp/fetch.py +third_party/android_deps/autorolled/fetch_all_autorolled.py third_party/android_deps/libs/com_android_support_support_annotations/3pp/fetch.py third_party/android_deps/libs/com_android_tools_common/3pp/fetch.py third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api/3pp/fetch.py @@ -5166,6 +5189,7 @@ third_party/android_deps/libs/com_google_android_libraries_identity_googleid_goo third_party/android_deps/libs/com_google_android_material_material/3pp/fetch.py third_party/android_deps/libs/com_google_android_play_core_common/3pp/fetch.py third_party/android_deps/libs/com_google_android_play_feature_delivery/3pp/fetch.py +third_party/android_deps/libs/com_google_ar_impress/3pp/fetch.py third_party/android_deps/libs/com_google_firebase_firebase_annotations/3pp/fetch.py third_party/android_deps/libs/com_google_firebase_firebase_common/3pp/fetch.py third_party/android_deps/libs/com_google_firebase_firebase_components/3pp/fetch.py @@ -5382,7 +5406,6 @@ third_party/blink/common/origin_trials/trial_token.cc third_party/blink/common/origin_trials/trial_token_validator_unittest.cc third_party/blink/common/page_state/page_state_serialization.cc third_party/blink/common/page_state/page_state_serialization_unittest.cc -third_party/blink/common/permissions_policy/origin_with_possible_wildcards_unittest.cc third_party/blink/common/shared_storage/module_script_downloader.cc third_party/blink/common/webid/federated_auth_request_mojom_traits_unittest.cc third_party/blink/public/common/custom_handlers/protocol_handler_utils.h @@ -5410,20 +5433,18 @@ third_party/blink/renderer/bindings/core/v8/generated_code_helper.cc third_party/blink/renderer/bindings/core/v8/window_proxy.cc third_party/blink/renderer/bindings/core/v8/window_proxy.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_posix.cc third_party/blink/renderer/core/BUILD.gn -third_party/blink/renderer/core/animation/pending_animations.cc third_party/blink/renderer/core/animation/sampled_effect.cc third_party/blink/renderer/core/clipboard/data_transfer.h third_party/blink/renderer/core/css/css_computed_style_declaration.cc third_party/blink/renderer/core/css/css_font_face_rule.idl third_party/blink/renderer/core/css/css_global_rule_set.h +third_party/blink/renderer/core/css/css_identifier_value_mappings.h third_party/blink/renderer/core/css/css_import_rule.idl third_party/blink/renderer/core/css/css_math_expression_node_test.cc third_party/blink/renderer/core/css/css_media_rule.idl third_party/blink/renderer/core/css/css_page_rule.idl -third_party/blink/renderer/core/css/css_primitive_value_mappings.h third_party/blink/renderer/core/css/css_property_value_set.cc third_party/blink/renderer/core/css/css_rule.idl third_party/blink/renderer/core/css/css_selector.cc @@ -5504,6 +5525,7 @@ third_party/blink/renderer/core/editing/serializers/serialization.cc third_party/blink/renderer/core/editing/spellcheck/cold_mode_spell_check_requester.h third_party/blink/renderer/core/editing/spellcheck/hot_mode_spell_check_requester.h third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.h +third_party/blink/renderer/core/editing/spellcheck/spell_checker_test.cc third_party/blink/renderer/core/editing/visible_units_line_test.cc third_party/blink/renderer/core/events/before_unload_event.cc third_party/blink/renderer/core/events/before_unload_event.h @@ -5532,7 +5554,6 @@ third_party/blink/renderer/core/execution_context/navigator_base.cc third_party/blink/renderer/core/exported/web_plugin_container_impl.cc third_party/blink/renderer/core/exported/web_searchable_form_data.cc third_party/blink/renderer/core/fetch/fetch_manager.cc -third_party/blink/renderer/core/fetch/form_data_bytes_consumer.cc third_party/blink/renderer/core/fetch/response.h third_party/blink/renderer/core/fileapi/file_reader_client.h third_party/blink/renderer/core/fragment_directive/text_fragment_anchor_metrics_test.cc @@ -5622,8 +5643,10 @@ third_party/blink/renderer/core/layout/geometry/logical_size.h third_party/blink/renderer/core/layout/geometry/physical_offset.h third_party/blink/renderer/core/layout/geometry/physical_rect.h third_party/blink/renderer/core/layout/geometry/physical_size.h +third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.h third_party/blink/renderer/core/layout/hit_test_cache.h third_party/blink/renderer/core/layout/hit_test_location.h +third_party/blink/renderer/core/layout/inline/inline_items_builder.cc third_party/blink/renderer/core/layout/inline/inline_items_builder.h third_party/blink/renderer/core/layout/inline/offset_mapping.h third_party/blink/renderer/core/layout/inline/offset_mapping_builder.h @@ -5770,6 +5793,7 @@ third_party/blink/renderer/modules/accessibility/ax_node_object.cc third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h third_party/blink/renderer/modules/accessibility/testing/internals_accessibility.h +third_party/blink/renderer/modules/ai/on_device_translation/ai_translator_factory.cc third_party/blink/renderer/modules/bluetooth/bluetooth_error.cc third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h @@ -5793,7 +5817,6 @@ third_party/blink/renderer/modules/mediarecorder/vpx_encoder.cc third_party/blink/renderer/modules/mediastream/media_devices_test.cc third_party/blink/renderer/modules/mediastream/media_stream_utils.cc third_party/blink/renderer/modules/mediastream/media_stream_video_renderer_sink.h -third_party/blink/renderer/modules/on_device_translation/translation.cc third_party/blink/renderer/modules/payments/android_pay_method_data.idl third_party/blink/renderer/modules/payments/on_payment_response_test.cc third_party/blink/renderer/modules/payments/payment_request.cc @@ -5803,6 +5826,7 @@ third_party/blink/renderer/modules/payments/payment_response_test.cc third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc third_party/blink/renderer/modules/presentation/presentation_connection_available_event.h third_party/blink/renderer/modules/service_worker/service_worker_content_settings_proxy.cc +third_party/blink/renderer/modules/service_worker/service_worker_event_queue.cc third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc third_party/blink/renderer/modules/smart_card/smart_card_error.cc third_party/blink/renderer/modules/storage/cached_storage_area.h @@ -6068,6 +6092,7 @@ third_party/catapult/catapult_build/run_dev_server_tests.py third_party/catapult/common/bin/update_chrome_reference_binaries.py third_party/catapult/common/lab/commits.py third_party/catapult/common/lab/hardware.py +third_party/catapult/common/node_runner/node_runner/package-lock.json third_party/catapult/common/py_trace_event/py_trace_event/trace_event_impl/perfetto_proto_classes.py third_party/catapult/common/py_utils/py_utils/cloud_storage.py third_party/catapult/common/py_utils/py_utils/cloud_storage_unittest.py @@ -7246,11 +7271,13 @@ third_party/crossbench/crossbench/cli/exception_formatter.py third_party/crossbench/crossbench/plt/android_adb.py third_party/crossbench/crossbench/probes/chrome_histograms.py third_party/crossbench/crossbench/probes/perfetto/downloader.py +third_party/crossbench/crossbench/probes/perfetto/trace_processor/queries/loadline/breakdown.sql third_party/crossbench/crossbench/probes/performance_entries.py third_party/crossbench/crossbench/probes/profiling/browser_profiling.py third_party/crossbench/crossbench/probes/profiling/context/base.py third_party/crossbench/crossbench/probes/profiling/enum.py third_party/crossbench/crossbench/probes/web_page_replay/recorder.py +third_party/crossbench/tests/crossbench/benchmarks/loading/action_runner/test_default_bond_action_runner.py third_party/crossbench/tests/crossbench/benchmarks/loading/config/test_example_configs.py third_party/crossbench/tests/crossbench/benchmarks/loading/config/test_login.py third_party/crossbench/tests/crossbench/benchmarks/loading/config/test_pages.py @@ -7273,7 +7300,6 @@ third_party/dawn/src/dawn/dawn.json third_party/dawn/src/dawn/native/CommandAllocator.cpp third_party/dawn/src/dawn/native/CopyTextureForBrowserHelper.cpp third_party/dawn/src/dawn/native/Features.cpp -third_party/dawn/src/dawn/native/PipelineLayout.cpp third_party/dawn/src/dawn/native/Sampler.h third_party/dawn/src/dawn/native/SubresourceStorage.h third_party/dawn/src/dawn/native/d3d/D3DError.cpp @@ -7551,6 +7577,7 @@ third_party/depot_tools/infra_lib/telemetry/__init__.py third_party/depot_tools/infra_lib/telemetry/clearcut_span_exporter.py third_party/depot_tools/infra_lib/telemetry/proto/clientanalytics_pb2.py third_party/depot_tools/infra_lib/telemetry/proto/trace_span_pb2.py +third_party/depot_tools/man/README.txt third_party/depot_tools/man/html/depot_tools.html third_party/depot_tools/man/html/depot_tools_tutorial.html third_party/depot_tools/man/html/git-cl.html @@ -7700,6 +7727,7 @@ third_party/depot_tools/tests/git_cache_test.py third_party/depot_tools/tests/git_cl_creds_check_report.txt third_party/depot_tools/tests/git_cl_test.py third_party/depot_tools/tests/metrics_test.py +third_party/depot_tools/tests/presubmit_canned_checks_test.py third_party/depot_tools/tests/presubmit_support_test.py third_party/depot_tools/tests/presubmit_unittest.py third_party/depot_tools/tests/reclient_helper_test.py @@ -7716,6 +7744,7 @@ third_party/devtools-frontend/src/extensions/cxx_debugging/third_party/lit-html/ third_party/devtools-frontend/src/front_end/core/common/ColorConverter.ts third_party/devtools-frontend/src/front_end/core/host/AidaClient.test.ts third_party/devtools-frontend/src/front_end/core/host/InspectorFrontendHost.ts +third_party/devtools-frontend/src/front_end/core/host/UserMetrics.ts third_party/devtools-frontend/src/front_end/core/i18n/i18n.test.ts third_party/devtools-frontend/src/front_end/core/i18n/locales/af.json third_party/devtools-frontend/src/front_end/core/i18n/locales/am.json @@ -7802,6 +7831,7 @@ third_party/devtools-frontend/src/front_end/core/platform/StringUtilities.test.t third_party/devtools-frontend/src/front_end/core/platform/StringUtilities.ts third_party/devtools-frontend/src/front_end/core/platform/UIString.ts third_party/devtools-frontend/src/front_end/core/root/Runtime.test.ts +third_party/devtools-frontend/src/front_end/core/root/Runtime.ts third_party/devtools-frontend/src/front_end/core/sdk/CSSMetadata.ts third_party/devtools-frontend/src/front_end/core/sdk/Cookie.ts third_party/devtools-frontend/src/front_end/core/sdk/NetworkManager.ts @@ -7838,7 +7868,11 @@ third_party/devtools-frontend/src/front_end/models/live-metrics/LiveMetrics.ts third_party/devtools-frontend/src/front_end/models/persistence/NetworkPersistenceManager.test.ts third_party/devtools-frontend/src/front_end/models/persistence/NetworkPersistenceManager.ts third_party/devtools-frontend/src/front_end/models/persistence/PersistenceImpl.test.ts +third_party/devtools-frontend/src/front_end/models/persistence/PlatformFileSystem.ts +third_party/devtools-frontend/src/front_end/models/project_settings/ProjectSettingsModel.ts third_party/devtools-frontend/src/front_end/models/trace/ModelImpl.test.ts +third_party/devtools-frontend/src/front_end/models/trace/extras/ThirdParties.test.ts +third_party/devtools-frontend/src/front_end/models/trace/extras/TraceTree.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/MetaHandler.test.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/MetaHandler.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/NetworkRequestsHandler.test.ts @@ -7855,7 +7889,7 @@ third_party/devtools-frontend/src/front_end/models/trace/insights/FontDisplay.ts third_party/devtools-frontend/src/front_end/models/trace/insights/ForcedReflow.ts third_party/devtools-frontend/src/front_end/models/trace/insights/ImageDelivery.ts third_party/devtools-frontend/src/front_end/models/trace/insights/InteractionToNextPaint.ts -third_party/devtools-frontend/src/front_end/models/trace/insights/LongCriticalNetworkTree.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/NetworkDependencyTree.ts third_party/devtools-frontend/src/front_end/models/trace/insights/RenderBlocking.test.ts third_party/devtools-frontend/src/front_end/models/trace/insights/SlowCSSSelector.ts third_party/devtools-frontend/src/front_end/models/trace/insights/ThirdParties.test.ts @@ -7872,12 +7906,15 @@ third_party/devtools-frontend/src/front_end/models/trace/types/TraceEvents.ts third_party/devtools-frontend/src/front_end/panels/accessibility/AccessibilityNodeView.ts third_party/devtools-frontend/src/front_end/panels/accessibility/AccessibilityStrings.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/AiAssistancePanel.ts +third_party/devtools-frontend/src/front_end/panels/ai_assistance/ExtensionScope.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/agents/FileAgent.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/agents/PerformanceAgent.test.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/agents/PerformanceAgent.ts -third_party/devtools-frontend/src/front_end/panels/ai_assistance/components/ChatView.ts +third_party/devtools-frontend/src/front_end/panels/ai_assistance/agents/PerformanceInsightsAgent.test.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/components/UserActionRow.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/components/chatView.css +third_party/devtools-frontend/src/front_end/panels/ai_assistance/data_formatters/PerformanceInsightFormatter.test.ts +third_party/devtools-frontend/src/front_end/panels/animation/AnimationTimeline.ts third_party/devtools-frontend/src/front_end/panels/application/AppManifestView.ts third_party/devtools-frontend/src/front_end/panels/application/ApplicationPanelSidebar.ts third_party/devtools-frontend/src/front_end/panels/application/BackgroundServiceView.ts @@ -7890,9 +7927,13 @@ third_party/devtools-frontend/src/front_end/panels/application/StorageView.ts third_party/devtools-frontend/src/front_end/panels/application/components/EndpointsGrid.ts third_party/devtools-frontend/src/front_end/panels/application/components/FrameDetailsView.ts third_party/devtools-frontend/src/front_end/panels/application/components/ReportsGrid.ts +third_party/devtools-frontend/src/front_end/panels/application/components/SharedStorageAccessGrid.ts third_party/devtools-frontend/src/front_end/panels/application/components/TrustTokensView.ts +third_party/devtools-frontend/src/front_end/panels/application/preloading/PreloadingView.ts +third_party/devtools-frontend/src/front_end/panels/application/preloading/components/PreloadingDetailsReportView.ts third_party/devtools-frontend/src/front_end/panels/application/preloading/components/PreloadingDisabledInfobar.ts third_party/devtools-frontend/src/front_end/panels/application/preloading/components/PreloadingString.ts +third_party/devtools-frontend/src/front_end/panels/application/preloading/components/RuleSetDetailsView.ts third_party/devtools-frontend/src/front_end/panels/application/preloading/components/UsedPreloadingView.test.ts third_party/devtools-frontend/src/front_end/panels/application/preloading/components/UsedPreloadingView.ts third_party/devtools-frontend/src/front_end/panels/autofill/AutofillView.ts @@ -7900,6 +7941,7 @@ third_party/devtools-frontend/src/front_end/panels/browser_debugger/DOMBreakpoin third_party/devtools-frontend/src/front_end/panels/changes/ChangesView.ts third_party/devtools-frontend/src/front_end/panels/console/ConsoleViewMessage.ts third_party/devtools-frontend/src/front_end/panels/console/ErrorStackParser.test.ts +third_party/devtools-frontend/src/front_end/panels/coverage/CoverageView.ts third_party/devtools-frontend/src/front_end/panels/css_overview/components/CSSOverviewStartView.ts third_party/devtools-frontend/src/front_end/panels/elements/ElementStatePaneWidget.test.ts third_party/devtools-frontend/src/front_end/panels/elements/ElementStatePaneWidget.ts @@ -7911,8 +7953,12 @@ third_party/devtools-frontend/src/front_end/panels/issues/AffectedCookiesView.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedDirectivesView.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedMetadataAllowedSitesView.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedTrackingSitesView.ts +third_party/devtools-frontend/src/front_end/panels/issues/IssuesPane.ts third_party/devtools-frontend/src/front_end/panels/lighthouse/LighthouseController.ts +third_party/devtools-frontend/src/front_end/panels/linear_memory_inspector/LinearMemoryInspectorPane.ts +third_party/devtools-frontend/src/front_end/panels/media/MainView.ts third_party/devtools-frontend/src/front_end/panels/mobile_throttling/CalibrationController.ts +third_party/devtools-frontend/src/front_end/panels/network/BlockedURLsPane.ts third_party/devtools-frontend/src/front_end/panels/network/NetworkConfigView.ts third_party/devtools-frontend/src/front_end/panels/network/NetworkDataGridNode.ts third_party/devtools-frontend/src/front_end/panels/network/NetworkLogView.ts @@ -7958,7 +8004,9 @@ third_party/devtools-frontend/src/front_end/panels/timeline/utils/AICallTree.tes third_party/devtools-frontend/src/front_end/panels/timeline/utils/EntityMapper.test.ts third_party/devtools-frontend/src/front_end/panels/timeline/utils/EntryStyles.ts third_party/devtools-frontend/src/front_end/panels/timeline/utils/Helpers.test.ts +third_party/devtools-frontend/src/front_end/panels/timeline/utils/Helpers.ts third_party/devtools-frontend/src/front_end/panels/timeline/utils/IgnoreList.test.ts +third_party/devtools-frontend/src/front_end/panels/web_audio/WebAudioView.ts third_party/devtools-frontend/src/front_end/panels/webauthn/WebauthnPane.ts third_party/devtools-frontend/src/front_end/panels/whats_new/ReleaseNote.test.ts third_party/devtools-frontend/src/front_end/panels/whats_new/ReleaseNoteText.ts @@ -8246,9 +8294,6 @@ third_party/devtools-frontend/src/node_modules/@sinonjs/commons/lib/prototypes/t third_party/devtools-frontend/src/node_modules/@sinonjs/commons/types/prototypes/throws-on-proto.d.ts third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/lib/create-set.js third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/lib/deep-equal.js -third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons/lib/class-name.js -third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons/lib/prototypes/throws-on-proto.js -third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons/types/prototypes/throws-on-proto.d.ts third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/types/create-set.d.ts third_party/devtools-frontend/src/node_modules/@sinonjs/text-encoding/package.json third_party/devtools-frontend/src/node_modules/@tootallnate/quickjs-emscripten/dist/context.d.ts @@ -8356,16 +8401,25 @@ third_party/devtools-frontend/src/node_modules/cookie/package.json third_party/devtools-frontend/src/node_modules/cors/package.json third_party/devtools-frontend/src/node_modules/cosmiconfig/package.json third_party/devtools-frontend/src/node_modules/css-functions-list/package.json -third_party/devtools-frontend/src/node_modules/css-select/node_modules/domutils/lib/stringify.d.ts -third_party/devtools-frontend/src/node_modules/css-select/node_modules/domutils/lib/stringify.js third_party/devtools-frontend/src/node_modules/css-tree/data/patch.json -third_party/devtools-frontend/src/node_modules/css-tree/dist/csstree.js third_party/devtools-frontend/src/node_modules/css-tree/lib/lexer/generic.js third_party/devtools-frontend/src/node_modules/css-tree/package.json third_party/devtools-frontend/src/node_modules/cssnano-preset-default/package.json third_party/devtools-frontend/src/node_modules/cssnano/package.json -third_party/devtools-frontend/src/node_modules/csso/dist/csso.js third_party/devtools-frontend/src/node_modules/csso/lib/restructure/6-restructBlock.js +third_party/devtools-frontend/src/node_modules/csso/lib/restructure/prepare/specificity.js +third_party/devtools-frontend/src/node_modules/csso/node_modules/css-tree/data/patch.json +third_party/devtools-frontend/src/node_modules/csso/node_modules/css-tree/lib/lexer/generic.js +third_party/devtools-frontend/src/node_modules/csso/node_modules/css-tree/package.json +third_party/devtools-frontend/src/node_modules/csso/node_modules/mdn-data/css/at-rules.json +third_party/devtools-frontend/src/node_modules/csso/node_modules/mdn-data/css/at-rules.schema.json +third_party/devtools-frontend/src/node_modules/csso/node_modules/mdn-data/css/properties.json +third_party/devtools-frontend/src/node_modules/csso/node_modules/mdn-data/css/properties.schema.json +third_party/devtools-frontend/src/node_modules/csso/node_modules/mdn-data/css/selectors.json +third_party/devtools-frontend/src/node_modules/csso/node_modules/mdn-data/css/selectors.schema.json +third_party/devtools-frontend/src/node_modules/csso/node_modules/mdn-data/css/types.json +third_party/devtools-frontend/src/node_modules/csso/node_modules/mdn-data/css/types.schema.json +third_party/devtools-frontend/src/node_modules/csso/node_modules/mdn-data/package.json third_party/devtools-frontend/src/node_modules/csso/package.json third_party/devtools-frontend/src/node_modules/custom-event/index.js third_party/devtools-frontend/src/node_modules/data-view-buffer/package.json @@ -8391,6 +8445,10 @@ third_party/devtools-frontend/src/node_modules/diff/lib/convert/dmp.js third_party/devtools-frontend/src/node_modules/diff/lib/index.es6.js third_party/devtools-frontend/src/node_modules/diff/package.json third_party/devtools-frontend/src/node_modules/dir-glob/package.json +third_party/devtools-frontend/src/node_modules/domutils/lib/esm/stringify.d.ts +third_party/devtools-frontend/src/node_modules/domutils/lib/esm/stringify.js +third_party/devtools-frontend/src/node_modules/domutils/lib/stringify.d.ts +third_party/devtools-frontend/src/node_modules/domutils/lib/stringify.js third_party/devtools-frontend/src/node_modules/end-of-stream/package.json third_party/devtools-frontend/src/node_modules/engine.io-parser/build/cjs/index.js third_party/devtools-frontend/src/node_modules/engine.io-parser/build/esm/index.js @@ -8597,9 +8655,6 @@ third_party/devtools-frontend/src/node_modules/nise/nise.js third_party/devtools-frontend/src/node_modules/node-releases/package.json third_party/devtools-frontend/src/node_modules/normalize-package-data/package.json third_party/devtools-frontend/src/node_modules/normalize-path/index.js -third_party/devtools-frontend/src/node_modules/normalize-url/index.d.ts -third_party/devtools-frontend/src/node_modules/normalize-url/index.js -third_party/devtools-frontend/src/node_modules/normalize-url/package.json third_party/devtools-frontend/src/node_modules/object-assign/index.js third_party/devtools-frontend/src/node_modules/object-assign/package.json third_party/devtools-frontend/src/node_modules/object-keys/package.json @@ -8624,13 +8679,16 @@ third_party/devtools-frontend/src/node_modules/possible-typed-array-names/packag third_party/devtools-frontend/src/node_modules/postcss-colormin/package.json third_party/devtools-frontend/src/node_modules/postcss-colormin/src/index.js third_party/devtools-frontend/src/node_modules/postcss-convert-values/package.json +third_party/devtools-frontend/src/node_modules/postcss-discard-comments/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/postcss-discard-comments/package.json third_party/devtools-frontend/src/node_modules/postcss-discard-duplicates/package.json third_party/devtools-frontend/src/node_modules/postcss-discard-empty/package.json third_party/devtools-frontend/src/node_modules/postcss-discard-overridden/package.json third_party/devtools-frontend/src/node_modules/postcss-merge-longhand/package.json +third_party/devtools-frontend/src/node_modules/postcss-merge-rules/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/postcss-merge-rules/package.json third_party/devtools-frontend/src/node_modules/postcss-minify-gradients/package.json +third_party/devtools-frontend/src/node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/postcss-minify-selectors/package.json third_party/devtools-frontend/src/node_modules/postcss-normalize-display-values/package.json third_party/devtools-frontend/src/node_modules/postcss-normalize-positions/package.json @@ -8639,6 +8697,7 @@ third_party/devtools-frontend/src/node_modules/postcss-normalize-string/package. third_party/devtools-frontend/src/node_modules/postcss-normalize-timing-functions/package.json third_party/devtools-frontend/src/node_modules/postcss-normalize-unicode/package.json third_party/devtools-frontend/src/node_modules/postcss-normalize-url/package.json +third_party/devtools-frontend/src/node_modules/postcss-normalize-url/src/normalize.js third_party/devtools-frontend/src/node_modules/postcss-normalize-whitespace/package.json third_party/devtools-frontend/src/node_modules/postcss-ordered-values/package.json third_party/devtools-frontend/src/node_modules/postcss-reduce-initial/package.json @@ -8646,6 +8705,7 @@ third_party/devtools-frontend/src/node_modules/postcss-reduce-transforms/package third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/package.json third_party/devtools-frontend/src/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/postcss-svgo/package.json +third_party/devtools-frontend/src/node_modules/postcss-unique-selectors/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/postcss-unique-selectors/package.json third_party/devtools-frontend/src/node_modules/postcss/lib/comment.d.ts third_party/devtools-frontend/src/node_modules/postcss/lib/declaration.d.ts @@ -8774,6 +8834,7 @@ third_party/devtools-frontend/src/node_modules/sinon/lib/sinon/proxy-invoke.js third_party/devtools-frontend/src/node_modules/sinon/lib/sinon/util/core/extend.js third_party/devtools-frontend/src/node_modules/sinon/lib/sinon/util/core/get-property-descriptor.js third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/dist/diff.js +third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/dist/diff.min.js third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/lib/convert/dmp.js third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/lib/index.es6.js third_party/devtools-frontend/src/node_modules/sinon/node_modules/diff/package.json @@ -8815,6 +8876,7 @@ third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/packag third_party/devtools-frontend/src/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/strip-bom/package.json third_party/devtools-frontend/src/node_modules/strip-json-comments/package.json +third_party/devtools-frontend/src/node_modules/stylehacks/node_modules/postcss-selector-parser/package.json third_party/devtools-frontend/src/node_modules/stylehacks/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/@csstools/selector-specificity/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/css-tree/data/patch.json @@ -8831,9 +8893,6 @@ third_party/devtools-frontend/src/node_modules/stylelint/node_modules/mdn-data/c third_party/devtools-frontend/src/node_modules/stylelint/node_modules/mdn-data/css/types.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/mdn-data/css/types.schema.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/mdn-data/package.json -third_party/devtools-frontend/src/node_modules/stylelint/node_modules/postcss-selector-parser/package.json -third_party/devtools-frontend/src/node_modules/stylelint/node_modules/postcss/lib/comment.d.ts -third_party/devtools-frontend/src/node_modules/stylelint/node_modules/postcss/lib/declaration.d.ts third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/package.json third_party/devtools-frontend/src/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/supports-hyperlinks/node_modules/has-flag/package.json @@ -8842,6 +8901,7 @@ third_party/devtools-frontend/src/node_modules/supports-preserve-symlinks-flag/p third_party/devtools-frontend/src/node_modules/svg-tags/package.json third_party/devtools-frontend/src/node_modules/svgo/dist/svgo.browser.js third_party/devtools-frontend/src/node_modules/svgo/plugins/_collections.js +third_party/devtools-frontend/src/node_modules/svgo/plugins/convertOneStopGradients.js third_party/devtools-frontend/src/node_modules/svgo/plugins/inlineStyles.js third_party/devtools-frontend/src/node_modules/svgo/plugins/mergeStyles.js third_party/devtools-frontend/src/node_modules/svgo/plugins/minifyStyles.js @@ -8849,6 +8909,8 @@ third_party/devtools-frontend/src/node_modules/svgo/plugins/prefixIds.js third_party/devtools-frontend/src/node_modules/svgo/plugins/removeAttributesBySelector.js third_party/devtools-frontend/src/node_modules/svgo/plugins/removeDesc.js third_party/devtools-frontend/src/node_modules/svgo/plugins/removeTitle.js +third_party/devtools-frontend/src/node_modules/svgo/plugins/removeXlink.js +third_party/devtools-frontend/src/node_modules/svgo/plugins/reusePaths.js third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/package.json third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/tar-stream/package.json @@ -8984,7 +9046,6 @@ third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi third_party/devtools-frontend/src/node_modules/wrap-ansi/package.json third_party/devtools-frontend/src/node_modules/ws/package.json third_party/devtools-frontend/src/node_modules/y18n/package.json -third_party/devtools-frontend/src/node_modules/yaml/package.json third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/decamelize/package.json third_party/devtools-frontend/src/node_modules/yauzl/package.json third_party/devtools-frontend/src/node_modules/yocto-queue/index.d.ts @@ -9121,7 +9182,6 @@ third_party/eigen3/src/Eigen/src/Core/arch/AltiVec/Complex.h third_party/eigen3/src/Eigen/src/Core/arch/AltiVec/MathFunctions.h third_party/eigen3/src/Eigen/src/Core/arch/AltiVec/MatrixProduct.h third_party/eigen3/src/Eigen/src/Core/arch/AltiVec/MatrixProductMMA.h -third_party/eigen3/src/Eigen/src/Core/arch/AltiVec/MatrixVectorProduct.h third_party/eigen3/src/Eigen/src/Core/arch/AltiVec/PacketMath.h third_party/eigen3/src/Eigen/src/Core/arch/AltiVec/TypeCasting.h third_party/eigen3/src/Eigen/src/Core/arch/Default/ConjHelper.h @@ -9433,6 +9493,7 @@ third_party/eigen3/src/test/geo_transformations.cpp third_party/eigen3/src/test/half_float.cpp third_party/eigen3/src/test/hessenberg.cpp third_party/eigen3/src/test/householder.cpp +third_party/eigen3/src/test/incomplete_LUT.cpp third_party/eigen3/src/test/incomplete_cholesky.cpp third_party/eigen3/src/test/indexed_view.cpp third_party/eigen3/src/test/initializer_list_construction.cpp @@ -10579,112 +10640,44 @@ third_party/googletest/src/googletest/src/gtest.cc third_party/googletest/src/googletest/test/googletest-death-test-test.cc third_party/googletest/src/googletest/test/gtest_list_output_unittest_.cc third_party/googletest/src/googletest/test/gtest_skip_test.cc -third_party/grpc/src/CMakeLists.txt -third_party/grpc/src/include/grpc/grpc.h -third_party/grpc/src/include/grpc/grpc_security_constants.h -third_party/grpc/src/include/grpc/support/port_platform.h -third_party/grpc/src/include/grpcpp/create_channel_binder.h -third_party/grpc/src/include/grpcpp/security/binder_security_policy.h -third_party/grpc/src/include/grpcpp/support/proto_buffer_reader.h -third_party/grpc/src/include/grpcpp/support/proto_buffer_writer.h -third_party/grpc/src/package.xml -third_party/grpc/src/setup.py -third_party/grpc/src/src/boringssl/gen_build_yaml.py -third_party/grpc/src/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc -third_party/grpc/src/src/core/ext/transport/binder/security_policy/security_policy.h -third_party/grpc/src/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc -third_party/grpc/src/src/core/ext/xds/xds_api.cc -third_party/grpc/src/src/core/ext/xds/xds_cluster.cc -third_party/grpc/src/src/core/lib/event_engine/windows/iocp.cc -third_party/grpc/src/src/core/lib/gpr/string.h -third_party/grpc/src/src/core/lib/gprpp/status_helper.cc -third_party/grpc/src/src/core/lib/gprpp/time.h -third_party/grpc/src/src/core/lib/iomgr/socket_windows.cc -third_party/grpc/src/src/core/lib/json/json_object_loader.cc -third_party/grpc/src/src/core/lib/json/json_util.h -third_party/grpc/src/src/core/lib/security/authorization/cel_authorization_engine.h -third_party/grpc/src/src/core/lib/security/credentials/credentials.h -third_party/grpc/src/src/core/lib/security/credentials/external/external_account_credentials.cc -third_party/grpc/src/src/core/lib/security/credentials/google_default/google_default_credentials.cc -third_party/grpc/src/src/core/lib/security/credentials/jwt/json_token.h -third_party/grpc/src/src/core/lib/security/credentials/jwt/jwt_verifier.h -third_party/grpc/src/src/core/lib/security/security_connector/ssl_utils_config.cc -third_party/grpc/src/src/core/lib/service_config/service_config.h -third_party/grpc/src/src/core/lib/service_config/service_config_impl.h -third_party/grpc/src/src/cpp/ext/gcp/observability.cc -third_party/grpc/src/src/cpp/ext/gcp/observability_logging_sink.cc -third_party/grpc/src/src/csharp/Grpc.Tools/build/_grpc/Grpc.CSharp.xml -third_party/grpc/src/src/csharp/Grpc.Tools/build/_protobuf/Protobuf.CSharp.xml -third_party/grpc/src/src/objective-c/tests/CppCronetTests/CppCronetEnd2EndTests.mm -third_party/grpc/src/src/python/grpcio/grpc/__init__.py -third_party/grpc/src/src/python/grpcio_admin/setup.py -third_party/grpc/src/src/python/grpcio_channelz/setup.py -third_party/grpc/src/src/python/grpcio_csds/setup.py -third_party/grpc/src/src/python/grpcio_health_checking/setup.py -third_party/grpc/src/src/python/grpcio_reflection/setup.py -third_party/grpc/src/src/python/grpcio_status/setup.py -third_party/grpc/src/src/python/grpcio_testing/setup.py -third_party/grpc/src/src/python/grpcio_tests/tests/unit/_api_test.py -third_party/grpc/src/src/python/grpcio_tests/tests/unit/_auth_context_test.py -third_party/grpc/src/src/python/grpcio_tests/tests_aio/unit/auth_context_test.py -third_party/grpc/src/test/core/client_channel/http_proxy_mapper_test.cc -third_party/grpc/src/test/core/client_channel/resolvers/binder_resolver_test.cc -third_party/grpc/src/test/core/client_channel/resolvers/dns_resolver_test.cc -third_party/grpc/src/test/core/client_channel/resolvers/sockaddr_resolver_test.cc -third_party/grpc/src/test/core/security/credentials_test.cc -third_party/grpc/src/test/core/security/evaluate_args_test.cc -third_party/grpc/src/test/core/security/grpc_alts_credentials_options_test.cc -third_party/grpc/src/test/core/security/json_token_test.cc -third_party/grpc/src/test/core/security/jwt_verifier_test.cc -third_party/grpc/src/test/core/security/print_google_default_creds_token.cc -third_party/grpc/src/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc -third_party/grpc/src/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc -third_party/grpc/src/test/core/tsi/ssl_transport_security_test.cc -third_party/grpc/src/test/core/tsi/transport_security_test.cc -third_party/grpc/src/test/core/uri/uri_parser_test.cc -third_party/grpc/src/test/core/xds/google_mesh_ca_certificate_provider_factory_test.cc -third_party/grpc/src/test/core/xds/xds_bootstrap_test.cc -third_party/grpc/src/test/core/xds/xds_client_test.cc -third_party/grpc/src/test/core/xds/xds_cluster_resource_type_test.cc -third_party/grpc/src/test/core/xds/xds_common_types_test.cc -third_party/grpc/src/test/core/xds/xds_http_filters_test.cc -third_party/grpc/src/test/core/xds/xds_lb_policy_registry_test.cc -third_party/grpc/src/test/core/xds/xds_listener_resource_type_test.cc -third_party/grpc/src/test/core/xds/xds_route_config_resource_type_test.cc -third_party/grpc/src/test/cpp/end2end/end2end_test.cc -third_party/grpc/src/test/cpp/end2end/tls_key_export_test.cc -third_party/grpc/src/test/cpp/end2end/xds/xds_end2end_test.cc -third_party/grpc/src/test/cpp/end2end/xds/xds_server.h -third_party/grpc/src/test/cpp/qps/parse_json.cc -third_party/grpc/src/test/cpp/qps/report.cc -third_party/grpc/src/test/cpp/util/channel_trace_proto_helper.cc -third_party/grpc/src/test/cpp/util/create_test_channel.cc -third_party/grpc/src/third_party/objective_c/google_toolbox_for_mac/UnitTesting/GTMGoogleTestRunner.mm -third_party/grpc/src/third_party/upb/python/message.c -third_party/grpc/src/third_party/upb/upbc/protoc-gen-upbdefs.cc -third_party/grpc/src/third_party/xxhash/xxhash.h -third_party/grpc/src/tools/distrib/python/grpc_prefixed/templates/setup.py.template -third_party/grpc/src/tools/distrib/python/grpcio_tools/setup.py -third_party/grpc/src/tools/distrib/python/xds_protos/setup.py -third_party/grpc/src/tools/distrib/update_flakes_query.py -third_party/grpc/src/tools/interop_matrix/run_interop_matrix_tests.py -third_party/grpc/src/tools/run_tests/performance/bq_upload_result.py -third_party/grpc/src/tools/run_tests/python_utils/bazel_report_helper.py -third_party/grpc/src/tools/run_tests/python_utils/port_server.py -third_party/grpc/src/tools/run_tests/python_utils/upload_rbe_results.py -third_party/grpc/src/tools/run_tests/python_utils/upload_test_results.py -third_party/grpc/src/tools/run_tests/run_interop_tests.py -third_party/grpc/src/tools/run_tests/run_xds_tests.py -third_party/grpc/src/tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/api.py -third_party/grpc/src/tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/iam.py -third_party/grpc/src/tools/run_tests/xds_k8s_test_driver/framework/infrastructure/k8s.py -third_party/grpc/src/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_base_runner.py -third_party/grpc/src/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_xds_server_runner.py -third_party/grpc/src/tools/run_tests/xds_k8s_test_driver/framework/xds_url_map_testcase.py +third_party/grpc/source/include/grpc/grpc.h +third_party/grpc/source/include/grpc/grpc_security_constants.h +third_party/grpc/source/include/grpc/support/port_platform.h +third_party/grpc/source/include/grpcpp/create_channel_binder.h +third_party/grpc/source/include/grpcpp/security/binder_security_policy.h +third_party/grpc/source/include/grpcpp/support/proto_buffer_reader.h +third_party/grpc/source/include/grpcpp/support/proto_buffer_writer.h +third_party/grpc/source/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc +third_party/grpc/source/src/core/ext/transport/binder/security_policy/security_policy.h +third_party/grpc/source/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc +third_party/grpc/source/src/core/ext/xds/xds_api.cc +third_party/grpc/source/src/core/ext/xds/xds_cluster.cc +third_party/grpc/source/src/core/lib/event_engine/windows/iocp.cc +third_party/grpc/source/src/core/lib/gpr/string.h +third_party/grpc/source/src/core/lib/gprpp/status_helper.cc +third_party/grpc/source/src/core/lib/gprpp/time.h +third_party/grpc/source/src/core/lib/iomgr/socket_windows.cc +third_party/grpc/source/src/core/lib/json/json_object_loader.cc +third_party/grpc/source/src/core/lib/json/json_util.h +third_party/grpc/source/src/core/lib/security/authorization/cel_authorization_engine.h +third_party/grpc/source/src/core/lib/security/credentials/credentials.h +third_party/grpc/source/src/core/lib/security/credentials/external/external_account_credentials.cc +third_party/grpc/source/src/core/lib/security/credentials/google_default/google_default_credentials.cc +third_party/grpc/source/src/core/lib/security/credentials/jwt/json_token.h +third_party/grpc/source/src/core/lib/security/credentials/jwt/jwt_verifier.h +third_party/grpc/source/src/core/lib/security/security_connector/ssl_utils_config.cc +third_party/grpc/source/src/core/lib/service_config/service_config.h +third_party/grpc/source/src/core/lib/service_config/service_config_impl.h +third_party/grpc/source/src/cpp/ext/gcp/observability.cc +third_party/grpc/source/src/cpp/ext/gcp/observability_logging_sink.cc +third_party/grpc/source/third_party/upb/python/message.c +third_party/grpc/source/third_party/upb/upbc/protoc-gen-upbdefs.cc +third_party/grpc/source/third_party/xxhash/xxhash.h third_party/harfbuzz-ng/src/docs/usermanual-install-harfbuzz.xml third_party/harfbuzz-ng/src/docs/usermanual-integration.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/perf/texts/react-dom.txt third_party/harfbuzz-ng/src/src/OT/Color/CBDT/CBDT.hh third_party/harfbuzz-ng/src/src/OT/Color/COLR/COLR.hh third_party/harfbuzz-ng/src/src/OT/Color/COLR/colrv1-closure.hh @@ -10850,6 +10843,8 @@ third_party/isimpledom/ISimpleDOMDocument.idl third_party/isimpledom/ISimpleDOMNode.idl third_party/isimpledom/ISimpleDOMText.idl third_party/jni_zero/PRESUBMIT.py +third_party/kotlinc/licenses/gradle_license.txt +third_party/kotlinc/licenses/rhino_LICENSE.txt third_party/leveldatabase/src/doc/benchmark.html third_party/leveldatabase/src/table/format.h third_party/libFuzzer/src/FuzzerSHA1.cpp @@ -11234,6 +11229,7 @@ third_party/material_web_components/components-chromium/node_modules/lit-html/di third_party/material_web_components/components-chromium/node_modules/lit-html/directives/async-replace.d.ts third_party/material_web_components/package.json third_party/mediapipe/src/mediapipe/calculators/audio/audio_decoder_calculator.cc +third_party/mediapipe/src/mediapipe/calculators/audio/two_tap_fir_filter_calculator.cc third_party/mediapipe/src/mediapipe/calculators/core/bypass_calculator.cc third_party/mediapipe/src/mediapipe/calculators/image/opencv_image_encoder_calculator.cc third_party/mediapipe/src/mediapipe/calculators/image/scale_image_calculator.cc @@ -11316,7 +11312,6 @@ third_party/node/node_modules/@azure/msal-browser/lib/types/network/FetchClient. third_party/node/node_modules/@azure/msal-browser/package.json third_party/node/node_modules/@azure/msal-common/lib/types/telemetry/performance/PerformanceEvent.d.ts third_party/node/node_modules/@azure/msal-common/package.json -third_party/node/node_modules/@eslint/eslintrc/node_modules/globals/package.json third_party/node/node_modules/@lit/reactive-element/reactive-element.d.ts third_party/node/node_modules/@mediapipe/tasks-vision/vision.d.ts third_party/node/node_modules/@rollup/wasm-node/dist/shared/index.js @@ -11329,7 +11324,6 @@ third_party/node/node_modules/@typescript-eslint/eslint-plugin/dist/rules/prefer third_party/node/node_modules/acorn/dist/acorn.js third_party/node/node_modules/acorn/package.json third_party/node/node_modules/ajv/dist/ajv.bundle.js -third_party/node/node_modules/ansi-regex/package.json third_party/node/node_modules/callsites/package.json third_party/node/node_modules/chai/chai.js third_party/node/node_modules/chai/package.json @@ -11396,6 +11390,7 @@ third_party/node/node_modules/fast-glob/node_modules/glob-parent/package.json third_party/node/node_modules/fast-glob/out/utils/path.js third_party/node/node_modules/find-up/package.json third_party/node/node_modules/glob-parent/package.json +third_party/node/node_modules/globals/package.json third_party/node/node_modules/html-minifier/package.json third_party/node/node_modules/html-minifier/src/htmlminifier.js third_party/node/node_modules/html-minifier/src/htmlparser.js @@ -11403,7 +11398,6 @@ third_party/node/node_modules/import-fresh/package.json third_party/node/node_modules/imurmurhash/imurmurhash.js third_party/node/node_modules/imurmurhash/imurmurhash.min.js third_party/node/node_modules/imurmurhash/package.json -third_party/node/node_modules/is-path-inside/package.json third_party/node/node_modules/js-yaml/package.json third_party/node/node_modules/json-buffer/package.json third_party/node/node_modules/lit-html/directives/async-append.d.ts @@ -11437,7 +11431,6 @@ third_party/node/node_modules/source-map-support/node_modules/source-map/lib/bas third_party/node/node_modules/source-map-support/node_modules/source-map/lib/source-map-consumer.js third_party/node/node_modules/source-map-support/node_modules/source-map/package.json third_party/node/node_modules/source-map-support/source-map-support.js -third_party/node/node_modules/strip-ansi/package.json third_party/node/node_modules/strip-json-comments/package.json third_party/node/node_modules/svgo/dist/svgo.browser.js third_party/node/node_modules/svgo/plugins/_collections.js @@ -12147,7 +12140,6 @@ third_party/perfetto/src/profiling/memory/client.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/profiling/symbolizer/breakpad_parser.cc third_party/perfetto/src/profiling/symbolizer/breakpad_parser.h third_party/perfetto/src/trace_processor/importers/art_method/art_method_tokenizer.cc third_party/perfetto/src/trace_processor/importers/common/args_translation_table.cc @@ -12156,11 +12148,11 @@ third_party/perfetto/src/trace_processor/importers/ftrace/binder_tracker.cc third_party/perfetto/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.h third_party/perfetto/src/trace_processor/importers/fuchsia/fuchsia_trace_utils.h third_party/perfetto/src/trace_processor/importers/ninja/ninja_log_parser.cc +third_party/perfetto/src/trace_processor/importers/proto/android_probes_parser.cc third_party/perfetto/src/trace_processor/importers/proto/heap_graph_tracker_unittest.cc third_party/perfetto/src/trace_processor/importers/proto/statsd_module.cc third_party/perfetto/src/trace_processor/importers/proto/system_probes_parser.cc third_party/perfetto/src/trace_processor/metrics/sql/android/unsymbolized_frames.sql -third_party/perfetto/src/trace_processor/metrics/sql/chrome/rail_modes.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/android/battery/doze.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/android/startup/time_to_display.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/chrome/page_loads.sql @@ -12199,7 +12191,9 @@ third_party/perfetto/ui/src/frontend/sidebar.ts third_party/perfetto/ui/src/frontend/trace_url_handler.ts third_party/perfetto/ui/src/frontend/viewer_page/wasd_navigation_handler.ts third_party/perfetto/ui/src/open_perfetto_trace/index.html +third_party/perfetto/ui/src/plugins/dev.perfetto.ProcessSummary/index.ts third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTraceV2/adb/adb_msg.ts +third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTraceV2/adb/web_device_proxy/wdp_target_provider.ts third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTraceV2/pages/android.ts third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTraceV2/pages/record_page.ts third_party/perfetto/ui/src/plugins/dev.perfetto.TraceInfoPage/trace_info_page.ts @@ -12227,7 +12221,6 @@ third_party/protobuf-javascript/src/binary/constants.js third_party/protobuf-javascript/src/binary/decoder.js third_party/protobuf-javascript/src/binary/decoder_test.js third_party/protobuf-javascript/src/binary/encoder.js -third_party/protobuf-javascript/src/binary/message_test.js third_party/protobuf-javascript/src/binary/proto_test.js third_party/protobuf-javascript/src/binary/reader.js third_party/protobuf-javascript/src/binary/reader_test.js @@ -12235,55 +12228,33 @@ third_party/protobuf-javascript/src/binary/utils.js third_party/protobuf-javascript/src/binary/utils_test.js third_party/protobuf-javascript/src/binary/writer.js third_party/protobuf-javascript/src/binary/writer_test.js -third_party/protobuf-javascript/src/commonjs/import_test.js -third_party/protobuf-javascript/src/commonjs/strict_test.js third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/arith_test.js third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/decoder_test.js -third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/proto_test.js third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/reader_test.js third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/utils_test.js third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/binary/writer_test.js -third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/commonjs/import_test.js -third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/debug_test.js -third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/message_test.js -third_party/protobuf-javascript/src/compatibility_tests/v3.0.0/proto3_test.js third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/arith_test.js third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/decoder_test.js -third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/proto_test.js third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/reader_test.js third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/utils_test.js third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/binary/writer_test.js -third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/debug_test.js -third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/maps_test.js -third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/message_test.js -third_party/protobuf-javascript/src/compatibility_tests/v3.1.0/proto3_test.js -third_party/protobuf-javascript/src/debug.js -third_party/protobuf-javascript/src/debug_test.js third_party/protobuf-javascript/src/experimental/runtime/int64.js -third_party/protobuf-javascript/src/experimental/runtime/kernel/kernel_compatibility_test.js third_party/protobuf-javascript/src/experimental/runtime/kernel/storage.js -third_party/protobuf-javascript/src/experimental/runtime/kernel/writer.js third_party/protobuf-javascript/src/generator/js_generator.cc -third_party/protobuf-javascript/src/generator/js_generator.h -third_party/protobuf-javascript/src/generator/protoc-gen-js.cc third_party/protobuf-javascript/src/generator/well_known_types_embed.cc -third_party/protobuf-javascript/src/generator/well_known_types_embed.h -third_party/protobuf-javascript/src/gulpfile.js third_party/protobuf-javascript/src/map.js -third_party/protobuf-javascript/src/maps_test.js third_party/protobuf-javascript/src/message.js -third_party/protobuf-javascript/src/message_test.js -third_party/protobuf-javascript/src/node_loader.js -third_party/protobuf-javascript/src/proto3_test.js -third_party/protobuf-javascript/src/test_bootstrap.js -third_party/protobuf/CHANGES.txt +third_party/protobuf/.bcr/metadata.template.json third_party/protobuf/CMakeLists.txt third_party/protobuf/CONTRIBUTORS.txt -third_party/protobuf/benchmarks/cpp/cpp_benchmark.cc +third_party/protobuf/benchmarks/benchmark.cc +third_party/protobuf/benchmarks/compare.py +third_party/protobuf/benchmarks/gen_protobuf_binary_cc.py +third_party/protobuf/benchmarks/gen_synthetic_protos.py +third_party/protobuf/benchmarks/gen_upb_binary_c.py third_party/protobuf/conformance/binary_json_conformance_suite.cc third_party/protobuf/conformance/binary_json_conformance_suite.h third_party/protobuf/conformance/conformance_cpp.cc -third_party/protobuf/conformance/conformance_nodejs.js third_party/protobuf/conformance/conformance_python.py third_party/protobuf/conformance/conformance_test.cc third_party/protobuf/conformance/conformance_test.h @@ -12292,11 +12263,57 @@ third_party/protobuf/conformance/conformance_test_runner.cc third_party/protobuf/conformance/text_format_conformance_suite.cc third_party/protobuf/conformance/text_format_conformance_suite.h third_party/protobuf/conformance/update_failure_list.py +third_party/protobuf/docs/upb/render.py +third_party/protobuf/editions/generated_files_test.cc +third_party/protobuf/editions/generated_reflection_test.cc +third_party/protobuf/hpb/arena.h +third_party/protobuf/hpb/backend/upb/interop.h +third_party/protobuf/hpb/backend/upb/interop_test.cc +third_party/protobuf/hpb/backend/upb/upb.h +third_party/protobuf/hpb/extension.cc +third_party/protobuf/hpb/extension.h +third_party/protobuf/hpb/hpb.cc +third_party/protobuf/hpb/hpb.h +third_party/protobuf/hpb/internal/message_lock.cc +third_party/protobuf/hpb/internal/message_lock.h +third_party/protobuf/hpb/internal/message_lock_test.cc +third_party/protobuf/hpb/internal/template_help.h +third_party/protobuf/hpb/ptr.h +third_party/protobuf/hpb/repeated_field.h +third_party/protobuf/hpb/repeated_field_iterator.h +third_party/protobuf/hpb/repeated_field_iterator_test.cc +third_party/protobuf/hpb_generator/gen_accessors.cc +third_party/protobuf/hpb_generator/gen_accessors.h +third_party/protobuf/hpb_generator/gen_enums.cc +third_party/protobuf/hpb_generator/gen_enums.h +third_party/protobuf/hpb_generator/gen_extensions.cc +third_party/protobuf/hpb_generator/gen_extensions.h +third_party/protobuf/hpb_generator/gen_messages.cc +third_party/protobuf/hpb_generator/gen_messages.h +third_party/protobuf/hpb_generator/gen_repeated_fields.cc +third_party/protobuf/hpb_generator/gen_repeated_fields.h +third_party/protobuf/hpb_generator/gen_utils.cc +third_party/protobuf/hpb_generator/gen_utils.h +third_party/protobuf/hpb_generator/keywords.cc +third_party/protobuf/hpb_generator/keywords.h +third_party/protobuf/hpb_generator/names.cc +third_party/protobuf/hpb_generator/names.h +third_party/protobuf/hpb_generator/output.cc +third_party/protobuf/hpb_generator/output.h +third_party/protobuf/hpb_generator/protoc-gen-upb-protos.cc +third_party/protobuf/hpb_generator/tests/test_generated.cc third_party/protobuf/java/bom/pom.xml -third_party/protobuf/java/core/pom.xml -third_party/protobuf/java/lite/pom.xml +third_party/protobuf/java/core/pom_template.xml +third_party/protobuf/java/lite/pom_template.xml third_party/protobuf/java/pom.xml -third_party/protobuf/java/util/pom.xml +third_party/protobuf/java/protoc/pom.xml +third_party/protobuf/java/util/pom_template.xml +third_party/protobuf/lua/def.c +third_party/protobuf/lua/main.c +third_party/protobuf/lua/msg.c +third_party/protobuf/lua/upb.c +third_party/protobuf/lua/upb.h +third_party/protobuf/lua/upbc.cc third_party/protobuf/objectivec/DevTools/pddm.py third_party/protobuf/objectivec/DevTools/pddm_tests.py third_party/protobuf/objectivec/GPBAny.pbobjc.h @@ -12327,12 +12344,15 @@ third_party/protobuf/objectivec/GPBUnknownField.h third_party/protobuf/objectivec/GPBUnknownFieldSet.h third_party/protobuf/objectivec/GPBUnknownFieldSet_PackagePrivate.h third_party/protobuf/objectivec/GPBUnknownField_PackagePrivate.h +third_party/protobuf/objectivec/GPBUnknownFields.h +third_party/protobuf/objectivec/GPBUnknownFields_PackagePrivate.h third_party/protobuf/objectivec/GPBUtilities.h third_party/protobuf/objectivec/GPBUtilities_PackagePrivate.h third_party/protobuf/objectivec/GPBWellKnownTypes.h third_party/protobuf/objectivec/GPBWireFormat.h third_party/protobuf/objectivec/Tests/GPBObjectiveCPlusPlusTest.mm third_party/protobuf/objectivec/Tests/GPBTestUtilities.h +third_party/protobuf/objectivec/Tests/UnitTests-Bridging-Header.h third_party/protobuf/php/composer.json third_party/protobuf/php/ext/google/protobuf/arena.c third_party/protobuf/php/ext/google/protobuf/arena.h @@ -12348,29 +12368,53 @@ third_party/protobuf/php/ext/google/protobuf/message.c third_party/protobuf/php/ext/google/protobuf/message.h third_party/protobuf/php/ext/google/protobuf/names.c third_party/protobuf/php/ext/google/protobuf/names.h +third_party/protobuf/php/ext/google/protobuf/php-upb.c +third_party/protobuf/php/ext/google/protobuf/php-upb.h third_party/protobuf/php/ext/google/protobuf/php_protobuf.h third_party/protobuf/php/ext/google/protobuf/protobuf.c third_party/protobuf/php/ext/google/protobuf/protobuf.h third_party/protobuf/php/ext/google/protobuf/template_package.xml -third_party/protobuf/protoc-artifacts/pom.xml +third_party/protobuf/pkg/test/test_lib.cc +third_party/protobuf/pkg/test/test_lib.h +third_party/protobuf/protos/protos.h +third_party/protobuf/python/.repo-metadata.json +third_party/protobuf/python/convert.c +third_party/protobuf/python/convert.h +third_party/protobuf/python/descriptor.c +third_party/protobuf/python/descriptor.h +third_party/protobuf/python/descriptor_containers.c +third_party/protobuf/python/descriptor_containers.h +third_party/protobuf/python/descriptor_pool.c +third_party/protobuf/python/descriptor_pool.h +third_party/protobuf/python/dist/setup.py third_party/protobuf/python/docs/conf.py third_party/protobuf/python/docs/generate_docs.py +third_party/protobuf/python/extension_dict.c +third_party/protobuf/python/extension_dict.h third_party/protobuf/python/google/protobuf/__init__.py +third_party/protobuf/python/google/protobuf/any.py third_party/protobuf/python/google/protobuf/descriptor.py third_party/protobuf/python/google/protobuf/descriptor_database.py third_party/protobuf/python/google/protobuf/descriptor_pool.py +third_party/protobuf/python/google/protobuf/duration.py +third_party/protobuf/python/google/protobuf/internal/__init__.py third_party/protobuf/python/google/protobuf/internal/_parameterized.py +third_party/protobuf/python/google/protobuf/internal/any_test.py third_party/protobuf/python/google/protobuf/internal/api_implementation.cc third_party/protobuf/python/google/protobuf/internal/api_implementation.py third_party/protobuf/python/google/protobuf/internal/builder.py third_party/protobuf/python/google/protobuf/internal/containers.py third_party/protobuf/python/google/protobuf/internal/decoder.py +third_party/protobuf/python/google/protobuf/internal/decoder_test.py third_party/protobuf/python/google/protobuf/internal/descriptor_database_test.py third_party/protobuf/python/google/protobuf/internal/descriptor_pool_test.py third_party/protobuf/python/google/protobuf/internal/descriptor_test.py +third_party/protobuf/python/google/protobuf/internal/duration_test.py third_party/protobuf/python/google/protobuf/internal/encoder.py third_party/protobuf/python/google/protobuf/internal/enum_type_wrapper.py third_party/protobuf/python/google/protobuf/internal/extension_dict.py +third_party/protobuf/python/google/protobuf/internal/field_mask.py +third_party/protobuf/python/google/protobuf/internal/field_mask_test.py third_party/protobuf/python/google/protobuf/internal/generator_test.py third_party/protobuf/python/google/protobuf/internal/import_test.py third_party/protobuf/python/google/protobuf/internal/import_test_package/__init__.py @@ -12379,16 +12423,25 @@ third_party/protobuf/python/google/protobuf/internal/keywords_test.py third_party/protobuf/python/google/protobuf/internal/message_factory_test.py third_party/protobuf/python/google/protobuf/internal/message_listener.py third_party/protobuf/python/google/protobuf/internal/message_test.py +third_party/protobuf/python/google/protobuf/internal/numpy/__init__.py +third_party/protobuf/python/google/protobuf/internal/numpy/numpy_test.py third_party/protobuf/python/google/protobuf/internal/proto_builder_test.py +third_party/protobuf/python/google/protobuf/internal/proto_json_test.py +third_party/protobuf/python/google/protobuf/internal/proto_test.py +third_party/protobuf/python/google/protobuf/internal/pybind11_test_module.cc third_party/protobuf/python/google/protobuf/internal/python_message.py third_party/protobuf/python/google/protobuf/internal/python_protobuf.cc +third_party/protobuf/python/google/protobuf/internal/reflection_cpp_test.py third_party/protobuf/python/google/protobuf/internal/reflection_test.py +third_party/protobuf/python/google/protobuf/internal/runtime_version_test.py third_party/protobuf/python/google/protobuf/internal/service_reflection_test.py third_party/protobuf/python/google/protobuf/internal/symbol_database_test.py third_party/protobuf/python/google/protobuf/internal/test_util.py third_party/protobuf/python/google/protobuf/internal/testing_refleaks.py third_party/protobuf/python/google/protobuf/internal/text_encoding_test.py third_party/protobuf/python/google/protobuf/internal/text_format_test.py +third_party/protobuf/python/google/protobuf/internal/thread_safe_test.py +third_party/protobuf/python/google/protobuf/internal/timestamp_test.py third_party/protobuf/python/google/protobuf/internal/type_checkers.py third_party/protobuf/python/google/protobuf/internal/unknown_fields_test.py third_party/protobuf/python/google/protobuf/internal/well_known_types.py @@ -12398,8 +12451,10 @@ third_party/protobuf/python/google/protobuf/internal/wire_format_test.py third_party/protobuf/python/google/protobuf/json_format.py third_party/protobuf/python/google/protobuf/message.py third_party/protobuf/python/google/protobuf/message_factory.py +third_party/protobuf/python/google/protobuf/proto.py third_party/protobuf/python/google/protobuf/proto_api.h third_party/protobuf/python/google/protobuf/proto_builder.py +third_party/protobuf/python/google/protobuf/proto_json.py third_party/protobuf/python/google/protobuf/pyext/cpp_message.py third_party/protobuf/python/google/protobuf/pyext/descriptor.cc third_party/protobuf/python/google/protobuf/pyext/descriptor.h @@ -12428,25 +12483,43 @@ third_party/protobuf/python/google/protobuf/pyext/safe_numerics.h third_party/protobuf/python/google/protobuf/pyext/scoped_pyobject_ptr.h third_party/protobuf/python/google/protobuf/pyext/unknown_field_set.cc third_party/protobuf/python/google/protobuf/pyext/unknown_field_set.h -third_party/protobuf/python/google/protobuf/pyext/unknown_fields.cc -third_party/protobuf/python/google/protobuf/pyext/unknown_fields.h third_party/protobuf/python/google/protobuf/python_protobuf.h third_party/protobuf/python/google/protobuf/reflection.py +third_party/protobuf/python/google/protobuf/runtime_version.py third_party/protobuf/python/google/protobuf/service.py third_party/protobuf/python/google/protobuf/service_reflection.py third_party/protobuf/python/google/protobuf/symbol_database.py third_party/protobuf/python/google/protobuf/text_encoding.py third_party/protobuf/python/google/protobuf/text_format.py +third_party/protobuf/python/google/protobuf/timestamp.py third_party/protobuf/python/google/protobuf/unknown_fields.py -third_party/protobuf/python/mox.py +third_party/protobuf/python/map.c +third_party/protobuf/python/map.h +third_party/protobuf/python/message.c +third_party/protobuf/python/message.h +third_party/protobuf/python/minimal_test.py +third_party/protobuf/python/pb_unit_tests/descriptor_pool_test_wrapper.py +third_party/protobuf/python/pb_unit_tests/descriptor_test_wrapper.py +third_party/protobuf/python/pb_unit_tests/generator_test_wrapper.py +third_party/protobuf/python/pb_unit_tests/message_factory_test_wrapper.py +third_party/protobuf/python/pb_unit_tests/message_test_wrapper.py +third_party/protobuf/python/pb_unit_tests/proto_builder_test_wrapper.py +third_party/protobuf/python/pb_unit_tests/reflection_test_wrapper.py +third_party/protobuf/python/protobuf.c +third_party/protobuf/python/protobuf.h third_party/protobuf/python/protobuf_distutils/protobuf_distutils/generate_py_protobufs.py third_party/protobuf/python/protobuf_distutils/setup.py -third_party/protobuf/python/setup.py -third_party/protobuf/python/stubout.py +third_party/protobuf/python/python_api.h +third_party/protobuf/python/python_version_test.py +third_party/protobuf/python/repeated.c +third_party/protobuf/python/repeated.h +third_party/protobuf/python/unknown_fields.c +third_party/protobuf/python/unknown_fields.h third_party/protobuf/ruby/ext/google/protobuf_c/convert.c third_party/protobuf/ruby/ext/google/protobuf_c/convert.h third_party/protobuf/ruby/ext/google/protobuf_c/defs.c third_party/protobuf/ruby/ext/google/protobuf_c/defs.h +third_party/protobuf/ruby/ext/google/protobuf_c/glue.c third_party/protobuf/ruby/ext/google/protobuf_c/map.c third_party/protobuf/ruby/ext/google/protobuf_c/map.h third_party/protobuf/ruby/ext/google/protobuf_c/message.c @@ -12455,15 +12528,30 @@ third_party/protobuf/ruby/ext/google/protobuf_c/protobuf.c third_party/protobuf/ruby/ext/google/protobuf_c/protobuf.h third_party/protobuf/ruby/ext/google/protobuf_c/repeated_field.c third_party/protobuf/ruby/ext/google/protobuf_c/repeated_field.h +third_party/protobuf/ruby/ext/google/protobuf_c/ruby-upb.c +third_party/protobuf/ruby/ext/google/protobuf_c/ruby-upb.h +third_party/protobuf/ruby/ext/google/protobuf_c/shared_convert.c +third_party/protobuf/ruby/ext/google/protobuf_c/shared_convert.h +third_party/protobuf/ruby/ext/google/protobuf_c/shared_message.c +third_party/protobuf/ruby/ext/google/protobuf_c/shared_message.h third_party/protobuf/ruby/ext/google/protobuf_c/wrap_memcpy.c third_party/protobuf/ruby/pom.xml +third_party/protobuf/rust/cpp_kernel/serialized_data.h +third_party/protobuf/rust/cpp_kernel/strings.h +third_party/protobuf/rust/test/cpp/interop/test_utils.cc +third_party/protobuf/rust/test/rust_proto_library_unit_test/empty.cc +third_party/protobuf/rust/upb/upb_api.c third_party/protobuf/src/google/protobuf/any.cc third_party/protobuf/src/google/protobuf/any.h third_party/protobuf/src/google/protobuf/any_lite.cc third_party/protobuf/src/google/protobuf/any_test.cc third_party/protobuf/src/google/protobuf/arena.cc third_party/protobuf/src/google/protobuf/arena.h -third_party/protobuf/src/google/protobuf/arena_impl.h +third_party/protobuf/src/google/protobuf/arena_align.cc +third_party/protobuf/src/google/protobuf/arena_align.h +third_party/protobuf/src/google/protobuf/arena_align_test.cc +third_party/protobuf/src/google/protobuf/arena_allocation_policy.h +third_party/protobuf/src/google/protobuf/arena_cleanup.h third_party/protobuf/src/google/protobuf/arena_test_util.cc third_party/protobuf/src/google/protobuf/arena_test_util.h third_party/protobuf/src/google/protobuf/arena_unittest.cc @@ -12477,47 +12565,63 @@ third_party/protobuf/src/google/protobuf/compiler/annotation_test_util.cc third_party/protobuf/src/google/protobuf/compiler/annotation_test_util.h third_party/protobuf/src/google/protobuf/compiler/code_generator.cc third_party/protobuf/src/google/protobuf/compiler/code_generator.h +third_party/protobuf/src/google/protobuf/compiler/code_generator_lite.cc +third_party/protobuf/src/google/protobuf/compiler/code_generator_lite.h +third_party/protobuf/src/google/protobuf/compiler/code_generator_unittest.cc third_party/protobuf/src/google/protobuf/compiler/command_line_interface.cc third_party/protobuf/src/google/protobuf/compiler/command_line_interface.h +third_party/protobuf/src/google/protobuf/compiler/command_line_interface_tester.cc +third_party/protobuf/src/google/protobuf/compiler/command_line_interface_tester.h third_party/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/arena_ctor_visibility_test.cc third_party/protobuf/src/google/protobuf/compiler/cpp/bootstrap_unittest.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/copy_unittest.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_generator.h third_party/protobuf/src/google/protobuf/compiler/cpp/enum.cc third_party/protobuf/src/google/protobuf/compiler/cpp/enum.h -third_party/protobuf/src/google/protobuf/compiler/cpp/enum_field.cc -third_party/protobuf/src/google/protobuf/compiler/cpp/enum_field.h third_party/protobuf/src/google/protobuf/compiler/cpp/extension.cc third_party/protobuf/src/google/protobuf/compiler/cpp/extension.h third_party/protobuf/src/google/protobuf/compiler/cpp/field.cc third_party/protobuf/src/google/protobuf/compiler/cpp/field.h +third_party/protobuf/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/field_generators/generators.h +third_party/protobuf/src/google/protobuf/compiler/cpp/field_generators/map_field.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/field_generators/message_field.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/field_generators/string_field.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/field_generators/string_view_field.cc third_party/protobuf/src/google/protobuf/compiler/cpp/file.cc third_party/protobuf/src/google/protobuf/compiler/cpp/file.h +third_party/protobuf/src/google/protobuf/compiler/cpp/file_unittest.cc third_party/protobuf/src/google/protobuf/compiler/cpp/generator.cc third_party/protobuf/src/google/protobuf/compiler/cpp/generator.h +third_party/protobuf/src/google/protobuf/compiler/cpp/generator_unittest.cc third_party/protobuf/src/google/protobuf/compiler/cpp/helpers.cc third_party/protobuf/src/google/protobuf/compiler/cpp/helpers.h -third_party/protobuf/src/google/protobuf/compiler/cpp/map_field.cc -third_party/protobuf/src/google/protobuf/compiler/cpp/map_field.h +third_party/protobuf/src/google/protobuf/compiler/cpp/ifndef_guard.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/ifndef_guard.h +third_party/protobuf/src/google/protobuf/compiler/cpp/main.cc third_party/protobuf/src/google/protobuf/compiler/cpp/message.cc third_party/protobuf/src/google/protobuf/compiler/cpp/message.h -third_party/protobuf/src/google/protobuf/compiler/cpp/message_field.cc -third_party/protobuf/src/google/protobuf/compiler/cpp/message_field.h third_party/protobuf/src/google/protobuf/compiler/cpp/message_layout_helper.h third_party/protobuf/src/google/protobuf/compiler/cpp/message_size_unittest.cc third_party/protobuf/src/google/protobuf/compiler/cpp/metadata_test.cc third_party/protobuf/src/google/protobuf/compiler/cpp/move_unittest.cc third_party/protobuf/src/google/protobuf/compiler/cpp/names.h +third_party/protobuf/src/google/protobuf/compiler/cpp/namespace_printer.h third_party/protobuf/src/google/protobuf/compiler/cpp/options.h third_party/protobuf/src/google/protobuf/compiler/cpp/padding_optimizer.cc third_party/protobuf/src/google/protobuf/compiler/cpp/padding_optimizer.h third_party/protobuf/src/google/protobuf/compiler/cpp/parse_function_generator.cc third_party/protobuf/src/google/protobuf/compiler/cpp/parse_function_generator.h third_party/protobuf/src/google/protobuf/compiler/cpp/plugin_unittest.cc -third_party/protobuf/src/google/protobuf/compiler/cpp/primitive_field.cc -third_party/protobuf/src/google/protobuf/compiler/cpp/primitive_field.h third_party/protobuf/src/google/protobuf/compiler/cpp/service.cc third_party/protobuf/src/google/protobuf/compiler/cpp/service.h -third_party/protobuf/src/google/protobuf/compiler/cpp/string_field.cc -third_party/protobuf/src/google/protobuf/compiler/cpp/string_field.h +third_party/protobuf/src/google/protobuf/compiler/cpp/tools/analyze_profile_proto.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/tools/analyze_profile_proto_main.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/tracker.cc +third_party/protobuf/src/google/protobuf/compiler/cpp/tracker.h third_party/protobuf/src/google/protobuf/compiler/cpp/unittest.cc third_party/protobuf/src/google/protobuf/compiler/cpp/unittest.h third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc @@ -12540,7 +12644,6 @@ third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_message.cc third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_message.h third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.cc third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.h -third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_names.h third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_options.h third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_primitive_field.h @@ -12556,6 +12659,9 @@ third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_source_generator third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_source_generator_base.h third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_wrapper_field.h +third_party/protobuf/src/google/protobuf/compiler/csharp/names.cc +third_party/protobuf/src/google/protobuf/compiler/csharp/names.h +third_party/protobuf/src/google/protobuf/compiler/fake_plugin.cc third_party/protobuf/src/google/protobuf/compiler/importer.cc third_party/protobuf/src/google/protobuf/compiler/importer.h third_party/protobuf/src/google/protobuf/compiler/importer_unittest.cc @@ -12564,95 +12670,125 @@ third_party/protobuf/src/google/protobuf/compiler/java/context.h third_party/protobuf/src/google/protobuf/compiler/java/doc_comment.cc third_party/protobuf/src/google/protobuf/compiler/java/doc_comment.h third_party/protobuf/src/google/protobuf/compiler/java/doc_comment_unittest.cc -third_party/protobuf/src/google/protobuf/compiler/java/enum.cc -third_party/protobuf/src/google/protobuf/compiler/java/enum.h -third_party/protobuf/src/google/protobuf/compiler/java/enum_field.cc -third_party/protobuf/src/google/protobuf/compiler/java/enum_field.h -third_party/protobuf/src/google/protobuf/compiler/java/enum_field_lite.cc -third_party/protobuf/src/google/protobuf/compiler/java/enum_field_lite.h -third_party/protobuf/src/google/protobuf/compiler/java/enum_lite.cc -third_party/protobuf/src/google/protobuf/compiler/java/enum_lite.h -third_party/protobuf/src/google/protobuf/compiler/java/extension.cc -third_party/protobuf/src/google/protobuf/compiler/java/extension.h -third_party/protobuf/src/google/protobuf/compiler/java/extension_lite.cc -third_party/protobuf/src/google/protobuf/compiler/java/extension_lite.h -third_party/protobuf/src/google/protobuf/compiler/java/field.cc -third_party/protobuf/src/google/protobuf/compiler/java/field.h third_party/protobuf/src/google/protobuf/compiler/java/file.cc third_party/protobuf/src/google/protobuf/compiler/java/file.h +third_party/protobuf/src/google/protobuf/compiler/java/full/enum.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/enum.h +third_party/protobuf/src/google/protobuf/compiler/java/full/enum_field.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/enum_field.h +third_party/protobuf/src/google/protobuf/compiler/java/full/extension.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/extension.h +third_party/protobuf/src/google/protobuf/compiler/java/full/generator_factory.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/make_field_gens.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/make_field_gens.h +third_party/protobuf/src/google/protobuf/compiler/java/full/map_field.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/map_field.h +third_party/protobuf/src/google/protobuf/compiler/java/full/message.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/message.h +third_party/protobuf/src/google/protobuf/compiler/java/full/message_builder.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/message_builder.h +third_party/protobuf/src/google/protobuf/compiler/java/full/message_field.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/message_field.h +third_party/protobuf/src/google/protobuf/compiler/java/full/primitive_field.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/primitive_field.h +third_party/protobuf/src/google/protobuf/compiler/java/full/service.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/service.h +third_party/protobuf/src/google/protobuf/compiler/java/full/string_field.cc +third_party/protobuf/src/google/protobuf/compiler/java/full/string_field.h third_party/protobuf/src/google/protobuf/compiler/java/generator.cc third_party/protobuf/src/google/protobuf/compiler/java/generator.h -third_party/protobuf/src/google/protobuf/compiler/java/generator_factory.cc third_party/protobuf/src/google/protobuf/compiler/java/generator_factory.h third_party/protobuf/src/google/protobuf/compiler/java/helpers.cc third_party/protobuf/src/google/protobuf/compiler/java/helpers.h -third_party/protobuf/src/google/protobuf/compiler/java/kotlin_generator.cc -third_party/protobuf/src/google/protobuf/compiler/java/kotlin_generator.h -third_party/protobuf/src/google/protobuf/compiler/java/map_field.cc -third_party/protobuf/src/google/protobuf/compiler/java/map_field.h -third_party/protobuf/src/google/protobuf/compiler/java/map_field_lite.cc -third_party/protobuf/src/google/protobuf/compiler/java/map_field_lite.h -third_party/protobuf/src/google/protobuf/compiler/java/message.cc -third_party/protobuf/src/google/protobuf/compiler/java/message.h -third_party/protobuf/src/google/protobuf/compiler/java/message_builder.cc -third_party/protobuf/src/google/protobuf/compiler/java/message_builder.h -third_party/protobuf/src/google/protobuf/compiler/java/message_builder_lite.cc -third_party/protobuf/src/google/protobuf/compiler/java/message_builder_lite.h -third_party/protobuf/src/google/protobuf/compiler/java/message_field.cc -third_party/protobuf/src/google/protobuf/compiler/java/message_field.h -third_party/protobuf/src/google/protobuf/compiler/java/message_field_lite.cc -third_party/protobuf/src/google/protobuf/compiler/java/message_field_lite.h -third_party/protobuf/src/google/protobuf/compiler/java/message_lite.cc -third_party/protobuf/src/google/protobuf/compiler/java/message_lite.h +third_party/protobuf/src/google/protobuf/compiler/java/internal_helpers.cc +third_party/protobuf/src/google/protobuf/compiler/java/internal_helpers.h +third_party/protobuf/src/google/protobuf/compiler/java/java_generator.h +third_party/protobuf/src/google/protobuf/compiler/java/lite/enum.cc +third_party/protobuf/src/google/protobuf/compiler/java/lite/enum.h +third_party/protobuf/src/google/protobuf/compiler/java/lite/enum_field.cc +third_party/protobuf/src/google/protobuf/compiler/java/lite/enum_field.h +third_party/protobuf/src/google/protobuf/compiler/java/lite/extension.cc +third_party/protobuf/src/google/protobuf/compiler/java/lite/extension.h +third_party/protobuf/src/google/protobuf/compiler/java/lite/generator_factory.cc +third_party/protobuf/src/google/protobuf/compiler/java/lite/make_field_gens.cc +third_party/protobuf/src/google/protobuf/compiler/java/lite/make_field_gens.h +third_party/protobuf/src/google/protobuf/compiler/java/lite/map_field.cc +third_party/protobuf/src/google/protobuf/compiler/java/lite/map_field.h +third_party/protobuf/src/google/protobuf/compiler/java/lite/message.cc +third_party/protobuf/src/google/protobuf/compiler/java/lite/message.h +third_party/protobuf/src/google/protobuf/compiler/java/lite/message_builder.cc +third_party/protobuf/src/google/protobuf/compiler/java/lite/message_builder.h +third_party/protobuf/src/google/protobuf/compiler/java/lite/message_field.cc +third_party/protobuf/src/google/protobuf/compiler/java/lite/message_field.h +third_party/protobuf/src/google/protobuf/compiler/java/lite/primitive_field.cc +third_party/protobuf/src/google/protobuf/compiler/java/lite/primitive_field.h +third_party/protobuf/src/google/protobuf/compiler/java/lite/string_field.cc +third_party/protobuf/src/google/protobuf/compiler/java/lite/string_field.h +third_party/protobuf/src/google/protobuf/compiler/java/message_serialization.cc +third_party/protobuf/src/google/protobuf/compiler/java/message_serialization.h +third_party/protobuf/src/google/protobuf/compiler/java/message_serialization_unittest.cc third_party/protobuf/src/google/protobuf/compiler/java/name_resolver.cc third_party/protobuf/src/google/protobuf/compiler/java/name_resolver.h +third_party/protobuf/src/google/protobuf/compiler/java/names.cc third_party/protobuf/src/google/protobuf/compiler/java/names.h third_party/protobuf/src/google/protobuf/compiler/java/options.h third_party/protobuf/src/google/protobuf/compiler/java/plugin_unittest.cc -third_party/protobuf/src/google/protobuf/compiler/java/primitive_field.cc -third_party/protobuf/src/google/protobuf/compiler/java/primitive_field.h -third_party/protobuf/src/google/protobuf/compiler/java/primitive_field_lite.cc -third_party/protobuf/src/google/protobuf/compiler/java/primitive_field_lite.h -third_party/protobuf/src/google/protobuf/compiler/java/service.cc -third_party/protobuf/src/google/protobuf/compiler/java/service.h third_party/protobuf/src/google/protobuf/compiler/java/shared_code_generator.cc third_party/protobuf/src/google/protobuf/compiler/java/shared_code_generator.h -third_party/protobuf/src/google/protobuf/compiler/java/string_field.cc -third_party/protobuf/src/google/protobuf/compiler/java/string_field.h -third_party/protobuf/src/google/protobuf/compiler/java/string_field_lite.cc -third_party/protobuf/src/google/protobuf/compiler/java/string_field_lite.h +third_party/protobuf/src/google/protobuf/compiler/kotlin/file.cc +third_party/protobuf/src/google/protobuf/compiler/kotlin/file.h +third_party/protobuf/src/google/protobuf/compiler/kotlin/generator.cc +third_party/protobuf/src/google/protobuf/compiler/kotlin/generator.h +third_party/protobuf/src/google/protobuf/compiler/kotlin/message.cc +third_party/protobuf/src/google/protobuf/compiler/kotlin/message.h third_party/protobuf/src/google/protobuf/compiler/main.cc +third_party/protobuf/src/google/protobuf/compiler/main_no_generators.cc third_party/protobuf/src/google/protobuf/compiler/mock_code_generator.cc third_party/protobuf/src/google/protobuf/compiler/mock_code_generator.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum_field.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_extension.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_extension.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_generator.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_generator.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.h -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc -third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/enum.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/enum.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/enum_field.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/enum_field.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/extension.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/extension.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/field.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/field.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/file.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/file.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/generator.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/generator.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/helpers.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/helpers.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/import_writer.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/import_writer.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/line_consumer.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/line_consumer.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/line_consumer_unittest.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/map_field.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/map_field.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/message.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/message.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/message_field.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/message_field.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/names.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/names.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/names_unittest.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/nsobject_methods.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/oneof.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/oneof.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/options.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/primitive_field.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/primitive_field.h +third_party/protobuf/src/google/protobuf/compiler/objectivec/text_format_decode_data_unittest.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/tf_decode_data.cc +third_party/protobuf/src/google/protobuf/compiler/objectivec/tf_decode_data.h third_party/protobuf/src/google/protobuf/compiler/package_info.h third_party/protobuf/src/google/protobuf/compiler/parser.cc third_party/protobuf/src/google/protobuf/compiler/parser.h third_party/protobuf/src/google/protobuf/compiler/parser_unittest.cc +third_party/protobuf/src/google/protobuf/compiler/php/generator_unittest.cc +third_party/protobuf/src/google/protobuf/compiler/php/names.cc +third_party/protobuf/src/google/protobuf/compiler/php/names.h third_party/protobuf/src/google/protobuf/compiler/php/php_generator.cc third_party/protobuf/src/google/protobuf/compiler/php/php_generator.h third_party/protobuf/src/google/protobuf/compiler/plugin.cc @@ -12664,25 +12800,70 @@ third_party/protobuf/src/google/protobuf/compiler/python/helpers.h third_party/protobuf/src/google/protobuf/compiler/python/plugin_unittest.cc third_party/protobuf/src/google/protobuf/compiler/python/pyi_generator.cc third_party/protobuf/src/google/protobuf/compiler/python/pyi_generator.h +third_party/protobuf/src/google/protobuf/compiler/python/python_generator.h +third_party/protobuf/src/google/protobuf/compiler/retention.cc +third_party/protobuf/src/google/protobuf/compiler/retention.h +third_party/protobuf/src/google/protobuf/compiler/retention_unittest.cc third_party/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.cc third_party/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.h third_party/protobuf/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/accessor_case.h +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/accessors.cc +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/accessors.h +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/default_value.cc +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/default_value.h +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/generator.h +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/map.cc +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/repeated_field.cc +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_cord.cc +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_message.cc +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_scalar.cc +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_string.cc +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/unsupported_field.cc +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/with_presence.cc +third_party/protobuf/src/google/protobuf/compiler/rust/accessors/with_presence.h +third_party/protobuf/src/google/protobuf/compiler/rust/context.cc +third_party/protobuf/src/google/protobuf/compiler/rust/context.h +third_party/protobuf/src/google/protobuf/compiler/rust/enum.cc +third_party/protobuf/src/google/protobuf/compiler/rust/enum.h +third_party/protobuf/src/google/protobuf/compiler/rust/generator.cc +third_party/protobuf/src/google/protobuf/compiler/rust/generator.h +third_party/protobuf/src/google/protobuf/compiler/rust/message.cc +third_party/protobuf/src/google/protobuf/compiler/rust/message.h +third_party/protobuf/src/google/protobuf/compiler/rust/naming.cc +third_party/protobuf/src/google/protobuf/compiler/rust/naming.h +third_party/protobuf/src/google/protobuf/compiler/rust/oneof.cc +third_party/protobuf/src/google/protobuf/compiler/rust/oneof.h +third_party/protobuf/src/google/protobuf/compiler/rust/relative_path.cc +third_party/protobuf/src/google/protobuf/compiler/rust/relative_path.h +third_party/protobuf/src/google/protobuf/compiler/rust/relative_path_test.cc +third_party/protobuf/src/google/protobuf/compiler/rust/rust_keywords.cc +third_party/protobuf/src/google/protobuf/compiler/rust/rust_keywords.h +third_party/protobuf/src/google/protobuf/compiler/rust/upb_helpers.h third_party/protobuf/src/google/protobuf/compiler/scc.h third_party/protobuf/src/google/protobuf/compiler/subprocess.cc third_party/protobuf/src/google/protobuf/compiler/subprocess.h third_party/protobuf/src/google/protobuf/compiler/test_plugin.cc +third_party/protobuf/src/google/protobuf/compiler/versions.cc +third_party/protobuf/src/google/protobuf/compiler/versions.h +third_party/protobuf/src/google/protobuf/compiler/versions_test.cc third_party/protobuf/src/google/protobuf/compiler/zip_writer.cc third_party/protobuf/src/google/protobuf/compiler/zip_writer.h +third_party/protobuf/src/google/protobuf/debug_counter_test.cc third_party/protobuf/src/google/protobuf/descriptor.cc third_party/protobuf/src/google/protobuf/descriptor.h third_party/protobuf/src/google/protobuf/descriptor_database.cc third_party/protobuf/src/google/protobuf/descriptor_database.h third_party/protobuf/src/google/protobuf/descriptor_database_unittest.cc +third_party/protobuf/src/google/protobuf/descriptor_lite.h third_party/protobuf/src/google/protobuf/descriptor_unittest.cc +third_party/protobuf/src/google/protobuf/descriptor_visitor.h +third_party/protobuf/src/google/protobuf/descriptor_visitor_test.cc third_party/protobuf/src/google/protobuf/drop_unknown_fields_test.cc third_party/protobuf/src/google/protobuf/dynamic_message.cc third_party/protobuf/src/google/protobuf/dynamic_message.h third_party/protobuf/src/google/protobuf/dynamic_message_unittest.cc +third_party/protobuf/src/google/protobuf/edition_message_unittest.cc third_party/protobuf/src/google/protobuf/endian.h third_party/protobuf/src/google/protobuf/explicitly_constructed.h third_party/protobuf/src/google/protobuf/extension_set.cc @@ -12690,10 +12871,14 @@ third_party/protobuf/src/google/protobuf/extension_set.h third_party/protobuf/src/google/protobuf/extension_set_heavy.cc third_party/protobuf/src/google/protobuf/extension_set_inl.h third_party/protobuf/src/google/protobuf/extension_set_unittest.cc +third_party/protobuf/src/google/protobuf/feature_resolver.cc +third_party/protobuf/src/google/protobuf/feature_resolver.h +third_party/protobuf/src/google/protobuf/feature_resolver_test.cc third_party/protobuf/src/google/protobuf/field_access_listener.h third_party/protobuf/src/google/protobuf/generated_enum_reflection.h third_party/protobuf/src/google/protobuf/generated_enum_util.cc third_party/protobuf/src/google/protobuf/generated_enum_util.h +third_party/protobuf/src/google/protobuf/generated_enum_util_test.cc third_party/protobuf/src/google/protobuf/generated_message_bases.cc third_party/protobuf/src/google/protobuf/generated_message_bases.h third_party/protobuf/src/google/protobuf/generated_message_reflection.cc @@ -12701,17 +12886,23 @@ third_party/protobuf/src/google/protobuf/generated_message_reflection.h third_party/protobuf/src/google/protobuf/generated_message_reflection_unittest.cc third_party/protobuf/src/google/protobuf/generated_message_tctable_decl.h third_party/protobuf/src/google/protobuf/generated_message_tctable_full.cc +third_party/protobuf/src/google/protobuf/generated_message_tctable_gen.cc +third_party/protobuf/src/google/protobuf/generated_message_tctable_gen.h third_party/protobuf/src/google/protobuf/generated_message_tctable_impl.h third_party/protobuf/src/google/protobuf/generated_message_tctable_lite.cc third_party/protobuf/src/google/protobuf/generated_message_tctable_lite_test.cc third_party/protobuf/src/google/protobuf/generated_message_util.cc third_party/protobuf/src/google/protobuf/generated_message_util.h third_party/protobuf/src/google/protobuf/has_bits.h +third_party/protobuf/src/google/protobuf/has_bits_test.cc third_party/protobuf/src/google/protobuf/implicit_weak_message.cc third_party/protobuf/src/google/protobuf/implicit_weak_message.h third_party/protobuf/src/google/protobuf/inlined_string_field.cc third_party/protobuf/src/google/protobuf/inlined_string_field.h third_party/protobuf/src/google/protobuf/inlined_string_field_unittest.cc +third_party/protobuf/src/google/protobuf/internal_message_util_unittest.cc +third_party/protobuf/src/google/protobuf/internal_visibility.h +third_party/protobuf/src/google/protobuf/internal_visibility_for_testing.h third_party/protobuf/src/google/protobuf/io/coded_stream.cc third_party/protobuf/src/google/protobuf/io/coded_stream.h third_party/protobuf/src/google/protobuf/io/coded_stream_unittest.cc @@ -12723,12 +12914,18 @@ third_party/protobuf/src/google/protobuf/io/io_win32_unittest.cc third_party/protobuf/src/google/protobuf/io/package_info.h third_party/protobuf/src/google/protobuf/io/printer.cc third_party/protobuf/src/google/protobuf/io/printer.h +third_party/protobuf/src/google/protobuf/io/printer_death_test.cc third_party/protobuf/src/google/protobuf/io/printer_unittest.cc third_party/protobuf/src/google/protobuf/io/strtod.cc third_party/protobuf/src/google/protobuf/io/strtod.h +third_party/protobuf/src/google/protobuf/io/test_zero_copy_stream.h +third_party/protobuf/src/google/protobuf/io/test_zero_copy_stream_test.cc third_party/protobuf/src/google/protobuf/io/tokenizer.cc third_party/protobuf/src/google/protobuf/io/tokenizer.h third_party/protobuf/src/google/protobuf/io/tokenizer_unittest.cc +third_party/protobuf/src/google/protobuf/io/zero_copy_sink.cc +third_party/protobuf/src/google/protobuf/io/zero_copy_sink.h +third_party/protobuf/src/google/protobuf/io/zero_copy_sink_test.cc third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc third_party/protobuf/src/google/protobuf/io/zero_copy_stream.h third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.cc @@ -12736,12 +12933,33 @@ third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h third_party/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc +third_party/protobuf/src/google/protobuf/json/internal/descriptor_traits.h +third_party/protobuf/src/google/protobuf/json/internal/lexer.cc +third_party/protobuf/src/google/protobuf/json/internal/lexer.h +third_party/protobuf/src/google/protobuf/json/internal/lexer_test.cc +third_party/protobuf/src/google/protobuf/json/internal/message_path.cc +third_party/protobuf/src/google/protobuf/json/internal/message_path.h +third_party/protobuf/src/google/protobuf/json/internal/parser.cc +third_party/protobuf/src/google/protobuf/json/internal/parser.h +third_party/protobuf/src/google/protobuf/json/internal/parser_traits.h +third_party/protobuf/src/google/protobuf/json/internal/unparser.cc +third_party/protobuf/src/google/protobuf/json/internal/unparser.h +third_party/protobuf/src/google/protobuf/json/internal/unparser_traits.h +third_party/protobuf/src/google/protobuf/json/internal/untyped_message.cc +third_party/protobuf/src/google/protobuf/json/internal/untyped_message.h +third_party/protobuf/src/google/protobuf/json/internal/writer.cc +third_party/protobuf/src/google/protobuf/json/internal/writer.h +third_party/protobuf/src/google/protobuf/json/internal/zero_copy_buffered_stream.cc +third_party/protobuf/src/google/protobuf/json/internal/zero_copy_buffered_stream.h +third_party/protobuf/src/google/protobuf/json/internal/zero_copy_buffered_stream_test.cc +third_party/protobuf/src/google/protobuf/json/json.cc +third_party/protobuf/src/google/protobuf/json/json.h +third_party/protobuf/src/google/protobuf/json/json_test.cc third_party/protobuf/src/google/protobuf/lite_arena_unittest.cc third_party/protobuf/src/google/protobuf/lite_unittest.cc third_party/protobuf/src/google/protobuf/map.cc third_party/protobuf/src/google/protobuf/map.h third_party/protobuf/src/google/protobuf/map_entry.h -third_party/protobuf/src/google/protobuf/map_entry_lite.h third_party/protobuf/src/google/protobuf/map_field.cc third_party/protobuf/src/google/protobuf/map_field.h third_party/protobuf/src/google/protobuf/map_field_inl.h @@ -12749,6 +12967,7 @@ third_party/protobuf/src/google/protobuf/map_field_lite.h third_party/protobuf/src/google/protobuf/map_field_test.cc third_party/protobuf/src/google/protobuf/map_lite_test_util.cc third_party/protobuf/src/google/protobuf/map_lite_test_util.h +third_party/protobuf/src/google/protobuf/map_probe_benchmark.cc third_party/protobuf/src/google/protobuf/map_test.cc third_party/protobuf/src/google/protobuf/map_test_util.h third_party/protobuf/src/google/protobuf/map_test_util_impl.h @@ -12760,17 +12979,27 @@ third_party/protobuf/src/google/protobuf/message_lite.h third_party/protobuf/src/google/protobuf/message_unittest.cc third_party/protobuf/src/google/protobuf/metadata.h third_party/protobuf/src/google/protobuf/metadata_lite.h +third_party/protobuf/src/google/protobuf/no_field_presence_map_test.cc third_party/protobuf/src/google/protobuf/no_field_presence_test.cc third_party/protobuf/src/google/protobuf/package_info.h third_party/protobuf/src/google/protobuf/parse_context.cc third_party/protobuf/src/google/protobuf/parse_context.h +third_party/protobuf/src/google/protobuf/port.cc third_party/protobuf/src/google/protobuf/port.h +third_party/protobuf/src/google/protobuf/port_test.cc third_party/protobuf/src/google/protobuf/preserve_unknown_enum_test.cc third_party/protobuf/src/google/protobuf/proto3_arena_lite_unittest.cc third_party/protobuf/src/google/protobuf/proto3_arena_unittest.cc third_party/protobuf/src/google/protobuf/proto3_lite_unittest.cc +third_party/protobuf/src/google/protobuf/raw_ptr.cc +third_party/protobuf/src/google/protobuf/raw_ptr.h +third_party/protobuf/src/google/protobuf/raw_ptr_test.cc +third_party/protobuf/src/google/protobuf/redaction_metric_test.cc third_party/protobuf/src/google/protobuf/reflection.h third_party/protobuf/src/google/protobuf/reflection_internal.h +third_party/protobuf/src/google/protobuf/reflection_mode.cc +third_party/protobuf/src/google/protobuf/reflection_mode.h +third_party/protobuf/src/google/protobuf/reflection_mode_test.cc third_party/protobuf/src/google/protobuf/reflection_ops.cc third_party/protobuf/src/google/protobuf/reflection_ops.h third_party/protobuf/src/google/protobuf/reflection_ops_unittest.cc @@ -12782,52 +13011,23 @@ third_party/protobuf/src/google/protobuf/repeated_field_reflection_unittest.cc third_party/protobuf/src/google/protobuf/repeated_field_unittest.cc third_party/protobuf/src/google/protobuf/repeated_ptr_field.cc third_party/protobuf/src/google/protobuf/repeated_ptr_field.h +third_party/protobuf/src/google/protobuf/repeated_ptr_field_unittest.cc +third_party/protobuf/src/google/protobuf/retention_test.cc +third_party/protobuf/src/google/protobuf/serial_arena.h third_party/protobuf/src/google/protobuf/service.cc third_party/protobuf/src/google/protobuf/service.h +third_party/protobuf/src/google/protobuf/string_block.h +third_party/protobuf/src/google/protobuf/string_block_test.cc third_party/protobuf/src/google/protobuf/string_member_robber.h -third_party/protobuf/src/google/protobuf/stubs/bytestream.cc -third_party/protobuf/src/google/protobuf/stubs/bytestream.h -third_party/protobuf/src/google/protobuf/stubs/bytestream_unittest.cc -third_party/protobuf/src/google/protobuf/stubs/casts.h +third_party/protobuf/src/google/protobuf/string_piece_field_support_unittest.cc +third_party/protobuf/src/google/protobuf/stubs/callback.h third_party/protobuf/src/google/protobuf/stubs/common.cc third_party/protobuf/src/google/protobuf/stubs/common.h third_party/protobuf/src/google/protobuf/stubs/common_unittest.cc -third_party/protobuf/src/google/protobuf/stubs/hash.h -third_party/protobuf/src/google/protobuf/stubs/int128.cc -third_party/protobuf/src/google/protobuf/stubs/int128.h -third_party/protobuf/src/google/protobuf/stubs/int128_unittest.cc -third_party/protobuf/src/google/protobuf/stubs/logging.h -third_party/protobuf/src/google/protobuf/stubs/macros.h -third_party/protobuf/src/google/protobuf/stubs/map_util.h -third_party/protobuf/src/google/protobuf/stubs/mathutil.h -third_party/protobuf/src/google/protobuf/stubs/once.h third_party/protobuf/src/google/protobuf/stubs/platform_macros.h third_party/protobuf/src/google/protobuf/stubs/port.h -third_party/protobuf/src/google/protobuf/stubs/status.cc -third_party/protobuf/src/google/protobuf/stubs/status.h third_party/protobuf/src/google/protobuf/stubs/status_macros.h -third_party/protobuf/src/google/protobuf/stubs/status_test.cc -third_party/protobuf/src/google/protobuf/stubs/statusor.cc -third_party/protobuf/src/google/protobuf/stubs/statusor.h -third_party/protobuf/src/google/protobuf/stubs/statusor_test.cc -third_party/protobuf/src/google/protobuf/stubs/stl_util.h -third_party/protobuf/src/google/protobuf/stubs/stringpiece.cc -third_party/protobuf/src/google/protobuf/stubs/stringpiece.h -third_party/protobuf/src/google/protobuf/stubs/stringpiece_unittest.cc -third_party/protobuf/src/google/protobuf/stubs/stringprintf.cc -third_party/protobuf/src/google/protobuf/stubs/stringprintf.h -third_party/protobuf/src/google/protobuf/stubs/stringprintf_unittest.cc -third_party/protobuf/src/google/protobuf/stubs/structurally_valid.cc -third_party/protobuf/src/google/protobuf/stubs/structurally_valid_unittest.cc -third_party/protobuf/src/google/protobuf/stubs/strutil.cc -third_party/protobuf/src/google/protobuf/stubs/strutil.h -third_party/protobuf/src/google/protobuf/stubs/strutil_unittest.cc -third_party/protobuf/src/google/protobuf/stubs/substitute.cc -third_party/protobuf/src/google/protobuf/stubs/substitute.h -third_party/protobuf/src/google/protobuf/stubs/template_util.h -third_party/protobuf/src/google/protobuf/stubs/template_util_unittest.cc -third_party/protobuf/src/google/protobuf/stubs/time.h -third_party/protobuf/src/google/protobuf/stubs/time_test.cc +third_party/protobuf/src/google/protobuf/test_textproto.h third_party/protobuf/src/google/protobuf/test_util.cc third_party/protobuf/src/google/protobuf/test_util.h third_party/protobuf/src/google/protobuf/test_util2.h @@ -12837,11 +13037,10 @@ third_party/protobuf/src/google/protobuf/testing/file.cc third_party/protobuf/src/google/protobuf/testing/file.h third_party/protobuf/src/google/protobuf/testing/googletest.cc third_party/protobuf/src/google/protobuf/testing/googletest.h -third_party/protobuf/src/google/protobuf/testing/zcgunzip.cc -third_party/protobuf/src/google/protobuf/testing/zcgzip.cc third_party/protobuf/src/google/protobuf/text_format.cc third_party/protobuf/src/google/protobuf/text_format.h third_party/protobuf/src/google/protobuf/text_format_unittest.cc +third_party/protobuf/src/google/protobuf/thread_safe_arena.h third_party/protobuf/src/google/protobuf/unknown_field_set.cc third_party/protobuf/src/google/protobuf/unknown_field_set.h third_party/protobuf/src/google/protobuf/unknown_field_set_unittest.cc @@ -12854,49 +13053,7 @@ third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc third_party/protobuf/src/google/protobuf/util/field_mask_util.cc third_party/protobuf/src/google/protobuf/util/field_mask_util.h third_party/protobuf/src/google/protobuf/util/field_mask_util_test.cc -third_party/protobuf/src/google/protobuf/util/internal/constants.h -third_party/protobuf/src/google/protobuf/util/internal/datapiece.cc -third_party/protobuf/src/google/protobuf/util/internal/datapiece.h -third_party/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.cc -third_party/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h -third_party/protobuf/src/google/protobuf/util/internal/default_value_objectwriter_test.cc -third_party/protobuf/src/google/protobuf/util/internal/error_listener.cc -third_party/protobuf/src/google/protobuf/util/internal/error_listener.h -third_party/protobuf/src/google/protobuf/util/internal/expecting_objectwriter.h -third_party/protobuf/src/google/protobuf/util/internal/field_mask_utility.cc -third_party/protobuf/src/google/protobuf/util/internal/field_mask_utility.h -third_party/protobuf/src/google/protobuf/util/internal/json_escaping.cc -third_party/protobuf/src/google/protobuf/util/internal/json_escaping.h -third_party/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc -third_party/protobuf/src/google/protobuf/util/internal/json_objectwriter.h -third_party/protobuf/src/google/protobuf/util/internal/json_objectwriter_test.cc -third_party/protobuf/src/google/protobuf/util/internal/json_stream_parser.cc -third_party/protobuf/src/google/protobuf/util/internal/json_stream_parser.h -third_party/protobuf/src/google/protobuf/util/internal/json_stream_parser_test.cc -third_party/protobuf/src/google/protobuf/util/internal/location_tracker.h -third_party/protobuf/src/google/protobuf/util/internal/mock_error_listener.h -third_party/protobuf/src/google/protobuf/util/internal/object_location_tracker.h -third_party/protobuf/src/google/protobuf/util/internal/object_source.h -third_party/protobuf/src/google/protobuf/util/internal/object_writer.cc -third_party/protobuf/src/google/protobuf/util/internal/object_writer.h -third_party/protobuf/src/google/protobuf/util/internal/proto_writer.cc -third_party/protobuf/src/google/protobuf/util/internal/proto_writer.h -third_party/protobuf/src/google/protobuf/util/internal/protostream_objectsource.cc -third_party/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h -third_party/protobuf/src/google/protobuf/util/internal/protostream_objectsource_test.cc -third_party/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.cc -third_party/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h -third_party/protobuf/src/google/protobuf/util/internal/protostream_objectwriter_test.cc -third_party/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h -third_party/protobuf/src/google/protobuf/util/internal/type_info.cc -third_party/protobuf/src/google/protobuf/util/internal/type_info.h -third_party/protobuf/src/google/protobuf/util/internal/type_info_test_helper.cc -third_party/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h -third_party/protobuf/src/google/protobuf/util/internal/utility.cc -third_party/protobuf/src/google/protobuf/util/internal/utility.h -third_party/protobuf/src/google/protobuf/util/json_util.cc third_party/protobuf/src/google/protobuf/util/json_util.h -third_party/protobuf/src/google/protobuf/util/json_util_test.cc third_party/protobuf/src/google/protobuf/util/message_differencer.cc third_party/protobuf/src/google/protobuf/util/message_differencer.h third_party/protobuf/src/google/protobuf/util/message_differencer_unittest.cc @@ -12908,13 +13065,268 @@ third_party/protobuf/src/google/protobuf/util/type_resolver.h third_party/protobuf/src/google/protobuf/util/type_resolver_util.cc third_party/protobuf/src/google/protobuf/util/type_resolver_util.h third_party/protobuf/src/google/protobuf/util/type_resolver_util_test.cc +third_party/protobuf/src/google/protobuf/varint_shuffle.h +third_party/protobuf/src/google/protobuf/varint_shuffle_test.cc third_party/protobuf/src/google/protobuf/well_known_types_unittest.cc third_party/protobuf/src/google/protobuf/wire_format.cc third_party/protobuf/src/google/protobuf/wire_format.h third_party/protobuf/src/google/protobuf/wire_format_lite.cc third_party/protobuf/src/google/protobuf/wire_format_lite.h third_party/protobuf/src/google/protobuf/wire_format_unittest.cc -third_party/protobuf/update_version.py +third_party/protobuf/upb/base/descriptor_constants.h +third_party/protobuf/upb/base/internal/endian.h +third_party/protobuf/upb/base/internal/log2.h +third_party/protobuf/upb/base/status.c +third_party/protobuf/upb/base/status.h +third_party/protobuf/upb/base/status.hpp +third_party/protobuf/upb/base/string_view.h +third_party/protobuf/upb/base/upcast.h +third_party/protobuf/upb/bazel/amalgamate.py +third_party/protobuf/upb/cmake/make_cmakelists.py +third_party/protobuf/upb/cmake/staleness_test.py +third_party/protobuf/upb/cmake/staleness_test_lib.py +third_party/protobuf/upb/conformance/conformance_upb.c +third_party/protobuf/upb/generated_code_support.h +third_party/protobuf/upb/hash/common.c +third_party/protobuf/upb/hash/common.h +third_party/protobuf/upb/hash/int_table.h +third_party/protobuf/upb/hash/str_table.h +third_party/protobuf/upb/hash/test.cc +third_party/protobuf/upb/io/chunked_input_stream.c +third_party/protobuf/upb/io/chunked_input_stream.h +third_party/protobuf/upb/io/chunked_output_stream.c +third_party/protobuf/upb/io/chunked_output_stream.h +third_party/protobuf/upb/io/string.h +third_party/protobuf/upb/io/string_test.cc +third_party/protobuf/upb/io/tokenizer.c +third_party/protobuf/upb/io/tokenizer.h +third_party/protobuf/upb/io/tokenizer_test.cc +third_party/protobuf/upb/io/zero_copy_input_stream.h +third_party/protobuf/upb/io/zero_copy_output_stream.h +third_party/protobuf/upb/io/zero_copy_stream_test.cc +third_party/protobuf/upb/json/decode.c +third_party/protobuf/upb/json/decode.h +third_party/protobuf/upb/json/decode_test.cc +third_party/protobuf/upb/json/encode.c +third_party/protobuf/upb/json/encode.h +third_party/protobuf/upb/json/encode_test.cc +third_party/protobuf/upb/json/fuzz_test.cc +third_party/protobuf/upb/lex/atoi.c +third_party/protobuf/upb/lex/atoi.h +third_party/protobuf/upb/lex/atoi_test.cc +third_party/protobuf/upb/lex/round_trip.c +third_party/protobuf/upb/lex/round_trip.h +third_party/protobuf/upb/lex/strtod.c +third_party/protobuf/upb/lex/strtod.h +third_party/protobuf/upb/lex/unicode.c +third_party/protobuf/upb/lex/unicode.h +third_party/protobuf/upb/mem/alloc.c +third_party/protobuf/upb/mem/alloc.h +third_party/protobuf/upb/mem/arena.c +third_party/protobuf/upb/mem/arena.h +third_party/protobuf/upb/mem/arena.hpp +third_party/protobuf/upb/mem/arena_test.cc +third_party/protobuf/upb/mem/internal/arena.h +third_party/protobuf/upb/message/accessors.c +third_party/protobuf/upb/message/accessors.h +third_party/protobuf/upb/message/accessors_split64.h +third_party/protobuf/upb/message/accessors_test.cc +third_party/protobuf/upb/message/array.c +third_party/protobuf/upb/message/array.h +third_party/protobuf/upb/message/array_test.cc +third_party/protobuf/upb/message/compare.c +third_party/protobuf/upb/message/compare.h +third_party/protobuf/upb/message/compat.c +third_party/protobuf/upb/message/compat.h +third_party/protobuf/upb/message/copy.c +third_party/protobuf/upb/message/copy.h +third_party/protobuf/upb/message/copy_test.cc +third_party/protobuf/upb/message/internal/accessors.h +third_party/protobuf/upb/message/internal/array.h +third_party/protobuf/upb/message/internal/compare_unknown.c +third_party/protobuf/upb/message/internal/compare_unknown.h +third_party/protobuf/upb/message/internal/compare_unknown_test.cc +third_party/protobuf/upb/message/internal/extension.c +third_party/protobuf/upb/message/internal/extension.h +third_party/protobuf/upb/message/internal/iterator.c +third_party/protobuf/upb/message/internal/iterator.h +third_party/protobuf/upb/message/internal/map.h +third_party/protobuf/upb/message/internal/map_entry.h +third_party/protobuf/upb/message/internal/map_sorter.h +third_party/protobuf/upb/message/internal/message.c +third_party/protobuf/upb/message/internal/message.h +third_party/protobuf/upb/message/internal/tagged_ptr.h +third_party/protobuf/upb/message/internal/types.h +third_party/protobuf/upb/message/map.c +third_party/protobuf/upb/message/map.h +third_party/protobuf/upb/message/map_gencode_util.h +third_party/protobuf/upb/message/map_sorter.c +third_party/protobuf/upb/message/map_test.cc +third_party/protobuf/upb/message/message.c +third_party/protobuf/upb/message/message.h +third_party/protobuf/upb/message/promote.c +third_party/protobuf/upb/message/promote.h +third_party/protobuf/upb/message/promote_test.cc +third_party/protobuf/upb/message/tagged_ptr.h +third_party/protobuf/upb/message/test.cc +third_party/protobuf/upb/message/utf8_test.cc +third_party/protobuf/upb/message/value.h +third_party/protobuf/upb/mini_descriptor/build_enum.c +third_party/protobuf/upb/mini_descriptor/build_enum.h +third_party/protobuf/upb/mini_descriptor/decode.c +third_party/protobuf/upb/mini_descriptor/decode.h +third_party/protobuf/upb/mini_descriptor/internal/base92.c +third_party/protobuf/upb/mini_descriptor/internal/base92.h +third_party/protobuf/upb/mini_descriptor/internal/decoder.h +third_party/protobuf/upb/mini_descriptor/internal/encode.c +third_party/protobuf/upb/mini_descriptor/internal/encode.h +third_party/protobuf/upb/mini_descriptor/internal/encode.hpp +third_party/protobuf/upb/mini_descriptor/internal/encode_test.cc +third_party/protobuf/upb/mini_descriptor/internal/modifiers.h +third_party/protobuf/upb/mini_descriptor/internal/wire_constants.h +third_party/protobuf/upb/mini_descriptor/link.c +third_party/protobuf/upb/mini_descriptor/link.h +third_party/protobuf/upb/mini_table/compat.c +third_party/protobuf/upb/mini_table/compat.h +third_party/protobuf/upb/mini_table/compat_test.cc +third_party/protobuf/upb/mini_table/enum.h +third_party/protobuf/upb/mini_table/extension.h +third_party/protobuf/upb/mini_table/extension_registry.c +third_party/protobuf/upb/mini_table/extension_registry.h +third_party/protobuf/upb/mini_table/field.h +third_party/protobuf/upb/mini_table/file.h +third_party/protobuf/upb/mini_table/internal/enum.h +third_party/protobuf/upb/mini_table/internal/extension.h +third_party/protobuf/upb/mini_table/internal/field.h +third_party/protobuf/upb/mini_table/internal/file.h +third_party/protobuf/upb/mini_table/internal/message.c +third_party/protobuf/upb/mini_table/internal/message.h +third_party/protobuf/upb/mini_table/internal/size_log2.h +third_party/protobuf/upb/mini_table/internal/sub.h +third_party/protobuf/upb/mini_table/message.c +third_party/protobuf/upb/mini_table/message.h +third_party/protobuf/upb/mini_table/sub.h +third_party/protobuf/upb/port/atomic.h +third_party/protobuf/upb/port/vsnprintf_compat.h +third_party/protobuf/upb/reflection/common.h +third_party/protobuf/upb/reflection/def.h +third_party/protobuf/upb/reflection/def.hpp +third_party/protobuf/upb/reflection/def_pool.c +third_party/protobuf/upb/reflection/def_pool.h +third_party/protobuf/upb/reflection/def_type.c +third_party/protobuf/upb/reflection/def_type.h +third_party/protobuf/upb/reflection/desc_state.c +third_party/protobuf/upb/reflection/enum_def.c +third_party/protobuf/upb/reflection/enum_def.h +third_party/protobuf/upb/reflection/enum_reserved_range.c +third_party/protobuf/upb/reflection/enum_reserved_range.h +third_party/protobuf/upb/reflection/enum_value_def.c +third_party/protobuf/upb/reflection/enum_value_def.h +third_party/protobuf/upb/reflection/extension_range.c +third_party/protobuf/upb/reflection/extension_range.h +third_party/protobuf/upb/reflection/field_def.c +third_party/protobuf/upb/reflection/field_def.h +third_party/protobuf/upb/reflection/file_def.c +third_party/protobuf/upb/reflection/file_def.h +third_party/protobuf/upb/reflection/internal/def_builder.c +third_party/protobuf/upb/reflection/internal/def_builder.h +third_party/protobuf/upb/reflection/internal/def_builder_test.cc +third_party/protobuf/upb/reflection/internal/def_pool.h +third_party/protobuf/upb/reflection/internal/desc_state.h +third_party/protobuf/upb/reflection/internal/enum_def.h +third_party/protobuf/upb/reflection/internal/enum_reserved_range.h +third_party/protobuf/upb/reflection/internal/enum_value_def.h +third_party/protobuf/upb/reflection/internal/extension_range.h +third_party/protobuf/upb/reflection/internal/field_def.h +third_party/protobuf/upb/reflection/internal/file_def.h +third_party/protobuf/upb/reflection/internal/message_def.h +third_party/protobuf/upb/reflection/internal/message_reserved_range.h +third_party/protobuf/upb/reflection/internal/method_def.h +third_party/protobuf/upb/reflection/internal/oneof_def.h +third_party/protobuf/upb/reflection/internal/service_def.h +third_party/protobuf/upb/reflection/internal/strdup2.c +third_party/protobuf/upb/reflection/internal/strdup2.h +third_party/protobuf/upb/reflection/internal/upb_edition_defaults.h +third_party/protobuf/upb/reflection/message.c +third_party/protobuf/upb/reflection/message.h +third_party/protobuf/upb/reflection/message.hpp +third_party/protobuf/upb/reflection/message_def.c +third_party/protobuf/upb/reflection/message_def.h +third_party/protobuf/upb/reflection/message_reserved_range.c +third_party/protobuf/upb/reflection/message_reserved_range.h +third_party/protobuf/upb/reflection/method_def.c +third_party/protobuf/upb/reflection/method_def.h +third_party/protobuf/upb/reflection/oneof_def.c +third_party/protobuf/upb/reflection/oneof_def.h +third_party/protobuf/upb/reflection/service_def.c +third_party/protobuf/upb/reflection/service_def.h +third_party/protobuf/upb/test/editions_test.cc +third_party/protobuf/upb/test/fuzz_util.cc +third_party/protobuf/upb/test/fuzz_util.h +third_party/protobuf/upb/test/parse_text_proto.h +third_party/protobuf/upb/test/proto3_test.cc +third_party/protobuf/upb/test/test_cpp.cc +third_party/protobuf/upb/test/test_generated_code.cc +third_party/protobuf/upb/test/test_import_empty_srcs.cc +third_party/protobuf/upb/test/test_mini_table_oneof.cc +third_party/protobuf/upb/text/debug_string.c +third_party/protobuf/upb/text/debug_string.h +third_party/protobuf/upb/text/encode.c +third_party/protobuf/upb/text/encode.h +third_party/protobuf/upb/text/encode_debug_test.cc +third_party/protobuf/upb/text/internal/encode.c +third_party/protobuf/upb/text/internal/encode.h +third_party/protobuf/upb/text/options.h +third_party/protobuf/upb/util/def_to_proto.c +third_party/protobuf/upb/util/def_to_proto.h +third_party/protobuf/upb/util/def_to_proto_fuzz_test.cc +third_party/protobuf/upb/util/def_to_proto_test.cc +third_party/protobuf/upb/util/def_to_proto_test.h +third_party/protobuf/upb/util/required_fields.c +third_party/protobuf/upb/util/required_fields.h +third_party/protobuf/upb/util/required_fields_test.cc +third_party/protobuf/upb/wire/byte_size.c +third_party/protobuf/upb/wire/byte_size.h +third_party/protobuf/upb/wire/byte_size_test.cc +third_party/protobuf/upb/wire/decode.c +third_party/protobuf/upb/wire/decode.h +third_party/protobuf/upb/wire/encode.c +third_party/protobuf/upb/wire/encode.h +third_party/protobuf/upb/wire/eps_copy_input_stream.c +third_party/protobuf/upb/wire/eps_copy_input_stream.h +third_party/protobuf/upb/wire/eps_copy_input_stream_test.cc +third_party/protobuf/upb/wire/internal/constants.h +third_party/protobuf/upb/wire/internal/decode_fast.c +third_party/protobuf/upb/wire/internal/decode_fast.h +third_party/protobuf/upb/wire/internal/decoder.h +third_party/protobuf/upb/wire/internal/reader.h +third_party/protobuf/upb/wire/reader.c +third_party/protobuf/upb/wire/reader.h +third_party/protobuf/upb/wire/types.h +third_party/protobuf/upb_generator/c/generator.cc +third_party/protobuf/upb_generator/c/names.cc +third_party/protobuf/upb_generator/c/names.h +third_party/protobuf/upb_generator/c/names_internal.cc +third_party/protobuf/upb_generator/c/names_internal.h +third_party/protobuf/upb_generator/common.cc +third_party/protobuf/upb_generator/common.h +third_party/protobuf/upb_generator/common/names.cc +third_party/protobuf/upb_generator/common/names.h +third_party/protobuf/upb_generator/file_layout.cc +third_party/protobuf/upb_generator/file_layout.h +third_party/protobuf/upb_generator/minitable/fasttable.cc +third_party/protobuf/upb_generator/minitable/fasttable.h +third_party/protobuf/upb_generator/minitable/generator.cc +third_party/protobuf/upb_generator/minitable/generator.h +third_party/protobuf/upb_generator/minitable/main.cc +third_party/protobuf/upb_generator/minitable/names.cc +third_party/protobuf/upb_generator/minitable/names.h +third_party/protobuf/upb_generator/minitable/names_internal.cc +third_party/protobuf/upb_generator/minitable/names_internal.h +third_party/protobuf/upb_generator/plugin.h +third_party/protobuf/upb_generator/reflection/generator.cc +third_party/protobuf/upb_generator/reflection/names.cc +third_party/protobuf/upb_generator/reflection/names.h third_party/pthreadpool/chromium/jobs.cc third_party/pycoverage/coverage/htmlfiles/pyfile.html third_party/pyelftools/elftools/__init__.py @@ -12998,6 +13410,7 @@ third_party/rust/diplomat/v0_9/BUILD.gn third_party/rust/diplomat_core/v0_9/BUILD.gn third_party/rust/diplomat_runtime/v0_9/BUILD.gn third_party/rust/foldhash/v0_1/BUILD.gn +third_party/rust/hashbrown/v0_15/BUILD.gn third_party/rust/heck/v0_4/BUILD.gn third_party/rust/itoa/v1/BUILD.gn third_party/rust/lazy_static/v1/BUILD.gn @@ -13022,6 +13435,7 @@ third_party/rust/serde/v1/BUILD.gn third_party/rust/serde_derive/v1/BUILD.gn third_party/rust/serde_json/v1/BUILD.gn third_party/rust/serde_json_lenient/v0_2/BUILD.gn +third_party/rust/sfv/v0_10/BUILD.gn third_party/rust/stable_deref_trait/v1/BUILD.gn third_party/rust/strck/v1/BUILD.gn third_party/rust/strum/v0_25/BUILD.gn @@ -13079,7 +13493,6 @@ third_party/skia/fuzz/FuzzPathop.cpp 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/gradients.cpp @@ -13123,6 +13536,8 @@ third_party/skia/infra/bots/recipe_modules/gsutil/examples/full.py third_party/skia/infra/bots/recipe_modules/infra/examples/full.py third_party/skia/infra/bots/recipe_modules/run/examples/full.py third_party/skia/infra/bots/recipe_modules/vars/examples/full.py +third_party/skia/infra/bots/recipe_modules/xcode/api.py +third_party/skia/infra/bots/recipe_modules/xcode/examples/full.py third_party/skia/infra/bots/recipes.py third_party/skia/infra/bots/recipes/compile.py third_party/skia/infra/bots/recipes/compute_buildstats.expected/normal_bot.json @@ -13242,6 +13657,8 @@ third_party/skia/tests/BlurTest.cpp third_party/skia/tests/CanvasTest.cpp third_party/skia/tests/ClipperTest.cpp third_party/skia/tests/CodecTest.cpp +third_party/skia/tests/ColorPrivTest.cpp +third_party/skia/tests/CtsEnforcement.h third_party/skia/tests/DrawPathTest.cpp third_party/skia/tests/DrawTextTest.cpp third_party/skia/tests/FillPathTest.cpp @@ -13519,6 +13936,43 @@ third_party/speedometer/v3.0/resources/todomvc/vanilla-examples/javascript-es5/s third_party/speedometer/v3.0/resources/todomvc/vanilla-examples/javascript-es6-webpack-complex/dist/app.css third_party/speedometer/v3.0/resources/todomvc/vanilla-examples/javascript-es6-webpack/package-lock.json third_party/speedometer/v3.0/resources/todomvc/vanilla-examples/javascript-es6-webpack/src/helpers.js +third_party/speedometer/v3.1/resources/editors/assets/longscript.js +third_party/speedometer/v3.1/resources/editors/dist/assets/codemirror-521de7ab.js +third_party/speedometer/v3.1/resources/editors/dist/assets/tiptap-95a40ba8.js +third_party/speedometer/v3.1/resources/newssite/news-next/dist/_next/static/chunks/main-2ba37e62325cc71b.js +third_party/speedometer/v3.1/resources/perf.webkit.org/public/data/manifest.json +third_party/speedometer/v3.1/resources/react-stockcharts/package-lock.json +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/angular-complex/dist/3rdpartylicenses.txt +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/angular-complex/dist/styles.746a93d9fd4de753.css +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/angular/dist/3rdpartylicenses.txt +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/backbone-complex/dist/index.css +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/backbone/dist/index.css +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/jquery-complex/dist/index.css +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/jquery/dist/index.css +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/lit/src/lib/todo-item.ts +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/preact-complex/dist/app.css +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/preact/package-lock.json +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/react-complex/dist/app.css +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/react-redux-complex/dist/app.css +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/react-redux/package-lock.json +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/react/package-lock.json +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/svelte-complex/dist/app.css +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/vue-complex/dist/css/app.319576e1.css +third_party/speedometer/v3.1/resources/todomvc/architecture-examples/vue/package-lock.json +third_party/speedometer/v3.1/resources/todomvc/big-dom-generator/package-lock.json +third_party/speedometer/v3.1/resources/todomvc/big-dom-generator/utils/app.css +third_party/speedometer/v3.1/resources/todomvc/todomvc-css/dist/index.css +third_party/speedometer/v3.1/resources/todomvc/todomvc-css/dist/todo-item.css +third_party/speedometer/v3.1/resources/todomvc/todomvc-css/dist/todo-item.module.css +third_party/speedometer/v3.1/resources/todomvc/todomvc-css/src/css/todo-item.css +third_party/speedometer/v3.1/resources/todomvc/vanilla-examples/javascript-es5-complex/dist/helpers.js +third_party/speedometer/v3.1/resources/todomvc/vanilla-examples/javascript-es5-complex/dist/index.css +third_party/speedometer/v3.1/resources/todomvc/vanilla-examples/javascript-es5/dist/helpers.js +third_party/speedometer/v3.1/resources/todomvc/vanilla-examples/javascript-es5/dist/index.css +third_party/speedometer/v3.1/resources/todomvc/vanilla-examples/javascript-es5/src/helpers.js +third_party/speedometer/v3.1/resources/todomvc/vanilla-examples/javascript-es6-webpack-complex/dist/app.css +third_party/speedometer/v3.1/resources/todomvc/vanilla-examples/javascript-es6-webpack/package-lock.json +third_party/speedometer/v3.1/resources/todomvc/vanilla-examples/javascript-es6-webpack/src/helpers.js third_party/spirv-cross/src/spirv_hlsl.cpp third_party/spirv-headers/src/include/spirv/spir-v.xml third_party/spirv-tools/src/PRESUBMIT.py @@ -14217,7 +14671,6 @@ third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/wpttest.py third_party/wuffs/BUILD.gn third_party/wuffs/src/release/c/wuffs-v0.3.c third_party/xdg-utils/scripts/desc/xdg-settings.xml -third_party/xnnpack/generate_build_gn.py third_party/xnnpack/src/CMakeLists.txt third_party/zlib/deflate.c third_party/zlib/google/compression_utils_portable.cc @@ -14327,6 +14780,7 @@ tools/clang/scripts/package.py tools/clang/scripts/update.py tools/clang/spanify/evaluate_patches.py tools/clang/spanify/extract_edits.py +tools/clang/spanify/list-required-pragma.py tools/clang/translation_unit/test_translation_unit.py tools/code_coverage/coverage.py tools/code_coverage/js_source_maps/create_js_source_maps/PRESUBMIT.py @@ -14530,6 +14984,7 @@ tools/metrics/histograms/metadata/dev/histograms.xml tools/metrics/histograms/metadata/disk/histograms.xml tools/metrics/histograms/metadata/download/enums.xml tools/metrics/histograms/metadata/download/histograms.xml +tools/metrics/histograms/metadata/dwa/histograms.xml tools/metrics/histograms/metadata/enterprise/enums.xml tools/metrics/histograms/metadata/enterprise/histograms.xml tools/metrics/histograms/metadata/event/enums.xml @@ -14720,8 +15175,6 @@ tools/metrics/histograms/metadata/ukm/histograms.xml tools/metrics/histograms/metadata/uma/enums.xml tools/metrics/histograms/metadata/uma/histograms.xml tools/metrics/histograms/metadata/update_engine/histograms.xml -tools/metrics/histograms/metadata/user_annotations/enums.xml -tools/metrics/histograms/metadata/user_annotations/histograms.xml tools/metrics/histograms/metadata/user_education/histograms.xml tools/metrics/histograms/metadata/v8/enums.xml tools/metrics/histograms/metadata/v8/histograms.xml @@ -14759,6 +15212,10 @@ tools/metrics/histograms/test_data/example_valid_histograms.xml tools/metrics/histograms/test_data/histograms.xml tools/metrics/histograms/test_data/no_allowlist_entries_histograms.xml tools/metrics/histograms/test_data/tokens/token_errors_histograms.xml +tools/metrics/histograms/test_data/tokens/variants_inline_histograms.xml +tools/metrics/histograms/test_data/tokens/variants_missing_histograms.xml +tools/metrics/histograms/test_data/tokens/variants_out_of_line_explicit_histograms.xml +tools/metrics/histograms/test_data/tokens/variants_out_of_line_implicit_histograms.xml tools/metrics/histograms/test_data/ukm.xml tools/metrics/md2xml.py tools/metrics/structured/PRESUBMIT.py @@ -14858,6 +15315,8 @@ tools/perf/core/test_data/test_timing_data_1_build.json tools/perf/download_proto_trace.py tools/perf/generate_legacy_perf_dashboard_json.py tools/perf/generate_perf_sharding.py +tools/perf/json_util.py +tools/perf/json_util_unittest.py tools/perf/page_sets/ad_frames.py tools/perf/page_sets/alexa1-10000-urls.json tools/perf/page_sets/companion/basic_companion_story.py @@ -14911,6 +15370,7 @@ tools/perf/page_sets/tough_animation_cases/mix_blend_mode_propagating_isolation. tools/perf/page_sets/v8_top_25.py tools/perf/page_sets/webrtc_cases/codec_constraints.html tools/perf/process_perf_results.py +tools/perf/process_perf_results_unittest.py tools/perfbot-analysis/builder.js tools/perfbot-analysis/bulk-download.js tools/pgo/generate_profile.py @@ -14998,8 +15458,8 @@ ui/accessibility/platform/browser_accessibility_manager_win.cc ui/accessibility/platform/fuchsia/browser_accessibility_fuchsia.h ui/android/color_utils_android_unittest.cc ui/android/java/res/values/strings.xml -ui/aura/native_window_occlusion_tracker_win.cc -ui/base/accelerators/accelerator.cc +ui/base/accelerators/command.cc +ui/base/accelerators/command.h ui/base/clipboard/clipboard.h ui/base/clipboard/clipboard_android.h ui/base/clipboard/clipboard_format_type.h @@ -15090,6 +15550,7 @@ ui/gfx/icon_util.h ui/gfx/render_text.cc ui/gfx/render_text_unittest.cc ui/gfx/text_elider_unittest.cc +ui/gfx/win/hwnd_util.cc ui/gfx/win/physical_size.cc ui/gfx/win/singleton_hwnd_hot_key_observer.cc ui/gl/android/scoped_a_native_window.cc @@ -15139,6 +15600,7 @@ ui/views/view_unittest.cc ui/views/win/hwnd_message_handler.cc ui/views/window/non_client_view.cc ui/webui/resources/cr_components/certificate_manager/certificate_manager_v2_icons.html +ui/webui/resources/cr_components/cr_shortcut_input/cr_shortcut_input.ts ui/webui/resources/cr_components/help_bubble/help_bubble_icons.html ui/webui/resources/cr_elements/icons.html.ts ui/webui/resources/js/ios/web_ui.js @@ -15162,6 +15624,7 @@ url/url_util.cc url/url_util.h url/url_util_unittest.cc v8/PRESUBMIT.py +v8/build_overrides/partition_alloc.gni v8/include/cppgc/internal/compiler-specific.h v8/include/v8-callbacks.h v8/include/v8-context.h 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 74aeb1cc..d2b6a6b6 100644 --- a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch +++ b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch @@ -1,14 +1,6 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2266,7 +2266,6 @@ static_library("browser") { - "//components/reporting/util:task_runner_context", - "//components/resources", - "//components/safe_browsing/content/browser", -- "//components/safe_browsing/content/browser:client_side_detection", - "//components/safe_browsing/content/browser:safe_browsing_service", - "//components/safe_browsing/content/browser/notification_content_detection", - "//components/safe_browsing/content/browser/password_protection", -@@ -3618,8 +3617,6 @@ static_library("browser") { +@@ -3648,8 +3648,6 @@ static_library("browser") { "download/download_commands.cc", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -19,7 +11,7 @@ "download/download_dir_util.cc", --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5403,10 +5403,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -5405,10 +5405,6 @@ ChromeContentBrowserClient::CreateThrott throttles.push_back(std::make_unique( handle, handle->GetWebContents()->GetBrowserContext())); @@ -30,32 +22,6 @@ throttles.push_back(std::make_unique( handle, base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp), -@@ -5461,16 +5457,6 @@ ChromeContentBrowserClient::CreateThrott - &throttles); - #endif - -- // g_browser_process->safe_browsing_service() may be null in unittests. -- safe_browsing::SafeBrowsingUIManager* ui_manager = -- g_browser_process->safe_browsing_service() -- ? g_browser_process->safe_browsing_service()->ui_manager().get() -- : nullptr; -- MaybeAddThrottle( -- safe_browsing::SafeBrowsingNavigationThrottle::MaybeCreateThrottleFor( -- handle, ui_manager), -- &throttles); -- - if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) { - throttles.push_back( - std::make_unique( -@@ -5771,8 +5757,6 @@ bool ChromeContentBrowserClient::IsPlugi - void ChromeContentBrowserClient::InitOnUIThread() { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - -- safe_browsing_service_ = g_browser_process->safe_browsing_service(); -- - // Initialize `network_contexts_parent_directory_`. - base::FilePath user_data_dir; - base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); --- a/chrome/browser/component_updater/file_type_policies_component_installer.cc +++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc @@ -38,21 +38,6 @@ const uint8_t kFileTypePoliciesPublicKey @@ -80,43 +46,9 @@ } } // namespace ---- a/chrome/browser/download/chrome_download_manager_delegate.cc -+++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -530,13 +530,6 @@ void ChromeDownloadManagerDelegate::SetD - - download_manager_ = dm; - -- safe_browsing::SafeBrowsingService* sb_service = -- g_browser_process->safe_browsing_service(); -- if (sb_service && !profile_->IsOffTheRecord()) { -- // Include this download manager in the set monitored by safe browsing. -- sb_service->AddDownloadManager(dm); -- } -- - if (download_manager_) { - download_manager_->AddObserver(this); - } -@@ -1074,17 +1067,6 @@ void ChromeDownloadManagerDelegate::Choo - void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( - base::FilePath* filename, - const GURL& source_url) { -- safe_browsing::FileTypePolicies* file_type_policies = -- safe_browsing::FileTypePolicies::GetInstance(); -- -- const PrefService* prefs = profile_->GetPrefs(); -- if (file_type_policies->GetFileDangerLevel(*filename, source_url, prefs) == -- safe_browsing::DownloadFileType::NOT_DANGEROUS) -- return; -- -- base::FilePath default_filename = base::FilePath::FromUTF8Unsafe( -- l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME)); -- *filename = filename->AddExtension(default_filename.BaseName().value()); - } - - void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -119,7 +119,7 @@ class DownloadItemModelData : public bas +@@ -128,7 +128,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. @@ -125,7 +57,7 @@ // Whether the download is currently being revived. bool is_being_revived_ = false; -@@ -502,13 +502,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -512,13 +512,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -142,131 +74,6 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -711,9 +711,6 @@ bool DownloadItemModel::IsCommandEnabled - // filename. Don't base an "Always open" decision based on it. Also - // exclude extensions. - return download_->CanOpenDownload() && -- safe_browsing::FileTypePolicies::GetInstance() -- ->IsAllowedToOpenAutomatically( -- download_->GetTargetFilePath()) && - !download_crx_util::IsExtensionDownload(*download_); - case DownloadCommands::PAUSE: - return !download_->IsSavePackageDownload() && ---- a/chrome/browser/download/download_prefs.cc -+++ b/chrome/browser/download/download_prefs.cc -@@ -256,14 +256,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr - base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) + - extension); - -- // Note that the list of file types that are not allowed to open -- // automatically can change in the future. When the list is tightened, it is -- // expected that some entries in the users' auto open list will get dropped -- // permanently as a result. -- if (FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically( -- filename_with_extension)) { -- auto_open_by_user_.insert(extension); -- } -+ auto_open_by_user_.insert(extension); - } - } - -@@ -441,10 +434,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c - bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension( - const base::FilePath& file_name) { - base::FilePath::StringType extension = file_name.Extension(); -- if (!FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically( -- file_name)) { -- return false; -- } - - DCHECK(extension[0] == base::FilePath::kExtensionSeparator); - extension.erase(0, 1); ---- a/chrome/browser/download/download_target_determiner.cc -+++ b/chrome/browser/download/download_target_determiner.cc -@@ -324,13 +324,6 @@ base::FilePath DownloadTargetDeterminer: - download_->GetURL(), download_->GetContentDisposition(), referrer_charset, - suggested_filename, sniffed_mime_type, default_filename); - -- // We don't replace the file extension if sfafe browsing consider the file -- // extension to be unsafe. Just let safe browsing scan the generated file. -- if (safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile( -- generated_filename)) { -- return generated_filename; -- } -- - // If no mime type or explicitly specified a name, don't replace file - // extension. - if (sniffed_mime_type.empty() || !suggested_filename.empty()) -@@ -1290,68 +1283,7 @@ DownloadFileType::DangerLevel DownloadTa - PriorVisitsToReferrer visits) const { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - -- // User-initiated extension downloads from pref-whitelisted sources are not -- // considered dangerous. -- if (download_->HasUserGesture() && -- download_crx_util::IsTrustedExtensionDownload(GetProfile(), *download_)) { -- return DownloadFileType::NOT_DANGEROUS; -- } -- -- DownloadFileType::DangerLevel danger_level = -- safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( -- virtual_path_.BaseName(), download_->GetURL(), -- GetProfile()->GetPrefs()); -- policy::DownloadRestriction download_restriction = -- static_cast( -- GetProfile()->GetPrefs()->GetInteger( -- policy::policy_prefs::kDownloadRestrictions)); -- -- // If the user has has been prompted or will be, assume that the user has -- // approved the download. A programmatic download is considered safe unless it -- // contains malware. -- bool user_approved_path = -- !download_->GetForcedFilePath().empty() && -- // Drag and drop download paths are not approved by the user. See -- // https://crbug.com/1513639 -- download_->GetDownloadSource() != download::DownloadSource::DRAG_AND_DROP; -- if (HasPromptedForPath() || -- confirmation_reason_ != DownloadConfirmationReason::NONE || -- user_approved_path) { -- // If the "DownloadRestrictions" enterprise policy explicitly disallows the -- // download, don't let the user gesture bypass the dangerous verdict. -- if ((download_restriction == policy::DownloadRestriction::DANGEROUS_FILES || -- download_restriction == -- policy::DownloadRestriction::POTENTIALLY_DANGEROUS_FILES) && -- danger_level != DownloadFileType::NOT_DANGEROUS) { -- return DownloadFileType::DANGEROUS; -- } -- return DownloadFileType::NOT_DANGEROUS; -- } -- -- // Anything the user has marked auto-open is OK if it's user-initiated. -- if (download_prefs_->IsAutoOpenEnabled(download_->GetURL(), virtual_path_) && -- download_->HasUserGesture()) -- return DownloadFileType::NOT_DANGEROUS; -- -- // A danger level of ALLOW_ON_USER_GESTURE is used to label potentially -- // dangerous file types that have a high frequency of legitimate use. We would -- // like to avoid prompting for the legitimate cases as much as possible. To -- // that end, we consider a download to be legitimate if one of the following -- // is true, and avoid prompting: -- // -- // * The user navigated to the download URL via the omnibox (either by typing -- // the URL, pasting it, or using search). -- // -- // * The navigation that initiated the download has a user gesture associated -- // with it AND the user the user is familiar with the referring origin. A -- // user is considered familiar with a referring origin if a visit for a page -- // from the same origin was recorded on the previous day or earlier. -- if (danger_level == DownloadFileType::ALLOW_ON_USER_GESTURE && -- ((download_->GetTransitionType() & -- ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 || -- (download_->HasUserGesture() && visits == VISITED_REFERRER))) -- return DownloadFileType::NOT_DANGEROUS; -- return danger_level; -+ return DownloadFileType::NOT_DANGEROUS; - } - - std::optional --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -38,7 +38,6 @@ @@ -371,7 +178,7 @@ class DownloadsShowFunction : public ExtensionFunction { --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -713,18 +713,6 @@ void WebstorePrivateBeginInstallWithMani +@@ -711,18 +711,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -436,7 +243,7 @@ sources = [ "chrome_controller_client.cc", "chrome_controller_client.h", -@@ -78,6 +79,7 @@ static_library("safe_browsing") { +@@ -75,6 +76,7 @@ static_library("safe_browsing") { "//mojo/public/cpp/system", "//services/preferences/public/cpp", ] @@ -444,7 +251,7 @@ if (is_android) { deps += [ -@@ -549,6 +551,7 @@ static_library("advanced_protection") { +@@ -553,6 +555,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -452,7 +259,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -568,6 +571,7 @@ source_set("metrics_collector") { +@@ -572,6 +575,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -460,44 +267,6 @@ } source_set("test_support") { ---- a/chrome/browser/ui/tab_helpers.cc -+++ b/chrome/browser/ui/tab_helpers.cc -@@ -486,35 +486,8 @@ void TabHelpers::AttachTabHelpers(WebCon - // See https://crbug.com/910288. - resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( - web_contents); -- safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents( -- web_contents, HostContentSettingsMapFactory::GetForProfile(profile), -- safe_browsing::SafeBrowsingNavigationObserverManagerFactory:: -- GetForBrowserContext(profile), -- profile->GetPrefs(), g_browser_process->safe_browsing_service()); - site_protection::SiteProtectionMetricsObserver::CreateForWebContents( - web_contents); -- -- if (base::FeatureList::IsEnabled( -- safe_browsing::kTailoredSecurityIntegration)) { -- safe_browsing::TailoredSecurityUrlObserver::CreateForWebContents( -- web_contents, -- safe_browsing::TailoredSecurityServiceFactory::GetForProfile(profile)); -- } -- if (g_browser_process->safe_browsing_service()) { -- safe_browsing::AsyncCheckTracker::CreateForWebContents( -- web_contents, g_browser_process->safe_browsing_service()->ui_manager(), -- safe_browsing::AsyncCheckTracker:: -- IsPlatformEligibleForSyncCheckerCheckAllowlist()); -- } -- // SafeBrowsingTabObserver creates a ClientSideDetectionHost, which observes -- // events from PermissionRequestManager and AsyncCheckTracker in its -- // constructor. Therefore, PermissionRequestManager and AsyncCheckTracker need -- // to be created before SafeBrowsingTabObserver is created. -- safe_browsing::SafeBrowsingTabObserver::CreateForWebContents( -- web_contents, -- std::make_unique()); -- safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents( -- profile, web_contents); - SafetyTipWebContentsObserver::CreateForWebContents(web_contents); - SearchEngineTabHelper::CreateForWebContents(web_contents); - if (site_engagement::SiteEngagementService::IsEnabled()) { --- a/chrome/browser/ui/views/download/BUILD.gn +++ b/chrome/browser/ui/views/download/BUILD.gn @@ -27,7 +27,6 @@ source_set("download") { @@ -518,7 +287,7 @@ #include "chrome/browser/download/download_history.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_item_warning_data.h" -@@ -536,12 +535,6 @@ void DownloadsDOMHandler::RemoveDownload +@@ -541,12 +540,6 @@ void DownloadsDOMHandler::RemoveDownload IdSet ids; for (download::DownloadItem* download : to_remove) { diff --git a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch index c8614e2e..76235a3a 100644 --- a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch +++ b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch @@ -1,6 +1,6 @@ --- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc +++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc -@@ -868,93 +868,6 @@ std::tuple AutofillCr +@@ -888,93 +888,6 @@ std::tuple AutofillCr } bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) { diff --git a/patches/core/inox-patchset/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index 24f88af5..412bddec 100644 --- a/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -36,7 +36,7 @@ { --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc -@@ -520,20 +520,6 @@ void WebstoreInstaller::DownloadNextPend +@@ -485,20 +485,6 @@ void WebstoreInstaller::DownloadNextPend void WebstoreInstaller::DownloadCrx(const extensions::ExtensionId& extension_id, InstallSource source) { @@ -57,7 +57,7 @@ } // http://crbug.com/165634 -@@ -679,25 +665,6 @@ void WebstoreInstaller::UpdateDownloadPr +@@ -644,25 +630,6 @@ void WebstoreInstaller::UpdateDownloadPr void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!crx_installer_.get()); @@ -66,7 +66,7 @@ - extension_service(); - CHECK(service); - -- const Approval* approval = GetAssociatedApproval(download); +- const InstallApproval* approval = GetAssociatedApproval(download); - DCHECK(approval); - - crx_installer_ = download_crx_util::CreateCrxInstaller(profile_, download); diff --git a/patches/core/inox-patchset/0021-disable-rlz.patch b/patches/core/inox-patchset/0021-disable-rlz.patch index bfb138a3..305f6f6f 100644 --- a/patches/core/inox-patchset/0021-disable-rlz.patch +++ b/patches/core/inox-patchset/0021-disable-rlz.patch @@ -2,7 +2,7 @@ --- a/BUILD.gn +++ b/BUILD.gn -@@ -477,14 +477,6 @@ group("gn_all") { +@@ -479,14 +479,6 @@ group("gn_all") { deps += [ "//chromeos:chromeos_unittests" ] } diff --git a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index 3f8d583e..fe9f49b7 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 @@ -101,7 +101,7 @@ by default. "-----BEGIN PUBLIC KEY-----" --- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -111,7 +111,7 @@ void OnURLLoadUploadProgress(uint64_t cu +@@ -110,7 +110,7 @@ void OnURLLoadUploadProgress(uint64_t cu } // namespace const char WebRtcEventLogUploaderImpl::kUploadURL[] = @@ -112,7 +112,7 @@ by default. scoped_refptr task_runner) --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -538,7 +538,7 @@ void WebRtcLogUploader::UploadCompressed +@@ -535,7 +535,7 @@ void WebRtcLogUploader::UploadCompressed } })"); @@ -189,7 +189,7 @@ by default. --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -@@ -72,17 +72,17 @@ namespace { +@@ -73,17 +73,17 @@ namespace { // The URL for the the Learn More page shown on incognito new tab. const char kLearnMoreIncognitoUrl[] = #if BUILDFLAG(IS_CHROMEOS) @@ -380,7 +380,7 @@ by default. --- a/content/browser/webauth/webauth_request_security_checker.h +++ b/content/browser/webauth/webauth_request_security_checker.h -@@ -87,9 +87,9 @@ class CONTENT_EXPORT WebAuthRequestSecur +@@ -90,9 +90,9 @@ class CONTENT_EXPORT WebAuthRequestSecur // Legacy App IDs, which google.com origins are allowed to assert for // compatibility reasons. static constexpr char kGstaticAppId[] = @@ -638,7 +638,7 @@ by default. const char kFeedOAuth2Scope[] = "https://www.googleapis.com/auth/googlenow"; --- a/google_apis/gaia/gaia_urls.cc +++ b/google_apis/gaia/gaia_urls.cc -@@ -25,6 +25,7 @@ +@@ -24,6 +24,7 @@ namespace { // Gaia service constants 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 9ebd611b..536c1230 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future). IncidentReportingService::IncidentReportingService( --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -379,7 +379,7 @@ SafeBrowsingUIManager* SafeBrowsingServi +@@ -382,7 +382,7 @@ SafeBrowsingUIManager* SafeBrowsingServi } void SafeBrowsingServiceImpl::RegisterAllDelayedAnalysis() { diff --git a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch index 187f709c..bc233b39 100644 --- a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch +++ b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch @@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware). --- a/components/safe_browsing/content/browser/client_side_detection_service.cc +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc -@@ -314,6 +314,10 @@ void ClientSideDetectionService::StartCl +@@ -316,6 +316,10 @@ void ClientSideDetectionService::StartCl return; } @@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware). std::string request_data; request->SerializeToString(&request_data); -@@ -396,6 +400,7 @@ void ClientSideDetectionService::StartCl +@@ -398,6 +402,7 @@ void ClientSideDetectionService::StartCl base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent, base::Unretained(WebUIInfoSingleton::GetInstance()), std::move(request), access_token)); diff --git a/patches/core/ungoogled-chromium/block-requests.patch b/patches/core/ungoogled-chromium/block-requests.patch index 8ed56c64..5a1217f2 100644 --- a/patches/core/ungoogled-chromium/block-requests.patch +++ b/patches/core/ungoogled-chromium/block-requests.patch @@ -8,7 +8,7 @@ # Dev tools attempts to download css data --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc -@@ -301,6 +301,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad +@@ -318,6 +318,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default; void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) { @@ -48,7 +48,7 @@ --- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc +++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc -@@ -121,6 +121,9 @@ AffiliationFetcherDelegate* HashAffiliat +@@ -127,6 +127,9 @@ AffiliationFetcherDelegate* HashAffiliat } void HashAffiliationFetcher::StartRequest( diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index 6bfdf576..6c78c6c6 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -70,7 +70,7 @@ // other origins, so we should not treat them as web safe. Remove callers of --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1071,6 +1071,8 @@ component("net") { +@@ -1073,6 +1073,8 @@ component("net") { "url_request/referrer_policy.h", "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", @@ -150,7 +150,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" -@@ -53,6 +54,7 @@ +@@ -54,6 +55,7 @@ #include "net/url_request/url_request_redirect_job.h" #include "url/gurl.h" #include "url/origin.h" @@ -158,7 +158,7 @@ namespace net { -@@ -635,6 +637,12 @@ URLRequest::URLRequest(base::PassKey URLRe +@@ -596,6 +597,9 @@ std::unique_ptr URLRe } protocol_handlers_.clear(); diff --git a/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/patches/core/ungoogled-chromium/disable-crash-reporter.patch index aa948ac6..ca7174ea 100644 --- a/patches/core/ungoogled-chromium/disable-crash-reporter.patch +++ b/patches/core/ungoogled-chromium/disable-crash-reporter.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -2700,24 +2700,6 @@ void ChromeContentBrowserClient::AppendE +@@ -2708,24 +2708,6 @@ void ChromeContentBrowserClient::AppendE command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -58,7 +58,7 @@ std::string_view process_type) { --- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc +++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc -@@ -748,8 +748,6 @@ void CrashpadClient::CrashWithoutDump(co +@@ -747,8 +747,6 @@ void CrashpadClient::CrashWithoutDump(co // static void CrashpadClient::SetFirstChanceExceptionHandler( FirstChanceHandler handler) { diff --git a/patches/core/ungoogled-chromium/disable-gaia.patch b/patches/core/ungoogled-chromium/disable-gaia.patch index a25f596d..44b5de2b 100644 --- a/patches/core/ungoogled-chromium/disable-gaia.patch +++ b/patches/core/ungoogled-chromium/disable-gaia.patch @@ -3,7 +3,7 @@ --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc -@@ -251,62 +251,6 @@ void GaiaAuthFetcher::CreateAndStartGaia +@@ -247,62 +247,6 @@ void GaiaAuthFetcher::CreateAndStartGaia network::mojom::CredentialsMode credentials_mode, const net::NetworkTrafficAnnotationTag& traffic_annotation) { DCHECK(!fetch_pending_) << "Tried to fetch two things at once!"; diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index 5e425975..b43366a3 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -681,7 +681,7 @@ } // namespace variations --- a/content/browser/preloading/prefetch/prefetch_container.cc +++ b/content/browser/preloading/prefetch/prefetch_container.cc -@@ -986,7 +986,7 @@ void PrefetchContainer::AddRedirectHop(c +@@ -990,7 +990,7 @@ void PrefetchContainer::AddRedirectHop(c // some which are added by throttles). These aren't yet supported for // prefetch, including browsing topics and client hints. net::HttpRequestHeaders updated_headers; @@ -692,7 +692,7 @@ --- a/net/base/url_util.cc +++ b/net/base/url_util.cc -@@ -511,28 +511,6 @@ bool HasGoogleHost(const GURL& url) { +@@ -519,28 +519,6 @@ bool HasGoogleHost(const GURL& url) { } bool IsGoogleHost(std::string_view host) { diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch index c2034018..cdb2b216 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -1,11 +1,11 @@ --- a/components/browsing_data/content/browsing_data_model.cc +++ b/components/browsing_data/content/browsing_data_model.cc @@ -1002,12 +1002,6 @@ void BrowsingDataModel::PopulateFromDisk - base::FeatureList::IsEnabled(blink::features::kSharedStorageAPI); + base::FeatureList::IsEnabled(network::features::kSharedStorageAPI); bool is_shared_dictionary_enabled = base::FeatureList::IsEnabled( network::features::kCompressionDictionaryTransportBackend); - bool is_interest_group_enabled = -- base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage); +- base::FeatureList::IsEnabled(network::features::kInterestGroupStorage); - bool is_attribution_reporting_enabled = base::FeatureList::IsEnabled( - attribution_reporting::features::kConversionMeasurement); - bool is_private_aggregation_enabled = @@ -75,7 +75,23 @@ PrivacySandboxSettingsImpl::Status --- a/content/browser/attribution_reporting/attribution_suitable_context.cc +++ b/content/browser/attribution_reporting/attribution_suitable_context.cc -@@ -44,67 +44,7 @@ std::optional AttributionSuitableContext::Create( + NavigationHandle* navigation_handle) { +- RenderFrameHostImpl* rfh = static_cast( +- navigation_handle->GetRenderFrameHost()); +- std::optional context = Create(rfh); +- // Override the UKM source ID from the associated ongoing navigation handle as +- // `AttributionHost::GetPageUkmSourceId()` is not updated until the navigation +- // finishes. +- if (context && UkmSourceIdAllowed(rfh)) { +- context->ukm_source_id_ = navigation_handle->GetNextPageUkmSourceId(); +- } +- return context; ++ return std::nullopt; + } + // static std::optional AttributionSuitableContext::Create( RenderFrameHostImpl* initiator_frame) { @@ -139,13 +155,16 @@ - !url_matcher::util::GetGoogleAmpViewerEmbeddedURL( - initiator_root_frame->GetLastCommittedURL()) - .is_empty(), +- UkmSourceIdAllowed(initiator_root_frame) +- ? attribution_host->GetPageUkmSourceId() +- : ukm::kInvalidSourceId, - data_host_manager->AsWeakPtr()); } // static --- a/content/browser/interest_group/ad_auction_service_impl.cc +++ b/content/browser/interest_group/ad_auction_service_impl.cc -@@ -217,11 +217,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD +@@ -214,11 +214,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD void AdAuctionServiceImpl::CreateMojoService( RenderFrameHost* render_frame_host, mojo::PendingReceiver receiver) { @@ -172,7 +191,7 @@ - this, path, special_storage_policy_); - } -- if (base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) { +- if (base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) { - // Auction worklets on non-Android use dedicated processes; on Android due - // to high cost of process launch they try to reuse renderers. - interest_group_manager_ = std::make_unique( @@ -191,7 +210,7 @@ - - // The Topics API is not available in Incognito mode. - if (!is_in_memory() && -- base::FeatureList::IsEnabled(blink::features::kBrowsingTopics)) { +- base::FeatureList::IsEnabled(network::features::kBrowsingTopics)) { - browsing_topics_site_data_manager_ = - std::make_unique(path); - } @@ -221,7 +240,7 @@ void StoragePartitionImpl::OnStorageServiceDisconnected() { --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3857,12 +3857,6 @@ void WebContentsImpl::Init(const WebCont +@@ -3888,12 +3888,6 @@ void WebContentsImpl::Init(const WebCont DateTimeChooser::CreateDateTimeChooser(this); #endif diff --git a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch index a8f5308f..64f8dd5c 100644 --- a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch +++ b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -186,31 +186,13 @@ void WebRtcLogUploader::OnLoggingStopped +@@ -183,31 +183,13 @@ void WebRtcLogUploader::OnLoggingStopped DCHECK(meta_data.get()); DCHECK(!upload_done_data.paths.directory.empty()); @@ -35,7 +35,7 @@ } else { main_task_runner_->PostTask( FROM_HERE, -@@ -227,28 +209,7 @@ void WebRtcLogUploader::PrepareMultipart +@@ -224,28 +206,7 @@ void WebRtcLogUploader::PrepareMultipart DCHECK(!compressed_log.empty()); DCHECK(meta_data.get()); @@ -65,7 +65,7 @@ } void WebRtcLogUploader::UploadStoredLog( -@@ -315,48 +276,6 @@ void WebRtcLogUploader::LoggingStoppedDo +@@ -312,48 +273,6 @@ void WebRtcLogUploader::LoggingStoppedDo DCHECK(log_buffer.get()); DCHECK(!log_paths.directory.empty()); diff --git a/patches/core/ungoogled-chromium/extensions-manifestv2.patch b/patches/core/ungoogled-chromium/extensions-manifestv2.patch index 10ddb836..ddca277f 100644 --- a/patches/core/ungoogled-chromium/extensions-manifestv2.patch +++ b/patches/core/ungoogled-chromium/extensions-manifestv2.patch @@ -1,8 +1,8 @@ ---- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -@@ -599,17 +599,6 @@ void ExtensionInfoGenerator::CreateExten - info->controlled_info.emplace(); - info->controlled_info->text = +--- a/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc ++++ b/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc +@@ -131,17 +131,6 @@ void ExtensionInfoGenerator::FillExtensi + info.controlled_info.emplace(); + info.controlled_info->text = l10n_util::GetStringUTF8(IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE); - } else { - // Create Safety Hub information for any non-enterprise extension. @@ -10,8 +10,8 @@ - ExtensionSafetyCheckUtils::GetSafetyCheckWarningReason(extension, - profile); - if (warning_reason != developer::SafetyCheckWarningReason::kNone) { -- info->safety_check_warning_reason = warning_reason; -- info->safety_check_text = +- info.safety_check_warning_reason = warning_reason; +- info.safety_check_text = - ExtensionSafetyCheckUtils::GetSafetyCheckWarningStrings( - warning_reason, state); - } @@ -126,18 +126,18 @@ // Returns true if the given `stage` is one in which extension enablement should --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -467,7 +467,7 @@ content::WebUIDataSource* CreateAndAddEx +@@ -477,7 +477,7 @@ content::WebUIDataSource* CreateAndAddEx extensions_features::kExtensionsMenuAccessControlWithPermittedSites)); source->AddBoolean( "safetyHubThreeDotDetails", - base::FeatureList::IsEnabled(features::kSafetyHubThreeDotDetails)); + false); - // MV2 deprecation. - auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile); + // TODO(crbug.com/392777363): Clean these up with non-placeholder values. + #if BUILDFLAG(IS_ANDROID) --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc -@@ -95,13 +95,6 @@ bool IsManifestSupported(int manifest_ve +@@ -96,13 +96,6 @@ bool IsManifestSupported(int manifest_ve // Supported versions are always safe. if (manifest_version >= kMinimumSupportedManifestVersion && manifest_version <= kMaximumSupportedManifestVersion) { diff --git a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch index 4d338cbf..71d50584 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -30,7 +30,7 @@ if (is_chrome_branded) { --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -746,10 +746,6 @@ static_library("browser") { +@@ -755,10 +755,6 @@ static_library("browser") { "navigation_predictor/navigation_predictor_metrics_document_data.h", "navigation_predictor/navigation_predictor_preconnect_client.cc", "navigation_predictor/navigation_predictor_preconnect_client.h", @@ -41,7 +41,7 @@ "net/cert_verifier_service_time_updater.cc", "net/cert_verifier_service_time_updater.h", "net/chrome_mojo_proxy_resolver_factory.cc", -@@ -3482,10 +3478,6 @@ static_library("browser") { +@@ -3514,10 +3510,6 @@ static_library("browser") { } else { #!is_android sources += [ @@ -52,7 +52,7 @@ "accessibility/caption_bubble_context_browser.h", "accessibility/embedded_a11y_extension_loader.cc", "accessibility/embedded_a11y_extension_loader.h", -@@ -4225,10 +4217,6 @@ static_library("browser") { +@@ -4250,10 +4242,6 @@ static_library("browser") { "//chrome/browser/new_tab_page/chrome_colors", "//chrome/browser/policy:path_parser", "//chrome/browser/resources:component_extension_resources", @@ -63,9 +63,9 @@ "//chrome/browser/search/background", "//chrome/browser/smart_card", "//chrome/browser/themes", -@@ -4354,9 +4342,6 @@ static_library("browser") { +@@ -4378,9 +4366,6 @@ static_library("browser") { + "//components/webauthn/core/browser", "//components/webauthn/core/browser:passkey_model", - "//services/device/public/cpp/bluetooth", "//services/device/public/cpp/hid", - "//services/screen_ai", - "//services/screen_ai/public/cpp:utilities", @@ -73,7 +73,7 @@ "//third_party/crashpad/crashpad/client:common", "//third_party/zxcvbn-cpp", "//ui/views", -@@ -4453,8 +4438,6 @@ static_library("browser") { +@@ -4475,8 +4460,6 @@ static_library("browser") { sources += [ "accessibility/soda_installer_impl.cc", "accessibility/soda_installer_impl.h", @@ -82,7 +82,7 @@ "device_identity/device_oauth2_token_store_desktop.cc", "device_identity/device_oauth2_token_store_desktop.h", "device_notifications/device_status_icon_renderer.cc", -@@ -4493,8 +4476,6 @@ static_library("browser") { +@@ -4515,8 +4498,6 @@ static_library("browser") { "profiles/profile_activity_metrics_recorder.h", "profiles/profile_list_desktop.cc", "profiles/profile_list_desktop.h", @@ -91,7 +91,7 @@ "signin/force_signin_verifier.cc", "signin/force_signin_verifier.h", "signin/signin_manager.cc", -@@ -5294,7 +5275,6 @@ static_library("browser") { +@@ -5317,7 +5298,6 @@ static_library("browser") { "//chrome/browser/policy:system_features_disable_list", "//chrome/browser/push_notification:push_notification", "//chrome/browser/resources:app_icon_resources", @@ -99,15 +99,15 @@ "//chrome/browser/support_tool/ash", "//chrome/browser/ui/ash/accelerator", "//chrome/browser/ui/ash/accessibility", -@@ -5552,7 +5532,6 @@ static_library("browser") { - "//device/vr/public/mojom:isolated_xr_service", +@@ -5581,7 +5561,6 @@ static_library("browser") { + "//remoting/host/chromeos:browser_interop", "//remoting/host/chromeos:features", "//services/device/public/cpp/geolocation", - "//services/screen_ai/public/cpp:metrics", "//third_party/nearby:rpc_resources_proto", "//third_party/nearby:wire_format_proto", "//ui/chromeos", -@@ -7778,12 +7757,6 @@ static_library("browser") { +@@ -7803,12 +7782,6 @@ static_library("browser") { } if (enable_pdf) { @@ -135,9 +135,9 @@ #include "chrome/browser/usb/usb_status_icon.h" #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif -@@ -1351,9 +1349,6 @@ void BrowserProcessImpl::PreMainMessageL +@@ -1347,9 +1345,6 @@ void BrowserProcessImpl::PreMainMessageL soda_installer_impl_ = std::make_unique(); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) -#if !BUILDFLAG(IS_ANDROID) - screen_ai_download_ = screen_ai::ScreenAIInstallState::Create(); @@ -147,7 +147,7 @@ bool result = base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -93,9 +93,6 @@ namespace speech { +@@ -92,9 +92,6 @@ namespace speech { class SodaInstaller; } // namespace speech @@ -157,7 +157,7 @@ // Real implementation of BrowserProcess that creates and returns the services. class BrowserProcessImpl : public BrowserProcess, -@@ -437,9 +434,6 @@ class BrowserProcessImpl : public Browse +@@ -431,9 +428,6 @@ class BrowserProcessImpl : public Browse // to ensure that SodaInstallerImpl gets destructed first. std::unique_ptr soda_installer_impl_; @@ -169,16 +169,16 @@ std::unique_ptr platform_part_; --- a/chrome/browser/chrome_browser_interface_binders.cc +++ b/chrome/browser/chrome_browser_interface_binders.cc -@@ -127,8 +127,6 @@ +@@ -78,8 +78,6 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) -#include "chrome/browser/screen_ai/screen_ai_service_router.h" -#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h" #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" - #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h" - #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" -@@ -692,27 +690,6 @@ void BindMediaFoundationPreferences( + #endif + +@@ -357,27 +355,6 @@ void BindMediaFoundationPreferences( } #endif // BUILDFLAG(IS_WIN) @@ -204,9 +204,9 @@ -} -#endif - void PopulateChromeFrameBinders( - mojo::BinderMapWithContext* map, -@@ -843,11 +820,6 @@ void PopulateChromeFrameBinders( + } // namespace + +@@ -510,11 +487,6 @@ void PopulateChromeFrameBinders( base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed)); } @@ -229,7 +229,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID) -@@ -234,9 +232,6 @@ void RegisterComponentsForUpdate() { +@@ -237,9 +235,6 @@ void RegisterComponentsForUpdate() { RegisterAutofillStatesComponent(cus, g_browser_process->local_state()); @@ -354,31 +354,31 @@ {"tooltipDocumentOutline", IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE}, --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -262,21 +262,6 @@ void PredictionBasedPermissionUiSelector +@@ -281,21 +281,6 @@ void PredictionBasedPermissionUiSelector if (inner_text.size() > kPageContentMaxLength) { inner_text.resize(kPageContentMaxLength); } - if (PredictionModelHandlerProvider* prediction_model_handler_provider = - PredictionModelHandlerProviderFactory::GetForBrowserContext( - profile_)) { -- if (GenAiModelHandler* gen_ai_model_handler = -- prediction_model_handler_provider->GetGenAiModelHandler()) { +- if (PermissionsAiHandler* gen_ai_model_handler = +- prediction_model_handler_provider->GetPermissionsAiHandler()) { - VLOG(1) << "[PermissionsAIv1] Inquire model."; -- gen_ai_model_handler->InquireGenAiOnDeviceModel( +- gen_ai_model_handler->InquireAiOnDeviceModel( - std::move(inner_text), request_type, - base::BindRepeating(&PredictionBasedPermissionUiSelector:: -- GenAIModelExecutionCallback, +- AiOnDeviceModelExecutionCallback, - weak_ptr_factory_.GetWeakPtr(), - std::move(features), request_type)); - return; - } - } - VLOG(1) << "[PermissionsAIv1] On device genAI model session unavailable"; + VLOG(1) << "[PermissionsAIv1] On device AI model session unavailable"; } else { VLOG(1) << "[PermissionsAIv1] The page's contnet too short or empty"; --- a/chrome/browser/prefs/BUILD.gn +++ b/chrome/browser/prefs/BUILD.gn -@@ -265,7 +265,6 @@ source_set("impl") { +@@ -266,7 +266,6 @@ source_set("impl") { } else { deps += [ "//chrome/browser/promos:utils", @@ -388,7 +388,7 @@ "//chrome/browser/search_engines", --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1888,9 +1888,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1793,9 +1793,6 @@ void RegisterLocalState(PrefRegistrySimp DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry); #endif @@ -400,7 +400,7 @@ PlatformAuthPolicyObserver::RegisterPrefs(registry); --- a/chrome/browser/profiles/BUILD.gn +++ b/chrome/browser/profiles/BUILD.gn -@@ -302,7 +302,6 @@ source_set("profiles_extra_parts_impl") +@@ -301,7 +301,6 @@ source_set("profiles_extra_parts_impl") "//chrome/browser/feedback", "//chrome/browser/hid", "//chrome/browser/media/router/discovery/access_code:access_code_sink_service", @@ -410,31 +410,31 @@ "//chrome/browser/search_engine_choice", --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -107,7 +107,6 @@ +@@ -98,7 +98,6 @@ #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h" #include "chrome/browser/metrics/variations/google_groups_manager_factory.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" -#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h" #include "chrome/browser/net/dns_probe_service_factory.h" #include "chrome/browser/net/profile_network_context_service_factory.h" - #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) -@@ -508,7 +507,6 @@ - #include "chrome/browser/new_tab_page/promos/promo_service_factory.h" - #include "chrome/browser/payments/payment_request_display_manager_factory.h" + #include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h" +@@ -314,7 +313,6 @@ + #include "chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h" #include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h" + #include "chrome/browser/profile_resetter/reset_report_uploader_factory.h" -#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h" #include "chrome/browser/search/background/ntp_background_service_factory.h" #include "chrome/browser/search/background/ntp_custom_background_service_factory.h" - #include "chrome/browser/serial/serial_chooser_context_factory.h" -@@ -1007,7 +1005,6 @@ void ChromeBrowserMainExtraPartsProfiles + #include "chrome/browser/search/instant_service_factory.h" +@@ -995,7 +993,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) net::ServerCertificateDatabaseServiceFactory::GetInstance(); - #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) + #endif - PreloadingModelKeyedServiceFactory::GetInstance(); #if BUILDFLAG(IS_CHROMEOS) NearbySharingServiceFactory::GetInstance(); if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) { -@@ -1059,9 +1056,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1047,9 +1044,6 @@ void ChromeBrowserMainExtraPartsProfiles OneTimePermissionsTrackerFactory::GetInstance(); #endif OpenerHeuristicServiceFactory::GetInstance(); @@ -444,7 +444,7 @@ OptimizationGuideKeyedServiceFactory::GetInstance(); OriginKeyedPermissionActionServiceFactory::GetInstance(); OriginTrialsFactory::GetInstance(); -@@ -1125,13 +1119,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1113,13 +1107,6 @@ void ChromeBrowserMainExtraPartsProfiles policy::UserPolicySigninServiceFactory::GetInstance(); #endif PolicyBlocklistFactory::GetInstance(); @@ -458,7 +458,7 @@ PredictionServiceFactory::GetInstance(); predictors::AutocompleteActionPredictorFactory::GetInstance(); predictors::LoadingPredictorFactory::GetInstance(); -@@ -1213,13 +1200,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1205,13 +1192,6 @@ void ChromeBrowserMainExtraPartsProfiles #else SafetyHubMenuNotificationServiceFactory::GetInstance(); SafetyHubHatsServiceFactory::GetInstance(); @@ -467,7 +467,7 @@ - } -#if BUILDFLAG(ENABLE_PDF) - screen_ai::PdfOcrControllerFactory::GetInstance(); --#endif // BUILDFLAG(ENABLE_PDF) +-#endif - screen_ai::ScreenAIServiceRouterFactory::EnsureFactoryBuilt(); #endif #if BUILDFLAG(IS_CHROMEOS) @@ -501,7 +501,7 @@ // The announcement notification service might not be available for some --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -51,7 +51,6 @@ +@@ -50,7 +50,6 @@ #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" @@ -509,16 +509,16 @@ #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/delete_profile_helper.h" #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h" -@@ -1497,9 +1496,6 @@ void ProfileManager::DoFinalInitForServi +@@ -1507,9 +1506,6 @@ void ProfileManager::DoFinalInitForServi // Ensure NavigationPredictorKeyedService is started. NavigationPredictorKeyedServiceFactory::GetForProfile(profile); - // Ensure PreloadingModelKeyedService is started. - PreloadingModelKeyedServiceFactory::GetForProfile(profile); - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) - contextual_cueing::ContextualCueingServiceFactory::GetForProfile(profile); - #endif + IdentityManagerFactory::GetForProfile(profile)->OnNetworkInitialized(); + AccountReconcilorFactory::GetForProfile(profile); + #if BUILDFLAG(IS_ANDROID) --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn @@ -90,7 +90,6 @@ group("resources") { @@ -544,7 +544,7 @@ ${this.showErrorDialog ? html` --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1705,8 +1705,6 @@ static_library("ui") { +@@ -1703,8 +1703,6 @@ static_library("ui") { "//chrome/browser/reading_list", "//chrome/browser/safe_browsing", "//chrome/browser/safe_browsing:advanced_protection", @@ -553,7 +553,7 @@ "//chrome/browser/smart_card:smart_card", "//chrome/browser/tab_group_sync:utils", "//chrome/browser/themes", -@@ -2376,7 +2374,6 @@ static_library("ui") { +@@ -2373,7 +2371,6 @@ static_library("ui") { "//chrome/browser/policy:onc", "//chrome/browser/policy:system_features_disable_list", "//chrome/browser/push_notification:push_notification", @@ -697,7 +697,7 @@ #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/ui/browser.h" -@@ -364,24 +362,6 @@ ReadAnythingUntrustedPageHandler::ReadAn +@@ -370,24 +368,6 @@ ReadAnythingUntrustedPageHandler::ReadAn prefs_lang = language::ExtractBaseLanguage(prefs_lang); SetDefaultLanguageCode(prefs_lang); @@ -722,7 +722,7 @@ // Enable accessibility for the top level render frame and all descendants. // This causes AXTreeSerializer to reset and send accessibility events of -@@ -804,12 +784,6 @@ void ReadAnythingUntrustedPageHandler::S +@@ -824,12 +804,6 @@ void ReadAnythingUntrustedPageHandler::S weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode); } } @@ -798,7 +798,7 @@ void ChromeRenderFrameObserver::DidMeaningfulLayout( --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -2079,9 +2079,6 @@ if (!is_android) { +@@ -2136,9 +2136,6 @@ if (!is_android) { "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/safe_browsing:advanced_protection", "//chrome/browser/safe_browsing:verdict_cache_manager_factory", @@ -808,7 +808,7 @@ "//chrome/browser/search", "//chrome/browser/search_engines", "//chrome/browser/segmentation_platform:test_utils", -@@ -2485,9 +2482,6 @@ if (!is_android) { +@@ -2543,9 +2540,6 @@ if (!is_android) { "//services/network/public/proto:sct_audit_report_proto", "//services/preferences/public/cpp", "//services/preferences/public/cpp/tracked", @@ -818,7 +818,7 @@ "//services/service_manager/public/cpp", "//services/strings", "//services/test/echo/public/mojom", -@@ -8020,7 +8014,6 @@ test("unit_tests") { +@@ -8032,7 +8026,6 @@ test("unit_tests") { # Non-android deps for "unit_tests" target. deps += [ @@ -826,15 +826,15 @@ "//chrome:packed_resources_integrity_header", "//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps/app_service", -@@ -8166,7 +8159,6 @@ test("unit_tests") { - "//services/device/public/cpp/bluetooth", +@@ -8175,7 +8168,6 @@ test("unit_tests") { + "//components/webapps/browser", "//services/metrics/public/cpp:ukm_builders", "//services/network:test_support", - "//services/screen_ai:test_support", "//services/video_effects/test:test_support", "//third_party/crashpad/crashpad/util", "//third_party/libaddressinput", -@@ -8585,7 +8577,6 @@ test("unit_tests") { +@@ -8615,7 +8607,6 @@ test("unit_tests") { "//chrome/browser/nearby_sharing/contacts:unit_tests", "//chrome/browser/nearby_sharing/local_device_data:unit_tests", "//chrome/browser/policy:unit_tests", @@ -844,7 +844,7 @@ "//chrome/browser/ui/ash:unit_tests", --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn -@@ -409,7 +409,7 @@ source_set("lib") { +@@ -408,7 +408,7 @@ source_set("lib") { } } @@ -884,7 +884,7 @@ #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE) -@@ -260,12 +258,6 @@ auto RunSpeechRecognitionService( +@@ -262,12 +260,6 @@ auto RunSpeechRecognitionService( } #endif // !BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE) @@ -897,7 +897,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) auto RunCupsIppParser( -@@ -467,7 +459,6 @@ void RegisterMainThreadServices(mojo::Se +@@ -471,7 +463,6 @@ void RegisterMainThreadServices(mojo::Se services.Add(RunProfileImporter); services.Add(RunMirroringService); services.Add(RunPassageEmbeddingsService); @@ -1044,7 +1044,7 @@ fuzzer_test("update_client_protocol_serializer_fuzzer") { --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -804,10 +804,6 @@ if (is_apple) { +@@ -814,10 +814,6 @@ if (is_apple) { deps = [ "//third_party/icu:icudata" ] } @@ -1057,17 +1057,17 @@ if (use_v8_context_snapshot) { --- a/pdf/accessibility.cc +++ b/pdf/accessibility.cc -@@ -47,7 +47,6 @@ void GetAccessibilityInfo(PDFiumEngine* +@@ -46,7 +46,6 @@ void GetAccessibilityInfo(PDFiumEngine* page_info.page_index = page_index; page_info.bounds = page->rect(); page_info.char_count = char_count; - page_info.is_searchified = page->IsPageSearchified(); - - chars.resize(page_info.char_count); - for (uint32_t i = 0; i < char_count; ++i) { + page->GetTextAndImageInfo(text_runs, chars, page_objects.images); + page_info.text_run_count = text_runs.size(); + page_objects.links = page->GetLinkInfo(text_runs); --- a/pdf/pdf_view_web_plugin.cc +++ b/pdf/pdf_view_web_plugin.cc -@@ -1299,11 +1299,6 @@ void PdfViewWebPlugin::DocumentLoadCompl +@@ -1326,11 +1326,6 @@ void PdfViewWebPlugin::DocumentLoadCompl if (accessibility_state_ == AccessibilityState::kPending) LoadAccessibility(); @@ -1079,7 +1079,7 @@ if (!full_frame_) return; -@@ -2284,7 +2279,7 @@ void PdfViewWebPlugin::EnableAccessibili +@@ -2322,7 +2317,7 @@ void PdfViewWebPlugin::EnableAccessibili SkBitmap PdfViewWebPlugin::GetImageForOcr(int32_t page_index, int32_t page_object_index) { @@ -1088,7 +1088,7 @@ } void PdfViewWebPlugin::HandleAccessibilityAction( -@@ -2834,19 +2829,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce +@@ -2843,19 +2838,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce return; } @@ -1110,7 +1110,7 @@ --- a/pdf/pdfium/pdfium_engine.cc +++ b/pdf/pdfium/pdfium_engine.cc -@@ -2686,7 +2686,7 @@ void PDFiumEngine::HandleLongPress(const +@@ -2715,7 +2715,7 @@ void PDFiumEngine::HandleLongPress(const SkBitmap PDFiumEngine::GetImageForOcr(int page_index, int image_index) { DCHECK(PageIndexInBounds(page_index)); @@ -1119,6 +1119,16 @@ } bool PDFiumEngine::GetPrintScaling() { +--- a/services/passage_embeddings/passage_embeddings_service.cc ++++ b/services/passage_embeddings/passage_embeddings_service.cc +@@ -22,7 +22,6 @@ PassageEmbeddingsService::PassageEmbeddi + PassageEmbeddingsService::~PassageEmbeddingsService() = default; + + void PassageEmbeddingsService::OnEmbedderDisconnect() { +- embedder_.reset(); + } + + void PassageEmbeddingsService::LoadModels( --- a/services/passage_embeddings/passage_embeddings_service.h +++ b/services/passage_embeddings/passage_embeddings_service.h @@ -11,7 +11,6 @@ @@ -1161,7 +1171,7 @@ group("devtools_all_files") { --- a/third_party/devtools-frontend/src/front_end/BUILD.gn +++ b/third_party/devtools-frontend/src/front_end/BUILD.gn -@@ -196,7 +196,6 @@ group("unittests") { +@@ -211,7 +211,6 @@ group("unittests") { "panels/timeline:unittests", "panels/timeline/components:unittests", "panels/timeline/components/insights:unittests", diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index 4583c1c2..f89c9526 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -599,8 +599,6 @@ static_library("browser") { +@@ -606,8 +606,6 @@ static_library("browser") { "infobars/simple_alert_infobar_creator.h", "interstitials/chrome_settings_page_helper.cc", "interstitials/chrome_settings_page_helper.h", @@ -11,7 +11,7 @@ "invalidation/profile_invalidation_provider_factory.cc", "invalidation/profile_invalidation_provider_factory.h", "k_anonymity_service/k_anonymity_service_client.cc", -@@ -2263,7 +2261,6 @@ static_library("browser") { +@@ -2284,7 +2282,6 @@ static_library("browser") { "//components/resources", "//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser:safe_browsing_service", @@ -19,7 +19,7 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser", -@@ -3823,10 +3820,6 @@ static_library("browser") { +@@ -3854,10 +3851,6 @@ static_library("browser") { "new_tab_page/modules/modules_switches.h", "new_tab_page/modules/new_tab_page_modules.cc", "new_tab_page/modules/new_tab_page_modules.h", @@ -30,7 +30,7 @@ "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.cc", "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h", "new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc", -@@ -6509,19 +6502,14 @@ static_library("browser") { +@@ -6576,14 +6569,11 @@ static_library("browser") { deps += [ "//components/enterprise/idle" ] } @@ -45,34 +45,7 @@ if (enterprise_cloud_content_analysis) { sources += [ -- "enterprise/connectors/analysis/content_analysis_delegate.cc", -- "enterprise/connectors/analysis/content_analysis_delegate.h", - "enterprise/connectors/analysis/content_analysis_delegate_base.h", - "enterprise/connectors/analysis/content_analysis_dialog.cc", - "enterprise/connectors/analysis/content_analysis_dialog.h", -@@ -6529,8 +6517,6 @@ static_library("browser") { - "enterprise/connectors/analysis/content_analysis_downloads_delegate.h", - "enterprise/connectors/analysis/files_request_handler.cc", - "enterprise/connectors/analysis/files_request_handler.h", -- "enterprise/connectors/analysis/page_print_analysis_request.cc", -- "enterprise/connectors/analysis/page_print_analysis_request.h", - "enterprise/connectors/analysis/request_handler_base.cc", - "enterprise/connectors/analysis/request_handler_base.h", - "enterprise/connectors/reporting/browser_crash_event_router.cc", -@@ -7114,12 +7100,6 @@ static_library("browser") { - } - } - -- if (enterprise_content_analysis) { -- sources += [ -- "enterprise/data_protection/print_utils.cc", -- "enterprise/data_protection/print_utils.h", -- ] -- } - - if (enable_captive_portal_detection) { - sources += [ -@@ -8084,9 +8064,14 @@ static_library("browser") { +@@ -8114,9 +8104,14 @@ static_library("browser") { "//components/safe_browsing/content/browser:safe_browsing_blocking_page", "//components/safe_browsing/content/browser/download:download_stats", "//components/safe_browsing/content/common:file_type_policies", @@ -88,7 +61,7 @@ if (build_with_tflite_lib) { sources += [ -@@ -8391,7 +8376,6 @@ static_library("browser_generated_files" +@@ -8423,7 +8418,6 @@ static_library("browser_generated_files" "//chrome/browser/new_tab_page/chrome_colors:generate_chrome_colors_info", "//chrome/browser/new_tab_page/chrome_colors:generate_colors_info", "//chrome/browser/new_tab_page/modules/file_suggestion:mojo_bindings", @@ -96,7 +69,7 @@ "//chrome/browser/new_tab_page/modules/v2/authentication:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings", -@@ -8873,8 +8857,6 @@ static_library("test_support") { +@@ -8905,8 +8899,6 @@ static_library("test_support") { "//components/reporting/util:status", "//components/reporting/util:status_macros", "//components/reporting/util:task_runner_context", @@ -105,120 +78,17 @@ "//components/safe_browsing/core/common/proto:csd_proto", "//components/search_engines:test_support", "//components/security_interstitials/content:security_interstitial_page", ---- a/chrome/browser/chrome_content_browser_client.cc -+++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5439,11 +5439,13 @@ ChromeContentBrowserClient::CreateThrott - &throttles); - #endif - -+#if BUILDFLAG(FULL_SAFE_BROWSING) - if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) { - throttles.push_back( - std::make_unique( - handle)); - } -+#endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: -@@ -7217,26 +7219,7 @@ ChromeContentBrowserClient::GetSafeBrows - const std::vector& allowlist_domains) { - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - -- // Should not bypass safe browsing check if the check is for enterprise -- // lookup. -- if (!safe_browsing_enabled_for_profile && !should_check_on_sb_disabled) -- return nullptr; -- -- // |safe_browsing_service_| may be unavailable in tests. -- if (safe_browsing_service_ && !safe_browsing_url_checker_delegate_) { -- safe_browsing_url_checker_delegate_ = -- base::MakeRefCounted( -- safe_browsing_service_->database_manager(), -- safe_browsing_service_->ui_manager()); -- } -- -- // Update allowlist domains. -- if (safe_browsing_url_checker_delegate_) { -- safe_browsing_url_checker_delegate_->SetPolicyAllowlistDomains( -- allowlist_domains); -- } -- -- return safe_browsing_url_checker_delegate_; -+ return nullptr; - } - - safe_browsing::RealTimeUrlLookupServiceBase* -@@ -7244,19 +7227,6 @@ ChromeContentBrowserClient::GetUrlLookup - content::BrowserContext* browser_context, - bool is_enterprise_lookup_enabled, - bool is_consumer_lookup_enabled) { -- // |safe_browsing_service_| may be unavailable in tests. -- if (!safe_browsing_service_) { -- return nullptr; -- } -- Profile* profile = Profile::FromBrowserContext(browser_context); -- if (is_enterprise_lookup_enabled) { -- return safe_browsing::ChromeEnterpriseRealTimeUrlLookupServiceFactory:: -- GetForProfile(profile); -- } -- if (is_consumer_lookup_enabled) { -- return safe_browsing::RealTimeUrlLookupServiceFactory::GetForProfile( -- profile); -- } - return nullptr; - } - -@@ -7268,30 +7238,7 @@ ChromeContentBrowserClient::GetAsyncChec - safe_browsing::hash_realtime_utils::HashRealTimeSelection - hash_realtime_selection, - content::FrameTreeNodeId frame_tree_node_id) { -- content::WebContents* contents = wc_getter.Run(); -- if (!contents || !safe_browsing_service_ || -- !safe_browsing_service_->ui_manager()) { - return nullptr; -- } -- if (is_enterprise_lookup_enabled) { -- // No async checks for enterprise real-time checks. URL filtering rules -- // need to be applied before the navigation is completed. -- return nullptr; -- } -- if (!is_consumer_lookup_enabled && -- hash_realtime_selection == -- safe_browsing::hash_realtime_utils::HashRealTimeSelection::kNone) { -- return nullptr; -- } -- if (prerender::ChromeNoStatePrefetchContentsDelegate::FromWebContents( -- contents) || -- contents->IsPrerenderedFrame(frame_tree_node_id)) { -- return nullptr; -- } -- return safe_browsing::AsyncCheckTracker::GetOrCreateForWebContents( -- contents, safe_browsing_service_->ui_manager().get(), -- safe_browsing::AsyncCheckTracker:: -- IsPlatformEligibleForSyncCheckerCheckAllowlist()); - } - - void ChromeContentBrowserClient::ReportLegacyTechEvent( --- a/chrome/browser/download/bubble/download_bubble_ui_controller.cc +++ b/chrome/browser/download/bubble/download_bubble_ui_controller.cc -@@ -31,7 +31,6 @@ - #include "chrome/browser/feature_engagement/tracker_factory.h" - #include "chrome/browser/offline_items_collection/offline_content_aggregator_factory.h" - #include "chrome/browser/profiles/profile_key.h" --#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h" - #include "chrome/browser/safe_browsing/safe_browsing_service.h" - #include "chrome/browser/ui/browser.h" - #include "chrome/browser/ui/browser_finder.h" -@@ -46,7 +45,6 @@ - #include "components/feature_engagement/public/tracker.h" +@@ -45,7 +45,6 @@ #include "components/offline_items_collection/core/offline_content_aggregator.h" + #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "content/public/browser/download_item_utils.h" #include "content/public/browser/download_manager.h" -@@ -262,14 +260,6 @@ void DownloadBubbleUIController::Process +@@ -265,14 +264,6 @@ void DownloadBubbleUIController::Process switch (command) { case DownloadCommands::KEEP: case DownloadCommands::DISCARD: { @@ -233,42 +103,17 @@ DownloadItemWarningData::AddWarningActionEvent(item, warning_surface, warning_action); // Launch a HaTS survey. Note this needs to come before the command is -@@ -288,8 +278,6 @@ void DownloadBubbleUIController::Process - break; - } - case DownloadCommands::REVIEW: -- model->ReviewScanningVerdict( -- browser_->tab_strip_model()->GetActiveWebContents()); - break; - case DownloadCommands::RETRY: - RetryDownload(model.get(), command); --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -163,7 +163,6 @@ using content::DownloadManager; +@@ -169,7 +169,6 @@ using content::DownloadManager; using download::DownloadItem; using download::DownloadPathReservationTracker; using download::PathValidationResult; -using safe_browsing::DownloadFileType; using ConnectionType = net::NetworkChangeNotifier::ConnectionType; - #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -694,15 +693,6 @@ bool ChromeDownloadManagerDelegate::Shou - #endif - - bool should_open = download_prefs_->IsAutoOpenEnabled(url, path); -- int64_t file_type_uma_value = -- safe_browsing::FileTypePolicies::GetInstance()->UmaValueForFile(path); -- if (should_open) { -- base::UmaHistogramSparse("SBClientDownload.AutoOpenEnabledFileType", -- file_type_uma_value); -- } else { -- base::UmaHistogramSparse("SBClientDownload.AutoOpenDisabledFileType", -- file_type_uma_value); -- } - - return should_open; - } -@@ -1791,7 +1781,6 @@ void ChromeDownloadManagerDelegate::OnDo + #if BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION) +@@ -1815,7 +1814,6 @@ void ChromeDownloadManagerDelegate::OnDo DownloadItemModel model(item); model.DetermineAndSetShouldPreferOpeningInBrowser( target_info.target_path, target_info.is_filetype_handled_safely); @@ -276,7 +121,7 @@ } if (ShouldBlockFile(item, target_info.danger_type)) { MaybeReportDangerousDownloadBlocked( -@@ -1872,49 +1861,20 @@ bool ChromeDownloadManagerDelegate::IsOp +@@ -1896,49 +1894,20 @@ bool ChromeDownloadManagerDelegate::IsOp bool ChromeDownloadManagerDelegate::ShouldBlockFile( download::DownloadItem* item, download::DownloadDangerType danger_type) const { @@ -330,85 +175,9 @@ default: LOG(ERROR) << "Invalid download restriction value: " << static_cast(download_restriction); -@@ -2057,8 +2017,7 @@ void ChromeDownloadManagerDelegate::Chec - DCHECK(download_item); - DCHECK(download_item->IsSavePackageDownload()); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) -+#if 0 - std::optional settings = - safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item); - ---- a/chrome/browser/download/download_item_model.cc -+++ b/chrome/browser/download/download_item_model.cc -@@ -920,30 +920,6 @@ void DownloadItemModel::ExecuteCommand(D - } - - TailoredWarningType DownloadItemModel::GetTailoredWarningType() const { -- if (!base::FeatureList::IsEnabled(safe_browsing::kDownloadTailoredWarnings)) { -- return TailoredWarningType::kNoTailoredWarning; -- } -- -- download::DownloadDangerType danger_type = GetDangerType(); -- TailoredVerdict tailored_verdict = safe_browsing::DownloadProtectionService:: -- GetDownloadProtectionTailoredVerdict(download_); -- if (danger_type == download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT && -- tailored_verdict.tailored_verdict_type() == -- TailoredVerdict::SUSPICIOUS_ARCHIVE) { -- return TailoredWarningType::kSuspiciousArchive; -- } -- -- if (danger_type == -- download::DOWNLOAD_DANGER_TYPE_DANGEROUS_ACCOUNT_COMPROMISE && -- tailored_verdict.tailored_verdict_type() == -- TailoredVerdict::COOKIE_THEFT) { -- if (base::Contains(tailored_verdict.adjustments(), -- TailoredVerdict::ACCOUNT_INFO_STRING)) { -- return TailoredWarningType::kCookieTheftWithAccountInfo; -- } -- return TailoredWarningType::kCookieTheft; -- } -- - return TailoredWarningType::kNoTailoredWarning; - } - ---- a/chrome/browser/download/download_stats.cc -+++ b/chrome/browser/download/download_stats.cc -@@ -12,6 +12,7 @@ - #include "chrome/browser/profiles/profile.h" - #include "components/download/public/common/download_content.h" - #include "components/profile_metrics/browser_profile_type.h" -+#include "components/safe_browsing/buildflags.h" - #include "components/safe_browsing/content/browser/download/download_stats.h" - - void RecordDownloadSource(ChromeDownloadSource source) { -@@ -34,9 +35,6 @@ void MaybeRecordDangerousDownloadWarning - base::UmaHistogramEnumeration("SBClientDownload.TailoredWarningType", - model.GetTailoredWarningType()); - #endif // BUILDFLAG(IS_ANDROID) -- safe_browsing::RecordDangerousDownloadWarningShown( -- model.GetDangerType(), model.GetTargetFilePath(), -- model.GetURL().SchemeIs(url::kHttpsScheme), model.HasUserGesture()); - - model.SetWasUIWarningShown(true); - } --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1024,12 +1024,6 @@ void DownloadTargetDeterminer::CheckVisi - bool visited_referrer_before) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); -- safe_browsing::RecordDownloadFileTypeAttributes( -- safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( -- virtual_path_.BaseName(), download_->GetURL(), -- GetProfile()->GetPrefs()), -- download_->HasUserGesture(), visited_referrer_before, -- GetLastDownloadBypassTimestamp()); - danger_level_ = GetDangerLevel( - visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER); - if (danger_level_ != DownloadFileType::NOT_DANGEROUS && -@@ -1288,14 +1282,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1373,14 +1373,7 @@ DownloadFileType::DangerLevel DownloadTa std::optional DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { @@ -424,21 +193,6 @@ } void DownloadTargetDeterminer::OnDownloadDestroyed( ---- a/chrome/browser/download/download_ui_safe_browsing_util.cc -+++ b/chrome/browser/download/download_ui_safe_browsing_util.cc -@@ -68,12 +68,6 @@ bool CanUserTurnOnSafeBrowsing(Profile* - void RecordDownloadDangerPromptHistogram( - const std::string& proceed_or_shown_suffix, - const download::DownloadItem& item) { -- int64_t file_type_uma_value = -- safe_browsing::FileTypePolicies::GetInstance()->UmaValueForFile( -- item.GetTargetFilePath()); -- base::UmaHistogramSparse( -- GetDangerPromptHistogramName(proceed_or_shown_suffix, item), -- file_type_uma_value); - } - - #if BUILDFLAG(FULL_SAFE_BROWSING) --- a/chrome/browser/download/download_warning_desktop_hats_utils.cc +++ b/chrome/browser/download/download_warning_desktop_hats_utils.cc @@ -33,7 +33,6 @@ @@ -560,7 +314,7 @@ base::TimeDelta GetIgnoreDownloadBubbleWarningDelay() { --- a/chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc +++ b/chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc -@@ -200,8 +200,6 @@ AnalysisSettings AnalysisServiceSettings +@@ -201,8 +201,6 @@ AnalysisSettings AnalysisServiceSettings settings.block_large_files = block_large_files_; if (is_cloud_analysis()) { CloudAnalysisSettings cloud_settings; @@ -571,7 +325,7 @@ analysis_config_->supported_tags[0].max_file_size; --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc -@@ -37,8 +37,6 @@ +@@ -39,8 +39,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" @@ -580,23 +334,6 @@ #include "chrome/grit/generated_resources.h" #include "components/enterprise/buildflags/buildflags.h" #include "components/enterprise/common/files_scan_data.h" -@@ -1152,16 +1150,6 @@ void ContentAnalysisDelegate::AckAllRequ - void ContentAnalysisDelegate::FinishLargeDataRequestEarly( - std::unique_ptr request, - safe_browsing::BinaryUploadService::Result result) { -- // We add the request here in case we never actually uploaded anything, so -- // it wasn't added in OnGetRequestData -- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanRequests( -- request->per_profile_request(), /*access_token*/ "", /*upload_info*/ -- "Skipped - Large data blocked", /*upload_url*/ "", -- request->content_analysis_request()); -- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanResponses( -- /*token=*/"", safe_browsing::BinaryUploadService::ResultToString(result), -- enterprise_connectors::ContentAnalysisResponse()); -- - request->FinishRequest(result, - enterprise_connectors::ContentAnalysisResponse()); - } --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc @@ -126,7 +126,7 @@ ContentAnalysisDownloadsDelegate::GetCus @@ -610,7 +347,7 @@ std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel() --- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc +++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc -@@ -176,52 +176,12 @@ void FilesRequestHandler::FileRequestCal +@@ -166,57 +166,12 @@ void FilesRequestHandler::FileRequestCal } bool FilesRequestHandler::UploadDataImpl() { @@ -645,14 +382,19 @@ - DCHECK_LT(index, paths_.size()); - base::FilePath path = paths_[index]; - auto request = std::make_unique( -- *analysis_settings_, path, path.BaseName(), /*mime_type*/ "", +- content_analysis_info_->settings(), path, path.BaseName(), +- /*mime_type*/ "", - /* delay_opening_file */ true, - base::BindOnce(&FilesRequestHandler::FileRequestCallback, - weak_ptr_factory_.GetWeakPtr(), index), - base::BindOnce(&FilesRequestHandler::FileRequestStartCallback, - weak_ptr_factory_.GetWeakPtr(), index)); - safe_browsing::FileAnalysisRequest* request_raw = request.get(); -- PrepareRequest(AccessPointToEnterpriseConnector(access_point_), request_raw); +- content_analysis_info_->InitializeRequest(request_raw); +- request_raw->set_analysis_connector( +- AccessPointToEnterpriseConnector(access_point_)); +- request_raw->set_source(source_); +- request_raw->set_destination(destination_); - request_raw->GetRequestData(base::BindOnce( - &FilesRequestHandler::OnGotFileInfo, weak_ptr_factory_.GetWeakPtr(), - std::move(request), index)); @@ -663,7 +405,7 @@ void FilesRequestHandler::OnGotFileInfo( std::unique_ptr request, size_t index, -@@ -270,15 +230,6 @@ void FilesRequestHandler::OnGotFileInfo( +@@ -265,15 +220,6 @@ void FilesRequestHandler::OnGotFileInfo( void FilesRequestHandler::FinishRequestEarly( std::unique_ptr request, safe_browsing::BinaryUploadService::Result result) { @@ -681,7 +423,7 @@ } --- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.h +++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.h -@@ -123,10 +123,6 @@ class FilesRequestHandler : public Reque +@@ -113,10 +113,6 @@ class FilesRequestHandler : public Reque enterprise_connectors::ContentAnalysisResponse response); private: @@ -721,31 +463,6 @@ } void ConnectorsManager::StartObservingPrefs(PrefService* pref_service) { ---- a/chrome/browser/enterprise/connectors/connectors_service.cc -+++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -424,22 +424,7 @@ std::string ConnectorsService::GetManage - } - - std::string ConnectorsService::GetRealTimeUrlCheckIdentifier() const { -- auto dm_token = GetDmToken(kEnterpriseRealTimeUrlCheckScope); -- if (!dm_token) { - return std::string(); -- } -- -- Profile* profile = Profile::FromBrowserContext(context_); -- if (dm_token->scope == policy::POLICY_SCOPE_MACHINE) { -- return GetClientId(profile); -- } -- -- auto* identity_manager = IdentityManagerFactory::GetForProfile(profile); -- if (!identity_manager) { -- return std::string(); -- } -- -- return GetProfileEmail(identity_manager); - } - - ConnectorsManager* ConnectorsService::ConnectorsManagerForTesting() { --- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc +++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc @@ -26,24 +26,6 @@ enum class PasswordProtectionTrigger { @@ -792,7 +509,7 @@ signals.Set(device_signals::names::kBuiltInDnsClientEnabled, --- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc +++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc -@@ -211,20 +211,7 @@ void RealtimeReportingClient::SetProfile +@@ -190,20 +190,7 @@ void RealtimeReportingClient::SetProfile } std::string RealtimeReportingClient::GetProfileUserName() { @@ -913,20 +630,7 @@ ReportingServiceFactory::~ReportingServiceFactory() = default; --- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc +++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc -@@ -68,12 +68,6 @@ void RunPendingNavigationCallback( - auto* user_data = GetUserData(web_contents); - DCHECK(user_data); - -- if (ShouldReportSafeUrlFilteringEvents(user_data)) { -- MaybeTriggerUrlFilteringInterstitialEvent( -- web_contents, web_contents->GetLastCommittedURL(), -- /*threat_type=*/"", *user_data->rt_lookup_response()); -- } -- - std::move(callback).Run(user_data->settings()); - } - -@@ -177,9 +171,7 @@ void LogVerdictSource( +@@ -183,9 +183,7 @@ void LogVerdictSource( bool IsScreenshotAllowedByDataControls(content::BrowserContext* context, const GURL& url) { @@ -937,59 +641,6 @@ } } // namespace -@@ -208,16 +200,6 @@ void DataProtectionNavigationObserver::C - std::move(callback).Run(UrlSettings::None()); - return; - } -- -- // ChromeEnterpriseRealTimeUrlLookupServiceFactory::GetForProfile() return -- // nullptr if enterprise policies are not set. In this case data protections -- // will be based on data controls alone, -- enterprise_data_protection::DataProtectionNavigationObserver:: -- CreateForNavigationHandle( -- *navigation_handle, -- safe_browsing::ChromeEnterpriseRealTimeUrlLookupServiceFactory:: -- GetForProfile(profile), -- navigation_handle->GetWebContents(), std::move(callback)); - } - - // static -@@ -253,35 +235,9 @@ void DataProtectionNavigationObserver::A - web_contents->GetLastCommittedURL())); - } - -- auto* lookup_service = -- g_lookup_service -- ? g_lookup_service -- : safe_browsing::ChromeEnterpriseRealTimeUrlLookupServiceFactory:: -- GetForProfile(profile); -- if (lookup_service && IsEnterpriseLookupEnabled(profile)) { -- auto lookup_callback = base::BindOnce( -- [](const std::string& identifier, -- DataProtectionNavigationObserver::Callback callback, -- base::WeakPtr web_contents, -- std::unique_ptr response) { -- if (web_contents) { -- DataProtectionPageUserData::UpdateRTLookupResponse( -- GetPageFromWebContents(web_contents.get()), identifier, -- std::move(response)); -- auto* user_data = GetUserData(web_contents.get()); -- DCHECK(user_data); -- std::move(callback).Run(user_data->settings()); -- } -- }, -- std::move(identifier), std::move(callback), web_contents->GetWeakPtr()); -- -- DoLookup(lookup_service, web_contents->GetLastCommittedURL(), -- GetIdentifier(profile), std::move(lookup_callback), web_contents); -- } else { - ud = GetUserData(web_contents); - DCHECK(ud); - std::move(callback).Run(ud->settings()); -- } - } - - // static --- a/chrome/browser/enterprise/signals/context_info_fetcher.h +++ b/chrome/browser/enterprise/signals/context_info_fetcher.h @@ -6,6 +6,7 @@ @@ -1068,89 +719,15 @@ } // namespace utils --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -280,10 +280,6 @@ source_set("extensions") { - "api/proxy/proxy_pref_transformer.h", - "api/runtime/chrome_runtime_api_delegate.cc", - "api/runtime/chrome_runtime_api_delegate.h", -- "api/safe_browsing_private/safe_browsing_private_event_router.cc", -- "api/safe_browsing_private/safe_browsing_private_event_router.h", -- "api/safe_browsing_private/safe_browsing_private_event_router_factory.cc", -- "api/safe_browsing_private/safe_browsing_private_event_router_factory.h", - "api/sessions/session_id.cc", - "api/sessions/session_id.h", - "api/sessions/sessions_api.cc", -@@ -567,8 +563,6 @@ source_set("extensions") { - "mv2_experiment_stage.h", +@@ -679,8 +679,6 @@ source_set("extensions") { + "mv2_deprecation_impact_checker.h", "navigation_extension_enabler.cc", "navigation_extension_enabler.h", - "omaha_attributes_handler.cc", - "omaha_attributes_handler.h", - "pack_extension_job.cc", - "pack_extension_job.h", - "pending_extension_info.cc", ---- a/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -+++ b/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -114,7 +114,6 @@ void EnsureApiBrowserContextKeyedService - #endif - extensions::ProcessesAPI::GetFactoryInstance(); - extensions::ReadingListEventRouterFactory::GetInstance(); -- extensions::SafeBrowsingPrivateEventRouterFactory::GetInstance(); - extensions::SessionsAPI::GetFactoryInstance(); - extensions::SettingsPrivateEventRouterFactory::GetInstance(); - extensions::SettingsOverridesAPI::GetFactoryInstance(); ---- a/chrome/browser/extensions/api/cookies/cookies_api.cc -+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc -@@ -348,22 +348,6 @@ void CookiesGetFunction::GetCookieListCa - } - - void CookiesGetFunction::NotifyExtensionTelemetry() { -- // TODO(crbug.com/371423073): Support telemetry on Android. --#if !BUILDFLAG(IS_ANDROID) -- auto* telemetry_service = -- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile( -- Profile::FromBrowserContext(browser_context())); -- -- if (!telemetry_service || !telemetry_service->enabled()) { -- return; -- } -- -- auto cookies_get_signal = std::make_unique( -- extension_id(), parsed_args_->details.name, -- parsed_args_->details.store_id.value_or(std::string()), -- parsed_args_->details.url, js_callstack().value_or(StackTrace())); -- telemetry_service->AddSignal(std::move(cookies_get_signal)); --#endif - } - - CookiesGetAllFunction::CookiesGetAllFunction() = default; -@@ -455,27 +439,6 @@ void CookiesGetAllFunction::GetCookieLis - } - - void CookiesGetAllFunction::NotifyExtensionTelemetry() { -- // TODO(crbug.com/371423073): Support telemetry on Android. --#if !BUILDFLAG(IS_ANDROID) -- auto* telemetry_service = -- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile( -- Profile::FromBrowserContext(browser_context())); -- -- if (!telemetry_service || !telemetry_service->enabled()) { -- return; -- } -- -- auto cookies_get_all_signal = -- std::make_unique( -- extension_id(), parsed_args_->details.domain.value_or(std::string()), -- parsed_args_->details.name.value_or(std::string()), -- parsed_args_->details.path.value_or(std::string()), -- parsed_args_->details.secure, -- parsed_args_->details.store_id.value_or(std::string()), -- parsed_args_->details.url.value_or(std::string()), -- parsed_args_->details.session, js_callstack().value_or(StackTrace())); -- telemetry_service->AddSignal(std::move(cookies_get_all_signal)); --#endif - } - - CookiesSetFunction::CookiesSetFunction() + "permissions/site_permissions_helper.cc", + "permissions/site_permissions_helper.h", + "permissions_based_management_policy_provider.cc", --- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc +++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc @@ -100,16 +100,8 @@ api::enterprise_reporting_private::Conte @@ -1170,31 +747,6 @@ info.browser_version = std::move(signals.browser_version); info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled; info.enterprise_profile_id = signals.enterprise_profile_id; ---- a/chrome/browser/extensions/api/tabs/tabs_api.cc -+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -447,22 +447,6 @@ void NotifyExtensionTelemetry(Profile* p - const std::string& current_url, - const std::string& new_url, - const std::optional& js_callstack) { -- // Ignore API calls that are not invoked by extensions. -- if (!extension) { -- return; -- } -- -- auto* extension_telemetry_service = -- safe_browsing::ExtensionTelemetryService::Get(profile); -- -- if (!extension_telemetry_service || !extension_telemetry_service->enabled()) { -- return; -- } -- -- auto tabs_api_signal = std::make_unique( -- extension->id(), api_method, current_url, new_url, -- js_callstack.value_or(StackTrace())); -- extension_telemetry_service->AddSignal(std::move(tabs_api_signal)); - } - - } // namespace --- a/chrome/browser/extensions/blocklist.cc +++ b/chrome/browser/extensions/blocklist.cc @@ -190,21 +190,8 @@ Blocklist* Blocklist::Get(content::Brows @@ -1219,86 +771,20 @@ } void Blocklist::GetMalwareIDs(const std::set& ids, ---- a/chrome/browser/extensions/chrome_extensions_browser_client.cc -+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc -@@ -792,42 +792,17 @@ void ChromeExtensionsBrowserClient::Noti - content::BrowserContext* context, - const ExtensionId& extension_id, - const std::string& code) const { -- auto* telemetry_service = -- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile( -- Profile::FromBrowserContext(context)); -- if (!telemetry_service || !telemetry_service->enabled()) { -- return; -- } -- -- auto signal = std::make_unique( -- extension_id, code); -- telemetry_service->AddSignal(std::move(signal)); +--- a/chrome/browser/extensions/chrome_extension_system.cc ++++ b/chrome/browser/extensions/chrome_extension_system.cc +@@ -450,8 +450,6 @@ void ChromeExtensionSystem::InstallUpdat + void ChromeExtensionSystem::PerformActionBasedOnOmahaAttributes( + const std::string& extension_id, + const base::Value::Dict& attributes) { +- extension_service()->PerformActionBasedOnOmahaAttributes(extension_id, +- attributes); } - bool ChromeExtensionsBrowserClient::IsExtensionTelemetryServiceEnabled( - content::BrowserContext* context) const { -- auto* telemetry_service = -- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile( -- Profile::FromBrowserContext(context)); -- return telemetry_service && telemetry_service->enabled(); -+ return false; - } - - void ChromeExtensionsBrowserClient::NotifyExtensionApiDeclarativeNetRequest( - content::BrowserContext* context, - const ExtensionId& extension_id, - const std::vector& rules) const { -- auto* telemetry_service = -- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile( -- Profile::FromBrowserContext(context)); -- if (!telemetry_service || !telemetry_service->enabled()) { -- return; -- } -- -- // The telemetry service will consume and release the signal object inside the -- // `AddSignal()` call. -- auto signal = std::make_unique( -- extension_id, rules); -- telemetry_service->AddSignal(std::move(signal)); - } - - void ChromeExtensionsBrowserClient:: -@@ -836,22 +811,6 @@ void ChromeExtensionsBrowserClient:: - const ExtensionId& extension_id, - const GURL& request_url, - const GURL& redirect_url) const { -- auto* telemetry_service = -- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile( -- Profile::FromBrowserContext(context)); -- if (!telemetry_service || !telemetry_service->enabled() || -- !base::FeatureList::IsEnabled( -- safe_browsing:: -- kExtensionTelemetryDeclarativeNetRequestActionSignal)) { -- return; -- } -- -- // The telemetry service will consume and release the signal object inside the -- // `AddSignal()` call. -- auto signal = safe_browsing::DeclarativeNetRequestActionSignal:: -- CreateDeclarativeNetRequestRedirectActionSignal(extension_id, request_url, -- redirect_url); -- telemetry_service->AddSignal(std::move(signal)); - } - - // static -@@ -1020,7 +979,6 @@ void ChromeExtensionsBrowserClient::GetW - - void ChromeExtensionsBrowserClient::CreatePasswordReuseDetectionManager( - content::WebContents* web_contents) const { -- ChromePasswordReuseDetectionManagerClient::CreateForWebContents(web_contents); - } - - media_device_salt::MediaDeviceSaltService* + bool ChromeExtensionSystem::FinishDelayedInstallationIfReady( --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -56,7 +56,6 @@ +@@ -55,7 +55,6 @@ #include "chrome/browser/extensions/installed_loader.h" #include "chrome/browser/extensions/manifest_v2_experiment_manager.h" #include "chrome/browser/extensions/mv2_experiment_stage.h" @@ -1306,18 +792,19 @@ #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/permissions/permissions_updater.h" #include "chrome/browser/extensions/profile_util.h" -@@ -407,9 +406,6 @@ ExtensionService::ExtensionService( - safe_browsing_verdict_handler_(extension_prefs, - ExtensionRegistry::Get(profile), - this), +@@ -403,10 +402,6 @@ ExtensionService::ExtensionService( + install_directory, + unpacked_install_directory)), + extension_registrar_(ExtensionRegistrar::Get(profile)), - omaha_attributes_handler_(extension_prefs, - ExtensionRegistry::Get(profile), -- this), - extension_telemetry_service_verdict_handler_( - extension_prefs, - ExtensionRegistry::Get(profile), -@@ -838,17 +834,6 @@ bool ExtensionService::IsExtensionEnable - return extension_registrar_.IsExtensionEnabled(extension_id); +- this, +- extension_registrar_), + force_installed_tracker_(registry_, profile_), + force_installed_metrics_(registry_, profile_, &force_installed_tracker_), + corrupted_extension_reinstaller_(profile_), +@@ -749,17 +744,6 @@ bool ExtensionService::IsExtensionEnable + return extension_registrar_->IsExtensionEnabled(extension_id); } -void ExtensionService::PerformActionBasedOnOmahaAttributes( @@ -1336,15 +823,15 @@ DCHECK_CURRENTLY_ON(BrowserThread::UI); --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h -@@ -31,7 +31,6 @@ +@@ -30,7 +30,6 @@ + #include "chrome/browser/extensions/extension_telemetry_service_verdict_handler.h" #include "chrome/browser/extensions/forced_extensions/force_installed_metrics.h" #include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h" - #include "chrome/browser/extensions/install_gate.h" -#include "chrome/browser/extensions/omaha_attributes_handler.h" - #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/safe_browsing_verdict_handler.h" #include "chrome/browser/profiles/profile_manager_observer.h" -@@ -308,10 +307,6 @@ class ExtensionService : public Extensio + #include "chrome/browser/upgrade_detector/upgrade_observer.h" +@@ -303,10 +302,6 @@ class ExtensionService : public Extensio void RemoveDisableReasonAndMaybeEnable(const std::string& extension_id, disable_reason::DisableReason reason); @@ -1355,26 +842,15 @@ // Performs action based on verdicts received from the Extension Telemetry // server. Currently, these verdicts are limited to off-store extensions. void PerformActionBasedOnExtensionTelemetryServiceVerdicts( -@@ -695,8 +690,6 @@ class ExtensionService : public Extensio - - SafeBrowsingVerdictHandler safe_browsing_verdict_handler_; +@@ -715,8 +710,6 @@ class ExtensionService : public Extensio + // Helper to register and unregister extensions. + raw_ptr extension_registrar_ = nullptr; +- // Needs `extension_registrar_` during construction. - OmahaAttributesHandler omaha_attributes_handler_; -- - ExtensionTelemetryServiceVerdictHandler - extension_telemetry_service_verdict_handler_; ---- a/chrome/browser/extensions/extension_system_impl.cc -+++ b/chrome/browser/extensions/extension_system_impl.cc -@@ -447,8 +447,6 @@ void ExtensionSystemImpl::InstallUpdate( - void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes( - const std::string& extension_id, - const base::Value::Dict& attributes) { -- extension_service()->PerformActionBasedOnOmahaAttributes(extension_id, -- attributes); - } - - bool ExtensionSystemImpl::FinishDelayedInstallationIfReady( + // Tracker of enterprise policy forced installation. + ForceInstalledTracker force_installed_tracker_; --- a/chrome/browser/extensions/extension_telemetry_service_verdict_handler.cc +++ b/chrome/browser/extensions/extension_telemetry_service_verdict_handler.cc @@ -73,14 +73,12 @@ void ExtensionTelemetryServiceVerdictHan @@ -1426,240 +902,6 @@ UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Disabled", extension->location()); } ---- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -42,7 +42,6 @@ - #include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h" - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/profiles/profile_manager.h" --#include "chrome/browser/safe_browsing/download_protection/download_protection_util.h" - #include "chrome/browser/ui/browser_finder.h" - #include "chrome/browser/ui/file_system_access/file_system_access_dangerous_file_dialog.h" - #include "chrome/browser/ui/file_system_access/file_system_access_dialogs.h" -@@ -495,86 +494,6 @@ bool ShouldBlockAccessToPath(const base: - return true; - } - --void DoSafeBrowsingCheckOnUIThread( -- content::GlobalRenderFrameHostId frame_id, -- std::unique_ptr item, -- safe_browsing::CheckDownloadCallback callback) { -- DCHECK_CURRENTLY_ON(content::BrowserThread::UI); -- // Download Protection Service is not supported on Android. --#if BUILDFLAG(FULL_SAFE_BROWSING) -- safe_browsing::SafeBrowsingService* sb_service = -- g_browser_process->safe_browsing_service(); -- if (!sb_service || !sb_service->download_protection_service() || -- !sb_service->download_protection_service()->enabled()) { -- std::move(callback).Run(safe_browsing::DownloadCheckResult::UNKNOWN); -- return; -- } -- -- if (!item->browser_context) { -- content::RenderProcessHost* rph = -- content::RenderProcessHost::FromID(frame_id.child_id); -- if (!rph) { -- std::move(callback).Run(safe_browsing::DownloadCheckResult::UNKNOWN); -- return; -- } -- item->browser_context = rph->GetBrowserContext(); -- } -- -- if (!item->web_contents) { -- content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(frame_id); -- if (rfh) { -- DCHECK_NE(rfh->GetLifecycleState(), -- content::RenderFrameHost::LifecycleState::kPrerendering); -- item->web_contents = content::WebContents::FromRenderFrameHost(rfh); -- } -- } -- -- sb_service->download_protection_service()->CheckFileSystemAccessWrite( -- std::move(item), std::move(callback)); --#else -- std::move(callback).Run(safe_browsing::DownloadCheckResult::UNKNOWN); --#endif --} -- --ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult --InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) { -- using Result = safe_browsing::DownloadCheckResult; -- switch (result) { -- // Only allow downloads that are marked as SAFE or UNKNOWN by SafeBrowsing. -- // All other types are going to be blocked. UNKNOWN could be the result of a -- // failed safe browsing ping or if Safe Browsing is not enabled. -- case Result::UNKNOWN: -- case Result::SAFE: -- case Result::ALLOWLISTED_BY_POLICY: -- return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult:: -- kAllow; -- -- case Result::DANGEROUS: -- case Result::UNCOMMON: -- case Result::DANGEROUS_HOST: -- case Result::POTENTIALLY_UNWANTED: -- case Result::BLOCKED_PASSWORD_PROTECTED: -- case Result::BLOCKED_TOO_LARGE: -- case Result::DANGEROUS_ACCOUNT_COMPROMISE: -- case Result::BLOCKED_SCAN_FAILED: -- return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult:: -- kBlock; -- -- // This shouldn't be returned for File System Access write checks. -- case Result::ASYNC_SCANNING: -- case Result::ASYNC_LOCAL_PASSWORD_SCANNING: -- case Result::SENSITIVE_CONTENT_WARNING: -- case Result::SENSITIVE_CONTENT_BLOCK: -- case Result::DEEP_SCANNED_SAFE: -- case Result::PROMPT_FOR_SCANNING: -- case Result::PROMPT_FOR_LOCAL_PASSWORD_SCANNING: -- case Result::DEEP_SCANNED_FAILED: -- case Result::IMMEDIATE_DEEP_SCAN: -- NOTREACHED(); -- } -- NOTREACHED(); --} -- - std::string GenerateLastPickedDirectoryKey(const std::string& id) { - return id.empty() ? kDefaultLastPickedDirectoryKey - : base::StrCat({kCustomLastPickedDirectoryKey, "-", id}); -@@ -591,13 +510,6 @@ std::string_view GetGrantKeyFromGrantTyp - : kPermissionReadableKey; - } - --safe_browsing::DownloadFileType::DangerLevel GetFileTypeDangerLevel( -- const base::FilePath& path, -- const url::Origin& origin, -- Profile* profile) { -- return safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( -- path, origin.GetURL(), profile->GetPrefs()); --} - - std::string StringOrEmpty(const std::string* s) { - return s ? *s : std::string(); -@@ -1717,9 +1629,7 @@ bool ChromeFileSystemAccessPermissionCon - bool ChromeFileSystemAccessPermissionContext::IsFileTypeDangerous( - const base::FilePath& path, - const url::Origin& origin) { -- return GetFileTypeDangerLevel(path, origin, -- Profile::FromBrowserContext(profile_)) == -- safe_browsing::DownloadFileType::DANGEROUS; -+ return false; - } - - void ChromeFileSystemAccessPermissionContext::ConfirmSensitiveEntryAccess( -@@ -1852,29 +1762,6 @@ void ChromeFileSystemAccessPermissionCon - std::move(callback)); - } - --void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( -- std::unique_ptr item, -- content::GlobalRenderFrameHostId frame_id, -- base::OnceCallback callback) { -- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -- content::GetUIThreadTaskRunner({})->PostTask( -- FROM_HERE, -- base::BindOnce( -- &DoSafeBrowsingCheckOnUIThread, frame_id, std::move(item), -- base::BindOnce( -- [](scoped_refptr task_runner, -- base::OnceCallback -- callback, -- safe_browsing::DownloadCheckResult result) { -- task_runner->PostTask( -- FROM_HERE, -- base::BindOnce(std::move(callback), -- InterpretSafeBrowsingResult(result))); -- }, -- base::SequencedTaskRunner::GetCurrentDefault(), -- std::move(callback)))); --} -- - base::expected - ChromeFileSystemAccessPermissionContext::CanShowFilePicker( - content::RenderFrameHost* rfh) { -@@ -1935,26 +1822,6 @@ void ChromeFileSystemAccessPermissionCon - return; - } - -- // If attempting to save a file with a dangerous extension, prompt the user -- // to make them confirm they actually want to save the file. -- if (handle_type == HandleType::kFile && user_action == UserAction::kSave) { -- // See https://crbug.com/1320877#c4 for justification for why we show the -- // prompt if `danger_level` is ALLOW_ON_USER_GESTURE as well as DANGEROUS. -- auto danger_level = GetFileTypeDangerLevel( -- path_info.path, origin, Profile::FromBrowserContext(profile_)); -- if (danger_level == safe_browsing::DownloadFileType::DANGEROUS || -- danger_level == -- safe_browsing::DownloadFileType::ALLOW_ON_USER_GESTURE) { -- auto result_callback = -- base::BindPostTaskToCurrentDefault(std::move(callback)); -- content::GetUIThreadTaskRunner({})->PostTask( -- FROM_HERE, -- base::BindOnce(&ShowFileSystemAccessDangerousFileDialogOnUIThread, -- frame_id, origin, path_info, -- std::move(result_callback))); -- return; -- } -- } - - std::move(callback).Run(SensitiveEntryResult::kAllowed); - } ---- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h -+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h -@@ -179,10 +179,6 @@ class ChromeFileSystemAccessPermissionCo - UserAction user_action, - content::GlobalRenderFrameHostId frame_id, - base::OnceCallback callback) override; -- void PerformAfterWriteChecks( -- std::unique_ptr item, -- content::GlobalRenderFrameHostId frame_id, -- base::OnceCallback callback) override; - bool IsFileTypeDangerous(const base::FilePath& path, - const url::Origin& origin) override; - base::expected CanShowFilePicker( ---- a/chrome/browser/media/webrtc/display_media_access_handler.cc -+++ b/chrome/browser/media/webrtc/display_media_access_handler.cc -@@ -27,6 +27,7 @@ - #include "chrome/browser/ui/url_identity.h" - #include "chrome/common/pref_names.h" - #include "components/prefs/pref_service.h" -+#include "components/safe_browsing/buildflags.h" - #include "components/url_formatter/elide_url.h" - #include "content/public/browser/browser_thread.h" - #include "content/public/browser/desktop_media_id.h" -@@ -141,6 +142,7 @@ void DisplayMediaAccessHandler::HandleRe - return; - } - -+ #if BUILDFLAG(FULL_SAFE_BROWSING) - // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing - // warnings until user interaction. If the current page has a delayed warning, - // it'll have a user interaction observer attached. Show the warning -@@ -156,6 +158,7 @@ void DisplayMediaAccessHandler::HandleRe - observer->OnDesktopCaptureRequest(); - return; - } -+ #endif // BUILDFLAG(FULL_SAFE_BROWSING) - - #if BUILDFLAG(IS_MAC) - // Do not allow picker UI to be shown on a page that isn't in the foreground ---- a/chrome/browser/notifications/notification_display_service_impl.cc -+++ b/chrome/browser/notifications/notification_display_service_impl.cc -@@ -80,13 +80,6 @@ NotificationDisplayServiceImpl::Notifica - profile_)); - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -- AddNotificationHandler( -- NotificationHandler::Type::TAILORED_SECURITY, -- std::make_unique()); --#endif -- - #if BUILDFLAG(ENABLE_EXTENSIONS_CORE) - AddNotificationHandler( - NotificationHandler::Type::EXTENSION, --- a/chrome/browser/notifications/persistent_notification_handler.cc +++ b/chrome/browser/notifications/persistent_notification_handler.cc @@ -212,16 +212,6 @@ void PersistentNotificationHandler::Disa @@ -1679,140 +921,6 @@ } void PersistentNotificationHandler::OpenSettings(Profile* profile, ---- a/chrome/browser/notifications/platform_notification_service_impl.cc -+++ b/chrome/browser/notifications/platform_notification_service_impl.cc -@@ -300,40 +300,6 @@ void PlatformNotificationServiceImpl::Di - auto metadata = std::make_unique(); - metadata->service_worker_scope = service_worker_scope; - -- if (safe_browsing::IsSafeBrowsingEnabled(*profile_->GetPrefs()) && -- !safe_browsing::IsURLAllowlistedByPolicy(origin, *profile_->GetPrefs()) && -- base::FeatureList::IsEnabled( -- safe_browsing::kOnDeviceNotificationContentDetectionModel)) { -- auto* notification_content_service = safe_browsing:: -- NotificationContentDetectionServiceFactory::GetForProfile(profile_); -- if (notification_content_service) { -- bool is_show_warnings_for_suspicious_notifications_enabled = -- base::FeatureList::IsEnabled( -- safe_browsing::kShowWarningsForSuspiciousNotifications); -- notification_content_service->MaybeCheckNotificationContentDetectionModel( -- notification_data, origin, -- AreSuspiciousNotificationsAllowlistedByUser(origin), -- is_show_warnings_for_suspicious_notifications_enabled -- ? base::BindOnce(&PlatformNotificationServiceImpl:: -- UpdatePersistentMetadataThenDisplay, -- weak_ptr_factory_.GetWeakPtr(), notification, -- std::move(metadata)) -- : base::DoNothing()); -- // When this feature is enabled, the -- // `MaybeCheckNotificationContentDetectionModel` method will also include -- // displaying the notification. In this case, the metrics should be logged -- // and the method should return without calling `Display`. Otherwise, the -- // notification should be displayed below. -- if (is_show_warnings_for_suspicious_notifications_enabled) { -- base::UmaHistogramEnumeration( -- kNotificationContentDetectionDisplayPersistentNotificationEventHistogram, -- DisplayPersistentNotificationEvents::kRequested); -- LogPersistentNotificationShownMetrics(notification_data, origin, -- notification.origin_url()); -- return; -- } -- } -- } - - NotificationDisplayServiceFactory::GetForProfile(profile_)->Display( - NotificationHandler::Type::WEB_PERSISTENT, notification, ---- a/chrome/browser/password_manager/chrome_password_manager_client.cc -+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -41,7 +41,6 @@ - #include "chrome/browser/password_manager/profile_password_store_factory.h" - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/profiles/profile_manager.h" --#include "chrome/browser/safe_browsing/chrome_password_protection_service.h" - #include "chrome/browser/safe_browsing/user_interaction_observer.h" - #include "chrome/browser/signin/identity_manager_factory.h" - #include "chrome/browser/sync/sync_service_factory.h" -@@ -1131,6 +1130,7 @@ autofill::LanguageCode ChromePasswordMan - return autofill::LanguageCode(); - } - -+#if BUILDFLAG(FULL_SAFE_BROWSING) - safe_browsing::PasswordProtectionService* - ChromePasswordManagerClient::GetPasswordProtectionService() const { - return safe_browsing::ChromePasswordProtectionService:: -@@ -1150,6 +1150,7 @@ void ChromePasswordManagerClient::CheckS - } - } - #endif // defined(ON_FOCUS_PING_ENABLED) -+#endif // BUILDFLAG(FULL_SAFE_BROWSING) - - #if BUILDFLAG(ENABLE_EXTENSIONS) - void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent( -@@ -1157,30 +1158,10 @@ void ChromePasswordManagerClient::MaybeR - bool is_federated, - const url::SchemeHostPort& federated_origin, - const std::u16string& login_user_name) const { -- extensions::SafeBrowsingPrivateEventRouter* router = -- extensions::SafeBrowsingPrivateEventRouterFactory::GetForProfile( -- profile_); -- if (!router) { -- return; -- } -- -- // The router is responsible for checking if the reporting of this event type -- // is enabled by the admin. -- router->OnLoginEvent(url, is_federated, federated_origin, login_user_name); - } - - void ChromePasswordManagerClient::MaybeReportEnterprisePasswordBreachEvent( - const std::vector>& identities) const { -- extensions::SafeBrowsingPrivateEventRouter* router = -- extensions::SafeBrowsingPrivateEventRouterFactory::GetForProfile( -- profile_); -- if (!router) { -- return; -- } -- -- // The router is responsible for checking if the reporting of this event type -- // is enabled by the admin. -- router->OnPasswordBreach(kPasswordBreachEntryTrigger, identities); - } - #endif // BUILDFLAG(ENABLE_EXTENSIONS) - -@@ -1973,6 +1954,7 @@ bool ChromePasswordManagerClient::IsPass - is_enabled = false; - } - -+ #if BUILDFLAG(FULL_SAFE_BROWSING) - // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing - // warnings until user interaction. If the current page has a delayed warning, - // it'll have a user interaction observer attached. Disable password -@@ -1983,6 +1965,7 @@ bool ChromePasswordManagerClient::IsPass - observer->OnPasswordSaveOrAutofillDenied(); - is_enabled = false; - } -+ #endif // BUILDFLAG(FULL_SAFE_BROWSING) - - autofill::LogManager* log_manager = GetOrCreateLogManager(); - if (log_manager && log_manager->IsLoggingActive()) { ---- a/chrome/browser/password_manager/chrome_password_manager_client.h -+++ b/chrome/browser/password_manager/chrome_password_manager_client.h -@@ -246,15 +246,9 @@ class ChromePasswordManagerClient - autofill::LogManager* GetCurrentLogManager() override; - void AnnotateNavigationEntry(bool has_password_field) override; - autofill::LanguageCode GetPageLanguage() const override; -- safe_browsing::PasswordProtectionService* GetPasswordProtectionService() -- const override; - void TriggerUserPerceptionOfPasswordManagerSurvey( - const std::string& filling_assistance) override; - --#if defined(ON_FOCUS_PING_ENABLED) -- void CheckSafeBrowsingReputation(const GURL& form_action, -- const GURL& frame_url) override; --#endif - - // Reporting these events is only supported when extensions are enabled. - #if BUILDFLAG(ENABLE_EXTENSIONS) --- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc +++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc @@ -16,7 +16,6 @@ @@ -1900,7 +1008,7 @@ --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -454,55 +454,5 @@ bool PredictionBasedPermissionUiSelector +@@ -475,55 +475,5 @@ bool PredictionBasedPermissionUiSelector PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse( permissions::RequestType request_type) { @@ -1935,7 +1043,7 @@ - } - if (use_server_side) { - if (base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv1)) { -- return PredictionSource::USE_ONDEVICE_GENAI_AND_SERVER_SIDE; +- return PredictionSource::USE_ONDEVICE_AI_AND_SERVER_SIDE; - } - return PredictionSource::USE_SERVER_SIDE; - } @@ -1958,15 +1066,7 @@ } --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -121,6 +121,7 @@ - #include "components/privacy_sandbox/privacy_sandbox_prefs.h" - #include "components/privacy_sandbox/tracking_protection_prefs.h" - #include "components/proxy_config/proxy_policy_handler.h" -+#include "components/safe_browsing/buildflags.h" - #include "components/safe_browsing/content/common/file_type_policies_prefs.h" - #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" - #include "components/safe_browsing/core/common/safe_browsing_prefs.h" -@@ -2460,8 +2461,6 @@ std::unique_ptrAddHandler( std::make_unique( chrome_schema)); @@ -1975,30 +1075,9 @@ handlers->AddHandler(std::make_unique()); handlers->AddHandler( std::make_unique(key::kURLBlocklist)); -@@ -2578,20 +2577,6 @@ std::unique_ptrAddHandler(std::make_unique( -- key::kExemptDomainFileTypePairsFromFileTypeDownloadWarnings, -- safe_browsing::file_type::prefs:: -- kExemptDomainFileTypePairsFromFileTypeDownloadWarnings, -- chrome_schema, SCHEMA_ALLOW_UNKNOWN, -- SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, -- SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); -- -- handlers->AddHandler(std::make_unique( -- key::kManagedConfigurationPerOrigin, -- prefs::kManagedConfigurationPerOrigin, chrome_schema, -- SCHEMA_ALLOW_UNKNOWN, -- SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, -- SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); - handlers->AddHandler( - std::make_unique()); - --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -280,7 +280,6 @@ +@@ -275,7 +275,6 @@ #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h" #include "chrome/browser/new_tab_page/modules/file_suggestion/drive_service.h" #include "chrome/browser/new_tab_page/modules/file_suggestion/microsoft_files_page_handler.h" @@ -2006,7 +1085,7 @@ #include "chrome/browser/new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h" #include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h" #include "chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.h" -@@ -2127,7 +2126,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -2032,7 +2031,6 @@ void RegisterProfilePrefs(user_prefs::Pr MicrosoftFilesPageHandler::RegisterProfilePrefs(registry); NewTabPageHandler::RegisterProfilePrefs(registry); NewTabPageUI::RegisterProfilePrefs(registry); @@ -2014,38 +1093,9 @@ ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry); OutlookCalendarPageHandler::RegisterProfilePrefs(registry); PinnedTabCodec::RegisterProfilePrefs(registry); ---- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -1172,26 +1172,6 @@ void ChromeBrowserMainExtraPartsProfiles - #if !BUILDFLAG(IS_ANDROID) - ResetReportUploaderFactory::GetInstance(); - #endif --#if BUILDFLAG(FULL_SAFE_BROWSING) -- safe_browsing::AdvancedProtectionStatusManagerFactory::GetInstance(); --#endif --#if BUILDFLAG(SAFE_BROWSING_AVAILABLE) -- safe_browsing::ChromeEnterpriseRealTimeUrlLookupServiceFactory::GetInstance(); --#endif -- safe_browsing::ChromePasswordProtectionServiceFactory::GetInstance(); -- safe_browsing::ChromePingManagerFactory::GetInstance(); -- safe_browsing::ClientSideDetectionServiceFactory::GetInstance(); --#if BUILDFLAG(FULL_SAFE_BROWSING) -- safe_browsing::CloudBinaryUploadServiceFactory::GetInstance(); -- safe_browsing::ExtensionTelemetryServiceFactory::GetInstance(); -- safe_browsing::HashRealTimeServiceFactory::GetInstance(); --#endif -- safe_browsing::NotificationContentDetectionServiceFactory::GetInstance(); -- safe_browsing::RealTimeUrlLookupServiceFactory::GetInstance(); -- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetInstance(); -- safe_browsing::SafeBrowsingNavigationObserverManagerFactory::GetInstance(); -- safe_browsing::TailoredSecurityServiceFactory::GetInstance(); -- safe_browsing::VerdictCacheManagerFactory::GetInstance(); - SafeSearchFactory::GetInstance(); - #if BUILDFLAG(IS_ANDROID) - if (base::FeatureList::IsEnabled(features::kSafetyHub)) { --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn -@@ -95,13 +95,6 @@ static_library("safe_browsing") { +@@ -92,13 +92,6 @@ static_library("safe_browsing") { allow_circular_includes_from += [ "//chrome/browser/ash/file_manager" ] } @@ -2148,7 +1198,7 @@ scoped_refptr --- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc +++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc -@@ -126,15 +126,6 @@ CreateSettingsPageHelper() { +@@ -125,15 +125,6 @@ CreateSettingsPageHelper() { CreateChromeSettingsPageHelper(); } @@ -2164,7 +1214,7 @@ } // namespace std::unique_ptr -@@ -157,10 +148,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -156,10 +147,6 @@ ChromeSecurityBlockingPageFactory::Creat Profile::FromBrowserContext(web_contents->GetBrowserContext())); state->DidDisplayErrorPage(cert_error); @@ -2175,7 +1225,7 @@ auto controller_client = std::make_unique( web_contents, ssl_info, cert_error, request_url, std::move(metrics_helper), CreateSettingsPageHelper()); -@@ -225,10 +212,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -224,10 +211,6 @@ ChromeSecurityBlockingPageFactory::Creat const std::string& mitm_software_name) { Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); @@ -2186,7 +1236,7 @@ auto page = std::make_unique( web_contents, cert_error, request_url, /*can_show_enhanced_protection_message=*/true, ssl_info, -@@ -248,10 +231,6 @@ ChromeSecurityBlockingPageFactory::Creat +@@ -247,10 +230,6 @@ ChromeSecurityBlockingPageFactory::Creat int cert_error, const GURL& request_url, const net::SSLInfo& ssl_info) { @@ -2199,7 +1249,7 @@ /*can_show_enhanced_protection_message=*/true, ssl_info, --- a/chrome/browser/ssl/ssl_error_controller_client.cc +++ b/chrome/browser/ssl/ssl_error_controller_client.cc -@@ -93,8 +93,6 @@ void SSLErrorControllerClient::GoBack() +@@ -92,8 +92,6 @@ void SSLErrorControllerClient::GoBack() void SSLErrorControllerClient::Proceed() { content::WebContents* const web_contents = this->web_contents(); @@ -2210,15 +1260,7 @@ // certificate. So, when users click proceed on an interstitial, move the tab --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -571,7 +571,6 @@ static_library("ui") { - "//components/renderer_context_menu", - "//components/resources", - "//components/safe_browsing/content/browser", -- "//components/safe_browsing/content/browser:client_side_detection", - "//components/safe_browsing/content/browser/password_protection", - "//components/safe_browsing/content/browser/web_ui", - "//components/safe_browsing/core/browser/db:database_manager", -@@ -4554,8 +4553,6 @@ static_library("ui") { +@@ -4547,8 +4547,6 @@ static_library("ui") { "views/safe_browsing/prompt_for_scanning_modal_dialog.h", "views/safe_browsing/tailored_security_desktop_dialog_manager.cc", "views/safe_browsing/tailored_security_desktop_dialog_manager.h", @@ -2242,35 +1284,9 @@ #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" ---- a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc -+++ b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc -@@ -17,6 +17,7 @@ - #include "components/javascript_dialogs/tab_modal_dialog_manager.h" - #include "components/javascript_dialogs/tab_modal_dialog_view.h" - #include "components/navigation_metrics/navigation_metrics.h" -+#include "components/safe_browsing/buildflags.h" - #include "content/public/browser/devtools_agent_host.h" - #include "content/public/browser/navigation_handle.h" - #include "content/public/browser/render_frame_host.h" -@@ -36,6 +37,7 @@ JavaScriptTabModalDialogManagerDelegateD - - void JavaScriptTabModalDialogManagerDelegateDesktop::WillRunDialog() { - BrowserList::AddObserver(this); -+ #if BUILDFLAG(FULL_SAFE_BROWSING) - // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing - // warnings until user interaction. If the current page has a delayed warning, - // it'll have a user interaction observer attached. Show the warning -@@ -46,6 +48,7 @@ void JavaScriptTabModalDialogManagerDele - if (observer) { - observer->OnJavaScriptDialog(); - } -+ #endif // BUILDFLAG(FULL_SAFE_BROWSING) - } - - void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() { --- a/chrome/browser/ui/safety_hub/unused_site_permissions_service.cc +++ b/chrome/browser/ui/safety_hub/unused_site_permissions_service.cc -@@ -51,7 +51,6 @@ +@@ -52,7 +52,6 @@ #include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2278,7 +1294,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "ui/base/l10n/l10n_util.h" -@@ -369,25 +368,6 @@ UnusedSitePermissionsService::UnusedSite +@@ -370,34 +369,6 @@ UnusedSitePermissionsService::UnusedSite base::Unretained(this))); #endif // BUILDFLAG(IS_ANDROID) @@ -2295,6 +1311,15 @@ -#endif - hcsm()); - +- if (base::FeatureList::IsEnabled( +- safe_browsing::kSafetyHubDisruptiveNotificationRevocation)) { +- disruptive_notification_manager_ = +- std::make_unique( +- hcsm(), +- site_engagement::SiteEngagementServiceFactory::GetForProfile( +- browser_context_)); +- } +- - pref_change_registrar_->Add( - prefs::kSafeBrowsingEnabled, - base::BindRepeating(&UnusedSitePermissionsService:: @@ -2304,7 +1329,7 @@ bool migration_completed = pref_change_registrar_->prefs()->GetBoolean( safety_hub_prefs::kUnusedSitePermissionsRevocationMigrationCompleted); -@@ -1041,9 +1021,7 @@ bool UnusedSitePermissionsService::IsUnu +@@ -1054,9 +1025,7 @@ bool UnusedSitePermissionsService::IsUnu bool UnusedSitePermissionsService:: IsAbusiveNotificationAutoRevocationEnabled() { @@ -2325,16 +1350,6 @@ ] } ---- a/chrome/browser/ui/tab_helpers.cc -+++ b/chrome/browser/ui/tab_helpers.cc -@@ -366,7 +366,6 @@ void TabHelpers::AttachTabHelpers(WebCon - if (!autofill_client_provider.uses_platform_autofill()) { - ChromePasswordManagerClient::CreateForWebContents(web_contents); - } -- ChromePasswordReuseDetectionManagerClient::CreateForWebContents(web_contents); - CreateSubresourceFilterWebContentsHelper(web_contents); - #if BUILDFLAG(ENABLE_RLZ) - ChromeRLZTrackerWebContentsObserver::CreateForWebContentsIfNeeded( --- a/chrome/browser/ui/toasts/toast_service.cc +++ b/chrome/browser/ui/toasts/toast_service.cc @@ -33,7 +33,6 @@ @@ -2345,7 +1360,7 @@ #include "components/saved_tab_groups/public/features.h" #include "components/strings/grit/components_strings.h" #include "components/vector_icons/vector_icons.h" -@@ -141,57 +140,6 @@ void ToastService::RegisterToasts( +@@ -140,57 +139,6 @@ void ToastService::RegisterToasts( .Build()); } @@ -2403,157 +1418,6 @@ if (tab_groups::IsTabGroupsSaveV2Enabled()) { // Current tab has been removed from the group. ---- a/chrome/browser/ui/views/download/bubble/download_bubble_contents_view.cc -+++ b/chrome/browser/ui/views/download/bubble/download_bubble_contents_view.cc -@@ -13,7 +13,6 @@ - #include "chrome/browser/download/download_core_service.h" - #include "chrome/browser/download/download_core_service_factory.h" - #include "chrome/browser/download/download_item_warning_data.h" --#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h" - #include "chrome/browser/safe_browsing/safe_browsing_service.h" - #include "chrome/browser/ui/browser.h" - #include "chrome/browser/ui/browser_element_identifiers.h" -@@ -40,14 +39,6 @@ namespace { - - void MaybeSendDownloadReport(content::BrowserContext* browser_context, - download::DownloadItem* download) { -- if (safe_browsing::SafeBrowsingService* service = -- g_browser_process->safe_browsing_service()) { -- service->SendDownloadReport(download, -- safe_browsing::ClientSafeBrowsingReportRequest:: -- DANGEROUS_DOWNLOAD_RECOVERY, -- /*did_proceed=*/true, -- /*show_download_in_folder=*/std::nullopt); -- } - } - - } // namespace -@@ -182,73 +173,16 @@ void DownloadBubbleContentsView::Process - const ContentId& id, - DownloadItemWarningData::DeepScanTrigger trigger, - base::optional_ref password) { -- if (DownloadUIModel* model = GetDownloadModel(id); model) { -- LogDeepScanEvent(model->GetDownloadItem(), -- safe_browsing::DeepScanEvent::kPromptAccepted); -- DownloadItemWarningData::AddWarningActionEvent( -- model->GetDownloadItem(), -- DownloadItemWarningData::WarningSurface::BUBBLE_SUBPAGE, -- DownloadItemWarningData::WarningAction::ACCEPT_DEEP_SCAN); -- safe_browsing::DownloadProtectionService::UploadForConsumerDeepScanning( -- model->GetDownloadItem(), trigger, password); -- } - } - - void DownloadBubbleContentsView::ProcessLocalDecryptionPress( - const offline_items_collection::ContentId& id, - base::optional_ref password) { -- if (DownloadUIModel* model = GetDownloadModel(id); model) { -- LogLocalDecryptionEvent(safe_browsing::DeepScanEvent::kPromptAccepted); -- safe_browsing::DownloadProtectionService::CheckDownloadWithLocalDecryption( -- model->GetDownloadItem(), password); -- } - } - - void DownloadBubbleContentsView::ProcessLocalPasswordInProgressClick( - const offline_items_collection::ContentId& id, - DownloadCommands::Command command) { -- DownloadUIModel* model = GetDownloadModel(id); -- if (!model) { -- return; -- } -- -- download::DownloadItem* item = model->GetDownloadItem(); -- safe_browsing::SafeBrowsingService* sb_service = -- g_browser_process->safe_browsing_service(); -- if (!sb_service) { -- return; -- } -- safe_browsing::DownloadProtectionService* protection_service = -- sb_service->download_protection_service(); -- if (!protection_service) { -- return; -- } -- -- protection_service->CancelChecksForDownload(item); -- -- content::BrowserContext* browser_context = -- content::DownloadItemUtils::GetBrowserContext(item); -- DownloadCoreService* download_core_service = -- DownloadCoreServiceFactory::GetForBrowserContext(browser_context); -- -- DCHECK(download_core_service); -- ChromeDownloadManagerDelegate* delegate = -- download_core_service->GetDownloadManagerDelegate(); -- DCHECK(delegate); -- -- if (command == DownloadCommands::CANCEL) { -- LogLocalDecryptionEvent(safe_browsing::DeepScanEvent::kScanCanceled); -- delegate->CheckClientDownloadDone( -- item->GetId(), -- safe_browsing::DownloadCheckResult::PROMPT_FOR_LOCAL_PASSWORD_SCANNING); -- } else if (command == DownloadCommands::BYPASS_DEEP_SCANNING) { -- LogLocalDecryptionEvent(safe_browsing::DeepScanEvent::kPromptBypassed); -- MaybeSendDownloadReport(browser_context, item); -- delegate->CheckClientDownloadDone( -- item->GetId(), safe_browsing::DownloadCheckResult::UNKNOWN); -- } else { -- NOTREACHED() << "Unexpected command: " << static_cast(command); -- } - } - - bool DownloadBubbleContentsView::IsEncryptedArchive(const ContentId& id) { ---- a/chrome/browser/ui/views/download/download_item_view.cc -+++ b/chrome/browser/ui/views/download/download_item_view.cc -@@ -37,7 +37,6 @@ - #include "chrome/browser/icon_manager.h" - #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h" - #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" --#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h" - #include "chrome/browser/safe_browsing/safe_browsing_service.h" - #include "chrome/browser/ui/browser.h" - #include "chrome/browser/ui/color/chrome_color_id.h" -@@ -831,9 +830,7 @@ void DownloadItemView::UpdateLabels() { - deep_scanning_label_->SetVisible(mode_ == - download::DownloadItemMode::kDeepScanning); - if (deep_scanning_label_->GetVisible()) { -- const int id = (model_->GetDownloadItem() && -- safe_browsing::DeepScanningRequest::ShouldUploadBinary( -- model_->GetDownloadItem())) -+ const int id = model_->GetDownloadItem() - ? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD - : IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD; - const std::u16string filename = ElidedFilename(*deep_scanning_label_); -@@ -1312,7 +1309,9 @@ void DownloadItemView::ShowContextMenuIm - } - - void DownloadItemView::OpenDownloadDuringAsyncScanning() { -+#if BUILDFLAG(FULL_SAFE_BROWSING) - model_->CompleteSafeBrowsingScan(); -+#endif - model_->SetOpenWhenComplete(true); - } - ---- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc -+++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc -@@ -172,7 +172,6 @@ void PresentationReceiverWindowView::Ini - ChromeSecurityStateTabHelper::CreateForWebContents(web_contents); - autofill::ChromeAutofillClient::CreateForWebContents(web_contents); - ChromePasswordManagerClient::CreateForWebContents(web_contents); -- ChromePasswordReuseDetectionManagerClient::CreateForWebContents(web_contents); - ManagePasswordsUIController::CreateForWebContents(web_contents); - SearchTabHelper::CreateForWebContents(web_contents); - TabDialogs::CreateForWebContents(web_contents); ---- a/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc -+++ b/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc -@@ -281,8 +281,6 @@ void ProfilePickerDiceSignInProvider::On - .Then(base::BindOnce(std::move(switch_finished_callback), true)); - host_->ShowScreen(contents(), BuildSigninURL(), - std::move(navigation_finished_closure)); -- ChromePasswordReuseDetectionManagerClient::CreateForProfilePickerWebContents( -- contents()); - // Attach a `DiceTabHelper` to the `WebContents` to trigger the completion - // of the step. - DiceTabHelper::CreateForWebContents(contents()); --- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc +++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc @@ -111,7 +111,7 @@ void ChromeWebContentsViewDelegateViews: @@ -2576,41 +1440,9 @@ } std::unique_ptr ---- a/chrome/browser/ui/webui/BUILD.gn -+++ b/chrome/browser/ui/webui/BUILD.gn -@@ -34,7 +34,6 @@ source_set("configs") { - ":webui", - "//chrome/browser/optimization_guide:optimization_guide", - "//chrome/browser/ui", -- "//chrome/browser/ui/webui/safe_browsing", - "//components/compose:buildflags", - "//components/lens:buildflags", - "//components/security_interstitials/content:security_interstitial_page", ---- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc -+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -238,8 +238,6 @@ void RegisterChromeWebUIConfigs() { - map.AddWebUIConfig( - std::make_unique< - security_interstitials::KnownInterceptionDisclosureUIConfig>()); -- map.AddWebUIConfig( -- std::make_unique()); - map.AddWebUIConfig(std::make_unique()); - map.AddWebUIConfig(std::make_unique()); - map.AddWebUIConfig(std::make_unique()); --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -154,10 +154,6 @@ void MaybeReportBypassAction(download::D - if (action != WarningAction::PROCEED && action != WarningAction::DISCARD) { - return; - } -- SendSafeBrowsingDownloadReport( -- safe_browsing::ClientSafeBrowsingReportRequest:: -- DANGEROUS_DOWNLOAD_RECOVERY, -- /*did_proceed=*/action == WarningAction::PROCEED, file); - } - - // Triggers a Trust and Safety sentiment survey (if enabled). Should be called -@@ -166,21 +162,6 @@ void MaybeReportBypassAction(download::D +@@ -171,21 +171,6 @@ void MaybeReportBypassAction(download::D void MaybeTriggerTrustSafetySurvey(download::DownloadItem* file, WarningSurface surface, WarningAction action) { @@ -2632,38 +1464,6 @@ } void RecordDownloadsPageValidatedHistogram(download::DownloadItem* item) { -@@ -594,18 +575,6 @@ void DownloadsDOMHandler::DeepScan(const - return; - } - -- if (DownloadItemWarningData::IsTopLevelEncryptedArchive(download)) { -- // For encrypted archives, we need a password from the user. We will request -- // this in the download bubble. -- PromptForScanningInBubble(GetWebUIWebContents(), download); -- return; -- } -- -- LogDeepScanEvent(download, -- safe_browsing::DeepScanEvent::kPromptAcceptedFromWebUI); -- DownloadItemWarningData::AddWarningActionEvent( -- download, DownloadItemWarningData::WarningSurface::DOWNLOADS_PAGE, -- DownloadItemWarningData::WarningAction::ACCEPT_DEEP_SCAN); - DownloadItemModel model(download); - DownloadCommands commands(model.GetWeakPtr()); - commands.ExecuteCommand(DownloadCommands::DEEP_SCAN); -@@ -641,12 +610,6 @@ void DownloadsDOMHandler::ReviewDangerou - return; - } - -- CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_REVIEW_DANGEROUS); -- download::DownloadItem* download = GetDownloadByStringId(id); -- if (download) { -- DownloadItemModel model(download); -- model.ReviewScanningVerdict(GetWebUIWebContents()); -- } - } - - #if BUILDFLAG(GOOGLE_CHROME_BRANDING) --- a/chrome/browser/ui/webui/settings/hats_handler.cc +++ b/chrome/browser/ui/webui/settings/hats_handler.cc @@ -64,60 +64,6 @@ void HatsHandler::RegisterMessages() { @@ -2845,21 +1645,19 @@ } --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -2340,9 +2340,6 @@ if (!is_android) { +@@ -2399,8 +2399,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", -- "//components/safe_browsing/content/browser:client_side_detection", - "//components/safe_browsing/content/browser:client_side_detection_images_cache", - "//components/safe_browsing/content/browser:client_side_detection_service", "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:test_support", -@@ -6671,9 +6668,6 @@ test("unit_tests") { +@@ -6695,8 +6693,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", -- "//components/safe_browsing/content/browser:client_side_detection", - "//components/safe_browsing/content/browser:client_side_detection_images_cache", - "//components/safe_browsing/content/browser:client_side_detection_service", "//components/safe_browsing/content/browser/notification_content_detection", @@ -2894,23 +1692,12 @@ - // when new events may be added in the future. And this is also to support - // existing customer policies that were created before we introduced the - // concept of enabling/disabling events. -- for (const char* event : kAllReportingEvents) { +- for (const char* event : kAllReportingEnabledEvents) { - enabled_event_names_.insert(event); - } } const base::Value::List* enabled_opt_in_events_value = ---- a/components/password_manager/content/browser/content_password_manager_driver.cc -+++ b/components/password_manager/content/browser/content_password_manager_driver.cc -@@ -651,7 +651,7 @@ void ContentPasswordManagerDriver::Check - if (!password_manager::bad_message::CheckFrameNotPrerendering( - render_frame_host_)) - return; --#if defined(ON_FOCUS_PING_ENABLED) -+#if defined(ON_FOCUS_PING_ENABLED) && BUILDFLAG(FULL_SAFE_BROWSING) - client_->CheckSafeBrowsingReputation(form_action, frame_url); - #endif - } --- a/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc +++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc @@ -336,12 +336,7 @@ bool LeakDetectionCheck::IsURLBlockedByP @@ -2927,32 +1714,6 @@ } } // namespace password_manager ---- a/components/password_manager/core/browser/password_manager_client.h -+++ b/components/password_manager/core/browser/password_manager_client.h -@@ -416,9 +416,6 @@ class PasswordManagerClient { - // Returns the current best guess as to the page's display language. - virtual autofill::LanguageCode GetPageLanguage() const; - -- // Return the PasswordProtectionService associated with this instance. -- virtual safe_browsing::PasswordProtectionService* -- GetPasswordProtectionService() const = 0; - - // Maybe triggers a hats survey that measures the user's perception of - // Autofill for passwords. When triggering happens, the survey dialog will be -@@ -430,13 +427,6 @@ class PasswordManagerClient { - virtual void TriggerUserPerceptionOfPasswordManagerSurvey( - const std::string& filling_assistance); - --#if defined(ON_FOCUS_PING_ENABLED) -- // Checks the safe browsing reputation of the webpage when the -- // user focuses on a username/password field. This is used for reporting -- // only, and won't trigger a warning. -- virtual void CheckSafeBrowsingReputation(const GURL& form_action, -- const GURL& frame_url) = 0; --#endif - - // If the feature is enabled send an event to the enterprise reporting - // connector server indicating that the user signed in to a website. --- a/components/safe_browsing/content/common/proto/BUILD.gn +++ b/components/safe_browsing/content/common/proto/BUILD.gn @@ -5,8 +5,12 @@ @@ -2990,17 +1751,6 @@ - "user_population.h", ] - configs += [ "//build/config/compiler:wexit_time_destructors" ] ---- a/components/safe_browsing/core/browser/db/BUILD.gn -+++ b/components/safe_browsing/core/browser/db/BUILD.gn -@@ -243,8 +243,6 @@ source_set("v4_store") { - sources = [ - "hash_prefix_map.cc", - "hash_prefix_map.h", -- "v4_store.cc", -- "v4_store.h", - ] - configs += [ "//build/config/compiler:wexit_time_destructors" ] --- a/components/safe_browsing/core/browser/db/hash_prefix_map.h +++ b/components/safe_browsing/core/browser/db/hash_prefix_map.h @@ -3093,7 +1843,7 @@ void OhttpKeyService::Shutdown() { --- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc -@@ -282,17 +282,6 @@ void RealTimeUrlLookupService::MaybeLogP +@@ -284,17 +284,6 @@ void RealTimeUrlLookupService::MaybeLogP bool request_had_cookie, bool was_first_request, bool sent_with_token) { @@ -3110,7 +1860,38 @@ - } } - } // namespace safe_browsing + void RealTimeUrlLookupService::MaybeFillReferringWebApk( +--- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc ++++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc +@@ -613,17 +613,6 @@ std::unique_ptr RealTim + request->set_report_type(is_sampled_report ? RTLookupRequest::SAMPLED_REPORT + : RTLookupRequest::FULL_REPORT); + request->set_frame_type(RTLookupRequest::MAIN_FRAME); +- if (referring_app_info && pref_service_ && +- IsEnhancedProtectionEnabled(*pref_service_)) { +- safe_browsing::ReferringAppInfo referring_app_info_proto; +- referring_app_info_proto.set_referring_app_name( +- referring_app_info.value().referring_app_name); +- referring_app_info_proto.set_referring_app_source( +- referring_app_info.value().referring_app_source); +- *request->mutable_referring_app_info() = +- std::move(referring_app_info_proto); +- MaybeFillReferringWebApk(*referring_app_info, *request); +- } + std::optional dm_token_string = GetDMTokenString(); + if (dm_token_string.has_value()) { + request->set_dm_token(dm_token_string.value()); +--- a/components/safe_browsing/core/browser/safe_browsing_hats_delegate.h ++++ b/components/safe_browsing/core/browser/safe_browsing_hats_delegate.h +@@ -5,6 +5,8 @@ + #ifndef COMPONENTS_SAFE_BROWSING_CORE_BROWSER_SAFE_BROWSING_HATS_DELEGATE_H_ + #define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_SAFE_BROWSING_HATS_DELEGATE_H_ + ++#include ++ + #include "base/functional/callback.h" + #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" + #include "components/safe_browsing/core/common/proto/csd.pb.h" --- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc +++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc @@ -407,7 +407,6 @@ void TailoredSecurityService::MaybeNotif @@ -3240,7 +2021,7 @@ void SSLBlockingPageBase::PopulateEnhancedProtectionMessage( --- a/components/sync_preferences/common_syncable_prefs_database.cc +++ b/components/sync_preferences/common_syncable_prefs_database.cc -@@ -315,9 +315,6 @@ constexpr auto kCommonSyncablePrefsAllow +@@ -320,9 +320,6 @@ constexpr auto kCommonSyncablePrefsAllow {plus_addresses::prefs::kLastPlusAddressFillingTime, {syncable_prefs_ids::kLastPlusAddressFillingTime, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, @@ -3326,89 +2107,9 @@ void DidAfterWriteCheck( FileSystemAccessPermissionContext::AfterWriteCheckResult result); void DidFileSkipQuarantine(base::File::Error result); ---- a/content/browser/file_system_access/mock_file_system_access_permission_context.cc -+++ b/content/browser/file_system_access/mock_file_system_access_permission_context.cc -@@ -22,13 +22,6 @@ void MockFileSystemAccessPermissionConte - frame_id, callback); - } - --void MockFileSystemAccessPermissionContext::PerformAfterWriteChecks( -- std::unique_ptr item, -- GlobalRenderFrameHostId frame_id, -- base::OnceCallback callback) { -- PerformAfterWriteChecks_(item.get(), frame_id, callback); --} -- - bool MockFileSystemAccessPermissionContext::IsFileTypeDangerous( - const base::FilePath& path, - const url::Origin& origin) { ---- a/content/browser/file_system_access/mock_file_system_access_permission_context.h -+++ b/content/browser/file_system_access/mock_file_system_access_permission_context.h -@@ -52,16 +52,6 @@ class MockFileSystemAccessPermissionCont - GlobalRenderFrameHostId frame_id, - base::OnceCallback& callback)); - -- void PerformAfterWriteChecks( -- std::unique_ptr item, -- GlobalRenderFrameHostId frame_id, -- base::OnceCallback callback) override; -- MOCK_METHOD(void, -- PerformAfterWriteChecks_, -- (FileSystemAccessWriteItem * item, -- GlobalRenderFrameHostId frame_id, -- base::OnceCallback& callback)); -- - bool IsFileTypeDangerous(const base::FilePath& path, - const url::Origin& origin) override; - MOCK_METHOD(bool, ---- a/content/public/browser/file_system_access_permission_context.h -+++ b/content/public/browser/file_system_access_permission_context.h -@@ -178,12 +178,6 @@ class FileSystemAccessPermissionContext - base::OnceCallback callback) = 0; - - enum class AfterWriteCheckResult { kAllow, kBlock }; -- // Runs a recently finished write operation through checks such as malware -- // or other security checks to determine if the write should be allowed. -- virtual void PerformAfterWriteChecks( -- std::unique_ptr item, -- GlobalRenderFrameHostId frame_id, -- base::OnceCallback callback) = 0; - - // Returns whether the file type is considered dangerous. This is used to - // block file operations from creating or accessing these file types. ---- a/content/public/test/fake_file_system_access_permission_context.cc -+++ b/content/public/test/fake_file_system_access_permission_context.cc -@@ -46,13 +46,6 @@ void FakeFileSystemAccessPermissionConte - std::move(callback).Run(SensitiveEntryResult::kAllowed); - } - --void FakeFileSystemAccessPermissionContext::PerformAfterWriteChecks( -- std::unique_ptr item, -- GlobalRenderFrameHostId frame_id, -- base::OnceCallback callback) { -- std::move(callback).Run(AfterWriteCheckResult::kAllow); --} -- - bool FakeFileSystemAccessPermissionContext::IsFileTypeDangerous( - const base::FilePath& path, - const url::Origin& origin) { ---- a/content/public/test/fake_file_system_access_permission_context.h -+++ b/content/public/test/fake_file_system_access_permission_context.h -@@ -45,11 +45,6 @@ class FakeFileSystemAccessPermissionCont - GlobalRenderFrameHostId frame_id, - base::OnceCallback callback) override; - -- void PerformAfterWriteChecks( -- std::unique_ptr item, -- GlobalRenderFrameHostId frame_id, -- base::OnceCallback callback) override; -- - bool IsFileTypeDangerous(const base::FilePath& path, - const url::Origin& origin) override; - --- a/extensions/browser/extension_registrar.cc +++ b/extensions/browser/extension_registrar.cc -@@ -669,103 +669,27 @@ void ExtensionRegistrar::UnblockAllExten +@@ -740,103 +740,27 @@ void ExtensionRegistrar::UnblockAllExten void ExtensionRegistrar::OnBlocklistStateRemoved( const std::string& extension_id) { @@ -3492,7 +2193,7 @@ - // to disable the extension again. - blocklist_prefs::UpdateCurrentGreylistStatesAsAcknowledged(extension_id, - extension_prefs_); -- DisableExtension(extension_id, disable_reason::DISABLE_GREYLIST); +- DisableExtension(extension_id, {disable_reason::DISABLE_GREYLIST}); } void ExtensionRegistrar::BlocklistExtensionForTest( diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 6cb90137..e65cc586 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -95,7 +95,7 @@ } --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -312,7 +312,6 @@ +@@ -308,7 +308,6 @@ #include "components/safe_browsing/core/browser/url_checker_delegate.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" @@ -105,7 +105,7 @@ #include "components/security_interstitials/content/ssl_error_handler.h" --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc -@@ -109,7 +109,6 @@ +@@ -108,7 +108,6 @@ #include "components/safe_browsing/content/common/file_type_policies_test_util.h" #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -113,54 +113,9 @@ #include "components/security_state/core/security_state.h" #include "components/services/quarantine/test_support.h" #include "content/public/browser/browser_task_traits.h" ---- a/chrome/browser/download/download_item_model.cc -+++ b/chrome/browser/download/download_item_model.cc -@@ -828,17 +828,6 @@ void DownloadItemModel::ExecuteCommand(D - #if BUILDFLAG(FULL_SAFE_BROWSING) - CompleteSafeBrowsingScan(); - #endif -- if (download_->GetDangerType() == -- download::DOWNLOAD_DANGER_TYPE_ASYNC_LOCAL_PASSWORD_SCANNING || -- download_->GetDangerType() == -- download:: -- DOWNLOAD_DANGER_TYPE_PROMPT_FOR_LOCAL_PASSWORD_SCANNING) { -- safe_browsing::LogLocalDecryptionEvent( -- safe_browsing::DeepScanEvent::kPromptBypassed); -- } else { -- LogDeepScanEvent(download_, -- safe_browsing::DeepScanEvent::kPromptBypassed); -- } - [[fallthrough]]; - case DownloadCommands::KEEP: - if (IsInsecure()) { -@@ -896,24 +885,9 @@ void DownloadItemModel::ExecuteCommand(D - DownloadUIModel::ExecuteCommand(download_commands, command); - break; - case DownloadCommands::DEEP_SCAN: { -- safe_browsing::DownloadProtectionService::UploadForConsumerDeepScanning( -- download_, -- DownloadItemWarningData::DeepScanTrigger::TRIGGER_CONSUMER_PROMPT, -- /*password=*/std::nullopt); - break; - } - case DownloadCommands::CANCEL_DEEP_SCAN: { -- DownloadCoreService* download_core_service = -- DownloadCoreServiceFactory::GetForBrowserContext( -- content::DownloadItemUtils::GetBrowserContext(download_)); -- DCHECK(download_core_service); -- ChromeDownloadManagerDelegate* delegate = -- download_core_service->GetDownloadManagerDelegate(); -- DCHECK(delegate); -- LogDeepScanEvent(download_, safe_browsing::DeepScanEvent::kScanCanceled); -- delegate->CheckClientDownloadDone( -- download_->GetId(), -- safe_browsing::DownloadCheckResult::PROMPT_FOR_SCANNING); - break; - } - } --- a/chrome/browser/download/download_ui_model.cc +++ b/chrome/browser/download/download_ui_model.cc -@@ -31,7 +31,6 @@ +@@ -30,7 +30,6 @@ #include "components/enterprise/common/proto/connectors.pb.h" #include "components/google/core/common/google_util.h" #include "components/safe_browsing/buildflags.h" @@ -172,15 +127,15 @@ +++ b/chrome/browser/download/download_ui_safe_browsing_util.cc @@ -11,7 +11,6 @@ #include "components/prefs/pref_service.h" - #include "components/safe_browsing/content/common/file_type_policies.h" + #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - #if BUILDFLAG(FULL_SAFE_BROWSING) + #if BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION) #include "chrome/browser/browser_process.h" --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc -@@ -47,7 +47,6 @@ +@@ -50,7 +50,6 @@ #include "components/prefs/pref_service.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/core/common/features.h" @@ -190,7 +145,7 @@ #include "crypto/secure_hash.h" --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -374,8 +374,7 @@ std::string ConnectorsService::GetManage +@@ -351,8 +351,7 @@ std::string ConnectorsService::GetManage std::optional scope = std::nullopt; for (const char* scope_pref : @@ -202,7 +157,7 @@ AnalysisConnectorScopePref(AnalysisConnector::PRINT), --- a/chrome/browser/enterprise/connectors/connectors_service.h +++ b/chrome/browser/enterprise/connectors/connectors_service.h -@@ -18,7 +18,6 @@ +@@ -17,7 +17,6 @@ #include "components/enterprise/connectors/core/connectors_service_base.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/keyed_service.h" @@ -247,7 +202,7 @@ Profile::FromBrowserContext( --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc -@@ -277,12 +277,6 @@ void ContextInfoFetcher::Fetch(ContextIn +@@ -276,12 +276,6 @@ void ContextInfoFetcher::Fetch(ContextIn info.third_party_blocking_enabled = utils::GetThirdPartyBlockingEnabled(g_browser_process->local_state()); @@ -409,7 +364,7 @@ } --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc -@@ -71,7 +71,6 @@ +@@ -70,7 +70,6 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/list_accounts_test_utils.h" #include "components/signin/public/base/signin_metrics.h" @@ -427,7 +382,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -66,7 +65,7 @@ const char* const kExtensionsIdentityAPI +@@ -67,7 +66,7 @@ const char* const kExtensionsIdentityAPI "extensions_identity_api"; bool IsBrowserSigninAllowed(Profile* profile) { @@ -438,15 +393,15 @@ std::string_view GetOAuth2MintTokenFlowVersion() { --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc -@@ -23,7 +23,6 @@ - #include "components/autofill/core/common/autofill_prefs.h" +@@ -25,7 +25,6 @@ + #include "components/content_settings/core/common/pref_names.h" #include "components/prefs/pref_service.h" - #include "components/privacy_sandbox/tracking_protection_prefs.h" + #include "components/privacy_sandbox/privacy_sandbox_features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "extensions/browser/api/content_settings/content_settings_service.h" #include "extensions/browser/extension_function_registry.h" #include "extensions/browser/extension_pref_value_map.h" -@@ -437,17 +436,6 @@ ExtensionFunction::ResponseAction SetPre +@@ -449,17 +448,6 @@ ExtensionFunction::ResponseAction SetPre base::Value(browser_pref_value->GetBool())); } @@ -464,7 +419,7 @@ prefs_helper->SetExtensionControlledPref(extension_id(), browser_pref, scope, browser_pref_value->Clone()); -@@ -497,16 +485,6 @@ ExtensionFunction::ResponseAction ClearP +@@ -509,16 +497,6 @@ ExtensionFunction::ResponseAction ClearP prefs_helper->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); @@ -491,7 +446,7 @@ #include "components/translate/core/browser/translate_pref_names.h" #include "content/public/test/browser_test.h" #include "content/public/test/test_devtools_protocol_client.h" -@@ -89,7 +88,6 @@ class ExtensionPreferenceApiTest +@@ -92,7 +91,6 @@ class ExtensionPreferenceApiTest prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); EXPECT_TRUE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); @@ -499,7 +454,7 @@ EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); VerifyPrefValueAndControlledState(prefs::kPrivacySandboxM1TopicsEnabled, base::Value(false), -@@ -127,7 +125,6 @@ class ExtensionPreferenceApiTest +@@ -130,7 +128,6 @@ class ExtensionPreferenceApiTest prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); EXPECT_FALSE( prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); @@ -507,7 +462,7 @@ EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); VerifyPrefValueAndControlledState(prefs::kPrivacySandboxM1TopicsEnabled, base::Value(true), -@@ -212,7 +209,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen +@@ -216,7 +213,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen prefetch::prefs::kNetworkPredictionOptions, static_cast(prefetch::NetworkPredictionOptions::kDisabled)); prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false); @@ -537,7 +492,7 @@ #include "extensions/browser/test_event_router.h" --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -56,10 +56,8 @@ +@@ -57,10 +57,8 @@ #include "components/privacy_sandbox/privacy_sandbox_prefs.h" #include "components/privacy_sandbox/tracking_protection_prefs.h" #include "components/proxy_config/proxy_config_pref_names.h" @@ -548,7 +503,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/supervised_user/core/common/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" -@@ -328,8 +326,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -331,8 +329,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kNumber; // Privacy page @@ -557,7 +512,7 @@ (*s_allowlist)[::prefs::kDnsOverHttpsMode] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kDnsOverHttpsTemplates] = settings_api::PrefType::kString; -@@ -352,16 +348,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -355,16 +351,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; // Security page @@ -576,7 +531,7 @@ (*s_allowlist)[::kGeneratedHttpsFirstModePref] = --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc -@@ -784,9 +784,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore +@@ -785,9 +785,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, GetReferrerChainForNonSafeBrowsingUser) { PrefService* pref_service = browser()->profile()->GetPrefs(); @@ -641,15 +596,15 @@ } // namespace extensions --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -79,7 +79,6 @@ +@@ -75,7 +75,6 @@ + #include "chrome/common/url_constants.h" #include "components/crx_file/id_util.h" - #include "components/favicon_base/favicon_url_parser.h" #include "components/policy/core/common/policy_pref_names.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/supervised_user/core/browser/supervised_user_preferences.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" -@@ -550,10 +549,7 @@ void ExtensionService::Init() { +@@ -547,10 +546,7 @@ void ExtensionService::Init() { LoadExtensionsFromCommandLineFlag(::switches::kDisableExtensionsExcept); if (load_command_line_extensions) { @@ -671,7 +626,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" #include "extensions/browser/allowlist_state.h" -@@ -1139,19 +1138,6 @@ void InstalledLoader::RecordExtensionsMe +@@ -1140,19 +1139,6 @@ void InstalledLoader::RecordExtensionsMe base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled2", disabled_not_allowlisted_count); } @@ -723,7 +678,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/first_party_sets_handler.h" -@@ -1411,15 +1410,8 @@ void ProfileNetworkContextService::Confi +@@ -1393,15 +1392,8 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; @@ -743,13 +698,13 @@ +++ b/chrome/browser/notifications/platform_notification_service_impl.cc @@ -42,7 +42,6 @@ #include "components/prefs/pref_service.h" + #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/browser/notification_content_detection/notification_content_detection_constants.h" - #include "components/safe_browsing/content/browser/notification_content_detection/notification_content_detection_service.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/platform_notification_context.h" #include "content/public/browser/storage_partition.h" -@@ -744,23 +743,5 @@ void PlatformNotificationServiceImpl::Lo +@@ -791,23 +790,5 @@ void PlatformNotificationServiceImpl::Lo bool PlatformNotificationServiceImpl:: AreSuspiciousNotificationsAllowlistedByUser(const GURL& origin) { @@ -822,7 +777,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc -@@ -32,7 +32,6 @@ +@@ -33,7 +33,6 @@ #include "components/permissions/prediction_service/prediction_service_messages.pb.h" #include "components/permissions/request_type.h" #include "components/prefs/pref_service.h" @@ -893,16 +848,16 @@ } // namespace policy --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -123,8 +123,6 @@ +@@ -121,8 +121,6 @@ + #include "components/privacy_sandbox/tracking_protection_prefs.h" #include "components/proxy_config/proxy_policy_handler.h" #include "components/safe_browsing/buildflags.h" - #include "components/safe_browsing/content/common/file_type_policies_prefs.h" -#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/search_engines/enterprise/default_search_policy_handler.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/security_interstitials/core/https_only_mode_policy_handler.h" -@@ -133,7 +131,6 @@ +@@ -131,7 +129,6 @@ #include "components/sharing_message/buildflags.h" #include "components/sharing_message/pref_names.h" #include "components/signin/public/base/signin_buildflags.h" @@ -910,7 +865,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/service/sync_policy_handler.h" -@@ -320,9 +317,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -321,9 +318,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kForcePermissionPolicyUnloadDefaultEnabled, policy_prefs::kForcePermissionPolicyUnloadDefaultEnabled, base::Value::Type::BOOLEAN}, @@ -920,7 +875,7 @@ { key::kDomainReliabilityAllowed, domain_reliability::prefs::kDomainReliabilityAllowedByPolicy, base::Value::Type::BOOLEAN }, -@@ -356,15 +350,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -357,15 +351,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kOopPrintDriversAllowedByPolicy, base::Value::Type::BOOLEAN }, #endif @@ -936,7 +891,7 @@ { key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled, base::Value::Type::BOOLEAN }, -@@ -485,9 +470,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -489,9 +474,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdsSettingForIntrusiveAdsSites, prefs::kManagedDefaultAdsSetting, base::Value::Type::INTEGER }, @@ -946,7 +901,7 @@ { key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, base::Value::Type::BOOLEAN }, -@@ -719,15 +701,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -723,15 +705,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kPasswordDismissCompromisedAlertEnabled, password_manager::prefs::kPasswordDismissCompromisedAlertEnabled, base::Value::Type::BOOLEAN }, @@ -962,7 +917,7 @@ #if BUILDFLAG(ENABLE_PDF) { key::kPdfLocalFileAccessAllowedForDomains, prefs::kPdfLocalFileAccessAllowedForDomains, -@@ -902,9 +875,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -906,9 +879,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdditionalDnsQueryTypesEnabled, prefs::kAdditionalDnsQueryTypesEnabled, base::Value::Type::BOOLEAN }, @@ -972,7 +927,7 @@ { key::kForceGoogleSafeSearch, policy_prefs::kForceGoogleSafeSearch, base::Value::Type::BOOLEAN }, -@@ -966,9 +936,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -970,9 +940,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, @@ -982,7 +937,7 @@ #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -1905,9 +1872,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1909,9 +1876,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, @@ -992,7 +947,7 @@ { key::kLiveTranslateEnabled, prefs::kLiveTranslateEnabled, base::Value::Type::BOOLEAN }, -@@ -1969,9 +1933,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1973,9 +1937,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kImportDialogAutofillFormData, base::Value::Type::BOOLEAN }, @@ -1002,7 +957,7 @@ { key::kHardwareAccelerationModeEnabled, prefs::kHardwareAccelerationModeEnabled, base::Value::Type::BOOLEAN }, -@@ -2242,9 +2203,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2240,9 +2201,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGoogleSearchSidePanelEnabled, prefs::kGoogleSearchSidePanelEnabled, base::Value::Type::BOOLEAN }, @@ -1012,7 +967,7 @@ #endif // BUILDFLAG(IS_ANDROID) { key::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, policy_prefs::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, -@@ -2761,21 +2719,7 @@ std::unique_ptrAddHandler(std::make_unique( key::kProfileReauthPrompt, enterprise_signin::prefs::kProfileReauthPrompt, static_cast(enterprise_signin::ProfileReauthPrompt::kDoNotPrompt), -@@ -2836,24 +2780,6 @@ std::unique_ptr> signin_legacy_policies; @@ -1061,23 +1016,23 @@ std::make_unique(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -164,7 +164,6 @@ - #include "components/privacy_sandbox/privacy_sandbox_prefs.h" +@@ -156,7 +156,6 @@ + #include "components/privacy_sandbox/tpcd_pref_names.h" #include "components/proxy_config/pref_proxy_config_tracker_impl.h" - #include "components/safe_browsing/content/common/file_type_policies_prefs.h" + #include "components/safe_browsing/buildflags.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/saved_tab_groups/public/pref_names.h" #include "components/search_engines/search_engine_choice/search_engine_choice_service.h" #include "components/search_engines/template_url_prepopulate_data.h" -@@ -173,7 +172,6 @@ - #include "components/segmentation_platform/embedder/default_model/device_switcher_result_dispatcher.h" - #include "components/segmentation_platform/public/segmentation_platform_service.h" +@@ -168,7 +167,6 @@ #include "components/sessions/core/session_id_generator.h" + #include "components/sharing_message/sharing_sync_preference.h" + #include "components/signin/core/browser/active_primary_accounts_metrics_recorder.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_engagement/content/site_engagement_service.h" -@@ -1671,7 +1669,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1588,7 +1586,6 @@ void RegisterLocalState(PrefRegistrySimp PushMessagingServiceImpl::RegisterPrefs(registry); #endif RegisterScreenshotPrefs(registry); @@ -1085,18 +1040,17 @@ search_engines::SearchEngineChoiceService::RegisterLocalStatePrefs(registry); secure_origin_allowlist::RegisterPrefs(registry); segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs( -@@ -2015,8 +2012,6 @@ void RegisterProfilePrefs(user_prefs::Pr - #if BUILDFLAG(IS_CHROMEOS_ASH) - settings::ResetSettingsHandler::RegisterProfilePrefs(registry); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) -- safe_browsing::file_type::RegisterProfilePrefs(registry); +@@ -1924,7 +1921,6 @@ void RegisterProfilePrefs(user_prefs::Pr + #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) + safe_browsing::file_type::RegisterProfilePrefs(registry); + #endif - safe_browsing::RegisterProfilePrefs(registry); SearchPrefetchService::RegisterProfilePrefs(registry); blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs( registry); --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc -@@ -25,7 +25,6 @@ +@@ -24,7 +24,6 @@ #include "components/language/core/browser/pref_names.h" #include "components/proxy_config/proxy_config_dictionary.h" #include "components/proxy_config/proxy_config_pref_names.h" @@ -1104,18 +1058,18 @@ #include "components/safe_browsing/core/common/safebrowsing_switches.h" #include "components/sync/base/pref_names.h" #include "content/public/common/content_switches.h" -@@ -78,8 +77,6 @@ const CommandLinePrefStore::BooleanSwitc +@@ -77,8 +76,6 @@ const CommandLinePrefStore::BooleanSwitc {switches::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, true}, {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true}, - {safe_browsing::switches::kSbEnableEnhancedProtection, - prefs::kSafeBrowsingEnhanced, true}, - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) {ash::switches::kEnableTouchpadThreeFingerClick, ash::prefs::kEnableTouchpadThreeFingerClick, true}, --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc -@@ -57,10 +57,8 @@ +@@ -56,10 +56,8 @@ #include "components/prefs/pref_store.h" #include "components/prefs/pref_value_store.h" #include "components/prefs/wrap_with_prefix_pref_store.h" @@ -1123,9 +1077,9 @@ #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" + #include "components/signin/public/base/signin_switches.h" #include "components/supervised_user/core/browser/supervised_user_pref_store.h" #include "components/sync/base/data_type.h" - #include "components/sync/base/features.h" @@ -132,9 +130,6 @@ const auto kTrackedPrefs = std::to_array {5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT, PrefTrackingStrategy::SPLIT, ValueType::IMPERSONAL}, @@ -1197,7 +1151,7 @@ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc -@@ -29,7 +29,6 @@ +@@ -34,7 +34,6 @@ #include "components/prefs/pref_service.h" #include "components/profile_metrics/state.h" #include "components/signin/public/base/consent_level.h" @@ -1224,7 +1178,7 @@ } bool ProfileAttributesEntry::IsDasherlessManagement() const { -@@ -735,7 +734,6 @@ void ProfileAttributesEntry::SetLastDown +@@ -736,7 +735,6 @@ void ProfileAttributesEntry::SetLastDown } void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) { @@ -1273,7 +1227,7 @@ // On Android StartupData creates proto database provider for the profile --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -94,7 +94,6 @@ +@@ -93,7 +93,6 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -1281,7 +1235,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/supervised_user/core/browser/child_account_service.h" -@@ -1908,8 +1907,7 @@ void ProfileManager::AddProfileToStorage +@@ -1914,8 +1913,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1291,7 +1245,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -1958,14 +1956,13 @@ void ProfileManager::AddProfileToStorage +@@ -1964,14 +1962,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsForceEphemeralProfilesEnabled(profile); init_params.is_signed_in_with_credential_provider = @@ -1309,14 +1263,14 @@ prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName); --- a/chrome/browser/profiles/profile_window.cc +++ b/chrome/browser/profiles/profile_window.cc -@@ -37,7 +37,6 @@ +@@ -36,7 +36,6 @@ + #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" - #include "components/flags_ui/pref_service_flags_storage.h" #include "components/prefs/pref_service.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" - #include "content/public/browser/browser_thread.h" + #include "components/webui/flags/pref_service_flags_storage.h" --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc @@ -45,7 +45,6 @@ @@ -1329,7 +1283,7 @@ namespace profiles { --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -782,7 +782,7 @@ +@@ -876,7 +876,7 @@ @@ -1775,7 +1729,7 @@ #include "components/sync/service/sync_service.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 -@@ -41,7 +41,6 @@ +@@ -34,7 +34,6 @@ #include "components/safe_browsing/content/common/file_type_policies.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -1785,7 +1739,7 @@ #include "content/public/browser/browser_context.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 -@@ -27,7 +27,6 @@ +@@ -24,7 +24,6 @@ #include "components/safe_browsing/content/common/file_type_policies.h" #include "components/safe_browsing/core/browser/sync/sync_utils.h" #include "components/safe_browsing/core/common/features.h" @@ -1795,7 +1749,7 @@ #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 -@@ -99,7 +99,6 @@ +@@ -89,7 +89,6 @@ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -2024,7 +1978,7 @@ #include "components/security_interstitials/content/security_interstitial_tab_helper.h" --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -199,7 +199,6 @@ bool SafeBrowsingServiceImpl::IsUserElig +@@ -202,7 +202,6 @@ bool SafeBrowsingServiceImpl::IsUserElig SafeBrowsingServiceImpl::SafeBrowsingServiceImpl() : services_delegate_(ServicesDelegate::Create(this)), @@ -2032,7 +1986,7 @@ shutdown_(false), enabled_(false), enabled_by_prefs_(false) {} -@@ -340,9 +339,6 @@ TriggerManager* SafeBrowsingServiceImpl: +@@ -343,9 +342,6 @@ TriggerManager* SafeBrowsingServiceImpl: PasswordProtectionService* SafeBrowsingServiceImpl::GetPasswordProtectionService(Profile* profile) const { @@ -2042,7 +1996,7 @@ return nullptr; } -@@ -443,9 +439,6 @@ void SafeBrowsingServiceImpl::OnProfileA +@@ -446,9 +442,6 @@ void SafeBrowsingServiceImpl::OnProfileA std::unique_ptr registrar = std::make_unique(); registrar->Init(pref_service); @@ -2052,7 +2006,7 @@ // ClientSideDetectionService will need to be refresh the models // renderers have if extended-reporting changes. registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled, -@@ -485,14 +478,6 @@ void SafeBrowsingServiceImpl::OnProfileA +@@ -488,14 +481,6 @@ void SafeBrowsingServiceImpl::OnProfileA NoCachedPopulationReason::kChangeMbbPref)); user_population_prefs_[pref_service] = std::move(user_population_registrar); @@ -2067,7 +2021,7 @@ // Record the current enhanced protection pref state for regular profiles only if (profiles::IsRegularUserProfile(profile)) { -@@ -604,18 +589,6 @@ void SafeBrowsingServiceImpl::RefreshSta +@@ -607,18 +592,6 @@ void SafeBrowsingServiceImpl::RefreshSta // Check if any profile requires the service to be active. enabled_by_prefs_ = false; @@ -2112,7 +2066,7 @@ // Get current enabled status. Must be called on IO thread. bool enabled() const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); -@@ -379,10 +369,6 @@ class SafeBrowsingServiceImpl : public S +@@ -381,10 +371,6 @@ class SafeBrowsingServiceImpl : public S std::unique_ptr proxy_config_monitor_; @@ -2180,15 +2134,15 @@ #include "content/public/browser/web_contents.h" --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -23,7 +23,6 @@ +@@ -22,7 +22,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/signin_buildflags.h" -#include "components/signin/public/base/signin_pref_names.h" #include "google_apis/google_api_keys.h" - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -97,14 +96,6 @@ AccountConsistencyModeManager::AccountCo + #if BUILDFLAG(IS_CHROMEOS) +@@ -92,14 +91,6 @@ AccountConsistencyModeManager::AccountCo ->GetProfileAttributesStorage() .GetProfileAttributesWithPath(profile_->GetPath()) : nullptr; @@ -2203,7 +2157,7 @@ #endif account_consistency_ = ComputeAccountConsistencyMethod(profile_); -@@ -117,7 +108,6 @@ AccountConsistencyModeManager::~AccountC +@@ -112,7 +103,6 @@ AccountConsistencyModeManager::~AccountC // static void AccountConsistencyModeManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { @@ -2211,11 +2165,10 @@ } // static -@@ -207,15 +197,7 @@ AccountConsistencyModeManager::ComputeAc +@@ -194,13 +184,9 @@ AccountConsistencyModeManager::ComputeAc + #if BUILDFLAG(ENABLE_MIRROR) return AccountConsistencyMethod::kMirror; - #endif - --#if BUILDFLAG(ENABLE_DICE_SUPPORT) + #elif BUILDFLAG(ENABLE_DICE_SUPPORT) - if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) { VLOG(1) << "Desktop Identity Consistency disabled as sign-in to Chrome " "is not allowed"; @@ -2223,13 +2176,12 @@ - } - - return AccountConsistencyMethod::kDice; --#endif -- -- NOTREACHED(); - } + #else + NOTREACHED(); + #endif --- a/chrome/browser/signin/account_consistency_mode_manager_unittest.cc +++ b/chrome/browser/signin/account_consistency_mode_manager_unittest.cc -@@ -20,7 +20,6 @@ +@@ -19,7 +19,6 @@ #include "components/prefs/testing_pref_store.h" #include "components/signin/public/base/account_consistency_method.h" #include "components/signin/public/base/signin_buildflags.h" @@ -2292,8 +2244,8 @@ - return; - } - #if BUILDFLAG(IS_CHROMEOS_LACROS) - // Disabling signin in chrome and 'RestrictSigninToPattern' policy + if (ChromeSigninClientFactory::GetForProfile(profile) + ->IsClearPrimaryAccountAllowed(identity_manager->HasPrimaryAccount( --- a/chrome/browser/signin/accounts_policy_manager.h +++ b/chrome/browser/signin/accounts_policy_manager.h @@ -73,9 +73,6 @@ class AccountsPolicyManager : public Key @@ -2414,10 +2366,10 @@ - std::string()); } - #endif + #endif // BUILDFLAG(IS_CHROMEOS) --- a/chrome/browser/signin/chrome_signin_client.cc +++ b/chrome/browser/signin/chrome_signin_client.cc -@@ -45,7 +45,6 @@ +@@ -44,7 +44,6 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" @@ -2452,12 +2404,12 @@ #include "chrome/browser/signin/signin_util.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/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" + #include "content/public/browser/storage_partition.h" --- a/chrome/browser/signin/dice_web_signin_interceptor.cc +++ b/chrome/browser/signin/dice_web_signin_interceptor.cc -@@ -72,7 +72,6 @@ +@@ -71,7 +71,6 @@ #include "components/search_engines/template_url_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2465,7 +2417,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_capabilities.h" -@@ -471,16 +470,8 @@ void DiceWebSigninInterceptor::RegisterP +@@ -458,16 +457,8 @@ void DiceWebSigninInterceptor::RegisterP registry->RegisterBooleanPref(prefs::kSigninInterceptionEnabled, true); registry->RegisterStringPref(prefs::kManagedAccountsSigninRestriction, std::string()); @@ -2482,7 +2434,7 @@ } std::optional -@@ -1514,16 +1505,6 @@ void DiceWebSigninInterceptor:: +@@ -1492,16 +1483,6 @@ void DiceWebSigninInterceptor:: g_browser_process->browser_policy_connector(), g_browser_process->system_network_context_manager() ->GetSharedURLLoaderFactory()); @@ -2501,7 +2453,7 @@ void DiceWebSigninInterceptor:: --- a/chrome/browser/signin/header_modification_delegate_impl.cc +++ b/chrome/browser/signin/header_modification_delegate_impl.cc -@@ -15,7 +15,6 @@ +@@ -14,7 +14,6 @@ #include "chrome/browser/sync/sync_service_factory.h" #include "components/policy/core/common/policy_pref_names.h" #include "components/prefs/pref_service.h" @@ -2538,7 +2490,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -68,10 +67,6 @@ SigninManager::SigninManager(PrefService +@@ -63,10 +62,6 @@ SigninManager::SigninManager(PrefService : prefs_(prefs), signin_client_(client), identity_manager_(identity_manager) { @@ -2549,7 +2501,7 @@ UpdateUnconsentedPrimaryAccount(); identity_manager_observation_.Observe(&identity_manager_.get()); } -@@ -211,16 +206,6 @@ CoreAccountInfo SigninManager::ComputeUn +@@ -150,16 +145,6 @@ CoreAccountInfo SigninManager::ComputeUn signin::ConsentLevel::kSync); } @@ -2568,7 +2520,7 @@ IsValidUnconsentedPrimaryAccount(current_primary_account); --- a/chrome/browser/signin/signin_promo_util.cc +++ b/chrome/browser/signin/signin_promo_util.cc -@@ -10,7 +10,6 @@ +@@ -11,7 +11,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2576,7 +2528,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -179,51 +178,7 @@ namespace signin { +@@ -160,51 +159,7 @@ namespace signin { #if !BUILDFLAG(IS_ANDROID) bool ShouldShowSyncPromo(Profile& profile) { @@ -2598,7 +2550,7 @@ - - // Don't show for supervised child profiles. - if (original_profile->IsChild()) { -- return false; + return false; - } - - // Don't show if sign in is not allowed. @@ -2611,7 +2563,7 @@ - - // No promo if the user is already syncing. - if (identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)) { - return false; +- return false; - } - - syncer::SyncPrefs prefs(profile.GetPrefs()); @@ -2630,7 +2582,7 @@ --- a/chrome/browser/signin/signin_ui_util.cc +++ b/chrome/browser/signin/signin_ui_util.cc -@@ -42,7 +42,6 @@ +@@ -41,7 +41,6 @@ #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2640,15 +2592,15 @@ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" --- a/chrome/browser/signin/signin_util.cc +++ b/chrome/browser/signin/signin_util.cc -@@ -32,7 +32,6 @@ +@@ -31,7 +31,6 @@ #include "components/policy/core/browser/signin/profile_separation_policies.h" #include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_reconcilor.h" -#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/accounts_mutator.h" -@@ -71,8 +70,7 @@ ScopedForceSigninSetterForTesting::~Scop + #include "content/public/browser/storage_partition.h" +@@ -69,8 +68,7 @@ ScopedForceSigninSetterForTesting::~Scop CookiesMover::CookiesMover(base::WeakPtr source_profile, base::WeakPtr destination_profile, base::OnceCallback callback) @@ -2658,7 +2610,7 @@ source_profile_(std::move(source_profile)), destination_profile_(std::move(destination_profile)), callback_(std::move(callback)) { -@@ -82,25 +80,7 @@ CookiesMover::CookiesMover(base::WeakPtr +@@ -80,25 +78,7 @@ CookiesMover::CookiesMover(base::WeakPtr CookiesMover::~CookiesMover() = default; void CookiesMover::StartMovingCookies() { @@ -2684,7 +2636,7 @@ } void CookiesMover::OnCookiesReceived( -@@ -240,16 +220,7 @@ bool ProfileSeparationAllowsKeepingUnman +@@ -238,16 +218,7 @@ bool ProfileSeparationAllowsKeepingUnman bool IsAccountExemptedFromEnterpriseProfileSeparation( Profile* profile, const std::string& email) { @@ -2782,7 +2734,7 @@ --- a/chrome/browser/ssl/ssl_browsertest.cc +++ b/chrome/browser/ssl/ssl_browsertest.cc -@@ -99,7 +99,6 @@ +@@ -98,7 +98,6 @@ #include "components/policy/policy_constants.h" #include "components/prefs/testing_pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -2792,7 +2744,7 @@ #include "components/security_interstitials/content/common_name_mismatch_handler.h" --- a/chrome/browser/ssl/ssl_error_controller_client.cc +++ b/chrome/browser/ssl/ssl_error_controller_client.cc -@@ -22,7 +22,6 @@ +@@ -21,7 +21,6 @@ #include "chrome/browser/ssl/stateful_ssl_host_state_delegate_factory.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -2812,7 +2764,7 @@ #include "components/sync/service/sync_service.h" --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -91,7 +91,6 @@ +@@ -92,7 +92,6 @@ #include "components/sessions/core/tab_restore_service.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -2840,6 +2792,28 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif +--- a/chrome/browser/ui/extensions/extension_installed_bubble_model.cc ++++ b/chrome/browser/ui/extensions/extension_installed_bubble_model.cc +@@ -15,7 +15,6 @@ + #include "chrome/grit/branded_strings.h" + #include "chrome/grit/generated_resources.h" + #include "components/prefs/pref_service.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "extensions/common/api/extension_action/action_info.h" + #include "extensions/common/command.h" + #include "extensions/common/extension.h" +@@ -109,10 +108,7 @@ ExtensionInstalledBubbleModel::Extension + // Finally, make sure the promo is not shown to users that have explicitly + // signed in through the browser (even if extensions are not syncing). + show_sign_in_promo_ = +- extensions::sync_util::ShouldSync(profile, extension) && +- !extensions::sync_util::IsSyncingExtensionsEnabled(profile) && +- signin::ShouldShowSyncPromo(*profile) && +- !profile->GetPrefs()->GetBoolean(prefs::kExplicitBrowserSignin); ++ false; + + if (show_how_to_use_) { + how_to_use_text_ = MakeHowToUseText(action_info, command, keyword); --- a/chrome/browser/ui/hats/trust_safety_sentiment_service.cc +++ b/chrome/browser/ui/hats/trust_safety_sentiment_service.cc @@ -32,8 +32,6 @@ @@ -3029,10 +3003,10 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" - #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" -@@ -289,15 +288,6 @@ void SigninViewController::SignoutOrReau +@@ -307,15 +306,6 @@ void SigninViewController::SignoutOrReau &SigninViewController::SignoutOrReauthWithPromptWithUnsyncedDataTypes, weak_ptr_factory_.GetWeakPtr(), reauth_access_point, profile_signout_source, token_signout_source); @@ -3048,7 +3022,7 @@ // Dice users don't see the prompt, pass empty datatypes. std::move(signout_prompt_with_datatypes).Run(syncer::DataTypeSet()); } -@@ -644,9 +634,7 @@ void SigninViewController::SignoutOrReau +@@ -658,9 +648,7 @@ void SigninViewController::SignoutOrReau bool sign_out_immediately = unsynced_datatypes.empty() && needs_reauth; // Do not show the dialog to users with implicit signin. @@ -3056,8 +3030,8 @@ sign_out_immediately = true; - } - base::OnceCallback callback = - base::BindOnce(&HandleSignoutConfirmationChoice, browser_->AsWeakPtr(), + #if BUILDFLAG(ENABLE_EXTENSIONS) + // Do not sign out immediately if the user has account extensions. --- a/chrome/browser/ui/startup/first_run_service.cc +++ b/chrome/browser/ui/startup/first_run_service.cc @@ -28,7 +28,6 @@ @@ -3104,7 +3078,7 @@ void SetFirstRunFinished(FirstRunService::FinishedReason reason) { --- a/chrome/browser/ui/toolbar/app_menu_model.cc +++ b/chrome/browser/ui/toolbar/app_menu_model.cc -@@ -108,7 +108,6 @@ +@@ -110,7 +110,6 @@ #include "components/profile_metrics/browser_profile_type.h" #include "components/saved_tab_groups/public/features.h" #include "components/signin/public/base/signin_metrics.h" @@ -3112,7 +3086,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" -@@ -604,51 +603,7 @@ int ProfileSubMenuModel::GetAndIncrement +@@ -601,51 +600,7 @@ int ProfileSubMenuModel::GetAndIncrement } bool ProfileSubMenuModel::BuildSyncSection() { @@ -3176,7 +3150,7 @@ #include "ui/base/l10n/l10n_util.h" --- a/chrome/browser/ui/views/download/bubble/download_toolbar_ui_controller.cc +++ b/chrome/browser/ui/views/download/bubble/download_toolbar_ui_controller.cc -@@ -43,7 +43,6 @@ +@@ -44,7 +44,6 @@ #include "components/feature_engagement/public/feature_constants.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" @@ -3204,7 +3178,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -1628,18 +1627,6 @@ void AvatarToolbarButtonDelegate::OnErro +@@ -1625,18 +1624,6 @@ void AvatarToolbarButtonDelegate::OnErro const CoreAccountInfo& account_info, const GoogleServiceAuthError& error, signin_metrics::SourceForRefreshTokenOperation token_operation_source) { @@ -3225,7 +3199,7 @@ // static --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -71,7 +71,6 @@ +@@ -70,7 +70,6 @@ #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -3233,7 +3207,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" -@@ -754,135 +753,6 @@ void ProfileMenuView::BuildAutofillButto +@@ -739,121 +738,6 @@ void ProfileMenuView::BuildAutofillButto } void ProfileMenuView::BuildSyncInfo() { @@ -3293,7 +3267,6 @@ - std::u16string description; - std::u16string button_text; - ActionableItem button_type = ActionableItem::kSigninAccountButton; -- bool show_sync_badge = false; - bool show_account_card = false; - signin_metrics::AccessPoint access_point = - signin_metrics::AccessPoint::kAvatarBubbleSignIn; @@ -3302,8 +3275,7 @@ - signin_metrics::PromoAction::PROMO_ACTION_NO_SIGNIN_PROMO; - - if (!account_info.IsEmpty()) { -- if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled() && -- identity_manager->HasAccountWithRefreshTokenInPersistentErrorState( +- if (identity_manager->HasAccountWithRefreshTokenInPersistentErrorState( - account_info.account_id)) { - // Sign-in pending state. - button_type = ActionableItem::kSigninReauthButton; @@ -3313,23 +3285,16 @@ - l10n_util::GetStringUTF16(IDS_PROFILES_VERIFY_ACCOUNT_BUTTON); - } else { - // Signed-in not-syncing state. -- description = l10n_util::GetStringUTF16( -- switches::IsExplicitBrowserSigninUIOnDesktopEnabled() -- ? IDS_PROFILES_DICE_SYNC_PROMO -- : IDS_PROFILES_DICE_NOT_SYNCING_TITLE); +- description = l10n_util::GetStringUTF16(IDS_PROFILES_DICE_SYNC_PROMO); - button_text = l10n_util::GetStringUTF16(IDS_PROFILES_DICE_SIGNIN_BUTTON); -- show_sync_badge = !switches::IsExplicitBrowserSigninUIOnDesktopEnabled(); - } -- } else if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled() && -- !account_info_for_promos.IsEmpty()) { +- } else if (!account_info_for_promos.IsEmpty()) { - // Web-only signed-in state. - account_info = account_info_for_promos; - access_point = - signin_metrics::AccessPoint::kAvatarBubbleSignInWithSyncPromo; -- description = l10n_util::GetStringUTF16( -- switches::IsExplicitBrowserSigninUIOnDesktopEnabled() -- ? IDS_PROFILE_MENU_SIGNIN_PROMO_DESCRIPTION -- : IDS_PROFILES_DICE_SYNC_PROMO); +- description = +- l10n_util::GetStringUTF16(IDS_PROFILE_MENU_SIGNIN_PROMO_DESCRIPTION); - button_text = l10n_util::GetStringFUTF16( - IDS_PROFILES_DICE_WEB_ONLY_SIGNIN_BUTTON, - base::UTF8ToUTF16(!account_info_for_promos.given_name.empty() @@ -3340,17 +3305,12 @@ - promo_action = signin_metrics::PromoAction::PROMO_ACTION_WITH_DEFAULT; - } else { - // Not signed in state. -- if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled()) { -- access_point = -- signin_metrics::AccessPoint::kAvatarBubbleSignInWithSyncPromo; -- description = -- l10n_util::GetStringUTF16(IDS_PROFILE_MENU_SIGNIN_PROMO_DESCRIPTION); -- button_text = -- l10n_util::GetStringUTF16(IDS_PROFILE_MENU_SIGNIN_PROMO_BUTTON); -- } else { -- description = l10n_util::GetStringUTF16(IDS_PROFILES_DICE_SYNC_PROMO); -- button_text = l10n_util::GetStringUTF16(IDS_PROFILES_DICE_SIGNIN_BUTTON); -- } +- access_point = +- signin_metrics::AccessPoint::kAvatarBubbleSignInWithSyncPromo; +- description = +- l10n_util::GetStringUTF16(IDS_PROFILE_MENU_SIGNIN_PROMO_DESCRIPTION); +- button_text = +- l10n_util::GetStringUTF16(IDS_PROFILE_MENU_SIGNIN_PROMO_BUTTON); - button_type = ActionableItem::kSigninButton; - promo_action = signin_metrics::PromoAction:: - PROMO_ACTION_NEW_ACCOUNT_NO_EXISTING_ACCOUNT; @@ -3364,12 +3324,12 @@ - base::BindRepeating(&ProfileMenuView::OnSigninButtonClicked, - base::Unretained(this), account_info, button_type, - access_point), -- show_sync_badge, +- /*show_sync_badge=*/false, - show_account_card ? account_info_for_promos : AccountInfo()); } ProfileMenuViewBase::IdentitySectionParams -@@ -969,15 +839,6 @@ ProfileMenuView::GetIdentitySectionParam +@@ -939,15 +823,6 @@ ProfileMenuView::GetIdentitySectionParam signin_metrics::AccessPoint::kAvatarBubbleSignIn; switch (signin_util::GetSignedInState(identity_manager)) { case signin_util::SignedInState::kSignedOut: @@ -3385,7 +3345,7 @@ break; case signin_util::SignedInState::kWebOnlySignedIn: { access_point = -@@ -1098,9 +959,6 @@ void ProfileMenuView::MaybeBuildChromeAc +@@ -1068,9 +943,6 @@ void ProfileMenuView::MaybeBuildChromeAc int message_id = IDS_PROFILE_MENU_OPEN_ACCOUNT_SETTINGS; const gfx::VectorIcon* icon = &vector_icons::kSettingsChromeRefreshIcon; if (switches::IsImprovedSigninUIOnDesktopEnabled()) { @@ -3473,14 +3433,14 @@ --- a/chrome/browser/ui/views/toolbar/app_menu.cc +++ b/chrome/browser/ui/views/toolbar/app_menu.cc @@ -61,7 +61,6 @@ + #include "chrome/grit/generated_resources.h" #include "chrome/grit/theme_resources.h" - #include "components/bookmarks/browser/bookmark_model.h" #include "components/saved_tab_groups/public/features.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/zoom/page_zoom.h" #include "components/zoom/zoom_controller.h" -@@ -388,61 +387,6 @@ void AddSignedInChipToProfileMenuItem( +@@ -387,61 +386,6 @@ void AddSignedInChipToProfileMenuItem( const int horizontal_padding, std::vector& profile_menu_subscription_list) { @@ -3579,7 +3539,7 @@ break; --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -53,7 +53,6 @@ +@@ -52,7 +52,6 @@ #include "components/history/core/common/pref_names.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -3597,7 +3557,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" -@@ -182,8 +181,6 @@ content::WebUIDataSource* CreateAndAddHi +@@ -181,8 +180,6 @@ content::WebUIDataSource* CreateAndAddHi source->AddBoolean("allowDeletingHistory", allow_deleting_history); source->AddBoolean("isGuestSession", profile->IsGuestSession()); @@ -3690,7 +3650,7 @@ #endif // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_ --- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc +++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc -@@ -21,7 +21,6 @@ +@@ -23,7 +23,6 @@ #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -3731,15 +3691,15 @@ #include "components/site_engagement/content/site_engagement_service.h" --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -84,7 +84,6 @@ - #include "components/prefs/pref_service.h" +@@ -86,7 +86,6 @@ + #include "components/regional_capabilities/regional_capabilities_service.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/saved_tab_groups/public/features.h" - #include "components/search_engines/search_engine_choice/search_engine_choice_service.h" #include "components/signin/public/base/signin_buildflags.h" -@@ -3435,11 +3434,6 @@ void AddSiteSettingsStrings(content::Web + #include "components/signin/public/base/signin_switches.h" +@@ -3447,11 +3446,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -3753,15 +3713,15 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -106,7 +106,6 @@ +@@ -108,7 +108,6 @@ + #include "components/regional_capabilities/regional_capabilities_service.h" + #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" - #include "components/search_engines/search_engine_choice/search_engine_choice_service.h" - #include "components/search_engines/search_engine_choice/search_engine_choice_utils.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "content/public/browser/url_data_source.h" -@@ -308,9 +307,7 @@ SettingsUI::SettingsUI(content::WebUI* w +@@ -310,9 +309,7 @@ SettingsUI::SettingsUI(content::WebUI* w } #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -3837,15 +3797,15 @@ --- a/chrome/browser/ui/webui/signin/managed_user_profile_notice_ui.cc +++ b/chrome/browser/ui/webui/signin/managed_user_profile_notice_ui.cc -@@ -27,7 +27,6 @@ - #include "chrome/grit/generated_resources.h" +@@ -32,7 +32,6 @@ #include "chrome/grit/signin_resources.h" #include "components/prefs/pref_service.h" + #include "components/signin/public/base/consent_level.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" + #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" - #include "content/public/browser/web_ui.h" -@@ -287,8 +286,7 @@ void ManagedUserProfileNoticeUI::Initial +@@ -359,8 +358,7 @@ void ManagedUserProfileNoticeUI::Initial // Change the text so that the "(Recommended)" label is not shown when the // admin has set merging data as the default option. bool profile_separation_data_migration_settings_optout = @@ -3988,6 +3948,16 @@ - return !last_gaia_id.empty() && gaia_id != last_gaia_id; + return false; } +--- a/chrome/browser/ui/webui/signin/signout_confirmation/signout_confirmation_handler.cc ++++ b/chrome/browser/ui/webui/signin/signout_confirmation/signout_confirmation_handler.cc +@@ -11,7 +11,6 @@ + #include "chrome/browser/ui/browser.h" + #include "chrome/grit/branded_strings.h" + #include "chrome/grit/generated_resources.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/strings/grit/components_strings.h" + #include "ui/base/l10n/l10n_util.h" + #include "url/gurl.h" --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc @@ -47,7 +47,6 @@ @@ -3998,7 +3968,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/accounts_mutator.h" -@@ -266,8 +265,7 @@ void TurnSyncOnHelper::TurnSyncOnInterna +@@ -271,8 +270,7 @@ void TurnSyncOnHelper::TurnSyncOnInterna // last authenticated account of the current profile, then Chrome will show a // confirmation dialog before starting sync. // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754). @@ -4010,7 +3980,7 @@ base::BindOnce(&TurnSyncOnHelper::OnMergeAccountConfirmation, --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc -@@ -37,7 +37,6 @@ +@@ -38,7 +38,6 @@ #include "components/policy/core/browser/signin/profile_separation_policies.h" #include "components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher.h" #include "components/policy/core/common/policy_utils.h" @@ -4018,7 +3988,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "third_party/skia/include/core/SkColor.h" -@@ -224,26 +223,6 @@ void TurnSyncOnHelperDelegateImpl::OnPro +@@ -247,26 +246,6 @@ void TurnSyncOnHelperDelegateImpl::OnPro return; } @@ -4165,7 +4135,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/data_type.h" #include "components/sync/base/features.h" -@@ -311,13 +310,7 @@ void AddressDataManager::RemoveLocalProf +@@ -308,13 +307,7 @@ void AddressDataManager::RemoveLocalProf } bool AddressDataManager::IsEligibleForAddressAccountStorage() const { @@ -4179,7 +4149,7 @@ } bool AddressDataManager::IsCountryEligibleForAccountStorage( -@@ -602,35 +595,7 @@ bool AddressDataManager::IsAutofillUserS +@@ -601,35 +594,7 @@ bool AddressDataManager::IsAutofillUserS } bool AddressDataManager::IsAutofillSyncToggleAvailable() const { @@ -4282,6 +4252,28 @@ ] public_deps = [ +--- a/components/collaboration/internal/collaboration_service_impl.cc ++++ b/components/collaboration/internal/collaboration_service_impl.cc +@@ -15,7 +15,6 @@ + #include "components/data_sharing/public/group_data.h" + #include "components/prefs/pref_service.h" + #include "components/saved_tab_groups/public/tab_group_sync_service.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/identity_manager/identity_manager.h" + #include "components/sync/base/collaboration_id.h" + #include "components/sync/base/features.h" +@@ -273,11 +272,6 @@ SigninStatus CollaborationServiceImpl::G + } + + CollaborationStatus CollaborationServiceImpl::GetCollaborationStatus() { +- // Check if device policy allow signin. +- if (!profile_prefs_->GetBoolean(prefs::kSigninAllowed)) { +- return CollaborationStatus::kDisabledForPolicy; +- } +- + // TODO(haileywang): Support collaboration status updates. + CollaborationStatus status = CollaborationStatus::kDisabled; + if (base::FeatureList::IsEnabled( --- a/components/feed/core/v2/feed_stream.cc +++ b/components/feed/core/v2/feed_stream.cc @@ -65,7 +65,6 @@ @@ -4490,15 +4482,15 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" -@@ -731,7 +730,7 @@ StoreMetricsReporter::StoreMetricsReport +@@ -736,7 +735,7 @@ StoreMetricsReporter::StoreMetricsReport is_account_storage_enabled_ = features_util::IsAccountStorageEnabled(prefs_, sync_service); - is_safe_browsing_enabled_ = safe_browsing::IsSafeBrowsingEnabled(*prefs_); + is_safe_browsing_enabled_ = false; - // TODO(crbug/358998546): use PasswordManagerSettingsService here. - base::UmaHistogramEnumeration( + if (settings) { + // TODO(crbug.com/358998546): use PasswordManagerSettingsService here. --- a/components/password_manager/core/browser/sync_credentials_filter.cc +++ b/components/password_manager/core/browser/sync_credentials_filter.cc @@ -13,7 +13,6 @@ @@ -4560,7 +4552,7 @@ bool SyncCredentialsFilter::ShouldSaveGaiaPasswordHash( --- a/components/password_manager/core/browser/sync_credentials_filter_unittest.cc +++ b/components/password_manager/core/browser/sync_credentials_filter_unittest.cc -@@ -33,7 +33,6 @@ +@@ -34,7 +34,6 @@ #include "components/password_manager/core/common/password_manager_features.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/testing_pref_service.h" @@ -4707,10 +4699,10 @@ #include "components/safe_browsing/core/common/proto/csd.pb.h" #include "components/safe_browsing/core/common/proto/safebrowsingv5.pb.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - #include "content/public/browser/global_routing_id.h" - #include "services/network/public/mojom/cookie_manager.mojom.h" - #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -1530,20 +1529,7 @@ std::string SerializeHitReport(const Hit + #include "components/safe_browsing/core/common/web_ui_constants.h" + #include "components/strings/grit/components_strings.h" + #include "components/user_prefs/user_prefs.h" +@@ -1529,20 +1528,7 @@ std::string SerializeHitReport(const Hit } hit_report_dict.Set("threat_source", threat_source); std::string extended_reporting_level; @@ -4731,7 +4723,7 @@ hit_report_dict.Set("extended_reporting_level", extended_reporting_level); hit_report_dict.Set("is_enhanced_protection", hit_report.is_enhanced_protection); -@@ -2401,18 +2387,13 @@ void SafeBrowsingUIHandler::GetPrefs(con +@@ -2415,18 +2401,13 @@ void SafeBrowsingUIHandler::GetPrefs(con AllowJavascript(); DCHECK(!args.empty()); std::string callback_id = args[0].GetString(); @@ -4996,8 +4988,8 @@ -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/sessions/core/session_id.h" #include "components/signin/public/identity_manager/account_info.h" - #include "components/signin/public/identity_manager/identity_manager.h" -@@ -149,10 +148,6 @@ class PasswordProtectionServiceBase : pu + #include "services/network/public/cpp/shared_url_loader_factory.h" +@@ -152,10 +151,6 @@ class PasswordProtectionServiceBase : pu // Returns if the warning UI is enabled. bool IsWarningEnabled(ReusedPasswordAccountType password_type); @@ -5057,15 +5049,15 @@ } // namespace safe_browsing --- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc -@@ -21,7 +21,6 @@ - #include "components/safe_browsing/core/browser/referrer_chain_provider.h" - #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h" +@@ -23,7 +23,6 @@ + #include "components/safe_browsing/core/browser/utils/safe_browsing_web_app_utils.h" #include "components/safe_browsing/core/browser/verdict_cache_manager.h" + #include "components/safe_browsing/core/common/proto/csd.pb.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/safe_browsing/core/common/utils.h" #include "components/unified_consent/pref_names.h" #include "net/base/ip_address.h" -@@ -140,8 +139,7 @@ bool RealTimeUrlLookupService::CanSendPa +@@ -142,8 +141,7 @@ bool RealTimeUrlLookupService::CanSendPa } bool RealTimeUrlLookupService::CanIncludeSubframeUrlInReferrerChain() const { @@ -5075,7 +5067,7 @@ } bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const { -@@ -158,9 +156,7 @@ bool RealTimeUrlLookupService::CanCheckS +@@ -160,9 +158,7 @@ bool RealTimeUrlLookupService::CanCheckS } bool RealTimeUrlLookupService::CanSendRTSampleRequest() const { @@ -5086,7 +5078,7 @@ } std::string RealTimeUrlLookupService::GetUserEmail() const { -@@ -268,14 +264,6 @@ RealTimeUrlLookupService::GetMinAllowedT +@@ -270,14 +266,6 @@ RealTimeUrlLookupService::GetMinAllowedT void RealTimeUrlLookupService::MaybeLogLastProtegoPingTimeToPrefs( bool sent_with_token) { @@ -5103,7 +5095,7 @@ void RealTimeUrlLookupService::MaybeLogProtegoPingCookieHistograms( --- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -20,7 +20,6 @@ +@@ -21,7 +21,6 @@ #include "components/safe_browsing/core/browser/referrer_chain_provider.h" #include "components/safe_browsing/core/browser/verdict_cache_manager.h" #include "components/safe_browsing/core/common/features.h" @@ -6031,7 +6023,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -423,23 +422,6 @@ void SigninMetricsService::OnRefreshToke +@@ -424,23 +423,6 @@ void SigninMetricsService::OnRefreshToke #if BUILDFLAG(ENABLE_DICE_SUPPORT) void SigninMetricsService::RecordExplicitSigninMigrationStatus() { @@ -6444,7 +6436,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -207,156 +206,27 @@ PrimaryAccountManager::PrimaryAccountMan +@@ -213,196 +212,27 @@ PrimaryAccountManager::PrimaryAccountMan account_tracker_service_(account_tracker_service) { DCHECK(client_); DCHECK(account_tracker_service_); @@ -6510,6 +6502,44 @@ // level are loaded. CHECK(primary_account_.has_value()); - +- bool migrated_sync_user_to_explicit_sign_in = false; +- if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled() && +- base::FeatureList::IsEnabled(kMigrateSyncToExplicitSignin) && +- !prefs->GetBoolean(prefs::kExplicitBrowserSignin) && +- HasPrimaryAccount(signin::ConsentLevel::kSync)) { +- // A profile that is opted in to sync can be migrated to explicit browser +- // sign-in as the user has explicitly signed in to the browser when they +- // opted in to sync. +- scoped_pref_commit.SetBoolean(prefs::kExplicitBrowserSignin, true); +- migrated_sync_user_to_explicit_sign_in = true; +- } +- base::UmaHistogramBoolean("Signin.ExplicitSigninMigration.FromSync", +- migrated_sync_user_to_explicit_sign_in); +- +- // `prefs::kPrefsThemesSearchEnginesAccountStorageEnabled` is set for sync +- // users and new signed in users. It is not cleared on sign out. +- if (base::FeatureList::IsEnabled( +- switches::kEnablePreferencesAccountStorage)) { +- if (HasPrimaryAccount(signin::ConsentLevel::kSync)) { +- scoped_pref_commit.SetBoolean( +- prefs::kPrefsThemesSearchEnginesAccountStorageEnabled, true); +- } +- } else { +- scoped_pref_commit.ClearPref( +- prefs::kPrefsThemesSearchEnginesAccountStorageEnabled); +- } +- +- // Clear the extensions explicit sign in pref if the feature flag is not +- // enabled. +- if (!switches::IsExtensionsExplicitBrowserSigninEnabled()) { +- std::vector accounts_in_tracker_service = +- account_tracker_service_->GetAccounts(); +- SigninPrefs signin_prefs = SigninPrefs(*prefs); +- for (const auto& account : accounts_in_tracker_service) { +- signin_prefs.SetExtensionsExplicitBrowserSignin(account.gaia, false); +- } +- } +- - // Instrument metrics to know what fraction of users without a primary - // account previously did have one, with sync enabled. - RecordHadPreviousSyncAccount(); @@ -6543,6 +6573,8 @@ - registry->RegisterBooleanPref(kExplicitBrowserSigninWithoutFeatureEnabled, - false); - registry->RegisterBooleanPref(prefs::kExplicitBrowserSignin, false); +- registry->RegisterBooleanPref( +- prefs::kPrefsThemesSearchEnginesAccountStorageEnabled, false); } // static @@ -6601,7 +6633,7 @@ } std::pair -@@ -384,46 +254,10 @@ PrimaryAccountManager::GetOrRestorePrima +@@ -430,46 +260,10 @@ PrimaryAccountManager::GetOrRestorePrima kEmptyAccountInfo_RestoreFailedNotSyncConsented); } @@ -6648,7 +6680,7 @@ } const PrimaryAccountManager::PrimaryAccount& -@@ -514,10 +348,9 @@ void PrimaryAccountManager::SetSyncPrima +@@ -560,10 +354,9 @@ void PrimaryAccountManager::SetSyncPrima #if DCHECK_IS_ON() { @@ -6661,7 +6693,7 @@ DCHECK(pref_account_id.empty() || !consented_to_sync || pref_account_id == account_info.account_id.ToString()) -@@ -532,10 +365,6 @@ void PrimaryAccountManager::SetSyncPrima +@@ -578,10 +371,6 @@ void PrimaryAccountManager::SetSyncPrima // Go ahead and update the last signed in account info here as well. Once a // user is signed in the corresponding preferences should match. Doing it here // as opposed to on signin allows us to catch the upgrade scenario. @@ -6672,7 +6704,7 @@ } void PrimaryAccountManager::SetPrimaryAccountInternal( -@@ -547,22 +376,6 @@ void PrimaryAccountManager::SetPrimaryAc +@@ -593,22 +382,6 @@ void PrimaryAccountManager::SetPrimaryAc // 'account_info' might be a reference to the contents of `primary_account_`. // Create a PrimaryAccount object before calling emplace to avoid crashes. primary_account_.emplace(PrimaryAccount(account_info, consented_to_sync)); @@ -6695,7 +6727,7 @@ } void PrimaryAccountManager::RecordHadPreviousSyncAccount() const { -@@ -572,7 +385,7 @@ void PrimaryAccountManager::RecordHadPre +@@ -618,7 +391,7 @@ void PrimaryAccountManager::RecordHadPre } const std::string& last_gaia_id_with_sync_enabled = @@ -6704,7 +6736,7 @@ const bool existed_primary_account_with_sync = !last_gaia_id_with_sync_enabled.empty(); -@@ -723,37 +536,6 @@ PrimaryAccountChangeEvent::State Primary +@@ -769,51 +542,6 @@ PrimaryAccountChangeEvent::State Primary void PrimaryAccountManager::ComputeExplicitBrowserSignin( const PrimaryAccountChangeEvent& event_details, ScopedPrefCommit& scoped_pref_commit) { @@ -6737,12 +6769,26 @@ - if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled()) { - scoped_pref_commit.SetBoolean(prefs::kExplicitBrowserSignin, true); - } +- if (base::FeatureList::IsEnabled( +- switches::kEnablePreferencesAccountStorage)) { +- scoped_pref_commit.SetBoolean( +- prefs::kPrefsThemesSearchEnginesAccountStorageEnabled, true); +- } +- if (access_point == +- signin_metrics::AccessPoint::kExtensionInstallBubble && +- switches::IsExtensionsExplicitBrowserSigninEnabled()) { +- // Record an explicit signin for extensions for this account only. +- auto current_gaia_id = +- event_details.GetCurrentState().primary_account.gaia; +- SigninPrefs(*client_->GetPrefs()) +- .SetExtensionsExplicitBrowserSignin(current_gaia_id, true); +- } - } - } } void PrimaryAccountManager::FirePrimaryAccountChanged( -@@ -835,7 +617,6 @@ void PrimaryAccountManager::OnSigninAllo +@@ -895,7 +623,6 @@ void PrimaryAccountManager::OnSigninAllo bool PrimaryAccountManager::ShouldSigninAllowedPrefAffectPrimaryAccount( bool is_sync_consent) { return switches::IsExplicitBrowserSigninUIOnDesktopEnabled() && @@ -6752,8 +6798,8 @@ // extremely hard to follow especially for the case when the user is --- a/components/signin/internal/identity_manager/primary_account_manager_unittest.cc +++ b/components/signin/internal/identity_manager/primary_account_manager_unittest.cc -@@ -29,7 +29,6 @@ - #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" +@@ -30,7 +30,6 @@ + #include "components/signin/public/base/gaia_id_hash.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" @@ -6789,7 +6835,7 @@ #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_access_token_consumer.h" -@@ -109,8 +108,6 @@ bool ProfileOAuth2TokenService::HasRefre +@@ -113,8 +112,6 @@ bool ProfileOAuth2TokenService::HasRefre // static void ProfileOAuth2TokenService::RegisterProfilePrefs( PrefRegistrySimple* registry) { @@ -6909,10 +6955,10 @@ #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_switches.h" #include "google_apis/gaia/gaia_id.h" - namespace { -@@ -75,8 +74,6 @@ SigninPrefs::~SigninPrefs() = default; +@@ -85,8 +84,6 @@ SigninPrefs::~SigninPrefs() = default; void SigninPrefs::RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterDictionaryPref(kSigninAccountPrefs); @@ -6931,7 +6977,7 @@ namespace switches { -@@ -60,11 +59,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti +@@ -71,11 +70,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti base::FEATURE_DISABLED_BY_DEFAULT); bool IsBoundSessionCredentialsEnabled(const PrefService* profile_prefs) { @@ -6943,7 +6989,7 @@ return base::FeatureList::IsEnabled(kEnableBoundSessionCredentials); } -@@ -92,11 +86,6 @@ BASE_FEATURE(kEnableChromeRefreshTokenBi +@@ -103,11 +97,6 @@ BASE_FEATURE(kEnableChromeRefreshTokenBi base::FEATURE_DISABLED_BY_DEFAULT); bool IsChromeRefreshTokenBindingEnabled(const PrefService* profile_prefs) { @@ -7041,10 +7087,10 @@ #include "components/saved_tab_groups/public/pref_names.h" #include "components/signin/public/base/gaia_id_hash.h" -#include "components/signin/public/base/signin_pref_names.h" + #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/account_pref_utils.h" - #include "components/sync/base/features.h" -@@ -230,7 +229,7 @@ bool SyncPrefs::IsInitialSyncFeatureSetu +@@ -235,7 +234,7 @@ bool SyncPrefs::IsInitialSyncFeatureSetu } bool SyncPrefs::IsExplicitBrowserSignin() const { @@ -7053,7 +7099,7 @@ } #if !BUILDFLAG(IS_CHROMEOS) -@@ -282,16 +281,6 @@ UserSelectableTypeSet SyncPrefs::GetSele +@@ -289,16 +288,6 @@ UserSelectableTypeSet SyncPrefs::GetSele type == UserSelectableType::kAutofill) { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) type_enabled = true; @@ -7070,17 +7116,24 @@ #endif } else if (type == UserSelectableType::kBookmarks || type == UserSelectableType::kReadingList) { -@@ -307,9 +296,6 @@ UserSelectableTypeSet SyncPrefs::GetSele +@@ -314,16 +303,10 @@ UserSelectableTypeSet SyncPrefs::GetSele type_enabled = false; } } else if (type == UserSelectableType::kExtensions) { -- // Extensions require an explicit sign in. -- type_enabled = -- pref_service_->GetBoolean(::prefs::kExplicitBrowserSignin); +- // Extensions require a specific explicit sign in. +- type_enabled = SigninPrefs(*pref_service_) +- .GetExtensionsExplicitBrowserSignin(gaia_id); + } else if (type == UserSelectableType::kPreferences || + type == UserSelectableType::kThemes) { + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) + type_enabled = true; +-#else +- type_enabled = pref_service_->GetBoolean( +- ::prefs::kPrefsThemesSearchEnginesAccountStorageEnabled); + #endif } else { // All other types are always enabled by default. - type_enabled = true; -@@ -1069,30 +1055,6 @@ void SyncPrefs::MaybeMigrateAutofillToPe +@@ -1103,30 +1086,6 @@ void SyncPrefs::MaybeMigrateAutofillToPe return; } pref_service->SetBoolean(kAutofillPerAccountPrefMigrationDone, true); @@ -7131,7 +7184,7 @@ kSyncedDefaultSearchProviderGUID = 49, kPrefForceTriggerTranslateCount = 50, // kPrefNeverPromptSitesDeprecated = 51, (deprecated) -@@ -220,16 +217,9 @@ constexpr auto kCommonSyncablePrefsAllow +@@ -225,16 +222,9 @@ constexpr auto kCommonSyncablePrefsAllow {payments::kCanMakePaymentEnabled, {syncable_prefs_ids::kCanMakePaymentEnabled, syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, @@ -7150,7 +7203,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) --- a/content/browser/webid/federated_auth_request_impl.cc +++ b/content/browser/webid/federated_auth_request_impl.cc -@@ -534,31 +534,6 @@ FederatedAuthRequestImpl::~FederatedAuth +@@ -546,31 +546,6 @@ FederatedAuthRequestImpl::~FederatedAuth void FederatedAuthRequestImpl::Create( RenderFrameHost* host, mojo::PendingReceiver receiver) { diff --git a/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch b/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch index cc36f28a..a7cf1480 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/third_party/search_engines_data/resources/definitions/prepopulated_engines.json +++ b/third_party/search_engines_data/resources/definitions/prepopulated_engines.json -@@ -154,25 +154,11 @@ +@@ -168,25 +168,11 @@ // TODO(crbug.com/343792225): Identify a way to resolve this problem and implement // necessary changes. "google": { diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index f8365104..a5451da2 100644 --- a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch +++ b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch @@ -1,7 +1,7 @@ # Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -175,6 +175,7 @@ +@@ -174,6 +174,7 @@ #include "components/supervised_user/core/browser/supervised_user_preferences.h" #include "components/supervised_user/core/browser/supervised_user_service.h" #include "components/supervised_user/core/browser/supervised_user_url_filter.h" @@ -9,7 +9,7 @@ #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" -@@ -2208,6 +2209,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -2230,6 +2231,7 @@ void RenderViewContextMenu::AppendPageIt } if (CanTranslate(/*menu_logging=*/true)) { diff --git a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch index 6e5371f8..f86c7b0d 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 -@@ -2476,6 +2476,7 @@ static_library("browser") { +@@ -2498,6 +2498,7 @@ static_library("browser") { "//third_party/libyuv", "//third_party/metrics_proto", "//third_party/re2", @@ -19,7 +19,7 @@ "//third_party/widevine/cdm:headers", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -184,6 +184,7 @@ +@@ -179,6 +179,7 @@ #include "components/translate/core/common/translate_util.h" #include "components/trusted_vault/features.h" #include "components/ui_devtools/switches.h" @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -284,6 +284,7 @@ source_set("browser") { +@@ -291,6 +291,7 @@ source_set("browser") { "//third_party/re2", "//third_party/snappy", "//third_party/sqlite", @@ -54,7 +54,7 @@ "//tools/v8_context_snapshot:buildflags", --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -79,6 +79,7 @@ +@@ -80,6 +80,7 @@ #include "components/services/storage/public/cpp/quota_error_or.h" #include "components/services/storage/public/mojom/cache_storage_control.mojom.h" #include "components/tracing/common/tracing_switches.h" @@ -73,7 +73,7 @@ switches::kForceGpuMemAvailableMb, --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn -@@ -109,6 +109,7 @@ target(link_target_type, "child") { +@@ -110,6 +110,7 @@ target(link_target_type, "child") { "//third_party/blink/public/common:buildflags", "//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" -@@ -481,6 +482,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -488,6 +489,10 @@ void SetRuntimeFeaturesFromCommandLine(c true}, {wrf::EnableWebAudioBypassOutputBufferingOptOut, blink::switches::kWebAudioBypassOutputBufferingOptOut, true}, @@ -124,7 +124,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" -@@ -866,6 +867,11 @@ Document::Document(const DocumentInit& i +@@ -867,6 +868,11 @@ Document::Document(const DocumentInit& i TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this), TRACE_EVENT_FLAG_FLOW_OUT); DCHECK(agent_); @@ -136,7 +136,7 @@ if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) && features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) { script_runner_delayer_->Activate(); -@@ -992,6 +998,14 @@ const Position Document::PositionAdjuste +@@ -993,6 +999,14 @@ const Position Document::PositionAdjuste return Position::BeforeNode(*shadow_host); } @@ -153,7 +153,7 @@ selector_query_cache_ = MakeGarbageCollected(); --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -550,6 +550,10 @@ class CORE_EXPORT Document : public Cont +@@ -555,6 +555,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -164,7 +164,7 @@ V8VisibilityState visibilityState() const; String visibilityStateAsString() const; bool IsPageVisible() const; -@@ -2641,6 +2645,9 @@ class CORE_EXPORT Document : public Cont +@@ -2644,6 +2648,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -176,7 +176,7 @@ --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2749,6 +2749,11 @@ DOMRectList* Element::getClientRects() { +@@ -2666,6 +2666,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads, *element_layout_object); @@ -188,7 +188,7 @@ return MakeGarbageCollected(quads); } -@@ -2776,6 +2781,9 @@ gfx::RectF Element::GetBoundingClientRec +@@ -2693,6 +2698,9 @@ gfx::RectF Element::GetBoundingClientRec DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -228,7 +228,7 @@ // TODO(editing-dev): We should make --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc -@@ -102,6 +102,24 @@ const ShapeResult* ShapeWord(const TextR +@@ -107,6 +107,24 @@ const ShapeResult* ShapeWord(const TextR } } // namespace @@ -250,23 +250,23 @@ + baselines_->setIdeographic(baselines_->ideographic() * factor); +} + - void TextMetrics::Update(const Font& font, + void TextMetrics::Update(const Font* font, const TextDirection& direction, - const TextBaseline& baseline, + const V8CanvasTextBaseline::Enum baseline, --- a/third_party/blink/renderer/core/html/canvas/text_metrics.h +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h -@@ -103,6 +103,8 @@ class CORE_EXPORT TextMetrics final : pu +@@ -112,6 +112,8 @@ class CORE_EXPORT TextMetrics final : pu float x_position_; }; + void Shuffle(const double factor); + private: - void Update(const Font&, - const TextDirection&, + void Update(const Font*, + const TextDirection& direction, --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -227,6 +227,9 @@ class Isolate; +@@ -235,6 +235,9 @@ class Isolate; class Value; } // namespace v8 @@ -276,15 +276,19 @@ namespace blink { class DOMMatrixInit; -@@ -3705,8 +3708,22 @@ TextMetrics* BaseRenderingContext2D::mea +@@ -3763,12 +3766,25 @@ TextMetrics* BaseRenderingContext2D::mea TextDirection direction = ToTextDirection( state.GetDirection(), GetCanvasRenderingContextHost(), computed_style); - return MakeGarbageCollected( -- font, direction, state.GetTextBaseline(), state.GetTextAlign(), text); -+ TextMetrics* text_metrics = MakeGarbageCollected(font, direction, -+ GetState().GetTextBaseline(), -+ GetState().GetTextAlign(), text); +- font, direction, state.GetTextBaseline().AsEnum(), +- state.GetTextAlign().AsEnum(), text, ++ TextMetrics* text_metrics = MakeGarbageCollected( ++ font, direction, GetState().GetTextBaseline().AsEnum(), ++ GetState().GetTextAlign().AsEnum(), text, + RuntimeEnabledFeatures::CanvasTextNgEnabled() + ? &GetCanvasRenderingContextHost()->GetPlainTextPainter() + : nullptr); + + // Scale text metrics if enabled + if (RuntimeEnabledFeatures::FingerprintingCanvasMeasureTextNoiseEnabled()) { @@ -303,7 +307,7 @@ void BaseRenderingContext2D::SnapshotStateForFilter() { --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1762,6 +1762,7 @@ component("platform") { +@@ -1772,6 +1772,7 @@ component("platform") { "//components/paint_preview/common", "//components/search_engines:search_engine_utils", "//components/translate/core/language_detection:language_detection", @@ -328,17 +332,17 @@ } // namespace blink --- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc +++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc -@@ -38,6 +38,7 @@ +@@ -35,6 +35,7 @@ + #include "base/compiler_specific.h" #include "base/memory/ptr_util.h" - #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h" #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h" +#include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "third_party/blink/renderer/platform/wtf/text/base64.h" - #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" - #include "third_party/blink/renderer/platform/wtf/vector.h" + #include "third_party/skia/include/core/SkImage.h" + #include "third_party/skia/include/core/SkSurface.h" --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2056,6 +2056,12 @@ +@@ -2080,6 +2080,12 @@ status: "experimental", }, { 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 8945dba8..b021abf0 100644 --- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch +++ b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch @@ -44,7 +44,7 @@ approach to change color components. switches::kForceGpuMemAvailableMb, --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -486,6 +486,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -493,6 +493,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -65,7 +65,7 @@ approach to change color components. }; --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -2973,6 +2973,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -2967,6 +2967,9 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -77,7 +77,7 @@ approach to change color components. return image_data; --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1706,7 +1706,9 @@ component("platform") { +@@ -1717,7 +1717,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -101,16 +101,16 @@ approach to change color components. } // namespace blink --- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc +++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc -@@ -36,6 +36,8 @@ +@@ -34,6 +34,8 @@ #include "base/compiler_specific.h" #include "base/memory/ptr_util.h" +#include "base/rand_util.h" +#include "base/logging.h" - #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h" #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" -@@ -147,6 +149,11 @@ bool ImageDataBuffer::EncodeImageInterna + #include "third_party/blink/renderer/platform/wtf/text/base64.h" +@@ -141,6 +143,11 @@ bool ImageDataBuffer::EncodeImageInterna const SkPixmap& pixmap) const { DCHECK(is_valid_); @@ -133,16 +133,17 @@ approach to change color components. #include "base/numerics/checked_math.h" #include "gpu/command_buffer/client/gles2_interface.h" #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h" -@@ -11,10 +13,12 @@ +@@ -11,11 +13,13 @@ #include "third_party/blink/renderer/platform/graphics/image_observer.h" #include "third_party/blink/renderer/platform/graphics/paint/paint_image.h" #include "third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h" +#include "third_party/blink/renderer/platform/runtime_enabled_features.h" + #include "third_party/blink/renderer/platform/transforms/affine_transform.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkSurface.h" -+#include "third_party/skia/include/private/SkColorData.h" ++#include "third_party/skia/src/core/SkColorData.h" #include "ui/gfx/geometry/skia_conversions.h" #include "v8/include/v8.h" @@ -303,7 +304,7 @@ approach to change color components. } // namespace blink --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h -@@ -38,6 +38,8 @@ class PLATFORM_EXPORT StaticBitmapImage +@@ -39,6 +39,8 @@ class PLATFORM_EXPORT StaticBitmapImage StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {} @@ -314,7 +315,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 -@@ -2062,6 +2062,9 @@ +@@ -2086,6 +2086,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 48e8ff52..6b5ae165 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 -@@ -2156,6 +2156,7 @@ static_library("browser") { +@@ -2177,6 +2177,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -65,7 +65,7 @@ with limited CPU/memory resources and it is disabled by default. #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" -@@ -117,6 +119,7 @@ +@@ -118,6 +120,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" @@ -73,7 +73,7 @@ with limited CPU/memory resources and it is disabled by default. #include "components/network_time/network_time_tracker.h" #include "components/os_crypt/async/browser/os_crypt_async.h" #include "components/permissions/permissions_client.h" -@@ -150,6 +153,7 @@ +@@ -151,6 +154,7 @@ #include "extensions/common/constants.h" #include "media/media_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" @@ -81,7 +81,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" -@@ -414,6 +418,18 @@ void BrowserProcessImpl::Init() { +@@ -417,6 +421,18 @@ void BrowserProcessImpl::Init() { pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled, base::BindRepeating(&ApplyMetricsReportingPolicy)); @@ -102,7 +102,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2507,6 +2507,10 @@ const char kMantisFeatureKeyDescription[ +@@ -2453,6 +2453,10 @@ const char kMantisFeatureKeyDescription[ "Feature key to use the Mantis feature on ChromeOS."; #endif // BUILDFLAG(IS_CHROMEOS) @@ -115,7 +115,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 -@@ -1432,6 +1432,9 @@ extern const char kMantisFeatureKeyName[ +@@ -1417,6 +1417,9 @@ extern const char kMantisFeatureKeyName[ extern const char kMantisFeatureKeyDescription[]; #endif // IS_CHROMEOS diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index 0428dab2..0889ff84 100644 --- a/patches/extra/inox-patchset/0006-modify-default-prefs.patch +++ b/patches/extra/inox-patchset/0006-modify-default-prefs.patch @@ -1,7 +1,7 @@ ---- a/chrome/browser/background/background_mode_manager.cc -+++ b/chrome/browser/background/background_mode_manager.cc -@@ -358,7 +358,7 @@ BackgroundModeManager::~BackgroundModeMa +--- a/chrome/browser/background/extensions/background_mode_manager.cc ++++ b/chrome/browser/background/extensions/background_mode_manager.cc +@@ -364,7 +364,7 @@ BackgroundModeManager::~BackgroundModeMa // static void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { @@ -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 -@@ -1546,7 +1546,7 @@ void ChromeContentBrowserClient::Registe +@@ -1553,7 +1553,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -98,7 +98,7 @@ prefs::kAutofillPaymentCvcStorage, true, --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc -@@ -462,7 +462,7 @@ bool DoesBookmarkContainWords(const std: +@@ -487,7 +487,7 @@ bool DoesBookmarkContainWords(const std: void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -120,7 +120,7 @@ --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -364,7 +364,7 @@ bool HasManuallyFilledFields(const Passw +@@ -389,7 +389,7 @@ bool HasManuallyFilledFields(const Passw void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -129,7 +129,7 @@ user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); #if BUILDFLAG(IS_IOS) // Deprecated pref in profile prefs. -@@ -372,7 +372,7 @@ void PasswordManager::RegisterProfilePre +@@ -397,7 +397,7 @@ void PasswordManager::RegisterProfilePre false); #endif // BUILDFLAG(IS_IOS) registry->RegisterBooleanPref( diff --git a/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch b/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch index 4f27f8a9..b2864005 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 -@@ -305,6 +305,12 @@ if (is_linux || is_chromeos) { +@@ -303,6 +303,12 @@ if (is_linux || is_chromeos) { # These files have a suspicious comparison. # TODO fix this and re-enable this warning. "-Wno-sign-compare", 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 56b72f9e..cd830b2d 100644 --- a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch +++ b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch @@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1686,11 +1686,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1578,11 +1578,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { diff --git a/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch b/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch index 4235740c..9a4fbb64 100644 --- a/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch +++ b/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch @@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily. --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc -@@ -267,7 +267,7 @@ void DownloadPrefs::RegisterProfilePrefs +@@ -283,7 +283,7 @@ void DownloadPrefs::RegisterProfilePrefs user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kPromptForDownload, diff --git a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch index 88816787..610c22d0 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -60,7 +60,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -3283,6 +3288,58 @@ bool Browser::CanCloseWithInProgressDown +@@ -3302,6 +3307,58 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -119,7 +119,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = RESPONSE_RECEIVED; -@@ -3308,6 +3365,22 @@ void Browser::InProgressDownloadResponse +@@ -3327,6 +3384,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -152,7 +152,7 @@ #include "chrome/browser/ui/signin/signin_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" -@@ -1184,12 +1185,17 @@ class Browser : public TabStripModelObse +@@ -1189,12 +1190,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -170,7 +170,7 @@ // Called when the user has decided whether to proceed or not with the browser // closure, in case the cookie migration notice was shown. |proceed_closing| // is true if the browser can be closed. -@@ -1355,6 +1361,8 @@ class Browser : public TabStripModelObse +@@ -1363,6 +1369,8 @@ class Browser : public TabStripModelObse // when the browser is closed with in-progress downloads. CancelDownloadConfirmationState cancel_download_confirmation_state_; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch b/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch index c98d1458..51f741a8 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -925,10 +925,14 @@ bool HandleNewTabPageLocationOverride( +@@ -929,10 +929,14 @@ bool HandleNewTabPageLocationOverride( // Don't change the URL when incognito mode. if (profile->IsOffTheRecord()) @@ -26,9 +26,9 @@ + "Allows setting a custom URL for the new tab page. Value can be internal (e.g. `about:blank` or `chrome://new-tab-page`), external (e.g. `example.com`), or local (e.g. `file:///tmp/startpage.html`). This applies for incognito windows as well when not set to a `chrome://` internal page. ungoogled-chromium flag", + kOsDesktop, ORIGIN_LIST_VALUE_TYPE("custom-ntp", "")}, #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ ---- a/components/flags_ui/flags_state.cc -+++ b/components/flags_ui/flags_state.cc -@@ -230,6 +230,7 @@ std::string GetCombinedOriginListValue(c +--- a/components/webui/flags/flags_state.cc ++++ b/components/webui/flags/flags_state.cc +@@ -234,6 +234,7 @@ std::string GetCombinedOriginListValue(c command_line.GetSwitchValueASCII(command_line_switch); const std::string new_value = flags_storage.GetOriginListFlag(internal_entry_name); @@ -36,7 +36,7 @@ return CombineAndSanitizeOriginLists(existing_value, new_value); } -@@ -474,6 +475,7 @@ void FlagsState::SetOriginListFlag(const +@@ -482,6 +483,7 @@ void FlagsState::SetOriginListFlag(const const std::string& value, FlagsStorage* flags_storage) { const std::string new_value = diff --git a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch index ea3fe1ca..e2489f76 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -20,6 +20,8 @@ +@@ -18,6 +18,8 @@ namespace blink::features { @@ -33,7 +33,15 @@ // --- a/third_party/blink/renderer/core/editing/selection_controller.cc +++ b/third_party/blink/renderer/core/editing/selection_controller.cc -@@ -1434,10 +1434,14 @@ FrameSelection& SelectionController::Sel +@@ -30,6 +30,7 @@ + #include "third_party/blink/renderer/core/editing/selection_controller.h" + + #include "base/auto_reset.h" ++#include "third_party/blink/public/common/features.h" + #include "third_party/blink/public/common/input/web_menu_source_type.h" + #include "third_party/blink/public/platform/web_input_event_result.h" + #include "third_party/blink/renderer/core/dom/document.h" +@@ -1434,10 +1435,14 @@ FrameSelection& SelectionController::Sel } bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) { @@ -50,7 +58,15 @@ Node* inner_node = event.InnerNode(); --- a/third_party/blink/renderer/core/input/mouse_event_manager.cc +++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc -@@ -681,8 +681,14 @@ WebInputEventResult MouseEventManager::H +@@ -5,6 +5,7 @@ + #include "third_party/blink/renderer/core/input/mouse_event_manager.h" + + #include "build/build_config.h" ++#include "third_party/blink/public/common/features.h" + #include "third_party/blink/public/platform/web_input_event_result.h" + #include "third_party/blink/renderer/bindings/core/v8/v8_drag_event_init.h" + #include "third_party/blink/renderer/bindings/core/v8/v8_pointer_event_init.h" +@@ -681,8 +682,14 @@ WebInputEventResult MouseEventManager::H bool single_click = event.Event().click_count <= 1; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch index 1da359eb..585daaa7 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -81,6 +81,7 @@ class FrameGrabHandle : public views::Vi +@@ -75,6 +75,7 @@ class FrameGrabHandle : public views::Vi // Reserve some space for the frame to be grabbed by, even if the tabstrip // is full. // TODO(tbergquist): Define this relative to the NTB insets again. diff --git a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch index 48033231..127362d9 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc -@@ -641,5 +641,7 @@ bool BrowserFrame::RegenerateFrameOnThem +@@ -640,5 +640,7 @@ bool BrowserFrame::RegenerateFrameOnThem } bool BrowserFrame::IsIncognitoBrowser() const { @@ -10,7 +10,7 @@ } --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -@@ -56,6 +56,7 @@ +@@ -57,6 +57,7 @@ #include "ui/base/webui/jstemplate_builder.h" #include "ui/base/webui/web_ui_util.h" #include "ui/color/color_provider.h" @@ -18,7 +18,7 @@ #include "ui/gfx/color_utils.h" #include "ui/native_theme/native_theme.h" -@@ -437,7 +438,9 @@ void NTPResourceCache::CreateNewTabIncog +@@ -454,7 +455,9 @@ void NTPResourceCache::CreateNewTabIncog profile_->GetPrefs()->GetString(prefs::kCurrentThemeID); // Colors. diff --git a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch index edbc4f4f..8fe3bbcb 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch @@ -41,7 +41,7 @@ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/functional/bind.h" -@@ -541,6 +542,15 @@ AutocompleteController::AutocompleteCont +@@ -537,6 +538,15 @@ AutocompleteController::AutocompleteCont steady_state_omnibox_position_( metrics::OmniboxEventProto::UNKNOWN_POSITION) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); 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 f87bd35d..d72753b9 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,9 +2,9 @@ --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -488,7 +488,9 @@ void TabHelpers::AttachTabHelpers(WebCon - site_protection::SiteProtectionMetricsObserver::CreateForWebContents( - web_contents); +@@ -531,7 +531,9 @@ void TabHelpers::AttachTabHelpers(WebCon + profile, web_contents); + #endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE) SafetyTipWebContentsObserver::CreateForWebContents(web_contents); + if (!base::CommandLine::ForCurrentProcess()->HasSwitch("disable-search-engine-collection")) { SearchEngineTabHelper::CreateForWebContents(web_contents); @@ -60,8 +60,8 @@ #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/debug/crash_logging.h" -@@ -243,6 +244,12 @@ TemplateURLData UpdateTemplateURLDataIfP - return data; +@@ -290,6 +291,12 @@ bool IsAccountDataActive(const TemplateU + return false; } +bool ShouldAutocollect() { @@ -73,15 +73,15 @@ } // namespace // TemplateURLService::LessWithPrefix ----------------------------------------- -@@ -422,6 +429,7 @@ TemplateURLService::TemplateURLService( +@@ -470,6 +477,7 @@ TemplateURLService::TemplateURLService( std::unique_ptr client, const base::RepeatingClosure& dsp_change_callback) : prefs_(prefs), + should_autocollect_(true), search_engine_choice_service_(search_engine_choice_service), + prepopulate_data_resolver_(prepopulate_data_resolver), search_terms_data_(std::move(search_terms_data)), - web_data_service_(web_data_service), -@@ -521,8 +529,8 @@ bool TemplateURLService::CanAddAutogener +@@ -573,8 +581,8 @@ bool TemplateURLService::CanAddAutogener // that may interfere with search queries). An easy heuristic for this is // whether the user has a TemplateURL that has been manually modified (e.g., // renamed) connected to the same host. @@ -92,7 +92,7 @@ } bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy( -@@ -2132,6 +2140,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -2266,6 +2274,8 @@ SyncDataMap TemplateURLService::CreateGU } void TemplateURLService::Init() { @@ -101,7 +101,7 @@ if (client_) { client_->SetOwner(this); } -@@ -2314,6 +2324,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -2448,6 +2458,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -113,9 +113,9 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -875,6 +875,8 @@ class TemplateURLService final : public - raw_ref - search_engine_choice_service_; +@@ -893,6 +893,8 @@ class TemplateURLService final : public + + raw_ref prepopulate_data_resolver_; + bool should_autocollect_; // Whether search engines should be auto-collected + diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch index a2492ed3..10fedf2a 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch @@ -8,7 +8,7 @@ #include "base/debug/alias.h" #include "base/functional/bind.h" #include "base/i18n/rtl.h" -@@ -708,6 +709,13 @@ void Tab::OnGestureEvent(ui::GestureEven +@@ -719,6 +720,13 @@ void Tab::OnGestureEvent(ui::GestureEven event->SetHandled(); } @@ -42,7 +42,7 @@ #include "base/check.h" #include "base/compiler_specific.h" #include "base/containers/adapters.h" -@@ -1865,6 +1866,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -1888,6 +1889,8 @@ void TabStrip::OnMouseEventInTab(views:: } void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch index 1e258bd5..ccb76f46 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -1427,7 +1427,8 @@ void BrowserCommandController::InitComma +@@ -1447,7 +1447,8 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, normal_window); @@ -20,7 +20,7 @@ #include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h" -@@ -125,6 +126,7 @@ TabStripRegionView::TabStripRegionView(s +@@ -119,6 +120,7 @@ TabStripRegionView::TabStripRegionView(s std::unique_ptr tab_strip_combo_button; std::unique_ptr product_specifications_button; if (browser && diff --git a/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch b/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch index a6145876..541ea85a 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch @@ -9,9 +9,9 @@ + "Set a custom value for the Accept header which is sent by the browser with every HTTP request. (e.g. `text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8`). ungoogled-chromium flag.", + kOsAll, ORIGIN_LIST_VALUE_TYPE("http-accept-header", "")}, #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ ---- a/components/flags_ui/flags_state.cc -+++ b/components/flags_ui/flags_state.cc -@@ -231,6 +231,7 @@ std::string GetCombinedOriginListValue(c +--- a/components/webui/flags/flags_state.cc ++++ b/components/webui/flags/flags_state.cc +@@ -235,6 +235,7 @@ std::string GetCombinedOriginListValue(c const std::string new_value = flags_storage.GetOriginListFlag(internal_entry_name); if (command_line_switch == "custom-ntp") return existing_value.empty() ? new_value : existing_value; @@ -19,7 +19,7 @@ return CombineAndSanitizeOriginLists(existing_value, new_value); } -@@ -476,6 +477,7 @@ void FlagsState::SetOriginListFlag(const +@@ -484,6 +485,7 @@ void FlagsState::SetOriginListFlag(const FlagsStorage* flags_storage) { const std::string new_value = internal_name == "custom-ntp" ? value : diff --git a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch index d6a28877..984e0829 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/browser_features.cc +++ b/chrome/browser/browser_features.cc -@@ -367,4 +367,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur +@@ -357,4 +357,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur "RemovalOfIWAsFromTabCapture", base::FEATURE_ENABLED_BY_DEFAULT); @@ -8,7 +8,7 @@ } // namespace features --- a/chrome/browser/browser_features.h +++ b/chrome/browser/browser_features.h -@@ -136,6 +136,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT +@@ -134,6 +134,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT // module, e.g. // //chrome/browser//features.h // diff --git a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch index dbb0beaf..c3878f19 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -8,7 +8,7 @@ #include "base/containers/adapters.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" -@@ -723,6 +724,10 @@ void TabStripModel::CloseAllTabsInGroup( +@@ -957,6 +958,10 @@ void TabStripModel::CloseAllTabsInGroup( void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) { CHECK(ContainsIndex(index)); @@ -19,7 +19,7 @@ CloseTabs({GetWebContentsAt(index)}, close_types); } -@@ -1968,9 +1973,13 @@ TabStripModel::GetGroupsDestroyedFromRem +@@ -2205,9 +2210,13 @@ TabStripModel::GetGroupsDestroyedFromRem void TabStripModel::ExecuteCloseTabsByIndices( base::RepeatingCallback()> get_indices_to_close, uint32_t close_types) { 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 45a6b96e..c97b2a89 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch @@ -50,7 +50,7 @@ bool IsExtensionDownload(const download::DownloadItem& download_item); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1217,10 +1217,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1238,10 +1238,12 @@ DownloadConfirmationReason DownloadTarge return DownloadConfirmationReason::SAVE_AS; #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch index afc3a80a..6f529fb5 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -1204,6 +1204,8 @@ WindowOpenDisposition NavigationPolicyTo +@@ -1207,6 +1207,8 @@ WindowOpenDisposition NavigationPolicyTo case blink::kWebNavigationPolicyNewWindow: return WindowOpenDisposition::NEW_WINDOW; case blink::kWebNavigationPolicyNewPopup: diff --git a/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch b/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch index 0c9e0ca5..5689bb0e 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch @@ -21,7 +21,7 @@ #include "base/compiler_specific.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" -@@ -1368,7 +1369,8 @@ void HistoryBackend::InitImpl( +@@ -1369,7 +1370,8 @@ void HistoryBackend::InitImpl( db_->GetStartDate(&first_recorded_time_); // Start expiring old stuff. @@ -31,7 +31,7 @@ } void HistoryBackend::OnMemoryPressure( -@@ -1600,6 +1602,8 @@ void HistoryBackend::AddPagesWithDetails +@@ -1597,6 +1599,8 @@ void HistoryBackend::AddPagesWithDetails } bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch index 66fe5ace..5e9a55cb 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -2141,6 +2141,10 @@ void BrowserView::ExitFullscreen() { +@@ -2161,6 +2161,10 @@ void BrowserView::ExitFullscreen() { void BrowserView::UpdateExclusiveAccessBubble( const ExclusiveAccessBubbleParams& params, ExclusiveAccessBubbleHideCallback first_hide_callback) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch index f150fd61..5d52f440 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc -@@ -1130,7 +1130,11 @@ void Tab::UpdateIconVisibility() { +@@ -1141,7 +1141,11 @@ void Tab::UpdateIconVisibility() { // Close button is shown on active tabs regardless of the size. showing_close_button_ = true; #endif // BUILDFLAG(IS_CHROMEOS) @@ -12,7 +12,7 @@ showing_alert_indicator_ = has_alert_icon && alert_icon_width <= available_width; -@@ -1159,6 +1163,8 @@ void Tab::UpdateIconVisibility() { +@@ -1170,6 +1174,8 @@ void Tab::UpdateIconVisibility() { !controller_->IsLockedForOnTask() && #endif large_enough_for_close_button; diff --git a/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch b/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch index cac6ec97..ba45045b 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc -@@ -145,6 +145,8 @@ const std::string& GetWindowsPlatformVer +@@ -142,6 +142,8 @@ const std::string& GetWindowsPlatformVer // TODO(crbug.com/1330890): Remove this method along with policy. bool ShouldReduceUserAgentMinorVersion( UserAgentReductionEnterprisePolicyState user_agent_reduction) { @@ -20,7 +20,7 @@ return ((user_agent_reduction != UserAgentReductionEnterprisePolicyState::kForceDisabled && base::FeatureList::IsEnabled( -@@ -168,6 +170,8 @@ bool ShouldReduceUserAgentMinorVersion( +@@ -165,6 +167,8 @@ bool ShouldReduceUserAgentMinorVersion( // sending unified platform for the user agent string. bool ShouldSendUserAgentUnifiedPlatform( UserAgentReductionEnterprisePolicyState user_agent_reduction) { @@ -29,7 +29,7 @@ #if BUILDFLAG(IS_ANDROID) return ShouldReduceUserAgentMinorVersion(user_agent_reduction) && base::FeatureList::IsEnabled( -@@ -462,6 +466,8 @@ blink::UserAgentMetadata GetUserAgentMet +@@ -446,6 +450,8 @@ blink::UserAgentMetadata GetUserAgentMet blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service, bool only_low_entropy_ch) { @@ -40,7 +40,7 @@ // Low entropy client hints. --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -21,6 +21,7 @@ +@@ -19,6 +19,7 @@ namespace blink::features { BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch index fce6210b..084f3cce 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch @@ -11,7 +11,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/browser/client_hints/client_hints.cc +++ b/content/browser/client_hints/client_hints.cc -@@ -822,6 +822,8 @@ void UpdateNavigationRequestClientUaHead +@@ -826,6 +826,8 @@ void UpdateNavigationRequestClientUaHead net::HttpRequestHeaders* headers, const std::optional& request_url) { DCHECK(frame_tree_node); @@ -20,9 +20,9 @@ if (!ShouldAddClientHints(origin, frame_tree_node, delegate, request_url)) { return; } -@@ -843,6 +845,8 @@ void AddRequestClientHintsHeaders( +@@ -847,6 +849,8 @@ void AddRequestClientHintsHeaders( FrameTreeNode* frame_tree_node, - const blink::ParsedPermissionsPolicy& container_policy, + const network::ParsedPermissionsPolicy& container_policy, const std::optional& request_url) { + if (base::FeatureList::IsEnabled(blink::features::kRemoveClientHints)) + return; @@ -31,7 +31,7 @@ data, container_policy); --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -22,6 +22,7 @@ namespace blink::features { +@@ -20,6 +20,7 @@ namespace blink::features { BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT); @@ -70,15 +70,15 @@ ua_data->SetBrandVersionList(metadata.brand_version_list); --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -48,6 +48,7 @@ +@@ -51,6 +51,7 @@ #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "third_party/blink/public/common/client_hints/client_hints.h" #include "third_party/blink/public/common/device_memory/approximated_device_memory.h" +#include "third_party/blink/public/common/features.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h" #include "third_party/blink/public/mojom/loader/request_context_frame_type.mojom-blink.h" - #include "third_party/blink/public/mojom/permissions_policy/permissions_policy.mojom-blink.h" -@@ -509,6 +510,8 @@ void FrameFetchContext::ModifyRequestFor + #include "third_party/blink/public/platform/modules/service_worker/web_service_worker_network_provider.h" +@@ -502,6 +503,8 @@ void FrameFetchContext::ModifyRequestFor void FrameFetchContext::AddClientHintsIfNecessary( const std::optional resource_width, ResourceRequest& request) { 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 e8b8daaa..dbbe64cf 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -498,6 +498,17 @@ void ToolbarView::Init() { +@@ -484,6 +484,17 @@ void ToolbarView::Init() { browser_->profile()->IsGuestSession() || browser_->profile()->IsRegularProfile(); #endif diff --git a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch index 9e0dc1d6..6f93aabd 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch @@ -58,7 +58,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -23,6 +23,11 @@ namespace blink::features { +@@ -21,6 +21,11 @@ namespace blink::features { BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kRemoveClientHints, "RemoveClientHints", base::FEATURE_DISABLED_BY_DEFAULT); @@ -86,7 +86,7 @@ // Feature declarations and associated constants (feature params, et cetera) --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3858,6 +3858,8 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3860,6 +3860,8 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_RENDERER)))); } @@ -95,7 +95,7 @@ return WebGLAny(script_state, String(ContextGL()->GetString(GL_RENDERER))); } -@@ -3873,6 +3875,8 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3875,6 +3877,8 @@ ScriptValue WebGLRenderingContextBase::g pname, IdentifiabilityBenignStringToken( String(ContextGL()->GetString(GL_VENDOR)))); } diff --git a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch index b5c8842d..6fb2d0fd 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4410,10 +4410,12 @@ const FeatureEntry::FeatureVariation kTa +@@ -4455,10 +4455,12 @@ const FeatureEntry::FeatureVariation #include "chrome/browser/ungoogled_flag_choices.h" #include "chrome/browser/bromite_flag_choices.h" #include "chrome/browser/ungoogled_platform_flag_choices.h" diff --git a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch index a7c30926..3df2fba4 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch @@ -19,15 +19,15 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -161,6 +161,7 @@ - #include "services/network/public/cpp/features.h" - #include "services/network/public/cpp/header_util.h" - #include "services/network/public/cpp/is_potentially_trustworthy.h" +@@ -165,6 +165,7 @@ + #include "services/network/public/cpp/permissions_policy/fenced_frame_permissions_policies.h" + #include "services/network/public/cpp/permissions_policy/permissions_policy_declaration.h" + #include "services/network/public/cpp/permissions_policy/permissions_policy_features.h" +#include "services/network/public/cpp/referrer_sanitizer.h" #include "services/network/public/cpp/resource_request_body.h" #include "services/network/public/cpp/supports_loading_mode/supports_loading_mode_parser.h" #include "services/network/public/cpp/url_loader_completion_status.h" -@@ -387,10 +388,10 @@ void AddAdditionalRequestHeaders( +@@ -383,10 +384,10 @@ void AddAdditionalRequestHeaders( net::HttpRequestHeaders::kUserAgent, ComputeUserAgentValue(*headers, user_agent_override, browser_context)); @@ -52,7 +52,7 @@ #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" #include "services/network/public/mojom/fetch_api.mojom.h" #include "services/network/public/mojom/restricted_cookie_manager.mojom.h" -@@ -4636,10 +4637,13 @@ void RenderFrameImpl::FinalizeRequestInt +@@ -4650,10 +4651,13 @@ void RenderFrameImpl::FinalizeRequestInt request.SetHasUserGesture(frame_->HasTransientUserActivation()); @@ -100,7 +100,7 @@ --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn -@@ -111,6 +111,8 @@ component("cpp") { +@@ -151,6 +151,8 @@ component("cpp") { "private_network_access_check_result.cc", "private_network_access_check_result.h", "record_ontransfersizeupdate_utils.h", @@ -241,7 +241,7 @@ #include "third_party/blink/public/platform/url_loader_throttle_provider.h" #include "third_party/blink/public/platform/web_url_request_extra_data.h" #include "third_party/blink/public/platform/websocket_handshake_throttle_provider.h" -@@ -161,10 +163,13 @@ void WebServiceWorkerFetchContextImpl::F +@@ -155,10 +157,13 @@ void WebServiceWorkerFetchContextImpl::F request.SetURLRequestExtraData(std::move(url_request_extra_data)); diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index aa2be37b..9523f272 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -47,7 +47,7 @@ // True if |hostname| ends with either ".local" or ".local.". bool ResemblesMulticastDNSName(std::string_view hostname) { return hostname.ends_with(".local") || hostname.ends_with(".local."); -@@ -1425,33 +1420,10 @@ int HostResolverManager::StartIPv6Reacha +@@ -1477,33 +1472,10 @@ int HostResolverManager::StartIPv6Reacha return OK; } diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index 973ce929..747552ec 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -334,7 +334,7 @@ void ReloadIcon(size_t index); --- a/chrome/browser/ui/webui/settings/search_engines_handler.cc +++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc -@@ -48,6 +48,7 @@ namespace { +@@ -50,6 +50,7 @@ namespace { const char kSearchEngineField[] = "searchEngine"; const char kKeywordField[] = "keyword"; const char kQueryUrlField[] = "queryUrl"; @@ -342,7 +342,7 @@ // Dummy number used for indicating that a new search engine is added. const int kNewSearchEngineIndex = -1; -@@ -226,6 +227,8 @@ base::Value::Dict SearchEnginesHandler:: +@@ -228,6 +229,8 @@ base::Value::Dict SearchEnginesHandler:: Profile* profile = Profile::FromWebUI(web_ui()); dict.Set("url", template_url->url_ref().DisplayURL(UIThreadSearchTermsData())); @@ -351,7 +351,7 @@ dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) || (template_url->starter_pack_id() > 0))); GURL icon_url = template_url->favicon_url(); -@@ -401,12 +404,14 @@ void SearchEnginesHandler::HandleSearchE +@@ -403,12 +406,14 @@ void SearchEnginesHandler::HandleSearchE void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url, const std::u16string& title, const std::u16string& keyword, @@ -369,7 +369,7 @@ } edit_controller_.reset(); -@@ -436,6 +441,8 @@ bool SearchEnginesHandler::CheckFieldVal +@@ -438,6 +443,8 @@ bool SearchEnginesHandler::CheckFieldVal is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value)); } else if (field_name.compare(kQueryUrlField) == 0) { is_valid = edit_controller_->IsURLValid(field_value); @@ -378,7 +378,7 @@ } else { NOTREACHED(); } -@@ -458,18 +465,21 @@ void SearchEnginesHandler::HandleSearchE +@@ -460,18 +467,21 @@ void SearchEnginesHandler::HandleSearchE return; } @@ -428,7 +428,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -924,7 +924,8 @@ void TemplateURLService::IncrementUsageC +@@ -975,7 +975,8 @@ void TemplateURLService::IncrementUsageC void TemplateURLService::ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -438,17 +438,17 @@ DCHECK(!IsCreatedByExtension(url)); DCHECK(!keyword.empty()); DCHECK(!search_url.empty()); -@@ -939,6 +940,7 @@ void TemplateURLService::ResetTemplateUR +@@ -990,6 +991,7 @@ void TemplateURLService::ResetTemplateUR data.safe_for_autoreplace = false; data.last_modified = clock_->Now(); data.is_active = TemplateURLData::ActiveStatus::kTrue; + data.suggestions_url = suggestions_url; - Update(url, TemplateURL(data)); - } + Update(url, base::FeatureList::IsEnabled( + syncer::kSeparateLocalAndAccountSearchEngines) --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -326,7 +326,8 @@ class TemplateURLService final : public +@@ -341,7 +341,8 @@ class TemplateURLService final : public void ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index 624d0253..524b586d 100644 --- a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch +++ b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4406,7 +4406,13 @@ const FeatureEntry::FeatureVariation kTa +@@ -4451,7 +4451,13 @@ const FeatureEntry::FeatureVariation // calculate and verify checksum. // // When adding a new choice, add it to the end of the list. diff --git a/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch b/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch index 5413ef9e..3f86d1ac 100644 --- a/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch +++ b/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/media/webrtc/capture_policy_utils.cc +++ b/chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -60,36 +60,7 @@ void IsMultiCaptureAllowedForAnyOriginOn +@@ -56,36 +56,7 @@ void IsMultiCaptureAllowedForAnyOriginOn base::OnceCallback callback, content::BrowserContext* context, bool is_multi_capture_allowed_for_any_origin_on_main_profile) { @@ -37,7 +37,7 @@ } void CheckAllScreensMediaAllowedForIwaResultReceived( -@@ -263,43 +234,13 @@ void RegisterProfilePrefs(PrefRegistrySi +@@ -257,43 +228,13 @@ void RegisterProfilePrefs(PrefRegistrySi void CheckGetAllScreensMediaAllowedForAnyOrigin( content::BrowserContext* context, base::OnceCallback callback) { diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index 9d82bceb..87c9a9c8 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -142,8 +142,8 @@ } // namespace download --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -120,7 +120,6 @@ source_set("browser") { - "//components/payments/mojom", +@@ -127,7 +127,6 @@ source_set("browser") { + "//components/performance_manager/scenario_api", "//components/power_monitor", "//components/services/filesystem:lib", - "//components/services/quarantine:quarantine", diff --git a/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch b/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch index 6730dc31..9b64c43c 100644 --- a/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch +++ b/patches/extra/ungoogled-chromium/enable-certificate-transparency-and-add-flag.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/browser_features.cc +++ b/chrome/browser/browser_features.cc -@@ -50,7 +50,7 @@ BASE_FEATURE(kBookmarkTriggerForPrerende +@@ -49,7 +49,7 @@ BASE_FEATURE(kBookmarkTriggerForPrerende // switch. BASE_FEATURE(kCertificateTransparencyAskBeforeEnabling, "CertificateTransparencyAskBeforeEnabling", diff --git a/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch b/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch index cde00a38..ba332522 100644 --- a/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch +++ b/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch @@ -2,7 +2,7 @@ --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -1980,7 +1980,7 @@ BASE_FEATURE(kPrefetchFontLookupTables, +@@ -1919,7 +1919,7 @@ BASE_FEATURE(kPrefetchFontLookupTables, // crbug.com/988956. BASE_FEATURE(kPrefetchPrivacyChanges, "PrefetchPrivacyChanges", diff --git a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch index d70efe34..b17438d3 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 @@ -14,7 +14,7 @@ } return content_restrictions; } -@@ -1727,8 +1722,7 @@ bool CanSavePage(const Browser* browser) +@@ -1723,8 +1718,7 @@ bool CanSavePage(const Browser* browser) policy::DownloadRestriction::ALL_FILES) { return false; } diff --git a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch index cc3f47fc..6ec8e9a5 100644 --- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch +++ b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -227,12 +227,10 @@ TabStripRegionView::TabStripRegionView(s +@@ -222,12 +222,10 @@ TabStripRegionView::TabStripRegionView(s new_tab_button_->GetViewAccessibility().SetName( l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB)); @@ -15,7 +15,7 @@ --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -2107,8 +2107,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2130,8 +2130,6 @@ void TabStrip::NewTabButtonPressed(const const ui::MouseEvent& mouse = static_cast(event); if (mouse.IsOnlyMiddleMouseButton()) { @@ -24,7 +24,7 @@ ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); CHECK(clipboard) << "Clipboard instance is not available, cannot proceed with " -@@ -2119,7 +2117,6 @@ void TabStrip::NewTabButtonPressed(const +@@ -2142,7 +2140,6 @@ void TabStrip::NewTabButtonPressed(const if (!clipboard_text.empty()) { controller_->CreateNewTabWithLocation(clipboard_text); } diff --git a/patches/extra/ungoogled-chromium/first-run-page.patch b/patches/extra/ungoogled-chromium/first-run-page.patch index 5a9ddc9c..30755633 100644 --- a/patches/extra/ungoogled-chromium/first-run-page.patch +++ b/patches/extra/ungoogled-chromium/first-run-page.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1117,6 +1117,7 @@ int ChromeBrowserMainParts::PreCreateThr +@@ -1013,6 +1013,7 @@ int ChromeBrowserMainParts::PreCreateThr if (first_run::IsChromeFirstRun()) { if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) && !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) { @@ -10,7 +10,7 @@ --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -44,6 +44,7 @@ +@@ -43,6 +43,7 @@ #include "chrome/browser/ui/webui/signin_internals_ui.h" #include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h" #include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h" @@ -18,7 +18,7 @@ #include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h" #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h" #include "chrome/browser/ui/webui/version/version_ui.h" -@@ -244,6 +245,7 @@ void RegisterChromeWebUIConfigs() { +@@ -248,6 +249,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); diff --git a/patches/extra/ungoogled-chromium/keep-expired-flags.patch b/patches/extra/ungoogled-chromium/keep-expired-flags.patch index a22319b8..554949d9 100644 --- a/patches/extra/ungoogled-chromium/keep-expired-flags.patch +++ b/patches/extra/ungoogled-chromium/keep-expired-flags.patch @@ -1,23 +1,25 @@ ---- a/components/flags_ui/flags_state.cc -+++ b/components/flags_ui/flags_state.cc -@@ -30,6 +30,7 @@ +--- a/components/webui/flags/flags_state.cc ++++ b/components/webui/flags/flags_state.cc +@@ -31,6 +31,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" +#include "chrome/browser/unexpire_flags.h" - #include "components/flags_ui/feature_entry.h" - #include "components/flags_ui/flags_storage.h" - #include "components/flags_ui/flags_ui_switches.h" -@@ -667,13 +668,17 @@ void FlagsState::GetFlagFeatureEntries( + #include "components/variations/field_trial_config/field_trial_util.h" + #include "components/variations/variations_associated_data.h" + #include "components/variations/variations_switches.h" +@@ -681,14 +682,19 @@ void FlagsState::GetFlagFeatureEntries( int current_platform = GetCurrentPlatform(); for (const FeatureEntry& entry : feature_entries_) { + std::string desc = entry.visible_description; - if (skip_feature_entry.Run(entry)) -+ if (flags::IsFlagExpired(flags_storage, entry.internal_name)) -+ desc.insert(0, "!!! NOTE: THIS FLAG IS EXPIRED AND MAY STOP FUNCTIONING OR BE REMOVED SOON !!! "); -+ else + if (skip_feature_entry.Run(entry)) { ++ if (flags::IsFlagExpired(flags_storage, entry.internal_name)) { ++ desc.insert(0, "!!! NOTE: THIS FLAG IS EXPIRED AND MAY STOP FUNCTIONING OR BE REMOVED SOON !!! "); ++ } else { continue; ++ } + } base::Value::Dict data; data.Set("internal_name", entry.internal_name); @@ -27,11 +29,13 @@ base::Value::List supported_platforms; AddOsStrings(entry.supported_platforms, &supported_platforms); -@@ -1074,6 +1079,7 @@ bool FlagsState::IsSupportedFeature(cons - if (!entry.InternalNameMatches(name)) +@@ -1097,7 +1103,9 @@ bool FlagsState::IsSupportedFeature(cons continue; - if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry)) -+ if (!flags::IsFlagExpired(storage, entry.internal_name)) + } + if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry)) { ++ if (!flags::IsFlagExpired(storage, entry.internal_name)) { continue; ++ } + } return true; } diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index a68ada82..b777695e 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -11,7 +11,6 @@ # update status text on the About page # link to Google's help site on the About page # external link for theme entry on settings page -# webstore text for theme entry on settings page # the Google account line from the Payment methods page # Safety check section on the settings page # Privacy guide promo on the privacy page @@ -35,7 +34,7 @@ --- a/chrome/app/settings_chromium_strings.grdp +++ b/chrome/app/settings_chromium_strings.grdp -@@ -370,13 +370,13 @@ +@@ -367,13 +367,13 @@ @@ -54,7 +53,7 @@ --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -1186,7 +1186,7 @@ +@@ -1183,7 +1183,7 @@ Active site @@ -63,7 +62,7 @@ Power -@@ -1210,7 +1210,7 @@ +@@ -1207,7 +1207,7 @@ Inactive tabs appearance @@ -72,7 +71,7 @@ Tab hover preview card appearance -@@ -1222,7 +1222,7 @@ +@@ -1219,7 +1219,7 @@ Performance issue alerts @@ -239,28 +238,9 @@ @@ -274,7 +254,7 @@ @@ -119,7 +119,7 @@ associated-control="[[$$('#securityLinkRow')]]" --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts -@@ -502,6 +502,12 @@ export class SettingsPrivacyPageElement +@@ -515,6 +515,12 @@ export class SettingsPrivacyPageElement Router.getInstance().navigateTo(routes.SITE_SETTINGS); } @@ -134,10 +134,10 @@ this.metricsBrowserProxy_.recordAction( --- a/chrome/browser/resources/settings/router.ts +++ b/chrome/browser/resources/settings/router.ts -@@ -33,6 +33,7 @@ export interface SettingsRoutes { - EDIT_DICTIONARY: Route; +@@ -34,6 +34,7 @@ export interface SettingsRoutes { FONTS: Route; - GLIC: Route; + GEMINI: Route; + GLIC_SECTION: Route; + HELIUM_SERVICES: Route; HISTORY_SEARCH: Route; INCOMPATIBLE_APPLICATIONS: Route; @@ -155,7 +155,7 @@ if (visibility.safetyHub !== false) { --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -141,6 +141,7 @@ build_webui("build") { +@@ -142,6 +142,7 @@ build_webui("build") { "privacy_page/security_keys_set_pin_dialog.ts", "privacy_page/security_keys_subpage.ts", "privacy_page/security_page.ts", @@ -280,7 +280,7 @@ +customElements.define(SettingsHeliumServicesPageElement.is, SettingsHeliumServicesPageElement); --- a/chrome/browser/resources/settings/lazy_load.ts +++ b/chrome/browser/resources/settings/lazy_load.ts -@@ -30,6 +30,7 @@ import './privacy_page/security_keys_pho +@@ -31,6 +31,7 @@ import './privacy_page/security_keys_pho import './privacy_page/security_keys_phones_list.js'; import './privacy_page/security_keys_phones_dialog.js'; import './privacy_page/security_page.js'; @@ -288,7 +288,7 @@ import './safety_hub/safety_hub_page.js'; import './safety_hub/safety_hub_entry_point.js'; import './site_settings/all_sites.js'; -@@ -202,6 +203,7 @@ export {ResetDialogPage, SettingsSecurit +@@ -204,6 +205,7 @@ export {ResetDialogPage, SettingsSecurit export {SetPinDialogPage, SettingsSecurityKeysSetPinDialogElement} from './privacy_page/security_keys_set_pin_dialog.js'; export {SecurityKeysSubpageElement} from './privacy_page/security_keys_subpage.js'; export {HttpsFirstModeSetting, SafeBrowsingSetting, SettingsSecurityPageElement} from './privacy_page/security_page.js'; @@ -320,7 +320,7 @@ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -42,6 +42,7 @@ +@@ -43,6 +43,7 @@ #include "components/dom_distiller/core/pref_names.h" #include "components/drive/drive_pref_names.h" #include "components/embedder_support/pref_names.h" @@ -328,7 +328,7 @@ #include "components/language/core/browser/pref_names.h" #include "components/live_caption/pref_names.h" #include "components/media_router/common/pref_names.h" -@@ -335,6 +336,12 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -338,6 +339,12 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kString; #endif diff --git a/patches/helium/settings/move-macos-settings.patch b/patches/helium/settings/move-macos-settings.patch index e5e1f979..d2a61bd0 100644 --- a/patches/helium/settings/move-macos-settings.patch +++ b/patches/helium/settings/move-macos-settings.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/resources/settings/appearance_page/appearance_page.html +++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -276,16 +276,6 @@ +@@ -274,16 +274,6 @@ diff --git a/patches/helium/settings/remove-autofill.patch b/patches/helium/settings/remove-autofill.patch index ffe9c9b3..56461e47 100644 --- a/patches/helium/settings/remove-autofill.patch +++ b/patches/helium/settings/remove-autofill.patch @@ -16,7 +16,7 @@ class="cr-nav-menu-item"> --- a/chrome/browser/resources/settings/basic_page/basic_page.html +++ b/chrome/browser/resources/settings/basic_page/basic_page.html -@@ -53,7 +53,7 @@ +@@ -55,7 +55,7 @@ @@ -27,7 +27,7 @@ section="autofill"> --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts -@@ -230,29 +230,6 @@ function createRoutes(): SettingsRoutes +@@ -238,21 +238,6 @@ function createRoutes(): SettingsRoutes r.FONTS = r.APPEARANCE.createChild('/fonts'); } @@ -37,18 +37,10 @@ - r.PAYMENTS = r.AUTOFILL.createChild('/payments'); - r.ADDRESSES = r.AUTOFILL.createChild('/addresses'); - -- if (loadTimeData.getBoolean('autofillAiEnabled')) { +- if (loadTimeData.getBoolean('autofillAiFeatureEnabled')) { - r.AUTOFILL_AI = r.AUTOFILL.createChild('/autofillAi'); - } - -- // -- if (visibility.glic !== false && -- loadTimeData.getBoolean('showGlicSettings')) { -- r.GLIC = r.BASIC.createSection( -- '/glic', 'glic', loadTimeData.getString('glicPageTitle')); -- } -- // -- - // - r.PASSKEYS = r.AUTOFILL.createChild('/passkeys'); - // From 0aaad75cd940fbe37fff145894d6c75691bf406a Mon Sep 17 00:00:00 2001 From: jj Date: Thu, 3 Apr 2025 20:32:56 +0000 Subject: [PATCH 10/11] patches/custom-importer: ignore chromium imports in metrics --- patches/extra/brave/custom-importer.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/patches/extra/brave/custom-importer.patch b/patches/extra/brave/custom-importer.patch index 084daada..5dbe1d78 100644 --- a/patches/extra/brave/custom-importer.patch +++ b/patches/extra/brave/custom-importer.patch @@ -472,6 +472,16 @@ ImporterTypeMetrics metrics_type = IMPORTER_METRICS_UNKNOWN; switch (type) { case TYPE_UNKNOWN: +@@ -59,6 +60,9 @@ void LogImporterUseToMetrics(const std:: + case TYPE_BOOKMARKS_FILE: + metrics_type = IMPORTER_METRICS_BOOKMARKS_FILE; + break; ++ default: ++ metrics_type = IMPORTER_METRICS_UNKNOWN; ++ break; + } + + // Note: This leaks memory, which is the expected behavior as the factory --- a/chrome/browser/importer/external_process_importer_client.h +++ b/chrome/browser/importer/external_process_importer_client.h @@ -51,10 +51,10 @@ class ExternalProcessImporterClient From cfa65ed1cb966089b509b722afffc6d503f1b566 Mon Sep 17 00:00:00 2001 From: jj Date: Fri, 4 Apr 2025 11:34:19 +0000 Subject: [PATCH 11/11] patches/webgl-renderer: export spoof value constants --- .../add-flag-to-spoof-webgl-renderer-info.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch index 6f93aabd..55ba2393 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch @@ -77,10 +77,10 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kReducedSystemInfo); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kRemoveClientHints); +BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kSpoofWebGLInfo); -+extern const char kSpoofWebGLRenderer[]; -+extern const char kSpoofWebGLVendor[]; -+extern const base::FeatureParam kSpoofWebGLRendererParam; -+extern const base::FeatureParam kSpoofWebGLVendorParam; ++BLINK_COMMON_EXPORT extern const char kSpoofWebGLRenderer[]; ++BLINK_COMMON_EXPORT extern const char kSpoofWebGLVendor[]; ++BLINK_COMMON_EXPORT extern const base::FeatureParam kSpoofWebGLRendererParam; ++BLINK_COMMON_EXPORT extern const base::FeatureParam kSpoofWebGLVendorParam; // ----------------------------------------------------------------------------- // Feature declarations and associated constants (feature params, et cetera)