From 791bedf06114bbbefbc569ef7c3ca8471f151f00 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 27 Jan 2023 10:25:10 +0100 Subject: [PATCH] Patches for v109 Build fixes Use helper macros to define base::Features --- build/LASTCHANGE | 2 +- build/RELEASE | 2 +- build/RELEASE_COMMIT | 2 +- build/bromite.gn_args | 1 + build/bromite_patches_list.txt | 2 +- build/chromium.gn_args | 1 + build/chromium_patches_list.txt | 1 + .../AImageReader-CFI-crash-mitigations.patch | 8 +- .../Add-AllowUserCertificates-flag.patch | 32 +- .../Add-English-only-search-engine.patch | 2 +- .../Add-IsCleartextPermitted-flag.patch | 6 +- .../Add-a-proxy-configuration-page.patch | 12 +- .../Add-an-always-incognito-mode.patch | 120 +- .../Add-bookmark-import-export-actions.patch | 94 +- ...dd-custom-tab-intents-privacy-option.patch | 4 +- build/patches/Add-exit-menu-item.patch | 8 +- ...g-for-omnibox-autocomplete-filtering.patch | 8 +- .../Add-flag-for-save-data-header.patch | 6 +- ...nfigure-maximum-connections-per-host.patch | 8 +- ...ontrol-video-playback-resume-feature.patch | 8 +- .../Add-flag-to-disable-IPv6-probes.patch | 8 +- ...-to-disable-external-intent-requests.patch | 6 +- .../Add-flag-to-disable-vibration.patch | 18 +- ...Add-lifetime-options-for-permissions.patch | 54 +- .../Add-menu-item-to-bookmark-all-tabs.patch | 44 +- .../Add-menu-item-to-view-source.patch | 8 +- .../Add-option-to-force-tablet-UI.patch | 12 +- ...-to-not-persist-tabs-across-sessions.patch | 2 +- .../Add-option-to-use-home-page-as-NTP.patch | 8 +- build/patches/Add-site-engagement-flag.patch | 8 +- ...-support-for-ISupportHelpAndFeedback.patch | 2 +- build/patches/Add-webGL-site-setting.patch | 14 +- build/patches/Add-webRTC-site-settings.patch | 8 +- ...ow-building-without-enable_reporting.patch | 28 +- .../Allow-playing-audio-in-background.patch | 16 +- ...ioBuffer-AnalyserNode-fp-mitigations.patch | 2 +- .../Automated-domain-substitution.patch | 14812 +++------------- ...Block-gateway-attacks-via-websockets.patch | 8 +- .../Block-qjz9zk-or-trk-requests.patch | 8 +- .../Bookmarks-select-all-menu-entry.patch | 10 +- build/patches/Bromite-auto-updater.patch | 12 +- .../Bromite-subresource-adblocker.patch | 30 +- ...-resolution-in-requestAnimationFrame.patch | 40 - build/patches/Client-hints-overrides.patch | 8 +- .../Content-settings-infrastructure.patch | 28 +- ...ctionary-suggestions-for-the-Omnibox.patch | 2 +- build/patches/Disable-AGSA-by-default.patch | 56 +- ...ble-Accessibility-service-by-default.patch | 2 +- .../patches/Disable-AsyncDNS-by-default.patch | 13 +- ...DRM-media-origin-IDs-preprovisioning.patch | 2 +- .../Disable-FLoC-and-privacy-sandbox.patch | 6 +- build/patches/Disable-PrivacyGuide.patch | 4 +- .../Disable-StartSurface-feature.patch | 2 +- build/patches/Disable-TLS-resumption.patch | 12 +- .../patches/Disable-all-predictors-code.patch | 18 +- build/patches/Disable-all-promo-dialogs.patch | 4 +- .../Disable-conversion-measurement-api.patch | 42 +- build/patches/Disable-crash-reporting.patch | 2 +- .../Disable-feeds-support-by-default.patch | 28 +- ...Disable-fetching-of-all-field-trials.patch | 8 +- build/patches/Disable-idle-detection.patch | 2 +- ...-lock-icon-in-address-bar-by-default.patch | 2 +- ...media-router-and-remoting-by-default.patch | 10 +- .../patches/Disable-plugins-enumeration.patch | 2 +- ...e-references-to-fonts.googleapis.com.patch | 2 +- build/patches/Disable-safe-browsing.patch | 298 +- build/patches/Disable-safety-check.patch | 10 +- .../Disable-smart-selection-by-default.patch | 12 +- ...isable-some-signed-exchange-features.patch | 2 +- .../Disable-text-fragments-by-default.patch | 22 +- .../Disable-third-party-origin-trials.patch | 14 +- build/patches/Disable-various-metrics.patch | 10 +- .../Do-not-build-API-keys-infobar.patch | 2 +- .../Do-not-hide-component-extensions.patch | 2 +- .../patches/Do-not-link-with-libatomic.patch | 2 +- .../Do-not-store-passwords-by-default.patch | 2 +- build/patches/DoH-improvements.patch | 2 +- .../Enable-Certificate-Transparency.patch | 16 +- build/patches/Enable-HEVC-by-default.patch | 6 +- ...-SPPI-for-devices-with-enough-memory.patch | 2 +- ...ctOriginIsolation-and-SitePerProcess.patch | 8 +- ...e-darken-websites-checkbox-in-themes.patch | 2 +- ...fwrapv-in-Clang-for-non-UBSan-builds.patch | 2 +- .../Enable-native-Android-autofill.patch | 60 +- ...-prefetch-privacy-changes-by-default.patch | 2 +- build/patches/Enable-share-intent.patch | 54 +- ...ble-third-party-storage-partitioning.patch | 8 +- .../Experimental-user-scripts-support.patch | 56 +- .../Guard-for-user-agent-reduction.patch | 2 +- ...story-number-of-days-privacy-setting.patch | 22 +- ...number-of-autocomplete-matches-to-10.patch | 4 +- ...ripts-for-AMP-tracking-ads-and-video.patch | 10 +- .../Invalidate-components-public-key.patch | 2 +- build/patches/JIT-site-settings.patch | 20 +- ...-allow-screenshots-in-Incognito-mode.patch | 2 +- build/patches/Logcat-crash-reports-UI.patch | 2 +- .../patches/Modify-default-preferences.patch | 46 +- .../Move-navigation-bar-to-bottom.patch | 315 +- .../Multiple-fingerprinting-mitigations.patch | 48 +- build/patches/Never-fetch-popular-sites.patch | 10 +- build/patches/OpenSearch-miscellaneous.patch | 6 +- .../patches/Override-Navigator-Language.patch | 2 +- .../Partition-Blink-memory-cache.patch | 12 +- .../Partition-blobs-by-top-frame-URL.patch | 50 +- .../patches/Re-introduce-kWebAuthCable.patch | 22 +- ...-modal-dialog-flag-to-close-all-tabs.patch | 24 +- ...e-introduce-override_build_timestamp.patch | 2 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 4 +- ...Reintroduce-override_build_timestamp.patch | 2 +- ...referrals-in-cross-origin-navigation.patch | 2 +- .../Remove-binary-blob-integrations.patch | 248 +- ...cklisted-URLs-upon-bookmark-creation.patch | 2 +- .../Remove-contextual-search-manager.patch | 165 +- build/patches/Remove-help-menu-item.patch | 4 +- .../Remove-navigator.connection-info.patch | 2 +- ...price-shopping-commerce-integrations.patch | 349 +- .../Remove-signin-and-sync-integrations.patch | 253 +- ...Remove-voice-recognition-integration.patch | 72 +- ...weblayer-dependency-on-Play-Services.patch | 2 +- ...ndow-name-on-cross-origin-navigation.patch | 4 +- .../Restore-Search-Ready-Omnibox-flag.patch | 42 +- .../Restore-Simplified-NTP-launch.patch | 22 +- ...-button-in-top-toolbar-customization.patch | 14 +- .../Restore-offline-indicator-v2-flag.patch | 28 +- ...Delete-block-external-form-redirects.patch | 18 +- ...emove-disable-pull-to-refresh-effect.patch | 8 +- ...vert-flags-remove-num-raster-threads.patch | 10 +- ...l-of-execution-context-address-space.patch | 22 +- ...moval-of-an-option-to-block-autoplay.patch | 16 +- ...tings-for-cookies-javascript-and-ads.patch | 6 +- build/patches/Site-setting-for-images.patch | 14 +- .../Switch-to-fstack-protector-strong.patch | 2 +- build/patches/Timezone-customization.patch | 44 +- build/patches/Unexpire-tab-groups-flags.patch | 32 +- build/patches/Update-i18n-zh_CN-support.patch | 12 +- .../Use-4-tile-rows-never-show-logo.patch | 2 +- build/patches/Use-dummy-DFM-installer.patch | 12 +- build/patches/User-agent-customization.patch | 26 +- build/patches/Welcome-screen.patch | 23 +- build/patches/autofill-miscellaneous.patch | 4 +- ...achine_learning-only-with-tflite_lib.patch | 30 + ...build-remove-calling-untrusted-hooks.patch | 23 +- .../disable-WebView-variations-support.patch | 2 +- .../enable-ftrivial-auto-var-init-zero.patch | 2 +- .../exit-on-failure-of-inclusion.patch | 2 +- build/patches/kill-Auth.patch | 8 +- build/patches/kill-Vision.patch | 2 +- ...nH264-enable-ARM-ARM64-optimizations.patch | 8 +- ...le-fetching-of-languages-from-server.patch | 4 +- .../ungoogled-chromium-Disable-Gaia.patch | 4 +- ...gled-chromium-Disable-profile-avatar.patch | 2 +- ...romium-Disable-translate-integration.patch | 2 +- ...ed-chromium-no-special-hosts-domains.patch | 4 +- ...RTC-do-not-expose-local-IP-addresses.patch | 2 +- ...iew-Hard-no-to-persistent-histograms.patch | 4 +- build/ruleset_converter.gn_args | 1 + 156 files changed, 3941 insertions(+), 14560 deletions(-) delete mode 100644 build/patches/Clamp-time-resolution-in-requestAnimationFrame.patch create mode 100644 build/patches/build-include-machine_learning-only-with-tflite_lib.patch diff --git a/build/LASTCHANGE b/build/LASTCHANGE index 8cd5f4f0..406017b0 100644 --- a/build/LASTCHANGE +++ b/build/LASTCHANGE @@ -1 +1 @@ -56775bdf8d12f9d3e1a99fcf1dde6a7417522963- \ No newline at end of file +cec76421893e88a89e38c0ab1356c84317b69067- \ No newline at end of file diff --git a/build/RELEASE b/build/RELEASE index 0f967c62..df3f4e3f 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -108.0.5359.156 \ No newline at end of file +109.0.5414.127 \ No newline at end of file diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT index dd312eec..89511d13 100644 --- a/build/RELEASE_COMMIT +++ b/build/RELEASE_COMMIT @@ -1 +1 @@ -1b133d62395a6ad11c65997a1c24acffb3f73d9e \ No newline at end of file +45d9f715605c58955812062372d27717b58d2c8f \ No newline at end of file diff --git a/build/bromite.gn_args b/build/bromite.gn_args index 8b6554b4..ec44771d 100644 --- a/build/bromite.gn_args +++ b/build/bromite.gn_args @@ -1,6 +1,7 @@ android_channel="stable" blink_symbol_level=1 build_contextual_search=false +build_with_internal_optimization_guide=false build_with_tflite_lib=false chrome_pgo_phase=0 dcheck_always_on=false diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 95deb1ec..f1d23b4d 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -197,8 +197,8 @@ Disable-add-to-home-screen-prompt.patch Remove-HTTP-referrals-in-cross-origin-navigation.patch Enable-ECH-by-default.patch Disable-StartSurface-feature.patch -Clamp-time-resolution-in-requestAnimationFrame.patch Enable-PermuteTLSExtensions-by-default.patch Enable-third-party-storage-partitioning.patch Restore-adaptive-button-in-top-toolbar-customization.patch +build-include-machine_learning-only-with-tflite_lib.patch Automated-domain-substitution.patch diff --git a/build/chromium.gn_args b/build/chromium.gn_args index 1536e4f1..696bf47e 100644 --- a/build/chromium.gn_args +++ b/build/chromium.gn_args @@ -1,6 +1,7 @@ android_channel="stable" blink_symbol_level=1 build_contextual_search=false +build_with_internal_optimization_guide=false build_with_tflite_lib=false chrome_pgo_phase=0 dcheck_always_on=false diff --git a/build/chromium_patches_list.txt b/build/chromium_patches_list.txt index 1f3b6fc9..6842e664 100644 --- a/build/chromium_patches_list.txt +++ b/build/chromium_patches_list.txt @@ -8,3 +8,4 @@ Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch enable-ftrivial-auto-var-init-zero.patch Disable-feeds-support-by-default.patch Chromium-package-name.patch +build-include-machine_learning-only-with-tflite_lib.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index e60d7ba1..fd0ff8e3 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -84,7 +84,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -2501,9 +2501,9 @@ +@@ -2515,9 +2515,9 @@ "expiry_milestone": 115 }, { @@ -231,7 +231,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -750,6 +750,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment, +@@ -758,6 +758,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment, // Allows automatically disabling hardware secure Content Decryption Module // (CDM) after failures or crashes to fallback to software secure CDMs. If this // feature is disabled, the fallback will never happen and users could be stuck @@ -246,11 +246,11 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.h b/media/base/media_switches.h --- a/media/base/media_switches.h +++ b/media/base/media_switches.h -@@ -232,6 +232,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); +@@ -235,6 +235,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); -+MEDIA_EXPORT BASE_DECLARE_FEATURE(kAImageReaderVideoOutput); ++MEDIA_EXPORT extern const base::Feature kAImageReaderVideoOutput; MEDIA_EXPORT BASE_DECLARE_FEATURE(kVp9kSVCHWDecoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kWakeLockOptimisationHiddenMuted); MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebContentsCaptureHiDpi); diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index 92a873d2..88018fb2 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -12,10 +12,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/browser/flag_descriptions.h | 3 +++ chrome/browser/flags/android/chrome_feature_list.cc | 5 +++++ chrome/browser/flags/android/chrome_feature_list.h | 1 + - .../chromium/chrome/browser/flags/CachedFeatureFlags.java | 1 + .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 3 +++ net/android/java/src/org/chromium/net/X509Util.java | 5 +++++ - 10 files changed, 31 insertions(+) + 9 files changed, 30 insertions(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java @@ -28,7 +27,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.printing.PrintManagerDelegateImpl; import org.chromium.printing.PrintingController; import org.chromium.printing.PrintingControllerImpl; -@@ -951,6 +952,8 @@ public abstract class ChromeActivity +@@ -961,6 +962,8 @@ public abstract class ChromeActivity UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); @@ -40,7 +39,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java -@@ -78,6 +78,7 @@ public class ChromeCachedFlags { +@@ -77,6 +77,7 @@ public class ChromeCachedFlags { add(ChromeFeatureList.sAndroidAuxiliarySearch); add(ChromeFeatureList.sAnonymousUpdateChecks); add(ChromeFeatureList.sAppMenuMobileSiteOption); @@ -51,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -8830,6 +8830,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8936,6 +8936,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)}, #endif // BUILDFLAG(IS_WIN) @@ -93,15 +92,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -148,6 +148,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &feed::kFeedNoViewCache, +@@ -153,6 +153,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &feed::kFeedReplaceAll, + &feed::kFeedShowSignInCommand, &feed::kInterestFeedContentSuggestions, + &kAllowUserCertificates, &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -468,6 +469,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents, +@@ -469,6 +470,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents, "AllowNewIncognitoTabIntents", base::FEATURE_ENABLED_BY_DEFAULT); @@ -123,21 +122,10 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser BASE_DECLARE_FEATURE(kAndroidScrollOptimizations); BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification); BASE_DECLARE_FEATURE(kAssistantConsentModal); -diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java ---- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java -+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java -@@ -50,6 +50,7 @@ public class CachedFeatureFlags { - ImmutableMap.builder() - .put(ChromeFeatureList.ANONYMOUS_UPDATE_CHECKS, true) - .put(ChromeFeatureList.APP_MENU_MOBILE_SITE_OPTION, false) -+ .put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false) - .put(ChromeFeatureList.BACK_GESTURE_REFACTOR, false) - .put(ChromeFeatureList.CCT_BRAND_TRANSPARENCY, false) - .put(ChromeFeatureList.CCT_INCOGNITO, true) diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -193,6 +193,7 @@ public abstract class ChromeFeatureList { +@@ -162,6 +162,7 @@ public abstract class ChromeFeatureList { } /* Alphabetical: */ @@ -145,8 +133,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 = -@@ -648,6 +649,8 @@ public abstract class ChromeFeatureList { - public static final String FEED_REPLACE_ALL = "FeedReplaceAll"; +@@ -612,6 +613,8 @@ public abstract class ChromeFeatureList { + "SkipServiceWorkerForInstallPromot"; /* Alphabetical: */ + public static final CachedFlag sAllowUserCertificates = diff --git a/build/patches/Add-English-only-search-engine.patch b/build/patches/Add-English-only-search-engine.patch index 178432f1..2380ed77 100644 --- a/build/patches/Add-English-only-search-engine.patch +++ b/build/patches/Add-English-only-search-engine.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json -@@ -137,6 +137,27 @@ +@@ -138,6 +138,27 @@ "id": 1 }, diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index 105ca155..7decc57a 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/patches/Add-IsCleartextPermitted-flag.patch @@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9070,6 +9070,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9171,6 +9171,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRequestDesktopSiteExceptionsName, flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, @@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1710,6 +1710,10 @@ const char kHttpsOnlyModeDescription[] = +@@ -1651,6 +1651,10 @@ const char kHttpsOnlyModeDescription[] = "Adds a setting under chrome://settings/security to opt-in to HTTPS-First " "Mode."; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -960,6 +960,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; +@@ -935,6 +935,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; extern const char kHttpsOnlyModeName[]; extern const char kHttpsOnlyModeDescription[]; diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 9469d8f9..2eef7b0a 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -187,7 +187,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -165,6 +165,8 @@ +@@ -167,6 +167,8 @@ #include "rlz/buildflags/buildflags.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -196,7 +196,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #if BUILDFLAG(ENABLE_BACKGROUND_MODE) #include "chrome/browser/background/background_mode_manager.h" #endif -@@ -1013,6 +1015,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1055,6 +1057,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { chrome::enterprise_util::RegisterLocalStatePrefs(registry); component_updater::RegisterPrefs(registry); embedder_support::OriginTrialPrefs::RegisterPrefs(registry); @@ -641,7 +641,7 @@ new file mode 100644 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -285,6 +285,8 @@ static_library("ui") { +@@ -287,6 +287,8 @@ static_library("ui") { "webui/metrics_internals/metrics_internals_ui.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -661,7 +661,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "chrome/browser/ui/webui/predictors/predictors_ui.h" #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h" #include "chrome/browser/ui/webui/signin_internals_ui.h" -@@ -795,6 +796,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -801,6 +802,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -1141,7 +1141,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons const char kChromeUIChromeURLsHost[] = "chrome-urls"; const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/"; const char kChromeUIComponentsHost[] = "components"; -@@ -439,6 +441,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -446,6 +448,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { kChromeUILockScreenNetworkHost, kChromeUILockScreenStartReauthHost, kChromeUIMobileSetupHost, @@ -1149,7 +1149,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kChromeUIMultiDeviceSetupHost, kChromeUINetworkHost, kChromeUINotificationTesterHost, -@@ -704,6 +707,7 @@ const char* const kChromeHostURLs[] = { +@@ -718,6 +721,7 @@ const char* const kChromeHostURLs[] = { #if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index b2dd4d11..eda4fd14 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -93,7 +93,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -652,6 +652,7 @@ chrome_java_resources = [ +@@ -650,6 +650,7 @@ chrome_java_resources = [ "java/res/xml/main_preferences.xml", "java/res/xml/manage_sync_preferences.xml", "java/res/xml/phone_as_a_security_key_accessory_filter.xml", @@ -112,7 +112,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java", "java/src/org/chromium/chrome/browser/ActivityTabProvider.java", "java/src/org/chromium/chrome/browser/ActivityUtils.java", -@@ -914,6 +915,7 @@ chrome_java_sources = [ +@@ -907,6 +908,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java", @@ -246,7 +246,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout; -@@ -578,8 +579,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1839,6 +1840,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -312,7 +312,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App /** * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu * items based on activity state. -@@ -560,6 +565,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -567,6 +572,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) { @@ -326,7 +326,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App // We have to iterate all menu items since same menu item ID may be associated with more // than one menu items. boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU; -@@ -636,7 +648,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -641,7 +653,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } if (item.getItemId() == R.id.recent_tabs_menu_id) { @@ -343,7 +343,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App } if (item.getItemId() == R.id.menu_group_tabs) { item.setVisible(isMenuGroupTabsVisible); -@@ -876,7 +896,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -878,7 +898,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate // is not persisted when adding to the homescreen. // * If creating shortcuts it not supported by the current home screen. return WebappsUtils.isAddToHomeIntentSupported() && !isChromeScheme && !isFileScheme @@ -365,7 +365,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType; -@@ -364,6 +365,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -355,6 +356,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { boolean hasSaveImage = false; mShowEphemeralTabNewLabel = null; @@ -375,7 +375,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr List> groupedItems = new ArrayList<>(); if (mParams.isAnchor()) { -@@ -382,6 +386,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -373,6 +377,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP)); } } @@ -383,7 +383,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) { linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB)); } -@@ -406,7 +411,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -397,7 +402,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { } } if (FirstRunStatus.getFirstRunFlowComplete()) { @@ -461,7 +461,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; -@@ -855,7 +858,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -884,7 +887,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid @Override public boolean isIncognito() { @@ -473,7 +473,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java -@@ -34,6 +34,7 @@ import org.chromium.base.annotations.NativeMethods; +@@ -33,6 +33,7 @@ import org.chromium.base.annotations.NativeMethods; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.R; @@ -481,7 +481,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.app.download.home.DownloadActivity; -@@ -74,6 +75,10 @@ import org.chromium.url.GURL; +@@ -73,6 +74,10 @@ import org.chromium.url.GURL; import java.io.File; @@ -492,7 +492,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo /** * A class containing some utility static methods. */ -@@ -318,7 +323,16 @@ public class DownloadUtils { +@@ -317,7 +322,16 @@ public class DownloadUtils { // Offline pages isn't supported in Incognito. This should be checked before calling // OfflinePageBridge.getForProfile because OfflinePageBridge instance will not be found // for incognito profile. @@ -841,7 +841,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; -@@ -254,6 +255,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -253,6 +254,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity if (fragment instanceof AdPersonalizationRemovedFragment) { ((AdPersonalizationRemovedFragment) fragment).setSnackbarManager(getSnackbarManager()); } @@ -963,7 +963,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -122,6 +122,8 @@ import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFacto +@@ -121,6 +121,8 @@ import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFacto import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.DeviceFormFactor; @@ -972,7 +972,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.ui.base.IntentRequestTracker; import org.chromium.ui.modaldialog.ModalDialogManager; -@@ -482,7 +484,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -491,7 +493,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mAppMenuCoordinator == null ? null : mAppMenuCoordinator.getAppMenuHandler(); mEmptyBackgroundViewWrapper = new EmptyBackgroundViewWrapper(mTabModelSelectorSupplier.get(), @@ -995,7 +995,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome /** * This class creates various kinds of new tabs and adds them to the right {@link TabModel}. */ -@@ -312,7 +316,6 @@ public class ChromeTabCreator extends TabCreator { +@@ -326,7 +330,6 @@ public class ChromeTabCreator extends TabCreator { // TODO(crbug.com/1081924): Clean up the launches from SearchActivity/Chrome. public Tab launchUrlFromExternalApp( LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) { @@ -1052,7 +1052,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -38,6 +38,7 @@ import org.chromium.base.supplier.OneshotSupplier; +@@ -37,6 +37,7 @@ import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; @@ -1060,7 +1060,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController; import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton; -@@ -523,7 +524,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -520,7 +521,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve return ret; } }, @@ -1118,7 +1118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4837,6 +4837,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4870,6 +4870,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOfflinePagesLivePageSharingName, flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid, FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)}, @@ -1228,9 +1228,9 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c #include "components/content_settings/core/browser/content_settings_pref_provider.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/permissions/features.h" -@@ -95,9 +96,23 @@ scoped_refptr - if (profile->IsOffTheRecord() && !profile->IsGuestSession()) - GetForProfile(original_profile); +@@ -112,9 +113,23 @@ scoped_refptr + should_record_metrics && ash::ProfileHelper::IsUserProfile(profile); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + bool always_incognito_enabled = false; + bool force_save_site_settings = false; @@ -1250,10 +1250,10 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c - profile->IsOffTheRecord() || profile->IsGuestSession(), + !force_save_site_settings && (profile->IsOffTheRecord() || profile->IsGuestSession()), + force_save_site_settings, - /*store_last_modified=*/true, - profile->ShouldRestoreOldSessionCookies())); + /*store_last_modified=*/true, profile->ShouldRestoreOldSessionCookies(), + should_record_metrics)); -@@ -107,6 +122,9 @@ scoped_refptr +@@ -124,6 +139,9 @@ scoped_refptr HostContentSettingsMap::WEBUI_ALLOWLIST_PROVIDER, std::move(allowlist_provider)); @@ -1266,7 +1266,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3907,6 +3907,12 @@ const char kOfflinePagesLivePageSharingDescription[] = +@@ -3815,6 +3815,12 @@ const char kOfflinePagesLivePageSharingDescription[] = "Enables to share current loaded page as offline page by saving as MHTML " "first."; @@ -1282,7 +1282,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2227,6 +2227,9 @@ extern const char kNotificationPermissionRationaleDescription[]; +@@ -2189,6 +2189,9 @@ extern const char kNotificationPermissionRationaleDescription[]; extern const char kOfflinePagesLivePageSharingName[]; extern const char kOfflinePagesLivePageSharingDescription[]; @@ -1295,7 +1295,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -561,8 +561,8 @@ BASE_FEATURE(kCCTNewDownloadTab, +@@ -562,8 +562,8 @@ BASE_FEATURE(kCCTNewDownloadTab, BASE_FEATURE(kCCTIncognito, "CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kCCTIncognitoAvailableToThirdParty, @@ -1319,7 +1319,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo #else #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -459,6 +462,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -473,6 +476,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { history::HistoryService* HistoryTabHelper::GetHistoryService() { Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); @@ -1333,7 +1333,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo if (profile->IsOffTheRecord()) return nullptr; -@@ -466,6 +476,14 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -480,6 +490,14 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -1357,10 +1357,10 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor #include "content/public/browser/web_contents_user_data.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" + #include "third_party/abseil-cpp/absl/types/optional.h" namespace history { - struct HistoryAddPageArgs; -@@ -51,6 +53,11 @@ class HistoryTabHelper +@@ -52,6 +54,11 @@ class HistoryTabHelper force_eligible_tab_for_testing_ = force; } @@ -1372,7 +1372,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor private: explicit HistoryTabHelper(content::WebContents* web_contents); friend class content::WebContentsUserData; -@@ -83,9 +90,6 @@ class HistoryTabHelper +@@ -84,9 +91,6 @@ class HistoryTabHelper void OnLanguageDetermined( const translate::LanguageDetectionDetails& details) override; @@ -1620,7 +1620,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -229,6 +229,7 @@ +@@ -230,6 +230,7 @@ #include "components/feed/core/shared_prefs/pref_names.h" #if BUILDFLAG(IS_ANDROID) @@ -1628,7 +1628,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" #include "chrome/browser/android/explore_sites/history_statistics_reporter.h" #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" -@@ -1390,6 +1391,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1437,6 +1438,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); @@ -1637,8 +1637,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse + /*default_value=*/false); + HistoryTabHelper::RegisterProfilePrefs(registry); #else // BUILDFLAG(IS_ANDROID) - AppShortcutManager::RegisterProfilePrefs(registry); browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); + BrowserFeaturePromoSnoozeService::RegisterProfilePrefs(registry); diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/android/native_page/BUILD.gn --- a/chrome/browser/ui/android/native_page/BUILD.gn +++ b/chrome/browser/ui/android/native_page/BUILD.gn @@ -1744,9 +1744,9 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java @@ -178,6 +178,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro - protected GURL mVisibleGurl = GURL.emptyGURL(); protected String mFormattedFullUrl; protected String mUrlForDisplay; + private boolean mOmniboxUpdatedConnectionSecurityIndicatorsEnabled; + private boolean mIsAlwaysIncognito; /** @@ -1775,9 +1775,9 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow mOptimizationsEnabled = - ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_SCROLL_OPTIMIZATIONS); + ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_SCROLL_OPTIMIZATIONS) && !mIsAlwaysIncognito; + mOmniboxUpdatedConnectionSecurityIndicatorsEnabled = ChromeFeatureList.isEnabled( + ChromeFeatureList.OMNIBOX_UPDATED_CONNECTION_SECURITY_INDICATORS); mLastUsedNonOTRProfile = Profile.getLastUsedRegularProfile(); - mNativeLocationBarModelAndroid = LocationBarModelJni.get().init(LocationBarModel.this); - diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn --- a/chrome/browser/ui/messages/android/BUILD.gn +++ b/chrome/browser/ui/messages/android/BUILD.gn @@ -1824,7 +1824,7 @@ new file mode 100644 diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -3458,6 +3458,12 @@ const char kShowCaretBrowsingDialog[] = +@@ -3451,6 +3451,12 @@ const char kShowCaretBrowsingDialog[] = const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; #endif @@ -1840,7 +1840,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -1219,6 +1219,8 @@ extern const char kDiscountConsentShowInterestIn[]; +@@ -1224,6 +1224,8 @@ extern const char kDiscountConsentShowInterestIn[]; #if BUILDFLAG(IS_ANDROID) extern const char kWebXRImmersiveArEnabled[]; @@ -1849,7 +1849,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1256,6 +1258,10 @@ extern const char kPrivacyGuideViewed[]; +@@ -1262,6 +1264,10 @@ extern const char kPrivacyGuideViewed[]; extern const char kCorsNonWildcardRequestHeadersSupport[]; @@ -1909,15 +1909,15 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc -@@ -243,6 +243,7 @@ const char* ContentSettingToString(ContentSetting setting) { - HostContentSettingsMap::HostContentSettingsMap( - PrefService* prefs, - bool is_off_the_record, +@@ -243,6 +243,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, + bool is_off_the_record, + bool store_last_modified, + bool restore_session, + bool force_save_site_settings, - bool store_last_modified, - bool restore_session) + bool should_record_metrics) : RefcountedKeyedService(base::ThreadTaskRunnerHandle::Get()), -@@ -251,6 +252,7 @@ HostContentSettingsMap::HostContentSettingsMap( + #ifndef NDEBUG +@@ -250,6 +251,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, #endif prefs_(prefs), is_off_the_record_(is_off_the_record), @@ -1925,7 +1925,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. store_last_modified_(store_last_modified), allow_invalid_secondary_pattern_for_testing_(false) { TRACE_EVENT0("startup", "HostContentSettingsMap::HostContentSettingsMap"); -@@ -262,7 +264,7 @@ HostContentSettingsMap::HostContentSettingsMap( +@@ -261,7 +263,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, policy_provider->AddObserver(this); auto pref_provider_ptr = std::make_unique( @@ -1943,9 +1943,9 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. bool is_off_the_record, + bool force_save_site_settings, bool store_last_modified, - bool restore_session); - -@@ -442,6 +443,8 @@ class HostContentSettingsMap : public content_settings::Observer, + bool restore_session, + bool should_record_metrics); +@@ -443,6 +444,8 @@ class HostContentSettingsMap : public content_settings::Observer, // Whether this settings map is for an incognito or guest session. bool is_off_the_record_; @@ -2003,7 +2003,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/compone diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc --- a/components/omnibox/browser/base_search_provider.cc +++ b/components/omnibox/browser/base_search_provider.cc -@@ -273,7 +273,7 @@ bool BaseSearchProvider::CanSendZeroSuggestRequest( +@@ -274,7 +274,7 @@ bool BaseSearchProvider::CanSendZeroSuggestRequest( } // Don't make a suggest request if in incognito mode. @@ -2015,7 +2015,7 @@ diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omn diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc --- a/components/omnibox/browser/search_provider.cc +++ b/components/omnibox/browser/search_provider.cc -@@ -832,7 +832,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const { +@@ -822,7 +822,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const { // keyword input to a keyword suggest server, if any.) const TemplateURL* default_url = providers_.GetDefaultProviderURL(); const TemplateURL* keyword_url = providers_.GetKeywordProviderURL(); @@ -2035,7 +2035,7 @@ diff --git a/weblayer/browser/host_content_settings_map_factory.cc b/weblayer/br user_prefs::UserPrefs::Get(context), context->IsOffTheRecord(), + /*force_save_site_settings*/false, /*store_last_modified=*/true, - /*restore_session=*/false); - + /*restore_session=*/false, + /*should_record_metrics=*/!context->IsOffTheRecord()); -- 2.25.1 diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 540aa606..810333a4 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -198,7 +198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } SelectionDelegate selectionDelegate = mDelegate.getSelectionDelegate(); -@@ -135,6 +141,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -149,6 +155,8 @@ public class BookmarkActionBar extends SelectableListToolbar void showLoadingUi() { setTitle(null); setNavigationButton(NAVIGATION_BUTTON_NONE); @@ -207,7 +207,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.edit_menu_id).setVisible(false); } -@@ -144,6 +152,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -158,6 +166,8 @@ public class BookmarkActionBar extends SelectableListToolbar super.showNormalView(); if (mDelegate == null) { @@ -216,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.edit_menu_id).setVisible(false); } -@@ -173,6 +183,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -187,6 +197,8 @@ public class BookmarkActionBar extends SelectableListToolbar @Override public void onFolderStateSet(BookmarkId folder) { mCurrentFolder = mDelegate.getModel().getBookmarkById(folder); @@ -249,7 +249,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import android.text.TextUtils; import android.util.Pair; -@@ -42,6 +55,32 @@ import java.util.HashMap; +@@ -40,6 +53,32 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -282,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * Provides the communication channel for Android to fetch and manipulate the * bookmark model stored in native. -@@ -442,6 +481,209 @@ class BookmarkBridge { +@@ -405,6 +444,209 @@ class BookmarkBridge { mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType()); } @@ -492,7 +492,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * Synchronously gets a list of bookmarks that match the specified search query. * @param query Keyword used for searching bookmarks. -@@ -990,6 +1232,39 @@ class BookmarkBridge { +@@ -869,6 +1111,39 @@ class BookmarkBridge { depthList.add(depth); } @@ -532,7 +532,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private static List> createPairsList(int[] left, int[] right) { List> pairList = new ArrayList>(); for (int i = 0; i < left.length; i++) { -@@ -1061,6 +1336,9 @@ class BookmarkBridge { +@@ -901,6 +1176,9 @@ class BookmarkBridge { int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type); void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type, List bookmarksList); @@ -704,7 +704,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1887,6 +1887,13 @@ static_library("browser") { +@@ -1877,6 +1877,13 @@ static_library("browser") { ] } @@ -718,16 +718,16 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -2904,6 +2911,8 @@ static_library("browser") { - "autofill/manual_filling_controller.h", - "autofill/manual_filling_controller_impl.cc", - "autofill/manual_filling_controller_impl.h", +@@ -2894,6 +2901,8 @@ static_library("browser") { + "content_creation/reactions/internal/reaction_service_factory.h", + "content_settings/request_desktop_site_web_contents_observer_android.cc", + "content_settings/request_desktop_site_web_contents_observer_android.h", + "bookmarks/bookmark_html_writer.cc", + "bookmarks/bookmark_html_writer.h", - "autofill/manual_filling_utils.cc", - "autofill/manual_filling_utils.h", - "autofill/manual_filling_view_interface.h", -@@ -3583,8 +3592,6 @@ static_library("browser") { + "crash_upload_list/crash_upload_list_android.cc", + "crash_upload_list/crash_upload_list_android.h", + "creator/android/creator_api_bridge.cc", +@@ -3551,8 +3560,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", @@ -739,7 +739,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9039,6 +9039,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9140,6 +9140,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, #endif @@ -755,7 +755,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc -@@ -60,6 +60,25 @@ +@@ -55,6 +55,25 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" @@ -781,7 +781,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse using base::android::AttachCurrentThread; using base::android::ConvertUTF16ToJavaString; using base::android::ConvertUTF8ToJavaString; -@@ -77,8 +96,92 @@ using bookmarks::android::JavaBookmarkIdGetType; +@@ -72,8 +91,92 @@ using bookmarks::android::JavaBookmarkIdGetType; using content::BrowserThread; using power_bookmarks::PowerBookmarkMeta; @@ -874,7 +874,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse class BookmarkTitleComparer { public: explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge, -@@ -164,6 +267,10 @@ BookmarkBridge::~BookmarkBridge() { +@@ -158,6 +261,10 @@ BookmarkBridge::~BookmarkBridge() { if (partner_bookmarks_shim_) partner_bookmarks_shim_->RemoveObserver(this); reading_list_manager_->RemoveObserver(this); @@ -885,7 +885,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef&) { -@@ -574,6 +681,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -568,6 +675,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -1079,7 +1079,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_observer.h" #include "chrome/browser/reading_list/android/reading_list_manager.h" -@@ -27,6 +28,9 @@ +@@ -26,6 +27,9 @@ #include "components/prefs/pref_change_registrar.h" #include "url/android/gurl_android.h" @@ -1089,7 +1089,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser namespace bookmarks { class BookmarkModel; class ManagedBookmarkService; -@@ -42,7 +46,8 @@ class Profile; +@@ -40,7 +44,8 @@ class Profile; class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, public PartnerBookmarksShim::Observer, public ReadingListManager::Observer, @@ -1099,7 +1099,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser public: BookmarkBridge(JNIEnv* env, const base::android::JavaRef& obj, -@@ -62,6 +67,12 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -60,6 +65,12 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, bool IsDoingExtensiveChanges(JNIEnv* env, const base::android::JavaParamRef& obj); @@ -1112,7 +1112,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser jboolean IsEditBookmarksEnabled(JNIEnv* env); void LoadEmptyPartnerBookmarkShimForTesting( -@@ -159,6 +170,15 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -157,6 +168,15 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, jlong id, jint type); @@ -1128,7 +1128,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser void SetBookmarkTitle(JNIEnv* env, const base::android::JavaParamRef& obj, jlong id, -@@ -372,12 +392,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -348,12 +368,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, void DestroyJavaObject(); raw_ptr profile_; @@ -1145,7 +1145,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser // Information about the Partner bookmarks (must check for IsLoaded()). // This is owned by profile. -@@ -389,6 +413,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -365,6 +389,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, // Observes the profile destruction and creation. base::ScopedObservation profile_observation_{this}; @@ -1153,9 +1153,9 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser + void FileSelectedImplOnUIThread(const base::FilePath& path, + const std::string& contents); + - // A means of accessing metadata about bookmarks. - raw_ptr opt_guide_; - + // Weak pointers for creating callbacks that won't call into a destroyed + // object. + base::WeakPtrFactory weak_ptr_factory_; diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -1251,7 +1251,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6836,6 +6836,11 @@ const char kVcControlsUiDescription[] = +@@ -6643,6 +6643,11 @@ const char kVcControlsUiDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1266,7 +1266,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3942,6 +3942,9 @@ extern const char kDisableLacrosTtsSupportDescription[]; +@@ -3851,6 +3851,9 @@ extern const char kDisableLacrosTtsSupportDescription[]; extern const char kVcControlsUiName[]; extern const char kVcControlsUiDescription[]; @@ -1279,7 +1279,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -181,6 +181,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -186,6 +186,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kCastDeviceFilter, &kClearOmniboxFocusAfterNavigation, &kCloseTabSuggestions, @@ -1287,7 +1287,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCriticalPersistedTabData, &kCommerceCoupons, &kCCTBackgroundTab, -@@ -1114,6 +1115,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent, +@@ -1107,6 +1108,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent, "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT); @@ -1302,7 +1302,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -161,6 +161,7 @@ BASE_DECLARE_FEATURE(kDiscoverFeedMultiColumn); +@@ -158,6 +158,7 @@ BASE_DECLARE_FEATURE(kDiscoverFeedMultiColumn); BASE_DECLARE_FEATURE(kTabStripRedesign); BASE_DECLARE_FEATURE(kTabSwitcherOnReturn); BASE_DECLARE_FEATURE(kTabToGTSAnimation); @@ -1313,7 +1313,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -620,6 +620,7 @@ public abstract class ChromeFeatureList { +@@ -580,6 +580,7 @@ public abstract class ChromeFeatureList { public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID = "UseLibunwindstackNativeUnwinderAndroid"; public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy"; @@ -1391,7 +1391,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** * Whether Chrome is set as the default browser. -@@ -1049,6 +1051,7 @@ public final class ChromePreferenceKeys { +@@ -1037,6 +1039,7 @@ public final class ChromePreferenceKeys { AUTOFILL_ASSISTANT_PROACTIVE_HELP_ENABLED, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, @@ -1601,10 +1601,10 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui boolean shouldUsePhotoPicker = shouldUsePhotoPicker(); - if (shouldUsePhotoPicker) { + if (shouldUsePhotoPicker || shouldShowHtmlTypes()) { - if (BuildInfo.isAtLeastT()) { - if (!window.hasPermission(PermissionConstants.READ_MEDIA_IMAGES) - && shouldShowImageTypes()) { -@@ -325,7 +332,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick + // The permission scenario for accessing media has evolved a bit over the years: + // Early on, READ_EXTERNAL_STORAGE was required to access media, but that permission was + // later deprecated. In its place (starting with Android T) READ_MEDIA_IMAGES and +@@ -333,7 +340,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick } // TODO(finnur): Remove once we figure out the cause of crbug.com/950024. @@ -1613,7 +1613,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui if (permissions.length != requestPermissions.length) { throw new RuntimeException( String.format("Permissions arrays misaligned: %d != %d", -@@ -339,7 +346,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -347,7 +354,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick } } @@ -1622,7 +1622,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui if (permissions[i].equals(storagePermission) || permissions[i].equals(PermissionConstants.READ_MEDIA_IMAGES) || permissions[i].equals( -@@ -544,6 +551,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -553,6 +560,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick } if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType); } @@ -1630,7 +1630,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui return mimeTypes; } -@@ -872,6 +880,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -881,6 +889,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick return countAcceptTypesFor(superType) == mFileTypes.size(); } @@ -1644,9 +1644,9 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/strings/android_ui_strings.grd --- a/ui/android/java/strings/android_ui_strings.grd +++ b/ui/android/java/strings/android_ui_strings.grd -@@ -181,6 +181,9 @@ - - Unable to open the photo picker +@@ -184,6 +184,9 @@ + + Unable to select media due to denied permissions + + Failed to save selected file diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index c188fbaf..bb01c676 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis // Since configureIntentForResizableCustomTab() might change the componenet/class // associated with the passed intent, it needs to be called after #setClassName(context, // CustomTabActivity.class.getName()); -@@ -433,6 +443,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -438,6 +448,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega if (Intent.ACTION_VIEW.equals(newIntent.getAction()) && !IntentHandler.wasIntentSenderChrome(newIntent)) { @@ -196,7 +196,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -4788,6 +4788,21 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Show original diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 1454b425..d79ef230 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -190,6 +193,9 @@ found in the LICENSE file. +@@ -187,6 +190,9 @@ found in the LICENSE file. @@ -59,7 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLife diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -224,6 +224,8 @@ import java.util.HashSet; +@@ -225,6 +225,8 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct /** * This is the main activity for ChromeMobile when not running in document mode. All the tabs * are accessible via a chrome specific tab switching UI. -@@ -2188,6 +2190,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2332,6 +2333,11 @@ public abstract class ChromeActivity return true; } diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index 9ea09477..4404906f 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -525,6 +525,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { +@@ -539,6 +539,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID) @@ -40,7 +40,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = { {"mode", "always-none"}}; const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNewTab[] = { -@@ -4371,7 +4387,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4428,7 +4444,11 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsLinux | kOsWin, FEATURE_VALUE_TYPE(features::kSystemNotifications)}, #endif // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -65,7 +65,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/metrics/histogram_functions.h" -@@ -338,6 +340,15 @@ AutocompleteController::AutocompleteController( +@@ -337,6 +339,15 @@ AutocompleteController::AutocompleteController( is_cros_launcher_(is_cros_launcher), search_service_worker_signal_sent_(false), template_url_service_(provider_client_->GetTemplateURLService()) { @@ -105,7 +105,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/ #include "base/feature_list.h" #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" -@@ -677,6 +678,9 @@ void SearchProvider::Run(bool query_is_private) { +@@ -671,6 +672,9 @@ void SearchProvider::Run(bool query_is_private) { } void SearchProvider::DoHistoryQuery(bool minimal_changes) { diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index 14aafb4e..0e225f29 100644 --- a/build/patches/Add-flag-for-save-data-header.patch +++ b/build/patches/Add-flag-for-save-data-header.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4981,7 +4981,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5018,7 +5018,10 @@ const FeatureEntry kFeatureEntries[] = { {"force-text-direction", flag_descriptions::kForceTextDirectionName, flag_descriptions::kForceTextDirectionDescription, kOsAll, MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, @@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1261,6 +1261,10 @@ const char kDeprecateAltBasedSixPackDescription[] = +@@ -1222,6 +1222,10 @@ const char kDeprecateAltBasedSixPackDescription[] = "Show deprecation notifications and disable functionality for Alt based " "six pack deprecations. The Search based versions continue to work."; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -662,6 +662,9 @@ extern const char kDeprecateAltClickDescription[]; +@@ -650,6 +650,9 @@ extern const char kDeprecateAltClickDescription[]; extern const char kDeprecateAltBasedSixPackName[]; extern const char kDeprecateAltBasedSixPackDescription[]; diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch index cbff4376..534ae2e5 100644 --- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1040,6 +1040,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { +@@ -1097,6 +1097,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { switches::kForceDisplayColorProfile, "hdr10"}, }; @@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kMemlogModeChoices[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode, -@@ -4884,6 +4889,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4917,6 +4922,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAndroidPictureInPictureAPIName, flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid, FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)}, @@ -46,7 +46,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1875,6 +1875,10 @@ const char kUnthrottledNestedTimeoutDescription[] = +@@ -1830,6 +1830,10 @@ const char kUnthrottledNestedTimeoutDescription[] = "websites abusing the API will still eventually have their setTimeouts " "clamped."; @@ -60,7 +60,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1050,6 +1050,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -1037,6 +1037,9 @@ extern const char kLogJsConsoleMessagesDescription[]; extern const char kUnthrottledNestedTimeoutName[]; extern const char kUnthrottledNestedTimeoutDescription[]; diff --git a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch index 2910990c..1bf1d702 100644 --- a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch +++ b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3661,6 +3661,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3730,6 +3730,10 @@ const FeatureEntry kFeatureEntries[] = { SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)}, #endif // ENABLE_EXTENSIONS #if BUILDFLAG(IS_ANDROID) @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1363,6 +1363,11 @@ const char kEnablePenetratingImageSelectionDescription[] = +@@ -1317,6 +1317,11 @@ const char kEnablePenetratingImageSelectionDescription[] = "Enables image options to be surfaced in the context menu for nodes " "covered by transparent overlays."; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -744,6 +744,9 @@ extern const char kEnablePortalsDescription[]; +@@ -722,6 +722,9 @@ extern const char kEnablePortalsDescription[]; extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginDescription[]; @@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -302,12 +302,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad, +@@ -316,12 +316,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad, // Let videos be resumed via remote controls (for example, the notification) // when in background. BASE_FEATURE(kResumeBackgroundVideo, diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index e0bf9c84..d98c50d8 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -6036,6 +6036,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6166,6 +6166,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName, flag_descriptions::kReaderModeInCCTDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3578,6 +3578,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] = +@@ -3517,6 +3517,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] = "Enables sending real-time engagement signals (e.g. scroll) through " "CustomTabsCallback."; @@ -45,7 +45,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -807,6 +807,9 @@ extern const char kEnableWasmLazyCompilationName[]; +@@ -788,6 +788,9 @@ extern const char kEnableWasmLazyCompilationName[]; extern const char kEnableWasmLazyCompilationDescription[]; extern const char kEnableWasmTieringName[]; @@ -109,7 +109,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc #include "net/log/net_log_with_source.h" #include "net/socket/client_socket_factory.h" #include "net/socket/datagram_client_socket.h" -@@ -3727,8 +3728,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -3758,8 +3759,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { if (last_ipv6_probe_time_.is_null() || (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { diff --git a/build/patches/Add-flag-to-disable-external-intent-requests.patch b/build/patches/Add-flag-to-disable-external-intent-requests.patch index 7c29ed67..937e35f7 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3621,6 +3621,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3692,6 +3692,9 @@ const FeatureEntry kFeatureEntries[] = { {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, flag_descriptions::kUiPartialSwapDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, @@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3966,6 +3966,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; +@@ -3874,6 +3874,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; const char kPhotoPickerVideoSupportDescription[] = "Enables video files to be shown in the Photo Picker dialog"; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2274,6 +2274,9 @@ extern const char kQueryTilesNTPDescription[]; +@@ -2236,6 +2236,9 @@ extern const char kQueryTilesNTPDescription[]; extern const char kQueryTilesOnStartName[]; extern const char kQueryTilesOnStartDescription[]; extern const char kQueryTilesSingleTierName[]; diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch index 5ed4c84b..888ac72a 100644 --- a/build/patches/Add-flag-to-disable-vibration.patch +++ b/build/patches/Add-flag-to-disable-vibration.patch @@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7467,6 +7467,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7623,6 +7623,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)}, #endif @@ -33,8 +33,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6463,6 +6463,9 @@ extern const char kLacrosScreenCoordinatesDescription[]; - +@@ -6271,6 +6271,9 @@ const char kLacrosScreenCoordinatesEnabledDescription[] = + "moveBy, moveTo or session restore."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) +const char kEnableVibrationName[] = "Vibration"; @@ -46,7 +46,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3938,6 +3938,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; +@@ -3847,6 +3847,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; extern const char kWebUITabStripTabDragIntegrationDescription[]; #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH) @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -101,6 +101,7 @@ void SetRuntimeFeatureDefaultsForPlatform( +@@ -102,6 +102,7 @@ void SetRuntimeFeatureDefaultsForPlatform( #if BUILDFLAG(IS_ANDROID) if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) WebRuntimeFeatures::EnableMediaSession(false); @@ -69,13 +69,13 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -130,6 +130,11 @@ BASE_FEATURE(kBackForwardCacheMemoryControls, +@@ -131,6 +131,11 @@ BASE_FEATURE(kBackForwardCacheMemoryControls, #endif ); +// Enables vibration; an user gesture will still be required if enabled. +BASE_FEATURE(kVibration, -+ "Vibration", ++ "Vibration", + base::FEATURE_DISABLED_BY_DEFAULT); + // When this feature is enabled, private network requests initiated from @@ -88,7 +88,7 @@ diff --git a/content/public/common/content_features.h b/content/public/common/co kCompositorLockTimeout; #endif // BUILDFLAG(IS_ANDROID) -+CONTENT_EXPORT BASE_DECLARE_FEATURE(kVibration); ++CONTENT_EXPORT extern const base::Feature kVibration; + #if BUILDFLAG(IS_MAC) @@ -141,7 +141,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1827,6 +1827,10 @@ +@@ -1903,6 +1903,10 @@ name: "OrientationEvent", status: {"Android": "stable"}, }, diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch index 7cf564ee..e414d289 100644 --- a/build/patches/Add-lifetime-options-for-permissions.patch +++ b/build/patches/Add-lifetime-options-for-permissions.patch @@ -181,8 +181,8 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/c diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -411,10 +411,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - LacrosFirstRunServiceFactory::GetInstance(); +@@ -415,10 +415,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + FirstRunServiceFactory::GetInstance(); #endif LanguageModelManagerFactory::GetInstance(); - if (base::FeatureList::IsEnabled( @@ -190,13 +190,13 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc - LastTabStandingTrackerFactory::GetInstance(); - } + LastTabStandingTrackerFactory::GetInstance(); - login_detection::LoginDetectionKeyedServiceFactory::GetInstance(); #if !BUILDFLAG(IS_ANDROID) - LoginUIServiceFactory::GetInstance(); + captions::LiveCaptionControllerFactory::GetInstance(); + if (base::FeatureList::IsEnabled(media::kLiveTranslate)) diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -491,6 +491,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -487,6 +487,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { PolicyAuditorBridge::CreateForWebContents(web_contents); PluginObserverAndroid::CreateForWebContents(web_contents); video_tutorials::VideoTutorialTabHelper::CreateForWebContents(web_contents); @@ -270,7 +270,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c private void setUpClearDataPreference() { ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA); long usage = mSite.getTotalUsage(); -@@ -963,6 +969,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -970,6 +976,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment if (contentType == mHighlightedPermission) { switchPreference.setBackgroundColor(mHighlightColor); } @@ -454,7 +454,7 @@ diff --git a/components/content_settings/core/common/content_settings_constraint diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java --- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java -@@ -360,9 +360,9 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr +@@ -344,9 +344,9 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr */ @CalledByNative private void addPermissionSection(String name, String nameMidSentence, int type, @@ -543,7 +543,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp @@ -208,7 +213,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title), ConvertUTF16ToJavaString(env, object_title), - static_cast(chosen_object->ui_info.content_settings_type), + static_cast(chosen_object->ui_info->content_settings_type), - static_cast(CONTENT_SETTING_ALLOW)); + static_cast(CONTENT_SETTING_ALLOW), + /* is_user_session */ false); @@ -565,7 +565,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h --- a/components/page_info/page_info.h +++ b/components/page_info/page_info.h -@@ -180,6 +180,7 @@ class PageInfo : private content_settings::CookieControlsView { +@@ -181,6 +181,7 @@ class PageInfo : private content_settings::CookieControlsView { content_settings::SettingSource source = content_settings::SETTING_SOURCE_NONE; bool is_one_time = false; @@ -829,7 +829,7 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co diff --git a/components/permissions/contexts/geolocation_permission_context_android.cc b/components/permissions/contexts/geolocation_permission_context_android.cc --- a/components/permissions/contexts/geolocation_permission_context_android.cc +++ b/components/permissions/contexts/geolocation_permission_context_android.cc -@@ -153,6 +153,19 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -157,6 +157,19 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( ContentSetting content_setting, bool is_one_time) { DCHECK(!is_one_time); @@ -849,7 +849,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr bool is_default_search = IsRequestingOriginDSE(requesting_origin); if (content_setting == CONTENT_SETTING_ALLOW && !location_settings_->IsSystemLocationSettingEnabled()) { -@@ -165,7 +178,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -169,7 +182,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( if (IsInLocationSettingsBackOff(is_default_search)) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -859,7 +859,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LogLocationSettingsMetric( kLocationSettingsSuppressMetricBase, is_default_search, LocationSettingsBackOffLevel(is_default_search)); -@@ -190,7 +204,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -193,7 +207,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( !location_settings_dialog_callback_.is_null()) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -869,7 +869,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr // This case should be very rare, so just pretend it was a denied prompt // for metrics purposes. LogLocationSettingsMetric( -@@ -207,12 +222,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -210,12 +225,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( base::BindOnce( &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown, weak_factory_.GetWeakPtr(), requesting_origin, embedding_origin, @@ -885,7 +885,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr } PermissionResult -@@ -379,6 +395,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -382,6 +398,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( const GURL& embedding_origin, bool persist, ContentSetting content_setting, @@ -893,7 +893,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LocationSettingsDialogOutcome prompt_outcome) { bool is_default_search = IsRequestingOriginDSE(requesting_origin); if (prompt_outcome == GRANTED) { -@@ -402,7 +419,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -405,7 +422,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( FinishNotifyPermissionSet( location_settings_dialog_request_id_, requesting_origin, embedding_origin, @@ -902,8 +902,8 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr + is_one_time, lifetime_option); location_settings_dialog_request_id_ = - PermissionRequestID(0, 0, PermissionRequestID::RequestLocalId()); -@@ -414,10 +432,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( + PermissionRequestID(content::GlobalRenderFrameHostId(0, 0), +@@ -418,10 +436,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( const GURL& embedding_origin, BrowserPermissionCallback callback, bool persist, @@ -1057,7 +1057,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h --- a/components/permissions/permission_context_base.h +++ b/components/permissions/permission_context_base.h -@@ -139,6 +139,14 @@ class PermissionContextBase : public content_settings::Observer { +@@ -138,6 +138,14 @@ class PermissionContextBase : public content_settings::Observer { // Updates stored content setting if persist is set, updates tab indicators // and runs the callback to finish the request. @@ -1072,7 +1072,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi virtual void NotifyPermissionSet(const PermissionRequestID& id, const GURL& requesting_origin, const GURL& embedding_origin, -@@ -159,6 +167,11 @@ class PermissionContextBase : public content_settings::Observer { +@@ -158,6 +166,11 @@ class PermissionContextBase : public content_settings::Observer { // Store the decided permission as a content setting. // virtual since the permission might be stored with different restrictions // (for example for desktop notifications). @@ -1084,7 +1084,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi virtual void UpdateContentSetting(const GURL& requesting_origin, const GURL& embedding_origin, ContentSetting content_setting, -@@ -191,6 +204,14 @@ class PermissionContextBase : public content_settings::Observer { +@@ -190,6 +203,14 @@ class PermissionContextBase : public content_settings::Observer { PermissionRequest::PermissionDecidedCallback permission_decided_callback, base::OnceClosure delete_callback) const; @@ -1099,7 +1099,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi ContentSettingsType content_settings_type() const { return content_settings_type_; } -@@ -217,7 +238,8 @@ class PermissionContextBase : public content_settings::Observer { +@@ -216,7 +237,8 @@ class PermissionContextBase : public content_settings::Observer { const GURL& embedding_origin, BrowserPermissionCallback callback, ContentSetting content_setting, @@ -1307,13 +1307,13 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } NotifyRequestDecided(PermissionAction::DENIED); -@@ -967,25 +978,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest( +@@ -971,25 +982,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest( void PermissionRequestManager::PermissionGrantedIncludingDuplicates( PermissionRequest* request, - bool is_one_time) { + bool is_one_time, content_settings::LifetimeMode lifetime_option) { - DCHECK_EQ(1ul, base::STLCount(requests_, request) + + DCHECK_EQ(1ul, base::ranges::count(requests_, request) + pending_permission_requests_.Count(request)) << "Only requests in [pending_permission_]requests_ can have duplicates"; - request->PermissionGranted(is_one_time); @@ -1327,7 +1327,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p void PermissionRequestManager::PermissionDeniedIncludingDuplicates( - PermissionRequest* request) { + PermissionRequest* request, bool is_one_time, content_settings::LifetimeMode lifetime_option) { - DCHECK_EQ(1ul, base::STLCount(requests_, request) + + DCHECK_EQ(1ul, base::ranges::count(requests_, request) + pending_permission_requests_.Count(request)) << "Only requests in [pending_permission_]requests_ can have duplicates"; - request->PermissionDenied(); @@ -1339,7 +1339,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } void PermissionRequestManager::CancelledIncludingDuplicates( -@@ -1187,7 +1198,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) { +@@ -1215,7 +1226,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) { void PermissionRequestManager::DoAutoResponseForTesting() { switch (auto_response_for_test_) { case ACCEPT_ONCE: @@ -1351,7 +1351,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p diff --git a/components/permissions/permission_request_manager.h b/components/permissions/permission_request_manager.h --- a/components/permissions/permission_request_manager.h +++ b/components/permissions/permission_request_manager.h -@@ -141,8 +141,10 @@ class PermissionRequestManager +@@ -155,8 +155,10 @@ class PermissionRequestManager GURL GetRequestingOrigin() const override; GURL GetEmbeddingOrigin() const override; void Accept() override; @@ -1363,7 +1363,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe void Dismiss() override; void Ignore() override; bool WasCurrentRequestAlreadyDisplayed() override; -@@ -303,9 +305,12 @@ class PermissionRequestManager +@@ -317,9 +319,12 @@ class PermissionRequestManager // Calls PermissionGranted on a request and all its duplicates. void PermissionGrantedIncludingDuplicates(PermissionRequest* request, diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index 6660250a..b8a4e838 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.compositor.layouts.Layout; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone; -@@ -2203,6 +2204,8 @@ public class ChromeTabbedActivity extends ChromeActivity getTabModelSelector().closeAllTabs(), /*isIncognito=*/false); RecordUserAction.record("MobileMenuCloseAllTabs"); @@ -71,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct } else if (id == R.id.close_all_incognito_tabs_menu_id) { // Close only incognito tabs CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(), -@@ -2255,6 +2258,27 @@ public class ChromeTabbedActivity extends ChromeActivity folderList, List depthList); BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller); @@ -229,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc -@@ -437,6 +437,11 @@ void BookmarkBridge::GetTopLevelFolderIDs( +@@ -431,6 +431,11 @@ void BookmarkBridge::GetTopLevelFolderIDs( top_level_folders.push_back(node.get()); } @@ -241,7 +241,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse for (const auto& node : bookmark_model_->bookmark_bar_node()->children()) { if (node->is_folder()) top_level_folders.push_back(node.get()); -@@ -484,6 +489,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( +@@ -478,6 +483,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( // Vector to temporarily contain all child bookmarks at same level for sorting std::vector bookmarks = { bookmark_model_->mobile_node(), @@ -249,7 +249,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse bookmark_model_->bookmark_bar_node(), bookmark_model_->other_node(), }; -@@ -536,6 +542,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( +@@ -530,6 +536,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( return folder_id_obj; } @@ -270,7 +270,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h --- a/chrome/browser/bookmarks/android/bookmark_bridge.h +++ b/chrome/browser/bookmarks/android/bookmark_bridge.h -@@ -121,6 +121,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -119,6 +119,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, JNIEnv* env, const base::android::JavaParamRef& obj); @@ -349,9 +349,9 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -3606,6 +3606,9 @@ To change this setting, <resetlink>reset sync

- Track prices +@@ -3603,6 +3603,9 @@ To change this setting, <resetlink>reset sync

+ Select tabs + + Bookmark all tabs @@ -559,13 +559,13 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b TitledUrlIndex* index() { return index_.get(); } std::unique_ptr owned_index() { return std::move(index_); } @@ -110,6 +111,7 @@ class BookmarkLoadDetails { - raw_ptr bb_node_ = nullptr; - raw_ptr other_folder_node_ = nullptr; - raw_ptr mobile_folder_node_ = nullptr; + raw_ptr bb_node_ = nullptr; + raw_ptr other_folder_node_ = + nullptr; + BookmarkPermanentNode* tabs_collection_folder_node_ = nullptr; + raw_ptr mobile_folder_node_ = + nullptr; LoadManagedNodeCallback load_managed_node_callback_; - std::unique_ptr index_; - BookmarkNode::MetaInfoMap model_meta_info_map_; diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc --- a/components/bookmarks/browser/bookmark_model.cc +++ b/components/bookmarks/browser/bookmark_model.cc @@ -603,13 +603,13 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); return node == root_; @@ -445,6 +451,7 @@ class BookmarkModel : public BookmarkUndoProvider, - raw_ptr bookmark_bar_node_ = nullptr; - raw_ptr other_node_ = nullptr; - raw_ptr mobile_node_ = nullptr; + raw_ptr bookmark_bar_node_ = + nullptr; + raw_ptr other_node_ = nullptr; + raw_ptr tabs_collection_node_ = nullptr; + raw_ptr mobile_node_ = nullptr; // The maximum ID assigned to the bookmark nodes in the model. - int64_t next_node_id_ = 1; diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmarks/browser/bookmark_node.cc --- a/components/bookmarks/browser/bookmark_node.cc +++ b/components/bookmarks/browser/bookmark_node.cc diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index e9acf4b9..9b9dce88 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2229,6 +2229,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2485,6 +2485,11 @@ public abstract class ChromeActivity return true; } @@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -@@ -543,6 +543,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -550,6 +550,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate isChromeScheme, isFileScheme, isContentScheme, isIncognito, url)); updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme); @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App updateAutoDarkMenuItem(menu, currentTab, isChromeScheme); -@@ -1242,6 +1243,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1244,6 +1245,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate stopPriceTrackingMenuItem.setVisible(false); } diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 2e86a4a6..044f8631 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -430,6 +430,7 @@ public final class ChromePreferenceKeys { +@@ -418,6 +418,7 @@ public final class ChromePreferenceKeys { AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM; public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info"; @@ -135,7 +135,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn disallowed_extension_deps_ = [ # Components should largely not depend on //extensions. Since // extensions # is not a component target and is linked with //chrome, depending on most -@@ -671,7 +671,7 @@ test("components_unittests") { +@@ -686,7 +686,7 @@ test("components_unittests") { # On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -144,7 +144,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn assert_no_deps = [ "//chrome/*" ] assert_no_deps += disallowed_extension_deps_ } -@@ -950,7 +950,7 @@ if (!is_ios) { +@@ -966,7 +966,7 @@ if (!is_ios) { # dependency. On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -180,7 +180,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c private TextScalePreference mTextScalePref; private PageZoomPreference mPageZoomDefaultZoomPref; private ChromeSwitchPreference mPageZoomAlwaysShowPref; -@@ -105,6 +107,12 @@ public class AccessibilitySettings +@@ -106,6 +108,12 @@ public class AccessibilitySettings getPreferenceScreen().removePreference(readerForAccessibilityPref); } @@ -193,7 +193,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c ChromeBaseCheckBoxPreference accessibilityTabSwitcherPref = (ChromeBaseCheckBoxPreference) findPreference( AccessibilityConstants.ACCESSIBILITY_TAB_SWITCHER); -@@ -153,6 +161,8 @@ public class AccessibilitySettings +@@ -162,6 +170,8 @@ public class AccessibilitySettings mFontSizePrefs.setUserFontScaleFactor((Float) newValue); } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) { mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue); @@ -217,7 +217,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn -@@ -374,6 +374,8 @@ android_library("ui_no_recycler_view_java") { +@@ -373,6 +373,8 @@ android_library("ui_no_recycler_view_java") { deps = [ ":ui_java_resources", ":ui_utils_java", diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index 29952c8d..43636403 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -4420,6 +4420,12 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

IMAGE diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch index 76c8e8b4..4e4c9e71 100644 --- a/build/patches/Add-option-to-use-home-page-as-NTP.patch +++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch @@ -118,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin; import org.chromium.chrome.browser.ntp.NewTabPageUtils; import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper; -@@ -297,6 +298,12 @@ public class ChromeTabCreator extends TabCreator { +@@ -311,6 +312,12 @@ public class ChromeTabCreator extends TabCreator { * @return the created tab. */ public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) { @@ -134,7 +134,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -441,6 +441,7 @@ public final class ChromePreferenceKeys { +@@ -429,6 +429,7 @@ public final class ChromePreferenceKeys { public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL = "Chrome.Homepage.PartnerCustomizedDefaultGurl"; @@ -181,7 +181,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -60,6 +60,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; +@@ -61,6 +61,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; // A boolean specifying whether the New Tab page is the home page or not. const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage"; @@ -195,7 +195,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -388,6 +388,7 @@ extern const char kRestrictedManagedGuestSessionExtensionCleanupExemptList[]; +@@ -389,6 +389,7 @@ extern const char kRestrictedManagedGuestSessionExtensionCleanupExemptList[]; extern const char kUsedPolicyCertificates[]; #endif // BUILDFLAG(IS_CHROMEOS) extern const char kShowHomeButton[]; diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch index 704cf6bb..791c8ab0 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -142,6 +142,7 @@ +@@ -144,6 +144,7 @@ #include "components/segmentation_platform/public/features.h" #include "components/send_tab_to_self/features.h" #include "components/services/heap_profiling/public/cpp/switches.h" @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/shared_highlighting/core/common/shared_highlighting_features.h" #include "components/signin/core/browser/dice_account_reconcilor_delegate.h" #include "components/signin/public/base/signin_buildflags.h" -@@ -9174,6 +9175,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9283,6 +9284,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)}, @@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3461,6 +3461,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] = +@@ -3407,6 +3407,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] = "Skips starting the service worker and run the fetch handler if the fetch " "handler is recognized as skippable."; @@ -59,7 +59,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1975,6 +1975,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[]; +@@ -1957,6 +1957,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[]; extern const char kSkipServiceWorkerFetchHandlerName[]; extern const char kSkipServiceWorkerFetchHandlerDescription[]; diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index f984e8ab..4c55ddd3 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment; import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; import org.chromium.components.browser_ui.widget.displaystyle.ViewResizer; -@@ -329,9 +330,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -328,9 +329,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finish(); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index e817de2f..1477f195 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -222,7 +222,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -669,6 +669,20 @@ void ContentSettingsRegistry::Init() { +@@ -633,6 +633,20 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -258,7 +258,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -206,7 +206,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -208,7 +208,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::AUTOPLAY || content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || @@ -268,7 +268,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -218,6 +219,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -220,6 +221,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url); FilterRulesForType(timezone_override_rules, outermost_main_frame_url); FilterRulesForType(autoplay_rules, outermost_main_frame_url); @@ -381,7 +381,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -65,6 +65,29 @@ +@@ -67,6 +67,29 @@ namespace blink { @@ -414,7 +414,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -96,6 +96,7 @@ class SecurityOrigin; +@@ -101,6 +101,7 @@ class SecurityOrigin; class ScriptState; class ScriptWrappable; class TrustedTypePolicyFactory; @@ -422,7 +422,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context enum ReasonForCallingCanExecuteScripts { kAboutToExecuteScript, -@@ -104,6 +105,10 @@ enum ReasonForCallingCanExecuteScripts { +@@ -109,6 +110,10 @@ enum ReasonForCallingCanExecuteScripts { enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag }; @@ -476,7 +476,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(), builder); builder.Append('.'); -@@ -578,6 +566,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( +@@ -579,6 +567,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( const CanvasContextCreationAttributesCore& attributes, Platform::ContextType context_type, Platform::GraphicsInfo* graphics_info) { diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch index 8c7b3246..b469ab20 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -218,7 +218,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -683,6 +683,20 @@ void ContentSettingsRegistry::Init() { +@@ -647,6 +647,20 @@ void ContentSettingsRegistry::Init() { /*show_into_info_page*/ true, /*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBGL, /*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE); @@ -254,7 +254,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -207,7 +207,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -209,7 +209,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || content_type == ContentSettingsType::TIMEZONE_OVERRIDE || @@ -264,7 +264,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -220,6 +221,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -222,6 +223,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(timezone_override_rules, outermost_main_frame_url); FilterRulesForType(autoplay_rules, outermost_main_frame_url); FilterRulesForType(webgl_rules, outermost_main_frame_url); @@ -385,7 +385,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d #include "third_party/blink/public/platform/web_url.h" #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h" #include "third_party/blink/public/web/web_document.h" -@@ -765,6 +766,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -804,6 +805,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( // origin. WebRTCIPHandlingPolicy policy = GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy); diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 140c170a..5b1890f3 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -184,7 +184,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -12373,12 +12373,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -11993,12 +11993,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( base::Value::Dict body; if (!reason.empty()) body.Set("reason", reason); @@ -201,21 +201,21 @@ diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/b --- a/content/browser/web_package/signed_exchange_reporter.cc +++ b/content/browser/web_package/signed_exchange_reporter.cc @@ -127,6 +127,7 @@ bool ShouldDowngradeReport(const char* result_string, - void ReportResult(int frame_tree_node_id, - network::mojom::SignedExchangeReportPtr report, - const net::NetworkAnonymizationKey& network_isolation_key) { + void ReportResult( + int frame_tree_node_id, + network::mojom::SignedExchangeReportPtr report, +#if BUILDFLAG(ENABLE_REPORTING) + const net::NetworkAnonymizationKey& network_anonymization_key) { FrameTreeNode* frame_tree_node = FrameTreeNode::GloballyFindByID(frame_tree_node_id); - if (!frame_tree_node) -@@ -141,6 +142,7 @@ void ReportResult(int frame_tree_node_id, +@@ -141,6 +142,7 @@ void ReportResult( + frame_host->GetBrowserContext()->GetStoragePartition(site_instance); DCHECK(partition); partition->GetNetworkContext()->QueueSignedExchangeReport( - std::move(report), network_isolation_key); +#endif + std::move(report), network_anonymization_key); } - } // namespace diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc b/content/public/common/content_switch_dependent_feature_overrides.cc --- a/content/public/common/content_switch_dependent_feature_overrides.cc +++ b/content/public/common/content_switch_dependent_feature_overrides.cc @@ -246,7 +246,7 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic diff --git a/services/network/network_context.h b/services/network/network_context.h --- a/services/network/network_context.h +++ b/services/network/network_context.h -@@ -461,10 +461,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -465,10 +465,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const absl::optional& reporting_source, const net::NetworkAnonymizationKey& network_anonymization_key, const absl::optional& user_agent, @@ -262,7 +262,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn --- a/services/network/public/mojom/BUILD.gn +++ b/services/network/public/mojom/BUILD.gn -@@ -1120,7 +1120,6 @@ mojom("mojom") { +@@ -1168,7 +1168,6 @@ mojom("mojom") { export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_header_blink = "third_party/blink/public/platform/web_common.h" if (enable_reporting) { @@ -273,7 +273,7 @@ diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mo diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom -@@ -1064,6 +1064,7 @@ interface NetworkContext { +@@ -1072,6 +1072,7 @@ interface NetworkContext { // provided |network_isolation_key|. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -281,7 +281,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueReport(string type, string group, url.mojom.Url url, -@@ -1077,6 +1078,7 @@ interface NetworkContext { +@@ -1085,6 +1086,7 @@ interface NetworkContext { // Note that this queued report will never be delivered if no reporting // endpoint matching is registered for with the provided // |network_isolation_key|. @@ -300,7 +300,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h" #include "services/network/public/cpp/features.h" #include "services/network/public/mojom/content_security_policy.mojom-blink.h" -@@ -2307,9 +2308,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { +@@ -2328,9 +2329,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { return base::UnguessableToken::Null(); } @@ -326,7 +326,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b #include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h" #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h" #include "third_party/blink/public/common/frame/frame_ad_evidence.h" -@@ -593,9 +593,9 @@ class CORE_EXPORT LocalFrame final +@@ -596,9 +596,9 @@ class CORE_EXPORT LocalFrame final } SmoothScrollSequencer& GetSmoothScrollSequencer(); diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 3d211b33..793fe816 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc -@@ -1226,6 +1226,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1237,6 +1237,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -24,23 +24,23 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc void WebMediaPlayerImpl::EnabledAudioTracksChanged( const WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3627,7 +3633,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { - // Audio only stream is allowed to play when in background. - // TODO: We should check IsBackgroundOptimizationCandidate here. But we need - // to move the logic of checking video frames out of that function. +@@ -2175,7 +2181,11 @@ void WebMediaPlayerImpl::OnBufferingStateChange( + void WebMediaPlayerImpl::CreateVideoDecodeStatsReporter() { + // TODO(chcunningham): destroy reporter if we initially have video but the + // track gets disabled. Currently not possible in default desktop Chrome. - if (!HasVideo()) + + //pipeline_metadata_.has_video is true for MediaPlayerRenderer, + //see media/base/pipeline_metadata.h. This is a workaround to allow audio + //streams be played in background. + if (!HasVideoNonEmptySize()) - return false; + return; - if (using_media_player_renderer_ && + // Only record stats from the local pipeline. diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h --- a/third_party/blink/renderer/platform/media/web_media_player_impl.h +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h -@@ -195,6 +195,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl +@@ -197,6 +197,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl bool HasVideo() const override; bool HasAudio() const override; diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index c7bdae5a..5ee06156 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -48,7 +48,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc -@@ -508,7 +508,9 @@ double AudioContext::baseLatency() const { +@@ -546,7 +546,9 @@ double AudioContext::baseLatency() const { DCHECK(IsMainThread()); DCHECK(destination()); diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index 831d52c9..152f4984 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -4,1463 +4,1463 @@ Subject: Automated domain substitution License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../cts_config/webview_cts_gcs_path.json | 30 +- - android_webview/tools/record_netlog.py | 6 +- - .../tools/remove_preinstalled_webview.py | 2 +- - android_webview/tools/update_cts.py | 6 +- - ash/accelerators/accelerator_notifications.cc | 2 +- - ash/ash_strings.grd | 28 +- - ash/assistant/assistant_setup_controller.cc | 2 +- - ash/assistant/util/deep_link_util.cc | 16 +- - ash/components/phonehub/url_constants.cc | 2 +- - ash/constants/url_constants.cc | 6 +- - .../fake_device_metadata_http_fetcher.cc | 2 +- - .../fast_pair/device_metadata_fetcher.cc | 2 +- - .../fast_pair/footprints_fetcher_impl.cc | 4 +- - .../ui/fast_pair/fast_pair_presenter_impl.cc | 4 +- - .../device_sync/cryptauth_client_impl.cc | 8 +- - ash/services/ime/constants.cc | 2 +- - ash/system/eche/eche_tray.cc | 2 +- - ...pcie_peripheral_notification_controller.cc | 2 +- - .../usb_peripheral_notification_controller.cc | 4 +- - .../test_wallpaper_controller_client.cc | 2 +- - .../camera_app_ui/camera_app_untrusted_ui.cc | 2 +- - .../resources/js/lib/analytics.js | 14 +- - .../resources/strings/camera_strings.grd | 2 +- - .../quick_unlock/pin_keyboard_icons.html | 2 +- - ash/webui/diagnostics_ui/diagnostics_ui.cc | 2 +- - ash/webui/eche_app_ui/eche_alert_generator.cc | 2 +- - .../help_app_kids_magazine_untrusted_ui.cc | 2 +- - ash/webui/media_app_ui/media_app_guest_ui.cc | 2 +- - .../backend/help_content_provider.cc | 4 +- - .../resources/confirmation_page.js | 2 +- - .../os_feedback_ui/resources/fake_data.js | 16 +- - .../resources/feedback_constants.js | 6 +- - .../os_feedback_ui/resources/search_page.js | 2 +- - .../personalization_app_ui.cc | 2 +- - .../projector_app/projector_xhr_sender.cc | 10 +- - .../projector_app/projector_xhr_sender.h | 2 +- - .../projector_app/untrusted_projector_ui.cc | 12 +- - .../scanning/resources/scanning_app.html | 2 +- - ash/webui/scanning/resources/scanning_app.js | 2 +- - ...boarding_enter_rsu_wp_disable_code_page.js | 2 +- - base/android/resource_exclusions.gni | 2 +- - base/debug/debugger_posix.cc | 4 +- - base/debug/stack_trace_posix.cc | 2 +- - base/functional/callback.h | 8 +- - base/ios/device_util.mm | 2 +- - base/memory/raw_ptr.cc | 2 +- - base/memory/raw_ptr_asan_service.cc | 2 +- - build/android/gradle/generate_gradle.py | 2 +- - .../android/gyp/assert_static_initializers.py | 2 +- - build/android/gyp/lint.py | 2 +- - build/android/gyp/proguard.py | 4 +- - build/android/gyp/util/diff_utils.py | 4 +- - build/android/gyp/util/protoresources.py | 2 +- - .../android/incremental_install/installer.py | 2 +- - build/android/resource_sizes.py | 2 +- - build/android/test_wrapper/logdog_wrapper.py | 2 +- - build/apple/tweak_info_plist.py | 6 +- - build/config/android/rules.gni | 2 +- - build/config/chrome_build.gni | 2 +- - build/config/chromeos/args.gni | 4 +- - build/config/chromeos/rules.gni | 6 +- - build/config/compiler/compiler.gni | 4 +- - build/config/locales.gni | 2 +- - build/config/nacl/rules.gni | 2 +- - build/config/ozone.gni | 2 +- - build/config/sanitizers/sanitizers.gni | 2 +- - build/config/win/control_flow_guard.gni | 2 +- - build/fuchsia/binary_size_differ.py | 2 +- - build/fuchsia/binary_sizes.py | 2 +- - build/fuchsia/pkg_repo.py | 2 +- - build/linux/install-chromeos-fonts.py | 2 +- - .../linux/sysroot_scripts/install-sysroot.py | 2 +- - build/mac_toolchain.py | 2 +- - build/nocompile.gni | 2 +- - build/toolchain/cros_toolchain.gni | 2 +- - build/toolchain/gcc_toolchain.gni | 2 +- - .../lib/common/perf_tests_results_helper.py | 2 +- - build/util/lib/results/result_sink.py | 2 +- - build/whitespace_file.txt | 2 +- - buildtools/README.txt | 4 +- - buildtools/clang_format/README.txt | 6 +- - .../javatest_manifest_config_delta.json | 12 +- - .../manifest/maps_go_manifest_config.json | 10 +- - chrome/app/chromium_strings.grd | 24 +- - chrome/app/generated_resources.grd | 304 +-- - chrome/app/google_chrome_strings.grd | 24 +- - chrome/app/resources/locale_settings.grd | 10 +- - chrome/browser/about_flags.cc | 4 +- - .../browser/android/explore_sites/url_util.cc | 2 +- - .../android/webapk/webapk_installer.cc | 4 +- - .../app_service/webapk/webapk_install_task.cc | 2 +- - .../apps/digital_goods/digital_goods_ash.cc | 2 +- - .../digital_goods_factory_impl.cc | 2 +- - .../apps/platform_apps/install_chrome_app.cc | 2 +- - .../ash/android_sms/android_sms_urls.cc | 16 +- - chrome/browser/ash/app_mode/fake_cws.cc | 2 +- - .../auth/arc_background_auth_code_fetcher.cc | 2 +- - .../arc/auth/arc_robot_auth_code_fetcher.cc | 2 +- - .../arc/input_overlay/ui/input_menu_view.cc | 2 +- - .../browser/ash/assistant/assistant_util.cc | 4 +- - .../ash/attestation/attestation_ca_client.cc | 8 +- - chrome/browser/ash/borealis/borealis_util.cc | 2 +- - .../ash/child_accounts/child_user_service.cc | 2 +- - chrome/browser/ash/crostini/crostini_util.cc | 2 +- - .../customization/customization_document.cc | 2 +- - .../enhanced_network_tts_constants.cc | 2 +- - .../file_manager/file_manager_string_util.cc | 14 +- - .../ash/file_manager/open_with_browser.cc | 8 +- - chrome/browser/ash/hats/hats_dialog.cc | 2 +- - .../assistive_suggester_client_filter.cc | 24 +- - .../ash/input_method/ime_rules_config.h | 14 +- - .../easy_unlock/easy_unlock_key_names.cc | 2 +- - .../ash/login/gaia_reauth_token_fetcher.cc | 2 +- - .../ash/login/marketing_backend_connector.cc | 4 +- - .../connectivity/target_fido_controller.cc | 4 +- - .../login/saml/password_sync_token_fetcher.cc | 2 +- - .../recommend_apps_fetcher_impl.cc | 4 +- - .../default_user_image/default_user_images.cc | 2 +- - .../arc_dns_resolution_routine.cc | 6 +- - .../dns_latency_routine.cc | 2 +- - .../dns_resolution_routine.cc | 2 +- - .../network_diagnostics_util.cc | 14 +- - .../video_conferencing_routine.cc | 4 +- - .../ash/plugin_vm/plugin_vm_diagnostics.cc | 4 +- - .../plugin_vm/plugin_vm_license_checker.cc | 4 +- - .../browser/ash/plugin_vm/plugin_vm_util.cc | 6 +- - .../account_status_check_fetcher.cc | 6 +- - .../powerwash_requirements_checker.cc | 2 +- - .../device_command_start_crd_session_job.cc | 6 +- - .../policy/uploading/heartbeat_scheduler.cc | 4 +- - chrome/browser/ash/u2f_notification.cc | 2 +- - .../wallpaper_handlers/wallpaper_handlers.cc | 16 +- - .../ash/web_applications/terminal_source.cc | 4 +- - .../autofill/autofill_gstatic_reader.cc | 4 +- - .../apc_onboarding_coordinator.cc | 2 +- - .../browser_switcher_service.cc | 2 +- - chrome/browser/cart/cart_discount_fetcher.cc | 2 +- - .../cart/cart_discount_link_fetcher.cc | 2 +- - chrome/browser/cart/cart_service.cc | 24 +- - chrome/browser/cart/fetch_discount_worker.cc | 2 +- - .../cart_domain_cart_url_mapping.json | 2 +- - .../resources/cart_domain_name_mapping.json | 2 +- - .../browser/chrome_browser_application_mac.mm | 2 +- - .../browser/chrome_content_browser_client.cc | 4 +- - .../file_manager/private_api_misc.cc | 2 +- - .../dlp/dlp_clipboard_bubble_constants.h | 2 +- - chrome/browser/devtools/url_constants.cc | 4 +- - .../mixed_content_download_blocking.cc | 2 +- - .../commands/mac_key_rotation_command.cc | 2 +- - .../management_service/rotate_util.cc | 2 +- - .../file_system/signin_dialog_delegate.cc | 2 +- - .../connectors/service_provider_config.cc | 4 +- - .../extension_request_notification.cc | 4 +- - .../enterprise/signals/signals_utils.cc | 4 +- - ...e_js_error_report_processor_nonchromeos.cc | 4 +- - .../cryptotoken_private_api.cc | 8 +- - .../enterprise_platform_keys_api.cc | 2 +- - .../identity_launch_web_auth_flow_function.cc | 2 +- - .../chrome_management_api_delegate.cc | 2 +- - .../api/platform_keys/platform_keys_api.cc | 2 +- - .../chrome_extension_browser_constants.cc | 4 +- - .../extensions/external_pref_loader.cc | 2 +- - chrome/browser/extensions/install_signer.cc | 2 +- - .../chrome_extension_downloader_factory.cc | 2 +- - .../updater/chrome_update_client_config.cc | 2 +- - chrome/browser/flag_descriptions.cc | 18 +- - .../k_anonymity_service_urls.h | 4 +- - .../lacros/lacros_startup_infobar_delegate.cc | 4 +- - .../service_discovery_client_mac.mm | 4 +- - .../long_screenshots_tab_service.cc | 2 +- - .../access_code/access_code_cast_constants.cc | 4 +- - .../cast/cast_media_route_provider.cc | 6 +- - .../dial/dial_media_route_provider.cc | 18 +- - .../media/webrtc/webrtc_event_log_uploader.cc | 2 +- - .../media/webrtc/webrtc_log_uploader.cc | 2 +- - .../nacl_host/nacl_infobar_delegate.cc | 2 +- - .../client/nearby_share_client_impl.cc | 4 +- - .../instantmessaging/constants.h | 4 +- - .../network_traversal_ice_config_fetcher.cc | 12 +- - .../tachyon_ice_config_fetcher.cc | 12 +- - .../modules/drive/drive_service.cc | 8 +- - .../modules/photos/photos_service.cc | 8 +- - .../obsolete_system/obsolete_system_linux.cc | 2 +- - ...rvice_worker_page_load_metrics_observer.cc | 2 +- - .../quiet_permission_prompt_model_android.cc | 2 +- - .../extension_key_permissions_service.cc | 2 +- - .../extension_platform_keys_service.cc | 2 +- - .../browser/policy/safe_search_policy_test.h | 2 +- - .../chrome_prefetch_service_delegate.cc | 6 +- - .../prefetch_proxy/prefetch_proxy_params.cc | 6 +- - .../privacy_sandbox_service.cc | 24 +- - .../profiles/profile_avatar_downloader.cc | 2 +- - .../push_messaging_constants.cc | 2 +- - .../push_messaging_service_impl.cc | 2 +- - .../browser/resources/about_sys/about_sys.js | 2 +- - .../browsing_topics_internals.html | 4 +- - .../resources/chromeos/about_os_credits.html | 6 +- - .../dictation/macros/list_commands_macro.js | 2 +- - .../magnifier/magnifier.js | 2 +- - .../chromevox/background/command_handler.js | 8 +- - .../chromevox/options/options.css | 2 +- - .../tools/webstore_extension_util.py | 10 +- - .../chromevox_manifest.json.jinja2 | 8 +- - .../common/tutorial/chromevox_tutorial.js | 6 +- - .../accessibility/select_to_speak/options.css | 2 +- - .../select_to_speak/options.html | 2 +- - .../select_to_speak/select_to_speak.js | 8 +- - .../select_to_speak_manifest.json.jinja2 | 8 +- - .../switch_access/switch_access.js | 2 +- - .../switch_access_manifest.json.jinja2 | 4 +- - .../add_supervision/add_supervision_ui.js | 16 +- - .../chromeos/arc_support/background.js | 12 +- - .../chromeos/arc_support/playstore.js | 6 +- - .../assistant_optin/assistant_related_info.js | 4 +- - .../assistant_optin/assistant_value_prop.js | 2 +- - .../connectivity_diagnostics/manifest.json | 4 +- - .../resources/chromeos/echo/manifest.json | 122 +- - .../edu_coexistence/edu_coexistence_ui.js | 2 +- - .../chromeos/emoji_picker/icons.html | 2 +- - .../resources/chromeos/emulator/icons.html | 2 +- - .../input_method/google_xkb_manifest.json | 8 +- - .../resources/chromeos/login/debug/debug.js | 10 +- - .../screens/common/arc_terms_of_service.js | 4 +- - .../screens/common/consolidated_consent.js | 2 +- - .../screens/common/marketing_opt_in.html | 2 +- - .../login/screens/login/offline_login.html | 2 +- - .../login/screens/login/offline_login.js | 2 +- - .../browser_tabs_metadata_form.js | 2 +- - .../parent_access/parent_access_ui.js | 8 +- - .../browser/resources/cryptotoken/enroller.js | 2 +- - .../default_apps/external_extensions.json | 2 +- - .../discards/graph_doc_template.html | 2 +- - chrome/browser/resources/downloads/icons.html | 2 +- - .../resources/gaia_auth_host/authenticator.js | 4 +- - .../saml_password_attributes.js | 2 +- - .../resources/hangout_services/manifest.json | 2 +- - .../manifest.json | 2 +- - .../scope_approval_dialog.js | 6 +- - chrome/browser/resources/inspect/inspect.html | 4 +- - .../query_tiles/query_tiles_internals.html | 2 +- - .../query_tiles/query_tiles_internals.js | 4 +- - .../resources/media/mei_preload/manifest.json | 2 +- - .../shared/nearby_shared_icons.html | 4 +- - .../nearby_shared_share_type_icons.html | 2 +- - .../resources/net_internals/index.html | 6 +- - .../network_speech_synthesis/manifest.json | 2 +- - .../network_speech_synthesis/tts_extension.js | 2 +- - .../new_tab_page/modules/photos/module.html | 2 +- - chrome/browser/resources/omnibox/omnibox.html | 2 +- - .../resources/omnibox/omnibox_output.js | 4 +- - .../browser/resources/pdf/elements/icons.html | 2 +- - .../resources/print_preview/ui/icons.html | 2 +- - .../settings/about_page/about_page.html | 4 +- - .../crostini_disk_resize_dialog.html | 2 +- - .../keyboard_and_text_input_page.js | 2 +- - .../chromeos/os_a11y_page/manage_a11y_page.js | 4 +- - .../chromeos/os_a11y_page/os_a11y_page.js | 2 +- - .../channel_switcher_dialog.html | 2 +- - .../chromeos/os_about_page/os_about_page.html | 2 +- - .../borealis_page/borealis_detail_view.html | 2 +- - .../resources/settings/chromeos/os_icons.html | 2 +- - .../os_people_page/users_add_user_dialog.js | 2 +- - chrome/browser/resources/settings/icons.html | 2 +- - .../resources/settings/settings_shared.css | 2 +- - .../browser/resources/tools/build_webui.gni | 2 +- - .../resources/webstore_app/manifest.json | 4 +- - .../demos/cr_input/cr_input_demo.html | 2 +- - .../certificate_reporting_service.cc | 2 +- - .../chrome_cleaner/srt_field_trial_win.cc | 2 +- - .../chrome_enterprise_url_lookup_service.cc | 2 +- - .../chrome_password_protection_service.cc | 4 +- - .../cloud_binary_upload_service.cc | 4 +- - .../check_client_download_request_base.cc | 4 +- - .../download_protection/download_feedback.cc | 2 +- - .../ppapi_download_request.cc | 6 +- - .../extension_telemetry_uploader.cc | 2 +- - .../incident_report_uploader_impl.cc | 4 +- - .../default_settings_fetcher.cc | 2 +- - .../background/ntp_background_service.cc | 2 +- - .../search/background/ntp_backgrounds.cc | 10 +- - .../browser/share/default_ranking_android.cc | 8 +- - .../remote_copy_message_handler.cc | 2 +- - .../sharing/web_push/web_push_sender.cc | 4 +- - chrome/browser/signin/signin_ui_util.cc | 2 +- - .../browser/ssl/connection_help_tab_helper.cc | 2 +- - chrome/browser/ssl/sct_reporting_service.cc | 4 +- - .../child_accounts/kids_management_api.cc | 2 +- - .../supervised_user_block_interstitial.html | 2 +- - ...supervised_user_block_interstitial_v2.html | 2 +- - .../supervised_user_service.cc | 2 +- - .../supervised_user_url_filter.cc | 12 +- - .../strings/android_chrome_strings.grd | 54 +- - .../search/arc/recommend_apps_fetcher_impl.cc | 2 +- - .../ui/app_list/search/common/string_util.cc | 2 +- - .../search/files/item_suggest_cache.h | 2 +- - .../ui/app_list/search/omnibox_util.cc | 2 +- - .../ui/ash/ambient/ambient_client_impl.cc | 8 +- - .../ui/ash/calendar/calendar_keyed_service.cc | 2 +- - .../browser/ui/ash/chrome_shell_delegate.cc | 2 +- - .../ui/ash/in_session_auth_dialog_client.cc | 2 +- - .../projector/pending_screencast_manager.cc | 2 +- - .../browser/ui/ash/system_tray_client_impl.cc | 4 +- - .../tab_under_navigation_throttle.h | 2 +- - ...r_content_setting_bubble_model_delegate.cc | 4 +- - chrome/browser/ui/chrome_pages.cc | 2 +- - .../browser/ui/cocoa/share_menu_controller.mm | 2 +- - .../ui/commander/open_url_command_source.cc | 2 +- - .../ui/dialogs/outdated_upgrade_bubble.cc | 2 +- - .../installation_error_infobar_delegate.cc | 2 +- - chrome/browser/ui/managed_ui.cc | 2 +- - .../omnibox/omnibox_pedal_implementations.cc | 24 +- - .../quick_answers_ui_controller.cc | 4 +- - chrome/browser/ui/signin_view_controller.cc | 2 +- - .../toolbar/media_router_contextual_menu.cc | 6 +- - .../app_dialog/app_uninstall_dialog_view.cc | 2 +- - .../ui/views/hats/hats_next_web_dialog.cc | 2 +- - .../lens/lens_side_panel_navigation_helper.cc | 2 +- - .../ui/views/lens/lens_side_panel_view.cc | 2 +- - .../ui/views/network_profile_bubble_view.cc | 2 +- - .../about_this_site_side_panel_view.cc | 2 +- - .../plugin_vm/plugin_vm_installer_view.cc | 2 +- - .../ui/views/session_crashed_bubble_view.cc | 2 +- - .../lens/lens_unified_side_panel_view.cc | 2 +- - .../app_management_page_handler.cc | 6 +- - .../ash/add_supervision/add_supervision_ui.cc | 4 +- - .../ash/cloud_upload/drive_upload_handler.cc | 2 +- - .../internals_ui_handler.cc | 2 +- - .../edu_coexistence_login_handler_chromeos.cc | 2 +- - .../consolidated_consent_screen_handler.h | 4 +- - .../notification_tester_handler.cc | 2 +- - .../parent_access/parent_access_ui.cc | 4 +- - chrome/browser/ui/webui/feed/feed_ui.cc | 2 +- - .../ui/webui/interstitials/interstitial_ui.cc | 6 +- - .../ui/webui/media_router/cast_feedback_ui.cc | 4 +- - .../quick_pair/quick_pair_handler.cc | 4 +- - .../ui/webui/new_tab_page/foo/foo_handler.cc | 8 +- - .../ui/webui/new_tab_page/untrusted_source.cc | 2 +- - chrome/browser/ui/webui/ntp/new_tab_ui.cc | 2 +- - .../ui/webui/ntp/ntp_resource_cache.cc | 8 +- - .../ui/webui/sanitized_image_source.cc | 6 +- - .../settings/ash/parental_controls_handler.cc | 2 +- - .../webui/settings/reset_settings_handler.cc | 2 +- - .../settings_localized_strings_provider.cc | 2 +- - ...nin_restriction_policy_fetcher_chromeos.cc | 2 +- - .../ui/webui/welcome/google_apps_handler.cc | 12 +- - .../webui/welcome/ntp_background_handler.cc | 2 +- - .../ui/webui/whats_new/whats_new_util.cc | 4 +- - .../fetch_manifest_and_install_command.cc | 2 +- - .../externally_managed_app_manager.cc | 4 +- - .../preinstalled_web_apps/gmail.cc | 6 +- - .../preinstalled_web_apps/google_calendar.cc | 6 +- - .../preinstalled_web_apps/google_chat.cc | 2 +- - .../preinstalled_web_apps/google_docs.cc | 6 +- - .../preinstalled_web_apps/google_drive.cc | 6 +- - .../preinstalled_web_apps/google_meet.cc | 2 +- - .../preinstalled_web_apps/google_sheets.cc | 6 +- - .../preinstalled_web_apps/google_slides.cc | 6 +- - .../preinstalled_web_apps/messages_dogfood.cc | 2 +- - .../preinstalled_web_apps.cc | 8 +- - .../preinstalled_web_apps/youtube.cc | 6 +- - .../web_applications/web_app_install_task.cc | 2 +- - .../chrome_authenticator_request_delegate.cc | 8 +- - .../components/recovery_component.cc | 4 +- - .../crash/crashpad_crash_reporter.cc | 2 +- - .../executables/chrome_cleaner_main.cc | 2 +- - .../logging/cleaner_logging_service.cc | 6 +- - .../chrome_cleaner/logging/dummy_api_keys.cc | 4 +- - .../logging/reporter_logging_service.cc | 6 +- - chrome/common/chrome_features.cc | 6 +- - .../common/extensions/api/_api_features.json | 4 +- - chrome/common/extensions/api/cookies.json | 2 +- - chrome/common/extensions/api/debugger.json | 8 +- - .../extensions/api/declarative_content.json | 4 +- - chrome/common/extensions/api/dom.json | 2 +- - chrome/common/extensions/api/gcm.json | 8 +- - chrome/common/extensions/api/instance_id.json | 2 +- - chrome/common/extensions/api/privacy.json | 2 +- - chrome/common/extensions/api/tabs.json | 4 +- - chrome/common/extensions/api/tts.json | 2 +- - chrome/common/extensions/api/webview_tag.json | 4 +- - chrome/common/extensions/api/windows.json | 2 +- - .../extensions/chrome_extensions_client.cc | 4 +- - chrome/common/google_url_loader_throttle.cc | 4 +- - chrome/common/url_constants.cc | 260 +- - .../gaiacp/associated_user_validator.cc | 2 +- - .../gaiacp/gaia_credential_base.cc | 8 +- - .../credential_provider/gaiacp/gcp_utils.cc | 4 +- - .../gaiacp/gcpw_strings.cc | 2 +- - .../credential_provider/gaiacp/mdm_utils.cc | 2 +- - chrome/docs/devtools-pillar.html | 2 +- - chrome/docs/index.html | 18 +- - chrome/docs/platform-pillar.html | 12 +- - chrome/installer/setup/eula/oem_ar.html | 2 +- - chrome/installer/setup/eula/oem_bg.html | 2 +- - chrome/installer/setup/eula/oem_ca.html | 2 +- - chrome/installer/setup/eula/oem_cs.html | 2 +- - chrome/installer/setup/eula/oem_da.html | 2 +- - chrome/installer/setup/eula/oem_de.html | 2 +- - chrome/installer/setup/eula/oem_el.html | 2 +- - chrome/installer/setup/eula/oem_en-GB.html | 2 +- - chrome/installer/setup/eula/oem_en.html | 2 +- - chrome/installer/setup/eula/oem_es-419.html | 2 +- - chrome/installer/setup/eula/oem_es.html | 2 +- - chrome/installer/setup/eula/oem_et.html | 2 +- - chrome/installer/setup/eula/oem_fi.html | 2 +- - chrome/installer/setup/eula/oem_fil.html | 2 +- - chrome/installer/setup/eula/oem_fr.html | 2 +- - chrome/installer/setup/eula/oem_hi.html | 2 +- - chrome/installer/setup/eula/oem_hr.html | 2 +- - chrome/installer/setup/eula/oem_hu.html | 2 +- - chrome/installer/setup/eula/oem_id.html | 2 +- - chrome/installer/setup/eula/oem_it.html | 2 +- - chrome/installer/setup/eula/oem_iw.html | 2 +- - chrome/installer/setup/eula/oem_ja.html | 2 +- - chrome/installer/setup/eula/oem_ko.html | 2 +- - chrome/installer/setup/eula/oem_lt.html | 2 +- - chrome/installer/setup/eula/oem_lv.html | 2 +- - chrome/installer/setup/eula/oem_nl.html | 2 +- - chrome/installer/setup/eula/oem_no.html | 2 +- - chrome/installer/setup/eula/oem_pl.html | 2 +- - chrome/installer/setup/eula/oem_pt-BR.html | 2 +- - chrome/installer/setup/eula/oem_pt-PT.html | 2 +- - chrome/installer/setup/eula/oem_ro.html | 2 +- - chrome/installer/setup/eula/oem_ru.html | 2 +- - chrome/installer/setup/eula/oem_sk.html | 2 +- - chrome/installer/setup/eula/oem_sl.html | 2 +- - chrome/installer/setup/eula/oem_sr.html | 2 +- - chrome/installer/setup/eula/oem_sv.html | 2 +- - chrome/installer/setup/eula/oem_th.html | 2 +- - chrome/installer/setup/eula/oem_tr.html | 2 +- - chrome/installer/setup/eula/oem_uk.html | 2 +- - chrome/installer/setup/eula/oem_vi.html | 2 +- - chrome/installer/setup/eula/oem_zh-CN.html | 2 +- - chrome/installer/setup/eula/oem_zh-TW.html | 2 +- - .../setup/google_chrome_behaviors.cc | 2 +- - chrome/renderer/cart/commerce_hint_agent.cc | 2 +- - chrome/renderer/media/flash_embed_rewrite.cc | 2 +- - ...ip_add_to_cart_request_domain_mapping.json | 2 +- - .../extensions/identity_custom_bindings.js | 2 +- - .../mac_notification_service_ns.mm | 2 +- - chrome/tools/webforms_aggregator_tests.py | 4 +- - chrome/tools/weburl_links.txt | 6 +- - chrome/updater/branding.gni | 12 +- - chrome/updater/mac/setup/ks_tickets.mm | 2 +- - chrome/utility/importer/ie_importer_win.cc | 2 +- - .../shell_devtools_discovery_page.html | 2 +- - chromecast/browser/webui/cast_webui.cc | 4 +- - .../runtime/browser/grpc_webui_controller.cc | 2 +- - chromecast/chromecast.gni | 2 +- - chromecast/crash/linux/minidump_uploader.cc | 2 +- - chromecast/net/connectivity_checker_impl.h | 4 +- - .../components/dbus/rmad/fake_rmad_client.cc | 2 +- - .../device_activity_controller.cc | 2 +- - .../ash/components/drivefs/drivefs_auth.cc | 2 +- - .../simple_geolocation_provider.cc | 2 +- - .../login/auth/recovery/service_constants.cc | 2 +- - .../multidevice/stub_multidevice_util.cc | 2 +- - .../components/timezone/timezone_request.cc | 2 +- - .../trial_group/trial_group_checker.cc | 2 +- - .../assistant_manager_service_impl.cc | 2 +- - chromeos/ash/services/assistant/service.cc | 2 +- - chromeos/chromeos_strings.grd | 6 +- - .../translation_result_loader.cc | 2 +- - chromeos/printing/ppd_provider.h | 2 +- - chromeos/printing/printer_config_cache.cc | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri1.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri10.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri11.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri12.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri13.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri14.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri15.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri18.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri19.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri2.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri24.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri3.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri4.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri49.txt | 2 +- - .../printing/uri_fuzzer_seed_corpus/uri5.txt | 2 +- - .../error_page_populator.cc | 2 +- - .../predictor_config_definitions.cc | 2 +- - .../autofill/content/renderer/form_cache.cc | 2 +- - .../renderer/page_passwords_analyser.cc | 2 +- - .../password_form_conversion_utils.cc | 2 +- - .../core/browser/autofill_download_manager.cc | 2 +- - .../core/browser/autofill_experiments.cc | 6 +- - .../browser/data_model/test_data_creator.cc | 6 +- - .../credit_card_fido_authenticator.cc | 2 +- - .../core/browser/payments/payments_client.cc | 2 +- - .../browser/payments/payments_service_url.cc | 10 +- - ...roid_chrome_autofill_assistant_strings.grd | 2 +- - .../autofill_assistant_onboarding_fetcher.cc | 2 +- - .../browser/headless/client_headless.cc | 2 +- - .../browser/service/server_url_fetcher.cc | 2 +- - .../launched_configs.cc | 4 +- - .../safe_browsing_triggered_popup_blocker.h | 4 +- - .../core/breadcrumb_manager_tab_helper.cc | 2 +- - .../strings/android/browser_ui_strings.grd | 6 +- - .../core/counters/history_counter.cc | 2 +- - .../core/history_notice_utils.cc | 4 +- - .../core/captive_portal_detector.cc | 2 +- - .../data/log_list.json | 22 +- - components/commerce/core/account_checker.cc | 10 +- - .../resources/cart_domain_cart_url_regex.json | 2 +- - .../subscriptions_server_proxy.cc | 4 +- - .../components_google_chrome_strings.grd | 2 +- - .../notes/core/server/notes_repository.cc | 2 +- - .../notes/core/server/notes_server_base.cc | 4 +- - .../notes/core/templates/template_fetcher.h | 2 +- - .../reactions/core/reaction_list_factory.cc | 4 +- - .../crash/core/app/crash_reporter_client.cc | 2 +- - .../crash/core/browser/resources/crashes.js | 4 +- - components/cronet/tools/generate_javadoc.py | 2 +- - .../core/html/dom_distiller_viewer.html | 2 +- - .../core/javascript/dom_distiller_viewer.js | 2 +- - components/dom_distiller/core/viewer.cc | 6 +- - .../domain_reliability/bake_in_configs.py | 286 +- - components/drive/service/drive_api_service.cc | 6 +- - .../error_page/common/localized_error.cc | 2 +- - .../favicon/core/large_icon_service_impl.cc | 2 +- - components/feed/core/v2/feed_network_impl.cc | 8 +- - components/feed/feed_feature_list.cc | 4 +- - components/feedback/feedback_uploader.cc | 2 +- - components/flags_ui/resources/flags.html | 4 +- - components/gcm_driver/gcm_account_mapper.cc | 2 +- - components/gcm_driver/gcm_client_impl.cc | 2 +- - .../core/browser/browsing_history_service.cc | 4 +- - .../history/core/browser/history_service.cc | 4 +- - .../core/browser/web_history_service.cc | 12 +- - .../per_user_topic_subscription_manager.cc | 2 +- - .../tab_modal_dialog_manager.cc | 2 +- - .../core/keyed_service_base_factory.cc | 2 +- - components/lens/lens_features.cc | 2 +- - components/media_router/common/media_source.h | 2 +- - .../metrics/net/net_metrics_log_uploader.cc | 2 +- - components/metrics/url_constants.cc | 6 +- - components/nacl/docs/dev/index.html | 4 +- - components/net_log/resources/net_export.html | 6 +- - .../network_time/network_time_tracker.cc | 2 +- - components/ntp_snippets/features.cc | 2 +- - .../ntp_snippets/ntp_snippets_constants.cc | 16 +- - components/ntp_snippets/remote/fetch.py | 8 +- - components/ntp_tiles/popular_sites_impl.cc | 2 +- - .../core/prefetch/prefetch_proto_utils.cc | 2 +- - .../core/prefetch/prefetch_server_urls.cc | 2 +- - .../omnibox/browser/document_provider.cc | 18 +- - .../browser/document_suggestions_service.cc | 4 +- - .../resources/omnibox_pedal_synonyms.grd | 138 +- - .../page_content_annotations_model_manager.cc | 2 +- - .../core/optimization_guide_constants.cc | 4 +- - .../core/page_entities_model_executor_impl.cc | 2 +- - .../core/prediction_manager.cc | 8 +- - .../ads_page_load_metrics_observer.cc | 2 +- - .../core/uma_page_load_metrics_observer.cc | 2 +- - .../use_counter_page_load_metrics_observer.cc | 4 +- - ...password_requirements_spec_fetcher_impl.cc | 2 +- - .../core/browser/hash_password_manager.cc | 2 +- - .../leak_detection/leak_detection_request.h | 2 +- - .../browser/leak_detection_dialog_utils.cc | 2 +- - .../browser/old_google_credentials_cleaner.cc | 8 +- - .../core/browser/password_hash_data.cc | 2 +- - .../browser/password_manager_constants.cc | 10 +- - .../core/browser/password_reuse_detector.cc | 2 +- - .../browser/password_scripts_fetcher_impl.cc | 2 +- - .../core/browser/password_sync_util.cc | 4 +- - .../core/browser/password_ui_utils.cc | 2 +- - .../core/browser/psl_matching_helper.cc | 6 +- - .../hash_affiliation_fetcher.cc | 2 +- - .../password_manager/ios/test_helpers.cc | 4 +- - .../payment_method_manifest_parser_fuzzer.cc | 2 +- - components/payments/core/error_strings.cc | 2 +- - components/payments/core/method_strings.cc | 6 +- - .../android/permissions_android_strings.grd | 4 +- - components/permissions/constants.cc | 2 +- - .../permissions/permission_context_base.cc | 10 +- - .../permissions/permission_request_manager.cc | 8 +- - .../prediction_service/prediction_common.h | 2 +- - .../core/browser/browser_policy_connector.cc | 10 +- - ...cloud_signin_restriction_policy_fetcher.cc | 2 +- - .../core/common/cloud/user_info_fetcher.cc | 4 +- - .../common/default_chrome_apps_migrator.cc | 16 +- - .../core/common/policy_loader_common.cc | 4 +- - .../policy/resources/policy_templates.json | 2414 ++++++++--------- - .../request_handler_for_policy.cc | 2 +- - .../policy/test_support/signature_provider.h | 4 +- - .../template_writers/writers/adm_writer.py | 4 +- - .../writers/doc_atomic_groups_writer.py | 2 +- - .../template_writers/writers/doc_writer.py | 10 +- - .../writers/ios_app_config_writer.py | 2 +- - .../writers/template_writer.py | 2 +- - components/quirks/quirks_client.cc | 2 +- - components/resources/terms/terms_am.html | 4 +- - components/resources/terms/terms_ar.html | 4 +- - components/resources/terms/terms_bg.html | 4 +- - components/resources/terms/terms_bn.html | 4 +- - components/resources/terms/terms_ca.html | 4 +- - components/resources/terms/terms_cs.html | 4 +- - components/resources/terms/terms_da.html | 4 +- - components/resources/terms/terms_de.html | 4 +- - components/resources/terms/terms_el.html | 4 +- - components/resources/terms/terms_en-GB.html | 4 +- - components/resources/terms/terms_en.html | 4 +- - components/resources/terms/terms_es-419.html | 4 +- - components/resources/terms/terms_es.html | 4 +- - components/resources/terms/terms_et.html | 4 +- - components/resources/terms/terms_fa.html | 4 +- - components/resources/terms/terms_fi.html | 4 +- - components/resources/terms/terms_fil.html | 4 +- - components/resources/terms/terms_fr.html | 4 +- - components/resources/terms/terms_gu.html | 4 +- - components/resources/terms/terms_he.html | 4 +- - components/resources/terms/terms_hi.html | 4 +- - components/resources/terms/terms_hr.html | 4 +- - components/resources/terms/terms_hu.html | 4 +- - components/resources/terms/terms_id.html | 4 +- - components/resources/terms/terms_it.html | 4 +- - components/resources/terms/terms_ja.html | 4 +- - components/resources/terms/terms_kn.html | 4 +- - components/resources/terms/terms_ko.html | 4 +- - components/resources/terms/terms_lt.html | 4 +- - components/resources/terms/terms_lv.html | 4 +- - components/resources/terms/terms_ml.html | 4 +- - components/resources/terms/terms_mr.html | 4 +- - components/resources/terms/terms_nb.html | 4 +- - components/resources/terms/terms_nl.html | 4 +- - components/resources/terms/terms_pl.html | 4 +- - components/resources/terms/terms_pt-BR.html | 4 +- - components/resources/terms/terms_pt-PT.html | 4 +- - components/resources/terms/terms_ro.html | 4 +- - components/resources/terms/terms_ru.html | 4 +- - components/resources/terms/terms_sk.html | 4 +- - components/resources/terms/terms_sl.html | 4 +- - components/resources/terms/terms_sr.html | 4 +- - components/resources/terms/terms_sv.html | 4 +- - components/resources/terms/terms_sw.html | 4 +- - components/resources/terms/terms_ta.html | 4 +- - components/resources/terms/terms_te.html | 4 +- - components/resources/terms/terms_th.html | 4 +- - components/resources/terms/terms_tr.html | 4 +- - components/resources/terms/terms_uk.html | 4 +- - components/resources/terms/terms_vi.html | 4 +- - components/resources/terms/terms_zh-CN.html | 4 +- - components/resources/terms/terms_zh-TW.html | 4 +- - .../browser/client_side_detection_service.cc | 2 +- - .../content/browser/triggers/trigger_util.cc | 2 +- - .../browser/db/v4_protocol_manager_util.cc | 4 +- - .../password_protection_service_base.cc | 2 +- - .../browser/realtime/url_lookup_service.cc | 2 +- - .../tailored_security_service.cc | 6 +- - ...tailored_security_service_observer_util.cc | 2 +- - .../safe_search_url_checker_client.cc | 2 +- - .../safe_search_api/stub_url_checker.cc | 2 +- - components/safety_check/url_constants.cc | 2 +- - .../template_url_starter_pack_data.cc | 2 +- - .../content/https_only_mode_blocking_page.cc | 2 +- - .../content/ssl_blocking_page.h | 2 +- - .../core/controller_client.cc | 2 +- - .../core/safe_browsing_loud_error_ui.cc | 4 +- - .../security_interstitials/core/urls.cc | 4 +- - ...ation_guide_segmentation_model_provider.cc | 2 +- - .../services/quarantine/quarantine_mac.mm | 2 +- - .../core/common/disabled_sites.cc | 16 +- - .../ios/shared_highlighting_constants.mm | 2 +- - .../browser/chrome_connected_header_helper.cc | 4 +- - .../browser/account_consistency_service.mm | 12 +- - .../identity_manager/access_token_fetcher.cc | 2 +- - .../browser/spelling_service_client.cc | 2 +- - .../browser/subresource_filter_constants.h | 8 +- - components/sync/base/sync_util.h | 4 +- - .../standalone_trusted_vault_client.cc | 2 +- - ...ted_vault_access_token_fetcher_frontend.cc | 2 +- - .../trusted_vault_server_constants.h | 2 +- - .../core/browser/translate_ranker_impl.cc | 6 +- - .../core/browser/translate_script.cc | 2 +- - .../translate/core/common/translate_util.cc | 2 +- - components/ui_devtools/agent_util.cc | 4 +- - components/ukm/ukm_reporting_service.cc | 2 +- - .../top_domains/make_alexa_top_list.py | 2 +- - components/url_matcher/url_util.cc | 4 +- - .../variations/variations_url_constants.cc | 4 +- - .../installable/installable_logging.cc | 2 +- - components/wifi/wifi_service_win.cc | 2 +- - .../render_widget_host_view_cocoa.mm | 2 +- - .../aggregation_service_features.cc | 2 +- - .../indexed_db/indexed_db_backing_store.cc | 2 +- - .../indexed_db/indexed_db_reporting.cc | 2 +- - .../interest_group_update_manager.cc | 2 +- - .../portal/portal_navigation_throttle.cc | 2 +- - .../renderer_host/navigation_request.cc | 6 +- - .../renderer_host/render_frame_host_impl.cc | 2 +- - content/browser/resources/gpu/info_view.js | 2 +- - .../speech/speech_recognition_engine.cc | 2 +- - .../browser/web_contents/web_contents_impl.cc | 2 +- - .../webauth/authenticator_common_impl.cc | 4 +- - content/browser/webauth/client_data_json.cc | 2 +- - .../webauth_request_security_checker.cc | 2 +- - .../webauth_request_security_checker.h | 4 +- - .../zygote_host/zygote_host_impl_linux.cc | 2 +- - .../pepper/pepper_media_device_manager.cc | 2 +- - content/renderer/render_thread_impl.cc | 14 +- - .../shell/browser/shell_browser_main_parts.cc | 2 +- - content/zygote/zygote_main_linux.cc | 2 +- - device/bluetooth/bluetooth_adapter_mac.mm | 2 +- - .../bluetooth/bluetooth_classic_device_mac.mm | 4 +- - device/fido/fido_strings.grd | 2 +- - device/fido/fido_test_data.h | 2 +- - device/gamepad/xbox_controller_mac.mm | 2 +- - docs/enterprise/extension_query.py | 4 +- - docs/enterprise/extension_query_py2.py | 4 +- - .../web_request/web_request_permissions.cc | 4 +- - extensions/browser/suggest_permission_util.cc | 4 +- - .../browser/updater/extension_downloader.cc | 4 +- - .../browser/updater/safe_manifest_parser.cc | 2 +- - extensions/common/api/_api_features.json | 2 +- - .../common/api/extensions_manifest_types.json | 6 +- - extensions/common/api/i18n.json | 2 +- - extensions/common/csp_validator.cc | 2 +- - extensions/common/extension_urls.cc | 12 +- - extensions/common/manifest_constants.cc | 6 +- - extensions/strings/extensions_strings.grd | 4 +- - google_apis/drive/drive_api_url_generator.cc | 2 +- - google_apis/gaia/gaia_auth_fetcher.cc | 4 +- - google_apis/gaia/gaia_auth_util.cc | 8 +- - google_apis/gaia/gaia_constants.cc | 84 +- - google_apis/gaia/gaia_oauth_client.cc | 6 +- - google_apis/gaia/gaia_urls.cc | 10 +- - google_apis/gcm/base/mcs_util.cc | 2 +- - google_apis/gcm/engine/gservices_settings.cc | 6 +- - google_apis/gcm/engine/mcs_client.cc | 2 +- - google_apis/gcm/tools/mcs_probe.cc | 2 +- - google_apis/google_api_keys.cc | 2 +- - .../ANGLE/EGL_ANGLE_sync_control_rate.txt | 2 +- - .../CHROMIUM/EGL_CHROMIUM_sync_control.txt | 2 +- - .../iosurface_image_backing_factory.mm | 2 +- - gpu/config/gpu_control_list_format.txt | 2 +- - .../lib/browser/protocol/headless_handler.cc | 2 +- - ios/build/bots/scripts/result_sink_util.py | 4 +- - ios/build/bots/scripts/test_result_util.py | 6 +- - ios/build/bots/scripts/xcode_util.py | 4 +- - ios/build/chrome_build.gni | 2 +- - .../app/strings/ios_chromium_strings.grd | 18 +- - .../app/strings/ios_google_chrome_strings.grd | 18 +- - ios/chrome/app/strings/ios_strings.grd | 44 +- - ios/chrome/browser/autofill/BUILD.gn | 4 +- - .../autofill/automation/automation_action.mm | 2 +- - ...chrome_browser_state_removal_controller.mm | 2 +- - ios/chrome/browser/flags/about_flags.mm | 4 +- - ios/chrome/browser/omaha/omaha_service.mm | 2 +- - .../search_engine_tab_helper.mm | 8 +- - .../activity_services/activity_type_util.mm | 2 +- - .../ui/bookmarks/bookmark_earl_grey.mm | 2 +- - .../new_tab_page_app_interface.mm | 4 +- - .../content_suggestions/ntp_home_mediator.mm | 8 +- - .../browser/ui/main/scene_controller.mm | 2 +- - .../browser/ui/ntp/discover_feed_constants.mm | 2 +- - ios/chrome/browser/ui/ntp/incognito_view.mm | 2 +- - .../browser/ui/ntp/revamped_incognito_view.mm | 2 +- - .../ui/qr_scanner/qr_scanner_app_interface.mm | 2 +- - .../ui/settings/settings_app_interface.mm | 2 +- - .../table_cell_catalog_view_controller.mm | 8 +- - .../translate_table_view_controller.mm | 2 +- - .../interstitials/interstitial_ui_util.mm | 2 +- - .../browser/url/chrome_url_constants.cc | 40 +- - ..._credential_provider_extension_strings.grd | 8 +- - .../password_spec_fetcher.mm | 2 +- - .../https_only_mode_blocking_page.mm | 2 +- - ios/net/cookies/cookie_store_ios_test_util.mm | 2 +- - ios/net/crn_http_protocol_handler.mm | 2 +- - .../browser/signin/chrome_identity_service.mm | 4 +- - .../browser/signin/fake_chrome_identity.mm | 6 +- - .../signin/fake_chrome_identity_service.mm | 2 +- - .../fake_chrome_identity_service_constants.mm | 2 +- - ios/showcase/alert/sc_alert_coordinator.mm | 8 +- - .../sc_infobar_modal_save_card_coordinator.mm | 2 +- - .../fake_autocomplete_suggestion.mm | 4 +- - ios/web/navigation/navigation_manager_impl.mm | 6 +- - .../web_state/ui/wk_content_rule_list_util.mm | 2 +- - ios/web_view/internal/cwv_flags.mm | 2 +- - ios/web_view/internal/cwv_web_view.mm | 2 +- - media/base/win/mf_initializer.cc | 2 +- - .../native_pixmap_handle_mojom_traits.cc | 12 +- - ...stable_video_decoder_types_mojom_traits.cc | 178 +- - .../src/build_tools/build_paths.py | 2 +- - .../src/build_tools/buildbot_common.py | 2 +- - .../build_tools/json/naclsdk_manifest.json | 32 +- - .../build_tools/json/naclsdk_manifest0.json | 2 +- - .../build_tools/json/naclsdk_manifest2.json | 4 +- - .../src/build_tools/nacl-mono-buildbot.py | 2 +- - .../src/build_tools/nacl-mono-builder.py | 2 +- - .../src/build_tools/sdk_tools/cacerts.txt | 2 +- - .../src/build_tools/sdk_tools/config.py | 2 +- - .../build_tools/sdk_tools/sdk_update_main.py | 2 +- - .../third_party/fancy_urllib/__init__.py | 4 +- - .../src/build_tools/update_nacl_manifest.py | 6 +- - .../src/build_tools/update_sdktools.py | 2 +- - native_client_sdk/src/doc/Makefile | 2 +- - .../security-contest/contest-warning.txt | 4 +- - native_client_sdk/src/doc/conf.py | 2 +- - .../src/doc/doxygen/generate_docs.py | 2 +- - native_client_sdk/src/doc/migration/apps.html | 8 +- - .../src/doc/migration/public.html | 2 +- - .../src/examples/api/socket/index.html | 2 +- - .../src/examples/demo/drive/drive.cc | 4 +- - .../src/examples/demo/drive/index.html | 2 +- - .../src/examples/demo/nacl_io_demo/index.html | 6 +- - .../src/gonacl_appengine/gonacl.py | 8 +- - .../static/bullet/fullscreen.html | 4 +- - .../gonacl_appengine/static/bullet/index.html | 4 +- - .../gonacl_appengine/static/bullet/main.js | 2 +- - .../gonacl_appengine/static/cube/example.js | 2 +- - .../gonacl_appengine/static/cube/index.html | 2 +- - .../gonacl_appengine/static/earth/example.js | 2 +- - .../gonacl_appengine/static/earth/index.html | 2 +- - .../gonacl_appengine/static/home/index.html | 2 +- - .../src/gonacl_appengine/static/index.html | 6 +- - .../gonacl_appengine/static/life/example.js | 2 +- - .../gonacl_appengine/static/life/index.html | 2 +- - .../gonacl_appengine/static/lua/index.html | 6 +- - .../src/gonacl_appengine/static/lua/lua.js | 2 +- - .../gonacl_appengine/static/lua/naclterm.js | 2 +- - .../static/smoothlife/example.js | 2 +- - .../static/smoothlife/index.html | 4 +- - .../static/voronoi/example.js | 2 +- - .../static/voronoi/index.html | 2 +- - native_client_sdk/src/tools/fix_manifest.py | 2 +- - native_client_sdk/src/web/manifest.html | 6 +- - net/base/network_change_notifier_mac.mm | 2 +- - .../http_security_header_047.txt | Bin 166 -> 169 bytes - net/dns/dns_test_util.h | 12 +- - net/dns/dns_transaction.cc | 2 +- - net/dns/public/doh_provider_entry.cc | 4 +- - net/http/http_server_properties.cc | 4 +- - net/http/webfonts_histogram.cc | 6 +- - net/log/file_net_log_observer.cc | 2 +- - net/quic/crypto/proof_verifier_chromium.cc | 2 +- - net/quic/quic_stream_factory.cc | 8 +- - net/spdy/spdy_session.cc | 2 +- - net/tools/print_certificates.py | 2 +- - net/tools/testserver/testserver.py.vpython3 | 4 +- - .../transport_security_state_generator.cc | 2 +- - printing/backend/win_helper.cc | 4 +- - printing/print_settings_initializer_win.cc | 2 +- - remoting/base/breakpad_mac.mm | 2 +- - remoting/base/chromium_url_request.cc | 2 +- - remoting/base/service_urls.cc | 8 +- - .../notification/gstatic_json_fetcher.cc | 2 +- - ...rome.remote_assistance-firefox.json.jinja2 | 2 +- - remoting/host/it2me/it2me_constants.cc | 2 +- - remoting/host/linux/linux_me2me_host.py | 4 +- - remoting/host/linux/remoting_user_session.cc | 2 +- - remoting/host/remoting_me2me_host.cc | 2 +- - ....chrome.remote_desktop-firefox.json.jinja2 | 2 +- - remoting/host/setup/start_host_main.cc | 2 +- - remoting/ios/app/help_view_controller.mm | 2 +- - .../ios/app/host_setup_view_controller.mm | 2 +- - .../ios/app/remoting_menu_view_controller.mm | 10 +- - .../facade/remoting_oauth_authentication.mm | 2 +- - remoting/protocol/fake_session.cc | 2 +- - remoting/resources/remoting_strings.grd | 8 +- - remoting/signaling/signaling_id_util.cc | 4 +- - remoting/tools/build/remoting_localize.py | 6 +- - remoting/tools/zip2msi.py | 2 +- - rlz/lib/financial_ping.cc | 2 +- - sandbox/features.gni | 2 +- - sandbox/linux/services/libc_interceptor.cc | 2 +- - .../linux/suid/client/setuid_sandbox_host.cc | 2 +- - sandbox/linux/suid/sandbox.c | 2 +- - sandbox/policy/win/sandbox_win.cc | 2 +- - .../geolocation/network_location_request.cc | 2 +- - .../image_annotation_service.h | 4 +- - .../markdown/extensions/smarty.py | 2 +- - .../Python-Markdown/markdown/pep562.py | 2 +- - .../abseil-cpp/absl/abseil.podspec.gen.py | 2 +- - third_party/abseil-cpp/conanfile.py | 2 +- - third_party/abseil-cpp/generate_def_files.py | 2 +- - third_party/abseil-cpp/roll_abseil.py | 4 +- - third_party/afl/src/Makefile | 4 +- - third_party/afl/src/afl-analyze.c | 2 +- - third_party/afl/src/afl-as.c | 2 +- - third_party/afl/src/afl-fuzz.c | 2 +- - third_party/afl/src/afl-gcc.c | 2 +- - third_party/afl/src/afl-gotcpu.c | 4 +- - third_party/afl/src/afl-showmap.c | 2 +- - third_party/afl/src/afl-tmin.c | 2 +- - third_party/afl/src/docs/QuickStartGuide.txt | 2 +- - third_party/afl/src/docs/historical_notes.txt | 2 +- - third_party/afl/src/docs/notes_for_asan.txt | 2 +- - third_party/afl/src/docs/sister_projects.txt | 4 +- - .../canvas_harness/canvas_harness.html | 2 +- - third_party/afl/src/libdislocator/Makefile | 2 +- - third_party/afl/src/libtokencap/Makefile | 2 +- - third_party/afl/src/llvm_mode/Makefile | 6 +- - .../afl/src/llvm_mode/afl-clang-fast.c | 4 +- - .../android_build_tools/aapt2/3pp/fetch.py | 4 +- - .../apkanalyzer/3pp/fetch.py | 2 +- - .../apkanalyzer/3pp/install.py | 2 +- - .../android_build_tools/lint/3pp/fetch.py | 2 +- - .../android_build_tools/lint/3pp/install.py | 2 +- - .../manifest_merger/3pp/fetch.py | 2 +- - .../manifest_merger/3pp/install.py | 2 +- - .../android_arch_core_common/3pp/fetch.py | 2 +- - .../android_arch_core_runtime/3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../com_android_support_design/3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../com_android_support_loader/3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../com_android_support_multidex/3pp/fetch.py | 2 +- - .../com_android_support_print/3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../com_android_tools_common/3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../com_android_tools_sdk_common/3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../com_google_android_play_core/3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../3pp/fetch.py | 2 +- - .../Android_SDK_License-December_9_2016.txt | 4 +- - .../runner/src/main/Android.mk | 2 +- - third_party/androidx/fetch_all_androidx.py | 2 +- - .../common/loader/record_load_histograms.cc | 2 +- - .../blink/public/strings/blink_strings.grd | 8 +- - .../renderer/bindings/scripts/utilities.py | 2 +- - .../build/scripts/update_css_ranking.py | 4 +- - .../core/css/remote_font_face_source.cc | 2 +- - .../blink/renderer/core/dom/element.cc | 2 +- - .../renderer/core/dom/events/event_target.cc | 2 +- - .../blink/renderer/core/events/touch_event.cc | 2 +- - .../blink/renderer/core/events/wheel_event.cc | 2 +- - .../blink/renderer/core/frame/local_frame.cc | 4 +- - .../renderer/core/html/html_iframe_element.cc | 2 +- - .../core/html/media/autoplay_policy.cc | 4 +- - .../core/html/media/html_media_element.cc | 4 +- - .../core/html/portal/html_portal_element.cc | 4 +- - .../renderer/core/loader/frame_loader.cc | 4 +- - .../core/loader/mixed_content_checker.cc | 2 +- - .../core/loader/subresource_filter.cc | 2 +- - .../script/document_write_intervention.cc | 6 +- - .../core/xmlhttprequest/xml_http_request.cc | 2 +- - .../modules/bluetooth/bluetooth_error.cc | 16 +- - .../modules/clipboard/clipboard_promise.cc | 2 +- - .../credentials_container.cc | 6 +- - .../encryptedmedia/encrypted_media_utils.h | 2 +- - .../modules/geolocation/geolocation.cc | 2 +- - .../play_app_url_manifest.json | 2 +- - .../modules/payments/payment_request.cc | 6 +- - .../modules/vibration/vibration_controller.cc | 4 +- - .../modules/webaudio/audio_context.cc | 4 +- - .../modules/webmidi/navigator_web_midi.cc | 2 +- - .../platform/fonts/mac/font_cache_mac.mm | 4 +- - .../platform/loader/fetch/resource_error.cc | 2 +- - .../loader/fetch/resource_load_scheduler.cc | 2 +- - .../platform/weborigin/security_origin.cc | 2 +- - .../blink/tools/blinkpy/common/net/git_cl.py | 4 +- - .../blinkpy/common/net/results_fetcher.py | 10 +- - .../blink/tools/blinkpy/common/net/rpc.py | 6 +- - .../blink/tools/blinkpy/common/pretty_diff.py | 2 +- - .../tools/blinkpy/common/system/filesystem.py | 2 +- - .../tools/blinkpy/common/system/profiler.py | 2 +- - .../blink/tools/blinkpy/style/filter.py | 2 +- - .../blinkpy/tool/commands/flaky_tests.py | 6 +- - .../tools/blinkpy/w3c/chromium_commit.py | 2 +- - .../tools/blinkpy/w3c/chromium_commit_mock.py | 2 +- - third_party/blink/tools/blinkpy/w3c/common.py | 4 +- - .../blinkpy/w3c/directory_owners_extractor.py | 2 +- - .../tools/blinkpy/w3c/export_notifier.py | 4 +- - third_party/blink/tools/blinkpy/w3c/gerrit.py | 6 +- - .../tools/blinkpy/w3c/import_notifier.py | 4 +- - .../blink/tools/blinkpy/w3c/monorail.py | 2 +- - .../tools/blinkpy/w3c/pr_cleanup_tool.py | 2 +- - .../blink/tools/blinkpy/w3c/test_exporter.py | 4 +- - .../blink/tools/blinkpy/w3c/test_importer.py | 10 +- - .../blinkpy/w3c/wpt_results_processor.py | 2 +- - .../blink/tools/blinkpy/w3c/wpt_uploader.py | 2 +- - .../blink/tools/commit_stats/org-list.txt | 10 +- - .../print_stale_test_expectations_entries.py | 2 +- - third_party/boringssl/roll_boringssl.py | 2 +- - .../closure/bin/build/depstree.py | 2 +- - .../closure/bin/build/source.py | 2 +- - .../closure/bin/build/treescan.py | 2 +- - .../externs/chrome_extensions.js | 6 +- - .../externs/command_line_private.js | 4 +- - .../crashpad/build/install_linux_sysroot.py | 2 +- - third_party/crashpad/crashpad/package.h | 4 +- - third_party/crashpad/update.py | 2 +- - third_party/dav1d/generate_source.py | 2 +- - .../protoc_plugins/util/plugin_protos.py | 4 +- - .../closure/bin/build/closurebuilder.py | 2 +- - .../closure/bin/build/depstree.py | 2 +- - .../closure/bin/build/depswriter.py | 2 +- - .../closure/bin/build/source.py | 2 +- - .../closure/bin/build/treescan.py | 2 +- - .../closure/css/inlay/g-base.css | 4 +- - .../closure/css/inlay/g-fixed.css | 4 +- - .../closure/css/inlay/g-ratio.css | 4 +- - .../closure/goog/css/bubble.css | 18 +- - .../closure/goog/css/checkbox.css | 4 +- - .../closure/goog/css/colorpalette.css | 2 +- - .../goog/css/colorpicker-simplegrid.css | 2 +- - .../closure/goog/css/combobox.css | 2 +- - .../closure/goog/css/css3menubutton.css | 2 +- - .../closure/goog/css/custombutton.css | 2 +- - .../closure/goog/css/dialog.css | 2 +- - .../closure/goog/css/dragdropdetector.css | 4 +- - .../closure/goog/css/editor/bubble.css | 2 +- - .../goog/css/editor/equationeditor.css | 2 +- - .../closure/goog/css/editortoolbar.css | 2 +- - .../closure/goog/css/flatmenubutton.css | 2 +- - .../closure/goog/css/hsvapalette.css | 8 +- - .../closure/goog/css/hsvpalette.css | 8 +- - .../closure/goog/css/imagelessmenubutton.css | 2 +- - .../closure/goog/css/menubutton.css | 4 +- - .../closure/goog/css/menuitem.css | 2 +- - .../closure/goog/css/toolbar.css | 4 +- - .../closure/goog/css/tree.css | 4 +- - .../closure/goog/css/tristatemenuitem.css | 4 +- - .../goog/demos/autocompleterichremotedata.js | 16 +- - .../demos/autocompleterichremotedata.json | 16 +- - .../closure/goog/demos/css/demo.css | 2 +- - .../closure/goog/demos/css/emojipicker.css | 2 +- - .../closure/goog/demos/dialog.html | 4 +- - .../demos/graphics/advancedcoordinates.html | 2 +- - .../demos/graphics/advancedcoordinates2.html | 2 +- - .../goog/demos/graphics/basicelements.html | 4 +- - .../closure/goog/demos/history1.html | 2 +- - .../closure/goog/demos/history2.html | 2 +- - .../closure/goog/demos/history3.html | 2 +- - .../closure/goog/demos/hovercard.html | 18 +- - .../closure/goog/demos/splitpane.html | 2 +- - .../closure/goog/html/safeurl_test_vectors.js | 8 +- - .../goog/html/sanitizer/html_test_vectors.js | 2 +- - .../goog/labs/net/webchannel/environment.js | 2 +- - .../goog/labs/net/webchannel/netutils.js | 2 +- - .../labs/net/webchannel/webchannelbase.js | 4 +- - .../closure/goog/net/browserchannel.js | 4 +- - .../closure/goog/net/networktester.js | 2 +- - .../closure/goog/net/tmpnetwork.js | 2 +- - .../closure/goog/soy/soy_testhelper.js | 4 +- - .../closure/goog/transpile.js | 46 +- - .../closure/goog/ui/editor/linkdialog.js | 2 +- - .../closure/goog/ui/editor/messages.js | 2 +- - .../closure/goog/ui/media/googlevideo.js | 6 +- - .../closure/goog/ui/media/mp3.js | 2 +- - .../closure/goog/ui/media/picasa.js | 8 +- - .../closure/goog/ui/media/youtube.js | 6 +- - .../closure/goog/ui/serverchart.js | 6 +- - .../doc/_layouts/article.html | 2 +- - .../google-closure-library/doc/js/article.js | 2 +- - .../src/chrome/os/inputview/adapter.js | 4 +- - .../closure/bin/build/closurebuilder.py | 2 +- - .../closure/bin/build/depstree.py | 2 +- - .../closure/bin/build/depswriter.py | 2 +- - .../closure/bin/build/source.py | 2 +- - .../closure/bin/build/treescan.py | 2 +- - .../closure_library/closure/bin/scopify.py | 2 +- - .../hunspell/src/hunspell/affentry.cxx | 2 +- - .../hunspell/src/hunspell/affentry.hxx | 2 +- - .../hunspell/src/hunspell/affixmgr.cxx | 2 +- - .../hunspell/src/hunspell/affixmgr.hxx | 2 +- - third_party/hunspell/src/hunspell/atypes.hxx | 2 +- - .../hunspell/src/hunspell/baseaffix.hxx | 2 +- - third_party/hunspell/src/hunspell/csutil.cxx | 2 +- - third_party/hunspell/src/hunspell/csutil.hxx | 2 +- - third_party/hunspell/src/hunspell/filemgr.cxx | 2 +- - third_party/hunspell/src/hunspell/filemgr.hxx | 2 +- - third_party/hunspell/src/hunspell/hashmgr.cxx | 2 +- - third_party/hunspell/src/hunspell/hashmgr.hxx | 2 +- - third_party/hunspell/src/hunspell/htypes.hxx | 2 +- - .../hunspell/src/hunspell/hunspell.cxx | 2 +- - .../hunspell/src/hunspell/hunspell.hxx | 2 +- - third_party/hunspell/src/hunspell/hunzip.cxx | 2 +- - third_party/hunspell/src/hunspell/hunzip.hxx | 2 +- - third_party/hunspell/src/hunspell/langnum.hxx | 2 +- - third_party/hunspell/src/hunspell/replist.cxx | 2 +- - third_party/hunspell/src/hunspell/replist.hxx | 2 +- - .../hunspell/src/hunspell/suggestmgr.cxx | 2 +- - .../hunspell/src/hunspell/suggestmgr.hxx | 2 +- - third_party/hunspell/src/hunspell/w_char.hxx | 2 +- - .../hunspell/src/parsers/firstparser.cxx | 2 +- - .../hunspell/src/parsers/firstparser.hxx | 2 +- - .../hunspell/src/parsers/htmlparser.cxx | 2 +- - .../hunspell/src/parsers/htmlparser.hxx | 2 +- - .../hunspell/src/parsers/latexparser.cxx | 2 +- - .../hunspell/src/parsers/latexparser.hxx | 2 +- - .../hunspell/src/parsers/manparser.cxx | 2 +- - .../hunspell/src/parsers/manparser.hxx | 2 +- - .../hunspell/src/parsers/odfparser.cxx | 2 +- - .../hunspell/src/parsers/odfparser.hxx | 2 +- - .../hunspell/src/parsers/testparser.cxx | 2 +- - .../hunspell/src/parsers/textparser.cxx | 2 +- - .../hunspell/src/parsers/textparser.hxx | 2 +- - .../hunspell/src/parsers/xmlparser.cxx | 2 +- - .../hunspell/src/parsers/xmlparser.hxx | 2 +- - .../src/be/hyph-be.lic.txt | 6 +- - .../src/hu/hyph-hu.lic.txt | 4 +- - .../src/hy/hyph-hy.lic.txt | 2 +- - third_party/inspector_protocol/roll.py | 4 +- - third_party/jstemplate/compile.py | 2 +- - .../jstemplate/jstemplate_example.html | 2 +- - third_party/jstemplate/jstemplate_jsunit.html | 10 +- - third_party/libaddressinput/BUILD.gn | 2 +- - .../chromium/tools/require_fields.py | 2 +- - third_party/libevent/evdns.c | 2 +- - .../libpng/contrib/oss-fuzz/README.txt | 2 +- - .../libusb/src/libusb/os/windows_usb.c | 4 +- - third_party/libxslt/chromium/roll.py | 2 +- - third_party/maldoca/src/maldoca/base/status.h | 2 +- - .../maldoca/src/maldoca/ole/vba_extract.cc | 2 +- - third_party/mozilla/NSPasteboard+Utils.mm | 2 +- - third_party/mozilla/NSString+Utils.mm | 2 +- - third_party/opus/src/doc/opus_in_isobmff.html | 2 +- - third_party/opus/src/doc/release.txt | 6 +- - third_party/pefile_py3/pefile.py | 4 +- - third_party/protobuf/CHANGES.txt | 12 +- - third_party/protobuf/CONTRIBUTORS.txt | 70 +- - third_party/protobuf/cmake/CMakeLists.txt | 2 +- - third_party/protobuf/composer.json | 2 +- - .../binary_json_conformance_suite.cc | 46 +- - .../protobuf/conformance/conformance_cpp.cc | 2 +- - .../text_format_conformance_suite.cc | 6 +- - .../Tests/GPBObjectiveCPlusPlusTest.mm | 2 +- - third_party/protobuf/php/composer.json | 2 +- - .../php/ext/google/protobuf/convert.c | 2 +- - .../php/ext/google/protobuf/message.c | 4 +- - .../protobuf/python/docs/generate_docs.py | 2 +- - .../python/google/protobuf/descriptor.py | 2 +- - .../google/protobuf/descriptor_database.py | 2 +- - .../python/google/protobuf/descriptor_pool.py | 2 +- - .../protobuf/internal/_parameterized.py | 2 +- - .../google/protobuf/internal/builder.py | 2 +- - .../google/protobuf/internal/decoder.py | 2 +- - .../google/protobuf/internal/encoder.py | 2 +- - .../protobuf/internal/enum_type_wrapper.py | 2 +- - .../protobuf/internal/message_listener.py | 2 +- - .../protobuf/internal/python_message.py | 2 +- - .../google/protobuf/internal/test_util.py | 2 +- - .../google/protobuf/internal/type_checkers.py | 2 +- - .../protobuf/internal/well_known_types.py | 4 +- - .../google/protobuf/internal/wire_format.py | 2 +- - .../python/google/protobuf/json_format.py | 2 +- - .../python/google/protobuf/message.py | 2 +- - .../python/google/protobuf/message_factory.py | 2 +- - .../google/protobuf/pyext/cpp_message.py | 2 +- - .../python/google/protobuf/reflection.py | 2 +- - .../python/google/protobuf/service.py | 2 +- - .../google/protobuf/service_reflection.py | 2 +- - .../python/google/protobuf/text_format.py | 2 +- - .../generate_py_protobufs.py | 2 +- - .../python/protobuf_distutils/setup.py | 6 +- - third_party/protobuf/python/setup.py | 6 +- - .../protobuf/src/google/protobuf/any_lite.cc | 4 +- - .../protobuf/compiler/java/java_message.cc | 2 +- - .../compiler/js/well_known_types_embed.cc | 2 +- - .../src/google/protobuf/compiler/parser.cc | 8 +- - .../google/protobuf/util/internal/constants.h | 6 +- - .../util/internal/protostream_objectwriter.cc | 44 +- - .../src/google/protobuf/util/json_util.cc | 2 +- - third_party/protobuf/update_version.py | 4 +- - .../pycoverage/coverage/htmlfiles/pyfile.html | 2 +- - .../src/benchmarks/chromium.linux.json | 152 +- - third_party/pyjson5/src/setup.py | 2 +- - third_party/r8/3pp/fetch.py | 4 +- - third_party/rust/adler/v1/BUILD.gn | 2 +- - third_party/rust/aho_corasick/v0_7/BUILD.gn | 2 +- - third_party/rust/atty/v0_2/BUILD.gn | 2 +- - third_party/rust/autocfg/v1/BUILD.gn | 2 +- - third_party/rust/autocxx/v0_22/BUILD.gn | 2 +- - .../rust/autocxx_bindgen/v0_60/BUILD.gn | 4 +- - .../rust/autocxx_engine/v0_22/BUILD.gn | 2 +- - third_party/rust/autocxx_gen/v0_22/BUILD.gn | 2 +- - third_party/rust/autocxx_macro/v0_22/BUILD.gn | 2 +- - .../rust/autocxx_parser/v0_22/BUILD.gn | 2 +- - third_party/rust/bindgen/v0_60/BUILD.gn | 4 +- - third_party/rust/camino/v1/BUILD.gn | 2 +- - third_party/rust/cxx/v1/BUILD.gn | 2 +- - third_party/rust/cxx_gen/v0_7/BUILD.gn | 2 +- - third_party/rust/cxxbridge_cmd/v1/BUILD.gn | 4 +- - third_party/rust/cxxbridge_macro/v1/BUILD.gn | 2 +- - third_party/rust/fastrand/v1/BUILD.gn | 2 +- - third_party/rust/hashbrown/v0_11/BUILD.gn | 2 +- - third_party/rust/heck/v0_4/BUILD.gn | 2 +- - third_party/rust/indexmap/v1/BUILD.gn | 2 +- - third_party/rust/indoc/v1/BUILD.gn | 2 +- - third_party/rust/itoa/v0_4/BUILD.gn | 2 +- - third_party/rust/itoa/v1/BUILD.gn | 2 +- - third_party/rust/lazy_static/v1/BUILD.gn | 2 +- - third_party/rust/link_cplusplus/v1/BUILD.gn | 2 +- - third_party/rust/memchr/v2/BUILD.gn | 2 +- - third_party/rust/memoffset/v0_6/BUILD.gn | 2 +- - .../rust/minimal_lexical/v0_2/BUILD.gn | 2 +- - third_party/rust/miniz_oxide/v0_4/BUILD.gn | 2 +- - third_party/rust/moveit/v0_5/BUILD.gn | 2 +- - third_party/rust/once_cell/v1/BUILD.gn | 4 +- - third_party/rust/pathdiff/v0_2/BUILD.gn | 2 +- - .../rust/peeking_take_while/v0_1/BUILD.gn | 2 +- - third_party/rust/prettyplease/v0_1/BUILD.gn | 2 +- - third_party/rust/proc_macro2/v1/BUILD.gn | 2 +- - third_party/rust/quote/v1/BUILD.gn | 2 +- - third_party/rust/remove_dir_all/v0_5/BUILD.gn | 2 +- - third_party/rust/rstest/v0_12/BUILD.gn | 2 +- - .../v0_12/crate/docs/head/COPYRIGHT.txt | 2 +- - third_party/rust/rustc_version/v0_4/BUILD.gn | 2 +- - third_party/rust/rustversion/v1/BUILD.gn | 2 +- - third_party/rust/ryu/v1/BUILD.gn | 2 +- - third_party/rust/semver/v1/BUILD.gn | 4 +- - third_party/rust/serde/v1/BUILD.gn | 2 +- - third_party/rust/serde_derive/v1/BUILD.gn | 2 +- - third_party/rust/serde_json/v1/BUILD.gn | 2 +- - .../rust/serde_json_lenient/v0_1/BUILD.gn | 2 +- - third_party/rust/shlex/v1/BUILD.gn | 2 +- - third_party/rust/strum_macros/v0_24/BUILD.gn | 2 +- - third_party/rust/syn/v1/BUILD.gn | 4 +- - third_party/rust/tempfile/v3/BUILD.gn | 4 +- - third_party/rust/termcolor/v1/BUILD.gn | 2 +- - third_party/rust/thiserror/v1/BUILD.gn | 2 +- - third_party/rust/thiserror_impl/v1/BUILD.gn | 2 +- - third_party/rust/unicode_ident/v1/BUILD.gn | 2 +- - .../rust/unicode_linebreak/v0_1/BUILD.gn | 2 +- - third_party/rust/unicode_width/v0_1/BUILD.gn | 2 +- - third_party/rust/unindent/v0_1/BUILD.gn | 2 +- - third_party/rust/which/v4/BUILD.gn | 2 +- - third_party/rust/winapi/v0_3/BUILD.gn | 2 +- - third_party/rust/winapi_util/v0_1/BUILD.gn | 2 +- - .../tensorflow_text/core/ops/rouge_l_op.cc | 2 +- - .../metrics/text_similarity_metric_ops.py | 2 +- - .../updater/chrome_mac_universal/3pp/fetch.py | 2 +- - .../chrome_mac_universal_prod/3pp/fetch.py | 2 +- - .../updater/chrome_win_x86/3pp/fetch.py | 2 +- - .../updater/chrome_win_x86_64/3pp/fetch.py | 2 +- - .../updater/chromium_mac_amd64/3pp/fetch.py | 6 +- - .../updater/chromium_mac_arm64/3pp/fetch.py | 6 +- - .../updater/chromium_win_x86/3pp/fetch.py | 6 +- - .../updater/chromium_win_x86_64/3pp/fetch.py | 6 +- - third_party/wpt_tools/roll_wpt.py | 8 +- - third_party/wpt_tools/wpt/tools/lint/rules.py | 4 +- - .../tools/third_party/pywebsocket3/setup.py | 2 +- - .../wpt/tools/webdriver/webdriver/client.py | 2 +- - .../wpt_tools/wpt/tools/wpt/android.py | 2 +- - .../wpt_tools/wpt/tools/wpt/browser.py | 32 +- - third_party/wpt_tools/wpt/tools/wpt/run.py | 4 +- - .../wpt/tools/wptrunner/requirements.txt | 2 +- - .../wpt_tools/wpt/tools/wptrunner/setup.py | 2 +- - .../executors/executorcontentshell.py | 2 +- - .../wptrunner/executors/executormarionette.py | 14 +- - .../wptrunner/formatters/chromium.py | 2 +- - third_party/xnnpack/generate_build_gn.py | 2 +- - .../codereview/download_issue.py | 6 +- - tools/accessibility/codereview/mph.py | 2 +- - tools/accessibility/inspect/ax_utils.cc | 2 +- - tools/accessibility/nvda/README.txt | 2 +- - tools/android/checkxmlstyle/checkxmlstyle.py | 8 +- - .../scripts/customtabs_benchmark.py | 2 +- - .../scripts/run_benchmark.py | 2 +- - .../scripts/sample_config.json | 4 +- - .../js/src/class_view.html | 2 +- - .../dependency_analysis/js/src/load_graph.js | 2 +- - .../js/src/package_view.html | 2 +- - .../dependency_analysis/upload_html_viewer.py | 2 +- - .../convenience/touch_resources.py | 2 +- - tools/android/sdk_updater/update_sdk.py | 2 +- - tools/binary_size/diagnose_bloat.py | 4 +- - tools/binary_size/libsupersize/console.py | 2 +- - .../libsupersize/viewer/static/auth-consts.js | 8 +- - .../libsupersize/viewer/static/index.html | 2 +- - .../libsupersize/viewer/static/index.js | 2 +- - .../viewer/static/tree-worker-wasm.js | 4 +- - .../libsupersize/viewer/static/viewer.html | 8 +- - .../libsupersize/viewer/upload_html_viewer.py | 2 +- - tools/binary_size/libsupersize/zip_util.py | 2 +- - .../binary_size/trybot_commit_size_checker.py | 4 +- - tools/bisect-builds.py | 30 +- - tools/bisect_repackage/bisect_repackage.py | 4 +- - .../bisect_repackage_utils.py | 4 +- - tools/boilerplate.py | 2 +- - tools/browserbench-webdriver/browserbench.py | 2 +- - tools/captured_sites/refresh.py | 2 +- - tools/check_git_config.py | 24 +- - tools/checklicenses/checklicenses.py | 2 +- - tools/checkteamtags/checkteamtags.py | 8 +- - tools/checkteamtags/extract_components.py | 2 +- - .../open_my_editor/ext/background.js | 26 +- - .../open_my_editor/ext/manifest.json | 6 +- - .../manual-fields-to-ignore.txt | 2 +- - tools/clang/scripts/build.py | 12 +- - tools/clang/scripts/include-analysis.html | 12 +- - tools/clang/scripts/package.py | 2 +- - tools/clang/scripts/update.py | 2 +- - tools/code_coverage/coverage.py | 8 +- - tools/cr/cr/base/android.py | 2 +- - tools/cr/main.py | 2 +- - tools/crates/gnrt/test_metadata.json | 2 +- - tools/crbug/crbug.js | 8 +- - tools/crbug/pinpoint.js | 4 +- - tools/crbug/user-activity.js | 4 +- - .../cygprofile/orderfile_generator_backend.py | 4 +- - tools/determinism/compare_build_artifacts.py | 2 +- - tools/download_optimization_profile.py | 2 +- - .../dromaeo_benchmark_runner.py | 10 +- - tools/emacs/trybot-mac.txt | 232 +- - tools/flags/list_flags.py | 6 +- - tools/generate_stubs/generate_stubs.py | 2 +- - tools/get_asan_chrome/get_asan_chrome.py | 6 +- - tools/git/suggest_owners.py | 6 +- - tools/gn/bootstrap/bootstrap.py | 2 +- - tools/gn/roll_gn.py | 2 +- - tools/grit/grit/format/rc.py | 2 +- - tools/grit/grit/tool/android2grd.py | 4 +- - tools/grit/grit/tool/resize.py | 2 +- - tools/grit/pak_util.py | 2 +- - tools/grit/setup.py | 4 +- - .../js_externs_generator.py | 4 +- - tools/json_schema_compiler/js_util.py | 2 +- - tools/json_schema_compiler/preview.py | 2 +- - tools/licenses.py | 38 +- - tools/mac/download_symbols.py | 4 +- - tools/mac/power/scenarios.py | 10 +- - tools/mb/mb.py | 6 +- - tools/mb/mb_config.pyl | 6 +- - tools/md_browser/base.css | 4 +- - tools/md_browser/footer.html | 2 +- - tools/md_browser/gitiles_autolink.py | 2 +- - tools/md_browser/gitiles_ext_blocks.py | 2 +- - tools/md_browser/gitiles_smart_quotes.py | 2 +- - tools/md_browser/md_browser.py | 2 +- - tools/metrics/common/models.py | 2 +- - tools/metrics/histograms/expand_owners.py | 12 +- - .../metrics/histograms/extract_histograms.py | 8 +- - ...ram_configuration_model_test_histograms.py | 68 +- - tools/metrics/histograms/split_xml.py | 4 +- - tools/metrics/md2xml.py | 4 +- - tools/metrics/structured/model.py | 6 +- - tools/metrics/ukm/xml_validations.py | 4 +- - tools/nocompile_driver.py | 2 +- - tools/omahaproxy.py | 2 +- - tools/perfbot-analysis/builder.js | 4 +- - tools/perfbot-analysis/bulk-download.js | 2 +- - tools/python/google/gethash_timer.py | 2 +- - tools/resources/find_unused_resources.py | 2 +- - tools/roll_webgl_conformance.py | 2 +- - tools/run-swarmed.py | 10 +- - tools/site_compare/commands/measure.py | 2 +- - tools/site_compare/commands/scrape.py | 2 +- - .../scrapers/chrome/chromebase.py | 4 +- - .../site_compare/scrapers/firefox/firefox2.py | 2 +- - tools/site_compare/scrapers/ie/ie7.py | 4 +- - tools/site_compare/utils/browser_iterate.py | 2 +- - tools/symsrc/source_index.py | 8 +- - tools/tracing/rename_breakpad.py | 2 +- - .../sample_traffic_annotation.cc | 2 +- - .../scripts/auditor/auditor.py | 2 +- - .../scripts/auditor/util.py | 2 +- - .../scripts/update_annotations_doc.py | 4 +- - .../scripts/update_annotations_sheet.py | 6 +- - tools/usb_gadget/gadget.py | 2 +- - tools/usb_gadget/msos20_descriptors.py | 2 +- - tools/variations/bisect_variations.py | 2 +- - tools/visual_debugger/app.html | 4 +- - tools/web_dev_style/css_checker.py | 6 +- - tools/web_dev_style/html_checker.py | 2 +- - tools/web_dev_style/js_checker.py | 8 +- - tools/web_dev_style/resource_checker.py | 2 +- - tools/win/RetrieveSymbols/RetrieveSymbols.cpp | 2 +- - tools/win/sizeviewer/template.html | 2 +- - .../chromevox/background/background.js | 2 +- - .../chromevox/background/prefs.js | 4 +- - .../chromevox/injected/history.js | 2 +- - .../cvox2/background/background.js | 14 +- - .../cvox2/background/panel.html | 2 +- - .../extensions/searchvox/loader.js | 2 +- - .../chromevoxclassic/manifest.json.jinja2 | 2 +- - .../color_contrast_companion/help.html | 2 +- - .../accessibility_extensions_strings.grd | 2 +- - ui/base/clipboard/clipboard_test_template.h | 10 +- - .../constrained_window_animation.mm | 2 +- - ui/base/cocoa/tool_tip_base_view.mm | 2 +- - .../cocoa/underlay_opengl_hosting_window.mm | 2 +- - ui/base/ime/character_composer_sequences.txt | 2 +- - .../keycodes/keyboard_code_conversion_mac.mm | 2 +- - .../file_manager/common/js/mock_chrome.js | 6 +- - .../foreground/elements/icons.html | 2 +- - .../foreground/js/ui/file_table.js | 2 +- - ui/file_manager/image_loader/piex/Makefile | 2 +- - ui/ozone/ozone.gni | 2 +- - ui/resources/README.txt | 4 +- - ui/resources/resource_check/ico_files.py | 4 +- - .../resource_check/resource_scale_factors.py | 4 +- - ui/strings/ui_strings.grd | 4 +- - ui/views/examples/webview_example.cc | 2 +- - .../cr_components/app_management/icons.html | 2 +- - .../help_bubble/help_bubble_icons.html | 2 +- - ui/webui/resources/cr_elements/icons.html | 4 +- - ...weblayer_security_blocking_page_factory.cc | 2 +- - weblayer/shell/app/shell_main_params.cc | 2 +- - 1456 files changed, 4904 insertions(+), 4904 deletions(-) + .../cts_config/webview_cts_gcs_path.json | 30 +- + android_webview/tools/record_netlog.py | 6 +- + .../tools/remove_preinstalled_webview.py | 2 +- + android_webview/tools/update_cts.py | 6 +- + ash/accelerators/accelerator_notifications.cc | 2 +- + ash/ash_strings.grd | 28 +- + ash/assistant/assistant_setup_controller.cc | 2 +- + ash/assistant/util/deep_link_util.cc | 16 +- + ash/components/phonehub/url_constants.cc | 2 +- + ash/constants/url_constants.cc | 6 +- + .../fake_device_metadata_http_fetcher.cc | 2 +- + .../fast_pair/device_metadata_fetcher.cc | 2 +- + .../fast_pair/footprints_fetcher_impl.cc | 4 +- + .../ui/fast_pair/fast_pair_presenter_impl.cc | 4 +- + ash/system/eche/eche_tray.cc | 2 +- + ...pcie_peripheral_notification_controller.cc | 2 +- + .../usb_peripheral_notification_controller.cc | 4 +- + .../test_wallpaper_controller_client.cc | 2 +- + .../camera_app_ui/camera_app_untrusted_ui.cc | 2 +- + .../resources/js/lib/analytics.js | 14 +- + .../resources/strings/camera_strings.grd | 2 +- + .../quick_unlock/pin_keyboard_icons.html | 2 +- + ash/webui/diagnostics_ui/diagnostics_ui.cc | 2 +- + ash/webui/eche_app_ui/eche_alert_generator.cc | 2 +- + .../help_app_kids_magazine_untrusted_ui.cc | 2 +- + ash/webui/media_app_ui/media_app_guest_ui.cc | 2 +- + .../backend/help_content_provider.cc | 4 +- + .../resources/confirmation_page.js | 2 +- + .../os_feedback_ui/resources/fake_data.js | 16 +- + .../resources/feedback_constants.js | 6 +- + .../os_feedback_ui/resources/search_page.js | 2 +- + .../personalization_app_ui.cc | 2 +- + .../projector_app/projector_xhr_sender.cc | 10 +- + .../projector_app/projector_xhr_sender.h | 2 +- + .../projector_app/untrusted_projector_ui.cc | 12 +- + .../scanning/resources/scanning_app.html | 2 +- + ash/webui/scanning/resources/scanning_app.js | 2 +- + ...boarding_enter_rsu_wp_disable_code_page.js | 2 +- + base/android/resource_exclusions.gni | 2 +- + base/debug/debugger_posix.cc | 4 +- + base/debug/stack_trace_posix.cc | 2 +- + base/functional/callback.h | 8 +- + base/ios/device_util.mm | 2 +- + base/memory/raw_ptr.cc | 2 +- + base/memory/raw_ptr_asan_service.cc | 2 +- + build/android/gradle/generate_gradle.py | 2 +- + .../android/gyp/assert_static_initializers.py | 2 +- + build/android/gyp/lint.py | 2 +- + build/android/gyp/proguard.py | 4 +- + build/android/gyp/util/diff_utils.py | 4 +- + build/android/gyp/util/protoresources.py | 2 +- + .../android/incremental_install/installer.py | 2 +- + build/android/resource_sizes.py | 2 +- + build/android/test_wrapper/logdog_wrapper.py | 2 +- + build/apple/tweak_info_plist.py | 6 +- + build/config/android/rules.gni | 2 +- + build/config/chrome_build.gni | 2 +- + build/config/chromeos/args.gni | 4 +- + build/config/chromeos/rules.gni | 6 +- + build/config/compiler/compiler.gni | 4 +- + build/config/locales.gni | 2 +- + build/config/nacl/rules.gni | 2 +- + build/config/ozone.gni | 2 +- + build/config/sanitizers/sanitizers.gni | 2 +- + build/config/win/control_flow_guard.gni | 2 +- + build/fuchsia/binary_size_differ.py | 2 +- + build/fuchsia/binary_sizes.py | 2 +- + build/fuchsia/pkg_repo.py | 2 +- + build/linux/install-chromeos-fonts.py | 2 +- + .../linux/sysroot_scripts/install-sysroot.py | 2 +- + build/mac_toolchain.py | 2 +- + build/nocompile.gni | 2 +- + build/toolchain/cros_toolchain.gni | 2 +- + build/toolchain/gcc_toolchain.gni | 2 +- + .../lib/common/perf_tests_results_helper.py | 2 +- + build/util/lib/results/result_sink.py | 2 +- + build/whitespace_file.txt | 2 +- + buildtools/README.txt | 4 +- + buildtools/clang_format/README.txt | 6 +- + .../javatest_manifest_config_delta.json | 12 +- + .../manifest/maps_go_manifest_config.json | 10 +- + chrome/app/chromium_strings.grd | 24 +- + chrome/app/generated_resources.grd | 312 +++++++++--------- + chrome/app/google_chrome_strings.grd | 24 +- + chrome/app/resources/locale_settings.grd | 10 +- + chrome/browser/about_flags.cc | 4 +- + .../browser/android/explore_sites/url_util.cc | 2 +- + .../android/webapk/webapk_installer.cc | 4 +- + .../app_service/webapk/webapk_install_task.cc | 2 +- + .../apps/digital_goods/digital_goods_ash.cc | 2 +- + .../digital_goods_factory_impl.cc | 2 +- + .../apps/platform_apps/install_chrome_app.cc | 2 +- + .../ash/android_sms/android_sms_urls.cc | 16 +- + chrome/browser/ash/app_mode/fake_cws.cc | 2 +- + .../auth/arc_background_auth_code_fetcher.cc | 2 +- + .../arc/auth/arc_robot_auth_code_fetcher.cc | 2 +- + .../arc/input_overlay/ui/input_menu_view.cc | 2 +- + .../browser/ash/assistant/assistant_util.cc | 4 +- + .../ash/attestation/attestation_ca_client.cc | 8 +- + chrome/browser/ash/borealis/borealis_util.cc | 2 +- + .../ash/child_accounts/child_user_service.cc | 2 +- + chrome/browser/ash/crostini/crostini_util.cc | 2 +- + .../customization/customization_document.cc | 2 +- + .../enhanced_network_tts_constants.cc | 2 +- + .../file_manager/private_api_misc.cc | 2 +- + .../file_manager/file_manager_string_util.cc | 14 +- + .../ash/file_manager/open_with_browser.cc | 8 +- + chrome/browser/ash/hats/hats_dialog.cc | 2 +- + .../assistive_suggester_client_filter.cc | 24 +- + .../easy_unlock/easy_unlock_key_names.cc | 2 +- + .../ash/login/gaia_reauth_token_fetcher.cc | 2 +- + .../ash/login/marketing_backend_connector.cc | 4 +- + .../connectivity/target_fido_controller.cc | 4 +- + .../login/saml/password_sync_token_fetcher.cc | 2 +- + .../recommend_apps_fetcher_impl.cc | 4 +- + .../default_user_image/default_user_images.cc | 2 +- + .../arc_dns_resolution_routine.cc | 6 +- + .../dns_latency_routine.cc | 2 +- + .../dns_resolution_routine.cc | 2 +- + .../network_diagnostics_util.cc | 14 +- + .../video_conferencing_routine.cc | 4 +- + .../ash/plugin_vm/plugin_vm_diagnostics.cc | 4 +- + .../plugin_vm/plugin_vm_license_checker.cc | 4 +- + .../browser/ash/plugin_vm/plugin_vm_util.cc | 6 +- + .../account_status_check_fetcher.cc | 6 +- + .../powerwash_requirements_checker.cc | 2 +- + .../device_command_start_crd_session_job.cc | 6 +- + .../policy/uploading/heartbeat_scheduler.cc | 4 +- + chrome/browser/ash/u2f_notification.cc | 2 +- + .../wallpaper_handlers/wallpaper_handlers.cc | 16 +- + .../autofill/autofill_gstatic_reader.cc | 4 +- + .../autofill/autofill_image_fetcher_impl.cc | 2 +- + .../apc_onboarding_coordinator.cc | 2 +- + .../browser_switcher_service.cc | 2 +- + chrome/browser/cart/cart_discount_fetcher.cc | 2 +- + .../cart/cart_discount_link_fetcher.cc | 2 +- + chrome/browser/cart/cart_service.cc | 24 +- + chrome/browser/cart/fetch_discount_worker.cc | 2 +- + .../cart_domain_cart_url_mapping.json | 2 +- + .../resources/cart_domain_name_mapping.json | 2 +- + .../browser/chrome_browser_application_mac.mm | 2 +- + .../browser/chrome_content_browser_client.cc | 4 +- + .../policy/dlp/dlp_policy_constants.h | 2 +- + chrome/browser/devtools/url_constants.cc | 4 +- + .../mixed_content_download_blocking.cc | 2 +- + .../commands/mac_key_rotation_command.cc | 2 +- + .../management_service/rotate_util.cc | 2 +- + .../file_system/signin_dialog_delegate.cc | 2 +- + .../connectors/service_provider_config.cc | 4 +- + .../extension_request_notification.cc | 4 +- + .../enterprise/signals/signals_utils.cc | 4 +- + ...e_js_error_report_processor_nonchromeos.cc | 4 +- + .../enterprise_platform_keys_api.cc | 2 +- + .../identity_launch_web_auth_flow_function.cc | 2 +- + .../chrome_management_api_delegate.cc | 2 +- + .../api/platform_keys/platform_keys_api.cc | 2 +- + .../chrome_extension_browser_constants.cc | 4 +- + .../extensions/external_pref_loader.cc | 2 +- + chrome/browser/extensions/install_signer.cc | 2 +- + .../chrome_extension_downloader_factory.cc | 2 +- + .../updater/chrome_update_client_config.cc | 2 +- + chrome/browser/flag_descriptions.cc | 14 +- + .../lacros/lacros_startup_infobar_delegate.cc | 4 +- + .../service_discovery_client_mac.mm | 4 +- + .../long_screenshots_tab_service.cc | 2 +- + .../access_code/access_code_cast_constants.cc | 4 +- + .../cast/cast_media_route_provider.cc | 6 +- + .../dial/dial_media_route_provider.cc | 18 +- + .../media/webrtc/webrtc_event_log_uploader.cc | 2 +- + .../media/webrtc/webrtc_log_uploader.cc | 2 +- + .../nacl_host/nacl_infobar_delegate.cc | 2 +- + .../client/nearby_share_client_impl.cc | 4 +- + .../instantmessaging/constants.h | 4 +- + .../network_traversal_ice_config_fetcher.cc | 12 +- + .../tachyon_ice_config_fetcher.cc | 12 +- + .../modules/drive/drive_service.cc | 8 +- + .../modules/photos/photos_service.cc | 8 +- + .../obsolete_system/obsolete_system_linux.cc | 2 +- + ...rvice_worker_page_load_metrics_observer.cc | 2 +- + .../quiet_permission_prompt_model_android.cc | 2 +- + .../extension_key_permissions_service.cc | 2 +- + .../extension_platform_keys_service.cc | 2 +- + .../browser/policy/safe_search_policy_test.h | 2 +- + .../chrome_prefetch_service_delegate.cc | 6 +- + .../prefetch_proxy/prefetch_proxy_params.cc | 6 +- + .../privacy_sandbox_service.cc | 24 +- + .../profiles/profile_avatar_downloader.cc | 2 +- + .../push_messaging_constants.cc | 2 +- + .../push_messaging_service_impl.cc | 2 +- + .../browser/resources/about_sys/about_sys.js | 2 +- + .../browsing_topics_internals.html | 4 +- + .../resources/chromeos/about_os_credits.html | 6 +- + .../dictation/macros/list_commands_macro.js | 2 +- + .../magnifier/magnifier.js | 2 +- + .../chromevox/background/command_handler.js | 8 +- + .../chromevox/options/options.css | 2 +- + .../tools/webstore_extension_util.py | 10 +- + .../chromevox_manifest.json.jinja2 | 8 +- + .../common/tutorial/chromevox_tutorial.js | 6 +- + .../accessibility/select_to_speak/options.css | 2 +- + .../select_to_speak/options.html | 2 +- + .../select_to_speak/select_to_speak.js | 6 +- + .../select_to_speak_manifest.json.jinja2 | 8 +- + .../switch_access/switch_access.js | 2 +- + .../switch_access_manifest.json.jinja2 | 4 +- + .../add_supervision/add_supervision_ui.js | 16 +- + .../chromeos/arc_support/background.js | 12 +- + .../chromeos/arc_support/playstore.js | 6 +- + .../assistant_optin/assistant_related_info.js | 4 +- + .../assistant_optin/assistant_value_prop.js | 2 +- + .../connectivity_diagnostics/manifest.json | 4 +- + .../resources/chromeos/echo/manifest.json | 122 +++---- + .../edu_coexistence/edu_coexistence_ui.js | 2 +- + .../chromeos/emoji_picker/icons.html | 2 +- + .../resources/chromeos/emulator/icons.html | 2 +- + .../input_method/google_xkb_manifest.json | 8 +- + .../resources/chromeos/login/debug/debug.js | 10 +- + .../screens/common/arc_terms_of_service.js | 4 +- + .../screens/common/consolidated_consent.js | 2 +- + .../screens/common/marketing_opt_in.html | 2 +- + .../login/screens/login/offline_login.html | 2 +- + .../login/screens/login/offline_login.js | 2 +- + .../browser_tabs_metadata_form.js | 2 +- + .../parent_access/parent_access_ui.js | 8 +- + .../default_apps/external_extensions.json | 2 +- + .../discards/graph_doc_template.html | 2 +- + chrome/browser/resources/downloads/icons.html | 2 +- + .../resources/gaia_auth_host/authenticator.js | 4 +- + .../saml_password_attributes.js | 2 +- + .../resources/hangout_services/manifest.json | 2 +- + .../manifest.json | 2 +- + .../scope_approval_dialog.js | 6 +- + chrome/browser/resources/inspect/inspect.html | 4 +- + .../query_tiles/query_tiles_internals.html | 2 +- + .../query_tiles/query_tiles_internals.js | 4 +- + .../resources/media/mei_preload/manifest.json | 2 +- + .../shared/nearby_shared_icons.html | 4 +- + .../nearby_shared_share_type_icons.html | 2 +- + .../resources/net_internals/index.html | 6 +- + .../network_speech_synthesis/manifest.json | 2 +- + .../network_speech_synthesis/tts_extension.js | 2 +- + .../new_tab_page/modules/photos/module.html | 2 +- + chrome/browser/resources/omnibox/omnibox.html | 2 +- + .../browser/resources/pdf/elements/icons.html | 2 +- + .../resources/print_preview/ui/icons.html | 2 +- + .../settings/about_page/about_page.html | 4 +- + .../crostini_disk_resize_dialog.html | 2 +- + .../chromeos/os_a11y_page/manage_a11y_page.js | 4 +- + .../chromeos/os_a11y_page/os_a11y_page.js | 2 +- + .../channel_switcher_dialog.html | 2 +- + .../chromeos/os_about_page/os_about_page.html | 2 +- + .../borealis_page/borealis_detail_view.html | 2 +- + .../resources/settings/chromeos/os_icons.html | 2 +- + .../os_people_page/users_add_user_dialog.js | 2 +- + chrome/browser/resources/settings/icons.html | 2 +- + .../resources/settings/settings_shared.css | 2 +- + .../browser/resources/tools/build_webui.gni | 2 +- + .../resources/webstore_app/manifest.json | 4 +- + .../demos/cr_input/cr_input_demo.html | 2 +- + .../certificate_reporting_service.cc | 2 +- + .../chrome_cleaner/srt_field_trial_win.cc | 2 +- + .../chrome_enterprise_url_lookup_service.cc | 2 +- + .../chrome_password_protection_service.cc | 4 +- + .../cloud_binary_upload_service.cc | 4 +- + .../check_client_download_request_base.cc | 4 +- + .../download_protection/download_feedback.cc | 2 +- + .../ppapi_download_request.cc | 6 +- + .../extension_telemetry_uploader.cc | 2 +- + .../incident_report_uploader_impl.cc | 4 +- + .../default_settings_fetcher.cc | 2 +- + .../background/ntp_background_service.cc | 2 +- + .../search/background/ntp_backgrounds.cc | 10 +- + .../browser/share/default_ranking_android.cc | 8 +- + .../remote_copy_message_handler.cc | 2 +- + .../sharing/web_push/web_push_sender.cc | 4 +- + chrome/browser/signin/signin_ui_util.cc | 2 +- + .../browser/ssl/connection_help_tab_helper.cc | 2 +- + chrome/browser/ssl/sct_reporting_service.cc | 4 +- + .../child_accounts/kids_management_api.cc | 2 +- + .../kids_management_service.cc | 2 +- + .../supervised_user_block_interstitial.html | 2 +- + ...supervised_user_block_interstitial_v2.html | 2 +- + .../supervised_user_service.cc | 2 +- + .../supervised_user_url_filter.cc | 12 +- + .../strings/android_chrome_strings.grd | 54 +-- + .../search/arc/recommend_apps_fetcher_impl.cc | 2 +- + .../ui/app_list/search/common/string_util.cc | 2 +- + .../search/files/item_suggest_cache.h | 2 +- + .../app_list/search/omnibox/omnibox_util.cc | 2 +- + .../ui/ash/ambient/ambient_client_impl.cc | 8 +- + .../ui/ash/calendar/calendar_keyed_service.cc | 2 +- + .../browser/ui/ash/chrome_shell_delegate.cc | 2 +- + .../ui/ash/in_session_auth_dialog_client.cc | 2 +- + .../projector/pending_screencast_manager.cc | 2 +- + .../browser/ui/ash/system_tray_client_impl.cc | 4 +- + .../tab_under_navigation_throttle.h | 2 +- + ...r_content_setting_bubble_model_delegate.cc | 4 +- + chrome/browser/ui/chrome_pages.cc | 2 +- + .../browser/ui/cocoa/share_menu_controller.mm | 2 +- + .../ui/commander/open_url_command_source.cc | 2 +- + .../ui/dialogs/outdated_upgrade_bubble.cc | 2 +- + .../installation_error_infobar_delegate.cc | 2 +- + chrome/browser/ui/managed_ui.cc | 2 +- + .../omnibox/omnibox_pedal_implementations.cc | 24 +- + .../quick_answers_ui_controller.cc | 4 +- + chrome/browser/ui/signin_view_controller.cc | 2 +- + .../toolbar/media_router_contextual_menu.cc | 6 +- + .../app_dialog/app_uninstall_dialog_view.cc | 2 +- + .../ui/views/hats/hats_next_web_dialog.cc | 2 +- + .../lens/lens_side_panel_navigation_helper.cc | 2 +- + .../ui/views/lens/lens_side_panel_view.cc | 2 +- + .../ui/views/network_profile_bubble_view.cc | 2 +- + .../about_this_site_side_panel_view.cc | 2 +- + .../plugin_vm/plugin_vm_installer_view.cc | 2 +- + .../ui/views/session_crashed_bubble_view.cc | 2 +- + .../lens/lens_unified_side_panel_view.cc | 2 +- + .../app_management_page_handler.cc | 6 +- + .../ash/add_supervision/add_supervision_ui.cc | 4 +- + .../ash/cloud_upload/drive_upload_handler.cc | 2 +- + .../edu_coexistence_login_handler.cc | 2 +- + .../consolidated_consent_screen_handler.h | 4 +- + .../notification_tester_handler.cc | 2 +- + .../parent_access_ui_handler_impl.cc | 4 +- + .../internals_ui_handler.cc | 2 +- + chrome/browser/ui/webui/feed/feed_ui.cc | 2 +- + .../ui/webui/interstitials/interstitial_ui.cc | 6 +- + .../ui/webui/media_router/cast_feedback_ui.cc | 4 +- + .../quick_pair/quick_pair_handler.cc | 4 +- + .../ui/webui/new_tab_page/foo/foo_handler.cc | 8 +- + .../ui/webui/new_tab_page/untrusted_source.cc | 2 +- + chrome/browser/ui/webui/ntp/new_tab_ui.cc | 2 +- + .../ui/webui/ntp/ntp_resource_cache.cc | 8 +- + .../ui/webui/sanitized_image_source.cc | 6 +- + .../settings/ash/parental_controls_handler.cc | 2 +- + .../webui/settings/reset_settings_handler.cc | 2 +- + .../settings_localized_strings_provider.cc | 2 +- + ...cloud_signin_restriction_policy_fetcher.cc | 2 +- + .../ui/webui/welcome/google_apps_handler.cc | 12 +- + .../webui/welcome/ntp_background_handler.cc | 2 +- + .../ui/webui/whats_new/whats_new_util.cc | 4 +- + .../fetch_manifest_and_install_command.cc | 2 +- + .../externally_managed_app_manager.cc | 4 +- + .../preinstalled_web_apps/gmail.cc | 6 +- + .../preinstalled_web_apps/google_calendar.cc | 6 +- + .../preinstalled_web_apps/google_chat.cc | 2 +- + .../preinstalled_web_apps/google_docs.cc | 6 +- + .../preinstalled_web_apps/google_drive.cc | 6 +- + .../preinstalled_web_apps/google_meet.cc | 2 +- + .../preinstalled_web_apps/google_sheets.cc | 6 +- + .../preinstalled_web_apps/google_slides.cc | 6 +- + .../preinstalled_web_apps/messages_dogfood.cc | 2 +- + .../preinstalled_web_apps.cc | 8 +- + .../preinstalled_web_apps/youtube.cc | 6 +- + .../web_applications/web_app_install_task.cc | 2 +- + .../chrome_authenticator_request_delegate.cc | 6 +- + .../components/recovery_component.cc | 4 +- + .../crash/crashpad_crash_reporter.cc | 2 +- + .../executables/chrome_cleaner_main.cc | 2 +- + .../logging/cleaner_logging_service.cc | 6 +- + .../chrome_cleaner/logging/dummy_api_keys.cc | 4 +- + .../logging/reporter_logging_service.cc | 6 +- + chrome/common/chrome_features.cc | 6 +- + .../common/extensions/api/_api_features.json | 4 +- + chrome/common/extensions/api/cookies.json | 2 +- + chrome/common/extensions/api/debugger.json | 8 +- + .../extensions/api/declarative_content.json | 4 +- + chrome/common/extensions/api/dom.json | 2 +- + chrome/common/extensions/api/gcm.json | 8 +- + chrome/common/extensions/api/instance_id.json | 2 +- + chrome/common/extensions/api/privacy.json | 2 +- + chrome/common/extensions/api/tabs.json | 4 +- + chrome/common/extensions/api/tts.json | 2 +- + chrome/common/extensions/api/webview_tag.json | 4 +- + chrome/common/extensions/api/windows.json | 2 +- + .../extensions/chrome_extensions_client.cc | 4 +- + chrome/common/google_url_loader_throttle.cc | 4 +- + chrome/common/url_constants.cc | 260 +++++++-------- + .../gaiacp/associated_user_validator.cc | 2 +- + .../gaiacp/gaia_credential_base.cc | 8 +- + .../credential_provider/gaiacp/gcp_utils.cc | 4 +- + .../gaiacp/gcpw_strings.cc | 2 +- + .../credential_provider/gaiacp/mdm_utils.cc | 2 +- + chrome/docs/devtools-pillar.html | 2 +- + chrome/docs/index.html | 18 +- + chrome/docs/platform-pillar.html | 12 +- + chrome/installer/setup/eula/oem_ar.html | 2 +- + chrome/installer/setup/eula/oem_bg.html | 2 +- + chrome/installer/setup/eula/oem_ca.html | 2 +- + chrome/installer/setup/eula/oem_cs.html | 2 +- + chrome/installer/setup/eula/oem_da.html | 2 +- + chrome/installer/setup/eula/oem_de.html | 2 +- + chrome/installer/setup/eula/oem_el.html | 2 +- + chrome/installer/setup/eula/oem_en-GB.html | 2 +- + chrome/installer/setup/eula/oem_en.html | 2 +- + chrome/installer/setup/eula/oem_es-419.html | 2 +- + chrome/installer/setup/eula/oem_es.html | 2 +- + chrome/installer/setup/eula/oem_et.html | 2 +- + chrome/installer/setup/eula/oem_fi.html | 2 +- + chrome/installer/setup/eula/oem_fil.html | 2 +- + chrome/installer/setup/eula/oem_fr.html | 2 +- + chrome/installer/setup/eula/oem_hi.html | 2 +- + chrome/installer/setup/eula/oem_hr.html | 2 +- + chrome/installer/setup/eula/oem_hu.html | 2 +- + chrome/installer/setup/eula/oem_id.html | 2 +- + chrome/installer/setup/eula/oem_it.html | 2 +- + chrome/installer/setup/eula/oem_iw.html | 2 +- + chrome/installer/setup/eula/oem_ja.html | 2 +- + chrome/installer/setup/eula/oem_ko.html | 2 +- + chrome/installer/setup/eula/oem_lt.html | 2 +- + chrome/installer/setup/eula/oem_lv.html | 2 +- + chrome/installer/setup/eula/oem_nl.html | 2 +- + chrome/installer/setup/eula/oem_no.html | 2 +- + chrome/installer/setup/eula/oem_pl.html | 2 +- + chrome/installer/setup/eula/oem_pt-BR.html | 2 +- + chrome/installer/setup/eula/oem_pt-PT.html | 2 +- + chrome/installer/setup/eula/oem_ro.html | 2 +- + chrome/installer/setup/eula/oem_ru.html | 2 +- + chrome/installer/setup/eula/oem_sk.html | 2 +- + chrome/installer/setup/eula/oem_sl.html | 2 +- + chrome/installer/setup/eula/oem_sr.html | 2 +- + chrome/installer/setup/eula/oem_sv.html | 2 +- + chrome/installer/setup/eula/oem_th.html | 2 +- + chrome/installer/setup/eula/oem_tr.html | 2 +- + chrome/installer/setup/eula/oem_uk.html | 2 +- + chrome/installer/setup/eula/oem_vi.html | 2 +- + chrome/installer/setup/eula/oem_zh-CN.html | 2 +- + chrome/installer/setup/eula/oem_zh-TW.html | 2 +- + .../setup/google_chrome_behaviors.cc | 2 +- + chrome/renderer/cart/commerce_hint_agent.cc | 2 +- + chrome/renderer/media/flash_embed_rewrite.cc | 2 +- + ...ip_add_to_cart_request_domain_mapping.json | 2 +- + .../extensions/identity_custom_bindings.js | 2 +- + .../mac_notification_service_ns.mm | 2 +- + chrome/tools/webforms_aggregator_tests.py | 4 +- + chrome/tools/weburl_links.txt | 6 +- + chrome/updater/branding.gni | 12 +- + chrome/updater/mac/setup/ks_tickets.mm | 2 +- + chrome/utility/importer/ie_importer_win.cc | 2 +- + .../shell_devtools_discovery_page.html | 2 +- + chromecast/browser/webui/cast_webui.cc | 4 +- + .../runtime/browser/grpc_webui_controller.cc | 2 +- + chromecast/chromecast.gni | 2 +- + chromecast/crash/linux/minidump_uploader.cc | 2 +- + chromecast/net/connectivity_checker_impl.h | 4 +- + .../components/dbus/rmad/fake_rmad_client.cc | 2 +- + .../device_activity_controller.cc | 2 +- + .../ash/components/drivefs/drivefs_auth.cc | 2 +- + .../simple_geolocation_provider.cc | 2 +- + .../login/auth/recovery/service_constants.cc | 2 +- + .../multidevice/stub_multidevice_util.cc | 2 +- + .../components/timezone/timezone_request.cc | 2 +- + .../trial_group/trial_group_checker.cc | 2 +- + .../assistant_manager_service_impl.cc | 2 +- + chromeos/ash/services/assistant/service.cc | 2 +- + .../device_sync/cryptauth_client_impl.cc | 8 +- + chromeos/ash/services/ime/constants.cc | 2 +- + chromeos/chromeos_strings.grd | 6 +- + .../translation_result_loader.cc | 2 +- + chromeos/printing/ppd_provider.h | 2 +- + chromeos/printing/printer_config_cache.cc | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri1.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri10.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri11.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri12.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri13.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri14.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri15.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri18.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri19.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri2.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri24.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri3.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri4.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri49.txt | 2 +- + .../printing/uri_fuzzer_seed_corpus/uri5.txt | 2 +- + .../error_page_populator.cc | 2 +- + .../predictor_config_definitions.cc | 2 +- + .../autofill/content/renderer/form_cache.cc | 2 +- + .../renderer/page_passwords_analyser.cc | 2 +- + .../password_form_conversion_utils.cc | 2 +- + .../core/browser/autofill_download_manager.cc | 2 +- + .../core/browser/autofill_experiments.cc | 6 +- + .../browser/data_model/test_data_creator.cc | 6 +- + .../credit_card_fido_authenticator.cc | 2 +- + .../core/browser/payments/payments_client.cc | 2 +- + .../browser/payments/payments_service_url.cc | 10 +- + ...roid_chrome_autofill_assistant_strings.grd | 2 +- + .../autofill_assistant_onboarding_fetcher.cc | 2 +- + .../browser/headless/client_headless.cc | 2 +- + .../browser/service/server_url_fetcher.cc | 2 +- + .../launched_configs.cc | 4 +- + .../safe_browsing_triggered_popup_blocker.h | 4 +- + .../core/breadcrumb_manager_tab_helper.cc | 2 +- + .../strings/android/browser_ui_strings.grd | 6 +- + .../core/counters/history_counter.cc | 2 +- + .../core/history_notice_utils.cc | 4 +- + .../core/captive_portal_detector.cc | 2 +- + .../data/log_list.json | 22 +- + components/commerce/core/account_checker.cc | 10 +- + .../resources/cart_domain_cart_url_regex.json | 2 +- + .../subscriptions_server_proxy.cc | 4 +- + .../components_google_chrome_strings.grd | 2 +- + .../notes/core/server/notes_repository.cc | 2 +- + .../notes/core/server/notes_server_base.cc | 4 +- + .../notes/core/templates/template_fetcher.h | 2 +- + .../reactions/core/reaction_list_factory.cc | 4 +- + .../crash/core/app/crash_reporter_client.cc | 2 +- + .../crash/core/browser/resources/crashes.js | 4 +- + components/cronet/tools/generate_javadoc.py | 2 +- + .../core/html/dom_distiller_viewer.html | 2 +- + .../core/javascript/dom_distiller_viewer.js | 2 +- + components/dom_distiller/core/viewer.cc | 6 +- + .../domain_reliability/bake_in_configs.py | 286 ++++++++-------- + components/drive/service/drive_api_service.cc | 6 +- + .../error_page/common/localized_error.cc | 2 +- + .../favicon/core/large_icon_service_impl.cc | 2 +- + components/feed/core/v2/feed_network_impl.cc | 8 +- + components/feed/feed_feature_list.cc | 4 +- + components/feedback/feedback_uploader.cc | 2 +- + components/flags_ui/resources/flags.html | 4 +- + components/gcm_driver/gcm_account_mapper.cc | 2 +- + components/gcm_driver/gcm_client_impl.cc | 2 +- + .../core/browser/browsing_history_service.cc | 4 +- + .../history/core/browser/history_service.cc | 4 +- + .../core/browser/web_history_service.cc | 12 +- + .../per_user_topic_subscription_manager.cc | 2 +- + .../tab_modal_dialog_manager.cc | 2 +- + .../core/keyed_service_base_factory.cc | 2 +- + components/lens/lens_features.cc | 2 +- + components/media_router/common/media_source.h | 2 +- + .../metrics/net/net_metrics_log_uploader.cc | 2 +- + components/metrics/url_constants.cc | 6 +- + components/nacl/docs/dev/index.html | 4 +- + components/net_log/resources/net_export.html | 6 +- + .../network_time/network_time_tracker.cc | 2 +- + components/ntp_snippets/features.cc | 2 +- + .../ntp_snippets/ntp_snippets_constants.cc | 16 +- + components/ntp_snippets/remote/fetch.py | 8 +- + components/ntp_tiles/popular_sites_impl.cc | 6 +- + ...fault_popular_sites_with_popular_apps.json | 6 +- + ...lt_popular_sites_without_popular_apps.json | 4 +- + .../core/prefetch/prefetch_proto_utils.cc | 2 +- + .../core/prefetch/prefetch_server_urls.cc | 2 +- + .../omnibox/browser/document_provider.cc | 18 +- + .../browser/document_suggestions_service.cc | 4 +- + .../resources/omnibox_pedal_synonyms.grd | 138 ++++---- + .../page_content_annotations_model_manager.cc | 2 +- + .../core/optimization_guide_constants.cc | 4 +- + .../core/page_entities_model_executor_impl.cc | 2 +- + .../core/prediction_manager.cc | 8 +- + .../ads_page_load_metrics_observer.cc | 2 +- + .../core/uma_page_load_metrics_observer.cc | 2 +- + .../use_counter_page_load_metrics_observer.cc | 4 +- + ...password_requirements_spec_fetcher_impl.cc | 2 +- + .../core/browser/hash_password_manager.cc | 2 +- + .../leak_detection/leak_detection_request.h | 2 +- + .../browser/leak_detection_dialog_utils.cc | 2 +- + .../browser/old_google_credentials_cleaner.cc | 8 +- + .../core/browser/password_hash_data.cc | 2 +- + .../browser/password_manager_constants.cc | 10 +- + .../core/browser/password_reuse_detector.cc | 2 +- + .../browser/password_scripts_fetcher_impl.cc | 2 +- + .../core/browser/password_sync_util.cc | 4 +- + .../core/browser/password_ui_utils.cc | 2 +- + .../core/browser/psl_matching_helper.cc | 6 +- + .../hash_affiliation_fetcher.cc | 2 +- + .../password_manager/ios/test_helpers.cc | 4 +- + .../payment_method_manifest_parser_fuzzer.cc | 2 +- + components/payments/core/error_strings.cc | 2 +- + components/payments/core/method_strings.cc | 6 +- + .../android/permissions_android_strings.grd | 4 +- + components/permissions/constants.cc | 2 +- + .../permissions/permission_context_base.cc | 10 +- + .../permissions/permission_request_manager.cc | 8 +- + .../prediction_service/prediction_common.h | 2 +- + .../core/browser/browser_policy_connector.cc | 6 +- + ...cloud_signin_restriction_policy_fetcher.cc | 2 +- + .../core/common/cloud/user_info_fetcher.cc | 4 +- + .../common/default_chrome_apps_migrator.cc | 16 +- + .../core/common/policy_loader_common.cc | 4 +- + .../request_handler_for_policy.cc | 2 +- + .../policy/test_support/signature_provider.h | 4 +- + .../template_writers/writers/adm_writer.py | 4 +- + .../writers/doc_atomic_groups_writer.py | 2 +- + .../template_writers/writers/doc_writer.py | 10 +- + .../writers/ios_app_config_writer.py | 2 +- + .../writers/template_writer.py | 2 +- + components/quirks/quirks_client.cc | 2 +- + components/resources/terms/terms_am.html | 4 +- + components/resources/terms/terms_ar.html | 4 +- + components/resources/terms/terms_bg.html | 4 +- + components/resources/terms/terms_bn.html | 4 +- + components/resources/terms/terms_ca.html | 4 +- + components/resources/terms/terms_cs.html | 4 +- + components/resources/terms/terms_da.html | 4 +- + components/resources/terms/terms_de.html | 4 +- + components/resources/terms/terms_el.html | 4 +- + components/resources/terms/terms_en-GB.html | 4 +- + components/resources/terms/terms_en.html | 4 +- + components/resources/terms/terms_es-419.html | 4 +- + components/resources/terms/terms_es.html | 4 +- + components/resources/terms/terms_et.html | 4 +- + components/resources/terms/terms_fa.html | 4 +- + components/resources/terms/terms_fi.html | 4 +- + components/resources/terms/terms_fil.html | 4 +- + components/resources/terms/terms_fr.html | 4 +- + components/resources/terms/terms_gu.html | 4 +- + components/resources/terms/terms_he.html | 4 +- + components/resources/terms/terms_hi.html | 4 +- + components/resources/terms/terms_hr.html | 4 +- + components/resources/terms/terms_hu.html | 4 +- + components/resources/terms/terms_id.html | 4 +- + components/resources/terms/terms_it.html | 4 +- + components/resources/terms/terms_ja.html | 4 +- + components/resources/terms/terms_kn.html | 4 +- + components/resources/terms/terms_ko.html | 4 +- + components/resources/terms/terms_lt.html | 4 +- + components/resources/terms/terms_lv.html | 4 +- + components/resources/terms/terms_ml.html | 4 +- + components/resources/terms/terms_mr.html | 4 +- + components/resources/terms/terms_nb.html | 4 +- + components/resources/terms/terms_nl.html | 4 +- + components/resources/terms/terms_pl.html | 4 +- + components/resources/terms/terms_pt-BR.html | 4 +- + components/resources/terms/terms_pt-PT.html | 4 +- + components/resources/terms/terms_ro.html | 4 +- + components/resources/terms/terms_ru.html | 4 +- + components/resources/terms/terms_sk.html | 4 +- + components/resources/terms/terms_sl.html | 4 +- + components/resources/terms/terms_sr.html | 4 +- + components/resources/terms/terms_sv.html | 4 +- + components/resources/terms/terms_sw.html | 4 +- + components/resources/terms/terms_ta.html | 4 +- + components/resources/terms/terms_te.html | 4 +- + components/resources/terms/terms_th.html | 4 +- + components/resources/terms/terms_tr.html | 4 +- + components/resources/terms/terms_uk.html | 4 +- + components/resources/terms/terms_vi.html | 4 +- + components/resources/terms/terms_zh-CN.html | 4 +- + components/resources/terms/terms_zh-TW.html | 4 +- + .../browser/client_side_detection_service.cc | 2 +- + .../content/browser/triggers/trigger_util.cc | 2 +- + .../browser/db/v4_protocol_manager_util.cc | 4 +- + .../password_protection_service_base.cc | 2 +- + .../browser/realtime/url_lookup_service.cc | 2 +- + .../tailored_security_service.cc | 6 +- + ...tailored_security_service_observer_util.cc | 2 +- + .../safe_search_url_checker_client.cc | 2 +- + .../safe_search_api/stub_url_checker.cc | 2 +- + components/safety_check/url_constants.cc | 2 +- + .../template_url_starter_pack_data.cc | 2 +- + .../content/https_only_mode_blocking_page.cc | 2 +- + .../content/ssl_blocking_page.h | 2 +- + .../core/controller_client.cc | 2 +- + .../core/safe_browsing_loud_error_ui.cc | 4 +- + .../security_interstitials/core/urls.cc | 6 +- + ...ation_guide_segmentation_model_provider.cc | 2 +- + .../services/quarantine/quarantine_mac.mm | 2 +- + .../core/common/disabled_sites.cc | 16 +- + .../ios/shared_highlighting_constants.mm | 2 +- + .../browser/chrome_connected_header_helper.cc | 4 +- + .../browser/account_consistency_service.mm | 12 +- + .../identity_manager/access_token_fetcher.cc | 2 +- + .../account_managed_status_finder.cc | 4 +- + .../browser/spelling_service_client.cc | 2 +- + .../browser/subresource_filter_constants.h | 8 +- + components/sync/base/sync_util.h | 4 +- + .../standalone_trusted_vault_client.cc | 2 +- + ...ted_vault_access_token_fetcher_frontend.cc | 2 +- + .../trusted_vault_server_constants.h | 2 +- + .../core/browser/translate_ranker_impl.cc | 6 +- + .../core/browser/translate_script.cc | 2 +- + .../translate/core/common/translate_util.cc | 2 +- + components/ui_devtools/agent_util.cc | 4 +- + components/ukm/ukm_reporting_service.cc | 2 +- + .../top_domains/make_alexa_top_list.py | 2 +- + components/url_matcher/url_util.cc | 4 +- + .../variations/variations_url_constants.cc | 4 +- + .../installable/installable_logging.cc | 2 +- + components/wifi/wifi_service_win.cc | 2 +- + .../render_widget_host_view_cocoa.mm | 2 +- + .../aggregation_service_features.cc | 2 +- + .../indexed_db/indexed_db_backing_store.cc | 2 +- + .../indexed_db/indexed_db_reporting.cc | 2 +- + .../interest_group_update_manager.cc | 2 +- + .../portal/portal_navigation_throttle.cc | 2 +- + .../renderer_host/navigation_request.cc | 6 +- + .../renderer_host/render_frame_host_impl.cc | 2 +- + content/browser/resources/gpu/info_view.js | 2 +- + .../speech/speech_recognition_engine.cc | 2 +- + .../browser/web_contents/web_contents_impl.cc | 2 +- + content/browser/webauth/client_data_json.cc | 2 +- + .../webauth_request_security_checker.cc | 2 +- + .../webauth_request_security_checker.h | 4 +- + .../webrtc/resources/webrtc_internals.html | 2 +- + .../zygote_host/zygote_host_impl_linux.cc | 2 +- + .../pepper/pepper_media_device_manager.cc | 2 +- + content/renderer/render_thread_impl.cc | 14 +- + .../shell/browser/shell_browser_main_parts.cc | 2 +- + content/zygote/zygote_main_linux.cc | 2 +- + device/bluetooth/bluetooth_adapter_mac.mm | 2 +- + .../bluetooth/bluetooth_classic_device_mac.mm | 4 +- + device/fido/fido_strings.grd | 2 +- + device/fido/fido_test_data.h | 2 +- + device/gamepad/xbox_controller_mac.mm | 2 +- + docs/enterprise/extension_query.py | 4 +- + docs/enterprise/extension_query_py2.py | 4 +- + .../web_request/web_request_permissions.cc | 4 +- + extensions/browser/suggest_permission_util.cc | 4 +- + .../browser/updater/extension_downloader.cc | 4 +- + .../browser/updater/safe_manifest_parser.cc | 2 +- + extensions/common/api/_api_features.json | 2 +- + .../common/api/extensions_manifest_types.json | 6 +- + extensions/common/api/i18n.json | 2 +- + extensions/common/csp_validator.cc | 2 +- + extensions/common/extension_urls.cc | 12 +- + extensions/common/manifest_constants.cc | 6 +- + extensions/strings/extensions_strings.grd | 4 +- + google_apis/drive/drive_api_url_generator.cc | 2 +- + google_apis/gaia/gaia_auth_fetcher.cc | 4 +- + google_apis/gaia/gaia_auth_util.cc | 8 +- + google_apis/gaia/gaia_constants.cc | 84 ++--- + google_apis/gaia/gaia_oauth_client.cc | 6 +- + google_apis/gaia/gaia_urls.cc | 10 +- + google_apis/gcm/base/mcs_util.cc | 2 +- + google_apis/gcm/engine/gservices_settings.cc | 6 +- + google_apis/gcm/engine/mcs_client.cc | 2 +- + google_apis/gcm/tools/mcs_probe.cc | 2 +- + google_apis/google_api_keys.cc | 2 +- + .../ANGLE/EGL_ANGLE_sync_control_rate.txt | 2 +- + .../CHROMIUM/EGL_CHROMIUM_sync_control.txt | 2 +- + .../iosurface_image_backing_factory.mm | 2 +- + gpu/config/gpu_control_list_format.txt | 2 +- + .../lib/browser/protocol/headless_handler.cc | 2 +- + ios/build/bots/scripts/result_sink_util.py | 6 +- + ios/build/bots/scripts/test_result_util.py | 8 +- + ios/build/bots/scripts/xcode_util.py | 4 +- + ios/build/chrome_build.gni | 2 +- + .../app/strings/ios_chromium_strings.grd | 18 +- + .../app/strings/ios_google_chrome_strings.grd | 18 +- + ios/chrome/app/strings/ios_strings.grd | 44 +-- + .../autofill/automation/automation_action.mm | 2 +- + ...chrome_browser_state_removal_controller.mm | 2 +- + ios/chrome/browser/flags/about_flags.mm | 4 +- + ios/chrome/browser/omaha/omaha_service.mm | 2 +- + .../search_engine_tab_helper.mm | 8 +- + .../browser/signin/fake_system_identity.mm | 8 +- + .../activity_services/activity_type_util.mm | 2 +- + .../ui/bookmarks/bookmark_earl_grey.mm | 2 +- + .../ui/browser_view/browser_coordinator.mm | 2 +- + .../new_tab_page_app_interface.mm | 4 +- + .../content_suggestions/ntp_home_mediator.mm | 8 +- + .../browser/ui/main/scene_controller.mm | 2 +- + .../browser/ui/ntp/discover_feed_constants.mm | 2 +- + ios/chrome/browser/ui/ntp/incognito_view.mm | 2 +- + .../browser/ui/ntp/revamped_incognito_view.mm | 2 +- + .../ui/qr_scanner/qr_scanner_app_interface.mm | 2 +- + .../ui/settings/settings_app_interface.mm | 2 +- + .../table_cell_catalog_view_controller.mm | 8 +- + .../translate_table_view_controller.mm | 2 +- + .../interstitials/interstitial_ui_util.mm | 2 +- + .../browser/url/chrome_url_constants.cc | 40 +-- + ..._credential_provider_extension_strings.grd | 8 +- + .../password_spec_fetcher.mm | 2 +- + .../https_only_mode_blocking_page.mm | 2 +- + ios/net/cookies/cookie_store_ios_test_util.mm | 2 +- + ios/net/crn_http_protocol_handler.mm | 2 +- + .../browser/signin/chrome_identity_service.mm | 4 +- + .../signin/fake_chrome_identity_service.mm | 2 +- + .../fake_chrome_identity_service_constants.mm | 2 +- + ios/showcase/alert/sc_alert_coordinator.mm | 8 +- + .../sc_infobar_modal_save_card_coordinator.mm | 2 +- + .../fake_autocomplete_suggestion.mm | 4 +- + ios/web/navigation/navigation_manager_impl.mm | 6 +- + .../web_state/ui/wk_content_rule_list_util.mm | 2 +- + ios/web_view/internal/cwv_flags.mm | 2 +- + ios/web_view/internal/cwv_web_view.mm | 2 +- + media/base/win/mf_initializer.cc | 2 +- + .../native_pixmap_handle_mojom_traits.cc | 12 +- + ...stable_video_decoder_types_mojom_traits.cc | 178 +++++----- + .../src/build_tools/build_paths.py | 2 +- + .../src/build_tools/buildbot_common.py | 2 +- + .../build_tools/json/naclsdk_manifest.json | 32 +- + .../build_tools/json/naclsdk_manifest0.json | 2 +- + .../build_tools/json/naclsdk_manifest2.json | 4 +- + .../src/build_tools/nacl-mono-buildbot.py | 2 +- + .../src/build_tools/nacl-mono-builder.py | 2 +- + .../src/build_tools/sdk_tools/cacerts.txt | 2 +- + .../src/build_tools/sdk_tools/config.py | 2 +- + .../build_tools/sdk_tools/sdk_update_main.py | 2 +- + .../third_party/fancy_urllib/__init__.py | 4 +- + .../src/build_tools/update_nacl_manifest.py | 6 +- + .../src/build_tools/update_sdktools.py | 2 +- + native_client_sdk/src/doc/Makefile | 2 +- + .../security-contest/contest-warning.txt | 4 +- + native_client_sdk/src/doc/conf.py | 2 +- + .../src/doc/doxygen/generate_docs.py | 2 +- + native_client_sdk/src/doc/migration/apps.html | 8 +- + .../src/doc/migration/public.html | 2 +- + .../src/examples/api/socket/index.html | 2 +- + .../src/examples/demo/drive/drive.cc | 4 +- + .../src/examples/demo/drive/index.html | 2 +- + .../src/examples/demo/nacl_io_demo/index.html | 6 +- + .../src/gonacl_appengine/gonacl.py | 8 +- + .../static/bullet/fullscreen.html | 4 +- + .../gonacl_appengine/static/bullet/index.html | 4 +- + .../gonacl_appengine/static/bullet/main.js | 2 +- + .../gonacl_appengine/static/cube/example.js | 2 +- + .../gonacl_appengine/static/cube/index.html | 2 +- + .../gonacl_appengine/static/earth/example.js | 2 +- + .../gonacl_appengine/static/earth/index.html | 2 +- + .../gonacl_appengine/static/home/index.html | 2 +- + .../src/gonacl_appengine/static/index.html | 6 +- + .../gonacl_appengine/static/life/example.js | 2 +- + .../gonacl_appengine/static/life/index.html | 2 +- + .../gonacl_appengine/static/lua/index.html | 6 +- + .../src/gonacl_appengine/static/lua/lua.js | 2 +- + .../gonacl_appengine/static/lua/naclterm.js | 2 +- + .../static/smoothlife/example.js | 2 +- + .../static/smoothlife/index.html | 4 +- + .../static/voronoi/example.js | 2 +- + .../static/voronoi/index.html | 2 +- + native_client_sdk/src/tools/fix_manifest.py | 2 +- + native_client_sdk/src/web/manifest.html | 6 +- + net/base/network_change_notifier_mac.mm | 2 +- + net/base/url_util.cc | 4 +- + .../http_security_header_047.txt | Bin 166 -> 169 bytes + net/dns/dns_test_util.h | 12 +- + net/dns/dns_transaction.cc | 2 +- + net/dns/public/doh_provider_entry.cc | 4 +- + net/http/http_server_properties.cc | 4 +- + net/http/webfonts_histogram.cc | 6 +- + net/log/file_net_log_observer.cc | 2 +- + net/quic/crypto/proof_verifier_chromium.cc | 2 +- + net/quic/quic_stream_factory.cc | 8 +- + net/spdy/spdy_session.cc | 2 +- + net/tools/print_certificates.py | 2 +- + net/tools/testserver/testserver.py.vpython3 | 4 +- + .../transport_security_state_generator.cc | 2 +- + printing/backend/win_helper.cc | 4 +- + printing/print_settings_initializer_win.cc | 2 +- + remoting/base/breakpad_mac.mm | 2 +- + remoting/base/chromium_url_request.cc | 2 +- + remoting/base/service_urls.cc | 8 +- + .../notification/gstatic_json_fetcher.cc | 2 +- + ...rome.remote_assistance-firefox.json.jinja2 | 2 +- + remoting/host/it2me/it2me_constants.cc | 2 +- + remoting/host/linux/linux_me2me_host.py | 4 +- + remoting/host/linux/remoting_user_session.cc | 2 +- + remoting/host/remoting_me2me_host.cc | 2 +- + ....chrome.remote_desktop-firefox.json.jinja2 | 2 +- + remoting/host/setup/start_host_main.cc | 2 +- + remoting/ios/app/help_view_controller.mm | 2 +- + .../ios/app/host_setup_view_controller.mm | 2 +- + .../ios/app/remoting_menu_view_controller.mm | 10 +- + .../facade/remoting_oauth_authentication.mm | 2 +- + remoting/protocol/fake_session.cc | 2 +- + remoting/resources/remoting_strings.grd | 8 +- + remoting/signaling/signaling_id_util.cc | 4 +- + remoting/tools/build/remoting_localize.py | 6 +- + remoting/tools/zip2msi.py | 2 +- + rlz/lib/financial_ping.cc | 2 +- + sandbox/features.gni | 2 +- + sandbox/linux/services/libc_interceptor.cc | 2 +- + .../linux/suid/client/setuid_sandbox_host.cc | 2 +- + sandbox/linux/suid/sandbox.c | 2 +- + sandbox/policy/win/sandbox_win.cc | 2 +- + .../geolocation/network_location_request.cc | 2 +- + .../image_annotation_service.h | 4 +- + .../markdown/extensions/smarty.py | 2 +- + .../Python-Markdown/markdown/pep562.py | 2 +- + .../abseil-cpp/absl/abseil.podspec.gen.py | 2 +- + third_party/abseil-cpp/conanfile.py | 2 +- + third_party/abseil-cpp/generate_def_files.py | 2 +- + third_party/abseil-cpp/roll_abseil.py | 4 +- + third_party/afl/src/Makefile | 4 +- + third_party/afl/src/afl-analyze.c | 2 +- + third_party/afl/src/afl-as.c | 2 +- + third_party/afl/src/afl-fuzz.c | 2 +- + third_party/afl/src/afl-gcc.c | 2 +- + third_party/afl/src/afl-gotcpu.c | 4 +- + third_party/afl/src/afl-showmap.c | 2 +- + third_party/afl/src/afl-tmin.c | 2 +- + third_party/afl/src/docs/QuickStartGuide.txt | 2 +- + third_party/afl/src/docs/historical_notes.txt | 2 +- + third_party/afl/src/docs/notes_for_asan.txt | 2 +- + third_party/afl/src/docs/sister_projects.txt | 4 +- + .../canvas_harness/canvas_harness.html | 2 +- + third_party/afl/src/libdislocator/Makefile | 2 +- + third_party/afl/src/libtokencap/Makefile | 2 +- + third_party/afl/src/llvm_mode/Makefile | 6 +- + .../afl/src/llvm_mode/afl-clang-fast.c | 4 +- + .../android_build_tools/aapt2/3pp/fetch.py | 4 +- + .../apkanalyzer/3pp/fetch.py | 2 +- + .../apkanalyzer/3pp/install.py | 2 +- + .../android_build_tools/lint/3pp/fetch.py | 2 +- + .../android_build_tools/lint/3pp/install.py | 2 +- + .../manifest_merger/3pp/fetch.py | 2 +- + .../manifest_merger/3pp/install.py | 2 +- + .../android_arch_core_common/3pp/fetch.py | 2 +- + .../android_arch_core_runtime/3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../com_android_support_design/3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../com_android_support_loader/3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../com_android_support_multidex/3pp/fetch.py | 2 +- + .../com_android_support_print/3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../com_android_tools_common/3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../com_android_tools_sdk_common/3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../com_google_android_play_core/3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../3pp/fetch.py | 2 +- + .../Android_SDK_License-December_9_2016.txt | 4 +- + .../runner/src/main/Android.mk | 2 +- + third_party/androidx/fetch_all_androidx.py | 2 +- + .../common/loader/record_load_histograms.cc | 2 +- + .../blink/public/strings/blink_strings.grd | 8 +- + .../renderer/bindings/scripts/utilities.py | 2 +- + .../build/scripts/update_css_ranking.py | 4 +- + .../core/css/remote_font_face_source.cc | 2 +- + .../renderer/core/dom/events/event_target.cc | 2 +- + .../blink/renderer/core/events/touch_event.cc | 2 +- + .../blink/renderer/core/events/wheel_event.cc | 2 +- + .../blink/renderer/core/frame/local_frame.cc | 4 +- + .../blink/renderer/core/html/html_element.cc | 2 +- + .../renderer/core/html/html_iframe_element.cc | 2 +- + .../core/html/media/autoplay_policy.cc | 4 +- + .../core/html/media/html_media_element.cc | 4 +- + .../core/html/portal/html_portal_element.cc | 4 +- + .../renderer/core/loader/frame_loader.cc | 4 +- + .../core/loader/mixed_content_checker.cc | 2 +- + .../core/loader/subresource_filter.cc | 2 +- + .../script/document_write_intervention.cc | 6 +- + .../core/xmlhttprequest/xml_http_request.cc | 2 +- + .../modules/bluetooth/bluetooth_error.cc | 16 +- + .../modules/clipboard/clipboard_promise.cc | 2 +- + .../credentials_container.cc | 2 +- + .../encryptedmedia/encrypted_media_utils.h | 2 +- + .../modules/geolocation/geolocation.cc | 2 +- + .../play_app_url_manifest.json | 2 +- + .../modules/payments/payment_request.cc | 6 +- + .../modules/vibration/vibration_controller.cc | 4 +- + .../modules/webaudio/audio_context.cc | 4 +- + .../modules/webmidi/navigator_web_midi.cc | 2 +- + .../platform/fonts/mac/font_cache_mac.mm | 4 +- + .../platform/loader/fetch/resource_error.cc | 2 +- + .../loader/fetch/resource_load_scheduler.cc | 2 +- + .../platform/weborigin/security_origin.cc | 2 +- + .../blink/tools/blinkpy/common/net/git_cl.py | 4 +- + .../blinkpy/common/net/results_fetcher.py | 10 +- + .../blink/tools/blinkpy/common/net/rpc.py | 6 +- + .../blink/tools/blinkpy/common/pretty_diff.py | 2 +- + .../tools/blinkpy/common/system/filesystem.py | 2 +- + .../tools/blinkpy/common/system/profiler.py | 2 +- + .../blink/tools/blinkpy/style/filter.py | 2 +- + .../blinkpy/tool/commands/flaky_tests.py | 6 +- + .../blinkpy/tool/commands/rebaseline_cl.py | 2 +- + .../tools/blinkpy/w3c/chromium_commit.py | 2 +- + .../tools/blinkpy/w3c/chromium_commit_mock.py | 2 +- + third_party/blink/tools/blinkpy/w3c/common.py | 4 +- + .../blinkpy/w3c/directory_owners_extractor.py | 2 +- + .../tools/blinkpy/w3c/export_notifier.py | 4 +- + third_party/blink/tools/blinkpy/w3c/gerrit.py | 6 +- + .../tools/blinkpy/w3c/import_notifier.py | 4 +- + .../blink/tools/blinkpy/w3c/monorail.py | 2 +- + .../tools/blinkpy/w3c/pr_cleanup_tool.py | 2 +- + .../blink/tools/blinkpy/w3c/test_exporter.py | 4 +- + .../blink/tools/blinkpy/w3c/test_importer.py | 10 +- + .../blinkpy/w3c/wpt_results_processor.py | 2 +- + .../blink/tools/blinkpy/w3c/wpt_uploader.py | 2 +- + .../blink/tools/commit_stats/org-list.txt | 10 +- + .../print_stale_test_expectations_entries.py | 2 +- + third_party/boringssl/roll_boringssl.py | 2 +- + .../closure/bin/build/depstree.py | 2 +- + .../closure/bin/build/source.py | 2 +- + .../closure/bin/build/treescan.py | 2 +- + .../externs/chrome_extensions.js | 6 +- + .../externs/command_line_private.js | 4 +- + .../crashpad/build/install_linux_sysroot.py | 2 +- + third_party/crashpad/crashpad/package.h | 4 +- + third_party/crashpad/update.py | 2 +- + third_party/dav1d/generate_source.py | 2 +- + .../protoc_plugins/util/plugin_protos.py | 4 +- + .../closure/bin/build/closurebuilder.py | 2 +- + .../closure/bin/build/depstree.py | 2 +- + .../closure/bin/build/depswriter.py | 2 +- + .../closure/bin/build/source.py | 2 +- + .../closure/bin/build/treescan.py | 2 +- + .../closure/css/inlay/g-base.css | 4 +- + .../closure/css/inlay/g-fixed.css | 4 +- + .../closure/css/inlay/g-ratio.css | 4 +- + .../closure/goog/css/bubble.css | 18 +- + .../closure/goog/css/checkbox.css | 4 +- + .../closure/goog/css/colorpalette.css | 2 +- + .../goog/css/colorpicker-simplegrid.css | 2 +- + .../closure/goog/css/combobox.css | 2 +- + .../closure/goog/css/css3menubutton.css | 2 +- + .../closure/goog/css/custombutton.css | 2 +- + .../closure/goog/css/dialog.css | 2 +- + .../closure/goog/css/dragdropdetector.css | 4 +- + .../closure/goog/css/editor/bubble.css | 2 +- + .../goog/css/editor/equationeditor.css | 2 +- + .../closure/goog/css/editortoolbar.css | 2 +- + .../closure/goog/css/flatmenubutton.css | 2 +- + .../closure/goog/css/hsvapalette.css | 8 +- + .../closure/goog/css/hsvpalette.css | 8 +- + .../closure/goog/css/imagelessmenubutton.css | 2 +- + .../closure/goog/css/menubutton.css | 4 +- + .../closure/goog/css/menuitem.css | 2 +- + .../closure/goog/css/toolbar.css | 4 +- + .../closure/goog/css/tree.css | 4 +- + .../closure/goog/css/tristatemenuitem.css | 4 +- + .../goog/demos/autocompleterichremotedata.js | 16 +- + .../demos/autocompleterichremotedata.json | 16 +- + .../closure/goog/demos/css/demo.css | 2 +- + .../closure/goog/demos/css/emojipicker.css | 2 +- + .../closure/goog/demos/dialog.html | 4 +- + .../demos/graphics/advancedcoordinates.html | 2 +- + .../demos/graphics/advancedcoordinates2.html | 2 +- + .../goog/demos/graphics/basicelements.html | 4 +- + .../closure/goog/demos/history1.html | 2 +- + .../closure/goog/demos/history2.html | 2 +- + .../closure/goog/demos/history3.html | 2 +- + .../closure/goog/demos/hovercard.html | 18 +- + .../closure/goog/demos/splitpane.html | 2 +- + .../closure/goog/html/safeurl_test_vectors.js | 8 +- + .../goog/html/sanitizer/html_test_vectors.js | 2 +- + .../goog/labs/net/webchannel/environment.js | 2 +- + .../goog/labs/net/webchannel/netutils.js | 2 +- + .../labs/net/webchannel/webchannelbase.js | 4 +- + .../closure/goog/net/browserchannel.js | 4 +- + .../closure/goog/net/networktester.js | 2 +- + .../closure/goog/net/tmpnetwork.js | 2 +- + .../closure/goog/soy/soy_testhelper.js | 4 +- + .../closure/goog/transpile.js | 46 +-- + .../closure/goog/ui/editor/linkdialog.js | 2 +- + .../closure/goog/ui/editor/messages.js | 2 +- + .../closure/goog/ui/media/googlevideo.js | 6 +- + .../closure/goog/ui/media/mp3.js | 2 +- + .../closure/goog/ui/media/picasa.js | 8 +- + .../closure/goog/ui/media/youtube.js | 6 +- + .../closure/goog/ui/serverchart.js | 6 +- + .../doc/_layouts/article.html | 2 +- + .../google-closure-library/doc/js/article.js | 2 +- + .../src/chrome/os/inputview/adapter.js | 4 +- + .../closure/bin/build/closurebuilder.py | 2 +- + .../closure/bin/build/depstree.py | 2 +- + .../closure/bin/build/depswriter.py | 2 +- + .../closure/bin/build/source.py | 2 +- + .../closure/bin/build/treescan.py | 2 +- + .../closure_library/closure/bin/scopify.py | 2 +- + .../hunspell/src/hunspell/affentry.cxx | 2 +- + .../hunspell/src/hunspell/affentry.hxx | 2 +- + .../hunspell/src/hunspell/affixmgr.cxx | 2 +- + .../hunspell/src/hunspell/affixmgr.hxx | 2 +- + third_party/hunspell/src/hunspell/atypes.hxx | 2 +- + .../hunspell/src/hunspell/baseaffix.hxx | 2 +- + third_party/hunspell/src/hunspell/csutil.cxx | 2 +- + third_party/hunspell/src/hunspell/csutil.hxx | 2 +- + third_party/hunspell/src/hunspell/filemgr.cxx | 2 +- + third_party/hunspell/src/hunspell/filemgr.hxx | 2 +- + third_party/hunspell/src/hunspell/hashmgr.cxx | 2 +- + third_party/hunspell/src/hunspell/hashmgr.hxx | 2 +- + third_party/hunspell/src/hunspell/htypes.hxx | 2 +- + .../hunspell/src/hunspell/hunspell.cxx | 2 +- + .../hunspell/src/hunspell/hunspell.hxx | 2 +- + third_party/hunspell/src/hunspell/hunzip.cxx | 2 +- + third_party/hunspell/src/hunspell/hunzip.hxx | 2 +- + third_party/hunspell/src/hunspell/langnum.hxx | 2 +- + third_party/hunspell/src/hunspell/replist.cxx | 2 +- + third_party/hunspell/src/hunspell/replist.hxx | 2 +- + .../hunspell/src/hunspell/suggestmgr.cxx | 2 +- + .../hunspell/src/hunspell/suggestmgr.hxx | 2 +- + third_party/hunspell/src/hunspell/w_char.hxx | 2 +- + .../hunspell/src/parsers/firstparser.cxx | 2 +- + .../hunspell/src/parsers/firstparser.hxx | 2 +- + .../hunspell/src/parsers/htmlparser.cxx | 2 +- + .../hunspell/src/parsers/htmlparser.hxx | 2 +- + .../hunspell/src/parsers/latexparser.cxx | 2 +- + .../hunspell/src/parsers/latexparser.hxx | 2 +- + .../hunspell/src/parsers/manparser.cxx | 2 +- + .../hunspell/src/parsers/manparser.hxx | 2 +- + .../hunspell/src/parsers/odfparser.cxx | 2 +- + .../hunspell/src/parsers/odfparser.hxx | 2 +- + .../hunspell/src/parsers/testparser.cxx | 2 +- + .../hunspell/src/parsers/textparser.cxx | 2 +- + .../hunspell/src/parsers/textparser.hxx | 2 +- + .../hunspell/src/parsers/xmlparser.cxx | 2 +- + .../hunspell/src/parsers/xmlparser.hxx | 2 +- + .../src/be/hyph-be.lic.txt | 6 +- + .../src/hu/hyph-hu.lic.txt | 4 +- + .../src/hy/hyph-hy.lic.txt | 2 +- + third_party/inspector_protocol/roll.py | 4 +- + third_party/jstemplate/compile.py | 2 +- + .../jstemplate/jstemplate_example.html | 2 +- + third_party/jstemplate/jstemplate_jsunit.html | 10 +- + third_party/libaddressinput/BUILD.gn | 2 +- + .../chromium/tools/require_fields.py | 2 +- + third_party/libevent/evdns.c | 2 +- + .../libpng/contrib/oss-fuzz/README.txt | 2 +- + .../libusb/src/libusb/os/windows_usb.c | 4 +- + third_party/libxslt/chromium/roll.py | 2 +- + third_party/maldoca/src/maldoca/base/status.h | 2 +- + .../maldoca/src/maldoca/ole/vba_extract.cc | 2 +- + third_party/mozilla/NSPasteboard+Utils.mm | 2 +- + third_party/mozilla/NSString+Utils.mm | 2 +- + third_party/opus/src/doc/opus_in_isobmff.html | 2 +- + third_party/opus/src/doc/release.txt | 6 +- + third_party/pefile_py3/pefile.py | 4 +- + third_party/protobuf/CHANGES.txt | 12 +- + third_party/protobuf/CONTRIBUTORS.txt | 70 ++-- + third_party/protobuf/cmake/CMakeLists.txt | 2 +- + third_party/protobuf/composer.json | 2 +- + .../binary_json_conformance_suite.cc | 46 +-- + .../protobuf/conformance/conformance_cpp.cc | 2 +- + .../text_format_conformance_suite.cc | 6 +- + .../Tests/GPBObjectiveCPlusPlusTest.mm | 2 +- + third_party/protobuf/php/composer.json | 2 +- + .../php/ext/google/protobuf/convert.c | 2 +- + .../php/ext/google/protobuf/message.c | 4 +- + .../protobuf/python/docs/generate_docs.py | 2 +- + .../python/google/protobuf/descriptor.py | 2 +- + .../google/protobuf/descriptor_database.py | 2 +- + .../python/google/protobuf/descriptor_pool.py | 2 +- + .../protobuf/internal/_parameterized.py | 2 +- + .../google/protobuf/internal/builder.py | 2 +- + .../google/protobuf/internal/decoder.py | 2 +- + .../google/protobuf/internal/encoder.py | 2 +- + .../protobuf/internal/enum_type_wrapper.py | 2 +- + .../protobuf/internal/message_listener.py | 2 +- + .../protobuf/internal/python_message.py | 2 +- + .../google/protobuf/internal/test_util.py | 2 +- + .../google/protobuf/internal/type_checkers.py | 2 +- + .../protobuf/internal/well_known_types.py | 4 +- + .../google/protobuf/internal/wire_format.py | 2 +- + .../python/google/protobuf/json_format.py | 2 +- + .../python/google/protobuf/message.py | 2 +- + .../python/google/protobuf/message_factory.py | 2 +- + .../google/protobuf/pyext/cpp_message.py | 2 +- + .../python/google/protobuf/reflection.py | 2 +- + .../python/google/protobuf/service.py | 2 +- + .../google/protobuf/service_reflection.py | 2 +- + .../python/google/protobuf/text_format.py | 2 +- + .../generate_py_protobufs.py | 2 +- + .../python/protobuf_distutils/setup.py | 6 +- + third_party/protobuf/python/setup.py | 6 +- + .../protobuf/src/google/protobuf/any_lite.cc | 4 +- + .../protobuf/compiler/java/java_message.cc | 2 +- + .../compiler/js/well_known_types_embed.cc | 2 +- + .../src/google/protobuf/compiler/parser.cc | 8 +- + .../google/protobuf/util/internal/constants.h | 6 +- + .../util/internal/protostream_objectwriter.cc | 44 +-- + .../src/google/protobuf/util/json_util.cc | 2 +- + third_party/protobuf/update_version.py | 4 +- + .../pycoverage/coverage/htmlfiles/pyfile.html | 2 +- + .../src/benchmarks/chromium.linux.json | 152 ++++----- + third_party/pyjson5/src/setup.py | 2 +- + third_party/r8/3pp/fetch.py | 4 +- + third_party/rust/adler/v1/BUILD.gn | 2 +- + third_party/rust/aho_corasick/v0_7/BUILD.gn | 2 +- + third_party/rust/atty/v0_2/BUILD.gn | 2 +- + third_party/rust/autocfg/v1/BUILD.gn | 2 +- + third_party/rust/autocxx/v0_23/BUILD.gn | 2 +- + .../rust/autocxx_bindgen/v0_62/BUILD.gn | 2 +- + .../rust/autocxx_engine/v0_23/BUILD.gn | 2 +- + third_party/rust/autocxx_gen/v0_23/BUILD.gn | 2 +- + third_party/rust/autocxx_macro/v0_23/BUILD.gn | 2 +- + .../rust/autocxx_parser/v0_23/BUILD.gn | 2 +- + third_party/rust/bindgen/v0_60/BUILD.gn | 4 +- + third_party/rust/camino/v1/BUILD.gn | 2 +- + third_party/rust/cxx/v1/BUILD.gn | 2 +- + third_party/rust/cxx_gen/v0_7/BUILD.gn | 2 +- + third_party/rust/cxxbridge_cmd/v1/BUILD.gn | 4 +- + third_party/rust/cxxbridge_macro/v1/BUILD.gn | 2 +- + third_party/rust/fastrand/v1/BUILD.gn | 2 +- + third_party/rust/hashbrown/v0_11/BUILD.gn | 2 +- + third_party/rust/heck/v0_4/BUILD.gn | 2 +- + third_party/rust/indexmap/v1/BUILD.gn | 2 +- + third_party/rust/indoc/v1/BUILD.gn | 2 +- + third_party/rust/itoa/v0_4/BUILD.gn | 2 +- + third_party/rust/itoa/v1/BUILD.gn | 2 +- + third_party/rust/lazy_static/v1/BUILD.gn | 2 +- + third_party/rust/link_cplusplus/v1/BUILD.gn | 2 +- + third_party/rust/memchr/v2/BUILD.gn | 2 +- + third_party/rust/memoffset/v0_6/BUILD.gn | 2 +- + .../rust/minimal_lexical/v0_2/BUILD.gn | 2 +- + third_party/rust/miniz_oxide/v0_4/BUILD.gn | 2 +- + third_party/rust/moveit/v0_5/BUILD.gn | 2 +- + third_party/rust/once_cell/v1/BUILD.gn | 4 +- + third_party/rust/pathdiff/v0_2/BUILD.gn | 2 +- + .../rust/peeking_take_while/v0_1/BUILD.gn | 2 +- + third_party/rust/prettyplease/v0_1/BUILD.gn | 2 +- + third_party/rust/proc_macro2/v1/BUILD.gn | 2 +- + third_party/rust/quote/v1/BUILD.gn | 2 +- + third_party/rust/remove_dir_all/v0_5/BUILD.gn | 2 +- + third_party/rust/rstest/v0_12/BUILD.gn | 2 +- + .../v0_12/crate/docs/head/COPYRIGHT.txt | 2 +- + third_party/rust/rustc_version/v0_4/BUILD.gn | 2 +- + third_party/rust/rustversion/v1/BUILD.gn | 2 +- + third_party/rust/ryu/v1/BUILD.gn | 2 +- + third_party/rust/semver/v1/BUILD.gn | 4 +- + third_party/rust/serde/v1/BUILD.gn | 2 +- + third_party/rust/serde_derive/v1/BUILD.gn | 2 +- + third_party/rust/serde_json/v1/BUILD.gn | 2 +- + .../rust/serde_json_lenient/v0_1/BUILD.gn | 2 +- + third_party/rust/shlex/v1/BUILD.gn | 2 +- + third_party/rust/strum_macros/v0_24/BUILD.gn | 2 +- + third_party/rust/syn/v1/BUILD.gn | 4 +- + third_party/rust/tempfile/v3/BUILD.gn | 4 +- + third_party/rust/termcolor/v1/BUILD.gn | 2 +- + third_party/rust/thiserror/v1/BUILD.gn | 2 +- + third_party/rust/thiserror_impl/v1/BUILD.gn | 2 +- + third_party/rust/unicode_ident/v1/BUILD.gn | 2 +- + .../rust/unicode_linebreak/v0_1/BUILD.gn | 2 +- + third_party/rust/unicode_width/v0_1/BUILD.gn | 2 +- + third_party/rust/unindent/v0_1/BUILD.gn | 2 +- + third_party/rust/which/v4/BUILD.gn | 2 +- + third_party/rust/winapi/v0_3/BUILD.gn | 2 +- + third_party/rust/winapi_util/v0_1/BUILD.gn | 2 +- + .../tensorflow_text/core/ops/rouge_l_op.cc | 2 +- + .../metrics/text_similarity_metric_ops.py | 2 +- + .../updater/chrome_mac_universal/3pp/fetch.py | 2 +- + .../chrome_mac_universal_prod/3pp/fetch.py | 2 +- + .../updater/chrome_win_x86/3pp/fetch.py | 2 +- + .../updater/chrome_win_x86_64/3pp/fetch.py | 2 +- + .../updater/chromium_mac_amd64/3pp/fetch.py | 6 +- + .../updater/chromium_mac_arm64/3pp/fetch.py | 6 +- + .../updater/chromium_win_x86/3pp/fetch.py | 6 +- + .../updater/chromium_win_x86_64/3pp/fetch.py | 6 +- + third_party/wpt_tools/roll_wpt.py | 8 +- + third_party/wpt_tools/wpt/tools/lint/rules.py | 4 +- + .../tools/third_party/pywebsocket3/setup.py | 2 +- + .../wpt/tools/webdriver/webdriver/client.py | 2 +- + .../wpt_tools/wpt/tools/wpt/android.py | 2 +- + .../wpt_tools/wpt/tools/wpt/browser.py | 32 +- + third_party/wpt_tools/wpt/tools/wpt/run.py | 4 +- + .../wpt/tools/wptrunner/requirements.txt | 2 +- + .../wpt_tools/wpt/tools/wptrunner/setup.py | 2 +- + .../executors/executorcontentshell.py | 2 +- + .../wptrunner/executors/executormarionette.py | 14 +- + .../wptrunner/formatters/chromium.py | 2 +- + third_party/xnnpack/generate_build_gn.py | 2 +- + .../codereview/download_issue.py | 6 +- + tools/accessibility/codereview/mph.py | 2 +- + tools/accessibility/inspect/ax_utils.cc | 2 +- + tools/accessibility/nvda/README.txt | 2 +- + tools/android/checkxmlstyle/checkxmlstyle.py | 8 +- + .../scripts/customtabs_benchmark.py | 2 +- + .../scripts/run_benchmark.py | 2 +- + .../scripts/sample_config.json | 4 +- + .../js/src/class_view.html | 2 +- + .../dependency_analysis/js/src/load_graph.js | 2 +- + .../js/src/package_view.html | 2 +- + .../dependency_analysis/upload_html_viewer.py | 2 +- + .../convenience/touch_resources.py | 2 +- + tools/android/sdk_updater/update_sdk.py | 2 +- + tools/binary_size/diagnose_bloat.py | 4 +- + tools/binary_size/libsupersize/console.py | 2 +- + .../libsupersize/viewer/static/auth-consts.js | 8 +- + .../libsupersize/viewer/static/index.html | 2 +- + .../libsupersize/viewer/static/index.js | 2 +- + .../viewer/static/tree-worker-wasm.js | 4 +- + .../libsupersize/viewer/static/viewer.html | 8 +- + .../libsupersize/viewer/upload_html_viewer.py | 2 +- + tools/binary_size/libsupersize/zip_util.py | 2 +- + .../binary_size/trybot_commit_size_checker.py | 4 +- + tools/bisect-builds.py | 30 +- + tools/bisect_repackage/bisect_repackage.py | 4 +- + .../bisect_repackage_utils.py | 4 +- + tools/boilerplate.py | 2 +- + tools/browserbench-webdriver/browserbench.py | 2 +- + tools/captured_sites/refresh.py | 2 +- + tools/check_git_config.py | 24 +- + tools/checklicenses/checklicenses.py | 2 +- + tools/checkteamtags/checkteamtags.py | 8 +- + tools/checkteamtags/extract_components.py | 2 +- + .../open_my_editor/ext/background.js | 26 +- + .../open_my_editor/ext/manifest.json | 6 +- + .../manual-fields-to-ignore.txt | 2 +- + tools/clang/scripts/build.py | 12 +- + tools/clang/scripts/include-analysis.html | 12 +- + tools/clang/scripts/package.py | 2 +- + tools/clang/scripts/update.py | 2 +- + tools/clang/scripts/upload_revision.py | 2 +- + tools/code_coverage/coverage.py | 8 +- + tools/cr/cr/base/android.py | 2 +- + tools/cr/main.py | 2 +- + tools/crates/gnrt/test_metadata.json | 2 +- + tools/crbug/crbug.js | 8 +- + tools/crbug/pinpoint.js | 4 +- + tools/crbug/user-activity.js | 4 +- + .../cygprofile/orderfile_generator_backend.py | 4 +- + tools/determinism/compare_build_artifacts.py | 2 +- + tools/download_optimization_profile.py | 2 +- + .../dromaeo_benchmark_runner.py | 10 +- + tools/emacs/trybot-mac.txt | 232 ++++++------- + tools/flags/list_flags.py | 6 +- + tools/generate_stubs/generate_stubs.py | 2 +- + tools/get_asan_chrome/get_asan_chrome.py | 6 +- + tools/git/suggest_owners.py | 6 +- + tools/gn/bootstrap/bootstrap.py | 2 +- + tools/gn/roll_gn.py | 2 +- + tools/grit/grit/format/rc.py | 2 +- + tools/grit/grit/tool/android2grd.py | 4 +- + tools/grit/grit/tool/resize.py | 2 +- + tools/grit/pak_util.py | 2 +- + tools/grit/setup.py | 4 +- + .../js_externs_generator.py | 4 +- + tools/json_schema_compiler/js_util.py | 2 +- + tools/json_schema_compiler/preview.py | 2 +- + tools/licenses.py | 44 +-- + tools/mac/download_symbols.py | 4 +- + tools/mac/power/scenarios.py | 10 +- + tools/mb/mb.py | 6 +- + tools/mb/mb_config.pyl | 6 +- + tools/md_browser/base.css | 4 +- + tools/md_browser/footer.html | 2 +- + tools/md_browser/gitiles_autolink.py | 2 +- + tools/md_browser/gitiles_ext_blocks.py | 2 +- + tools/md_browser/gitiles_smart_quotes.py | 2 +- + tools/md_browser/md_browser.py | 2 +- + tools/metrics/common/models.py | 2 +- + tools/metrics/histograms/expand_owners.py | 12 +- + .../metrics/histograms/extract_histograms.py | 8 +- + ...ram_configuration_model_test_histograms.py | 68 ++-- + tools/metrics/histograms/split_xml.py | 4 +- + tools/metrics/md2xml.py | 4 +- + tools/metrics/structured/model.py | 6 +- + tools/metrics/ukm/xml_validations.py | 4 +- + tools/nocompile_driver.py | 2 +- + tools/omahaproxy.py | 2 +- + tools/perfbot-analysis/builder.js | 4 +- + tools/perfbot-analysis/bulk-download.js | 2 +- + tools/python/google/gethash_timer.py | 2 +- + tools/resources/find_unused_resources.py | 2 +- + tools/roll_webgl_conformance.py | 2 +- + tools/run-swarmed.py | 10 +- + tools/site_compare/commands/measure.py | 2 +- + tools/site_compare/commands/scrape.py | 2 +- + .../scrapers/chrome/chromebase.py | 4 +- + .../site_compare/scrapers/firefox/firefox2.py | 2 +- + tools/site_compare/scrapers/ie/ie7.py | 4 +- + tools/site_compare/utils/browser_iterate.py | 2 +- + tools/symsrc/source_index.py | 8 +- + tools/tracing/rename_breakpad.py | 2 +- + .../sample_traffic_annotation.cc | 2 +- + .../scripts/auditor/auditor.py | 2 +- + .../scripts/auditor/util.py | 2 +- + .../scripts/update_annotations_doc.py | 4 +- + .../scripts/update_annotations_sheet.py | 6 +- + tools/usb_gadget/gadget.py | 2 +- + tools/usb_gadget/msos20_descriptors.py | 2 +- + tools/variations/bisect_variations.py | 2 +- + tools/visual_debugger/app.html | 4 +- + tools/web_dev_style/css_checker.py | 6 +- + tools/web_dev_style/html_checker.py | 2 +- + tools/web_dev_style/js_checker.py | 8 +- + tools/web_dev_style/resource_checker.py | 2 +- + tools/win/RetrieveSymbols/RetrieveSymbols.cpp | 2 +- + tools/win/sizeviewer/template.html | 2 +- + .../chromevox/background/background.js | 2 +- + .../chromevox/background/prefs.js | 4 +- + .../chromevox/injected/history.js | 2 +- + .../cvox2/background/background.js | 14 +- + .../cvox2/background/panel.html | 2 +- + .../extensions/searchvox/loader.js | 2 +- + .../chromevoxclassic/manifest.json.jinja2 | 2 +- + .../color_contrast_companion/help.html | 2 +- + .../accessibility_extensions_strings.grd | 2 +- + ui/base/clipboard/clipboard_test_template.h | 10 +- + .../constrained_window_animation.mm | 2 +- + ui/base/cocoa/tool_tip_base_view.mm | 2 +- + .../cocoa/underlay_opengl_hosting_window.mm | 2 +- + ui/base/ime/character_composer_sequences.txt | 2 +- + .../keycodes/keyboard_code_conversion_mac.mm | 2 +- + .../file_manager/common/js/mock_chrome.js | 6 +- + .../foreground/elements/icons.html | 2 +- + .../foreground/js/ui/file_table.js | 2 +- + ui/file_manager/image_loader/piex/Makefile | 2 +- + ui/ozone/ozone.gni | 2 +- + ui/resources/README.txt | 4 +- + ui/resources/resource_check/ico_files.py | 4 +- + .../resource_check/resource_scale_factors.py | 4 +- + ui/strings/ui_strings.grd | 4 +- + ui/views/examples/webview_example.cc | 2 +- + .../cr_components/app_management/icons.html | 2 +- + .../help_bubble/help_bubble_icons.html | 2 +- + ui/webui/resources/cr_elements/icons.html | 4 +- + ...weblayer_security_blocking_page_factory.cc | 2 +- + weblayer/shell/app/shell_main_params.cc | 2 +- + 1456 files changed, 3693 insertions(+), 3693 deletions(-) diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/android_webview/tools/cts_config/webview_cts_gcs_path.json --- a/android_webview/tools/cts_config/webview_cts_gcs_path.json @@ -1525,7 +1525,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/P/9.0_r20" } }, -@@ -326,12 +326,12 @@ +@@ -331,12 +331,12 @@ "arch": { "arm64": { "filename": "arm64/Q/android-cts-arm64-10_r13.zip", @@ -1540,7 +1540,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/Q/10_r13" } }, -@@ -419,12 +419,12 @@ +@@ -424,12 +424,12 @@ "arch": { "arm64": { "filename": "arm64/R/android-cts-arm64-11_r9.zip", @@ -1555,7 +1555,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/R/11_r9/" } }, -@@ -537,12 +537,12 @@ +@@ -565,12 +565,12 @@ "arch": { "arm64": { "filename": "arm64/S/android-cts-arm64-12_r5.zip", @@ -1570,7 +1570,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/S/12_r5/" } }, -@@ -670,7 +670,7 @@ +@@ -733,7 +733,7 @@ "arch": { "x86": { "filename": "x86/T/android-cts-x86-13_r1.zip", @@ -1612,7 +1612,7 @@ diff --git a/android_webview/tools/record_netlog.py b/android_webview/tools/reco diff --git a/android_webview/tools/remove_preinstalled_webview.py b/android_webview/tools/remove_preinstalled_webview.py --- a/android_webview/tools/remove_preinstalled_webview.py +++ b/android_webview/tools/remove_preinstalled_webview.py -@@ -93,7 +93,7 @@ def RemovePreinstalledWebViews(device): +@@ -90,7 +90,7 @@ def RemovePreinstalledWebViews(device): # workaround this. Use lots of newlines to make sure this message doesn't # get lost. logging.error('Did you start the emulator with "-writable-system?"\n' @@ -1666,7 +1666,7 @@ diff --git a/ash/accelerators/accelerator_notifications.cc b/ash/accelerators/ac diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd -@@ -721,7 +721,7 @@ This file contains the strings for ash. +@@ -730,7 +730,7 @@ Style notes: other {Update device within # seconds}} @@ -1675,7 +1675,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -746,7 +746,7 @@ This file contains the strings for ash. +@@ -755,7 +755,7 @@ Style notes: other {Change device to previous version within # seconds}} @@ -1684,7 +1684,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -756,10 +756,10 @@ This file contains the strings for ash. +@@ -765,10 +765,10 @@ Style notes: Update overdue @@ -1697,7 +1697,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -802,10 +802,10 @@ This file contains the strings for ash. +@@ -811,10 +811,10 @@ Style notes: This update requires powerwashing your $1Chromebook. All data will be deleted. Learn more about the latest $2ChromiumOS update. @@ -1710,7 +1710,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd $1Learn more about the latest ChromiumOS update. This Chromebook needs to restart to apply an update. This can take up to 1 minute. -@@ -899,7 +899,7 @@ This file contains the strings for ash. +@@ -908,7 +908,7 @@ Style notes: @@ -1719,7 +1719,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -1303,7 +1303,7 @@ This file contains the strings for ash. +@@ -1321,7 +1321,7 @@ Style notes: Supervised user @@ -1728,7 +1728,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1617,7 +1617,7 @@ This file contains the strings for ash. +@@ -1635,7 +1635,7 @@ Style notes: Tap to configure @@ -1737,7 +1737,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Connected devices settings -@@ -3726,7 +3726,7 @@ Connect your device to power. +@@ -3783,7 +3783,7 @@ Connect your device to power. Save your $1Pixel Buds @@ -1746,7 +1746,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Settings -@@ -3759,10 +3759,10 @@ Connect your device to power. +@@ -3816,10 +3816,10 @@ Connect your device to power. Connect $1Pixel Buds to this Chromebook @@ -1759,7 +1759,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Cancel -@@ -3888,7 +3888,7 @@ Connect your device to power. +@@ -3945,7 +3945,7 @@ Connect your device to power. Multiple sign-in has been disabled @@ -1768,7 +1768,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -4436,7 +4436,7 @@ Here are some things you can try to get started. +@@ -4520,7 +4520,7 @@ Here are some things you can try to get started. Unlock device to perform the notification action @@ -1917,57 +1917,10 @@ diff --git a/ash/quick_pair/ui/fast_pair/fast_pair_presenter_impl.cc b/ash/quick bool ShouldShowUserEmail(ash::LoginStatus status) { switch (status) { -diff --git a/ash/services/device_sync/cryptauth_client_impl.cc b/ash/services/device_sync/cryptauth_client_impl.cc ---- a/ash/services/device_sync/cryptauth_client_impl.cc -+++ b/ash/services/device_sync/cryptauth_client_impl.cc -@@ -29,7 +29,7 @@ namespace { - // -------------------- CryptAuth v1 Endpoints -------------------- - - // Default URL of Google APIs endpoint hosting CryptAuth v1. --const char kDefaultCryptAuthV1HTTPHost[] = "https://www.googleapis.com"; -+const char kDefaultCryptAuthV1HTTPHost[] = "https://www.9oo91eapis.qjz9zk"; - - // URL subpath hosting the CryptAuth v1 service. - const char kCryptAuthV1Path[] = "cryptauth/v1/"; -@@ -49,11 +49,11 @@ const char kFinishEnrollmentPath[] = "enrollment/finish"; - - // Default URL of Google APIs endpoint hosting CryptAuth v2 Enrollment. - const char kDefaultCryptAuthV2EnrollmentHTTPHost[] = -- "https://cryptauthenrollment.googleapis.com"; -+ "https://cryptauthenrollment.9oo91eapis.qjz9zk"; - - // Default URL of Google APIs endpoint hosting CryptAuth v2 DeviceSync. - const char kDefaultCryptAuthV2DeviceSyncHTTPHost[] = -- "https://cryptauthdevicesync.googleapis.com"; -+ "https://cryptauthdevicesync.9oo91eapis.qjz9zk"; - - // URL subpaths for each CryptAuth v2 API endpoint. - // Note: Although "v1" is part of the path names, these are in fact v2 API -@@ -69,7 +69,7 @@ const char kBatchSetFeatureStatusesPath[] = "/v1:batchSetFeatureStatuses"; - const char kGetDevicesActivityStatusPath[] = "/v1:getDevicesActivityStatus"; - - const char kCryptAuthOAuth2Scope[] = -- "https://www.googleapis.com/auth/cryptauth"; -+ "https://www.9oo91eapis.qjz9zk/auth/cryptauth"; - - // Creates the full CryptAuth v1 URL for endpoint to the API with - // |request_path|. -diff --git a/ash/services/ime/constants.cc b/ash/services/ime/constants.cc ---- a/ash/services/ime/constants.cc -+++ b/ash/services/ime/constants.cc -@@ -36,7 +36,7 @@ const base::FilePath::CharType kLanguageDataDirName[] = - FILE_PATH_LITERAL("data"); - #endif - --const char kGoogleKeyboardDownloadDomain[] = "dl.google.com"; -+const char kGoogleKeyboardDownloadDomain[] = "dl.9oo91e.qjz9zk"; - - } // namespace ime - } // namespace ash diff --git a/ash/system/eche/eche_tray.cc b/ash/system/eche/eche_tray.cc --- a/ash/system/eche/eche_tray.cc +++ b/ash/system/eche/eche_tray.cc -@@ -262,7 +262,7 @@ void EcheTray::CloseBubble() { +@@ -265,7 +265,7 @@ void EcheTray::CloseBubble() { void EcheTray::ShowBubble() { #ifdef FAKE_BUBBLE_FOR_DEBUG @@ -2073,7 +2026,7 @@ diff --git a/ash/webui/camera_app_ui/resources/js/lib/analytics.js b/ash/webui/c diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings.grd b/ash/webui/camera_app_ui/resources/strings/camera_strings.grd --- a/ash/webui/camera_app_ui/resources/strings/camera_strings.grd +++ b/ash/webui/camera_app_ui/resources/strings/camera_strings.grd -@@ -325,7 +325,7 @@ +@@ -328,7 +328,7 @@ Copy text @@ -2145,7 +2098,7 @@ diff --git a/ash/webui/media_app_ui/media_app_guest_ui.cc b/ash/webui/media_app_ diff --git a/ash/webui/os_feedback_ui/backend/help_content_provider.cc b/ash/webui/os_feedback_ui/backend/help_content_provider.cc --- a/ash/webui/os_feedback_ui/backend/help_content_provider.cc +++ b/ash/webui/os_feedback_ui/backend/help_content_provider.cc -@@ -39,9 +39,9 @@ using ::ash::os_feedback_ui::mojom::SearchResponse; +@@ -40,9 +40,9 @@ using ::ash::os_feedback_ui::mojom::SearchResponse; using ::ash::os_feedback_ui::mojom::SearchResponsePtr; constexpr char kHelpContentProviderUrl[] = @@ -2155,8 +2108,8 @@ diff --git a/ash/webui/os_feedback_ui/backend/help_content_provider.cc b/ash/web -constexpr char kGoogleSupportSiteUrl[] = "https://support.google.com"; +constexpr char kGoogleSupportSiteUrl[] = "https://support.9oo91e.qjz9zk"; - // Response with 5 items takes ~7KB. A loose upper bound of 64KB is chosen to - // avoid breaking the flow in case the response is longer. + // We need to drop items in different languages from the device language. + // Therefore, we request more items in search request in order to return diff --git a/ash/webui/os_feedback_ui/resources/confirmation_page.js b/ash/webui/os_feedback_ui/resources/confirmation_page.js --- a/ash/webui/os_feedback_ui/resources/confirmation_page.js +++ b/ash/webui/os_feedback_ui/resources/confirmation_page.js @@ -2249,7 +2202,7 @@ diff --git a/ash/webui/os_feedback_ui/resources/feedback_constants.js b/ash/webu diff --git a/ash/webui/os_feedback_ui/resources/search_page.js b/ash/webui/os_feedback_ui/resources/search_page.js --- a/ash/webui/os_feedback_ui/resources/search_page.js +++ b/ash/webui/os_feedback_ui/resources/search_page.js -@@ -319,7 +319,7 @@ export class SearchPageElement extends SearchPageElementBase { +@@ -348,7 +348,7 @@ export class SearchPageElement extends SearchPageElementBase { */ feedbackWritingGuidanceUrl_() { // TODO(xiangdongkong): append ?hl={the application locale} to the url. @@ -2261,7 +2214,7 @@ diff --git a/ash/webui/os_feedback_ui/resources/search_page.js b/ash/webui/os_fe diff --git a/ash/webui/personalization_app/personalization_app_ui.cc b/ash/webui/personalization_app/personalization_app_ui.cc --- a/ash/webui/personalization_app/personalization_app_ui.cc +++ b/ash/webui/personalization_app/personalization_app_ui.cc -@@ -33,7 +33,7 @@ namespace ash::personalization_app { +@@ -37,7 +37,7 @@ namespace ash::personalization_app { namespace { @@ -2366,7 +2319,7 @@ diff --git a/ash/webui/scanning/resources/scanning_app.js b/ash/webui/scanning/r diff --git a/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js b/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js --- a/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js +++ b/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js -@@ -251,7 +251,7 @@ export class OnboardingEnterRsuWpDisableCodePage extends +@@ -229,7 +229,7 @@ export class OnboardingEnterRsuWpDisableCodePage extends */ computeRsuChallengeLinkText_() { const unlockPageUrl = @@ -2423,7 +2376,7 @@ diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc diff --git a/base/functional/callback.h b/base/functional/callback.h --- a/base/functional/callback.h +++ b/base/functional/callback.h -@@ -184,7 +184,7 @@ class OnceCallback : public internal::CallbackBase { +@@ -213,7 +213,7 @@ class OnceCallback : public internal::CallbackBase { static_assert( AlwaysFalse, "need to convert a base::OnceCallback to base::FunctionRef? " @@ -2432,7 +2385,7 @@ diff --git a/base/functional/callback.h b/base/functional/callback.h } template -@@ -194,7 +194,7 @@ class OnceCallback : public internal::CallbackBase { +@@ -223,7 +223,7 @@ class OnceCallback : public internal::CallbackBase { AlwaysFalse, "using base::BindOnce() is not necessary with base::FunctionRef; is it " "possible to use a capturing lambda directly? If not, please bring up " @@ -2441,7 +2394,7 @@ diff --git a/base/functional/callback.h b/base/functional/callback.h } }; -@@ -318,7 +318,7 @@ class RepeatingCallback : public internal::CallbackBaseCopyable { +@@ -360,7 +360,7 @@ class RepeatingCallback : public internal::CallbackBaseCopyable { static_assert( AlwaysFalse, "need to convert a base::RepeatingCallback to base::FunctionRef? " @@ -2450,7 +2403,7 @@ diff --git a/base/functional/callback.h b/base/functional/callback.h } template -@@ -328,7 +328,7 @@ class RepeatingCallback : public internal::CallbackBaseCopyable { +@@ -370,7 +370,7 @@ class RepeatingCallback : public internal::CallbackBaseCopyable { AlwaysFalse, "using base::BindRepeating() is not necessary with base::FunctionRef; " "is it possible to use a capturing lambda directly? If not, please " @@ -2474,7 +2427,7 @@ diff --git a/base/ios/device_util.mm b/base/ios/device_util.mm diff --git a/base/memory/raw_ptr.cc b/base/memory/raw_ptr.cc --- a/base/memory/raw_ptr.cc +++ b/base/memory/raw_ptr.cc -@@ -202,7 +202,7 @@ void AsanBackupRefPtrImpl::AsanCheckIfValidExtraction( +@@ -203,7 +203,7 @@ void AsanBackupRefPtrImpl::AsanCheckIfValidExtraction( "Otherwise, it is still likely a bug to rely on the address of an " "already freed allocation.\n" "Refer to " @@ -2486,15 +2439,15 @@ diff --git a/base/memory/raw_ptr.cc b/base/memory/raw_ptr.cc diff --git a/base/memory/raw_ptr_asan_service.cc b/base/memory/raw_ptr_asan_service.cc --- a/base/memory/raw_ptr_asan_service.cc +++ b/base/memory/raw_ptr_asan_service.cc -@@ -215,7 +215,7 @@ void RawPtrAsanService::ErrorReportCallback(const char* report) { +@@ -282,7 +282,7 @@ void RawPtrAsanService::ErrorReportCallback(const char* report) { - Log("\nMiraclePtr Status: %s\n" + Log("\nMiraclePtr Status: %s\n%s\n%s\n" "Refer to " - "https://chromium.googlesource.com/chromium/src/+/main/base/memory/" + "https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/base/memory/" "raw_ptr.md for details.", - status_body); - } + ProtectionStatusToString(crash_info.protection_status), + crash_info.crash_details, crash_info.protection_details); diff --git a/build/android/gradle/generate_gradle.py b/build/android/gradle/generate_gradle.py --- a/build/android/gradle/generate_gradle.py +++ b/build/android/gradle/generate_gradle.py @@ -2510,8 +2463,8 @@ diff --git a/build/android/gradle/generate_gradle.py b/build/android/gradle/gene diff --git a/build/android/gyp/assert_static_initializers.py b/build/android/gyp/assert_static_initializers.py --- a/build/android/gyp/assert_static_initializers.py +++ b/build/android/gyp/assert_static_initializers.py -@@ -173,7 +173,7 @@ def main(): - print(' //tools/binary_size/diagnose_bloat.py') +@@ -157,7 +157,7 @@ def main(): + ignored_libs, no_initializers_libs) print() print('For more information:') - print(' https://chromium.googlesource.com/chromium/src/+/main/docs/' @@ -2534,7 +2487,7 @@ diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py -@@ -376,7 +376,7 @@ def _OptimizeWithR8(options, +@@ -383,7 +383,7 @@ def _OptimizeWithR8(options, # Python will print the original exception as well. raise Exception( 'R8 failed. Please see ' @@ -2543,7 +2496,7 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py 'android/docs/java_optimization.md#Debugging-common-failures') from e base_has_imported_lib = False -@@ -510,7 +510,7 @@ out/Release/apks/YourApk.apk > dex.txt +@@ -517,7 +517,7 @@ out/Release/apks/YourApk.apk > dex.txt stderr += """ You may need to update build configs to run FragmentActivityReplacer for additional targets. See @@ -2607,9 +2560,9 @@ diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py diff --git a/build/android/test_wrapper/logdog_wrapper.py b/build/android/test_wrapper/logdog_wrapper.py --- a/build/android/test_wrapper/logdog_wrapper.py +++ b/build/android/test_wrapper/logdog_wrapper.py -@@ -27,7 +27,7 @@ from py_utils import tempfile_ext +@@ -27,7 +27,7 @@ from devil.utils import timeout_retry + from py_utils import tempfile_ext - PROJECT = 'chromium' OUTPUT = 'logdog' -COORDINATOR_HOST = 'luci-logdog.appspot.com' +COORDINATOR_HOST = 'luci-logdog.8pp2p8t.qjz9zk' @@ -2643,7 +2596,7 @@ diff --git a/build/apple/tweak_info_plist.py b/build/apple/tweak_info_plist.py diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -1893,7 +1893,7 @@ if (enable_java_templates) { +@@ -1936,7 +1936,7 @@ if (enable_java_templates && is_android) { # * public.txt # * annotations.zip # * assets/ @@ -2659,8 +2612,8 @@ diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni # Note: CfT is not intended to be used as a test runner to run tests in this # repository. # -- # Design doc: https://goo.gle/chrome-for-testing -+ # Design doc: https://goo.gl.qjz9zke/chrome-for-testing +- # Design document: https://goo.gle/chrome-for-testing ++ # Design document: https://goo.gl.qjz9zke/chrome-for-testing is_chrome_for_testing_branded = false # Set to true to enable settings for high end Android devices, typically @@ -2888,7 +2841,7 @@ diff --git a/build/toolchain/cros_toolchain.gni b/build/toolchain/cros_toolchain diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni --- a/build/toolchain/gcc_toolchain.gni +++ b/build/toolchain/gcc_toolchain.gni -@@ -712,7 +712,7 @@ template("gcc_toolchain") { +@@ -725,7 +725,7 @@ template("gcc_toolchain") { rust_sysroot_relative_to_out = rebase_path(rust_sysroot, root_out_dir) rustc_wrapper = rebase_path("//build/rust/rustc_wrapper.py") @@ -2912,7 +2865,7 @@ diff --git a/build/util/lib/common/perf_tests_results_helper.py b/build/util/lib diff --git a/build/util/lib/results/result_sink.py b/build/util/lib/results/result_sink.py --- a/build/util/lib/results/result_sink.py +++ b/build/util/lib/results/result_sink.py -@@ -139,7 +139,7 @@ class ResultSinkClient(object): +@@ -151,7 +151,7 @@ class ResultSinkClient(object): if test_file and str(test_file).startswith('//'): tr['testMetadata']['location'] = { 'file_name': test_file, @@ -2920,7 +2873,7 @@ diff --git a/build/util/lib/results/result_sink.py b/build/util/lib/results/resu + 'repo': 'https://chromium.9oo91esource.qjz9zk/chromium/src', } - res = requests.post(url=self.test_results_url, + res = self.session.post(url=self.test_results_url, diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt --- a/build/whitespace_file.txt +++ b/build/whitespace_file.txt @@ -3120,7 +3073,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd Another account is already signed in. To keep your browsing separate, Chromium can create your own profile for you. -@@ -1414,7 +1414,7 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -1434,7 +1434,7 @@ Permissions you've already given to websites and apps may apply to this account. Welcome to Chromium @@ -3511,25 +3464,25 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources @@ -5050,16 +5050,16 @@ are declared in tools/grit/grit_rule.gni. Requested to read & change - + - All extensions can read & change $1google.com + All extensions can read & change $19oo91e.qjz9zk - + - You blocked all extensions from $1google.com + You blocked all extensions from $19oo91e.qjz9zk - + - This extension can read & change $1google.com + This extension can read & change $19oo91e.qjz9zk - + - Click this extension's icon to read & change $1google.com + Click this extension's icon to read & change $19oo91e.qjz9zk - + Pinned by your administrator -@@ -5073,16 +5073,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -5076,16 +5076,16 @@ are declared in tools/grit/grit_rule.gni. This can read and change site data @@ -3549,7 +3502,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always on all sites -@@ -5094,7 +5094,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -5097,7 +5097,7 @@ are declared in tools/grit/grit_rule.gni. When you click the extension @@ -3558,7 +3511,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -5147,16 +5147,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -5150,16 +5150,16 @@ are declared in tools/grit/grit_rule.gni. This Can Read and Change Site Data @@ -3578,7 +3531,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always on All Sites -@@ -5168,7 +5168,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -5171,7 +5171,7 @@ are declared in tools/grit/grit_rule.gni. When You Click the Extension @@ -3587,7 +3540,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -5473,7 +5473,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5479,7 +5479,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Change back to $1DuckDuckGo? @@ -3596,7 +3549,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -5599,28 +5599,28 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5605,28 +5605,28 @@ Keep your key file in a safe place. You will need it to create new versions of y Permissions @@ -3631,7 +3584,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Customize permissions for each extension -@@ -5928,10 +5928,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5934,10 +5934,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for $1example.com? @@ -3644,7 +3597,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Passwords are saved in your Google Account so you can use them on any device -@@ -5940,7 +5940,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5946,7 +5946,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Google Password Manager @@ -3653,7 +3606,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Passwords are saved to $1Google Password Manager on this device. -@@ -5949,7 +5949,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5955,7 +5955,7 @@ Keep your key file in a safe place. You will need it to create new versions of y You can view and manage saved passwords in $1Google Password Manager. @@ -3662,7 +3615,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Passwords are saved to $1Google Password Manager. -@@ -5958,10 +5958,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5964,10 +5964,10 @@ Keep your key file in a safe place. You will need it to create new versions of y You can view and manage saved passwords in Google Password Manager @@ -3675,7 +3628,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6388,7 +6388,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6394,7 +6394,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3684,7 +3637,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -6399,7 +6399,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6405,7 +6405,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3693,7 +3646,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -6409,7 +6409,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6415,7 +6415,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3702,7 +3655,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -6418,16 +6418,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6424,16 +6424,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -3722,7 +3675,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clear input -@@ -6875,7 +6875,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6881,7 +6881,7 @@ Keep your key file in a safe place. You will need it to create new versions of y memories from Google Photos @@ -3731,7 +3684,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources <br> <br> You can manage settings for this card from the card menu or see more options in Customize Chrome. -@@ -6930,10 +6930,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6936,10 +6936,10 @@ Keep your key file in a safe place. You will need it to create new versions of y About this card @@ -3744,7 +3697,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -7374,7 +7374,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7427,7 +7427,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome @@ -3753,7 +3706,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open in app -@@ -7382,7 +7382,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7435,7 +7435,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3762,7 +3715,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always use the $1YouTube app to open supported web links? -@@ -7536,7 +7536,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7589,7 +7589,7 @@ Keep your key file in a safe place. You will need it to create new versions of y This site has been blocked from seeing text and images copied to the clipboard @@ -3771,7 +3724,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -7721,7 +7721,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7774,7 +7774,7 @@ Keep your key file in a safe place. You will need it to create new versions of y other {You can wait for them to become responsive or exit the pages.}} @@ -3780,7 +3733,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Wait -@@ -7755,7 +7755,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7808,7 +7808,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Automatically sign in to websites using stored credentials. When the feature is disabled, you will be asked for confirmation every time before signing in to a website. @@ -3789,7 +3742,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7996,10 +7996,10 @@ Check your passwords anytime in $1Google +@@ -8049,10 +8049,10 @@ Check your passwords anytime in $1Google Suggest strong password @@ -3802,7 +3755,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Confirm your username -@@ -8195,7 +8195,7 @@ Check your passwords anytime in $1Google +@@ -8251,7 +8251,7 @@ Check your passwords anytime in $1Google Clear browsing data @@ -3811,7 +3764,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -8205,7 +8205,7 @@ Check your passwords anytime in $1Google +@@ -8261,7 +8261,7 @@ Check your passwords anytime in $1Google @@ -3820,7 +3773,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Some passwords were not deleted -@@ -8426,7 +8426,7 @@ Check your passwords anytime in $1Google +@@ -8482,7 +8482,7 @@ Check your passwords anytime in $1Google Uploading ($127%)... @@ -3829,7 +3782,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8847,7 +8847,7 @@ Check your passwords anytime in $1Google +@@ -8903,7 +8903,7 @@ Check your passwords anytime in $1Google @@ -3838,7 +3791,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8855,10 +8855,10 @@ Check your passwords anytime in $1Google +@@ -8911,10 +8911,10 @@ Check your passwords anytime in $1Google Sign in to Security Device @@ -3851,7 +3804,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -9167,7 +9167,7 @@ Check your passwords anytime in $1Google +@@ -9229,7 +9229,7 @@ Check your passwords anytime in $1Google Sending link to $1Ted's Pixel2 @@ -3860,7 +3813,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources To send this tab to another device, sign in to Chrome on both devices -@@ -9540,7 +9540,7 @@ Check your passwords anytime in $1Google +@@ -9602,7 +9602,7 @@ Check your passwords anytime in $1Google @@ -3869,7 +3822,28 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10158,16 +10158,16 @@ Check your passwords anytime in $1Google +@@ -10175,16 +10175,16 @@ Check your passwords anytime in $1Google + + Turn on sync to back up your stuff and use it on any device + +- ++ + Bookmarks + +- ++ + Autofill + +- ++ + History + +- ++ + Extensions and more + + +@@ -10255,16 +10255,16 @@ Check your passwords anytime in $1Google This will separate your browsing from $1bob@example.com @@ -3889,7 +3863,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10182,10 +10182,10 @@ Check your passwords anytime in $1Google +@@ -10279,10 +10279,10 @@ Check your passwords anytime in $1Google Can't sign in @@ -3902,7 +3876,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -10210,13 +10210,13 @@ Check your passwords anytime in $1Google +@@ -10307,13 +10307,13 @@ Check your passwords anytime in $1Google This wasn't me. @@ -3918,7 +3892,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -10265,7 +10265,7 @@ Check your passwords anytime in $1Google +@@ -10362,7 +10362,7 @@ Check your passwords anytime in $1Google Open $1Adobe Acrobat? @@ -3927,7 +3901,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -10276,8 +10276,8 @@ Check your passwords anytime in $1Google +@@ -10373,8 +10373,8 @@ Check your passwords anytime in $1Google Cancel @@ -3938,7 +3912,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10881,7 +10881,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10978,7 +10978,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -3947,7 +3921,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11308,7 +11308,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11405,7 +11405,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from accessing your location. @@ -3956,7 +3930,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from accessing your location -@@ -11351,7 +11351,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11448,7 +11448,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from having full control of MIDI devices. @@ -3965,7 +3939,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from having full control of MIDI devices -@@ -11439,7 +11439,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11536,7 +11536,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -3974,7 +3948,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11471,10 +11471,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11568,10 +11568,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -3987,7 +3961,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11585,19 +11585,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11682,19 +11682,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -4010,7 +3984,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -11620,7 +11620,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11717,7 +11717,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -4019,7 +3993,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -11647,7 +11647,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11744,7 +11744,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -4028,7 +4002,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11851,7 +11851,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11948,7 +11948,7 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Hangouts wants to share the contents of your screen. @@ -4037,7 +4011,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share system audio -@@ -11980,8 +11980,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12077,8 +12077,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -4048,7 +4022,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -12201,7 +12201,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12298,7 +12298,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4057,7 +4031,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -12313,7 +12313,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12410,7 +12410,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4066,7 +4040,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -12353,7 +12353,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12450,7 +12450,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4075,7 +4049,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -12438,7 +12438,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12535,7 +12535,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4084,7 +4058,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources No matching font found. -@@ -12569,7 +12569,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12666,7 +12666,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4093,7 +4067,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources wants to see the make and model of your Security Key -@@ -12778,13 +12778,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12884,13 +12884,13 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4109,7 +4083,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -12900,7 +12900,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13006,7 +13006,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4118,7 +4092,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Didn't get it? -@@ -12918,7 +12918,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13024,7 +13024,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Security key request @@ -4127,7 +4101,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Use phone with a QR code -@@ -13017,7 +13017,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13123,7 +13123,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4136,7 +4110,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -13033,7 +13033,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13139,7 +13139,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Your security key can't be used with this site @@ -4145,7 +4119,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Your security key does not have enough space for any more accounts. -@@ -13042,13 +13042,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13148,13 +13148,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? @@ -4161,7 +4135,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -13080,10 +13080,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13186,10 +13186,10 @@ Please help our engineers fix this problem. Tell us what happened right before y This passkey will only be saved on this device. It will remain on this device after you close all Incognito windows. @@ -4174,7 +4148,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This passkey will be saved only in Windows Hello. It will remain on this device after you close all Incognito windows. -@@ -13478,7 +13478,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13584,7 +13584,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4183,7 +4157,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -13835,7 +13835,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13938,7 +13938,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Help us build a more private web @@ -4272,7 +4246,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str Another account is already signed in. To keep your browsing separate, Chrome can create your own profile for you. -@@ -1509,7 +1509,7 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -1532,7 +1532,7 @@ Permissions you've already given to websites and apps may apply to this account. Welcome to Chrome @@ -4324,7 +4298,7 @@ diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/loc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4711,7 +4711,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4762,7 +4762,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( syncer::kSyncServiceURL, @@ -4333,7 +4307,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !BUILDFLAG(IS_ANDROID) {"block-migrated-default-chrome-app-sync", flag_descriptions::kBlockMigratedDefaultChromeAppSyncName, -@@ -4999,7 +4999,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5036,7 +5036,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -4503,7 +4477,7 @@ diff --git a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc b/chrome diff --git a/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc --- a/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc +++ b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc -@@ -84,7 +84,7 @@ constexpr int kAlphaLeftMargin = 8; +@@ -83,7 +83,7 @@ constexpr int kAlphaLeftMargin = 8; constexpr int kAlphaLeftMarginSmall = 4; constexpr char kFeedbackUrl[] = @@ -4609,10 +4583,22 @@ diff --git a/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_consta const char kNetworkRequestUploadType[] = "application/json"; +diff --git a/chrome/browser/ash/extensions/file_manager/private_api_misc.cc b/chrome/browser/ash/extensions/file_manager/private_api_misc.cc +--- a/chrome/browser/ash/extensions/file_manager/private_api_misc.cc ++++ b/chrome/browser/ash/extensions/file_manager/private_api_misc.cc +@@ -93,7 +93,7 @@ namespace { + + using api::file_manager_private::ProfileInfo; + +-const char kCWSScope[] = "https://www.googleapis.com/auth/chromewebstore"; ++const char kCWSScope[] = "https://www.9oo91eapis.qjz9zk/auth/chromewebstore"; + + // Thresholds for mountCrostini() API. + constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold = diff --git a/chrome/browser/ash/file_manager/file_manager_string_util.cc b/chrome/browser/ash/file_manager/file_manager_string_util.cc --- a/chrome/browser/ash/file_manager/file_manager_string_util.cc +++ b/chrome/browser/ash/file_manager/file_manager_string_util.cc -@@ -32,29 +32,29 @@ namespace { +@@ -34,29 +34,29 @@ namespace { // Location of the page to buy more storage for Google Drive. const char kGoogleDriveBuyStorageUrl[] = @@ -4652,7 +4638,7 @@ diff --git a/chrome/browser/ash/file_manager/file_manager_string_util.cc b/chrom diff --git a/chrome/browser/ash/file_manager/open_with_browser.cc b/chrome/browser/ash/file_manager/open_with_browser.cc --- a/chrome/browser/ash/file_manager/open_with_browser.cc +++ b/chrome/browser/ash/file_manager/open_with_browser.cc -@@ -173,18 +173,18 @@ bool OpenNewTabForHostedOfficeFile(const GURL& url) { +@@ -172,18 +172,18 @@ bool OpenNewTabForHostedOfficeFile(const GURL& url) { LOG(ERROR) << "Invalid URL"; return false; } @@ -4740,36 +4726,6 @@ diff --git a/chrome/browser/ash/input_method/assistive_suggester_client_filter.c }; const char* kDeniedAppsForDiacritics[] = { -diff --git a/chrome/browser/ash/input_method/ime_rules_config.h b/chrome/browser/ash/input_method/ime_rules_config.h ---- a/chrome/browser/ash/input_method/ime_rules_config.h -+++ b/chrome/browser/ash/input_method/ime_rules_config.h -@@ -50,19 +50,19 @@ class ImeRulesConfig { - // The default denylist of domains that will turn off auto_correct feature. - std::vector default_auto_correct_domain_denylist_{ - "amazon.com", -- "b.corp.google.com", -- "buganizer.corp.google.com", -- "cider.corp.google.com", -- "classroom.google.com", -+ "b.corp.9oo91e.qjz9zk", -+ "buganizer.corp.9oo91e.qjz9zk", -+ "cider.corp.9oo91e.qjz9zk", -+ "classroom.9oo91e.qjz9zk", - "desmos.com", -- "docs.google.com", -- "facebook.com", -+ "docs.9oo91e.qjz9zk", -+ "f8c3b00k.qjz9zk", - "instagram.com", - "outlook.live.com", - "outlook.office.com", - "quizlet.com", - "whatsapp.com", -- "youtube.com", -+ "y0u1ub3.qjz9zk", - }; - }; - diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc @@ -4855,15 +4811,15 @@ diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetc diff --git a/chrome/browser/ash/login/users/default_user_image/default_user_images.cc b/chrome/browser/ash/login/users/default_user_image/default_user_images.cc --- a/chrome/browser/ash/login/users/default_user_image/default_user_images.cc +++ b/chrome/browser/ash/login/users/default_user_image/default_user_images.cc -@@ -292,7 +292,7 @@ const char kDefaultUrlPrefix[] = "chrome://theme/IDR_LOGIN_DEFAULT_USER_"; - const char kZeroDefaultUrl[] = "chrome://theme/IDR_LOGIN_DEFAULT_USER"; - // TODO(b/244369871): Support 1x/2x images based on pixel density. - const char kGstaticImagePrefix[] = -- "https://www.gstatic.com/chromecast/home/chromeos/avatars/" -+ "https://www.95tat1c.qjz9zk/chromecast/home/chromeos/avatars/" - "default_200_percent/"; +@@ -291,7 +291,7 @@ const DefaultImageSourceInfoIds kDefaultImageSourceInfoIds[] = { + constexpr char kDefaultUrlPrefix[] = "chrome://theme/IDR_LOGIN_DEFAULT_USER_"; + constexpr char kZeroDefaultUrl[] = "chrome://theme/IDR_LOGIN_DEFAULT_USER"; + constexpr char kGstaticImagePrefix[] = +- "https://www.gstatic.com/chromecast/home/chromeos/avatars/"; ++ "https://www.95tat1c.qjz9zk/chromecast/home/chromeos/avatars/"; + constexpr char k100PercentPrefix[] = "default_100_percent/"; + constexpr char k200PercentPrefix[] = "default_200_percent/"; - } // namespace diff --git a/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc --- a/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc @@ -4961,7 +4917,7 @@ diff --git a/chrome/browser/ash/net/network_diagnostics/video_conferencing_routi diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc --- a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc -@@ -107,7 +107,7 @@ class PluginVmDiagnostics : public base::RefCounted { +@@ -108,7 +108,7 @@ class PluginVmDiagnostics : public base::RefCounted { entry.SetFail( IDS_VM_STATUS_PAGE_EPHEMERAL_PROFILE_EXPLANATION, /*learn_more_link=*/ @@ -4970,7 +4926,7 @@ diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc b/chrome/brow break; case ProfileSupported::kErrorNotSupported: entry.SetFail(IDS_VM_STATUS_PAGE_UNSUPPORTED_PROFILE_EXPLANATION); -@@ -212,7 +212,7 @@ class PluginVmDiagnostics : public base::RefCounted { +@@ -213,7 +213,7 @@ class PluginVmDiagnostics : public base::RefCounted { l10n_util::GetStringUTF16(IDS_PLUGIN_VM_APP_NAME)), /*learn_more_link=*/ GURL( @@ -5165,20 +5121,6 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom constexpr net::NetworkTrafficAnnotationTag kGooglePhotosPhotosTrafficAnnotation = -diff --git a/chrome/browser/ash/web_applications/terminal_source.cc b/chrome/browser/ash/web_applications/terminal_source.cc ---- a/chrome/browser/ash/web_applications/terminal_source.cc -+++ b/chrome/browser/ash/web_applications/terminal_source.cc -@@ -209,8 +209,8 @@ std::string TerminalSource::GetContentSecurityPolicy( - return "connect-src *;"; - } - return "connect-src 'self' " -- "https://*.corp.google.com:* wss://*.corp.google.com:* " -- "https://*.r.ext.google.com:* wss://*.r.ext.google.com:*;"; -+ "https://*.corp.9oo91e.qjz9zk:* wss://*.corp.9oo91e.qjz9zk:* " -+ "https://*.r.ext.9oo91e.qjz9zk:* wss://*.r.ext.9oo91e.qjz9zk:*;"; - case network::mojom::CSPDirectiveName::FrameAncestors: - return "frame-ancestors 'self';"; - case network::mojom::CSPDirectiveName::FrameSrc: diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser/autofill/autofill_gstatic_reader.cc --- a/chrome/browser/autofill/autofill_gstatic_reader.cc +++ b/chrome/browser/autofill/autofill_gstatic_reader.cc @@ -5194,6 +5136,18 @@ diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser static const size_t kMaxDownloadSize = 30 * 1024; } // namespace +diff --git a/chrome/browser/autofill/autofill_image_fetcher_impl.cc b/chrome/browser/autofill/autofill_image_fetcher_impl.cc +--- a/chrome/browser/autofill/autofill_image_fetcher_impl.cc ++++ b/chrome/browser/autofill/autofill_image_fetcher_impl.cc +@@ -137,7 +137,7 @@ void AutofillImageFetcherImpl::FetchImageForURL( + // FIFE URL option to fetch the correct image. + if (card_art_url == + GURL( +- "https://www.gstatic.com/autofill/virtualcard/icon/capitalone.png")) { ++ "https://www.95tat1c.qjz9zk/autofill/virtualcard/icon/capitalone.png")) { + url = card_art_url; + } else { + // A FIFE image fetching param suffix is appended to the URL. This means the diff --git a/chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator.cc b/chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator.cc --- a/chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator.cc +++ b/chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator.cc @@ -5386,7 +5340,7 @@ diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/c diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1195,7 +1195,7 @@ void LaunchURL(base::WeakPtr client, +@@ -1206,7 +1206,7 @@ void LaunchURL(base::WeakPtr client, "'allow-top-navigation-by-user-activation', " "'allow-top-navigation', or " "'allow-popups'. See " @@ -5395,7 +5349,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch "https://chromeenterprise.google/policies/" "#SandboxExternalProtocolBlocked"); return; -@@ -1211,7 +1211,7 @@ void LaunchURL(base::WeakPtr client, +@@ -1222,7 +1222,7 @@ void LaunchURL(base::WeakPtr client, "'allow-top-navigation-by-user-activation', " "'allow-top-navigation', or " "'allow-popups'. See " @@ -5404,29 +5358,17 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch "https://chromeenterprise.google/policies/" "#SandboxExternalProtocolBlocked"); } -diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc ---- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -@@ -93,7 +93,7 @@ namespace { - - using api::file_manager_private::ProfileInfo; - --const char kCWSScope[] = "https://www.googleapis.com/auth/chromewebstore"; -+const char kCWSScope[] = "https://www.9oo91eapis.qjz9zk/auth/chromewebstore"; - - // Thresholds for mountCrostini() API. - constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold = -diff --git a/chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h b/chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h ---- a/chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h -+++ b/chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h -@@ -35,7 +35,7 @@ constexpr int kClipboardDlpWarnDurationMs = 16000; +diff --git a/chrome/browser/chromeos/policy/dlp/dlp_policy_constants.h b/chrome/browser/chromeos/policy/dlp/dlp_policy_constants.h +--- a/chrome/browser/chromeos/policy/dlp/dlp_policy_constants.h ++++ b/chrome/browser/chromeos/policy/dlp/dlp_policy_constants.h +@@ -31,7 +31,7 @@ constexpr char kReportLevel[] = "REPORT"; // Link to the Help Center article about Data Leak Prevention. constexpr char kDlpLearnMoreUrl[] = - "https://support.google.com/chrome/a/?p=chromeos_datacontrols"; + "https://support.9oo91e.qjz9zk/chrome/a/?p=chromeos_datacontrols"; - } // namespace policy + } // namespace dlp diff --git a/chrome/browser/devtools/url_constants.cc b/chrome/browser/devtools/url_constants.cc --- a/chrome/browser/devtools/url_constants.cc @@ -5456,7 +5398,7 @@ diff --git a/chrome/browser/download/mixed_content_download_blocking.cc b/chrome diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc -@@ -29,7 +29,7 @@ namespace enterprise_connectors { +@@ -31,7 +31,7 @@ namespace enterprise_connectors { namespace { @@ -5468,9 +5410,9 @@ diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/br diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc --- a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc -@@ -24,7 +24,7 @@ namespace enterprise_connectors { - - namespace { +@@ -31,7 +31,7 @@ void RecordFailure(ManagementServiceError error, + SYSLOG(ERROR) << log_message; + } -constexpr char kStableChannelHostName[] = "m.google.com"; +constexpr char kStableChannelHostName[] = "m.9oo91e.qjz9zk"; @@ -5560,36 +5502,10 @@ diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor_non } // namespace -diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc ---- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc -+++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc -@@ -50,10 +50,10 @@ namespace api { - - namespace { - --const char kGoogleDotCom[] = "google.com"; -+const char kGoogleDotCom[] = "9oo91e.qjz9zk"; - constexpr const char* kGoogleGstaticAppIds[] = { -- "https://www.gstatic.com/securitykey/origins.json", -- "https://www.gstatic.com/securitykey/a/google.com/origins.json"}; -+ "https://www.95tat1c.qjz9zk/securitykey/origins.json", -+ "https://www.95tat1c.qjz9zk/securitykey/a/9oo91e.qjz9zk/origins.json"}; - - // ContainsAppIdByHash returns true iff the SHA-256 hash of one of the - // elements of |list| equals |hash|. -@@ -312,7 +312,7 @@ CryptotokenPrivateCanMakeU2fApiRequestFunction::Run() { - } - frame->AddMessageToConsole( - blink::mojom::ConsoleMessageLevel::kWarning, -- R"(The U2F Security Key API is deprecated and will be removed soon. If you own this website, please migrate to the Web Authentication API. For more information see https://groups.google.com/a/chromium.org/g/blink-dev/c/xHC3AtU_65A/m/yg20tsVFBAAJ)"); -+ R"(The U2F Security Key API is deprecated and will be removed soon. If you own this website, please migrate to the Web Authentication API. For more information see https://groups.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/g/blink-dev/c/xHC3AtU_65A/m/yg20tsVFBAAJ)"); - - blink::TrialTokenValidator validator; - const net::HttpResponseHeaders* response_headers = diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc --- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc -@@ -50,7 +50,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( +@@ -56,7 +56,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( // implemented for secondary profiles in Lacros. CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile()) << "Attempted to use an incorrect profile. Please file a bug at " @@ -5613,7 +5529,7 @@ diff --git a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flo diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc -@@ -89,7 +89,7 @@ namespace { +@@ -88,7 +88,7 @@ namespace { #if BUILDFLAG(IS_CHROMEOS_ASH) const char kPlayIntentPrefix[] = @@ -5625,7 +5541,7 @@ diff --git a/chrome/browser/extensions/api/management/chrome_management_api_dele diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc b/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc --- a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc +++ b/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc -@@ -79,7 +79,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( +@@ -83,7 +83,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( // implemented for secondary profiles in Lacros. CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile()) << "Attempted to use an incorrect profile. Please file a bug at " @@ -5669,15 +5585,15 @@ diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/ diff --git a/chrome/browser/extensions/install_signer.cc b/chrome/browser/extensions/install_signer.cc --- a/chrome/browser/extensions/install_signer.cc +++ b/chrome/browser/extensions/install_signer.cc -@@ -66,7 +66,7 @@ const int kSignatureFormatVersion = 2; +@@ -63,7 +63,7 @@ const int kSignatureFormatVersion = 2; const size_t kSaltBytes = 32; const char kBackendUrl[] = - "https://www.googleapis.com/chromewebstore/v1.1/items/verify"; + "https://www.9oo91eapis.qjz9zk/chromewebstore/v1.1/items/verify"; - const char kPublicKeyPEM[] = \ - "-----BEGIN PUBLIC KEY-----" \ + const char kPublicKeyPEM[] = + "-----BEGIN PUBLIC KEY-----" diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc --- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc +++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc @@ -5693,7 +5609,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_facto diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/chrome/browser/extensions/updater/chrome_update_client_config.cc --- a/chrome/browser/extensions/updater/chrome_update_client_config.cc +++ b/chrome/browser/extensions/updater/chrome_update_client_config.cc -@@ -216,7 +216,7 @@ ChromeUpdateClientConfig::GetNetworkFetcherFactory() { +@@ -220,7 +220,7 @@ ChromeUpdateClientConfig::GetNetworkFetcherFactory() { // from chrome.google.com, so send cookies if and only if that is // the download domain. base::BindRepeating([](const GURL& url) { @@ -5705,25 +5621,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -223,7 +223,7 @@ const char kU2FPermissionPromptDescription[] = - "Key API (CryptoToken). The U2F Security " - "Key API has been deprecated and will be removed soon. For more " - "information, refer to the deprecation announcement at " -- "https://groups.google.com/a/chromium.org/g/blink-dev/c/xHC3AtU_65A"; -+ "https://groups.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/g/blink-dev/c/xHC3AtU_65A"; - - #if BUILDFLAG(ENABLE_SUPERVISED_USERS) - const char kWebFilterInterstitialRefreshName[] = -@@ -238,7 +238,7 @@ const char kU2FSecurityKeyAPIDescription[] = - "Enable the legacy U2F Security Key API (CryptoToken). The U2F Security " - "Key API has been deprecated and will be removed soon. For more " - "information, refer to the deprecation announcement at " -- "https://groups.google.com/a/chromium.org/g/blink-dev/c/xHC3AtU_65A"; -+ "https://groups.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/g/blink-dev/c/xHC3AtU_65A"; - - const char kLoadCryptoTokenExtensionName[] = - "Load the CryptoToken component extension "; -@@ -1231,7 +1231,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] = +@@ -1192,7 +1192,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] = const char kBlockInsecurePrivateNetworkRequestsDescription[] = "Prevents non-secure contexts from making subresource requests to " "more-private IP addresses. See also: " @@ -5732,7 +5630,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kPrivateNetworkAccessSendPreflightsName[] = "Send Private Network Access preflights"; -@@ -1239,7 +1239,7 @@ const char kPrivateNetworkAccessSendPreflightsDescription[] = +@@ -1200,7 +1200,7 @@ const char kPrivateNetworkAccessSendPreflightsDescription[] = "Enables sending Private Network Access preflights ahead of requests to " "more-private IP addresses. Failed preflights display warnings in DevTools " "without failing entire request. See also: " @@ -5741,7 +5639,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kPrivateNetworkAccessRespectPreflightResultsName[] = "Respect the result of Private Network Access preflights"; -@@ -1247,7 +1247,7 @@ const char kPrivateNetworkAccessRespectPreflightResultsDescription[] = +@@ -1208,7 +1208,7 @@ const char kPrivateNetworkAccessRespectPreflightResultsDescription[] = "Enables sending Private Network Access preflights ahead of requests to " "more-private IP addresses. These preflight requests must succeed in order " "for the request to proceed. See also: " @@ -5750,7 +5648,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kPrivateNetworkAccessPreflightShortTimeoutName[] = "Reduce waiting time for Private Network Access preflights response"; -@@ -1255,7 +1255,7 @@ const char kPrivateNetworkAccessPreflightShortTimeoutDescription[] = +@@ -1216,7 +1216,7 @@ const char kPrivateNetworkAccessPreflightShortTimeoutDescription[] = "Reduce the waiting time for Private Network Access preflights to 200 " "milliseconds. The default timeout period for requests is 5 minutes." "See also: " @@ -5759,7 +5657,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kDeprecateAltClickName[] = "Enable Alt+Click deprecation notifications"; -@@ -2584,7 +2584,7 @@ const char kQuickIntensiveWakeUpThrottlingAfterLoadingDescription[] = +@@ -2563,7 +2563,7 @@ const char kQuickIntensiveWakeUpThrottlingAfterLoadingDescription[] = "throttling after 10 seconds instead of the default 5 minutes. Intensive " "throttling will limit wake ups, from setTimeout and setInterval tasks " "with a high nesting level and delayed scheduler.postTask tasks, to 1 per " @@ -5768,7 +5666,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti "info."; const char kSettingsAppNotificationSettingsName[] = -@@ -2610,7 +2610,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; +@@ -2589,7 +2589,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; const char kReduceUserAgentDescription[] = "Reduce (formerly, \"freeze\") the amount of information available in " "the User-Agent request header. " @@ -5777,7 +5675,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = -@@ -2666,7 +2666,7 @@ const char kThirdPartyStoragePartitioningName[] = +@@ -2633,7 +2633,7 @@ const char kThirdPartyStoragePartitioningName[] = const char kThirdPartyStoragePartitioningDescription[] = "Enables partitioning of third-party storage by top-level site. " "Note: this is under active development and may result in unexpected " @@ -5786,26 +5684,6 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti "entry?labels=StoragePartitioning-trial-bugs&components=Blink%3EStorage."; const char kScrollableTabStripFlagId[] = "scrollable-tabstrip"; -diff --git a/chrome/browser/k_anonymity_service/k_anonymity_service_urls.h b/chrome/browser/k_anonymity_service/k_anonymity_service_urls.h ---- a/chrome/browser/k_anonymity_service/k_anonymity_service_urls.h -+++ b/chrome/browser/k_anonymity_service/k_anonymity_service_urls.h -@@ -12,14 +12,14 @@ constexpr char kIssueTrustTokenPathFmt[] = - "/v1/%d/issueTrustToken"; // Put the short ID in the path. - - constexpr char kKAnonymityJoinSetServer[] = -- "https://chromekanonymity-pa.googleapis.com"; -+ "https://chromekanonymity-pa.9oo91eapis.qjz9zk"; - constexpr char kJoinSetPath[] = - "/v1/join?key="; // TODO: Set this when we know the correct path. - constexpr char kJoinSetOhttpPath[] = - "/v1/proxy/keys?key="; // TODO: Set this when we know the correct path. - - constexpr char kKAnonymityQuerySetServer[] = -- "https://chromekanonymityquery-pa.googleapis.com"; -+ "https://chromekanonymityquery-pa.9oo91eapis.qjz9zk"; - constexpr char kQuerySetPath[] = - "/v1/query?key="; // TODO: Set this when we know the correct path. - constexpr char kQuerySetOhttpPath[] = diff --git a/chrome/browser/lacros/lacros_startup_infobar_delegate.cc b/chrome/browser/lacros/lacros_startup_infobar_delegate.cc --- a/chrome/browser/lacros/lacros_startup_infobar_delegate.cc +++ b/chrome/browser/lacros/lacros_startup_infobar_delegate.cc @@ -6105,7 +5983,7 @@ diff --git a/chrome/browser/new_tab_page/modules/photos/photos_service.cc b/chro })"; } // namespace -@@ -454,10 +454,10 @@ void PhotosService::OnJsonParsed( +@@ -453,10 +453,10 @@ void PhotosService::OnJsonParsed( ntp_features::kNtpPhotosModule, ntp_features::kNtpPhotosModuleDataParam); if (fake_data_choice != "") { @@ -6155,7 +6033,7 @@ diff --git a/chrome/browser/permissions/quiet_permission_prompt_model_android.cc diff --git a/chrome/browser/platform_keys/extension_key_permissions_service.cc b/chrome/browser/platform_keys/extension_key_permissions_service.cc --- a/chrome/browser/platform_keys/extension_key_permissions_service.cc +++ b/chrome/browser/platform_keys/extension_key_permissions_service.cc -@@ -130,7 +130,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( +@@ -127,7 +127,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( // implemented for secondary profiles in Lacros. CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile()) << "Attempted to use an incorrect profile. Please file a bug at " @@ -6167,7 +6045,7 @@ diff --git a/chrome/browser/platform_keys/extension_key_permissions_service.cc b diff --git a/chrome/browser/platform_keys/extension_platform_keys_service.cc b/chrome/browser/platform_keys/extension_platform_keys_service.cc --- a/chrome/browser/platform_keys/extension_platform_keys_service.cc +++ b/chrome/browser/platform_keys/extension_platform_keys_service.cc -@@ -161,7 +161,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( +@@ -156,7 +156,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( // implemented for secondary profiles in Lacros. CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile()) << "Attempted to use an incorrect profile. Please file a bug at " @@ -6313,7 +6191,7 @@ diff --git a/chrome/browser/push_messaging/push_messaging_constants.cc b/chrome/ diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc -@@ -99,7 +99,7 @@ const char kSilentPushUnsupportedMessage[] = +@@ -108,7 +108,7 @@ const char kSilentPushUnsupportedMessage[] = "Chrome currently only supports the Push API for subscriptions that will " "result in user-visible messages. You can indicate this by calling " "pushManager.subscribe({userVisibleOnly: true}) instead. See " @@ -6412,7 +6290,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun }); } -@@ -1840,13 +1840,13 @@ export class CommandHandler extends CommandHandlerInterface { +@@ -1842,13 +1842,13 @@ export class CommandHandler extends CommandHandlerInterface { init() { ChromeVoxKbHandler.commandHandler = command => this.onCommand(command); @@ -6535,7 +6413,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/opt diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html --- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html +++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html -@@ -60,7 +60,7 @@ found in the LICENSE file. +@@ -67,7 +67,7 @@ found in the LICENSE file. { - this.enableLanguageDetectionIntegration_ = result; - }); -@@ -692,8 +692,8 @@ export class SelectToSpeak { + /** + * Determines if a node is in one of the known Google GSuite apps that needs +@@ -753,8 +753,8 @@ export class SelectToSpeak { chrome.tabs.query( { url: [ @@ -6589,8 +6458,8 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak_man + "https://docs.sandbox.9oo91e.qjz9zk/*", "clipboard", "clipboardRead", - "clipboardWrite" -@@ -33,8 +33,8 @@ + "clipboardWrite", +@@ -39,8 +39,8 @@ "options_page": "select_to_speak/options.html", "content_scripts": [ { @@ -7240,19 +7109,7 @@ diff --git a/chrome/browser/resources/chromeos/parent_access/parent_access_ui.js + '9oo91e.qjz9zk', ]; - class ParentAccessUi extends PolymerElement { -diff --git a/chrome/browser/resources/cryptotoken/enroller.js b/chrome/browser/resources/cryptotoken/enroller.js ---- a/chrome/browser/resources/cryptotoken/enroller.js -+++ b/chrome/browser/resources/cryptotoken/enroller.js -@@ -861,7 +861,7 @@ Enroller.prototype.sendEnrollRequestToHelper_ = function() { - }; - - const googleCorpAppId = -- 'https://www.gstatic.com/securitykey/a/google.com/origins.json'; -+ 'https://www.95tat1c.qjz9zk/securitykey/a/9oo91e.qjz9zk/origins.json'; - /** - * Proxies the registration request over the WebAuthn API. diff --git a/chrome/browser/resources/default_apps/external_extensions.json b/chrome/browser/resources/default_apps/external_extensions.json --- a/chrome/browser/resources/default_apps/external_extensions.json +++ b/chrome/browser/resources/default_apps/external_extensions.json @@ -7301,7 +7158,7 @@ diff --git a/chrome/browser/resources/gaia_auth_host/authenticator.js b/chrome/b const SIGN_IN_HEADER = 'google-accounts-signin'; const EMBEDDED_FORM_HEADER = 'google-accounts-embedded'; const LOCATION_HEADER = 'location'; -@@ -717,7 +717,7 @@ export class Authenticator extends EventTarget { +@@ -774,7 +774,7 @@ export class Authenticator extends EventTarget { url = appendParam( url, 'continue', data.gaiaUrl + 'programmatic_auth_chromeos?hl=' + data.hl + @@ -7536,27 +7393,6 @@ diff --git a/chrome/browser/resources/omnibox/omnibox.html b/chrome/browser/reso title="Mostly useful when zero-suggest is enabled, but may also affect clipboard and search providers.">