From a6ca6a5ceed5e4d5e70a04055913c338d86682e3 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 13 Mar 2020 18:52:40 +0100 Subject: [PATCH] Release 81.0.4044.63 --- CHANGELOG.md | 6 + build/GN_ARGS | 2 +- build/bromite_patches_list.txt | 10 +- build/patches/AV1-codec-support.patch | 6 +- .../Add-DuckDuckGo-Lite-search-engine.patch | 675 +- .../Add-English-only-search-engine.patch | 331 +- build/patches/Add-Qwant-search-engine.patch | 341 +- .../Add-a-proxy-configuration-page.patch | 24 +- .../Add-an-always-incognito-mode.patch | 77 +- .../Add-bookmark-import-export-actions.patch | 82 +- ...dd-custom-tab-intents-privacy-option.patch | 41 +- build/patches/Add-exit-menu-item.patch | 8 +- ...nfigure-maximum-connections-per-host.patch | 10 +- ...ontrol-video-playback-resume-feature.patch | 24 +- .../Add-flag-to-disable-IPv6-probes.patch | 26 +- build/patches/Add-flag-to-disable-WebGL.patch | 14 +- ...e-device-motion-and-orientation-APIs.patch | 22 +- .../Add-missing-android_provider.patch | 266 + ...configure-the-ad-blocker-filters-URL.patch | 65 +- ...-to-not-persist-tabs-across-sessions.patch | 20 +- .../Add-option-to-use-home-page-as-NTP.patch | 81 +- ...ings-option-for-session-only-cookies.patch | 24 +- ...ng-for-DNS-over-HTTPS-DoH-custom-URL.patch | 110 +- .../Allow-building-without-feed-support.patch | 60 +- .../Allow-playing-audio-in-background.patch | 6 +- ...site-sign-in-without-account-sign-in.patch | 2 +- ...c-dns-flag-regardless-of-SDK-version.patch | 4 +- ...tings-for-cookies-javascript-and-ads.patch | 32 +- ...e-new-tab-page-for-default-home-page.patch | 17 +- ...e-fingerprinting-mitigations-via-IDL.patch | 6 +- .../Automated-domain-substitution.patch | 47693 +++++++++------- .../patches/Battery-API-return-nothing.patch | 2 +- ...the-domain-name-or-with-a-trk-scheme.patch | 47 +- .../Bromite-AdBlockUpdaterService.patch | 51 +- ...AImageReader-for-ARM64-P-and-ARM64-Q.patch | 8 +- ...DRM-media-origin-IDs-preprovisioning.patch | 2 +- .../patches/Disable-Omaha-update-checks.patch | 15 +- ...isable-addresses-autofill-by-default.patch | 36 - build/patches/Disable-all-promo-dialogs.patch | 4 +- ...isable-autofill-assistant-by-default.patch | 23 + .../Disable-dynamic-module-loading.patch | 40 +- ...Disable-fetching-of-all-field-trials.patch | 10 +- ...media-router-and-remoting-by-default.patch | 4 +- .../Disable-metrics-on-all-I-O-threads.patch | 4 +- ...-password-reuse-detection-on-android.patch | 11 +- .../patches/Disable-plugins-enumeration.patch | 2 +- ...romos-displayed-in-bookmarks-manager.patch | 177 +- ...e-references-to-fonts.googleapis.com.patch | 4 +- build/patches/Disable-safe-browsing.patch | 677 +- ...able-search-ready-omnibox-by-default.patch | 10 +- .../Disable-smart-selection-by-default.patch | 12 +- ...isable-some-signed-exchange-features.patch | 4 +- .../Disable-sync-services-menu-entry.patch | 2 +- ...sable-third-party-cookies-by-default.patch | 2 +- .../Do-not-compile-QR-code-sharing.patch | 115 + ...tifications-to-default-search-engine.patch | 12 +- .../Do-not-store-passwords-by-default.patch | 2 +- ...Remove-a-DCHECK-in-CreateReservation.patch | 32 - ...ownloads-storage-location-by-default.patch | 4 +- ...fwrapv-in-Clang-for-non-UBSan-builds.patch | 2 +- ...ation-for-devices-with-enough-memory.patch | 4 +- .../Enable-user-agent-freeze-by-default.patch | 4 +- ...en-accessing-page-info-site-settings.patch | 10 +- .../patches/Hide-passwords-manager-link.patch | 12 +- .../patches/Hide-send-reports-checkbox.patch | 4 +- ...tracking-ads-and-video-functionality.patch | 12 +- .../patches/Modify-default-preferences.patch | 28 +- ...or-canvas-text-and-client-rectangles.patch | 99 +- build/patches/Never-fetch-popular-sites.patch | 4 +- .../Never-send-any-crash-upload-data.patch | 2 +- ...uiltin-autocomplete-for-chrome-flags.patch | 2 +- .../Open-YouTube-links-in-Bromite.patch | 4 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 8 +- build/patches/Remove-SMS-integration.patch | 16 +- ...dependency-on-com.google.android.gcm.patch | 4 +- ...dency-on-com.google.android.gms.auth.patch | 16 +- ...dency-on-com.google.android.gms.cast.patch | 35 +- ...dynamic-com.google.android.gms.tasks.patch | 58 +- ...apps-com.google.android.gms.location.patch | 20 +- ....places-com.google.android.gms.stats.patch | 35 +- ...ndency-on-com.google.android.gms.gcm.patch | 33 +- ...cut-com.google.android.gms.phenotype.patch | 40 +- ...ependency-on-com.google.android.play.patch | 4 +- build/patches/Remove-help-menu-item.patch | 8 +- ...e-signin-and-data-saver-integrations.patch | 190 +- ...acklist-for-AImageReader-on-ARM-CPUs.patch | 37 - .../Restore-classic-new-tab-page.patch | 6 +- ...y-Omnibox-flag-since-it-has-launched.patch | 102 +- ...t-code-in-sync-and-privacy-directory.patch | 187 +- ...emove-disable-pull-to-refresh-effect.patch | 16 +- .../Skip-the-first-run-and-metrics.patch | 48 +- .../Switch-to-fstack-protector-strong.patch | 2 +- ...ternal-DownloadCollectionBridge-code.patch | 805 + .../Use-4-tile-rows-never-show-logo.patch | 16 +- .../Use-a-minimum-DoH-timeout-of-400ms.patch | 8 +- build/patches/Use-dummy-DFM-installer.patch | 4 +- ...ll-disable-autofill-download-manager.patch | 4 +- ...vice-disable-more-privacy-nightmares.patch | 4 +- ...build-remove-calling-untrusted-hooks.patch | 12 +- .../disable-background-sync-by-default.patch | 2 +- ...nsors-access-site-setting-by-default.patch | 2 +- ...ging-disable-experiment-status-check.patch | 44 - build/patches/kill-Auth.patch | 4 +- build/patches/kill-GCM.patch | 60 +- .../kill-TOS-and-metrics-opt-out.patch | 6 +- build/patches/kill-Vision.patch | 19 +- ...-length-for-newly-generated-RSA-keys.patch | 2 +- ...nH264-enable-ARM-ARM64-optimizations.patch | 4 +- .../prefs-only-keep-cookies-until-exit.patch | 2 +- ...mo-disable-Google-promotion-fetching.patch | 2 +- .../ungoogled-chromium-Disable-Gaia.patch | 8 +- ...romium-Disable-Google-host-detection.patch | 2 +- ...-chromium-Disable-domain-reliability.patch | 2 +- ...m-Disable-profile-avatar-downloading.patch | 4 +- ...romium-Disable-translate-integration.patch | 57 +- ...ed-chromium-Disable-untraceable-URLs.patch | 14 +- 116 files changed, 29703 insertions(+), 23833 deletions(-) create mode 100644 build/patches/Add-missing-android_provider.patch delete mode 100644 build/patches/Disable-addresses-autofill-by-default.patch create mode 100644 build/patches/Disable-autofill-assistant-by-default.patch create mode 100644 build/patches/Do-not-compile-QR-code-sharing.patch delete mode 100644 build/patches/Download-on-Android-Q-Remove-a-DCHECK-in-CreateReservation.patch delete mode 100644 build/patches/Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch create mode 100644 build/patches/Upstream-internal-DownloadCollectionBridge-code.patch delete mode 100644 build/patches/google-cloud-messaging-disable-experiment-status-check.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index f82dede8..83e3b546 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 81.0.4044.63 +* use upstream fix for SD card not found issue (fixes https://github.com/bromite/bromite/issues/485) +* do not compile QR code sharing +* remove obsolete patch for GCM experiment status +* drop 2 patches for AImageReader crash fix (upstream has the same revert patches) + # 80.0.3987.118 * disable AImageReader for all ARM64 devices (fixes https://github.com/bromite/bromite/issues/497) * use upstream possible workaround for SD card not found issue (fixes https://github.com/bromite/bromite/issues/485) diff --git a/build/GN_ARGS b/build/GN_ARGS index 068577f3..e44669c9 100644 --- a/build/GN_ARGS +++ b/build/GN_ARGS @@ -22,7 +22,7 @@ enable_resource_whitelist_generation=false enable_vr=false fieldtrial_testing_like_official_build=true icu_use_data_file=true -is_cfi=true +is_cfi=false is_component_build=false is_debug=false is_official_build=true diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index c2d80c3b..e2aa7ed2 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -5,7 +5,6 @@ Always-use-new-tab-page-for-default-home-page.patch Always-allow-partner-customisation.patch battery_status_service-disable-more-privacy-nightmares.patch Battery-API-return-nothing.patch -google-cloud-messaging-disable-experiment-status-check.patch updater-disable-updater-pings.patch prefs-only-keep-cookies-until-exit.patch Remove-EV-certificates.patch @@ -90,6 +89,7 @@ Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com. Remove-dependency-on-com.google.android.gms.cast.patch Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch Remove-SMS-integration.patch +Do-not-compile-QR-code-sharing.patch Allow-website-sign-in-without-account-sign-in.patch Offer-builtin-autocomplete-for-chrome-flags.patch Do-not-grant-notifications-to-default-search-engine.patch @@ -115,7 +115,6 @@ Disable-search-ready-omnibox-by-default.patch disable-AdsBlockedInfoBar.patch Bromite-AdBlockUpdaterService.patch Add-option-to-configure-the-ad-blocker-filters-URL.patch -Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch Replace-DoH-probe-domain-with-RIPE-domain.patch Increase-number-of-autocomplete-matches-from-5-to-10.patch Disable-HEAD-requests-for-single-word-Omnibar-searches.patch @@ -128,7 +127,7 @@ Revert-flags-remove-disable-pull-to-refresh-effect.patch Use-dummy-DFM-installer.patch Disable-password-reuse-detection-on-android.patch Allow-building-without-feed-support.patch -Disable-addresses-autofill-by-default.patch +Disable-autofill-assistant-by-default.patch Always-show-site-settings-for-cookies-javascript-and-ads.patch Do-not-enable-QUIC-by-default.patch Restore-enable-horizontal-tab-switcher-flag.patch @@ -136,6 +135,7 @@ Use-a-minimum-DoH-timeout-of-400ms.patch Disable-DRM-media-origin-IDs-preprovisioning.patch Disable-smart-selection-by-default.patch Enable-user-agent-freeze-by-default.patch -Automated-domain-substitution.patch Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch -Download-on-Android-Q-Remove-a-DCHECK-in-CreateReservation.patch +Upstream-internal-DownloadCollectionBridge-code.patch +Automated-domain-substitution.patch +Add-missing-android_provider.patch diff --git a/build/patches/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch index 54ee580f..e714c38b 100644 --- a/build/patches/AV1-codec-support.patch +++ b/build/patches/AV1-codec-support.patch @@ -25,7 +25,7 @@ Report AV1 as playable on Android diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc --- a/media/base/mime_util_internal.cc +++ b/media/base/mime_util_internal.cc -@@ -560,9 +560,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid( +@@ -562,9 +562,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid( case THEORA: return false; @@ -61,7 +61,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn } configs += [ ":libaom_config" ] -@@ -203,6 +203,8 @@ if (enable_libaom_decoder) { +@@ -202,6 +202,8 @@ if (enable_libaom_decoder) { if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" || cpu_arch_full == "arm-neon-cpu-detect") { deps += [ ":libaom_intrinsics_neon" ] @@ -83,8 +83,8 @@ diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs + ] + aom_rtcd_sources = [ - "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd_defs.pl", "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd.c", + "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd_defs.pl", diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm diff --git a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch index c24b4adf..b8913fde 100644 --- a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch +++ b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch @@ -3,10 +3,10 @@ Date: Thu, 12 Oct 2017 11:06:18 +0200 Subject: Add DuckDuckGo Lite search engine --- - .../search_engines/prepopulated_engines.json | 10 ++ + .../search_engines/prepopulated_engines.json | 10 + .../search_engines/search_engine_type.h | 1 + - .../template_url_prepopulate_data.cc | 122 +++++++++--------- - 3 files changed, 75 insertions(+), 58 deletions(-) + .../template_url_prepopulate_data.cc | 190 +++++++++--------- + 3 files changed, 107 insertions(+), 94 deletions(-) diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json --- a/components/search_engines/prepopulated_engines.json @@ -56,558 +56,847 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &yandex_ru, }; - // Albania -@@ -60,7 +61,7 @@ const PrepopulatedEngine* const engines_AR[] = { +@@ -53,7 +54,7 @@ const PrepopulatedEngine* const engines_AL[] = { + &googleen, &google, + &yahoo, + &bing, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yandex_ru, + }; + +@@ -62,7 +63,7 @@ const PrepopulatedEngine* const engines_AR[] = { &googleen, &google, &bing, &yahoo_ar, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Austria -@@ -68,7 +69,7 @@ const PrepopulatedEngine* const engines_AT[] = { +@@ -70,7 +71,7 @@ const PrepopulatedEngine* const engines_AR[] = { + const PrepopulatedEngine* const engines_AT[] = { &googleen, &google, &bing, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, &yahoo_at, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, + &ecosia, }; - - // Australia -@@ -76,7 +77,7 @@ const PrepopulatedEngine* const engines_AU[] = { +@@ -79,7 +80,7 @@ const PrepopulatedEngine* const engines_AT[] = { + const PrepopulatedEngine* const engines_AU[] = { &googleen, &google, &bing, - &yahoo_au, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &yahoo_au, + &ecosia, }; - - // Bosnia and Herzegovina -@@ -92,7 +93,7 @@ const PrepopulatedEngine* const engines_BE[] = { +@@ -89,7 +90,7 @@ const PrepopulatedEngine* const engines_BA[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ask, + }; + +@@ -99,7 +100,7 @@ const PrepopulatedEngine* const engines_BE[] = { + &bing, + &yahoo, + &ecosia, +- &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Bulgaria -@@ -124,7 +125,7 @@ const PrepopulatedEngine* const engines_BN[] = { +@@ -107,7 +108,7 @@ const PrepopulatedEngine* const engines_BG[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &yandex_ru, }; - // Bolivia -@@ -132,7 +133,7 @@ const PrepopulatedEngine* const engines_BO[] = { +@@ -116,7 +117,7 @@ const PrepopulatedEngine* const engines_BH[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Brazil -@@ -140,7 +141,7 @@ const PrepopulatedEngine* const engines_BR[] = { +@@ -125,7 +126,7 @@ const PrepopulatedEngine* const engines_BI[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ask, + }; + +@@ -134,7 +135,7 @@ const PrepopulatedEngine* const engines_BN[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ecosia, + }; + +@@ -143,7 +144,7 @@ const PrepopulatedEngine* const engines_BO[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ecosia, + }; + +@@ -152,7 +153,7 @@ const PrepopulatedEngine* const engines_BR[] = { &googleen, &google, &bing, &yahoo_br, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Belarus -@@ -157,11 +158,12 @@ const PrepopulatedEngine* const engines_BZ[] = { - &bing, - &yahoo, - &duckduckgo, -+ &duckduckgo_light, - }; - - // Canada - const PrepopulatedEngine* const engines_CA[] = { -- &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, -+ &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light, - }; - - // Switzerland -@@ -169,6 +171,7 @@ const PrepopulatedEngine* const engines_CH[] = { +@@ -170,7 +171,7 @@ const PrepopulatedEngine* const engines_BZ[] = { &googleen, &google, &bing, - &duckduckgo, -+ &duckduckgo_light, - &yahoo_ch, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ask, }; -@@ -177,7 +180,7 @@ const PrepopulatedEngine* const engines_CL[] = { +@@ -179,7 +180,7 @@ const PrepopulatedEngine* const engines_CA[] = { + &googleen, &google, + &bing, + &yahoo_ca, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ecosia, + }; + +@@ -187,7 +188,7 @@ const PrepopulatedEngine* const engines_CA[] = { + const PrepopulatedEngine* const engines_CH[] = { + &googleen, &google, + &bing, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yahoo_ch, + &ecosia, + }; +@@ -197,7 +198,7 @@ const PrepopulatedEngine* const engines_CL[] = { &googleen, &google, &bing, &yahoo_cl, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // China -@@ -190,7 +193,7 @@ const PrepopulatedEngine* const engines_CO[] = { - &googleen, &google, - &yahoo_co, +@@ -216,7 +217,7 @@ const PrepopulatedEngine* const engines_CO[] = { &bing, + &yahoo_co, + &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Costa Rica -@@ -198,7 +201,7 @@ const PrepopulatedEngine* const engines_CR[] = { +@@ -224,7 +225,7 @@ const PrepopulatedEngine* const engines_CR[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ecosia, + }; + +@@ -234,7 +235,7 @@ const PrepopulatedEngine* const engines_CZ[] = { + &seznam_cz, + &bing, + &yahoo, +- &duckduckgo, + &duckduckgo, &duckduckgo_light, }; - // Czech Republic -@@ -214,7 +217,7 @@ const PrepopulatedEngine* const engines_DE[] = { + // Germany +@@ -242,7 +243,7 @@ const PrepopulatedEngine* const engines_DE[] = { &googleen, &google, &bing, &yahoo_de, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Denmark -@@ -222,7 +225,7 @@ const PrepopulatedEngine* const engines_DK[] = { +@@ -251,7 +252,7 @@ const PrepopulatedEngine* const engines_DK[] = { &googleen, &google, &bing, &yahoo_dk, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Dominican Republic -@@ -230,7 +233,7 @@ const PrepopulatedEngine* const engines_DO[] = { +@@ -260,7 +261,7 @@ const PrepopulatedEngine* const engines_DO[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Algeria -@@ -246,7 +249,7 @@ const PrepopulatedEngine* const engines_EC[] = { - &googleen, &google, +@@ -270,7 +271,7 @@ const PrepopulatedEngine* const engines_DZ[] = { + &yahoo, + &bing, + &yandex_ru, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + + // Ecuador +@@ -279,7 +280,7 @@ const PrepopulatedEngine* const engines_EC[] = { &bing, &yahoo, + &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Estonia -@@ -270,7 +273,7 @@ const PrepopulatedEngine* const engines_ES[] = { +@@ -297,7 +298,7 @@ const PrepopulatedEngine* const engines_EG[] = { + &yahoo, + &bing, + &yandex_ru, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + + // Spain +@@ -305,7 +306,7 @@ const PrepopulatedEngine* const engines_ES[] = { &googleen, &google, &bing, &yahoo_es, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Finland -@@ -278,7 +281,7 @@ const PrepopulatedEngine* const engines_FI[] = { +@@ -314,7 +315,7 @@ const PrepopulatedEngine* const engines_FI[] = { &googleen, &google, &bing, &yahoo_fi, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &yandex_ru, }; - // Faroe Islands -@@ -286,7 +289,7 @@ const PrepopulatedEngine* const engines_FO[] = { +@@ -323,7 +324,7 @@ const PrepopulatedEngine* const engines_FO[] = { &googleen, &google, &bing, - &yahoo, + &yahoo_dk, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // France -@@ -302,7 +305,7 @@ const PrepopulatedEngine* const engines_GB[] = { +@@ -341,7 +342,7 @@ const PrepopulatedEngine* const engines_GB[] = { &googleen, &google, &bing, &yahoo_uk, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Greece -@@ -310,7 +313,7 @@ const PrepopulatedEngine* const engines_GR[] = { +@@ -350,7 +351,7 @@ const PrepopulatedEngine* const engines_GR[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &yandex_ru, }; - // Guatemala -@@ -318,7 +321,7 @@ const PrepopulatedEngine* const engines_GT[] = { - &googleen, &google, +@@ -360,7 +361,7 @@ const PrepopulatedEngine* const engines_GT[] = { &bing, &yahoo, + &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Hong Kong -@@ -334,7 +337,7 @@ const PrepopulatedEngine* const engines_HN[] = { - &googleen, &google, +@@ -378,7 +379,7 @@ const PrepopulatedEngine* const engines_HN[] = { &bing, &yahoo, + &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Croatia -@@ -342,7 +345,7 @@ const PrepopulatedEngine* const engines_HR[] = { +@@ -386,7 +387,7 @@ const PrepopulatedEngine* const engines_HR[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Hungary -@@ -350,7 +353,7 @@ const PrepopulatedEngine* const engines_HU[] = { +@@ -395,7 +396,7 @@ const PrepopulatedEngine* const engines_HU[] = { &googleen, &google, - &yahoo, &bing, + &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Indonesia -@@ -358,7 +361,7 @@ const PrepopulatedEngine* const engines_ID[] = { +@@ -404,7 +405,7 @@ const PrepopulatedEngine* const engines_ID[] = { &googleen, &google, &yahoo_id, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &yandex_com, }; - // Ireland -@@ -366,7 +369,7 @@ const PrepopulatedEngine* const engines_IE[] = { +@@ -413,7 +414,7 @@ const PrepopulatedEngine* const engines_IE[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Israel -@@ -382,7 +385,7 @@ const PrepopulatedEngine* const engines_IN[] = { +@@ -423,7 +424,7 @@ const PrepopulatedEngine* const engines_IL[] = { + &bing, + &yahoo, + &yandex_ru, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + + // India +@@ -431,7 +432,7 @@ const PrepopulatedEngine* const engines_IN[] = { &googleen, &google, &yahoo_in, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &yandex_ru, }; - // Iraq -@@ -405,7 +408,7 @@ const PrepopulatedEngine* const engines_IS[] = { +@@ -441,7 +442,7 @@ const PrepopulatedEngine* const engines_IQ[] = { + &yahoo, + &bing, + &yandex_ru, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + + // Iran +@@ -457,7 +458,7 @@ const PrepopulatedEngine* const engines_IR[] = { + const PrepopulatedEngine* const engines_IS[] = { + &googleen, &google, + &bing, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yahoo, + &ecosia, + }; +@@ -467,7 +468,7 @@ const PrepopulatedEngine* const engines_IT[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Italy -@@ -413,7 +416,7 @@ const PrepopulatedEngine* const engines_IT[] = { +@@ -476,7 +477,7 @@ const PrepopulatedEngine* const engines_JM[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ask, }; - // Jamaica -@@ -421,7 +424,7 @@ const PrepopulatedEngine* const engines_JM[] = { +@@ -485,7 +486,7 @@ const PrepopulatedEngine* const engines_JO[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &yandex_com, }; - // Jordan -@@ -445,7 +448,7 @@ const PrepopulatedEngine* const engines_KE[] = { - &googleen, &google, - &yahoo, +@@ -495,7 +496,7 @@ const PrepopulatedEngine* const engines_JP[] = { + &yahoo_jp, &bing, + &baidu, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; - // South Korea -@@ -478,6 +481,7 @@ const PrepopulatedEngine* const engines_LB[] = { - &bing, - &yahoo, - &duckduckgo, -+ &duckduckgo_light, - }; - - // Liechtenstein -@@ -485,6 +489,7 @@ const PrepopulatedEngine* const engines_LI[] = { + // Kenya +@@ -503,7 +504,7 @@ const PrepopulatedEngine* const engines_KE[] = { &googleen, &google, &bing, - &duckduckgo, -+ &duckduckgo_light, &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yandex_ru, }; -@@ -500,7 +505,7 @@ const PrepopulatedEngine* const engines_LT[] = { +@@ -521,7 +522,7 @@ const PrepopulatedEngine* const engines_KW[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yandex_com, + }; + +@@ -539,7 +540,7 @@ const PrepopulatedEngine* const engines_LB[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ecosia, + }; + +@@ -547,7 +548,7 @@ const PrepopulatedEngine* const engines_LB[] = { + const PrepopulatedEngine* const engines_LI[] = { + &googleen, &google, + &bing, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yahoo, + &ecosia, + }; +@@ -558,14 +559,14 @@ const PrepopulatedEngine* const engines_LT[] = { + &bing, + &yahoo, + &yandex_ru, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + + // Luxembourg const PrepopulatedEngine* const engines_LU[] = { &googleen, &google, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yahoo, + &ecosia, }; - -@@ -533,7 +538,7 @@ const PrepopulatedEngine* const engines_MC[] = { - &googleen, &google, +@@ -576,7 +577,7 @@ const PrepopulatedEngine* const engines_LV[] = { + &yandex_ru, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; - // Moldova -@@ -541,7 +546,7 @@ const PrepopulatedEngine* const engines_MD[] = { + // Libya +@@ -585,7 +586,7 @@ const PrepopulatedEngine* const engines_LY[] = { + &yahoo, + &bing, + &yandex_com, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + + // Morocco +@@ -593,7 +594,7 @@ const PrepopulatedEngine* const engines_MA[] = { + &googleen, &google, + &yahoo, + &bing, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yandex_com, + }; + +@@ -601,7 +602,7 @@ const PrepopulatedEngine* const engines_MA[] = { + const PrepopulatedEngine* const engines_MC[] = { + &googleen, &google, + &bing, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yahoo, + &qwant, + }; +@@ -611,7 +612,7 @@ const PrepopulatedEngine* const engines_MD[] = { &googleen, &google, &yandex_ru, &mail_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &bing, }; - // Montenegro -@@ -557,7 +562,7 @@ const PrepopulatedEngine* const engines_MK[] = { - &googleen, &google, - &yahoo, +@@ -621,7 +622,7 @@ const PrepopulatedEngine* const engines_ME[] = { &bing, + &yahoo, + &yandex_ru, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; - // Mexico -@@ -565,7 +570,7 @@ const PrepopulatedEngine* const engines_MX[] = { + // Macedonia +@@ -629,7 +630,7 @@ const PrepopulatedEngine* const engines_MK[] = { &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yandex_ru, + }; + +@@ -639,7 +640,7 @@ const PrepopulatedEngine* const engines_MX[] = { &bing, &yahoo_mx, + &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Malaysia -@@ -581,7 +586,7 @@ const PrepopulatedEngine* const engines_NI[] = { +@@ -647,7 +648,7 @@ const PrepopulatedEngine* const engines_MY[] = { + &googleen, &google, + &bing, + &yahoo_my, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &baidu, + }; + +@@ -656,8 +657,9 @@ const PrepopulatedEngine* const engines_NI[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, ++ &duckduckgo_light, }; // Netherlands -@@ -589,7 +594,7 @@ const PrepopulatedEngine* const engines_NL[] = { +@@ -665,7 +667,7 @@ const PrepopulatedEngine* const engines_NL[] = { &googleen, &google, &bing, &yahoo_nl, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &yandex_ru, }; - // Norway -@@ -598,13 +603,14 @@ const PrepopulatedEngine* const engines_NO[] = { +@@ -674,7 +676,7 @@ const PrepopulatedEngine* const engines_NO[] = { + &googleen, &google, &bing, &yahoo, - &duckduckgo, -+ &duckduckgo_light, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yandex_ru, }; - // New Zealand +@@ -682,7 +684,7 @@ const PrepopulatedEngine* const engines_NO[] = { const PrepopulatedEngine* const engines_NZ[] = { &googleen, &google, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, &yahoo_nz, + &ecosia, }; - -@@ -621,7 +627,7 @@ const PrepopulatedEngine* const engines_PA[] = { +@@ -692,7 +694,7 @@ const PrepopulatedEngine* const engines_OM[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Peru -@@ -629,7 +635,7 @@ const PrepopulatedEngine* const engines_PE[] = { +@@ -701,7 +703,7 @@ const PrepopulatedEngine* const engines_PA[] = { &googleen, &google, - &yahoo_pe, &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ecosia, + }; + +@@ -711,7 +713,7 @@ const PrepopulatedEngine* const engines_PE[] = { + &bing, + &yahoo_pe, + &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Philippines -@@ -637,7 +643,7 @@ const PrepopulatedEngine* const engines_PH[] = { - &googleen, &google, +@@ -720,7 +722,7 @@ const PrepopulatedEngine* const engines_PH[] = { &yahoo_ph, &bing, + &ecosia, - &duckduckgo, + &duckduckgo, &duckduckgo_light, }; // Pakistan -@@ -653,7 +659,7 @@ const PrepopulatedEngine* const engines_PL[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Puerto Rico -@@ -661,7 +667,7 @@ const PrepopulatedEngine* const engines_PR[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Portugal -@@ -669,7 +675,7 @@ const PrepopulatedEngine* const engines_PT[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Paraguay -@@ -677,7 +683,7 @@ const PrepopulatedEngine* const engines_PY[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Qatar -@@ -693,7 +699,7 @@ const PrepopulatedEngine* const engines_RO[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Serbia -@@ -701,7 +707,7 @@ const PrepopulatedEngine* const engines_RS[] = { +@@ -728,7 +730,7 @@ const PrepopulatedEngine* const engines_PK[] = { &googleen, &google, &yahoo, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &yandex_com, }; - // Russia -@@ -733,7 +739,7 @@ const PrepopulatedEngine* const engines_SE[] = { +@@ -737,7 +739,7 @@ const PrepopulatedEngine* const engines_PL[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yandex_ru, + }; + +@@ -746,7 +748,7 @@ const PrepopulatedEngine* const engines_PR[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ecosia, + }; + +@@ -755,7 +757,7 @@ const PrepopulatedEngine* const engines_PT[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ecosia, + }; + +@@ -764,7 +766,7 @@ const PrepopulatedEngine* const engines_PY[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &ecosia, + }; + +@@ -773,7 +775,7 @@ const PrepopulatedEngine* const engines_QA[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yandex_com, + }; + +@@ -782,7 +784,7 @@ const PrepopulatedEngine* const engines_RO[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yandex_ru, + }; + +@@ -791,7 +793,7 @@ const PrepopulatedEngine* const engines_RS[] = { + &googleen, &google, + &yahoo, + &bing, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yandex_ru, + }; + +@@ -809,7 +811,7 @@ const PrepopulatedEngine* const engines_RW[] = { + &googleen, &google, + &bing, + &yahoo, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &mail_ru, + }; + +@@ -819,7 +821,7 @@ const PrepopulatedEngine* const engines_SA[] = { + &bing, + &yahoo, + &yandex_com, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + + // Sweden +@@ -827,7 +829,7 @@ const PrepopulatedEngine* const engines_SE[] = { &googleen, &google, &bing, &yahoo_se, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Singapore -@@ -749,7 +755,7 @@ const PrepopulatedEngine* const engines_SI[] = { +@@ -844,7 +846,7 @@ const PrepopulatedEngine* const engines_SG[] = { + const PrepopulatedEngine* const engines_SI[] = { + &googleen, &google, + &bing, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &yahoo, + &yandex_ru, + }; +@@ -854,7 +856,7 @@ const PrepopulatedEngine* const engines_SK[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &seznam_cz, }; - // Slovakia -@@ -757,7 +763,7 @@ const PrepopulatedEngine* const engines_SK[] = { +@@ -863,7 +865,7 @@ const PrepopulatedEngine* const engines_SV[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // El Salvador -@@ -765,7 +771,7 @@ const PrepopulatedEngine* const engines_SV[] = { +@@ -873,7 +875,7 @@ const PrepopulatedEngine* const engines_SY[] = { + &bing, + &yahoo, + &yandex_ru, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + + // Thailand +@@ -881,7 +883,7 @@ const PrepopulatedEngine* const engines_TH[] = { + &googleen, &google, + &yahoo_th, + &bing, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + &baidu, + }; + +@@ -891,7 +893,7 @@ const PrepopulatedEngine* const engines_TN[] = { + &yahoo, + &bing, + &yandex_ru, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + + // Turkey +@@ -900,7 +902,7 @@ const PrepopulatedEngine* const engines_TR[] = { + &yandex_tr, + &yahoo_tr, + &bing, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + + // Trinidad and Tobago +@@ -908,7 +910,7 @@ const PrepopulatedEngine* const engines_TT[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ask, }; - // Syria -@@ -805,7 +811,7 @@ const PrepopulatedEngine* const engines_TT[] = { +@@ -926,7 +928,7 @@ const PrepopulatedEngine* const engines_TZ[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &yandex_ru, }; - // Taiwan -@@ -837,7 +843,7 @@ const PrepopulatedEngine* const engines_US[] = { +@@ -944,7 +946,7 @@ const PrepopulatedEngine* const engines_US[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Uruguay -@@ -845,7 +851,7 @@ const PrepopulatedEngine* const engines_UY[] = { +@@ -953,7 +955,7 @@ const PrepopulatedEngine* const engines_UY[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Venezuela -@@ -853,7 +859,7 @@ const PrepopulatedEngine* const engines_VE[] = { +@@ -962,7 +964,7 @@ const PrepopulatedEngine* const engines_VE[] = { &googleen, &google, &yahoo_ve, &bing, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &ecosia, }; - // Vietnam -@@ -877,7 +883,7 @@ const PrepopulatedEngine* const engines_ZA[] = { +@@ -981,7 +983,7 @@ const PrepopulatedEngine* const engines_YE[] = { + &bing, + &yahoo, + &yandex_ru, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + + // South Africa +@@ -989,7 +991,7 @@ const PrepopulatedEngine* const engines_ZA[] = { &googleen, &google, &bing, &yahoo, - &duckduckgo, + &duckduckgo, &duckduckgo_light, + &baidu, }; - // Zimbabwe +@@ -999,7 +1001,7 @@ const PrepopulatedEngine* const engines_ZW[] = { + &bing, + &yahoo, + &ask, +- &duckduckgo, ++ &duckduckgo, &duckduckgo_light, + }; + // ---------------------------------------------------------------------------- + -- 2.17.1 diff --git a/build/patches/Add-English-only-search-engine.patch b/build/patches/Add-English-only-search-engine.patch index 93b4dd75..8636ca94 100644 --- a/build/patches/Add-English-only-search-engine.patch +++ b/build/patches/Add-English-only-search-engine.patch @@ -13,7 +13,7 @@ disable from all its searches RLZ and field experiments querystring parameters. 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 -@@ -122,6 +122,27 @@ +@@ -132,6 +132,27 @@ "id": 1 }, @@ -44,9 +44,9 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h --- a/components/search_engines/search_engine_type.h +++ b/components/search_engines/search_engine_type.h -@@ -74,6 +74,7 @@ enum SearchEngineType { - SEARCH_ENGINE_OCEANHERO, +@@ -75,6 +75,7 @@ enum SearchEngineType { SEARCH_ENGINE_PRIVACYWALL, + SEARCH_ENGINE_ECOSIA, + SEARCH_ENGINE_GOOGLE_EN, SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. @@ -73,7 +73,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -49,7 +49,7 @@ const PrepopulatedEngine* const engines_AE[] = { +@@ -50,7 +50,7 @@ const PrepopulatedEngine* const engines_AE[] = { // Albania const PrepopulatedEngine* const engines_AL[] = { @@ -81,8 +81,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &yahoo, &bing, - &ask, -@@ -57,7 +57,7 @@ const PrepopulatedEngine* const engines_AL[] = { + &duckduckgo, +@@ -59,7 +59,7 @@ const PrepopulatedEngine* const engines_AL[] = { // Argentina const PrepopulatedEngine* const engines_AR[] = { @@ -91,34 +91,34 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_ar, &duckduckgo, -@@ -65,7 +65,7 @@ const PrepopulatedEngine* const engines_AR[] = { +@@ -68,7 +68,7 @@ const PrepopulatedEngine* const engines_AR[] = { // Austria const PrepopulatedEngine* const engines_AT[] = { - &google, + &googleen, &google, &bing, - &yahoo_at, &duckduckgo, -@@ -73,7 +73,7 @@ const PrepopulatedEngine* const engines_AT[] = { + &yahoo_at, +@@ -77,7 +77,7 @@ const PrepopulatedEngine* const engines_AT[] = { // Australia const PrepopulatedEngine* const engines_AU[] = { - &google, + &googleen, &google, &bing, - &yahoo_au, &duckduckgo, -@@ -81,7 +81,7 @@ const PrepopulatedEngine* const engines_AU[] = { + &yahoo_au, +@@ -86,7 +86,7 @@ const PrepopulatedEngine* const engines_AU[] = { // Bosnia and Herzegovina const PrepopulatedEngine* const engines_BA[] = { - &google, + &googleen, &google, - &yahoo, &bing, - &ask, -@@ -89,7 +89,7 @@ const PrepopulatedEngine* const engines_BA[] = { + &yahoo, + &duckduckgo, +@@ -95,7 +95,7 @@ const PrepopulatedEngine* const engines_BA[] = { // Belgium const PrepopulatedEngine* const engines_BE[] = { @@ -126,8 +126,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &duckduckgo, -@@ -97,7 +97,7 @@ const PrepopulatedEngine* const engines_BE[] = { + &ecosia, +@@ -104,7 +104,7 @@ const PrepopulatedEngine* const engines_BE[] = { // Bulgaria const PrepopulatedEngine* const engines_BG[] = { @@ -135,8 +135,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &yandex_ru, -@@ -105,7 +105,7 @@ const PrepopulatedEngine* const engines_BG[] = { + &duckduckgo, +@@ -113,7 +113,7 @@ const PrepopulatedEngine* const engines_BG[] = { // Bahrain const PrepopulatedEngine* const engines_BH[] = { @@ -144,8 +144,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &ask, -@@ -113,7 +113,7 @@ const PrepopulatedEngine* const engines_BH[] = { + &duckduckgo, +@@ -122,7 +122,7 @@ const PrepopulatedEngine* const engines_BH[] = { // Burundi const PrepopulatedEngine* const engines_BI[] = { @@ -153,8 +153,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &yandex_ru, -@@ -121,7 +121,7 @@ const PrepopulatedEngine* const engines_BI[] = { + &duckduckgo, +@@ -131,7 +131,7 @@ const PrepopulatedEngine* const engines_BI[] = { // Brunei const PrepopulatedEngine* const engines_BN[] = { @@ -163,7 +163,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -129,7 +129,7 @@ const PrepopulatedEngine* const engines_BN[] = { +@@ -140,7 +140,7 @@ const PrepopulatedEngine* const engines_BN[] = { // Bolivia const PrepopulatedEngine* const engines_BO[] = { @@ -172,7 +172,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -137,7 +137,7 @@ const PrepopulatedEngine* const engines_BO[] = { +@@ -149,7 +149,7 @@ const PrepopulatedEngine* const engines_BO[] = { // Brazil const PrepopulatedEngine* const engines_BR[] = { @@ -181,7 +181,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_br, &duckduckgo, -@@ -145,7 +145,7 @@ const PrepopulatedEngine* const engines_BR[] = { +@@ -158,7 +158,7 @@ const PrepopulatedEngine* const engines_BR[] = { // Belarus const PrepopulatedEngine* const engines_BY[] = { @@ -190,7 +190,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yandex_by, &mail_ru, &bing, -@@ -153,7 +153,7 @@ const PrepopulatedEngine* const engines_BY[] = { +@@ -167,7 +167,7 @@ const PrepopulatedEngine* const engines_BY[] = { // Belize const PrepopulatedEngine* const engines_BZ[] = { @@ -199,13 +199,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -161,12 +161,12 @@ const PrepopulatedEngine* const engines_BZ[] = { +@@ -176,7 +176,7 @@ const PrepopulatedEngine* const engines_BZ[] = { // Canada const PrepopulatedEngine* const engines_CA[] = { -- &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, -+ &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, - }; +- &google, ++ &googleen, &google, + &bing, + &yahoo_ca, + &duckduckgo, +@@ -185,7 +185,7 @@ const PrepopulatedEngine* const engines_CA[] = { // Switzerland const PrepopulatedEngine* const engines_CH[] = { @@ -214,7 +217,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &duckduckgo, &yahoo_ch, -@@ -174,7 +174,7 @@ const PrepopulatedEngine* const engines_CH[] = { +@@ -194,7 +194,7 @@ const PrepopulatedEngine* const engines_CH[] = { // Chile const PrepopulatedEngine* const engines_CL[] = { @@ -223,22 +226,24 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_cl, &duckduckgo, -@@ -182,12 +182,12 @@ const PrepopulatedEngine* const engines_CL[] = { - - // China +@@ -205,14 +205,14 @@ const PrepopulatedEngine* const engines_CL[] = { const PrepopulatedEngine* const engines_CN[] = { -- &baidu, &so_360, &google, &sogou, &bing, -+ &baidu, &so_360, &googleen, &google, &sogou, &bing, + &baidu, + &sogou, +- &google, ++ &googleen, &google, + &so_360, + &bing, }; // Colombia const PrepopulatedEngine* const engines_CO[] = { - &google, + &googleen, &google, - &yahoo_co, &bing, - &duckduckgo, -@@ -195,7 +195,7 @@ const PrepopulatedEngine* const engines_CO[] = { + &yahoo_co, + &ecosia, +@@ -221,7 +221,7 @@ const PrepopulatedEngine* const engines_CO[] = { // Costa Rica const PrepopulatedEngine* const engines_CR[] = { @@ -247,7 +252,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -203,7 +203,7 @@ const PrepopulatedEngine* const engines_CR[] = { +@@ -230,7 +230,7 @@ const PrepopulatedEngine* const engines_CR[] = { // Czech Republic const PrepopulatedEngine* const engines_CZ[] = { @@ -256,7 +261,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &seznam_cz, &bing, &yahoo, -@@ -211,7 +211,7 @@ const PrepopulatedEngine* const engines_CZ[] = { +@@ -239,7 +239,7 @@ const PrepopulatedEngine* const engines_CZ[] = { // Germany const PrepopulatedEngine* const engines_DE[] = { @@ -265,7 +270,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_de, &duckduckgo, -@@ -219,7 +219,7 @@ const PrepopulatedEngine* const engines_DE[] = { +@@ -248,7 +248,7 @@ const PrepopulatedEngine* const engines_DE[] = { // Denmark const PrepopulatedEngine* const engines_DK[] = { @@ -274,7 +279,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_dk, &duckduckgo, -@@ -227,7 +227,7 @@ const PrepopulatedEngine* const engines_DK[] = { +@@ -257,7 +257,7 @@ const PrepopulatedEngine* const engines_DK[] = { // Dominican Republic const PrepopulatedEngine* const engines_DO[] = { @@ -283,7 +288,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -235,7 +235,7 @@ const PrepopulatedEngine* const engines_DO[] = { +@@ -266,7 +266,7 @@ const PrepopulatedEngine* const engines_DO[] = { // Algeria const PrepopulatedEngine* const engines_DZ[] = { @@ -292,7 +297,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &yandex_ru, -@@ -243,7 +243,7 @@ const PrepopulatedEngine* const engines_DZ[] = { +@@ -275,7 +275,7 @@ const PrepopulatedEngine* const engines_DZ[] = { // Ecuador const PrepopulatedEngine* const engines_EC[] = { @@ -300,8 +305,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &duckduckgo, -@@ -251,7 +251,7 @@ const PrepopulatedEngine* const engines_EC[] = { + &ecosia, +@@ -284,7 +284,7 @@ const PrepopulatedEngine* const engines_EC[] = { // Estonia const PrepopulatedEngine* const engines_EE[] = { @@ -309,8 +314,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yandex_ru, - &neti, -@@ -259,7 +259,7 @@ const PrepopulatedEngine* const engines_EE[] = { + &yahoo, +@@ -293,7 +293,7 @@ const PrepopulatedEngine* const engines_EE[] = { // Egypt const PrepopulatedEngine* const engines_EG[] = { @@ -319,7 +324,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &yandex_ru, -@@ -267,7 +267,7 @@ const PrepopulatedEngine* const engines_EG[] = { +@@ -302,7 +302,7 @@ const PrepopulatedEngine* const engines_EG[] = { // Spain const PrepopulatedEngine* const engines_ES[] = { @@ -328,7 +333,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_es, &duckduckgo, -@@ -275,7 +275,7 @@ const PrepopulatedEngine* const engines_ES[] = { +@@ -311,7 +311,7 @@ const PrepopulatedEngine* const engines_ES[] = { // Finland const PrepopulatedEngine* const engines_FI[] = { @@ -337,16 +342,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_fi, &duckduckgo, -@@ -283,7 +283,7 @@ const PrepopulatedEngine* const engines_FI[] = { +@@ -320,7 +320,7 @@ const PrepopulatedEngine* const engines_FI[] = { // Faroe Islands const PrepopulatedEngine* const engines_FO[] = { - &google, + &googleen, &google, &bing, - &yahoo, + &yahoo_dk, &duckduckgo, -@@ -291,7 +291,7 @@ const PrepopulatedEngine* const engines_FO[] = { +@@ -329,7 +329,7 @@ const PrepopulatedEngine* const engines_FO[] = { // France const PrepopulatedEngine* const engines_FR[] = { @@ -355,7 +360,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_fr, &qwant, -@@ -299,7 +299,7 @@ const PrepopulatedEngine* const engines_FR[] = { +@@ -338,7 +338,7 @@ const PrepopulatedEngine* const engines_FR[] = { // United Kingdom const PrepopulatedEngine* const engines_GB[] = { @@ -364,7 +369,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_uk, &duckduckgo, -@@ -307,7 +307,7 @@ const PrepopulatedEngine* const engines_GB[] = { +@@ -347,7 +347,7 @@ const PrepopulatedEngine* const engines_GB[] = { // Greece const PrepopulatedEngine* const engines_GR[] = { @@ -373,7 +378,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -315,7 +315,7 @@ const PrepopulatedEngine* const engines_GR[] = { +@@ -356,7 +356,7 @@ const PrepopulatedEngine* const engines_GR[] = { // Guatemala const PrepopulatedEngine* const engines_GT[] = { @@ -381,8 +386,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &duckduckgo, -@@ -323,7 +323,7 @@ const PrepopulatedEngine* const engines_GT[] = { + &ecosia, +@@ -365,7 +365,7 @@ const PrepopulatedEngine* const engines_GT[] = { // Hong Kong const PrepopulatedEngine* const engines_HK[] = { @@ -390,8 +395,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &yahoo_hk, &bing, - &baidu, -@@ -331,7 +331,7 @@ const PrepopulatedEngine* const engines_HK[] = { + &yandex_com, +@@ -374,7 +374,7 @@ const PrepopulatedEngine* const engines_HK[] = { // Honduras const PrepopulatedEngine* const engines_HN[] = { @@ -399,8 +404,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &duckduckgo, -@@ -339,7 +339,7 @@ const PrepopulatedEngine* const engines_HN[] = { + &yandex_ru, +@@ -383,7 +383,7 @@ const PrepopulatedEngine* const engines_HN[] = { // Croatia const PrepopulatedEngine* const engines_HR[] = { @@ -409,16 +414,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -347,7 +347,7 @@ const PrepopulatedEngine* const engines_HR[] = { +@@ -392,7 +392,7 @@ const PrepopulatedEngine* const engines_HR[] = { // Hungary const PrepopulatedEngine* const engines_HU[] = { - &google, + &googleen, &google, - &yahoo, &bing, + &yahoo, &duckduckgo, -@@ -355,7 +355,7 @@ const PrepopulatedEngine* const engines_HU[] = { +@@ -401,7 +401,7 @@ const PrepopulatedEngine* const engines_HU[] = { // Indonesia const PrepopulatedEngine* const engines_ID[] = { @@ -427,7 +432,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo_id, &bing, &duckduckgo, -@@ -363,7 +363,7 @@ const PrepopulatedEngine* const engines_ID[] = { +@@ -410,7 +410,7 @@ const PrepopulatedEngine* const engines_ID[] = { // Ireland const PrepopulatedEngine* const engines_IE[] = { @@ -436,7 +441,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -371,7 +371,7 @@ const PrepopulatedEngine* const engines_IE[] = { +@@ -419,7 +419,7 @@ const PrepopulatedEngine* const engines_IE[] = { // Israel const PrepopulatedEngine* const engines_IL[] = { @@ -445,7 +450,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &yandex_ru, -@@ -379,7 +379,7 @@ const PrepopulatedEngine* const engines_IL[] = { +@@ -428,7 +428,7 @@ const PrepopulatedEngine* const engines_IL[] = { // India const PrepopulatedEngine* const engines_IN[] = { @@ -454,7 +459,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo_in, &bing, &duckduckgo, -@@ -387,7 +387,7 @@ const PrepopulatedEngine* const engines_IN[] = { +@@ -437,7 +437,7 @@ const PrepopulatedEngine* const engines_IN[] = { // Iraq const PrepopulatedEngine* const engines_IQ[] = { @@ -463,7 +468,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &yandex_ru, -@@ -395,14 +395,14 @@ const PrepopulatedEngine* const engines_IQ[] = { +@@ -446,7 +446,7 @@ const PrepopulatedEngine* const engines_IQ[] = { // Iran const PrepopulatedEngine* const engines_IR[] = { @@ -471,16 +476,17 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - }; + &yandex_ru, +@@ -455,7 +455,7 @@ const PrepopulatedEngine* const engines_IR[] = { // Iceland const PrepopulatedEngine* const engines_IS[] = { - &google, + &googleen, &google, &bing, - &yahoo, &duckduckgo, -@@ -410,7 +410,7 @@ const PrepopulatedEngine* const engines_IS[] = { + &yahoo, +@@ -464,7 +464,7 @@ const PrepopulatedEngine* const engines_IS[] = { // Italy const PrepopulatedEngine* const engines_IT[] = { @@ -489,7 +495,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -418,7 +418,7 @@ const PrepopulatedEngine* const engines_IT[] = { +@@ -473,7 +473,7 @@ const PrepopulatedEngine* const engines_IT[] = { // Jamaica const PrepopulatedEngine* const engines_JM[] = { @@ -498,16 +504,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -426,7 +426,7 @@ const PrepopulatedEngine* const engines_JM[] = { +@@ -482,7 +482,7 @@ const PrepopulatedEngine* const engines_JM[] = { // Jordan const PrepopulatedEngine* const engines_JO[] = { - &google, + &googleen, &google, - &yahoo, &bing, - &yandex_ru, -@@ -434,7 +434,7 @@ const PrepopulatedEngine* const engines_JO[] = { + &yahoo, + &duckduckgo, +@@ -491,7 +491,7 @@ const PrepopulatedEngine* const engines_JO[] = { // Japan const PrepopulatedEngine* const engines_JP[] = { @@ -516,25 +522,25 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo_jp, &bing, &baidu, -@@ -442,7 +442,7 @@ const PrepopulatedEngine* const engines_JP[] = { +@@ -500,7 +500,7 @@ const PrepopulatedEngine* const engines_JP[] = { // Kenya const PrepopulatedEngine* const engines_KE[] = { - &google, + &googleen, &google, - &yahoo, &bing, + &yahoo, &duckduckgo, -@@ -450,7 +450,7 @@ const PrepopulatedEngine* const engines_KE[] = { +@@ -509,7 +509,7 @@ const PrepopulatedEngine* const engines_KE[] = { // South Korea const PrepopulatedEngine* const engines_KR[] = { - &google, + &googleen, &google, &naver, - &daum, &bing, -@@ -458,7 +458,7 @@ const PrepopulatedEngine* const engines_KR[] = { + &daum, +@@ -518,7 +518,7 @@ const PrepopulatedEngine* const engines_KR[] = { // Kuwait const PrepopulatedEngine* const engines_KW[] = { @@ -542,8 +548,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &ask, -@@ -466,7 +466,7 @@ const PrepopulatedEngine* const engines_KW[] = { + &duckduckgo, +@@ -527,7 +527,7 @@ const PrepopulatedEngine* const engines_KW[] = { // Kazakhstan const PrepopulatedEngine* const engines_KZ[] = { @@ -552,7 +558,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yandex_kz, &mail_ru, &bing, -@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_KZ[] = { +@@ -536,7 +536,7 @@ const PrepopulatedEngine* const engines_KZ[] = { // Lebanon const PrepopulatedEngine* const engines_LB[] = { @@ -561,7 +567,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -482,7 +482,7 @@ const PrepopulatedEngine* const engines_LB[] = { +@@ -545,7 +545,7 @@ const PrepopulatedEngine* const engines_LB[] = { // Liechtenstein const PrepopulatedEngine* const engines_LI[] = { @@ -570,7 +576,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &duckduckgo, &yahoo, -@@ -490,7 +490,7 @@ const PrepopulatedEngine* const engines_LI[] = { +@@ -554,7 +554,7 @@ const PrepopulatedEngine* const engines_LI[] = { // Lithuania const PrepopulatedEngine* const engines_LT[] = { @@ -579,7 +585,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &yandex_ru, -@@ -498,7 +498,7 @@ const PrepopulatedEngine* const engines_LT[] = { +@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_LT[] = { // Luxembourg const PrepopulatedEngine* const engines_LU[] = { @@ -588,16 +594,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &duckduckgo, &yahoo, -@@ -506,7 +506,7 @@ const PrepopulatedEngine* const engines_LU[] = { +@@ -572,7 +572,7 @@ const PrepopulatedEngine* const engines_LU[] = { // Latvia const PrepopulatedEngine* const engines_LV[] = { - &google, + &googleen, &google, - &bing, &yandex_ru, + &bing, &yahoo, -@@ -514,7 +514,7 @@ const PrepopulatedEngine* const engines_LV[] = { +@@ -581,7 +581,7 @@ const PrepopulatedEngine* const engines_LV[] = { // Libya const PrepopulatedEngine* const engines_LY[] = { @@ -606,7 +612,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &yandex_com, -@@ -522,7 +522,7 @@ const PrepopulatedEngine* const engines_LY[] = { +@@ -590,7 +590,7 @@ const PrepopulatedEngine* const engines_LY[] = { // Morocco const PrepopulatedEngine* const engines_MA[] = { @@ -614,17 +620,17 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &yahoo, &bing, - &yandex_ru, -@@ -530,7 +530,7 @@ const PrepopulatedEngine* const engines_MA[] = { + &duckduckgo, +@@ -599,7 +599,7 @@ const PrepopulatedEngine* const engines_MA[] = { // Monaco const PrepopulatedEngine* const engines_MC[] = { - &google, + &googleen, &google, &bing, - &yahoo, &duckduckgo, -@@ -538,7 +538,7 @@ const PrepopulatedEngine* const engines_MC[] = { + &yahoo, +@@ -608,7 +608,7 @@ const PrepopulatedEngine* const engines_MC[] = { // Moldova const PrepopulatedEngine* const engines_MD[] = { @@ -633,25 +639,25 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yandex_ru, &mail_ru, &duckduckgo, -@@ -546,7 +546,7 @@ const PrepopulatedEngine* const engines_MD[] = { +@@ -617,7 +617,7 @@ const PrepopulatedEngine* const engines_MD[] = { // Montenegro const PrepopulatedEngine* const engines_ME[] = { - &google, + &googleen, &google, - &yahoo, &bing, + &yahoo, &yandex_ru, -@@ -554,7 +554,7 @@ const PrepopulatedEngine* const engines_ME[] = { +@@ -626,7 +626,7 @@ const PrepopulatedEngine* const engines_ME[] = { // Macedonia const PrepopulatedEngine* const engines_MK[] = { - &google, + &googleen, &google, - &yahoo, &bing, + &yahoo, &duckduckgo, -@@ -562,7 +562,7 @@ const PrepopulatedEngine* const engines_MK[] = { +@@ -635,7 +635,7 @@ const PrepopulatedEngine* const engines_MK[] = { // Mexico const PrepopulatedEngine* const engines_MX[] = { @@ -659,17 +665,17 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo_mx, - &duckduckgo, -@@ -570,7 +570,7 @@ const PrepopulatedEngine* const engines_MX[] = { + &ecosia, +@@ -644,7 +644,7 @@ const PrepopulatedEngine* const engines_MX[] = { // Malaysia const PrepopulatedEngine* const engines_MY[] = { - &google, + &googleen, &google, - &yahoo_my, &bing, - &baidu, -@@ -578,7 +578,7 @@ const PrepopulatedEngine* const engines_MY[] = { + &yahoo_my, + &duckduckgo, +@@ -653,7 +653,7 @@ const PrepopulatedEngine* const engines_MY[] = { // Nicaragua const PrepopulatedEngine* const engines_NI[] = { @@ -678,7 +684,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -586,7 +586,7 @@ const PrepopulatedEngine* const engines_NI[] = { +@@ -662,7 +662,7 @@ const PrepopulatedEngine* const engines_NI[] = { // Netherlands const PrepopulatedEngine* const engines_NL[] = { @@ -687,7 +693,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_nl, &duckduckgo, -@@ -594,7 +594,7 @@ const PrepopulatedEngine* const engines_NL[] = { +@@ -671,7 +671,7 @@ const PrepopulatedEngine* const engines_NL[] = { // Norway const PrepopulatedEngine* const engines_NO[] = { @@ -696,7 +702,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -602,7 +602,7 @@ const PrepopulatedEngine* const engines_NO[] = { +@@ -680,7 +680,7 @@ const PrepopulatedEngine* const engines_NO[] = { // New Zealand const PrepopulatedEngine* const engines_NZ[] = { @@ -705,7 +711,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &duckduckgo, &yahoo_nz, -@@ -610,7 +610,7 @@ const PrepopulatedEngine* const engines_NZ[] = { +@@ -689,7 +689,7 @@ const PrepopulatedEngine* const engines_NZ[] = { // Oman const PrepopulatedEngine* const engines_OM[] = { @@ -713,8 +719,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &ask, -@@ -618,7 +618,7 @@ const PrepopulatedEngine* const engines_OM[] = { + &duckduckgo, +@@ -698,7 +698,7 @@ const PrepopulatedEngine* const engines_OM[] = { // Panama const PrepopulatedEngine* const engines_PA[] = { @@ -723,16 +729,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -626,7 +626,7 @@ const PrepopulatedEngine* const engines_PA[] = { +@@ -707,7 +707,7 @@ const PrepopulatedEngine* const engines_PA[] = { // Peru const PrepopulatedEngine* const engines_PE[] = { - &google, + &googleen, &google, - &yahoo_pe, &bing, - &duckduckgo, -@@ -634,7 +634,7 @@ const PrepopulatedEngine* const engines_PE[] = { + &yahoo_pe, + &ecosia, +@@ -716,7 +716,7 @@ const PrepopulatedEngine* const engines_PE[] = { // Philippines const PrepopulatedEngine* const engines_PH[] = { @@ -740,8 +746,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &yahoo_ph, &bing, - &duckduckgo, -@@ -642,7 +642,7 @@ const PrepopulatedEngine* const engines_PH[] = { + &ecosia, +@@ -725,7 +725,7 @@ const PrepopulatedEngine* const engines_PH[] = { // Pakistan const PrepopulatedEngine* const engines_PK[] = { @@ -749,8 +755,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &yahoo, &bing, - &baidu, -@@ -650,7 +650,7 @@ const PrepopulatedEngine* const engines_PK[] = { + &duckduckgo, +@@ -734,7 +734,7 @@ const PrepopulatedEngine* const engines_PK[] = { // Poland const PrepopulatedEngine* const engines_PL[] = { @@ -759,7 +765,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -658,7 +658,7 @@ const PrepopulatedEngine* const engines_PL[] = { +@@ -743,7 +743,7 @@ const PrepopulatedEngine* const engines_PL[] = { // Puerto Rico const PrepopulatedEngine* const engines_PR[] = { @@ -768,7 +774,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -666,7 +666,7 @@ const PrepopulatedEngine* const engines_PR[] = { +@@ -752,7 +752,7 @@ const PrepopulatedEngine* const engines_PR[] = { // Portugal const PrepopulatedEngine* const engines_PT[] = { @@ -777,7 +783,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -674,7 +674,7 @@ const PrepopulatedEngine* const engines_PT[] = { +@@ -761,7 +761,7 @@ const PrepopulatedEngine* const engines_PT[] = { // Paraguay const PrepopulatedEngine* const engines_PY[] = { @@ -786,7 +792,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -682,7 +682,7 @@ const PrepopulatedEngine* const engines_PY[] = { +@@ -770,7 +770,7 @@ const PrepopulatedEngine* const engines_PY[] = { // Qatar const PrepopulatedEngine* const engines_QA[] = { @@ -794,8 +800,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &ask, -@@ -690,7 +690,7 @@ const PrepopulatedEngine* const engines_QA[] = { + &duckduckgo, +@@ -779,7 +779,7 @@ const PrepopulatedEngine* const engines_QA[] = { // Romania const PrepopulatedEngine* const engines_RO[] = { @@ -804,7 +810,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -698,7 +698,7 @@ const PrepopulatedEngine* const engines_RO[] = { +@@ -788,7 +788,7 @@ const PrepopulatedEngine* const engines_RO[] = { // Serbia const PrepopulatedEngine* const engines_RS[] = { @@ -813,15 +819,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &duckduckgo, -@@ -707,14 +707,14 @@ const PrepopulatedEngine* const engines_RS[] = { +@@ -797,7 +797,7 @@ const PrepopulatedEngine* const engines_RS[] = { + // Russia const PrepopulatedEngine* const engines_RU[] = { - &yandex_ru, - &google, + &googleen, &google, + &yandex_ru, &mail_ru, &bing, - }; +@@ -806,7 +806,7 @@ const PrepopulatedEngine* const engines_RU[] = { // Rwanda const PrepopulatedEngine* const engines_RW[] = { @@ -829,8 +836,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &yandex_ru, -@@ -722,7 +722,7 @@ const PrepopulatedEngine* const engines_RW[] = { + &duckduckgo, +@@ -815,7 +815,7 @@ const PrepopulatedEngine* const engines_RW[] = { // Saudi Arabia const PrepopulatedEngine* const engines_SA[] = { @@ -839,7 +846,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &yandex_com, -@@ -730,7 +730,7 @@ const PrepopulatedEngine* const engines_SA[] = { +@@ -824,7 +824,7 @@ const PrepopulatedEngine* const engines_SA[] = { // Sweden const PrepopulatedEngine* const engines_SE[] = { @@ -848,25 +855,25 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_se, &duckduckgo, -@@ -738,7 +738,7 @@ const PrepopulatedEngine* const engines_SE[] = { +@@ -833,7 +833,7 @@ const PrepopulatedEngine* const engines_SE[] = { // Singapore const PrepopulatedEngine* const engines_SG[] = { - &google, + &googleen, &google, &bing, - &yahoo_sg, &yandex_com, -@@ -746,7 +746,7 @@ const PrepopulatedEngine* const engines_SG[] = { + &yahoo_sg, +@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_SG[] = { // Slovenia const PrepopulatedEngine* const engines_SI[] = { - &google, + &googleen, &google, &bing, - &yahoo, &duckduckgo, -@@ -754,7 +754,7 @@ const PrepopulatedEngine* const engines_SI[] = { + &yahoo, +@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_SI[] = { // Slovakia const PrepopulatedEngine* const engines_SK[] = { @@ -875,7 +882,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -762,7 +762,7 @@ const PrepopulatedEngine* const engines_SK[] = { +@@ -860,7 +860,7 @@ const PrepopulatedEngine* const engines_SK[] = { // El Salvador const PrepopulatedEngine* const engines_SV[] = { @@ -884,7 +891,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -770,7 +770,7 @@ const PrepopulatedEngine* const engines_SV[] = { +@@ -869,7 +869,7 @@ const PrepopulatedEngine* const engines_SV[] = { // Syria const PrepopulatedEngine* const engines_SY[] = { @@ -893,7 +900,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &yandex_ru, -@@ -778,7 +778,7 @@ const PrepopulatedEngine* const engines_SY[] = { +@@ -878,7 +878,7 @@ const PrepopulatedEngine* const engines_SY[] = { // Thailand const PrepopulatedEngine* const engines_TH[] = { @@ -901,8 +908,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &yahoo_th, &bing, - &ask, -@@ -786,7 +786,7 @@ const PrepopulatedEngine* const engines_TH[] = { + &duckduckgo, +@@ -887,7 +887,7 @@ const PrepopulatedEngine* const engines_TH[] = { // Tunisia const PrepopulatedEngine* const engines_TN[] = { @@ -911,7 +918,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &yandex_ru, -@@ -794,7 +794,7 @@ const PrepopulatedEngine* const engines_TN[] = { +@@ -896,7 +896,7 @@ const PrepopulatedEngine* const engines_TN[] = { // Turkey const PrepopulatedEngine* const engines_TR[] = { @@ -920,7 +927,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yandex_tr, &yahoo_tr, &bing, -@@ -802,7 +802,7 @@ const PrepopulatedEngine* const engines_TR[] = { +@@ -905,7 +905,7 @@ const PrepopulatedEngine* const engines_TR[] = { // Trinidad and Tobago const PrepopulatedEngine* const engines_TT[] = { @@ -929,7 +936,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -810,7 +810,7 @@ const PrepopulatedEngine* const engines_TT[] = { +@@ -914,7 +914,7 @@ const PrepopulatedEngine* const engines_TT[] = { // Taiwan const PrepopulatedEngine* const engines_TW[] = { @@ -938,7 +945,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo_tw, &bing, &baidu, -@@ -818,7 +818,7 @@ const PrepopulatedEngine* const engines_TW[] = { +@@ -923,7 +923,7 @@ const PrepopulatedEngine* const engines_TW[] = { // Tanzania const PrepopulatedEngine* const engines_TZ[] = { @@ -946,17 +953,17 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &yandex_ru, -@@ -826,7 +826,7 @@ const PrepopulatedEngine* const engines_TZ[] = { + &duckduckgo, +@@ -932,7 +932,7 @@ const PrepopulatedEngine* const engines_TZ[] = { // Ukraine const PrepopulatedEngine* const engines_UA[] = { - &google, + &googleen, &google, &yandex_ua, - &mail_ru, &bing, -@@ -834,7 +834,7 @@ const PrepopulatedEngine* const engines_UA[] = { + &mail_ru, +@@ -941,7 +941,7 @@ const PrepopulatedEngine* const engines_UA[] = { // United States const PrepopulatedEngine* const engines_US[] = { @@ -965,7 +972,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_US[] = { +@@ -950,7 +950,7 @@ const PrepopulatedEngine* const engines_US[] = { // Uruguay const PrepopulatedEngine* const engines_UY[] = { @@ -974,7 +981,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -850,7 +850,7 @@ const PrepopulatedEngine* const engines_UY[] = { +@@ -959,7 +959,7 @@ const PrepopulatedEngine* const engines_UY[] = { // Venezuela const PrepopulatedEngine* const engines_VE[] = { @@ -983,16 +990,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo_ve, &bing, &duckduckgo, -@@ -858,7 +858,7 @@ const PrepopulatedEngine* const engines_VE[] = { +@@ -968,7 +968,7 @@ const PrepopulatedEngine* const engines_VE[] = { // Vietnam const PrepopulatedEngine* const engines_VN[] = { - &google, + &googleen, &google, &coccoc, + &yahoo, &bing, - &yahoo_vn, -@@ -866,7 +866,7 @@ const PrepopulatedEngine* const engines_VN[] = { +@@ -977,7 +977,7 @@ const PrepopulatedEngine* const engines_VN[] = { // Yemen const PrepopulatedEngine* const engines_YE[] = { @@ -1000,8 +1007,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &baidu, -@@ -874,7 +874,7 @@ const PrepopulatedEngine* const engines_YE[] = { + &yandex_ru, +@@ -986,7 +986,7 @@ const PrepopulatedEngine* const engines_YE[] = { // South Africa const PrepopulatedEngine* const engines_ZA[] = { @@ -1010,7 +1017,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, -@@ -882,7 +882,7 @@ const PrepopulatedEngine* const engines_ZA[] = { +@@ -995,7 +995,7 @@ const PrepopulatedEngine* const engines_ZA[] = { // Zimbabwe const PrepopulatedEngine* const engines_ZW[] = { @@ -1018,7 +1025,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &bing, &yahoo, - &baidu, + &ask, -- 2.17.1 diff --git a/build/patches/Add-Qwant-search-engine.patch b/build/patches/Add-Qwant-search-engine.patch index 2fa63b73..8e857b5e 100644 --- a/build/patches/Add-Qwant-search-engine.patch +++ b/build/patches/Add-Qwant-search-engine.patch @@ -12,7 +12,7 @@ Make search engine selectable in default list 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 -@@ -183,6 +183,7 @@ +@@ -193,6 +193,7 @@ "favicon_url": "https://www.qwant.com/favicon.ico", "search_url": "https://www.qwant.com/?q={searchTerms}&client=opensearch", "suggest_url": "https://api.qwant.com/api/suggest/?q={searchTerms}&client=opensearch", @@ -41,7 +41,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -50,7 +50,7 @@ const PrepopulatedEngine* const engines_AE[] = { +@@ -51,7 +51,7 @@ const PrepopulatedEngine* const engines_AE[] = { // Albania const PrepopulatedEngine* const engines_AL[] = { @@ -49,8 +49,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &yahoo, &bing, - &ask, -@@ -58,7 +58,7 @@ const PrepopulatedEngine* const engines_AL[] = { + &duckduckgo, &duckduckgo_light, +@@ -60,7 +60,7 @@ const PrepopulatedEngine* const engines_AL[] = { // Argentina const PrepopulatedEngine* const engines_AR[] = { @@ -59,34 +59,34 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_ar, &duckduckgo, &duckduckgo_light, -@@ -66,7 +66,7 @@ const PrepopulatedEngine* const engines_AR[] = { +@@ -69,7 +69,7 @@ const PrepopulatedEngine* const engines_AR[] = { // Austria const PrepopulatedEngine* const engines_AT[] = { - &googleen, &google, + &googleen, &google, &qwant, &bing, - &yahoo_at, &duckduckgo, &duckduckgo_light, -@@ -74,7 +74,7 @@ const PrepopulatedEngine* const engines_AT[] = { + &yahoo_at, +@@ -78,7 +78,7 @@ const PrepopulatedEngine* const engines_AT[] = { // Australia const PrepopulatedEngine* const engines_AU[] = { - &googleen, &google, + &googleen, &google, &qwant, &bing, - &yahoo_au, &duckduckgo, &duckduckgo_light, -@@ -82,7 +82,7 @@ const PrepopulatedEngine* const engines_AU[] = { + &yahoo_au, +@@ -87,7 +87,7 @@ const PrepopulatedEngine* const engines_AU[] = { // Bosnia and Herzegovina const PrepopulatedEngine* const engines_BA[] = { - &googleen, &google, + &googleen, &google, &qwant, - &yahoo, &bing, - &ask, -@@ -90,7 +90,7 @@ const PrepopulatedEngine* const engines_BA[] = { + &yahoo, + &duckduckgo, &duckduckgo_light, +@@ -96,7 +96,7 @@ const PrepopulatedEngine* const engines_BA[] = { // Belgium const PrepopulatedEngine* const engines_BE[] = { @@ -94,8 +94,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -98,7 +98,7 @@ const PrepopulatedEngine* const engines_BE[] = { + &ecosia, +@@ -105,7 +105,7 @@ const PrepopulatedEngine* const engines_BE[] = { // Bulgaria const PrepopulatedEngine* const engines_BG[] = { @@ -103,8 +103,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &yandex_ru, -@@ -106,7 +106,7 @@ const PrepopulatedEngine* const engines_BG[] = { + &duckduckgo, &duckduckgo_light, +@@ -114,7 +114,7 @@ const PrepopulatedEngine* const engines_BG[] = { // Bahrain const PrepopulatedEngine* const engines_BH[] = { @@ -112,8 +112,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &ask, -@@ -114,7 +114,7 @@ const PrepopulatedEngine* const engines_BH[] = { + &duckduckgo, &duckduckgo_light, +@@ -123,7 +123,7 @@ const PrepopulatedEngine* const engines_BH[] = { // Burundi const PrepopulatedEngine* const engines_BI[] = { @@ -121,8 +121,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &yandex_ru, -@@ -122,7 +122,7 @@ const PrepopulatedEngine* const engines_BI[] = { + &duckduckgo, &duckduckgo_light, +@@ -132,7 +132,7 @@ const PrepopulatedEngine* const engines_BI[] = { // Brunei const PrepopulatedEngine* const engines_BN[] = { @@ -131,7 +131,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -130,7 +130,7 @@ const PrepopulatedEngine* const engines_BN[] = { +@@ -141,7 +141,7 @@ const PrepopulatedEngine* const engines_BN[] = { // Bolivia const PrepopulatedEngine* const engines_BO[] = { @@ -140,7 +140,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -138,7 +138,7 @@ const PrepopulatedEngine* const engines_BO[] = { +@@ -150,7 +150,7 @@ const PrepopulatedEngine* const engines_BO[] = { // Brazil const PrepopulatedEngine* const engines_BR[] = { @@ -149,7 +149,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_br, &duckduckgo, &duckduckgo_light, -@@ -146,7 +146,7 @@ const PrepopulatedEngine* const engines_BR[] = { +@@ -159,7 +159,7 @@ const PrepopulatedEngine* const engines_BR[] = { // Belarus const PrepopulatedEngine* const engines_BY[] = { @@ -158,7 +158,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yandex_by, &mail_ru, &bing, -@@ -154,7 +154,7 @@ const PrepopulatedEngine* const engines_BY[] = { +@@ -168,7 +168,7 @@ const PrepopulatedEngine* const engines_BY[] = { // Belize const PrepopulatedEngine* const engines_BZ[] = { @@ -166,23 +166,26 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &duckduckgo, -@@ -163,12 +163,12 @@ const PrepopulatedEngine* const engines_BZ[] = { + &duckduckgo, &duckduckgo_light, +@@ -177,7 +177,7 @@ const PrepopulatedEngine* const engines_BZ[] = { // Canada const PrepopulatedEngine* const engines_CA[] = { -- &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light, -+ &googleen, &google, &qwant, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light, - }; +- &googleen, &google, ++ &googleen, &google, &qwant, + &bing, + &yahoo_ca, + &duckduckgo, &duckduckgo_light, +@@ -186,7 +186,7 @@ const PrepopulatedEngine* const engines_CA[] = { // Switzerland const PrepopulatedEngine* const engines_CH[] = { - &googleen, &google, + &googleen, &google, &qwant, &bing, - &duckduckgo, - &duckduckgo_light, -@@ -177,7 +177,7 @@ const PrepopulatedEngine* const engines_CH[] = { + &duckduckgo, &duckduckgo_light, + &yahoo_ch, +@@ -195,7 +195,7 @@ const PrepopulatedEngine* const engines_CH[] = { // Chile const PrepopulatedEngine* const engines_CL[] = { @@ -191,22 +194,24 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_cl, &duckduckgo, &duckduckgo_light, -@@ -185,12 +185,12 @@ const PrepopulatedEngine* const engines_CL[] = { - - // China +@@ -206,14 +206,14 @@ const PrepopulatedEngine* const engines_CL[] = { const PrepopulatedEngine* const engines_CN[] = { -- &baidu, &so_360, &googleen, &google, &sogou, &bing, -+ &baidu, &so_360, &googleen, &google, &qwant, &sogou, &bing, + &baidu, + &sogou, +- &googleen, &google, ++ &googleen, &google, &qwant, + &so_360, + &bing, }; // Colombia const PrepopulatedEngine* const engines_CO[] = { - &googleen, &google, + &googleen, &google, &qwant, - &yahoo_co, &bing, - &duckduckgo, &duckduckgo_light, -@@ -198,7 +198,7 @@ const PrepopulatedEngine* const engines_CO[] = { + &yahoo_co, + &ecosia, +@@ -222,7 +222,7 @@ const PrepopulatedEngine* const engines_CO[] = { // Costa Rica const PrepopulatedEngine* const engines_CR[] = { @@ -215,7 +220,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -206,7 +206,7 @@ const PrepopulatedEngine* const engines_CR[] = { +@@ -231,7 +231,7 @@ const PrepopulatedEngine* const engines_CR[] = { // Czech Republic const PrepopulatedEngine* const engines_CZ[] = { @@ -224,7 +229,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &seznam_cz, &bing, &yahoo, -@@ -214,7 +214,7 @@ const PrepopulatedEngine* const engines_CZ[] = { +@@ -240,7 +240,7 @@ const PrepopulatedEngine* const engines_CZ[] = { // Germany const PrepopulatedEngine* const engines_DE[] = { @@ -233,7 +238,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_de, &duckduckgo, &duckduckgo_light, -@@ -222,7 +222,7 @@ const PrepopulatedEngine* const engines_DE[] = { +@@ -249,7 +249,7 @@ const PrepopulatedEngine* const engines_DE[] = { // Denmark const PrepopulatedEngine* const engines_DK[] = { @@ -242,7 +247,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_dk, &duckduckgo, &duckduckgo_light, -@@ -230,7 +230,7 @@ const PrepopulatedEngine* const engines_DK[] = { +@@ -258,7 +258,7 @@ const PrepopulatedEngine* const engines_DK[] = { // Dominican Republic const PrepopulatedEngine* const engines_DO[] = { @@ -251,7 +256,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -238,7 +238,7 @@ const PrepopulatedEngine* const engines_DO[] = { +@@ -267,7 +267,7 @@ const PrepopulatedEngine* const engines_DO[] = { // Algeria const PrepopulatedEngine* const engines_DZ[] = { @@ -260,7 +265,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &yandex_ru, -@@ -246,7 +246,7 @@ const PrepopulatedEngine* const engines_DZ[] = { +@@ -276,7 +276,7 @@ const PrepopulatedEngine* const engines_DZ[] = { // Ecuador const PrepopulatedEngine* const engines_EC[] = { @@ -268,8 +273,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -254,7 +254,7 @@ const PrepopulatedEngine* const engines_EC[] = { + &ecosia, +@@ -285,7 +285,7 @@ const PrepopulatedEngine* const engines_EC[] = { // Estonia const PrepopulatedEngine* const engines_EE[] = { @@ -277,8 +282,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yandex_ru, - &neti, -@@ -262,7 +262,7 @@ const PrepopulatedEngine* const engines_EE[] = { + &yahoo, +@@ -294,7 +294,7 @@ const PrepopulatedEngine* const engines_EE[] = { // Egypt const PrepopulatedEngine* const engines_EG[] = { @@ -287,7 +292,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &yandex_ru, -@@ -270,7 +270,7 @@ const PrepopulatedEngine* const engines_EG[] = { +@@ -303,7 +303,7 @@ const PrepopulatedEngine* const engines_EG[] = { // Spain const PrepopulatedEngine* const engines_ES[] = { @@ -296,7 +301,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_es, &duckduckgo, &duckduckgo_light, -@@ -278,7 +278,7 @@ const PrepopulatedEngine* const engines_ES[] = { +@@ -312,7 +312,7 @@ const PrepopulatedEngine* const engines_ES[] = { // Finland const PrepopulatedEngine* const engines_FI[] = { @@ -305,16 +310,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_fi, &duckduckgo, &duckduckgo_light, -@@ -286,7 +286,7 @@ const PrepopulatedEngine* const engines_FI[] = { +@@ -321,7 +321,7 @@ const PrepopulatedEngine* const engines_FI[] = { // Faroe Islands const PrepopulatedEngine* const engines_FO[] = { - &googleen, &google, + &googleen, &google, &qwant, &bing, - &yahoo, + &yahoo_dk, &duckduckgo, &duckduckgo_light, -@@ -294,7 +294,7 @@ const PrepopulatedEngine* const engines_FO[] = { +@@ -330,7 +330,7 @@ const PrepopulatedEngine* const engines_FO[] = { // France const PrepopulatedEngine* const engines_FR[] = { @@ -323,7 +328,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_fr, &qwant, -@@ -302,7 +302,7 @@ const PrepopulatedEngine* const engines_FR[] = { +@@ -339,7 +339,7 @@ const PrepopulatedEngine* const engines_FR[] = { // United Kingdom const PrepopulatedEngine* const engines_GB[] = { @@ -332,7 +337,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_uk, &duckduckgo, &duckduckgo_light, -@@ -310,7 +310,7 @@ const PrepopulatedEngine* const engines_GB[] = { +@@ -348,7 +348,7 @@ const PrepopulatedEngine* const engines_GB[] = { // Greece const PrepopulatedEngine* const engines_GR[] = { @@ -341,7 +346,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -318,7 +318,7 @@ const PrepopulatedEngine* const engines_GR[] = { +@@ -357,7 +357,7 @@ const PrepopulatedEngine* const engines_GR[] = { // Guatemala const PrepopulatedEngine* const engines_GT[] = { @@ -349,8 +354,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -326,7 +326,7 @@ const PrepopulatedEngine* const engines_GT[] = { + &ecosia, +@@ -366,7 +366,7 @@ const PrepopulatedEngine* const engines_GT[] = { // Hong Kong const PrepopulatedEngine* const engines_HK[] = { @@ -358,8 +363,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &yahoo_hk, &bing, - &baidu, -@@ -334,7 +334,7 @@ const PrepopulatedEngine* const engines_HK[] = { + &yandex_com, +@@ -375,7 +375,7 @@ const PrepopulatedEngine* const engines_HK[] = { // Honduras const PrepopulatedEngine* const engines_HN[] = { @@ -367,8 +372,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -342,7 +342,7 @@ const PrepopulatedEngine* const engines_HN[] = { + &yandex_ru, +@@ -384,7 +384,7 @@ const PrepopulatedEngine* const engines_HN[] = { // Croatia const PrepopulatedEngine* const engines_HR[] = { @@ -377,16 +382,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -350,7 +350,7 @@ const PrepopulatedEngine* const engines_HR[] = { +@@ -393,7 +393,7 @@ const PrepopulatedEngine* const engines_HR[] = { // Hungary const PrepopulatedEngine* const engines_HU[] = { - &googleen, &google, + &googleen, &google, &qwant, - &yahoo, &bing, + &yahoo, &duckduckgo, &duckduckgo_light, -@@ -358,7 +358,7 @@ const PrepopulatedEngine* const engines_HU[] = { +@@ -402,7 +402,7 @@ const PrepopulatedEngine* const engines_HU[] = { // Indonesia const PrepopulatedEngine* const engines_ID[] = { @@ -395,7 +400,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo_id, &bing, &duckduckgo, &duckduckgo_light, -@@ -366,7 +366,7 @@ const PrepopulatedEngine* const engines_ID[] = { +@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_ID[] = { // Ireland const PrepopulatedEngine* const engines_IE[] = { @@ -404,7 +409,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -374,7 +374,7 @@ const PrepopulatedEngine* const engines_IE[] = { +@@ -420,7 +420,7 @@ const PrepopulatedEngine* const engines_IE[] = { // Israel const PrepopulatedEngine* const engines_IL[] = { @@ -413,7 +418,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &yandex_ru, -@@ -382,7 +382,7 @@ const PrepopulatedEngine* const engines_IL[] = { +@@ -429,7 +429,7 @@ const PrepopulatedEngine* const engines_IL[] = { // India const PrepopulatedEngine* const engines_IN[] = { @@ -422,7 +427,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo_in, &bing, &duckduckgo, &duckduckgo_light, -@@ -390,7 +390,7 @@ const PrepopulatedEngine* const engines_IN[] = { +@@ -438,7 +438,7 @@ const PrepopulatedEngine* const engines_IN[] = { // Iraq const PrepopulatedEngine* const engines_IQ[] = { @@ -431,7 +436,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &yandex_ru, -@@ -398,14 +398,14 @@ const PrepopulatedEngine* const engines_IQ[] = { +@@ -447,7 +447,7 @@ const PrepopulatedEngine* const engines_IQ[] = { // Iran const PrepopulatedEngine* const engines_IR[] = { @@ -439,16 +444,17 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - }; + &yandex_ru, +@@ -456,7 +456,7 @@ const PrepopulatedEngine* const engines_IR[] = { // Iceland const PrepopulatedEngine* const engines_IS[] = { - &googleen, &google, + &googleen, &google, &qwant, &bing, - &yahoo, &duckduckgo, &duckduckgo_light, -@@ -413,7 +413,7 @@ const PrepopulatedEngine* const engines_IS[] = { + &yahoo, +@@ -465,7 +465,7 @@ const PrepopulatedEngine* const engines_IS[] = { // Italy const PrepopulatedEngine* const engines_IT[] = { @@ -457,7 +463,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -421,7 +421,7 @@ const PrepopulatedEngine* const engines_IT[] = { +@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_IT[] = { // Jamaica const PrepopulatedEngine* const engines_JM[] = { @@ -466,16 +472,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -429,7 +429,7 @@ const PrepopulatedEngine* const engines_JM[] = { +@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_JM[] = { // Jordan const PrepopulatedEngine* const engines_JO[] = { - &googleen, &google, + &googleen, &google, &qwant, - &yahoo, &bing, - &yandex_ru, -@@ -437,7 +437,7 @@ const PrepopulatedEngine* const engines_JO[] = { + &yahoo, + &duckduckgo, &duckduckgo_light, +@@ -492,7 +492,7 @@ const PrepopulatedEngine* const engines_JO[] = { // Japan const PrepopulatedEngine* const engines_JP[] = { @@ -484,25 +490,25 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo_jp, &bing, &baidu, -@@ -445,7 +445,7 @@ const PrepopulatedEngine* const engines_JP[] = { +@@ -501,7 +501,7 @@ const PrepopulatedEngine* const engines_JP[] = { // Kenya const PrepopulatedEngine* const engines_KE[] = { - &googleen, &google, + &googleen, &google, &qwant, - &yahoo, &bing, + &yahoo, &duckduckgo, &duckduckgo_light, -@@ -453,7 +453,7 @@ const PrepopulatedEngine* const engines_KE[] = { +@@ -510,7 +510,7 @@ const PrepopulatedEngine* const engines_KE[] = { // South Korea const PrepopulatedEngine* const engines_KR[] = { - &googleen, &google, + &googleen, &google, &qwant, &naver, - &daum, &bing, -@@ -461,7 +461,7 @@ const PrepopulatedEngine* const engines_KR[] = { + &daum, +@@ -519,7 +519,7 @@ const PrepopulatedEngine* const engines_KR[] = { // Kuwait const PrepopulatedEngine* const engines_KW[] = { @@ -510,8 +516,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &ask, -@@ -469,7 +469,7 @@ const PrepopulatedEngine* const engines_KW[] = { + &duckduckgo, &duckduckgo_light, +@@ -528,7 +528,7 @@ const PrepopulatedEngine* const engines_KW[] = { // Kazakhstan const PrepopulatedEngine* const engines_KZ[] = { @@ -520,7 +526,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yandex_kz, &mail_ru, &bing, -@@ -477,7 +477,7 @@ const PrepopulatedEngine* const engines_KZ[] = { +@@ -537,7 +537,7 @@ const PrepopulatedEngine* const engines_KZ[] = { // Lebanon const PrepopulatedEngine* const engines_LB[] = { @@ -528,17 +534,17 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &duckduckgo, -@@ -486,7 +486,7 @@ const PrepopulatedEngine* const engines_LB[] = { + &duckduckgo, &duckduckgo_light, +@@ -546,7 +546,7 @@ const PrepopulatedEngine* const engines_LB[] = { // Liechtenstein const PrepopulatedEngine* const engines_LI[] = { - &googleen, &google, + &googleen, &google, &qwant, &bing, - &duckduckgo, - &duckduckgo_light, -@@ -495,7 +495,7 @@ const PrepopulatedEngine* const engines_LI[] = { + &duckduckgo, &duckduckgo_light, + &yahoo, +@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_LI[] = { // Lithuania const PrepopulatedEngine* const engines_LT[] = { @@ -547,7 +553,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &yandex_ru, -@@ -503,7 +503,7 @@ const PrepopulatedEngine* const engines_LT[] = { +@@ -564,7 +564,7 @@ const PrepopulatedEngine* const engines_LT[] = { // Luxembourg const PrepopulatedEngine* const engines_LU[] = { @@ -556,16 +562,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &duckduckgo, &duckduckgo_light, &yahoo, -@@ -511,7 +511,7 @@ const PrepopulatedEngine* const engines_LU[] = { +@@ -573,7 +573,7 @@ const PrepopulatedEngine* const engines_LU[] = { // Latvia const PrepopulatedEngine* const engines_LV[] = { - &googleen, &google, + &googleen, &google, &qwant, - &bing, &yandex_ru, + &bing, &yahoo, -@@ -519,7 +519,7 @@ const PrepopulatedEngine* const engines_LV[] = { +@@ -582,7 +582,7 @@ const PrepopulatedEngine* const engines_LV[] = { // Libya const PrepopulatedEngine* const engines_LY[] = { @@ -574,7 +580,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &yandex_com, -@@ -527,7 +527,7 @@ const PrepopulatedEngine* const engines_LY[] = { +@@ -591,7 +591,7 @@ const PrepopulatedEngine* const engines_LY[] = { // Morocco const PrepopulatedEngine* const engines_MA[] = { @@ -582,17 +588,17 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &yahoo, &bing, - &yandex_ru, -@@ -535,7 +535,7 @@ const PrepopulatedEngine* const engines_MA[] = { + &duckduckgo, &duckduckgo_light, +@@ -600,7 +600,7 @@ const PrepopulatedEngine* const engines_MA[] = { // Monaco const PrepopulatedEngine* const engines_MC[] = { - &googleen, &google, + &googleen, &google, &qwant, &bing, - &yahoo, &duckduckgo, &duckduckgo_light, -@@ -543,7 +543,7 @@ const PrepopulatedEngine* const engines_MC[] = { + &yahoo, +@@ -609,7 +609,7 @@ const PrepopulatedEngine* const engines_MC[] = { // Moldova const PrepopulatedEngine* const engines_MD[] = { @@ -601,25 +607,25 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yandex_ru, &mail_ru, &duckduckgo, &duckduckgo_light, -@@ -551,7 +551,7 @@ const PrepopulatedEngine* const engines_MD[] = { +@@ -618,7 +618,7 @@ const PrepopulatedEngine* const engines_MD[] = { // Montenegro const PrepopulatedEngine* const engines_ME[] = { - &googleen, &google, + &googleen, &google, &qwant, - &yahoo, &bing, + &yahoo, &yandex_ru, -@@ -559,7 +559,7 @@ const PrepopulatedEngine* const engines_ME[] = { +@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_ME[] = { // Macedonia const PrepopulatedEngine* const engines_MK[] = { - &googleen, &google, + &googleen, &google, &qwant, - &yahoo, &bing, + &yahoo, &duckduckgo, &duckduckgo_light, -@@ -567,7 +567,7 @@ const PrepopulatedEngine* const engines_MK[] = { +@@ -636,7 +636,7 @@ const PrepopulatedEngine* const engines_MK[] = { // Mexico const PrepopulatedEngine* const engines_MX[] = { @@ -627,17 +633,17 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo_mx, - &duckduckgo, &duckduckgo_light, -@@ -575,7 +575,7 @@ const PrepopulatedEngine* const engines_MX[] = { + &ecosia, +@@ -645,7 +645,7 @@ const PrepopulatedEngine* const engines_MX[] = { // Malaysia const PrepopulatedEngine* const engines_MY[] = { - &googleen, &google, + &googleen, &google, &qwant, - &yahoo_my, &bing, - &baidu, -@@ -583,7 +583,7 @@ const PrepopulatedEngine* const engines_MY[] = { + &yahoo_my, + &duckduckgo, &duckduckgo_light, +@@ -654,7 +654,7 @@ const PrepopulatedEngine* const engines_MY[] = { // Nicaragua const PrepopulatedEngine* const engines_NI[] = { @@ -646,7 +652,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -591,7 +591,7 @@ const PrepopulatedEngine* const engines_NI[] = { +@@ -664,7 +664,7 @@ const PrepopulatedEngine* const engines_NI[] = { // Netherlands const PrepopulatedEngine* const engines_NL[] = { @@ -655,7 +661,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_nl, &duckduckgo, &duckduckgo_light, -@@ -599,7 +599,7 @@ const PrepopulatedEngine* const engines_NL[] = { +@@ -673,7 +673,7 @@ const PrepopulatedEngine* const engines_NL[] = { // Norway const PrepopulatedEngine* const engines_NO[] = { @@ -663,8 +669,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &duckduckgo, -@@ -608,7 +608,7 @@ const PrepopulatedEngine* const engines_NO[] = { + &duckduckgo, &duckduckgo_light, +@@ -682,7 +682,7 @@ const PrepopulatedEngine* const engines_NO[] = { // New Zealand const PrepopulatedEngine* const engines_NZ[] = { @@ -673,7 +679,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &duckduckgo, &duckduckgo_light, &yahoo_nz, -@@ -616,7 +616,7 @@ const PrepopulatedEngine* const engines_NZ[] = { +@@ -691,7 +691,7 @@ const PrepopulatedEngine* const engines_NZ[] = { // Oman const PrepopulatedEngine* const engines_OM[] = { @@ -681,8 +687,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &ask, -@@ -624,7 +624,7 @@ const PrepopulatedEngine* const engines_OM[] = { + &duckduckgo, &duckduckgo_light, +@@ -700,7 +700,7 @@ const PrepopulatedEngine* const engines_OM[] = { // Panama const PrepopulatedEngine* const engines_PA[] = { @@ -691,16 +697,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -632,7 +632,7 @@ const PrepopulatedEngine* const engines_PA[] = { +@@ -709,7 +709,7 @@ const PrepopulatedEngine* const engines_PA[] = { // Peru const PrepopulatedEngine* const engines_PE[] = { - &googleen, &google, + &googleen, &google, &qwant, - &yahoo_pe, &bing, - &duckduckgo, &duckduckgo_light, -@@ -640,7 +640,7 @@ const PrepopulatedEngine* const engines_PE[] = { + &yahoo_pe, + &ecosia, +@@ -718,7 +718,7 @@ const PrepopulatedEngine* const engines_PE[] = { // Philippines const PrepopulatedEngine* const engines_PH[] = { @@ -708,8 +714,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &yahoo_ph, &bing, - &duckduckgo, &duckduckgo_light, -@@ -648,7 +648,7 @@ const PrepopulatedEngine* const engines_PH[] = { + &ecosia, +@@ -727,7 +727,7 @@ const PrepopulatedEngine* const engines_PH[] = { // Pakistan const PrepopulatedEngine* const engines_PK[] = { @@ -717,8 +723,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &yahoo, &bing, - &baidu, -@@ -656,7 +656,7 @@ const PrepopulatedEngine* const engines_PK[] = { + &duckduckgo, &duckduckgo_light, +@@ -736,7 +736,7 @@ const PrepopulatedEngine* const engines_PK[] = { // Poland const PrepopulatedEngine* const engines_PL[] = { @@ -727,7 +733,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -664,7 +664,7 @@ const PrepopulatedEngine* const engines_PL[] = { +@@ -745,7 +745,7 @@ const PrepopulatedEngine* const engines_PL[] = { // Puerto Rico const PrepopulatedEngine* const engines_PR[] = { @@ -736,7 +742,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -672,7 +672,7 @@ const PrepopulatedEngine* const engines_PR[] = { +@@ -754,7 +754,7 @@ const PrepopulatedEngine* const engines_PR[] = { // Portugal const PrepopulatedEngine* const engines_PT[] = { @@ -745,7 +751,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -680,7 +680,7 @@ const PrepopulatedEngine* const engines_PT[] = { +@@ -763,7 +763,7 @@ const PrepopulatedEngine* const engines_PT[] = { // Paraguay const PrepopulatedEngine* const engines_PY[] = { @@ -754,7 +760,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -688,7 +688,7 @@ const PrepopulatedEngine* const engines_PY[] = { +@@ -772,7 +772,7 @@ const PrepopulatedEngine* const engines_PY[] = { // Qatar const PrepopulatedEngine* const engines_QA[] = { @@ -762,8 +768,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &ask, -@@ -696,7 +696,7 @@ const PrepopulatedEngine* const engines_QA[] = { + &duckduckgo, &duckduckgo_light, +@@ -781,7 +781,7 @@ const PrepopulatedEngine* const engines_QA[] = { // Romania const PrepopulatedEngine* const engines_RO[] = { @@ -772,7 +778,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -704,7 +704,7 @@ const PrepopulatedEngine* const engines_RO[] = { +@@ -790,7 +790,7 @@ const PrepopulatedEngine* const engines_RO[] = { // Serbia const PrepopulatedEngine* const engines_RS[] = { @@ -781,15 +787,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &duckduckgo, &duckduckgo_light, -@@ -713,14 +713,14 @@ const PrepopulatedEngine* const engines_RS[] = { +@@ -799,7 +799,7 @@ const PrepopulatedEngine* const engines_RS[] = { + // Russia const PrepopulatedEngine* const engines_RU[] = { - &yandex_ru, - &googleen, &google, + &googleen, &google, &qwant, + &yandex_ru, &mail_ru, &bing, - }; +@@ -808,7 +808,7 @@ const PrepopulatedEngine* const engines_RU[] = { // Rwanda const PrepopulatedEngine* const engines_RW[] = { @@ -797,8 +804,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &yandex_ru, -@@ -728,7 +728,7 @@ const PrepopulatedEngine* const engines_RW[] = { + &duckduckgo, &duckduckgo_light, +@@ -817,7 +817,7 @@ const PrepopulatedEngine* const engines_RW[] = { // Saudi Arabia const PrepopulatedEngine* const engines_SA[] = { @@ -807,7 +814,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &yandex_com, -@@ -736,7 +736,7 @@ const PrepopulatedEngine* const engines_SA[] = { +@@ -826,7 +826,7 @@ const PrepopulatedEngine* const engines_SA[] = { // Sweden const PrepopulatedEngine* const engines_SE[] = { @@ -816,25 +823,25 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo_se, &duckduckgo, &duckduckgo_light, -@@ -744,7 +744,7 @@ const PrepopulatedEngine* const engines_SE[] = { +@@ -835,7 +835,7 @@ const PrepopulatedEngine* const engines_SE[] = { // Singapore const PrepopulatedEngine* const engines_SG[] = { - &googleen, &google, + &googleen, &google, &qwant, &bing, - &yahoo_sg, &yandex_com, -@@ -752,7 +752,7 @@ const PrepopulatedEngine* const engines_SG[] = { + &yahoo_sg, +@@ -844,7 +844,7 @@ const PrepopulatedEngine* const engines_SG[] = { // Slovenia const PrepopulatedEngine* const engines_SI[] = { - &googleen, &google, + &googleen, &google, &qwant, &bing, - &yahoo, &duckduckgo, &duckduckgo_light, -@@ -760,7 +760,7 @@ const PrepopulatedEngine* const engines_SI[] = { + &yahoo, +@@ -853,7 +853,7 @@ const PrepopulatedEngine* const engines_SI[] = { // Slovakia const PrepopulatedEngine* const engines_SK[] = { @@ -843,7 +850,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -768,7 +768,7 @@ const PrepopulatedEngine* const engines_SK[] = { +@@ -862,7 +862,7 @@ const PrepopulatedEngine* const engines_SK[] = { // El Salvador const PrepopulatedEngine* const engines_SV[] = { @@ -852,7 +859,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -776,7 +776,7 @@ const PrepopulatedEngine* const engines_SV[] = { +@@ -871,7 +871,7 @@ const PrepopulatedEngine* const engines_SV[] = { // Syria const PrepopulatedEngine* const engines_SY[] = { @@ -861,7 +868,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &yandex_ru, -@@ -784,7 +784,7 @@ const PrepopulatedEngine* const engines_SY[] = { +@@ -880,7 +880,7 @@ const PrepopulatedEngine* const engines_SY[] = { // Thailand const PrepopulatedEngine* const engines_TH[] = { @@ -869,8 +876,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &yahoo_th, &bing, - &ask, -@@ -792,7 +792,7 @@ const PrepopulatedEngine* const engines_TH[] = { + &duckduckgo, &duckduckgo_light, +@@ -889,7 +889,7 @@ const PrepopulatedEngine* const engines_TH[] = { // Tunisia const PrepopulatedEngine* const engines_TN[] = { @@ -879,7 +886,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo, &bing, &yandex_ru, -@@ -800,7 +800,7 @@ const PrepopulatedEngine* const engines_TN[] = { +@@ -898,7 +898,7 @@ const PrepopulatedEngine* const engines_TN[] = { // Turkey const PrepopulatedEngine* const engines_TR[] = { @@ -888,7 +895,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yandex_tr, &yahoo_tr, &bing, -@@ -808,7 +808,7 @@ const PrepopulatedEngine* const engines_TR[] = { +@@ -907,7 +907,7 @@ const PrepopulatedEngine* const engines_TR[] = { // Trinidad and Tobago const PrepopulatedEngine* const engines_TT[] = { @@ -897,7 +904,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -816,7 +816,7 @@ const PrepopulatedEngine* const engines_TT[] = { +@@ -916,7 +916,7 @@ const PrepopulatedEngine* const engines_TT[] = { // Taiwan const PrepopulatedEngine* const engines_TW[] = { @@ -906,7 +913,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo_tw, &bing, &baidu, -@@ -824,7 +824,7 @@ const PrepopulatedEngine* const engines_TW[] = { +@@ -925,7 +925,7 @@ const PrepopulatedEngine* const engines_TW[] = { // Tanzania const PrepopulatedEngine* const engines_TZ[] = { @@ -914,17 +921,17 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &yandex_ru, -@@ -832,7 +832,7 @@ const PrepopulatedEngine* const engines_TZ[] = { + &duckduckgo, &duckduckgo_light, +@@ -934,7 +934,7 @@ const PrepopulatedEngine* const engines_TZ[] = { // Ukraine const PrepopulatedEngine* const engines_UA[] = { - &googleen, &google, + &googleen, &google, &qwant, &yandex_ua, - &mail_ru, &bing, -@@ -840,7 +840,7 @@ const PrepopulatedEngine* const engines_UA[] = { + &mail_ru, +@@ -943,7 +943,7 @@ const PrepopulatedEngine* const engines_UA[] = { // United States const PrepopulatedEngine* const engines_US[] = { @@ -933,7 +940,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -848,7 +848,7 @@ const PrepopulatedEngine* const engines_US[] = { +@@ -952,7 +952,7 @@ const PrepopulatedEngine* const engines_US[] = { // Uruguay const PrepopulatedEngine* const engines_UY[] = { @@ -942,7 +949,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -856,7 +856,7 @@ const PrepopulatedEngine* const engines_UY[] = { +@@ -961,7 +961,7 @@ const PrepopulatedEngine* const engines_UY[] = { // Venezuela const PrepopulatedEngine* const engines_VE[] = { @@ -951,16 +958,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &yahoo_ve, &bing, &duckduckgo, &duckduckgo_light, -@@ -864,7 +864,7 @@ const PrepopulatedEngine* const engines_VE[] = { +@@ -970,7 +970,7 @@ const PrepopulatedEngine* const engines_VE[] = { // Vietnam const PrepopulatedEngine* const engines_VN[] = { - &googleen, &google, + &googleen, &google, &qwant, &coccoc, + &yahoo, &bing, - &yahoo_vn, -@@ -872,7 +872,7 @@ const PrepopulatedEngine* const engines_VN[] = { +@@ -979,7 +979,7 @@ const PrepopulatedEngine* const engines_VN[] = { // Yemen const PrepopulatedEngine* const engines_YE[] = { @@ -968,8 +975,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &baidu, -@@ -880,7 +880,7 @@ const PrepopulatedEngine* const engines_YE[] = { + &yandex_ru, +@@ -988,7 +988,7 @@ const PrepopulatedEngine* const engines_YE[] = { // South Africa const PrepopulatedEngine* const engines_ZA[] = { @@ -978,7 +985,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon &bing, &yahoo, &duckduckgo, &duckduckgo_light, -@@ -888,7 +888,7 @@ const PrepopulatedEngine* const engines_ZA[] = { +@@ -997,7 +997,7 @@ const PrepopulatedEngine* const engines_ZA[] = { // Zimbabwe const PrepopulatedEngine* const engines_ZW[] = { @@ -986,7 +993,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon + &googleen, &google, &qwant, &bing, &yahoo, - &baidu, + &ask, -- 2.17.1 diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index edef9b33..a6789df0 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -36,9 +36,9 @@ Offer auto-complete for the proxy page URL. diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml --- a/chrome/android/java/res/values/values.xml +++ b/chrome/android/java/res/values/values.xml -@@ -77,6 +77,9 @@ - 1 - 2 +@@ -72,6 +72,9 @@ + + -1 + Proxy configuration + chrome://proxy @@ -63,7 +63,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -257,6 +257,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -231,6 +231,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { std::vector builtins_to_provide; builtins_to_provide.push_back( base::ASCIIToUTF16(chrome::kChromeUIFlagsURL)); @@ -75,7 +75,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd -@@ -148,6 +148,12 @@ +@@ -117,6 +117,12 @@ @@ -509,7 +509,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 -@@ -260,6 +260,8 @@ jumbo_static_library("ui") { +@@ -267,6 +267,8 @@ jumbo_static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -521,7 +521,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -55,6 +55,7 @@ +@@ -58,6 +58,7 @@ #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" #include "chrome/browser/ui/webui/policy_ui.h" #include "chrome/browser/ui/webui/predictors/predictors_ui.h" @@ -529,7 +529,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h" #include "chrome/browser/ui/webui/settings/settings_ui.h" #include "chrome/browser/ui/webui/settings_utils.h" -@@ -400,6 +401,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -409,6 +410,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -979,7 +979,7 @@ new file mode 100644 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -184,6 +184,8 @@ const char kChromeUINativePhysicalWebDiagnosticsURL[] = +@@ -189,6 +189,8 @@ const char kChromeUINativePhysicalWebDiagnosticsURL[] = const char kChromeUINativeScheme[] = "chrome-native"; const char kChromeUIOfflineInternalsHost[] = "offline-internals"; const char kChromeUIPhysicalWebDiagnosticsHost[] = "physical-web-diagnostics"; @@ -988,7 +988,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons const char kChromeUISnippetsInternalsHost[] = "snippets-internals"; const char kChromeUIWebApksHost[] = "webapks"; #endif -@@ -467,6 +469,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) { +@@ -472,6 +474,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) { kResetSubPage, kSmartLockSettingsSubPage, kSmbSharesSubPage, @@ -996,7 +996,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kStorageSubPage, kStylusSubPage, kSwitchAccessSubPage, -@@ -568,6 +571,7 @@ const char* const kChromeHostURLs[] = { +@@ -577,6 +580,7 @@ const char* const kChromeHostURLs[] = { #if !defined(OS_ANDROID) #if !defined(OS_CHROMEOS) kChromeUIAppLauncherPageHost, @@ -1007,7 +1007,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h --- a/chrome/common/webui_url_constants.h +++ b/chrome/common/webui_url_constants.h -@@ -105,6 +105,8 @@ extern const char kChromeUIMemoryInternalsHost[]; +@@ -106,6 +106,8 @@ extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUINTPTilesInternalsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index eab563b9..3273ad13 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -14,9 +14,8 @@ Make sure initial incognito status is correctly recognized. .../AppMenuPropertiesDelegateImpl.java | 6 ++ .../ChromeContextMenuPopulator.java | 9 ++- .../browser/tabmodel/ChromeTabCreator.java | 20 ++++- - .../ui/appmenu/AppMenuHandlerImpl.java | 1 + - .../strings/android_chrome_strings.grd | 8 ++ - 10 files changed, 130 insertions(+), 4 deletions(-) + .../strings/android_chrome_strings.grd | 7 ++ + 9 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni @@ -43,7 +42,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi + android:summary="@string/always_incognito_summary" + android:defaultValue="false" /> +@@ -1545,6 +1546,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -148,15 +147,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. 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 -@@ -50,6 +50,7 @@ import org.chromium.base.metrics.RecordHistogram; - import org.chromium.base.metrics.RecordUserAction; +@@ -49,6 +49,7 @@ import org.chromium.base.supplier.ObservableSupplierImpl; + import org.chromium.base.supplier.Supplier; import org.chromium.base.task.PostTask; import org.chromium.chrome.R; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout; -@@ -1609,8 +1610,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo +@@ -1570,8 +1571,9 @@ public class ChromeTabbedActivity extends ChromeActivity { Bundle savedInstanceState = getSavedInstanceState(); // We determine the model as soon as possible so every systems get initialized coherently. @@ -171,7 +170,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java -@@ -289,6 +289,12 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -293,6 +293,12 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate ChromeSwitches.ENABLE_VR_SHELL_DEV)); } @@ -187,17 +186,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -17,7 +17,9 @@ import androidx.annotation.IntDef; - import org.chromium.base.Supplier; +@@ -19,7 +19,9 @@ import androidx.annotation.VisibleForTesting; import org.chromium.base.library_loader.LibraryProcessType; import org.chromium.base.metrics.RecordHistogram; + import org.chromium.base.supplier.Supplier; +import org.chromium.base.ContextUtils; import org.chromium.chrome.R; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; - import org.chromium.chrome.browser.ChromeFeatureList; import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabPanel; import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; -@@ -308,7 +310,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { + import org.chromium.chrome.browser.contextmenu.ContextMenuParams.PerformanceClass; +@@ -329,7 +331,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { if (FirstRunStatus.getFirstRunFlowComplete() && mMode == ContextMenuMode.NORMAL && !isEmptyUrl(params.getUrl()) && UrlUtilities.isAcceptedScheme(params.getUrl())) { @@ -214,26 +213,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java -@@ -10,8 +10,10 @@ import android.text.TextUtils; +@@ -9,8 +9,10 @@ import android.text.TextUtils; + import androidx.annotation.Nullable; - import org.chromium.base.Supplier; +import org.chromium.base.ContextUtils; import org.chromium.base.SysUtils; import org.chromium.base.TraceEvent; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; + import org.chromium.base.supplier.Supplier; import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.IntentHandler; - import org.chromium.chrome.browser.ServiceTabLauncher; @@ -20,6 +22,7 @@ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabAssociatedApp; import org.chromium.chrome.browser.tab.TabBuilder; +import org.chromium.chrome.browser.tab.TabObserver; import org.chromium.chrome.browser.tab.TabDelegateFactory; + import org.chromium.chrome.browser.tab.TabLaunchType; import org.chromium.chrome.browser.tab.TabParentIntent; - import org.chromium.chrome.browser.tab.TabRedirectHandler; -@@ -41,6 +44,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { +@@ -43,6 +46,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { private final ChromeActivity mActivity; private final StartupTabPreloader mStartupTabPreloader; private final boolean mIncognito; @@ -241,7 +240,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome private WindowAndroid mNativeWindow; private TabModel mTabModel; -@@ -55,6 +59,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { +@@ -57,6 +61,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { mNativeWindow = nativeWindow; mTabDelegateFactorySupplier = tabDelegateFactory; mIncognito = incognito; @@ -252,7 +251,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome } @Override -@@ -190,6 +198,9 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { +@@ -195,6 +203,9 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { tab.getWebContents()); } @@ -262,7 +261,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mTabModel.addTab(tab, position, type); return tab; } finally { -@@ -221,6 +232,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { +@@ -226,6 +237,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { .setDelegateFactory(delegateFactory) .setInitiallyHidden(!openInForeground) .build(); @@ -273,7 +272,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mTabModel.addTab(tab, position, type); return true; } -@@ -263,7 +278,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { +@@ -268,7 +283,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { */ public Tab launchUrlFromExternalApp(String url, String referer, String headers, String appId, boolean forceNewTab, Intent intent, long intentTimestamp) { @@ -281,7 +280,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome boolean isLaunchedFromChrome = TextUtils.equals(appId, mActivity.getPackageName()); // If an external app sends an intent for a Weblite URL and the Data Reduction Proxy is -@@ -330,6 +344,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { +@@ -335,6 +349,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { .setTabState(state) .build(); assert state.isIncognito() == mIncognito; @@ -292,24 +291,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mTabModel.addTab(tab, index, TabLaunchType.FROM_RESTORE); return tab; } -diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java ---- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java -+++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java -@@ -212,6 +212,7 @@ class AppMenuHandlerImpl - if (mDelegate.shouldShowHeader(appRect.height())) { - headerResourceId = mDelegate.getHeaderResourceId(); - } -+ - mAppMenu.show(wrapper, anchorView, isByPermanentButton, rotation, appRect, pt.y, - footerResourceId, headerResourceId, mHighlightMenuId, mCircleHighlight, - showFromBottom, mDelegate.getCustomViewBinders()); 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 -@@ -699,6 +699,14 @@ CHAR-LIMIT guidelines: - Search and site suggestions disabled +@@ -698,6 +698,13 @@ Your Google account may have other forms of browsing history like searches and a + + Clears history and autocompletions in the address bar. - + + + Open links in incognito tabs always @@ -317,10 +305,9 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro + + Opens links in incognito tabs when you click on new tab or on a link + -+ - - - Themes + + Clears history and autocompletions in the address bar. Your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. + -- 2.17.1 diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index de8d56e2..d7616cd3 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -169,7 +169,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.Pair; -@@ -25,6 +29,11 @@ import org.chromium.components.bookmarks.BookmarkType; +@@ -26,6 +30,11 @@ import org.chromium.components.url_formatter.SchemeDisplay; import org.chromium.components.url_formatter.UrlFormatter; import org.chromium.content_public.browser.WebContents; @@ -181,7 +181,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import java.util.ArrayList; import java.util.List; -@@ -572,6 +581,24 @@ public class BookmarkBridge { +@@ -574,6 +583,24 @@ public class BookmarkBridge { mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType()); } @@ -206,7 +206,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. -@@ -952,6 +979,24 @@ public class BookmarkBridge { +@@ -954,6 +981,24 @@ public class BookmarkBridge { depthList.add(depth); } @@ -231,7 +231,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++) { -@@ -1020,6 +1065,8 @@ public class BookmarkBridge { +@@ -1022,6 +1067,8 @@ public class BookmarkBridge { int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type); void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type, boolean getFolders, boolean getBookmarks, List bookmarksList); @@ -243,7 +243,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java -@@ -69,6 +69,16 @@ interface BookmarkDelegate { +@@ -67,6 +67,16 @@ interface BookmarkDelegate { */ void openSearchUI(); @@ -263,23 +263,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java -@@ -24,6 +24,7 @@ import org.chromium.chrome.R; - import org.chromium.chrome.browser.ChromeFeatureList; +@@ -23,6 +23,7 @@ import org.chromium.base.metrics.RecordUserAction; + import org.chromium.chrome.R; import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem; import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver; +import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.favicon.LargeIconBridge; - import org.chromium.chrome.browser.gesturenav.HistoryNavigationDelegate; - import org.chromium.chrome.browser.native_page.BasicNativePage; -@@ -36,6 +37,7 @@ import org.chromium.chrome.browser.widget.selection.SelectableListLayout; - import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.SearchDelegate; - import org.chromium.chrome.browser.widget.selection.SelectionDelegate; - import org.chromium.components.bookmarks.BookmarkId; + import org.chromium.chrome.browser.flags.ChromeFeatureList; + import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader; +@@ -35,6 +36,7 @@ import org.chromium.components.bookmarks.BookmarkId; + import org.chromium.components.browser_ui.widget.dragreorder.DragStateDelegate; + import org.chromium.components.browser_ui.widget.selectable_list.SelectableListLayout; + import org.chromium.components.browser_ui.widget.selectable_list.SelectableListToolbar.SearchDelegate; +import org.chromium.ui.base.ActivityWindowAndroid; + import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate; import java.util.Stack; - -@@ -60,6 +62,7 @@ public class BookmarkManager +@@ -54,6 +56,7 @@ public class BookmarkManager private Activity mActivity; private ViewGroup mMainView; private BookmarkModel mBookmarkModel; @@ -287,8 +287,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private BookmarkUndoController mUndoController; private final ObserverList mUIObservers = new ObserverList<>(); private BasicNativePage mNativePage; -@@ -375,6 +378,13 @@ public class BookmarkManager - mSelectableListLayout.setHistoryNavigationDelegate(delegate); +@@ -357,6 +360,13 @@ public class BookmarkManager + mNativePage = nativePage; } + /** @@ -301,7 +301,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * @return Current URL representing the UI state of bookmark manager. If no state has been shown * yet in this session, on phone return last used state stored in preference; on tablet -@@ -548,6 +558,16 @@ public class BookmarkManager +@@ -529,6 +539,16 @@ public class BookmarkManager } } @@ -321,14 +321,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java -@@ -36,6 +36,7 @@ public class BookmarkPage extends BasicNativePage { - mManager = new BookmarkManager( - activity, false, ((SnackbarManageable) activity).getSnackbarManager()); +@@ -29,6 +29,7 @@ public class BookmarkPage extends BasicNativePage { + + mManager = new BookmarkManager(activity, false, activity.getSnackbarManager()); mManager.setBasicNativePage(this); -+ mManager.setWindow(activity.getWindowAndroid()); - mManager.setHistoryNavigationDelegate(host.createHistoryNavigationDelegate()); - mTitle = activity.getString(R.string.bookmarks); - } ++ mManager.setWindow(activity.getWindowAndroid()); + mTitle = host.getContext().getResources().getString(R.string.bookmarks); + + initWithView(mManager.getView()); diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -340,19 +340,19 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn + "importer/profile_writer.h", + "bookmarks/bookmark_html_writer.cc", + "bookmarks/bookmark_html_writer.h", - "bookmarks/bookmark_model_factory.cc", - "bookmarks/bookmark_model_factory.h", - "bookmarks/chrome_bookmark_client.cc", -@@ -3063,8 +3067,6 @@ jumbo_static_library("browser") { - "bluetooth/bluetooth_chooser_context.h", - "bluetooth/bluetooth_chooser_context_factory.cc", - "bluetooth/bluetooth_chooser_context_factory.h", + "bluetooth/bluetooth_chooser_context.cc", + "bluetooth/bluetooth_chooser_context.h", + "bluetooth/bluetooth_chooser_context_factory.cc", +@@ -3071,8 +3075,6 @@ jumbo_static_library("browser") { + "badging/badge_manager_factory.h", + "banners/app_banner_manager_desktop.cc", + "banners/app_banner_manager_desktop.h", - "bookmarks/bookmark_html_writer.cc", - "bookmarks/bookmark_html_writer.h", "certificate_viewer.h", "chrome_browser_field_trials_desktop.cc", "chrome_browser_field_trials_desktop.h", -@@ -3174,8 +3176,6 @@ jumbo_static_library("browser") { +@@ -3186,8 +3188,6 @@ jumbo_static_library("browser") { "importer/importer_uma.h", "importer/in_process_importer_bridge.cc", "importer/in_process_importer_bridge.h", @@ -462,7 +462,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef&) { -@@ -542,6 +612,153 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -543,6 +613,153 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -741,9 +741,9 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/ 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 -@@ -257,6 +257,12 @@ CHAR-LIMIT guidelines: - - Search +@@ -256,6 +256,12 @@ CHAR-LIMIT guidelines: + + Sites + + Import @@ -751,13 +751,13 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro + + Export + - - Show Info + + Virtual Reality diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -426,6 +426,9 @@ static_library("common") { +@@ -420,6 +420,9 @@ static_library("common") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -779,7 +779,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn "importer/bookmarks_file_importer.cc", "importer/bookmarks_file_importer.h", "importer/edge_database_reader_win.cc", -@@ -167,6 +165,11 @@ static_library("utility") { +@@ -169,6 +167,11 @@ static_library("utility") { } } diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index ce654a83..cbd4bfda 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -3,12 +3,12 @@ Date: Wed, 29 Aug 2018 11:03:44 +0200 Subject: Add custom tab intents privacy option --- - chrome/android/java/res/values/values.xml | 3 +++ - chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++ - .../chrome/browser/LaunchIntentDispatcher.java | 3 +++ - .../browser/settings/privacy/PrivacyPreferences.java | 11 +++++++++++ - .../ui/android/strings/android_chrome_strings.grd | 7 +++++++ - 5 files changed, 29 insertions(+) + chrome/android/java/res/values/values.xml | 3 +++ + chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++ + .../chrome/browser/LaunchIntentDispatcher.java | 3 +++ + .../browser/settings/privacy/PrivacySettings.java | 13 ++++++++++++- + .../ui/android/strings/android_chrome_strings.grd | 7 +++++++ + 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml --- a/chrome/android/java/res/values/values.xml @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml @@ -29,6 +29,11 @@ - android:fragment="org.chromium.chrome.browser.settings.privacy.DoNotTrackPreference" + android:fragment="org.chromium.chrome.browser.settings.privacy.DoNotTrackSettings" android:key="do_not_track" android:title="@string/do_not_track_title" /> + Show original diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index bb72084d..e1e43d8e 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -13,7 +13,7 @@ Corrected Exit functionality diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml -@@ -85,6 +85,8 @@ +@@ -87,6 +87,8 @@ android:title="@string/menu_help" /> @@ -25,7 +25,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/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java -@@ -2177,6 +2177,8 @@ public abstract class ChromeActivity +@@ -2044,6 +2044,8 @@ public abstract class ChromeActivity AddToHomescreenCoordinator.showForAppMenu( this, getWindowAndroid(), getModalDialogManager(), currentTab.getWebContents()); RecordUserAction.record("MobileMenuAddToHomescreen"); @@ -53,8 +53,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife 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 -@@ -2903,6 +2903,9 @@ To change this setting, <resetlink>reset sync

+@@ -2818,6 +2818,9 @@ To change this setting, <resetlink>reset sync

Settings + 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 bdadf9c1..9024425b 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 @@ -19,7 +19,7 @@ with limited CPU/memory resources and it is disabled by default. 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 -@@ -706,6 +706,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { +@@ -736,6 +736,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { net::kEffectiveConnectionType4G}, }; @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc // Ensure that all effective connection types returned by Network Quality // Estimator (NQE) are also exposed via flags. static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 == -@@ -2663,6 +2668,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2695,6 +2700,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kPassiveDocumentEventListenersName, flag_descriptions::kPassiveDocumentEventListenersDescription, kOsAll, FEATURE_VALUE_TYPE(features::kPassiveDocumentEventListeners)}, @@ -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 -@@ -1279,6 +1279,10 @@ extern const char kMediaInspectorLoggingDescription[] = +@@ -1181,6 +1181,10 @@ const char kMediaInspectorLoggingDescription[] = "project; #enable-devtools-experiments must also be enabled as well on " "desktop platforms"; @@ -58,7 +58,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 -@@ -775,6 +775,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[]; +@@ -703,6 +703,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[]; extern const char kMediaInspectorLoggingName[]; extern const char kMediaInspectorLoggingDescription[]; @@ -110,7 +110,7 @@ diff --git a/components/network_session_configurator/common/network_switch_list. diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/components/url_formatter/spoof_checks/top_domains/BUILD.gn --- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn +++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn -@@ -78,6 +78,7 @@ executable("make_top_domain_list_variables") { +@@ -73,6 +73,7 @@ executable("make_top_domain_list_variables") { "//base", "//base:i18n", "//third_party/icu", 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 6be02379..901a65e0 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 @@ -13,21 +13,21 @@ Disable it by default on Android as it is everywhere else 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 -@@ -1688,6 +1688,10 @@ const FeatureEntry kFeatureEntries[] = { - {"enable-webassembly-threads", flag_descriptions::kEnableWasmThreadsName, - flag_descriptions::kEnableWasmThreadsDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kWebAssemblyThreads)}, +@@ -1697,6 +1697,10 @@ const FeatureEntry kFeatureEntries[] = { + #if defined(USE_AURA) + {"overlay-scrollbars", flag_descriptions::kOverlayScrollbarsName, + flag_descriptions::kOverlayScrollbarsDescription, + {"resume-background-video", + flag_descriptions::kResumeBackgroundVideoName, + flag_descriptions::kResumeBackgroundVideoDescription, kOsAll, + FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)}, - {"shared-array-buffer", flag_descriptions::kEnableSharedArrayBufferName, - flag_descriptions::kEnableSharedArrayBufferDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kSharedArrayBuffer)}, + // Uses the system preference on Mac (a different implementation). + // On Android, this is always enabled. + kOsAura, FEATURE_VALUE_TYPE(features::kOverlayScrollbar)}, 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 -@@ -894,6 +894,11 @@ const char kMemlogStackModeNative[] = "Native"; +@@ -800,6 +800,11 @@ const char kMemlogStackModeNative[] = "Native"; const char kMemlogStackModeNativeWithThreadNames[] = "Native with thread names"; const char kMemlogStackModePseudo[] = "Trace events"; @@ -42,9 +42,9 @@ 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 -@@ -525,6 +525,9 @@ extern const char kEnablePortalsDescription[]; - extern const char kEnablePictureInPictureName[]; - extern const char kEnablePictureInPictureDescription[]; +@@ -462,6 +462,9 @@ extern const char kEnablePortalsDescription[]; + extern const char kEnablePortalsCrossOriginName[]; + extern const char kEnablePortalsCrossOriginDescription[]; +extern const char kResumeBackgroundVideoName[]; +extern const char kResumeBackgroundVideoDescription[]; @@ -55,7 +55,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 -@@ -231,11 +231,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", +@@ -229,11 +229,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", // when in background. const base::Feature kResumeBackgroundVideo { "resume-background-video", diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index a90290ac..3346d582 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -16,7 +16,7 @@ Subject: Add flag to disable IPv6 probes 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 -@@ -3303,6 +3303,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3327,6 +3327,11 @@ const FeatureEntry kFeatureEntries[] = { kMarkHttpAsFeatureVariations, "HTTPReallyBadFinal")}, @@ -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 -@@ -2520,6 +2520,10 @@ const char kContextualSearchSimplifiedServerDescription[] = +@@ -2370,6 +2370,10 @@ const char kContextualSearchRankerQueryDescription[] = const char kContextualSearchSecondTapName[] = "Contextual Search second tap triggering"; @@ -45,20 +45,20 @@ 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 -@@ -528,6 +528,9 @@ extern const char kEnableNewDownloadBackendDescription[]; - extern const char kEnablePortalsName[]; - extern const char kEnablePortalsDescription[]; +@@ -528,6 +528,9 @@ extern const char kEnableWasmThreadsName[]; + extern const char kEnableWasmThreadsDescription[]; + extern const char kEnableWasmTieringName[]; +extern const char kIPv6ProbingName[]; +extern const char kIPv6ProbingDescription[]; + - extern const char kEnablePictureInPictureName[]; - extern const char kEnablePictureInPictureDescription[]; + extern const char kEnableWasmTieringDescription[]; + extern const char kEvDetailsInPageInfoName[]; diff --git a/components/subresource_filter/tools/BUILD.gn b/components/subresource_filter/tools/BUILD.gn --- a/components/subresource_filter/tools/BUILD.gn +++ b/components/subresource_filter/tools/BUILD.gn -@@ -52,6 +52,8 @@ if (!is_ios) { +@@ -50,6 +50,8 @@ if (!is_ios) { deps = [ ":tools_lib", "//base", @@ -67,7 +67,7 @@ diff --git a/components/subresource_filter/tools/BUILD.gn b/components/subresour ] } -@@ -65,6 +67,8 @@ if (!is_ios) { +@@ -61,6 +63,8 @@ if (!is_ios) { ":tools_lib", "../core/common", "//base", @@ -76,7 +76,7 @@ diff --git a/components/subresource_filter/tools/BUILD.gn b/components/subresour ] } -@@ -76,6 +80,8 @@ if (!is_ios) { +@@ -70,6 +74,8 @@ if (!is_ios) { "ruleset_converter:support", "//base", "//third_party/protobuf:protobuf_lite", @@ -88,7 +88,7 @@ diff --git a/components/subresource_filter/tools/BUILD.gn b/components/subresour diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/components/url_formatter/spoof_checks/top_domains/BUILD.gn --- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn +++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn -@@ -78,7 +78,8 @@ executable("make_top_domain_list_variables") { +@@ -73,7 +73,8 @@ executable("make_top_domain_list_variables") { "//base", "//base:i18n", "//third_party/icu", @@ -109,7 +109,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc #include "url/url_canon_ip.h" #if BUILDFLAG(ENABLE_MDNS) -@@ -3564,8 +3565,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -3593,8 +3594,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { bool cached = true; if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { @@ -128,7 +128,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -51,6 +51,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -52,6 +52,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kThrottleDelayable{"ThrottleDelayable", base::FEATURE_ENABLED_BY_DEFAULT}; diff --git a/build/patches/Add-flag-to-disable-WebGL.patch b/build/patches/Add-flag-to-disable-WebGL.patch index 417a643d..0a488d99 100644 --- a/build/patches/Add-flag-to-disable-WebGL.patch +++ b/build/patches/Add-flag-to-disable-WebGL.patch @@ -11,7 +11,7 @@ Subject: Add flag to disable WebGL 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 -@@ -1476,6 +1476,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1544,6 +1544,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAccelerated2dCanvasName, flag_descriptions::kAccelerated2dCanvasDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)}, @@ -24,9 +24,9 @@ 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 -@@ -446,6 +446,10 @@ const char kDisableAudioForDesktopShareDescription[] = - "With this flag on, desktop share picker window will not let the user " - "choose whether to share audio."; +@@ -414,6 +414,10 @@ const char kDevtoolsExperimentsDescription[] = + "Enables Developer Tools experiments. Use Settings panel in Developer " + "Tools to toggle individual experiments."; +const char kDisableWebGLName[] = "Disable all versions of WebGL"; + @@ -38,9 +38,9 @@ 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 -@@ -287,6 +287,9 @@ extern const char kDevtoolsExperimentsDescription[]; - extern const char kDisableAudioForDesktopShareName[]; - extern const char kDisableAudioForDesktopShareDescription[]; +@@ -264,6 +264,9 @@ extern const char kDeviceDiscoveryNotificationsDescription[]; + extern const char kDevtoolsExperimentsName[]; + extern const char kDevtoolsExperimentsDescription[]; +extern const char kDisableWebGLName[]; +extern const char kDisableWebGLDescription[]; diff --git a/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch b/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch index d2b840c4..cb0b5424 100644 --- a/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch +++ b/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch @@ -20,7 +20,7 @@ legacy acceleration events. 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 -@@ -1714,6 +1714,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1771,6 +1771,12 @@ const FeatureEntry kFeatureEntries[] = { {"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName, flag_descriptions::kGpuRasterizationDescription, kOsAll, MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)}, @@ -36,7 +36,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 -@@ -667,6 +667,14 @@ const char kWinrtSensorsImplementationDescription[] = +@@ -594,6 +594,14 @@ const char kWinrtSensorsImplementationDescription[] = "Enables usage of the Windows.Devices.Sensors WinRT APIs on Windows for " "sensors"; @@ -54,7 +54,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 -@@ -409,6 +409,12 @@ extern const char kWinrtGeolocationImplementationDescription[]; +@@ -362,6 +362,12 @@ extern const char kWinrtGeolocationImplementationDescription[]; extern const char kWinrtSensorsImplementationName[]; extern const char kWinrtSensorsImplementationDescription[]; @@ -83,7 +83,7 @@ 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 -@@ -690,6 +690,16 @@ const base::Feature kExperimentalProductivityFeatures{ +@@ -756,6 +756,16 @@ const base::Feature kExperimentalProductivityFeatures{ // TODO(rouslan): Remove this. const base::Feature kWebPayments{"WebPayments", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -103,9 +103,9 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h -@@ -157,6 +157,8 @@ CONTENT_EXPORT extern const base::Feature kBrowserUseDisplayThreadPriority; - CONTENT_EXPORT extern const base::Feature kFeaturePolicyForClientHints; - CONTENT_EXPORT extern const base::Feature kVideoPlaybackQuality; +@@ -165,6 +165,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrHitTest; + CONTENT_EXPORT extern const base::Feature kWebXrIncubations; + CONTENT_EXPORT extern const base::Feature kWebXrPermissionsApi; +CONTENT_EXPORT extern const base::Feature kDeviceMotion, kDeviceOrientation; + @@ -115,7 +115,7 @@ diff --git a/content/public/common/content_features.h b/content/public/common/co diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -96,6 +96,8 @@ class WebRuntimeFeatures { +@@ -100,6 +100,8 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableCSSHexAlphaColor(bool); BLINK_PLATFORM_EXPORT static void EnableSameSiteByDefaultCookies(bool); BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool); @@ -127,7 +127,7 @@ diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_pa diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_party/blink/renderer/modules/modules_initializer.cc --- a/third_party/blink/renderer/modules/modules_initializer.cc +++ b/third_party/blink/renderer/modules/modules_initializer.cc -@@ -235,9 +235,12 @@ void ModulesInitializer::InitInspectorAgentSession( +@@ -245,9 +245,12 @@ void ModulesInitializer::InitInspectorAgentSession( void ModulesInitializer::OnClearWindowObjectInMainWorld( Document& document, const Settings& settings) const { @@ -146,7 +146,7 @@ diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_p diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -173,6 +173,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { +@@ -183,6 +183,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable); } @@ -164,7 +164,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 -@@ -1162,6 +1162,14 @@ +@@ -1171,6 +1171,14 @@ name: "OffscreenCanvasCommit", status: "experimental", }, diff --git a/build/patches/Add-missing-android_provider.patch b/build/patches/Add-missing-android_provider.patch new file mode 100644 index 00000000..6e9b8f5e --- /dev/null +++ b/build/patches/Add-missing-android_provider.patch @@ -0,0 +1,266 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Wed, 11 Mar 2020 19:56:49 +0100 +Subject: Add missing android_provider + +--- + third_party/android_provider/BUILD.gn | 14 ++ + .../android/provider/MediaStoreUtils.java | 228 ++++++++++++++++++ + 2 files changed, 242 insertions(+) + create mode 100644 third_party/android_provider/BUILD.gn + create mode 100644 third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java + +diff --git a/third_party/android_provider/BUILD.gn b/third_party/android_provider/BUILD.gn +new file mode 100644 +--- /dev/null ++++ b/third_party/android_provider/BUILD.gn +@@ -0,0 +1,14 @@ ++# Copyright 2020 The Chromium Authors. All rights reserved. ++# Use of this source code is governed by a BSD-style license that can be ++# found in the LICENSE file. ++ ++import("//build/config/android/rules.gni") ++ ++assert(is_android) ++ ++android_library("android_provider_java") { ++ sources = [ ++ "java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java", ++ ] ++ deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ] ++} +diff --git a/third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java b/third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java +new file mode 100644 +--- /dev/null ++++ b/third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java +@@ -0,0 +1,228 @@ ++/* ++ * Copyright (C) 2019 The Android Open Source Project ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License ++ */ ++ ++package org.chromium.third_party.android.provider; ++ ++import android.content.ContentValues; ++import android.content.Context; ++import android.net.Uri; ++import android.os.ParcelFileDescriptor; ++import android.provider.MediaStore; ++import android.provider.MediaStore.DownloadColumns; ++import android.provider.MediaStore.MediaColumns; ++import android.util.Log; ++ ++import androidx.annotation.NonNull; ++import androidx.annotation.Nullable; ++ ++import java.io.FileNotFoundException; ++import java.io.OutputStream; ++import java.util.Objects; ++ ++/** ++ * Utility class to contribute download to the public download collection using ++ * MediaStore API from Q. ++ */ ++public class MediaStoreUtils { ++ private static final String TAG = "MediaStoreUtils"; ++ ++ /** ++ * Creates a new pending media item using the given parameters. Pending items ++ * are expected to have a short lifetime, and owners should either ++ * {@link PendingSession#publish()} or {@link PendingSession#abandon()} a ++ * pending item within a few hours after first creating it. ++ * ++ * @param context Application context. ++ * @param params Parameters used to configure the item. ++ * @return token which can be passed to {@link #openPending(Context, Uri)} ++ * to work with this pending item. ++ */ ++ public static @NonNull Uri createPending( ++ @NonNull Context context, @NonNull PendingParams params) { ++ return context.getContentResolver().insert(params.mInsertUri, params.mInsertValues); ++ } ++ ++ /** ++ * Opens a pending media item to make progress on it. You can open a pending ++ * item multiple times before finally calling either ++ * {@link PendingSession#publish()} or {@link PendingSession#abandon()}. ++ * ++ * @param uri token which was previously returned from ++ * {@link #createPending(Context, PendingParams)}. ++ * @return pending session that was opened. ++ */ ++ public static @NonNull PendingSession openPending(@NonNull Context context, @NonNull Uri uri) { ++ return new PendingSession(context, uri); ++ } ++ ++ /** ++ * Parameters that describe a pending media item. ++ */ ++ public static class PendingParams { ++ final Uri mInsertUri; ++ final ContentValues mInsertValues; ++ ++ /** ++ * Creates parameters that describe a pending media item. ++ * ++ * @param insertUri the {@code content://} Uri where this pending item ++ * should be inserted when finally published. For example, to ++ * publish an image, use ++ * {@link MediaStore.Images.Media#getContentUri(String)}. ++ * @param displayName Display name of the item. ++ * @param mimeType MIME type of the item. ++ */ ++ public PendingParams( ++ @NonNull Uri insertUri, @NonNull String displayName, @NonNull String mimeType) { ++ mInsertUri = Objects.requireNonNull(insertUri); ++ final long now = System.currentTimeMillis() / 1000; ++ mInsertValues = new ContentValues(); ++ mInsertValues.put(MediaColumns.DISPLAY_NAME, Objects.requireNonNull(displayName)); ++ mInsertValues.put(MediaColumns.MIME_TYPE, Objects.requireNonNull(mimeType)); ++ mInsertValues.put(MediaColumns.DATE_ADDED, now); ++ mInsertValues.put(MediaColumns.DATE_MODIFIED, now); ++ try { ++ setPendingContentValues(this.mInsertValues, true); ++ } catch (Exception e) { ++ Log.e(TAG, "Unable to set pending content values.", e); ++ } ++ } ++ ++ /** ++ * Optionally sets the Uri from where the file has been downloaded. This is used ++ * for files being added to {@link Downloads} table. ++ * ++ * @see DownloadColumns#DOWNLOAD_URI ++ */ ++ public void setDownloadUri(@Nullable Uri downloadUri) { ++ if (downloadUri == null) { ++ mInsertValues.remove(DownloadColumns.DOWNLOAD_URI); ++ } else { ++ mInsertValues.put(DownloadColumns.DOWNLOAD_URI, downloadUri.toString()); ++ } ++ } ++ ++ /** ++ * Optionally set the Uri indicating HTTP referer of the file. This is used for ++ * files being added to {@link Downloads} table. ++ * ++ * @see DownloadColumns#REFERER_URI ++ */ ++ public void setRefererUri(@Nullable Uri refererUri) { ++ if (refererUri == null) { ++ mInsertValues.remove(DownloadColumns.REFERER_URI); ++ } else { ++ mInsertValues.put(DownloadColumns.REFERER_URI, refererUri.toString()); ++ } ++ } ++ ++ /** ++ * Sets the expiration time of the download. ++ * ++ * @time Epoch time in seconds. ++ */ ++ public void setExpirationTime(long time) { ++ mInsertValues.put("date_expires", time); ++ } ++ } ++ ++ /** ++ * Session actively working on a pending media item. Pending items are ++ * expected to have a short lifetime, and owners should either ++ * {@link PendingSession#publish()} or {@link PendingSession#abandon()} a ++ * pending item within a few hours after first creating it. ++ */ ++ public static class PendingSession implements AutoCloseable { ++ private final Context mContext; ++ private final Uri mUri; ++ ++ /** ++ * Create a new pending session item to be published. ++ * @param context Contexxt of the application. ++ * @param uri Token which was previously returned from ++ * {@link #createPending(Context, PendingParams)}. ++ */ ++ PendingSession(Context context, Uri uri) { ++ mContext = Objects.requireNonNull(context); ++ mUri = Objects.requireNonNull(uri); ++ } ++ ++ /** ++ * Open the underlying file representing this media item. When a media ++ * item is successfully completed, you should ++ * {@link ParcelFileDescriptor#close()} and then {@link #publish()} it. ++ * ++ * @return ParcelFileDescriptor to be written into. ++ */ ++ public @NonNull ParcelFileDescriptor open() throws FileNotFoundException { ++ return mContext.getContentResolver().openFileDescriptor(mUri, "rw"); ++ } ++ ++ /** ++ * Open the underlying file representing this media item. When a media ++ * item is successfully completed, you should ++ * {@link OutputStream#close()} and then {@link #publish()} it. ++ * ++ * @return OutputStream to be written into. ++ */ ++ public @NonNull OutputStream openOutputStream() throws FileNotFoundException { ++ return mContext.getContentResolver().openOutputStream(mUri); ++ } ++ ++ /** ++ * When this media item is successfully completed, call this method to ++ * publish and make the final item visible to the user. ++ * ++ * @return the final {@code content://} Uri representing the newly ++ * published media. ++ */ ++ public @NonNull Uri publish() { ++ try { ++ final ContentValues values = new ContentValues(); ++ setPendingContentValues(values, false); ++ values.putNull("date_expires"); ++ mContext.getContentResolver().update(mUri, values, null, null); ++ } catch (Exception e) { ++ Log.e(TAG, "Unable to publish pending session.", e); ++ } ++ return mUri; ++ } ++ ++ /** ++ * When this media item has failed to be completed, call this method to ++ * destroy the pending item record and any data related to it. ++ */ ++ public void abandon() { ++ mContext.getContentResolver().delete(mUri, null, null); ++ } ++ ++ @Override ++ public void close() { ++ // No resources to close, but at least we can inform people that no ++ // progress is being actively made. ++ } ++ } ++ ++ /** ++ * Helper method to set the ContentValues to pending or non-pending. ++ * @param values ContentValues to be set. ++ * @param isPending Whether the item is pending. ++ */ ++ private static void setPendingContentValues(ContentValues values, boolean isPending) ++ throws Exception { ++ values.put(MediaColumns.IS_PENDING, isPending ? 1 : 0); ++ } ++} +-- +2.17.1 + diff --git a/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch b/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch index 1ded57a2..c3a2182a 100644 --- a/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch +++ b/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch @@ -8,6 +8,7 @@ Subject: Add option to configure the ad blocker filters URL chrome/android/java/res/values/values.xml | 2 + .../java/res/xml/adblock_preferences.xml | 25 +++++ .../android/java/res/xml/main_preferences.xml | 5 + + .../browser/flags/FeatureUtilities.java | 10 ++ .../browser/settings/AdBlockEditor.java | 92 +++++++++++++++++++ .../browser/settings/AdBlockPreferences.java | 56 +++++++++++ chrome/app/generated_resources.grd | 10 ++ @@ -19,7 +20,7 @@ Subject: Add option to configure the ad blocker filters URL chrome/common/pref_names.h | 1 + .../adblock_updater_service.cc | 6 +- .../adblock_updater_service.h | 3 +- - 16 files changed, 293 insertions(+), 5 deletions(-) + 17 files changed, 303 insertions(+), 5 deletions(-) create mode 100644 chrome/android/java/res/layout/adblock_editor.xml create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java @@ -28,7 +29,7 @@ Subject: Add option to configure the ad blocker filters URL diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1277,6 +1277,8 @@ chrome_java_sources = [ +@@ -1296,6 +1296,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/photo_picker/DecodeVideoTask.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHost.java", @@ -66,7 +67,7 @@ new file mode 100644 + android:orientation="vertical" + android:focusableInTouchMode="true" > + -+ -+ ++ + + + @@ -104,7 +105,7 @@ new file mode 100644 + + + -+ ++ + + diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml @@ -152,9 +153,9 @@ new file mode 100644 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml --- a/chrome/android/java/res/xml/main_preferences.xml +++ b/chrome/android/java/res/xml/main_preferences.xml -@@ -60,6 +60,11 @@ +@@ -55,6 +55,11 @@ android:key="privacy" - android:order="13" + android:order="12" android:title="@string/prefs_privacy"/> + @@ -345,7 +372,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/android/feature_utilities.cc --- a/chrome/browser/android/feature_utilities.cc +++ b/chrome/browser/android/feature_utilities.cc -@@ -56,6 +56,14 @@ std::string GetReachedCodeProfilerTrialGroup() { +@@ -32,6 +32,14 @@ std::string GetReachedCodeProfilerTrialGroup() { } // namespace android } // namespace chrome @@ -357,13 +384,13 @@ diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/androi + g_browser_process->local_state()->SetString(prefs::kAdBlockFiltersURL, base::android::ConvertJavaStringToUTF8(env, url)); +} + - static void JNI_FeatureUtilities_SetCustomTabVisible( - JNIEnv* env, - jboolean visible) { + static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled( + JNIEnv* env) { + return content::IsOutOfProcessNetworkService() && diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -1030,7 +1030,8 @@ BrowserProcessImpl::adblock_updater() { +@@ -1035,7 +1035,8 @@ BrowserProcessImpl::adblock_updater() { adblock_updater_ = std::make_unique( g_browser_process->system_network_context_manager()->GetSharedURLLoaderFactory(), std::move(scheduler), @@ -376,7 +403,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -409,6 +409,8 @@ SystemNetworkContextManager::SystemNetworkContextManager( +@@ -358,6 +358,8 @@ SystemNetworkContextManager::SystemNetworkContextManager( ssl_config_service_manager_( SSLConfigServiceManager::CreateDefaultManager(local_state_)), proxy_config_monitor_(local_state_) { @@ -385,9 +412,9 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows #if !defined(OS_ANDROID) // QuicAllowed was not part of Android policy. const base::Value* value = -@@ -512,6 +514,7 @@ SystemNetworkContextManager::~SystemNetworkContextManager() { - } +@@ -462,6 +464,7 @@ SystemNetworkContextManager::~SystemNetworkContextManager() { + // static void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { + registry->RegisterStringPref(prefs::kAdBlockFiltersURL, std::string()); // Register the DnsClient and DoH preferences. The feature list has not been @@ -396,7 +423,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows 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 -@@ -893,6 +893,20 @@ Your Google account may have other forms of browsing history like searches and a +@@ -804,6 +804,20 @@ Your Google account may have other forms of browsing history like searches and a Captions @@ -420,7 +447,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro 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 -@@ -1974,6 +1974,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; +@@ -2002,6 +2002,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; // capture devices without prompt. const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls"; 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 7775ebad..48492716 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 @@ -6,7 +6,7 @@ Subject: Add option to not persist tabs across sessions chrome/android/java/res/values/values.xml | 3 +++ chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++ .../chrome/browser/ChromeTabbedActivity.java | 4 +++- - .../browser/settings/privacy/PrivacyPreferences.java | 12 ++++++++++++ + .../browser/settings/privacy/PrivacySettings.java | 12 ++++++++++++ .../ui/android/strings/android_chrome_strings.grd | 6 ++++++ 5 files changed, 29 insertions(+), 1 deletion(-) @@ -41,7 +41,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 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 -@@ -1144,8 +1144,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo +@@ -1104,8 +1104,10 @@ public class ChromeTabbedActivity extends ChromeActivity { boolean hadCipherData = CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState()); @@ -53,9 +53,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct if (noRestoreState) { // Clear the state files because they are inconsistent and useless from now on. mTabModelSelectorImpl.clearState(); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java @@ -4,6 +4,7 @@ package org.chromium.chrome.browser.settings.privacy; @@ -71,8 +71,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac +import org.chromium.base.ContextUtils; import org.chromium.base.BuildInfo; import org.chromium.chrome.R; - import org.chromium.chrome.browser.ChromeFeatureList; -@@ -36,6 +38,7 @@ public class PrivacyPreferences + import org.chromium.chrome.browser.flags.ChromeFeatureList; +@@ -36,6 +38,7 @@ public class PrivacySettings private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions"; private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_NETWORK_PREDICTIONS = "preload_pages"; @@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac private static final String PREF_DO_NOT_TRACK = "do_not_track"; private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; -@@ -84,6 +87,10 @@ public class PrivacyPreferences +@@ -84,6 +87,10 @@ public class PrivacySettings sharedPreferencesEditor.apply(); } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) { PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue); @@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac } return true; -@@ -128,6 +135,11 @@ public class PrivacyPreferences +@@ -128,6 +135,11 @@ public class PrivacySettings ? R.string.text_on : R.string.text_off); } @@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac 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 -@@ -3733,6 +3733,12 @@ The site does NOT gain access to the camera. The camera images are only visible +@@ -3618,6 +3618,12 @@ Only you can see what your camera is looking at. The site can't see your camera' 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 6bd68252..b72b83c2 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 @@ -4,15 +4,15 @@ Subject: Add option to use home page as NTP Use about:blank as default homepage --- - .../java/res/xml/homepage_preferences.xml | 5 ++++ - .../HomepageManager.java | 24 +++++++++++++++++-- - .../browser/settings/HomepagePreferences.java | 10 ++++++++ - .../browser/tabmodel/TabCreatorManager.java | 11 +++++++-- + .../java/res/xml/homepage_preferences.xml | 5 +++++ + .../HomepageManager.java | 22 +++++++++++++++++-- + .../settings/homepage/HomepageSettings.java | 11 ++++++++++ + .../browser/tabmodel/TabCreatorManager.java | 11 ++++++++-- .../strings/android_chrome_strings.grd | 3 +++ chrome/browser/ui/browser_ui_prefs.cc | 2 ++ chrome/common/pref_names.cc | 4 ++++ chrome/common/pref_names.h | 1 + - 8 files changed, 56 insertions(+), 4 deletions(-) + 8 files changed, 55 insertions(+), 4 deletions(-) diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/android/java/res/xml/homepage_preferences.xml --- a/chrome/android/java/res/xml/homepage_preferences.xml @@ -32,15 +32,15 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java -@@ -31,6 +31,7 @@ public class HomepageManager { - } - - private static final String PREF_HOMEPAGE_ENABLED = "homepage"; +@@ -28,6 +28,7 @@ import java.lang.annotation.RetentionPolicy; + * This class serves as a single homepage logic gateway. + */ + public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStateListener { + public static final String PREF_NTP_IS_HOMEPAGE = "newtabpage_is_homepage"; - private static final String PREF_HOMEPAGE_CUSTOM_URI = "homepage_custom_uri"; - private static final String PREF_HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled"; - -@@ -90,7 +91,8 @@ public class HomepageManager { + /** + * Possible states for HomeButton. Used for Histogram + * Settings.ShowHomeButtonPreferenceStateManaged. Currently {@link +@@ -123,7 +124,8 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat */ public static boolean shouldCloseAppWithZeroTabs() { return HomepageManager.isHomepageEnabled() @@ -50,17 +50,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz } /** -@@ -111,7 +113,7 @@ public class HomepageManager { +@@ -141,7 +143,7 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat * if the homepage button is force enabled via flag. */ - public static String getDefaultHomepageUri() { + private static String getDefaultHomepageUri() { - return UrlConstants.NTP_NON_NATIVE_URL; + return UrlConstants.CHROME_BLANK_URL; } /** -@@ -124,6 +126,14 @@ public class HomepageManager { - return mSharedPreferences.getBoolean(PREF_HOMEPAGE_ENABLED, true); +@@ -170,6 +172,14 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat + return mSharedPreferencesManager.readBoolean(ChromePreferenceKeys.HOMEPAGE_ENABLED, true); } + /** @@ -68,13 +68,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz + * + */ + public boolean getPrefNTPIsHomepageEnabled() { -+ return mSharedPreferences.getBoolean(PREF_NTP_IS_HOMEPAGE, false); ++ return mSharedPreferencesManager.readBoolean(PREF_NTP_IS_HOMEPAGE, false); + } + /** * Sets the user preference for whether the homepage is enabled. */ -@@ -137,6 +147,16 @@ public class HomepageManager { +@@ -181,6 +191,14 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat notifyHomepageUpdated(); } @@ -82,27 +82,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz + * Sets the user preference for whether the new tab page is the homepage or not. + */ + public void setPrefNTPIsHomepageEnabled(boolean enabled) { -+ SharedPreferences.Editor sharedPreferencesEditor = mSharedPreferences.edit(); -+ sharedPreferencesEditor.putBoolean(PREF_NTP_IS_HOMEPAGE, enabled); -+ sharedPreferencesEditor.apply(); ++ mSharedPreferencesManager.writeBoolean(PREF_NTP_IS_HOMEPAGE, enabled); + notifyHomepageUpdated(); + } + /** * @return User specified homepage custom URI string. */ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java -@@ -21,6 +21,7 @@ public class HomepagePreferences extends PreferenceFragmentCompat { +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java +@@ -27,6 +27,8 @@ public class HomepageSettings extends PreferenceFragmentCompat { @VisibleForTesting - public static final String PREF_HOMEPAGE_SWITCH = "homepage_switch"; - private static final String PREF_HOMEPAGE_EDIT = "homepage_edit"; -+ private static final String PREF_NTP_HOMEPAGE_SWITCH = "ntp_is_homepage_switch"; + public static final String PREF_HOMEPAGE_EDIT = "homepage_edit"; - private HomepageManager mHomepageManager; - private Preference mHomepageEdit; -@@ -46,6 +47,15 @@ public class HomepagePreferences extends PreferenceFragmentCompat { ++ private static final String PREF_NTP_HOMEPAGE_SWITCH = "ntp_is_homepage_switch"; ++ + /** + * Delegate used to mark that the homepage is being managed. + * Created for {@link org.chromium.chrome.browser.settings.HomepagePreferences} +@@ -63,6 +65,15 @@ public class HomepageSettings extends PreferenceFragmentCompat { }); } @@ -121,7 +120,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Homepa diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java -@@ -12,6 +12,7 @@ import org.chromium.chrome.browser.tab.TabState; +@@ -13,6 +13,7 @@ import org.chromium.chrome.browser.tab.TabState; import org.chromium.chrome.browser.util.UrlConstants; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.WebContents; @@ -129,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCre /** * An interface to return a {@link TabCreator} either for regular or incognito tabs. -@@ -85,12 +86,18 @@ public interface TabCreatorManager { +@@ -86,12 +87,18 @@ public interface TabCreatorManager { } /** @@ -153,16 +152,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCre 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 -@@ -698,6 +698,9 @@ CHAR-LIMIT guidelines: - - Search and site suggestions disabled +@@ -732,6 +732,9 @@ Your Google account may have other forms of browsing history like searches and a + + Last hour + + Use for new tabs + - - - + + Last 24 hours + diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc @@ -192,7 +191,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 -@@ -323,6 +323,7 @@ extern const char kSettingsShowOSBanner[]; +@@ -326,6 +326,7 @@ extern const char kSettingsShowOSBanner[]; extern const char kDeviceLoginScreenWebUsbAllowDevicesForUrls[]; #endif // defined(OS_CHROMEOS) extern const char kShowHomeButton[]; diff --git a/build/patches/Add-site-settings-option-for-session-only-cookies.patch b/build/patches/Add-site-settings-option-for-session-only-cookies.patch index b11ce3a7..ed449883 100644 --- a/build/patches/Add-site-settings-option-for-session-only-cookies.patch +++ b/build/patches/Add-site-settings-option-for-session-only-cookies.patch @@ -5,7 +5,7 @@ Subject: Add site settings option for session-only cookies --- chrome/android/java/res/values/values.xml | 3 ++ .../java/res/xml/website_preferences.xml | 7 +++++ - .../website/SingleCategoryPreferences.java | 21 ++++++++++++- + .../website/SingleCategorySettings.java | 21 ++++++++++++- .../preferences/pref_service_bridge.cc | 31 +++++++++++++++++++ .../preferences/PrefServiceBridge.java | 10 ++++++ .../strings/android_chrome_strings.grd | 6 ++++ @@ -41,10 +41,10 @@ diff --git a/chrome/android/java/res/xml/website_preferences.xml b/chrome/androi Prevent third-party websites from saving and reading cookie data diff --git a/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch b/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch index aa86c304..04d808ea 100644 --- a/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch +++ b/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch @@ -13,10 +13,10 @@ Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL .../browser/settings/DoHPreferences.java | 54 +++++++++++ chrome/app/generated_resources.grd | 6 ++ chrome/browser/android/feature_utilities.cc | 23 +++++ - .../net/system_network_context_manager.cc | 46 +++------- + .../net/system_network_context_manager.cc | 41 ++------- .../strings/android_chrome_strings.grd | 11 +++ chrome/common/chrome_features.cc | 4 +- - 13 files changed, 322 insertions(+), 37 deletions(-) + 13 files changed, 320 insertions(+), 34 deletions(-) create mode 100644 chrome/android/java/res/layout/doh_editor.xml create mode 100644 chrome/android/java/res/xml/doh_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java @@ -26,14 +26,14 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni @@ -1335,6 +1335,8 @@ chrome_java_sources = [ - "java/src/org/chromium/chrome/browser/settings/ChromeSwitchPreference.java", - "java/src/org/chromium/chrome/browser/settings/ClearBrowsingDataCheckBoxPreference.java", - "java/src/org/chromium/chrome/browser/settings/ExpandablePreferenceGroup.java", + "java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java", + "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetAdapter.java", + "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java", + "java/src/org/chromium/chrome/browser/settings/DoHEditor.java", + "java/src/org/chromium/chrome/browser/settings/DoHPreferences.java", - "java/src/org/chromium/chrome/browser/settings/HomepageEditor.java", - "java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java", - "java/src/org/chromium/chrome/browser/settings/HyperlinkPreference.java", + "java/src/org/chromium/chrome/browser/send_tab_to_self/NotificationManager.java", + "java/src/org/chromium/chrome/browser/send_tab_to_self/NotificationSharedPrefManager.java", + "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfAndroidBridge.java", diff --git a/chrome/android/java/res/layout/doh_editor.xml b/chrome/android/java/res/layout/doh_editor.xml new file mode 100644 --- /dev/null @@ -63,7 +63,7 @@ new file mode 100644 + android:orientation="vertical" + android:focusableInTouchMode="true" > + -+ -+ ++ + + + @@ -101,13 +101,13 @@ new file mode 100644 + + + -+ ++ + + diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml --- a/chrome/android/java/res/values/values.xml +++ b/chrome/android/java/res/values/values.xml -@@ -91,6 +91,8 @@ +@@ -86,6 +86,8 @@ 400 200 @@ -164,9 +164,9 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java --- a/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java -@@ -95,6 +95,26 @@ public class FeatureUtilities { - FeatureUtilitiesJni.get().setCustomTabVisible(visible); - } +@@ -120,6 +120,26 @@ public class FeatureUtilities { + private static Boolean sEnabledTabThumbnailApsectRatioForTesting; + private static final String ALLOW_TO_REFETCH = "allow_to_refetch"; + /** + * Records whether custom URL for DoH is enabled with native-side feature utilities. @@ -189,12 +189,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUt + } + /** - * Records whether the activity is in multi-window mode with native-side feature utilities. - * @param isInMultiWindowMode Whether the activity is in Android N multi-window mode. -@@ -736,6 +756,10 @@ public class FeatureUtilities { - void setCustomTabVisible(boolean visible); - void setActivityType(@ActivityType int type); - void setIsInMultiWindowMode(boolean isInMultiWindowMode); + * Checks if a cached feature flag is enabled. + * +@@ -792,6 +812,10 @@ public class FeatureUtilities { + + @NativeMethods + interface Natives { + void setDoHEnabled(boolean enabled); + boolean getDoHEnabled(); + void setDoHTemplates(String templates); @@ -361,7 +361,7 @@ new file mode 100644 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -6699,6 +6699,12 @@ the Bookmarks menu."> +@@ -6848,6 +6848,12 @@ the Bookmarks menu."> Home page @@ -384,10 +384,10 @@ diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/androi +#include "chrome/browser/browser_process.h" +#include "components/prefs/pref_service.h" +#include "chrome/common/pref_names.h" - #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h" - #include "chrome/browser/profiles/profile_manager.h" - #include "components/ntp_snippets/content_suggestions_service.h" -@@ -87,3 +90,23 @@ static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled( + #include "content/public/common/content_features.h" + #include "content/public/common/network_service_util.h" + +@@ -45,3 +48,23 @@ static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled( return content::IsOutOfProcessNetworkService() && base::FeatureList::IsEnabled(features::kWarmUpNetworkProcess); } @@ -414,29 +414,10 @@ diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/androi diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -139,9 +139,14 @@ void GetStubResolverConfig( - - std::string doh_templates = - local_state->GetString(prefs::kDnsOverHttpsTemplates); -- std::string server_method; -- if (!doh_templates.empty() && -- *secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) { -+ if (doh_templates.empty()) { -+ *secure_dns_mode = net::DnsConfig::SecureDnsMode::OFF; -+ doh_mode = chrome_browser_net::kDnsOverHttpsModeOff; -+ } -+ -+ LOG(INFO) << "DoH templates: '" << doh_templates << "' with mode " << doh_mode; -+ if (*secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) { -+ std::string server_method; - for (const std::string& server_template : - SplitString(doh_templates, " ", base::TRIM_WHITESPACE, - base::SPLIT_WANT_NONEMPTY)) { -@@ -429,40 +434,11 @@ SystemNetworkContextManager::SystemNetworkContextManager( - // features before registering change callbacks for these preferences. +@@ -379,40 +379,12 @@ SystemNetworkContextManager::SystemNetworkContextManager( local_state_->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, base::Value(ShouldEnableAsyncDns())); -- std::string default_doh_mode = chrome_browser_net::kDnsOverHttpsModeOff; + std::string default_doh_mode = chrome_browser_net::kDnsOverHttpsModeOff; - std::string default_doh_templates = ""; - if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) { - if (features::kDnsOverHttpsFallbackParam.Get()) { @@ -446,13 +427,12 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows - } - default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get(); - } -+ //NOTE: DoH fallback feature to insecure mode is not evaluated ++ std::string default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get(); local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsMode, -- base::Value(default_doh_mode)); -+ base::Value(chrome_browser_net::kDnsOverHttpsModeOff)); + base::Value(default_doh_mode)); local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsTemplates, -- base::Value(default_doh_templates)); -- + base::Value(default_doh_templates)); + - // If the user has explicitly enabled or disabled the DoH experiment in - // chrome://flags, store that choice in the user prefs so that it can be - // persisted after the experiment ends. Also make sure to remove the stored @@ -472,14 +452,32 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows - // The user has "Default" selected. - local_state_->ClearPref(prefs::kDnsOverHttpsMode); - } -+ base::Value(features::kDnsOverHttpsTemplatesParam.Get())); - +- PrefChangeRegistrar::NamedChangeCallback dns_pref_callback = base::BindRepeating(&OnStubResolverConfigChanged, + base::Unretained(local_state_)); +@@ -548,9 +520,14 @@ void SystemNetworkContextManager::GetStubResolverConfig( + + std::string doh_templates = + local_state->GetString(prefs::kDnsOverHttpsTemplates); +- std::string server_method; +- if (!doh_templates.empty() && +- *secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) { ++ if (doh_templates.empty()) { ++ *secure_dns_mode = net::DnsConfig::SecureDnsMode::OFF; ++ doh_mode = chrome_browser_net::kDnsOverHttpsModeOff; ++ } ++ ++ LOG(INFO) << "DoH templates: '" << doh_templates << "' with mode " << doh_mode; ++ if (*secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) { ++ std::string server_method; + for (const std::string& server_template : + SplitString(doh_templates, " ", base::TRIM_WHITESPACE, + base::SPLIT_WANT_NONEMPTY)) { 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 -@@ -674,6 +674,17 @@ CHAR-LIMIT guidelines: +@@ -578,6 +578,17 @@ CHAR-LIMIT guidelines: Chrome Passwords @@ -500,7 +498,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -303,12 +303,12 @@ const char kDisallowUnsafeHttpDownloadsParamName[] = "MimeTypeList"; +@@ -293,12 +293,12 @@ const char kDisallowUnsafeHttpDownloadsParamName[] = "MimeTypeList"; // Enable DNS over HTTPS (DoH). const base::Feature kDnsOverHttps{"DnsOverHttps", diff --git a/build/patches/Allow-building-without-feed-support.patch b/build/patches/Allow-building-without-feed-support.patch index 8912ddb4..dfe62c4e 100644 --- a/build/patches/Allow-building-without-feed-support.patch +++ b/build/patches/Allow-building-without-feed-support.patch @@ -5,7 +5,10 @@ Subject: Allow building without feed support --- .../start_surface/StartSurfaceCoordinator.java | 5 ----- .../start_surface/StartSurfaceMediator.java | 17 ----------------- - 2 files changed, 22 deletions(-) + chrome/android/feed/feed_java_sources.gni | 2 -- + .../browser/native_page/NativePageFactory.java | 7 ------- + components/feed/feed_feature_list.cc | 2 +- + 5 files changed, 1 insertion(+), 32 deletions(-) diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java --- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java @@ -56,6 +59,61 @@ diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromiu mPropertyModel.set(IS_EXPLORE_SURFACE_VISIBLE, isVisible); if (mOverviewModeState == OverviewModeState.SHOWN_TABSWITCHER_TWO_PANES) { +diff --git a/chrome/android/feed/feed_java_sources.gni b/chrome/android/feed/feed_java_sources.gni +--- a/chrome/android/feed/feed_java_sources.gni ++++ b/chrome/android/feed/feed_java_sources.gni +@@ -35,7 +35,6 @@ if (enable_feed_in_chrome) { + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLifecycleBridge.java", + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLoggingBridge.java", + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNetworkBridge.java", +- "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java", + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedOfflineBridge.java", + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedOfflineIndicator.java", + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedProcessScopeFactory.java", +@@ -736,7 +735,6 @@ if (enable_feed_in_chrome) { + feed_deps = [] + feed_java_sources = [ + "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedAppLifecycle.java", +- "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java", + "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedProcessScopeFactory.java", + "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedRefreshTask.java", + "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java", +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java +@@ -17,7 +17,6 @@ import org.chromium.chrome.browser.ChromeActivity; + import org.chromium.chrome.browser.bookmarks.BookmarkPage; + import org.chromium.chrome.browser.download.DownloadPage; + import org.chromium.chrome.browser.explore_sites.ExploreSitesPage; +-import org.chromium.chrome.browser.feed.FeedNewTabPage; + import org.chromium.chrome.browser.flags.ChromeFeatureList; + import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager; + import org.chromium.chrome.browser.history.HistoryPage; +@@ -57,12 +56,6 @@ public class NativePageFactory { + activity, new TabShim(tab, activity.getFullscreenManager())); + } + +- if (ChromeFeatureList.isEnabled(ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS)) { +- return new FeedNewTabPage(activity, +- new TabShim(tab, activity.getFullscreenManager()), tabModelSelector, +- activityTabProvider, activityLifecycleDispatcher, (TabImpl) tab); +- } +- + return new NewTabPage(activity, new TabShim(tab, activity.getFullscreenManager()), + tabModelSelector, activityTabProvider, activityLifecycleDispatcher, + (TabImpl) tab); +diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc +--- a/components/feed/feed_feature_list.cc ++++ b/components/feed/feed_feature_list.cc +@@ -7,7 +7,7 @@ + namespace feed { + + const base::Feature kInterestFeedContentSuggestions{ +- "InterestFeedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT}; ++ "InterestFeedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT}; + + const base::FeatureParam kDisableTriggerTypes{ + &kInterestFeedContentSuggestions, "disable_trigger_types", ""}; -- 2.17.1 diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index b4050130..7f29acb4 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -10,7 +10,7 @@ Subject: Allow playing audio in background diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc --- a/media/blink/webmediaplayer_impl.cc +++ b/media/blink/webmediaplayer_impl.cc -@@ -962,6 +962,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -977,6 +977,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -23,7 +23,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp void WebMediaPlayerImpl::EnabledAudioTracksChanged( const blink::WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3283,7 +3289,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3351,7 +3357,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. @@ -39,7 +39,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h --- a/media/blink/webmediaplayer_impl.h +++ b/media/blink/webmediaplayer_impl.h -@@ -145,6 +145,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl +@@ -149,6 +149,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl // True if the loaded media has a playable video/audio track. bool HasVideo() const override; bool HasAudio() const override; diff --git a/build/patches/Allow-website-sign-in-without-account-sign-in.patch b/build/patches/Allow-website-sign-in-without-account-sign-in.patch index 69b8a5bf..4efaf66d 100644 --- a/build/patches/Allow-website-sign-in-without-account-sign-in.patch +++ b/build/patches/Allow-website-sign-in-without-account-sign-in.patch @@ -10,7 +10,7 @@ Disable prefs::kSigninAllowedOnNextStartup by default. The setting can be found diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -120,7 +120,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs( +@@ -134,7 +134,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs( registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired, false); #endif diff --git a/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch b/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch index 973100fd..55862d68 100644 --- a/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch +++ b/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch @@ -11,7 +11,7 @@ Do not read experiment value for cronet async DNS configuration diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -247,7 +247,7 @@ void OnAuthPrefsChanged(PrefService* local_state, +@@ -196,7 +196,7 @@ void OnAuthPrefsChanged(PrefService* local_state, // Android this includes checking the Android version in the field trial. bool ShouldEnableAsyncDns() { bool feature_can_be_enabled = true; @@ -23,7 +23,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc --- a/components/cronet/url_request_context_config.cc +++ b/components/cronet/url_request_context_config.cc -@@ -564,7 +564,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( +@@ -540,7 +540,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( effective_experimental_options->Remove(it.key(), nullptr); continue; } diff --git a/build/patches/Always-show-site-settings-for-cookies-javascript-and-ads.patch b/build/patches/Always-show-site-settings-for-cookies-javascript-and-ads.patch index 8a151566..ae827d23 100644 --- a/build/patches/Always-show-site-settings-for-cookies-javascript-and-ads.patch +++ b/build/patches/Always-show-site-settings-for-cookies-javascript-and-ads.patch @@ -4,22 +4,22 @@ Subject: Always show site settings for cookies, javascript and ads Avoid displaying info about intrusive ads --- - .../website/SingleWebsitePreferences.java | 46 +++++++++---------- + .../website/SingleWebsiteSettings.java | 46 +++++++++---------- .../browser/settings/website/Website.java | 20 ++++++++ 2 files changed, 42 insertions(+), 24 deletions(-) -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsitePreferences.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsitePreferences.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsitePreferences.java -@@ -46,6 +46,7 @@ import java.util.Set; - */ - public class SingleWebsitePreferences extends PreferenceFragmentCompat - implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener { +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java +@@ -72,6 +72,7 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat + // Buttons: + public static final String PREF_RESET_SITE = "reset_site_button"; + + public static final String TAG = "SingleWebsitePreferences"; - // SingleWebsitePreferences expects either EXTRA_SITE (a Website) or - // EXTRA_SITE_ADDRESS (a WebsiteAddress) to be present (but not both). If - // EXTRA_SITE is present, the fragment will display the permissions in that -@@ -345,7 +346,24 @@ public class SingleWebsitePreferences extends PreferenceFragmentCompat + // Website permissions (if adding new, see hasPermissionsPreferences and resetSite below) + // All permissions from the permissions preference category must be listed here. + private static final String[] PERMISSION_PREFERENCE_KEYS = { +@@ -349,7 +350,24 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat } else if (i == ContentSettingException.Type.SOUND) { setUpSoundPreference(preference); } else { @@ -45,7 +45,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/websit } return; } -@@ -640,17 +658,8 @@ public class SingleWebsitePreferences extends PreferenceFragmentCompat +@@ -646,17 +664,8 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat } private void setUpAdsInformationalBanner() { @@ -65,7 +65,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/websit } private SiteSettingsCategory getWarningCategory() { -@@ -725,6 +734,7 @@ public class SingleWebsitePreferences extends PreferenceFragmentCompat +@@ -733,6 +742,7 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat // TODO(crbug.com/735110): Figure out if this is the correct thing to do - here we are // effectively treating non-ALLOW values as BLOCK. int index = (value == ContentSettingValues.ALLOW ? 0 : 1); @@ -73,7 +73,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/websit listPreference.setValueIndex(index); listPreference.setOnPreferenceChangeListener(this); listPreference.setSummary("%s"); -@@ -794,22 +804,10 @@ public class SingleWebsitePreferences extends PreferenceFragmentCompat +@@ -802,22 +812,10 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat setUpListPreference(preference, null); return; } @@ -99,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/websit diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java -@@ -166,6 +166,26 @@ public class Website implements Serializable { +@@ -197,6 +197,26 @@ public class Website implements Serializable { new ContentSettingException(ContentSettingsType.ADS, getAddress().getOrigin(), ContentSettingValues.BLOCK, ""); } diff --git a/build/patches/Always-use-new-tab-page-for-default-home-page.patch b/build/patches/Always-use-new-tab-page-for-default-home-page.patch index df1968b2..1fd48004 100644 --- a/build/patches/Always-use-new-tab-page-for-default-home-page.patch +++ b/build/patches/Always-use-new-tab-page-for-default-home-page.patch @@ -4,23 +4,22 @@ Subject: Always use new tab page for default home page Ignore any partner-provided home page. --- - .../chrome/browser/partnercustomizations/HomepageManager.java | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) + .../chrome/browser/partnercustomizations/HomepageManager.java | 3 --- + 1 file changed, 3 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java -@@ -111,9 +111,7 @@ public class HomepageManager { +@@ -141,9 +141,6 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat * if the homepage button is force enabled via flag. */ - public static String getDefaultHomepageUri() { -- return PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled() -- ? PartnerBrowserCustomizations.getHomePageUrl() -- : UrlConstants.NTP_NON_NATIVE_URL; -+ return UrlConstants.NTP_NON_NATIVE_URL; + private static String getDefaultHomepageUri() { +- if (PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()) { +- return PartnerBrowserCustomizations.getHomePageUrl(); +- } + return UrlConstants.NTP_NON_NATIVE_URL; } - /** -- 2.17.1 diff --git a/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch b/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch index aced69fb..b995dd39 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch @@ -12,7 +12,7 @@ Truncate base latency precision to two digits diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl --- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl +++ b/third_party/blink/renderer/modules/webaudio/analyser_node.idl -@@ -43,10 +43,10 @@ interface AnalyserNode : AudioNode { +@@ -40,10 +40,10 @@ // Copies the current frequency data into the passed array. // If the array has fewer elements than the frequencyBinCount, the excess elements will be dropped. @@ -30,7 +30,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/thi diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl -@@ -39,7 +39,7 @@ +@@ -37,7 +37,7 @@ // Channel access readonly attribute unsigned long numberOfChannels; @@ -43,7 +43,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 -@@ -373,7 +373,9 @@ double AudioContext::baseLatency() const { +@@ -399,7 +399,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 db494184..e2b9e9a2 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -1,5 +1,5 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Sun, 2 Feb 2020 08:37:33 +0100 +Date: Wed, 11 Mar 2020 19:33:28 +0100 Subject: Automated domain substitution --- @@ -15,7 +15,6 @@ Subject: Automated domain substitution .../aw_safe_browsing_whitelist_manager.h | 2 +- android_webview/common/url_constants.cc | 2 +- .../android_webview/AwFirebaseConfig.java | 2 +- - .../renderer/aw_content_renderer_client.cc | 2 +- android_webview/tools/record_netlog.py | 4 +- .../tools/remove_preinstalled_webview.py | 2 +- .../webview_shell/WebViewTracingActivity.java | 2 +- @@ -82,7 +81,6 @@ Subject: Automated domain substitution base/process/launch.h | 4 +- base/process/launch_posix.cc | 2 +- base/process/memory.h | 2 +- - base/process/memory_win.cc | 2 +- base/process/process.h | 2 +- base/process/process_metrics.h | 2 +- base/profiler/metadata_recorder.h | 2 +- @@ -100,8 +98,7 @@ Subject: Automated domain substitution base/third_party/nspr/prtime.cc | 8 +- base/third_party/nspr/prtime.h | 4 +- base/third_party/symbolize/symbolize.cc | 4 +- - base/threading/platform_thread_win.cc | 4 +- - base/threading/platform_thread_win.h | 2 +- + base/threading/platform_thread_win.cc | 6 +- base/time/time.h | 2 +- base/time/time_win.cc | 8 +- .../heap_profiler_allocation_context.h | 2 +- @@ -126,10 +123,9 @@ Subject: Automated domain substitution build/android/gradle/generate_gradle.py | 2 +- .../android/gyp/assert_static_initializers.py | 2 +- build/android/gyp/compile_resources.py | 2 +- - build/android/gyp/javac.py | 4 +- build/android/gyp/lint.py | 2 +- build/android/gyp/main_dex_list.py | 2 +- - build/android/gyp/merge_manifest.py | 4 +- + build/android/gyp/merge_manifest.py | 2 +- build/android/gyp/proguard.py | 4 +- .../android/incremental_install/installer.py | 2 +- .../ClassLoaderPatcher.java | 6 +- @@ -174,7 +170,7 @@ Subject: Automated domain substitution build/toolchain/win/rc/rc.py | 2 +- build/vs_toolchain.py | 2 +- build/whitespace_file.txt | 2 +- - buildtools/README.txt | 2 +- + buildtools/README.txt | 4 +- buildtools/clang_format/README.txt | 6 +- buildtools/ensure_gn_version.py | 2 +- cc/PRESUBMIT.py | 2 +- @@ -182,9 +178,10 @@ Subject: Automated domain substitution cc/input/browser_controls_offset_manager.cc | 2 +- cc/input/scroll_state.h | 2 +- cc/tiles/gpu_image_decode_cache.h | 2 +- - cc/trees/layer_tree_host_impl.cc | 4 +- + cc/trees/layer_tree_host_impl.cc | 2 +- chrome/BUILD.gn | 2 +- chrome/PRESUBMIT.py | 2 +- + chrome/android/BUILD.gn | 2 +- .../res/values/strings.xml | 4 +- ...rBrowserCustomizationsProviderExample.java | 4 +- .../AutofillAssistantClient.java | 2 +- @@ -194,7 +191,6 @@ Subject: Automated domain substitution .../chrome/browser/vr/VrShellDelegate.java | 2 +- .../browser/feed/FeedConfiguration.java | 4 +- ...ntent_suggestions_card_modern_reversed.xml | 2 +- - .../java/res/layout/preference_compat.xml | 2 +- .../java/res/values-sw600dp/values.xml | 2 +- chrome/android/java/res/values/dimens.xml | 4 +- chrome/android/java/res/values/strings.xml | 2 +- @@ -218,7 +214,6 @@ Subject: Automated domain substitution .../chrome/browser/help/HelpAndFeedback.java | 2 +- .../infobar/InfoBarContainerLayout.java | 2 +- .../chrome/browser/infobar/InfoBarLayout.java | 2 +- - .../browser/modaldialog/ModalDialogView.java | 2 +- .../RemoteViewsWithNightModeInflater.java | 2 +- .../notifications/NotificationConstants.java | 2 +- .../NotificationManagerProxy.java | 4 +- @@ -240,18 +235,15 @@ Subject: Automated domain substitution .../payments/AndroidPaymentAppFinder.java | 2 +- .../chrome/browser/payments/PaymentApp.java | 4 +- .../payments/PaymentManifestVerifier.java | 2 +- - .../browser/payments/PaymentRequestImpl.java | 6 +- + .../browser/payments/PaymentRequestImpl.java | 2 +- .../browser/payments/ui/DimmingDialog.java | 2 +- .../browser/payments/ui/PaymentRequestUI.java | 2 +- - .../snackbar/TemplatePreservingTextView.java | 4 +- - .../browser/ssl/CaptivePortalHelper.java | 2 +- .../suggestions/SuggestionsConfig.java | 2 +- .../SuggestionsNavigationDelegate.java | 2 +- .../browser/sync/GoogleServiceAuthError.java | 2 +- .../chromium/chrome/browser/tab/TabState.java | 2 +- .../browser/toolbar/top/CustomTabToolbar.java | 4 +- .../PackageReplacedBroadcastReceiver.java | 2 +- - .../chrome/browser/vr/ArCoreInstallUtils.java | 2 +- .../chrome/browser/vr/ArCoreShim.java | 6 +- .../chrome/browser/ShortcutHelperTest.java | 42 +- .../filter/SearchOfflineItemFilterTest.java | 12 +- @@ -266,11 +258,10 @@ Subject: Automated domain substitution .../browser/omnibox/UrlBarUnitTest.java | 6 +- .../geo/GeolocationHeaderUnitTest.java | 2 +- .../SearchEngineChoiceNotificationTest.java | 2 +- - .../browser/signin/SigninManagerTest.java | 12 +- + .../browser/signin/SigninManagerTest.java | 4 +- .../browser/signin/SigninPromoUtilTest.java | 14 +- .../suggestions/tile/TileGroupUnitTest.java | 2 +- .../browser/tasks/JourneyManagerTest.java | 6 +- - .../browser/util/UrlUtilitiesUnitTest.java | 10 +- .../browser/webapps/WebApkInfoTest.java | 12 +- .../webapps/WebappDataStorageTest.java | 4 +- .../browser/webapps/WebappInfoTest.java | 2 +- @@ -288,7 +279,7 @@ Subject: Automated domain substitution chrome/app/PRESUBMIT.py | 8 +- chrome/app/chrome_command_ids.h | 2 +- chrome/app/chromium_strings.grd | 8 +- - chrome/app/generated_resources.grd | 224 +- + chrome/app/generated_resources.grd | 232 +- chrome/app/google_chrome_strings.grd | 8 +- chrome/app/resources/locale_settings.grd | 12 +- chrome/app/theme/PRESUBMIT.py | 4 +- @@ -311,8 +302,6 @@ Subject: Automated domain substitution .../browser_switcher_service.cc | 2 +- .../browser_switcher/ieem_sitelist_parser.cc | 4 +- .../browsing_data/cookies_tree_model.cc | 18 +- - .../captive_portal/captive_portal_service.h | 2 +- - .../captive_portal_tab_helper.h | 2 +- .../browser/chrome_browser_application_mac.mm | 2 +- .../browser/chrome_content_browser_client.cc | 2 +- .../chromeos/android_sms/android_sms_urls.cc | 18 +- @@ -345,6 +334,7 @@ Subject: Automated domain substitution .../recommend_apps_fetcher_impl.cc | 2 +- .../login/session/user_session_manager.cc | 4 +- .../chromeos/login/ui/captive_portal_view.cc | 2 +- + .../chromeos/plugin_vm/plugin_vm_util.cc | 2 +- .../policy/active_directory_policy_manager.cc | 2 +- .../chromeos/policy/heartbeat_scheduler.cc | 6 +- .../remote_commands/crd_host_delegate.cc | 10 +- @@ -359,6 +349,7 @@ Subject: Automated domain substitution .../data_reduction_proxy_settings_android.cc | 2 +- .../devtools/device/adb/mock_adb_server.cc | 12 +- chrome/browser/devtools/url_constants.cc | 4 +- + .../mixed_content_download_blocking.cc | 2 +- .../engagement/site_engagement_helper.cc | 2 +- chrome/browser/extensions/api/README.txt | 4 +- .../cryptotoken_private_api.cc | 10 +- @@ -389,8 +380,7 @@ Subject: Automated domain substitution .../updater/chrome_update_client_config.cc | 4 +- .../feedback/feedback_uploader_chrome.cc | 2 +- .../log_sources/crash_ids_source.cc | 4 +- - chrome/browser/flag-metadata.json | 384 +- - chrome/browser/flag_descriptions.cc | 4 +- + chrome/browser/flag-metadata.json | 386 +- ...gle_search_domain_mixing_metrics_emitter.h | 4 +- ...ch_domain_mixing_metrics_emitter_factory.h | 2 +- chrome/browser/google/google_update_win.cc | 2 +- @@ -508,22 +498,16 @@ Subject: Automated domain substitution .../cloud_print_interface_manager.js | 2 +- .../print_preview/data/destination_store.js | 2 +- .../resources/settings/a11y_page/a11y_page.js | 2 +- - .../settings/a11y_page/manage_a11y_page.html | 2 +- .../settings/about_page/about_page.html | 4 +- - .../about_page/channel_switcher_dialog.html | 2 +- .../appearance_page/appearance_page.js | 2 +- .../change_password_browser_proxy.js | 2 +- .../chromeos/os_about_page/os_about_page.html | 2 +- .../app_management_page/icons.html | 2 +- .../resources/settings/chromeos/os_icons.html | 2 +- .../chromeos/os_people_page/os_people_page.js | 4 +- - .../crostini_page/crostini_shared_paths.js | 2 +- - .../resources/settings/device_page/stylus.js | 2 +- chrome/browser/resources/settings/icons.html | 2 +- .../incompatible_application_item.js | 2 +- .../languages_page/edit_dictionary_page.js | 2 +- - .../people_page/users_add_user_dialog.js | 4 +- - .../plugin_vm_page/plugin_vm_shared_paths.js | 2 +- .../settings/settings_shared_css.html | 2 +- .../supervised_user_internals.js | 2 +- .../usb_internals/descriptor_panel.js | 4 +- @@ -532,7 +516,7 @@ Subject: Automated domain substitution .../certificate_reporting_service.cc | 2 +- .../chrome_cleaner/srt_field_trial_win.cc | 8 +- .../chrome_password_protection_service.cc | 8 +- - .../client_side_detection_service.cc | 4 +- + .../client_side_detection_service.cc | 2 +- .../check_client_download_request_base.cc | 4 +- .../download_protection/download_feedback.cc | 2 +- .../ppapi_download_request.cc | 6 +- @@ -548,7 +532,6 @@ Subject: Automated domain substitution chrome/browser/sharing/vapid_key_manager.h | 2 +- ...hrome_signin_proxying_url_loader_factory.h | 2 +- chrome/browser/signin/signin_ui_util.cc | 2 +- - .../browser/ssl/captive_portal_helper_win.cc | 2 +- .../browser/ssl/connection_help_tab_helper.cc | 2 +- chrome/browser/startup_data.h | 2 +- .../child_accounts/family_info_fetcher.cc | 2 +- @@ -578,12 +561,10 @@ Subject: Automated domain substitution .../ui/crypto_module_password_dialog_nss.cc | 2 +- .../installation_error_infobar_delegate.cc | 2 +- .../javascript_dialog_tab_helper.cc | 2 +- - chrome/browser/ui/libgtkui/gtk_util.cc | 2 +- .../browser/ui/media_router/media_cast_mode.h | 2 +- .../ui/media_router/query_result_manager.h | 2 +- chrome/browser/ui/page_info/page_info.cc | 4 +- ...le_password_manager_navigation_throttle.cc | 4 +- - .../passwords/manage_passwords_bubble_model.h | 2 +- .../passwords/manage_passwords_view_utils.h | 4 +- .../ui/passwords/passwords_model_delegate.h | 2 +- .../browser/ui/pdf/adobe_reader_info_win.cc | 2 +- @@ -608,7 +589,6 @@ Subject: Automated domain substitution .../assistant_optin/assistant_optin_utils.cc | 2 +- .../chromeos/login/gaia_screen_handler.cc | 2 +- .../chromeos/login/gaia_screen_handler.h | 2 +- - chrome/browser/ui/webui/components_ui.cc | 2 +- .../ui/webui/interstitials/interstitial_ui.cc | 2 +- .../browser/ui/webui/management_ui_handler.cc | 2 +- chrome/browser/ui/webui/ntp/new_tab_ui.cc | 4 +- @@ -932,7 +912,7 @@ Subject: Automated domain substitution .../common/safe_browsing/client_model.proto | 4 +- chrome/common/search.mojom | 2 +- chrome/common/service_process.mojom | 2 +- - chrome/common/url_constants.cc | 196 +- + chrome/common/url_constants.cc | 198 +- chrome/common/url_constants.h | 2 +- .../gaiacp/associated_user_validator.cc | 2 +- .../credential_provider/gaiacp/auth_utils.cc | 2 +- @@ -1059,9 +1039,8 @@ Subject: Automated domain substitution chromecast/net/net_switches.cc | 2 +- chromecast/public/bluetooth/gatt.h | 6 +- chromecast/public/output_restrictions.h | 2 +- - chromeos/BUILD.gn | 8 +- + chromeos/BUILD.gn | 10 +- chromeos/components/drivefs/drivefs_auth.cc | 2 +- - chromeos/constants/chromeos_features.cc | 2 +- chromeos/dbus/arc_obb_mounter_client.h | 2 +- .../permission_broker_client.h | 2 +- .../simple_geolocation_provider.cc | 2 +- @@ -1112,7 +1091,6 @@ Subject: Automated domain substitution components/browser_sync/PRESUBMIT.py | 2 +- .../core/counters/history_counter.cc | 2 +- .../core/history_notice_utils.cc | 4 +- - .../captive_portal/captive_portal_detector.cc | 2 +- components/cast_channel/enum_table.h | 2 +- .../chrome_ct_policy_enforcer.cc | 2 +- .../chrome_require_ct_delegate.h | 2 +- @@ -1164,7 +1142,7 @@ Subject: Automated domain substitution components/drive/drive_api_util.h | 4 +- components/drive/service/drive_api_service.cc | 8 +- .../drive/service/fake_drive_service.cc | 4 +- - .../error_page/common/localized_error.cc | 4 +- + .../error_page/common/localized_error.cc | 2 +- .../favicon/core/favicon_driver_observer.h | 8 +- components/favicon/core/favicon_service.h | 4 +- .../favicon/core/large_icon_service_impl.cc | 2 +- @@ -1173,15 +1151,12 @@ Subject: Automated domain substitution components/feedback/feedback_common.cc | 2 +- components/feedback/feedback_report.h | 2 +- components/feedback/feedback_uploader.cc | 2 +- - components/feedback/feedback_util.cc | 2 +- - components/feedback/feedback_util.h | 2 +- components/feedback/proto/web.proto | 2 +- components/flags_ui/resources/flags.html | 4 +- .../gcm_driver/GoogleCloudMessagingV2.java | 2 +- components/gcm_driver/gcm_account_mapper.cc | 2 +- components/gcm_driver/gcm_account_tracker.cc | 4 +- components/gcm_driver/gcm_client_impl.cc | 2 +- - components/gcm_driver/web_push_sender.cc | 4 +- components/google/core/common/google_util.cc | 28 +- .../core/browser/browsing_history_service.cc | 4 +- .../core/browser/domain_mixing_metrics.h | 2 +- @@ -1202,13 +1177,11 @@ Subject: Automated domain substitution .../InvalidationClientService.java | 2 +- .../impl/gcm_invalidation_bridge.cc | 2 +- .../invalidation/impl/gcm_network_channel.cc | 2 +- - .../per_user_topic_registration_manager.cc | 4 +- .../invalidation/impl/push_client_channel.cc | 2 +- .../core/simple_keyed_service_factory.h | 2 +- .../metrics/net/net_metrics_log_uploader.cc | 2 +- components/metrics/persistent_histograms.cc | 2 +- components/metrics/url_constants.cc | 6 +- - .../MinidumpUploadCallable.java | 4 +- components/nacl/browser/nacl_process_host.cc | 4 +- components/nacl/docs/dev/index.html | 4 +- components/nacl/loader/nacl_helper_linux.h | 2 +- @@ -1282,7 +1255,7 @@ Subject: Automated domain substitution .../policy/proto/chrome_device_policy.proto | 4 +- .../proto/device_management_backend.proto | 2 +- components/policy/resources/PRESUBMIT.py | 2 +- - .../policy/resources/policy_templates.json | 764 +- + .../policy/resources/policy_templates.json | 790 +- .../policy/tools/generate_extension_admx.py | 2 +- .../syntax_check_policy_template_json.py | 2 +- .../tools/template_writers/PRESUBMIT.py | 2 +- @@ -1303,76 +1276,63 @@ Subject: Automated domain substitution components/rappor/rappor_recorder_impl.h | 2 +- components/rappor/rappor_service_impl.cc | 2 +- .../resources/terms/chromeos/terms_en.html | 16 +- - components/resources/terms/terms_am.html | 12 +- - components/resources/terms/terms_ar.html | 6 +- - components/resources/terms/terms_bg.html | 8 +- - components/resources/terms/terms_bn.html | 12 +- - components/resources/terms/terms_ca.html | 6 +- - components/resources/terms/terms_cs.html | 8 +- - components/resources/terms/terms_da.html | 6 +- - components/resources/terms/terms_de.html | 2 +- - components/resources/terms/terms_el.html | 6 +- - components/resources/terms/terms_en-GB.html | 6 +- - components/resources/terms/terms_en.html | 12 +- - components/resources/terms/terms_es-419.html | 12 +- - components/resources/terms/terms_es.html | 6 +- - components/resources/terms/terms_et.html | 6 +- - components/resources/terms/terms_fa.html | 12 +- - components/resources/terms/terms_fi.html | 6 +- - components/resources/terms/terms_fil.html | 12 +- - components/resources/terms/terms_fr.html | 12 +- - components/resources/terms/terms_gu.html | 12 +- - components/resources/terms/terms_he.html | 10 +- - components/resources/terms/terms_hi.html | 12 +- - components/resources/terms/terms_hr.html | 8 +- - components/resources/terms/terms_hu.html | 12 +- - components/resources/terms/terms_id.html | 12 +- - components/resources/terms/terms_it.html | 12 +- - components/resources/terms/terms_ja.html | 12 +- - components/resources/terms/terms_kn.html | 12 +- - components/resources/terms/terms_ko.html | 6 +- - components/resources/terms/terms_lt.html | 10 +- - components/resources/terms/terms_lv.html | 6 +- - components/resources/terms/terms_ml.html | 12 +- - components/resources/terms/terms_mr.html | 12 +- - components/resources/terms/terms_nb.html | 6 +- - components/resources/terms/terms_nl.html | 6 +- - components/resources/terms/terms_pl.html | 12 +- - components/resources/terms/terms_pt-BR.html | 12 +- - components/resources/terms/terms_pt-PT.html | 8 +- - components/resources/terms/terms_ro.html | 6 +- - components/resources/terms/terms_ru.html | 6 +- - components/resources/terms/terms_sk.html | 6 +- - components/resources/terms/terms_sl.html | 4 +- - components/resources/terms/terms_sr.html | 6 +- - components/resources/terms/terms_sv.html | 6 +- - components/resources/terms/terms_sw.html | 12 +- - components/resources/terms/terms_ta.html | 12 +- - components/resources/terms/terms_te.html | 12 +- - components/resources/terms/terms_th.html | 6 +- - components/resources/terms/terms_tr.html | 12 +- - components/resources/terms/terms_uk.html | 12 +- - components/resources/terms/terms_vi.html | 12 +- - components/resources/terms/terms_zh-CN.html | 12 +- - components/resources/terms/terms_zh-TW.html | 12 +- + components/resources/terms/terms_am.html | 14 +- + components/resources/terms/terms_ar.html | 8 +- + components/resources/terms/terms_bg.html | 10 +- + components/resources/terms/terms_bn.html | 14 +- + components/resources/terms/terms_ca.html | 8 +- + components/resources/terms/terms_cs.html | 10 +- + components/resources/terms/terms_da.html | 8 +- + components/resources/terms/terms_de.html | 4 +- + components/resources/terms/terms_el.html | 8 +- + components/resources/terms/terms_en-GB.html | 8 +- + components/resources/terms/terms_en.html | 14 +- + components/resources/terms/terms_es-419.html | 14 +- + components/resources/terms/terms_es.html | 8 +- + components/resources/terms/terms_et.html | 8 +- + components/resources/terms/terms_fa.html | 14 +- + components/resources/terms/terms_fi.html | 8 +- + components/resources/terms/terms_fil.html | 14 +- + components/resources/terms/terms_fr.html | 14 +- + components/resources/terms/terms_gu.html | 14 +- + components/resources/terms/terms_he.html | 12 +- + components/resources/terms/terms_hi.html | 14 +- + components/resources/terms/terms_hr.html | 10 +- + components/resources/terms/terms_hu.html | 14 +- + components/resources/terms/terms_id.html | 14 +- + components/resources/terms/terms_it.html | 14 +- + components/resources/terms/terms_ja.html | 14 +- + components/resources/terms/terms_kn.html | 14 +- + components/resources/terms/terms_ko.html | 8 +- + components/resources/terms/terms_lt.html | 12 +- + components/resources/terms/terms_lv.html | 8 +- + components/resources/terms/terms_ml.html | 14 +- + components/resources/terms/terms_mr.html | 14 +- + components/resources/terms/terms_nb.html | 10 +- + components/resources/terms/terms_nl.html | 8 +- + components/resources/terms/terms_pl.html | 14 +- + components/resources/terms/terms_pt-BR.html | 14 +- + components/resources/terms/terms_pt-PT.html | 10 +- + components/resources/terms/terms_ro.html | 8 +- + components/resources/terms/terms_ru.html | 8 +- + components/resources/terms/terms_sk.html | 8 +- + components/resources/terms/terms_sl.html | 6 +- + components/resources/terms/terms_sr.html | 8 +- + components/resources/terms/terms_sv.html | 8 +- + components/resources/terms/terms_sw.html | 14 +- + components/resources/terms/terms_ta.html | 14 +- + components/resources/terms/terms_te.html | 14 +- + components/resources/terms/terms_th.html | 8 +- + components/resources/terms/terms_tr.html | 14 +- + components/resources/terms/terms_uk.html | 14 +- + components/resources/terms/terms_vi.html | 14 +- + components/resources/terms/terms_zh-CN.html | 14 +- + components/resources/terms/terms_zh-TW.html | 14 +- components/rlz/rlz_tracker.h | 2 +- - components/safe_browsing/base_ui_manager.cc | 2 +- - .../common/safebrowsing_constants.cc | 2 +- - components/safe_browsing/db/metadata.proto | 2 +- - .../db/v4_get_hash_protocol_manager.cc | 2 +- - .../db/v4_protocol_manager_util.cc | 6 +- - .../db/v4_protocol_manager_util.h | 6 +- - components/safe_browsing/db/v4_store.cc | 2 +- - .../password_protection_service.cc | 4 +- - components/safe_browsing/proto/csd.proto | 10 +- - .../realtime/url_lookup_service.cc | 2 +- - .../safe_browsing/triggers/trigger_util.cc | 2 +- - .../safe_browsing/verdict_cache_manager.cc | 4 +- .../safe_search_url_checker_client.cc | 2 +- .../safe_search_api/stub_url_checker.cc | 2 +- components/search_engines/template_url.cc | 2 +- components/search_engines/template_url.h | 2 +- - .../search_engines/template_url_service.cc | 2 +- components/search_engines/util.cc | 2 +- .../search_provider_logos/google_logo_api.cc | 2 +- .../search_provider_logos/google_logo_api.h | 2 +- @@ -1383,13 +1343,12 @@ Subject: Automated domain substitution .../security_interstitials/core/urls.cc | 4 +- .../security_state/core/security_state.h | 2 +- .../font/ppapi_fontconfig_matching.cc | 2 +- - .../heap_profiling/connection_manager.cc | 4 +- + .../heap_profiling/connection_manager.cc | 2 +- .../services/quarantine/quarantine_mac.mm | 2 +- .../services/quarantine/quarantine_win.cc | 2 +- .../signin/AccountManagerFacade.java | 4 +- .../browser/chrome_connected_header_helper.cc | 8 +- .../browser/resources/signin_internals.js | 2 +- - .../oauth2_token_service_delegate_android.cc | 2 +- .../browser/account_consistency_service.mm | 6 +- components/signin/public/base/signin_client.h | 2 +- .../signin/public/base/signin_pref_names.cc | 2 +- @@ -1397,7 +1356,7 @@ Subject: Automated domain substitution .../spellcheck/SpellCheckerSessionBridge.java | 2 +- .../browser/spelling_service_client.cc | 2 +- components/ssl_errors/error_classification.h | 4 +- - .../browser/startup_metric_utils.cc | 4 +- + .../browser/startup_metric_utils.cc | 6 +- .../volume_mount_watcher_win.cc | 2 +- .../browser/subresource_filter_constants.h | 8 +- .../core/common/PRESUBMIT.py | 2 +- @@ -1428,7 +1387,7 @@ Subject: Automated domain substitution .../spoof_checks/idn_spoof_checker.cc | 2 +- .../spoof_checks/idn_spoof_checker.h | 2 +- .../top_domains/make_alexa_top_list.py | 2 +- - .../top_domains/top_domain_util.h | 4 +- + .../top_domains/top_domain_util.h | 2 +- components/url_formatter/url_fixer.cc | 2 +- components/url_formatter/url_formatter.cc | 4 +- components/url_formatter/url_formatter.h | 2 +- @@ -1456,7 +1415,6 @@ Subject: Automated domain substitution .../appcache/appcache_update_url_fetcher.cc | 2 +- .../appcache/appcache_url_loader_job.cc | 2 +- .../bluetooth_device_chooser_controller.cc | 2 +- - .../browser_plugin/browser_plugin_guest.cc | 2 +- content/browser/browser_url_handler_impl.cc | 2 +- .../browsing_data_filter_builder_impl.cc | 4 +- content/browser/client_hints/client_hints.cc | 2 +- @@ -1474,7 +1432,7 @@ Subject: Automated domain substitution content/browser/notification_service_impl.cc | 2 +- content/browser/plugin_service_impl.cc | 2 +- .../push_messaging/push_messaging_manager.cc | 2 +- - .../renderer_host/compositor_impl_android.cc | 4 +- + .../renderer_host/compositor_impl_android.cc | 2 +- .../dwrite_font_lookup_table_builder_win.cc | 2 +- .../dwrite_font_proxy_impl_win.cc | 2 +- .../renderer_host/input/touch_action_filter.h | 2 +- @@ -1520,7 +1478,7 @@ Subject: Automated domain substitution .../pepper/pepper_media_device_manager.cc | 2 +- .../renderer/pepper/pepper_plugin_registry.cc | 2 +- content/renderer/render_thread_impl.cc | 14 +- - content/renderer/render_widget.cc | 6 +- + content/renderer/render_widget.cc | 4 +- .../renderer/renderer_blink_platform_impl.h | 2 +- .../renderer_main_platform_delegate_linux.cc | 2 +- .../web_service_worker_provider_impl.cc | 2 +- @@ -1542,7 +1500,6 @@ Subject: Automated domain substitution crypto/secure_util.h | 2 +- device/bluetooth/bluetooth_adapter_android.cc | 4 +- device/bluetooth/bluetooth_adapter_mac.mm | 2 +- - .../bluetooth_adapter_mac_metrics.mm | 2 +- device/bluetooth/bluetooth_adapter_winrt.cc | 2 +- .../bluetooth/bluetooth_classic_device_mac.mm | 4 +- device/bluetooth/bluetooth_device_win.cc | 2 +- @@ -1643,7 +1600,7 @@ Subject: Automated domain substitution .../external_vk_image_dawn_representation.h | 2 +- .../gles2_cmd_decoder_passthrough_doers.cc | 2 +- .../shared_image_backing_factory_iosurface.mm | 6 +- - .../service/webgpu_decoder_impl.cc | 2 +- + .../service/webgpu_decoder_impl.cc | 4 +- gpu/config/gpu_info_collector_win.cc | 2 +- gpu/vulkan/PRESUBMIT.py | 2 +- headless/app/headless_shell_switches.cc | 2 +- @@ -1681,7 +1638,6 @@ Subject: Automated domain substitution .../welcome_to_chrome_view_controller.mm | 2 +- ios/chrome/browser/ui/ntp/incognito_view.mm | 2 +- .../ui/ntp/notification_promo_whats_new.mm | 2 +- - .../popup/autocomplete_match_formatter.mm | 2 +- .../ui/payments/cells/page_info_item.mm | 2 +- .../ui/payments/payment_request_manager.h | 2 +- .../ui/settings/cells/search_engine_item.h | 2 +- @@ -1691,7 +1647,7 @@ Subject: Automated domain substitution ios/net/crn_http_protocol_handler.mm | 2 +- .../browser/signin/chrome_identity_service.h | 4 +- .../browser/signin/chrome_identity_service.mm | 4 +- - .../signin/fake_chrome_identity_service.mm | 2 +- + .../signin/fake_chrome_identity_service.mm | 4 +- ios/showcase/alert/sc_alert_coordinator.mm | 8 +- .../fake_autocomplete_suggestion.mm | 4 +- ios/third_party/firebase/BUILD.gn | 2 +- @@ -1724,7 +1680,6 @@ Subject: Automated domain substitution .../org/chromium/media/MediaCodecUtil.java | 2 +- .../chromium/media/MediaFormatBuilder.java | 2 +- media/base/android/media_drm_bridge.cc | 8 +- - media/base/android/media_drm_key_type.h | 2 +- media/base/android/media_player_bridge.h | 2 +- media/base/container_names.cc | 2 +- media/base/key_systems.cc | 2 +- @@ -1896,7 +1851,7 @@ Subject: Automated domain substitution net/base/data_url.cc | 4 +- net/base/file_stream_context.h | 2 +- net/base/filename_util.cc | 2 +- - net/base/filename_util_internal.cc | 4 +- + net/base/filename_util_internal.cc | 2 +- net/base/load_timing_info.h | 2 +- net/base/network_change_notifier_mac.cc | 2 +- net/base/network_change_notifier_win.cc | 4 +- @@ -1954,7 +1909,7 @@ Subject: Automated domain substitution net/http/http_util.cc | 2 +- net/http/transport_security_state.cc | 2 +- net/http/transport_security_state.h | 2 +- - net/http/transport_security_state_static.json | 496 +- + net/http/transport_security_state_static.json | 500 +- net/http/url_security_manager_win.cc | 6 +- net/log/file_net_log_observer.cc | 2 +- net/log/net_log.h | 2 +- @@ -1968,7 +1923,6 @@ Subject: Automated domain substitution .../dhcp_pac_file_adapter_fetcher_win.cc | 4 +- net/proxy_resolution/pac_file_decider.cc | 2 +- net/proxy_resolution/proxy_bypass_rules.cc | 2 +- - net/proxy_resolution/proxy_bypass_rules.h | 6 +- net/proxy_resolution/proxy_config.h | 2 +- .../proxy_config_service_android.cc | 4 +- .../proxy_config_service_linux.cc | 6 +- @@ -1996,7 +1950,6 @@ Subject: Automated domain substitution net/tools/print_certificates.py | 2 +- net/tools/quic/quic_simple_client_bin.cc | 18 +- .../transport_security_state_generator.cc | 2 +- - net/url_request/redirect_util.cc | 2 +- net/url_request/url_fetcher.h | 2 +- pdf/document_loader_impl.cc | 2 +- pdf/out_of_process_instance.h | 2 +- @@ -2104,7 +2057,6 @@ Subject: Automated domain substitution services/network/cross_origin_read_blocking.h | 2 +- .../public/cpp/is_potentially_trustworthy.cc | 2 +- .../network/public/cpp/network_switches.cc | 2 +- - .../network/public/cpp/resource_response.h | 2 +- .../network/public/mojom/cookie_manager.mojom | 4 +- .../public/mojom/network_context.mojom | 4 +- .../public/mojom/network_service.mojom | 2 +- @@ -2204,7 +2156,6 @@ Subject: Automated domain substitution third_party/blink/PRESUBMIT.py | 4 +- .../common/frame/user_activation_state.h | 4 +- .../public/common/origin_trials/trial_token.h | 2 +- - .../document_metadata/copyless_paste.mojom | 2 +- .../public/mojom/feature_policy/PRESUBMIT.py | 2 +- .../mojom/payments/payment_handler_host.mojom | 2 +- .../mojom/payments/payment_request.mojom | 2 +- @@ -2212,7 +2163,6 @@ Subject: Automated domain substitution .../public/mojom/web_feature/PRESUBMIT.py | 2 +- .../platform/linux/web_sandbox_support.h | 2 +- third_party/blink/public/platform/platform.h | 4 +- - .../public/platform/web_keyboard_event.h | 2 +- .../blink/public/platform/web_url_response.h | 2 +- third_party/blink/public/web/web_node.h | 2 +- .../blink/renderer/bindings/PRESUBMIT.py | 2 +- @@ -2243,7 +2193,6 @@ Subject: Automated domain substitution .../renderer/bindings/scripts/v8_utilities.py | 2 +- .../core/style/make_computed_style_base.py | 2 +- .../build/scripts/update_css_ranking.py | 4 +- - .../memory_usage_monitor_android.cc | 2 +- third_party/blink/renderer/core/BUILD.gn | 2 +- .../renderer/core/animation/sampled_effect.cc | 2 +- .../renderer/core/clipboard/data_transfer.h | 2 +- @@ -2263,10 +2212,9 @@ Subject: Automated domain substitution .../css/invalidation/pending_invalidations.h | 2 +- .../core/css/invalidation/style_invalidator.h | 2 +- .../blink/renderer/core/css/parser/css.proto | 8 +- - .../core/css/parser/css_selector_parser.cc | 6 +- + .../core/css/parser/css_selector_parser.cc | 4 +- .../core/css/remote_font_face_source.cc | 2 +- .../core/css/resolver/style_adjuster.cc | 2 +- - .../core/css/resolver/style_resolver.cc | 2 +- .../renderer/core/css/rule_feature_set.cc | 2 +- .../renderer/core/css/selector_checker.cc | 2 +- .../blink/renderer/core/css/style_engine.cc | 6 +- @@ -2348,9 +2296,7 @@ Subject: Automated domain substitution .../exported/web_plugin_container_impl.cc | 2 +- .../core/exported/web_searchable_form_data.cc | 2 +- .../core/fileapi/file_reader_loader_client.h | 2 +- - .../blink/renderer/core/frame/PRESUBMIT.py | 2 +- - .../blink/renderer/core/frame/deprecation.cc | 50 +- - .../core/frame/embedded_content_view.h | 2 +- + .../blink/renderer/core/frame/deprecation.cc | 48 +- third_party/blink/renderer/core/frame/frame.h | 2 +- .../renderer/core/frame/frame_serializer.cc | 2 +- .../renderer/core/frame/local_dom_window.h | 2 +- @@ -2940,8 +2886,6 @@ Subject: Automated domain substitution third_party/libaom/BUILD.gn | 2 +- third_party/libjingle_xmpp/xmpp/constants.cc | 24 +- third_party/libjingle_xmpp/xmpp/xmppclient.cc | 12 +- - third_party/libjpeg/jconfig.h | 4 +- - third_party/liblouis/wasm/liblouis_wasm.js | 2 +- .../libpng/contrib/oss-fuzz/README.txt | 2 +- .../contrib/oss-fuzz/libpng_read_fuzzer.cc | 2 +- .../libusb/src/libusb/os/threads_windows.c | 2 +- @@ -4028,7 +3972,6 @@ Subject: Automated domain substitution tools/binary_size/PRESUBMIT.py | 2 +- tools/binary_size/diagnose_bloat.py | 2 +- .../binary_size/generate_milestone_reports.py | 2 +- - .../generate_official_build_report.py | 2 +- tools/binary_size/libsupersize/html_report.py | 2 +- .../libsupersize/static/index.html | 2 +- .../libsupersize/static/viewer.html | 4 +- @@ -4053,7 +3996,7 @@ Subject: Automated domain substitution tools/chrome_proxy/webdriver/decorators.py | 2 +- tools/chrome_proxy/webdriver/fallback.py | 18 +- .../chrome_proxy/webdriver/https_previews.py | 24 +- - tools/chrome_proxy/webdriver/lite_page.py | 16 +- + tools/chrome_proxy/webdriver/lite_page.py | 14 +- tools/chrome_proxy/webdriver/protocol_fuzz.py | 4 +- .../webdriver/proxy_connection.py | 8 +- tools/chrome_proxy/webdriver/quic.py | 4 +- @@ -4102,7 +4045,7 @@ Subject: Automated domain substitution tools/json_to_struct/PRESUBMIT.py | 2 +- tools/licenses.py | 34 +- tools/linux/PRESUBMIT.py | 2 +- - tools/mb/mb.py | 8 +- + tools/mb/mb.py | 10 +- tools/mb/mb_config.pyl | 6 +- tools/md_browser/base.css | 4 +- tools/md_browser/footer.html | 2 +- @@ -4116,23 +4059,23 @@ Subject: Automated domain substitution .../frontends/www_content/index.html | 10 +- .../frontends/www_content/js/rootUi.js | 2 +- tools/metrics/actions/PRESUBMIT.py | 2 +- - tools/metrics/actions/actions.xml | 5602 +- + tools/metrics/actions/actions.xml | 5638 +- tools/metrics/common/models.py | 2 +- tools/metrics/histograms/PRESUBMIT.py | 2 +- - tools/metrics/histograms/enums.xml | 100 +- + tools/metrics/histograms/enums.xml | 104 +- tools/metrics/histograms/expand_owners.py | 8 +- .../metrics/histograms/extract_histograms.py | 8 +- - tools/metrics/histograms/histograms.xml | 43860 ++++++++-------- + tools/metrics/histograms/histograms.xml | 45696 ++++++++-------- tools/metrics/md2xml.py | 4 +- tools/metrics/rappor/PRESUBMIT.py | 2 +- - tools/metrics/rappor/rappor.xml | 58 +- + tools/metrics/rappor/rappor.xml | 24 +- tools/metrics/ukm/PRESUBMIT.py | 2 +- - tools/metrics/ukm/ukm.xml | 548 +- + tools/metrics/ukm/ukm.xml | 604 +- tools/metrics/ukm/xml_validations.py | 4 +- tools/nocompile_driver.py | 2 +- tools/omahaproxy.py | 2 +- tools/perf/PRESUBMIT.py | 2 +- - tools/perf/benchmarks/blink_perf.py | 34 +- + tools/perf/benchmarks/blink_perf.py | 36 +- tools/perf/benchmarks/dromaeo.py | 6 +- tools/perf/benchmarks/dummy_benchmark.py | 6 +- tools/perf/benchmarks/jetstream.py | 2 +- @@ -4148,14 +4091,14 @@ Subject: Automated domain substitution tools/perf/benchmarks/speedometer.py | 4 +- tools/perf/benchmarks/speedometer2.py | 4 +- tools/perf/benchmarks/startup_mobile.py | 4 +- - tools/perf/benchmarks/system_health.py | 24 +- + tools/perf/benchmarks/system_health.py | 28 +- tools/perf/benchmarks/tab_switching.py | 2 +- tools/perf/benchmarks/tracing.py | 2 +- tools/perf/benchmarks/v8.py | 2 +- tools/perf/benchmarks/v8_browsing.py | 8 +- tools/perf/benchmarks/webrtc.py | 6 +- tools/perf/cli_tools/flakiness_cli/api.py | 2 +- - .../perf/cli_tools/pinboard/job_configs.json | 6 +- + .../perf/cli_tools/pinboard/job_configs.json | 4 +- .../cli_tools/soundwave/tables/timeseries.py | 2 +- tools/perf/cli_tools/update_wpr/update_wpr.py | 2 +- .../blink_layoutng_perf.py | 6 +- @@ -4184,15 +4127,13 @@ Subject: Automated domain substitution tools/perf/core/services/isolate_service.py | 2 +- tools/perf/core/services/pinpoint_service.py | 2 +- tools/perf/core/services/request.py | 2 +- - .../android-nexus5x-perf_timing.json | 8 +- .../android-pixel2-perf_timing.json | 8 +- .../android-pixel2_webview-perf_timing.json | 8 +- .../android_nexus5_perf_timing.json | 8 +- .../android_nexus5x_webview_perf_timing.json | 8 +- - .../android_nexus6_webview_perf_timing.json | 8 +- .../timing_data/linux-perf_timing.json | 38 +- - .../mac-10_12_laptop_low_end-perf_timing.json | 8 +- - ...mac-10_13_laptop_high_end-perf_timing.json | 8 +- + .../mac-10_12_laptop_low_end-perf_timing.json | 38 +- + ...mac-10_13_laptop_high_end-perf_timing.json | 38 +- .../timing_data/win-10-perf_timing.json | 38 +- .../win_7_nvidia_gpu_perf_timing.json | 38 +- .../timing_data/win_7_perf_timing.json | 38 +- @@ -4233,8 +4174,8 @@ Subject: Automated domain substitution .../tough_pinch_zoom_mobile_cases.py | 2 +- .../system_health/accessibility_stories.py | 6 +- .../system_health/background_stories.py | 2 +- - .../system_health/browsing_stories.py | 66 +- - .../system_health/loading_stories.py | 20 +- + .../system_health/browsing_stories.py | 46 +- + .../system_health/loading_stories.py | 30 +- .../system_health/long_running_stories.py | 8 +- .../page_sets/system_health/media_stories.py | 4 +- .../system_health/system_health_stories.py | 2 +- @@ -4306,7 +4247,7 @@ Subject: Automated domain substitution .../accessibility_extensions_strings.grd | 2 +- .../ax_platform_node_delegate_utils_win.cc | 2 +- ui/android/java/res/values/strings.xml | 2 +- - ui/base/clipboard/clipboard_format_type.h | 2 +- + ui/base/clipboard/clipboard_format_type.h | 4 +- ui/base/clipboard/clipboard_util_win.cc | 2 +- ui/base/clipboard/clipboard_win.cc | 4 +- ui/base/cocoa/base_view.mm | 2 +- @@ -4364,8 +4305,6 @@ Subject: Automated domain substitution ui/gfx/font_fallback_win.h | 2 +- ui/gfx/icon_util.cc | 6 +- ui/gfx/icon_util.h | 2 +- - ui/gfx/platform_font_win.cc | 2 +- - ui/gfx/platform_font_win.h | 4 +- ui/gfx/transform.cc | 2 +- ui/gfx/win/physical_size.cc | 2 +- ui/gfx/win/singleton_hwnd_hot_key_observer.cc | 2 +- @@ -4380,7 +4319,6 @@ Subject: Automated domain substitution .../chromeos_user_pod_template.html | 2 +- .../account_picker/user_pod_template.html | 2 +- ui/native_theme/native_theme_win.h | 2 +- - .../platform/wayland/host/wayland_window.cc | 2 +- ui/resources/PRESUBMIT.py | 4 +- ui/resources/resource_check/ico_files.py | 4 +- .../resource_check/resource_scale_factors.py | 4 +- @@ -4401,12 +4339,12 @@ Subject: Automated domain substitution url/url_idna_icu.cc | 2 +- url/url_util.cc | 2 +- url/url_util.h | 6 +- - 4398 files changed, 35988 insertions(+), 35988 deletions(-) + 4336 files changed, 36935 insertions(+), 36935 deletions(-) diff --git a/.gn b/.gn --- a/.gn +++ b/.gn -@@ -577,7 +577,7 @@ check_targets = [ +@@ -575,7 +575,7 @@ check_targets = [ "//ui/*", "//url/*", @@ -4418,8 +4356,8 @@ diff --git a/.gn b/.gn diff --git a/BUILD.gn b/BUILD.gn --- a/BUILD.gn +++ b/BUILD.gn -@@ -1009,7 +1009,7 @@ if (!is_ios) { - } +@@ -1032,7 +1032,7 @@ if (!is_ios) { + data = [ "//third_party/devtools-frontend/src/test/webtests/" ] } - # https://www.chromium.org/developers/testing/webkit-layout-tests @@ -4511,7 +4449,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -624,7 +624,7 @@ _BANNED_CPP_FUNCTIONS = ( +@@ -593,7 +593,7 @@ _BANNED_CPP_FUNCTIONS = ( ( "Don't use CallJavascriptFunctionUnsafe() in new code. Instead, use", 'AllowJavascript(), OnJavascriptAllowed()/OnJavascriptDisallowed(),', @@ -4520,7 +4458,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1240,7 +1240,7 @@ _DEPRECATED_MOJO_TYPES = ( +@@ -1219,7 +1219,7 @@ _DEPRECATED_MOJO_TYPES = ( _IPC_ENUM_TRAITS_DEPRECATED = ( 'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n' @@ -4529,7 +4467,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1373,7 +1373,7 @@ _KNOWN_ROBOTS = set( +@@ -1354,7 +1354,7 @@ _KNOWN_ROBOTS = set( 'wpt-autoroller',) ) | set('%s@skia-public.iam.gserviceaccount.com' % s for s in ('chromium-autoroll', 'chromium-release-autoroll') @@ -4538,7 +4476,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for s in ('chromium-internal-autoroll',)) -@@ -1780,7 +1780,7 @@ def _CheckNoDEPSGIT(input_api, output_api): +@@ -1761,7 +1761,7 @@ def _CheckNoDEPSGIT(input_api, output_api): 'Never commit changes to .DEPS.git. This file is maintained by an\n' 'automated system based on what\'s in DEPS and your changes will be\n' 'overwritten.\n' @@ -4547,7 +4485,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'get-the-code#Rolling_DEPS\n' 'for more information')] return [] -@@ -1944,7 +1944,7 @@ def _CheckNoPragmaOnce(input_api, output_api): +@@ -1939,7 +1939,7 @@ def _CheckNoPragmaOnce(input_api, output_api): if files: return [output_api.PresubmitError( 'Do not use #pragma once in header files.\n' @@ -4556,7 +4494,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py files)] return [] -@@ -2150,7 +2150,7 @@ def _CheckForVersionControlConflicts(input_api, output_api): +@@ -2145,7 +2145,7 @@ def _CheckForVersionControlConflicts(input_api, output_api): def _CheckGoogleSupportAnswerUrl(input_api, output_api): @@ -4565,7 +4503,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors = [] for f in input_api.AffectedFiles(): for line_num, line in f.ChangedContents(): -@@ -2259,7 +2259,7 @@ def _CheckNoAbbreviationInPngFileName(input_api, output_api): +@@ -2254,7 +2254,7 @@ def _CheckNoAbbreviationInPngFileName(input_api, output_api): results.append(output_api.PresubmitError( 'The name of PNG files should not have abbreviations. \n' 'Use _hover.png, _center.png, instead of _h.png, _c.png.\n' @@ -4574,7 +4512,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -2963,7 +2963,7 @@ def _CheckIpcOwners(input_api, output_api): +@@ -2960,7 +2960,7 @@ def _CheckIpcOwners(input_api, output_api): if to_check: # If there are any OWNERS files to check, there are IPC-related changes in # this CL. Auto-CC the review list. @@ -4583,7 +4521,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py # Go through the OWNERS files to check, filtering out rules that are already # present in that OWNERS file. -@@ -3187,7 +3187,7 @@ def _CheckAndroidToastUsage(input_api, output_api): +@@ -3184,7 +3184,7 @@ def _CheckAndroidToastUsage(input_api, output_api): 'android.widget.Toast usage is detected. Android toasts use hardware' ' acceleration, and can be\ncostly on low-end devices. Please use' ' org.chromium.ui.widget.Toast instead.\n' @@ -4592,7 +4530,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3318,7 +3318,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): +@@ -3315,7 +3315,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): if errors: results.append(output_api.PresubmitError( 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' @@ -4601,7 +4539,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' if you have any question.', errors)) return results -@@ -3349,7 +3349,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): +@@ -3346,7 +3346,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): results.append(output_api.PresubmitPromptWarning( 'The newly created files include Test classes that inherits from base' ' class. Please do not use inheritance in JUnit4 tests or add new' @@ -4610,7 +4548,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' questions.', errors)) return results -@@ -3373,7 +3373,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): +@@ -3370,7 +3370,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): 'Annotations in android.test.suitebuilder.annotation have been' ' deprecated since API level 24. Please use android.support.test.filters' ' from //third_party/android_support_test_runner:runner_java instead.' @@ -4619,7 +4557,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3393,7 +3393,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): +@@ -3390,7 +3390,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): 'MDPI assets should be placed in /res/drawable-mdpi/ or ' '/res/drawable-ldrtl-mdpi/\ninstead of /res/drawable/ and' '/res/drawable-ldrtl/.\n' @@ -4628,7 +4566,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -4070,7 +4070,7 @@ def _CheckFuzzTargets(input_api, output_api): +@@ -4067,7 +4067,7 @@ def _CheckFuzzTargets(input_api, output_api): 'LLVMFuzzerInitialize should not be used, unless your fuzz target needs ' 'to access command line arguments passed to the fuzzer. Instead, prefer ' 'static initialization and shared resources as documented in ' @@ -4637,7 +4575,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % ( ', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER) ) -@@ -4105,7 +4105,7 @@ def _CheckNewImagesWarning(input_api, output_api): +@@ -4102,7 +4102,7 @@ def _CheckNewImagesWarning(input_api, output_api): errors.append(output_api.PresubmitPromptWarning( 'It looks like you are trying to commit some images. If these are ' 'non-test-only images, please make sure to read and apply the tips in ' @@ -4646,7 +4584,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'binary_size/optimization_advice.md#optimizing-images\nThis check is ' 'FYI only and will not block your CL on the CQ.', image_paths)) return errors -@@ -4378,7 +4378,7 @@ def _CheckForInvalidIfDefinedMacros(input_api, output_api): +@@ -4375,7 +4375,7 @@ def _CheckForInvalidIfDefinedMacros(input_api, output_api): def _CheckForIPCRules(input_api, output_api): """Check for same IPC rules described in @@ -4655,7 +4593,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py """ base_pattern = r'IPC_ENUM_TRAITS\(' inclusion_pattern = input_api.re.compile(r'(%s)' % base_pattern) -@@ -4624,7 +4624,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -4621,7 +4621,7 @@ def CheckChangeOnCommit(input_api, output_api): results.extend(input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -4667,7 +4605,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc --- a/android_webview/browser/aw_browser_context.cc +++ b/android_webview/browser/aw_browser_context.cc -@@ -482,7 +482,7 @@ AwBrowserContext::GetNetworkContextParams( +@@ -483,7 +483,7 @@ AwBrowserContext::GetNetworkContextParams( // should behave like the Android system would. context_params->initial_ssl_config->sha1_local_anchors_enabled = true; // Do not enforce the Legacy Symantec PKI policies outlined in @@ -4781,18 +4719,6 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwFirebaseCon * * @return the Firebase app ID. */ -diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc ---- a/android_webview/renderer/aw_content_renderer_client.cc -+++ b/android_webview/renderer/aw_content_renderer_client.cc -@@ -64,7 +64,7 @@ namespace android_webview { - - namespace { - constexpr char kThrottledErrorDescription[] = -- "Request throttled. Visit http://dev.chromium.org/throttling for more " -+ "Request throttled. Visit http://dev.ch40m1um.qjz9zk/throttling for more " - "information."; - } // namespace - diff --git a/android_webview/tools/record_netlog.py b/android_webview/tools/record_netlog.py --- a/android_webview/tools/record_netlog.py +++ b/android_webview/tools/record_netlog.py @@ -4878,12 +4804,12 @@ diff --git a/ash/app_list/views/assistant/privacy_info_view.cc b/ash/app_list/vi - constexpr char url[] = "https://support.google.com/chromebook?p=assistant"; + constexpr char url[] = "https://support.9oo91e.qjz9zk/chromebook?p=assistant"; view_delegate_->GetAssistantViewDelegate()->OpenUrlFromView( - ash::assistant::util::CreateLocalizedGURL(url)); + assistant::util::CreateLocalizedGURL(url)); } diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd -@@ -443,7 +443,7 @@ This file contains the strings for ash. +@@ -452,7 +452,7 @@ This file contains the strings for ash. @@ -4892,7 +4818,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -691,7 +691,7 @@ This file contains the strings for ash. +@@ -700,7 +700,7 @@ This file contains the strings for ash. Supervised user @@ -4901,7 +4827,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1930,7 +1930,7 @@ This file contains the strings for ash. +@@ -1954,7 +1954,7 @@ This file contains the strings for ash. Multiple sign-in has been disabled @@ -4910,7 +4836,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -2139,7 +2139,7 @@ This file contains the strings for ash. +@@ -2166,7 +2166,7 @@ This file contains the strings for ash. Unlock device to perform the notification action @@ -4922,7 +4848,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd diff --git a/ash/assistant/assistant_interaction_controller.cc b/ash/assistant/assistant_interaction_controller.cc --- a/ash/assistant/assistant_interaction_controller.cc +++ b/ash/assistant/assistant_interaction_controller.cc -@@ -53,8 +53,8 @@ constexpr char kAndroidIntentPrefix[] = "#Intent"; +@@ -53,8 +53,8 @@ using assistant::ui::kWarmerWelcomesMaxTimesTriggered; chromeos::assistant::mojom::AssistantSuggestionPtr CreateSearchSuggestion( const std::string& query) { constexpr char kIconUrl[] = @@ -4948,7 +4874,7 @@ diff --git a/ash/assistant/assistant_setup_controller.cc b/ash/assistant/assista diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link_util.cc --- a/ash/assistant/util/deep_link_util.cc +++ b/ash/assistant/util/deep_link_util.cc -@@ -319,18 +319,18 @@ base::Optional GetAssistantUrl(DeepLinkType type, +@@ -318,18 +318,18 @@ base::Optional GetAssistantUrl(DeepLinkType type, switch (type) { case DeepLinkType::kLists: top_level_url = @@ -4973,7 +4899,7 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link break; default: NOTREACHED(); -@@ -370,7 +370,7 @@ base::Optional GetWebUrl( +@@ -371,7 +371,7 @@ base::Optional GetWebUrl( DeepLinkType type, const std::map& params) { static constexpr char kAssistantSettingsWebUrl[] = @@ -5004,12 +4930,12 @@ diff --git a/ash/login/ui/login_user_menu_view.cc b/ash/login/ui/login_user_menu - "www.chrome.com/manage"; + "www.ch40me.qjz9zk/manage"; - // Spacing between the child view inside the bubble view. - constexpr int kBubbleBetweenChildSpacingDp = 6; + // Vertical margin between username and mail. + constexpr int kUserMenuVerticalMarginUsernameMailDp = 8; diff --git a/ash/public/cpp/app_list/app_list_features.cc b/ash/public/cpp/app_list/app_list_features.cc --- a/ash/public/cpp/app_list/app_list_features.cc +++ b/ash/public/cpp/app_list/app_list_features.cc -@@ -143,7 +143,7 @@ std::string AnswerServerUrl() { +@@ -149,7 +149,7 @@ std::string AnswerServerUrl() { base::GetFieldTrialParamValueByFeature(kEnableAnswerCard, "ServerUrl"); if (!experiment_url.empty()) return experiment_url; @@ -5021,7 +4947,7 @@ diff --git a/ash/public/cpp/app_list/app_list_features.cc b/ash/public/cpp/app_l diff --git a/ash/public/cpp/app_list/internal_app_id_constants.h b/ash/public/cpp/app_list/internal_app_id_constants.h --- a/ash/public/cpp/app_list/internal_app_id_constants.h +++ b/ash/public/cpp/app_list/internal_app_id_constants.h -@@ -30,7 +30,7 @@ constexpr char kInternalAppIdDiscover[] = "pjdncmlmjhcebmcacdddfacepcjmfaoo"; +@@ -27,7 +27,7 @@ constexpr char kInternalAppIdDiscover[] = "pjdncmlmjhcebmcacdddfacepcjmfaoo"; // Generated as // web_app::GenerateAppIdFromURL(GURL( @@ -5048,7 +4974,7 @@ diff --git a/ash/resources/PRESUBMIT.py b/ash/resources/PRESUBMIT.py diff --git a/ash/shell/content/client/shell_browser_main_parts.cc b/ash/shell/content/client/shell_browser_main_parts.cc --- a/ash/shell/content/client/shell_browser_main_parts.cc +++ b/ash/shell/content/client/shell_browser_main_parts.cc -@@ -139,7 +139,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { +@@ -136,7 +136,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { base::Unretained(browser_context_.get()), nullptr), base::BindRepeating(base::IgnoreResult(&EmbeddedBrowser::Create), base::Unretained(browser_context_.get()), @@ -5102,7 +5028,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn "-Wglobal-constructors", ] } -@@ -2067,7 +2067,7 @@ jumbo_component("base") { +@@ -2078,7 +2078,7 @@ jumbo_component("base") { } # Build flags for Control Flow Integrity @@ -5123,7 +5049,7 @@ diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py for more details on the presubmit API built into depot_tools. """ -@@ -25,7 +25,7 @@ def _CheckNoInterfacesInBase(input_api, output_api): +@@ -26,7 +26,7 @@ def _CheckNoInterfacesInBase(input_api, output_api): if len(files): return [ output_api.PresubmitError( 'Objective-C interfaces or categories are forbidden in libbase. ' + @@ -5174,7 +5100,7 @@ diff --git a/base/android/android_image_reader_abi.h b/base/android/android_imag diff --git a/base/android/java/src/org/chromium/base/ApplicationStatus.java b/base/android/java/src/org/chromium/base/ApplicationStatus.java --- a/base/android/java/src/org/chromium/base/ApplicationStatus.java +++ b/base/android/java/src/org/chromium/base/ApplicationStatus.java -@@ -407,7 +407,7 @@ public class ApplicationStatus { +@@ -350,7 +350,7 @@ public class ApplicationStatus { *

* When relying on this method, be familiar with the expected life cycle state * transitions: @@ -5207,7 +5133,7 @@ diff --git a/base/android/java/src/org/chromium/base/LocaleUtils.java b/base/and diff --git a/base/android/java/src/org/chromium/base/PathUtils.java b/base/android/java/src/org/chromium/base/PathUtils.java --- a/base/android/java/src/org/chromium/base/PathUtils.java +++ b/base/android/java/src/org/chromium/base/PathUtils.java -@@ -206,7 +206,7 @@ public abstract class PathUtils { +@@ -198,7 +198,7 @@ public abstract class PathUtils { // TODO(crbug.com/508615): Temporarily allowing disk access until more permanent fix is in. try (StrictModeContext ignored = StrictModeContext.allowDiskReads()) { if (BuildInfo.isAtLeastQ()) { @@ -5240,7 +5166,7 @@ diff --git a/base/android/java/src/org/chromium/base/StrictModeContext.java b/ba diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java --- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java +++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java -@@ -472,7 +472,7 @@ public class LibraryLoader { +@@ -570,7 +570,7 @@ public class LibraryLoader { public static String makeLibraryPathInZipFile( String library, boolean crazyPrefix, boolean is64Bit) { // Determine the ABI string that Android uses to find native libraries. Values are described @@ -5264,7 +5190,7 @@ diff --git a/base/android/jni_generator/PRESUBMIT.py b/base/android/jni_generato diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py --- a/base/android/jni_generator/jni_generator.py +++ b/base/android/jni_generator/jni_generator.py -@@ -738,7 +738,7 @@ def RemoveComments(contents): +@@ -832,7 +832,7 @@ def RemoveComments(contents): # TODO(bulach): This is a bit hacky. It would be cleaner to use a real Java # parser. Maybe we could ditch JNIFromJavaSource and just always use # JNIFromJavaP; or maybe we could rewrite this script in Java and use APT. @@ -5798,7 +5724,7 @@ diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc diff --git a/base/process/memory.h b/base/process/memory.h --- a/base/process/memory.h +++ b/base/process/memory.h -@@ -44,7 +44,7 @@ BASE_EXPORT bool AdjustOOMScore(ProcessId process, int score); +@@ -50,7 +50,7 @@ bool ReleaseAddressSpaceReservation(); namespace win { // Custom Windows exception code chosen to indicate an out of memory error. @@ -5807,18 +5733,6 @@ diff --git a/base/process/memory.h b/base/process/memory.h // "To make sure that you do not define a code that conflicts with an existing // exception code" ... "The resulting error code should therefore have the // highest four bits set to hexadecimal E." -diff --git a/base/process/memory_win.cc b/base/process/memory_win.cc ---- a/base/process/memory_win.cc -+++ b/base/process/memory_win.cc -@@ -46,7 +46,7 @@ namespace { - NOINLINE int OnNoMemory(size_t size) { - // Kill the process. This is important for security since most of code - // does not check the result of memory allocation. -- // https://msdn.microsoft.com/en-us/library/het71c37.aspx -+ // https://msdn.m1cr050ft.qjz9zk/en-us/library/het71c37.aspx - // Pass the size of the failed request in an exception argument. - ULONG_PTR exception_args[] = {size}; - ::RaiseException(win::kOomExceptionCode, EXCEPTION_NONCONTINUABLE, diff --git a/base/process/process.h b/base/process/process.h --- a/base/process/process.h +++ b/base/process/process.h @@ -5894,7 +5808,7 @@ diff --git a/base/system/sys_info.h b/base/system/sys_info.h diff --git a/base/task/sequence_manager/sequence_manager_impl.cc b/base/task/sequence_manager/sequence_manager_impl.cc --- a/base/task/sequence_manager/sequence_manager_impl.cc +++ b/base/task/sequence_manager/sequence_manager_impl.cc -@@ -1189,7 +1189,7 @@ void SequenceManagerImpl::RecordCrashKeys(const PendingTask& pending_task) { +@@ -1170,7 +1170,7 @@ void SequenceManagerImpl::RecordCrashKeys(const PendingTask& pending_task) { // this. // // See @@ -6063,7 +5977,7 @@ diff --git a/base/third_party/nspr/prtime.h b/base/third_party/nspr/prtime.h diff --git a/base/third_party/symbolize/symbolize.cc b/base/third_party/symbolize/symbolize.cc --- a/base/third_party/symbolize/symbolize.cc +++ b/base/third_party/symbolize/symbolize.cc -@@ -872,7 +872,7 @@ public: +@@ -886,7 +886,7 @@ public: bool ready; SymInitializer() : process(NULL), ready(false) { // Initialize the symbol handler. @@ -6072,7 +5986,7 @@ diff --git a/base/third_party/symbolize/symbolize.cc b/base/third_party/symboliz process = GetCurrentProcess(); // Defer symbol loading. // We do not request undecorated symbols with SYMOPT_UNDNAME -@@ -898,7 +898,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, +@@ -912,7 +912,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, return false; } // Resolve symbol information from address. @@ -6084,8 +5998,8 @@ diff --git a/base/third_party/symbolize/symbolize.cc b/base/third_party/symboliz diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc --- a/base/threading/platform_thread_win.cc +++ b/base/threading/platform_thread_win.cc -@@ -38,7 +38,7 @@ constexpr int kWin7BackgroundThreadModePriority = 4; - constexpr int kWin7NormalPriority = 3; +@@ -42,7 +42,7 @@ constexpr int kWinNormalPriority1 = 5; + constexpr int kWinNormalPriority2 = 6; // The information on how to set the thread name comes from -// a MSDN article: http://msdn2.microsoft.com/en-us/library/xcb2z8hs.aspx @@ -6093,27 +6007,24 @@ diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thr const DWORD kVCThreadNameException = 0x406D1388; typedef struct tagTHREADNAME_INFO { -@@ -148,7 +148,7 @@ bool CreateThreadInternal(size_t stack_size, - // will have to work running on CreateThread() threads anyway, since we run - // code on the Windows thread pool, etc. For some background on the - // difference: -- // http://www.microsoft.com/msj/1099/win32/win321099.aspx -+ // http://www.m1cr050ft.qjz9zk/msj/1099/win32/win321099.aspx - thread_handle = - ::CreateThread(nullptr, stack_size, ThreadFunc, params, flags, nullptr); - } -diff --git a/base/threading/platform_thread_win.h b/base/threading/platform_thread_win.h ---- a/base/threading/platform_thread_win.h -+++ b/base/threading/platform_thread_win.h -@@ -18,7 +18,7 @@ namespace features { - // ThreadPriority::BACKGROUND threads. This lowers the disk and network I/O - // priority of the thread in addition to the CPU scheduling priority. MSDN - // recommends using this setting for threads that perform background work. --// https://docs.microsoft.com/en-us/windows/desktop/api/processthreadsapi/nf-processthreadsapi-setthreadpriority -+// https://docs.m1cr050ft.qjz9zk/en-us/windows/desktop/api/processthreadsapi/nf-processthreadsapi-setthreadpriority - BASE_EXPORT extern const Feature kWindowsThreadModeBackground; +@@ -147,7 +147,7 @@ bool CreateThreadInternal(size_t stack_size, + // faster and doesn't require the loader lock to be available. Our code will + // have to work running on CreateThread() threads anyway, since we run code on + // the Windows thread pool, etc. For some background on the difference: +- // http://www.microsoft.com/msj/1099/win32/win321099.aspx ++ // http://www.m1cr050ft.qjz9zk/msj/1099/win32/win321099.aspx + void* thread_handle = + ::CreateThread(nullptr, stack_size, ThreadFunc, params, flags, nullptr); - } // namespace features +@@ -342,7 +342,7 @@ void PlatformThread::SetCurrentThreadPriorityImpl(ThreadPriority priority) { + case ThreadPriority::BACKGROUND: + // Using THREAD_MODE_BACKGROUND_BEGIN instead of THREAD_PRIORITY_LOWEST + // improves input latency and navigation time. See +- // https://docs.google.com/document/d/16XrOwuwTwKWdgPbcKKajTmNqtB4Am8TgS9GjbzBYLc0 ++ // https://docs.9oo91e.qjz9zk/document/d/16XrOwuwTwKWdgPbcKKajTmNqtB4Am8TgS9GjbzBYLc0 + // + // MSDN recommends THREAD_MODE_BACKGROUND_BEGIN for threads that perform + // background work, as it reduces disk and memory priority in addition to diff --git a/base/time/time.h b/base/time/time.h --- a/base/time/time.h +++ b/base/time/time.h @@ -6138,7 +6049,7 @@ diff --git a/base/time/time_win.cc b/base/time/time_win.cc // // The default windows timer, GetSystemTimeAsFileTime is not very precise. // It is only good to ~15.5ms. -@@ -131,7 +131,7 @@ uint64_t QPCNowRaw() { +@@ -168,7 +168,7 @@ uint64_t QPCNowRaw() { LARGE_INTEGER perf_counter_now = {}; // According to the MSDN documentation for QueryPerformanceCounter(), this // will never fail on systems that run XP or later. @@ -6147,7 +6058,7 @@ diff --git a/base/time/time_win.cc b/base/time/time_win.cc ::QueryPerformanceCounter(&perf_counter_now); return perf_counter_now.QuadPart; } -@@ -608,7 +608,7 @@ bool TimeTicks::IsConsistentAcrossProcesses() { +@@ -641,7 +641,7 @@ bool TimeTicks::IsConsistentAcrossProcesses() { // Vista. So if we are using QPC then we are consistent which is the same as // being high resolution. // @@ -6156,7 +6067,7 @@ diff --git a/base/time/time_win.cc b/base/time/time_win.cc // // "In general, the performance counter results are consistent across all // processors in multi-core and multi-processor systems, even when measured on -@@ -724,7 +724,7 @@ double ThreadTicks::TSCTicksPerSecond() { +@@ -757,7 +757,7 @@ double ThreadTicks::TSCTicksPerSecond() { // stddev of less than 1 tick/us between multiple runs. // Note: According to the MSDN documentation for QueryPerformanceFrequency(), // this will never fail on systems that run XP or later. @@ -6189,8 +6100,8 @@ diff --git a/base/trace_event/malloc_dump_provider.cc b/base/trace_event/malloc_ resident_size = stats.size_in_use; #elif defined(OS_WIN) // This is too expensive on Windows, crbug.com/780735. -@@ -141,7 +141,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, - +@@ -136,7 +136,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + struct mallinfo info = mallinfo(); // In case of Android's jemalloc |arena| is 0 and the outer pages size is // reported by |hblkhd|. In case of dlmalloc the total is given by - // |arena| + |hblkhd|. For more details see link: http://goo.gl/fMR8lF. @@ -6249,7 +6160,7 @@ diff --git a/base/win/pe_image.h b/base/win/pe_image.h diff --git a/base/win/registry.cc b/base/win/registry.cc --- a/base/win/registry.cc +++ b/base/win/registry.cc -@@ -142,7 +142,7 @@ LONG RegKey::CreateKey(const wchar_t* name, REGSAM access) { +@@ -155,7 +155,7 @@ LONG RegKey::CreateKey(const wchar_t* name, REGSAM access) { // the [KEY_WOW64_32KEY / KEY_WOW64_64KEY] flags, all subsequent operations // (create, delete, or open) on child registry keys must explicitly use the // same flag. Otherwise, there can be unexpected behavior. @@ -6258,7 +6169,7 @@ diff --git a/base/win/registry.cc b/base/win/registry.cc if ((access & kWow64AccessMask) != wow64access_) { NOTREACHED(); return ERROR_INVALID_PARAMETER; -@@ -179,7 +179,7 @@ LONG RegKey::OpenKey(const wchar_t* relative_key_name, REGSAM access) { +@@ -192,7 +192,7 @@ LONG RegKey::OpenKey(const wchar_t* relative_key_name, REGSAM access) { // the [KEY_WOW64_32KEY / KEY_WOW64_64KEY] flags, all subsequent operations // (create, delete, or open) on child registry keys must explicitly use the // same flag. Otherwise, there can be unexpected behavior. @@ -6267,7 +6178,7 @@ diff --git a/base/win/registry.cc b/base/win/registry.cc if ((access & kWow64AccessMask) != wow64access_) { NOTREACHED(); return ERROR_INVALID_PARAMETER; -@@ -556,7 +556,7 @@ bool RegistryValueIterator::Read() { +@@ -575,7 +575,7 @@ bool RegistryValueIterator::Read() { // Registry key names are limited to 255 characters and fit within // MAX_PATH (which is 260) but registry value names can use up to 16,383 // characters and the value itself is not limited @@ -6279,7 +6190,7 @@ diff --git a/base/win/registry.cc b/base/win/registry.cc diff --git a/base/win/registry.h b/base/win/registry.h --- a/base/win/registry.h +++ b/base/win/registry.h -@@ -162,7 +162,7 @@ class BASE_EXPORT RegistryValueIterator { +@@ -164,7 +164,7 @@ class BASE_EXPORT RegistryValueIterator { // KEY_WOW64_32KEY or KEY_WOW64_64KEY, or 0. // Note: |wow64access| should be the same access used to open |root_key| // previously, or a predefined key (e.g. HKEY_LOCAL_MACHINE). @@ -6288,7 +6199,7 @@ diff --git a/base/win/registry.h b/base/win/registry.h RegistryValueIterator(HKEY root_key, const wchar_t* folder_key, REGSAM wow64access); -@@ -215,7 +215,7 @@ class BASE_EXPORT RegistryKeyIterator { +@@ -217,7 +217,7 @@ class BASE_EXPORT RegistryKeyIterator { // KEY_WOW64_32KEY or KEY_WOW64_64KEY, or 0. // Note: |wow64access| should be the same access used to open |root_key| // previously, or a predefined key (e.g. HKEY_LOCAL_MACHINE). @@ -6306,13 +6217,13 @@ diff --git a/base/win/scoped_com_initializer.cc b/base/win/scoped_com_initialize // COINIT_DISABLE_OLE1DDE is always added based on: - // https://docs.microsoft.com/en-us/windows/desktop/learnwin32/initializing-the-com-library + // https://docs.m1cr050ft.qjz9zk/en-us/windows/desktop/learnwin32/initializing-the-com-library - hr_ = CoInitializeEx(NULL, init | COINIT_DISABLE_OLE1DDE); + hr_ = CoInitializeEx(nullptr, init | COINIT_DISABLE_OLE1DDE); DCHECK_NE(RPC_E_CHANGED_MODE, hr_) << "Invalid COM thread model change"; } diff --git a/base/win/shortcut.h b/base/win/shortcut.h --- a/base/win/shortcut.h +++ b/base/win/shortcut.h -@@ -62,14 +62,14 @@ struct BASE_EXPORT ShortcutProperties { +@@ -63,14 +63,14 @@ struct BASE_EXPORT ShortcutProperties { } void set_arguments(const std::wstring& arguments_in) { @@ -6341,7 +6252,7 @@ diff --git a/base/win/win_util.cc b/base/win/win_util.cc bool EnablePerMonitorV2() { if (!IsUser32AndGdi32Available()) return false; -@@ -392,7 +392,7 @@ bool GetUserSidString(std::wstring* user_sid) { +@@ -394,7 +394,7 @@ bool GetUserSidString(std::wstring* user_sid) { bool UserAccountControlIsEnabled() { // This can be slow if Windows ends up going to disk. Should watch this key // for changes and only read it once, preferably on the file thread. @@ -6359,16 +6270,16 @@ diff --git a/base/win/win_util.cc b/base/win/win_util.cc DCHECK_LT(lstrlen(app_id), 64); DCHECK_EQ(wcschr(app_id, L' '), nullptr); -@@ -550,7 +550,7 @@ bool IsDeviceUsedAsATablet(std::string* reason) { +@@ -549,7 +549,7 @@ bool IsDeviceUsedAsATablet(std::string* reason) { // If the device is not supporting rotation, it's unlikely to be a tablet, // a convertible or a detachable. // See - // https://msdn.microsoft.com/en-us/library/windows/desktop/dn629263(v=vs.85).aspx + // https://msdn.m1cr050ft.qjz9zk/en-us/library/windows/desktop/dn629263(v=vs.85).aspx - typedef decltype(GetAutoRotationState)* GetAutoRotationStateType; + using GetAutoRotationStateType = decltype(GetAutoRotationState)*; static const auto get_auto_rotation_state_func = reinterpret_cast( -@@ -785,7 +785,7 @@ bool IsRunningUnderDesktopName(WStringPiece desktop_name) { +@@ -784,7 +784,7 @@ bool IsRunningUnderDesktopName(WStringPiece desktop_name) { // This method is used to detect whether current session is a remote session. // See: @@ -6392,7 +6303,7 @@ diff --git a/base/win/win_util.h b/base/win/win_util.h diff --git a/base/win/wincrypt_shim.h b/base/win/wincrypt_shim.h --- a/base/win/wincrypt_shim.h +++ b/base/win/wincrypt_shim.h -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ #include // Undefine the macros which conflict with OpenSSL and define replacements. See @@ -6470,7 +6381,7 @@ diff --git a/build/android/PRESUBMIT.py b/build/android/PRESUBMIT.py diff --git a/build/android/apk_operations.py b/build/android/apk_operations.py --- a/build/android/apk_operations.py +++ b/build/android/apk_operations.py -@@ -418,7 +418,7 @@ def _DuHelper(device, path_spec, run_as=None): +@@ -404,7 +404,7 @@ def _DuHelper(device, path_spec, run_as=None): def _RunDiskUsage(devices, package_name): # Measuring dex size is a bit complicated: @@ -6518,7 +6429,7 @@ diff --git a/build/android/gyp/assert_static_initializers.py b/build/android/gyp diff --git a/build/android/gyp/compile_resources.py b/build/android/gyp/compile_resources.py --- a/build/android/gyp/compile_resources.py +++ b/build/android/gyp/compile_resources.py -@@ -482,7 +482,7 @@ def _VerifyManifest(actual_manifest, expected_manifest, normalized_manifest, +@@ -477,7 +477,7 @@ def _VerifyManifest(actual_manifest, expected_manifest, normalized_manifest, msg_header = """\ AndroidManifest.xml expectations file needs updating. For details see: @@ -6527,33 +6438,12 @@ diff --git a/build/android/gyp/compile_resources.py b/build/android/gyp/compile_ """ sys.stderr.write(msg_header) sys.stderr.write(msg) -diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py ---- a/build/android/gyp/javac.py -+++ b/build/android/gyp/javac.py -@@ -46,7 +46,7 @@ ERRORPRONE_WARNINGS_TO_TURN_OFF = [ - # TODO(crbug.com/1027683): Follow steps in bug. - 'UnnecessaryParentheses', - # Android platform default is always UTF-8. -- # https://developer.android.com/reference/java/nio/charset/Charset.html#defaultCharset() -+ # https://developer.8n6r01d.qjz9zk/reference/java/nio/charset/Charset.html#defaultCharset() - 'DefaultCharset', - # Low priority since the alternatives still work. - 'JdkObsolete', -@@ -60,7 +60,7 @@ ERRORPRONE_WARNINGS_TO_TURN_OFF = [ - 'ThreadJoinLoop', - # Low priority corner cases with String.split. - # Linking Guava and using Splitter was rejected -- # in the https://chromium-review.googlesource.com/c/chromium/src/+/871630. -+ # in the https://chromium-review.9oo91esource.qjz9zk/c/chromium/src/+/871630. - 'StringSplitter', - # Preferred to use another method since it propagates exceptions better. - 'ClassNewInstance', diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py --- a/build/android/gyp/lint.py +++ b/build/android/gyp/lint.py -@@ -20,7 +20,7 @@ from xml.etree import ElementTree - from util import build_utils +@@ -21,7 +21,7 @@ from util import build_utils from util import manifest_utils + from util import md5_check -_LINT_MD_URL = 'https://chromium.googlesource.com/chromium/src/+/master/build/android/docs/lint.md' # pylint: disable=line-too-long +_LINT_MD_URL = 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/build/android/docs/lint.md' # pylint: disable=line-too-long @@ -6575,16 +6465,7 @@ diff --git a/build/android/gyp/main_dex_list.py b/build/android/gyp/main_dex_lis diff --git a/build/android/gyp/merge_manifest.py b/build/android/gyp/merge_manifest.py --- a/build/android/gyp/merge_manifest.py +++ b/build/android/gyp/merge_manifest.py -@@ -34,7 +34,7 @@ def _ProcessManifest(manifest_path, min_sdk_version, target_sdk_version, - """Patches an Android manifest to always include the 'tools' namespace - declaration, as it is not propagated by the manifest merger from the SDK. - -- See https://issuetracker.google.com/issues/63411481 -+ See https://issuetracker.9oo91e.qjz9zk/issues/63411481 - """ - doc, manifest, _ = manifest_utils.ParseManifest(manifest_path) - manifest_utils.AssertUsesSdk(manifest, min_sdk_version, target_sdk_version, -@@ -125,7 +125,7 @@ def main(argv): +@@ -128,7 +128,7 @@ def main(argv): 'PACKAGE=' + package, ] build_utils.CheckOutput(cmd, @@ -6605,7 +6486,7 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py """ sys.stderr.write(msg_header) sys.stderr.write(msg) -@@ -261,7 +261,7 @@ def _OptimizeWithR8(options, +@@ -257,7 +257,7 @@ def _OptimizeWithR8(options, cmd, env=env, print_stdout=print_stdout, stderr_filter=stderr_filter) except build_utils.CalledProcessError as err: debugging_link = ('R8 failed. Please see {}.'.format( @@ -6699,8 +6580,8 @@ diff --git a/build/android/pylib/device/commands/java/src/org/chromium/android/c -package org.chromium.android.commands.unzip; +package org.chromium.8n6r01d.qjz9zkmands.unzip; - import android.util.Log; - + import java.io.BufferedInputStream; + import java.io.BufferedOutputStream; diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device_settings.py --- a/build/android/pylib/device_settings.py +++ b/build/android/pylib/device_settings.py @@ -6909,7 +6790,7 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn 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 -@@ -1739,7 +1739,7 @@ if (enable_java_templates) { +@@ -1699,7 +1699,7 @@ if (enable_java_templates) { # * public.txt # * annotations.zip # * assets/ @@ -6933,7 +6814,7 @@ diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni --- a/build/config/chromeos/rules.gni +++ b/build/config/chromeos/rules.gni -@@ -197,7 +197,7 @@ template("tast_test") { +@@ -193,7 +193,7 @@ template("tast_test") { if (!defined(tast_attr_expr) && !defined(tast_tests)) { # The following expression filters out all non-critical tests. See the link # below for more details: @@ -6945,7 +6826,7 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -359,7 +359,7 @@ config("compiler") { +@@ -349,7 +349,7 @@ config("compiler") { defines += [ # _FILE_OFFSET_BITS=64 should not be set on Android in order to maintain # the behavior of the Android NDK from earlier versions. @@ -6954,7 +6835,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", -@@ -440,7 +440,7 @@ config("compiler") { +@@ -423,7 +423,7 @@ config("compiler") { ldflags += [ # Experimentation found that using four linking threads # saved ~20% of link time. @@ -6963,8 +6844,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn # Only apply this to the target linker, since the host # linker might not be gold, but isn't used much anyway. "-Wl,--threads", -@@ -669,7 +669,7 @@ config("compiler") { - } +@@ -663,7 +663,7 @@ config("compiler") { + ] } - # Work-around for http://openradar.appspot.com/20356002 @@ -6975,12 +6856,12 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni --- a/build/config/compiler/compiler.gni +++ b/build/config/compiler/compiler.gni -@@ -200,7 +200,7 @@ declare_args() { +@@ -213,7 +213,7 @@ declare_args() { # results independent of the checkout and build directory names, which # in turn is important for goma compile hit rate. # Setting this to true may make it harder to debug binaries on Linux, see --# https://chromium.googlesource.com/chromium/src/+/master/docs/linux_debugging.md#Source-level-debug-with-fdebug_compilation_dir -+# https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_debugging.md#Source-level-debug-with-fdebug_compilation_dir +-# https://chromium.googlesource.com/chromium/src/+/master/docs/linux/debugging.md#Source-level-debug-with-fdebug_compilation_dir ++# https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/debugging.md#Source-level-debug-with-fdebug_compilation_dir # It's not clear if the crash server will correctly handle dSYMs with relative # paths, so we disable this feature for official benefit. The main benefit is # deterministic builds to reduce compile times, so this is less relevant for @@ -7035,7 +6916,7 @@ diff --git a/build/config/nacl/rules.gni b/build/config/nacl/rules.gni diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sanitizers.gni --- a/build/config/sanitizers/sanitizers.gni +++ b/build/config/sanitizers/sanitizers.gni -@@ -77,7 +77,7 @@ declare_args() { +@@ -73,7 +73,7 @@ declare_args() { use_cfi_recover = false # Compile for fuzzing with LLVM LibFuzzer. @@ -7047,7 +6928,7 @@ diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sa diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn --- a/build/config/win/BUILD.gn +++ b/build/config/win/BUILD.gn -@@ -356,7 +356,7 @@ config("common_linker_setup") { +@@ -349,7 +349,7 @@ config("common_linker_setup") { config("cfi_linker") { # Control Flow Guard (CFG) @@ -7056,7 +6937,7 @@ diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn # /DYNAMICBASE (ASLR) is turned off in debug builds, therefore CFG can’t be # turned on either. # CFG seems to lead to random corruption with incremental linking so turn off -@@ -453,7 +453,7 @@ config("delayloads_not_for_child_dll") { +@@ -446,7 +446,7 @@ config("delayloads_not_for_child_dll") { # CRT -------------------------------------------------------------------------- # Configures how the runtime library (CRT) is going to be used. @@ -7065,7 +6946,7 @@ diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn # what each value does. config("default_crt") { if (is_component_build) { -@@ -463,7 +463,7 @@ config("default_crt") { +@@ -456,7 +456,7 @@ config("default_crt") { configs = [ ":dynamic_crt" ] } else { if (current_os == "winuwp") { @@ -7137,7 +7018,7 @@ diff --git a/build/mac/tweak_info_plist.py b/build/mac/tweak_info_plist.py diff --git a/build/mac_toolchain.py b/build/mac_toolchain.py --- a/build/mac_toolchain.py +++ b/build/mac_toolchain.py -@@ -70,7 +70,7 @@ def RequestCipdAuthentication(): +@@ -76,7 +76,7 @@ def RequestCipdAuthentication(): print() print('and follow the instructions.') print() @@ -7274,7 +7155,7 @@ diff --git a/build/toolchain/win/rc/rc.py b/build/toolchain/win/rc/rc.py diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py --- a/build/vs_toolchain.py +++ b/build/vs_toolchain.py -@@ -184,7 +184,7 @@ def DetectVisualStudioPath(): +@@ -176,7 +176,7 @@ def DetectVisualStudioPath(): # The VC++ >=2017 install location needs to be located using COM instead of # the registry. For details see: @@ -7298,7 +7179,16 @@ diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt diff --git a/buildtools/README.txt b/buildtools/README.txt --- a/buildtools/README.txt +++ b/buildtools/README.txt -@@ -36,7 +36,7 @@ ADDING BINARIES MANUALLY +@@ -3,7 +3,7 @@ projects. The actual binaries are pulled from Google Storage, normally as part + of a gclient hook. + + This directory also exists as a stand-alone git mirror at +-https://chromium.googlesource.com/chromium/src/buildtools/. ++https://chromium.9oo91esource.qjz9zk/chromium/src/buildtools/. + That mirror exists so that the shared build tools can be shared between + the various Chromium-related projects without each one needing to maintain + their own versionining of each binary. +@@ -14,7 +14,7 @@ ADDING BINARIES MANUALLY One uploads new versions of the tools using the 'gsutil' binary from the Google Storage SDK: @@ -7379,8 +7269,8 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont -// Contact tedchoc@chromium.org for questions about changing these values. +// Contact tedchoc@ch40m1um.qjz9zk for questions about changing these values. const int64_t kShowHideMaxDurationMs = 200; - } - + // TODO(sinansahin): Temporary value, pending UX guidance probably. + const int64_t kHeightChangeDurationMs = 200; diff --git a/cc/input/scroll_state.h b/cc/input/scroll_state.h --- a/cc/input/scroll_state.h +++ b/cc/input/scroll_state.h @@ -7408,16 +7298,7 @@ diff --git a/cc/tiles/gpu_image_decode_cache.h b/cc/tiles/gpu_image_decode_cache diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -3907,7 +3907,7 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollBegin( - bool scroll_on_main_thread = false; - - // TODO(bokan): This appears Mac-specific - from -- // https://codereview.chromium.org/2486673008 Suspect it is unnecessary - a -+ // https://codereview.ch40m1um.qjz9zk/2486673008 Suspect it is unnecessary - a - // fling should just produce GSUs without an intermediate GSB and GSE. - if (scroll_state->is_in_inertial_phase()) - scrolling_node = CurrentlyScrollingNode(); -@@ -5264,7 +5264,7 @@ void LayerTreeHostImpl::SetFullViewportDamage() { +@@ -5230,7 +5230,7 @@ void LayerTreeHostImpl::SetFullViewportDamage() { // the internal viewport rect. In the case of Android WebView, // GetDeviceViewport returns the external viewport, but we still want to use // the internal viewport's origin for setting the damage. @@ -7429,7 +7310,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -309,7 +309,7 @@ if (!is_android && !is_mac) { +@@ -285,7 +285,7 @@ if (!is_android && !is_mac) { ldflags = [] # Chrome OS debug builds for arm need to pass --long-plt to the linker. @@ -7450,6 +7331,18 @@ diff --git a/chrome/PRESUBMIT.py b/chrome/PRESUBMIT.py for more details about the presubmit API built into depot_tools. """ +diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn +--- a/chrome/android/BUILD.gn ++++ b/chrome/android/BUILD.gn +@@ -2865,7 +2865,7 @@ android_library("native_java_unittests_java") { + annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] + } + +-# See https://bugs.chromium.org/p/chromium/issues/detail?id=908819 for why we ++# See https://bugs.ch40m1um.qjz9zk/p/chromium/issues/detail?id=908819 for why we + # can't put 'java' in the name here. + generate_jni("native_j_unittests_jni_headers") { + testonly = true diff --git a/chrome/android/examples/partner_browser_customizations_provider/res/values/strings.xml b/chrome/android/examples/partner_browser_customizations_provider/res/values/strings.xml --- a/chrome/android/examples/partner_browser_customizations_provider/res/values/strings.xml +++ b/chrome/android/examples/partner_browser_customizations_provider/res/values/strings.xml @@ -7514,8 +7407,8 @@ diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/ch diff --git a/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd b/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd --- a/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd +++ b/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd -@@ -149,7 +149,7 @@ - Chrome will send the site’s URL and content as well as your email and credit card type saved in Chrome to Google. You can turn this off in Chrome settings. <link>Learn more</link> +@@ -179,7 +179,7 @@ + To help you complete tasks, Google will receive the URLs and contents of sites on which you use Assistant, as well as information you submit through Assistant. This information may be stored in your Google account. You can turn off Assistant in Chrome settings. <link>Learn more</link> - http://support.google.com/assistant?p=fast_checkout @@ -7582,25 +7475,13 @@ diff --git a/chrome/android/java/res/layout/content_suggestions_card_modern_reve +++ b/chrome/android/java/res/layout/content_suggestions_card_modern_reversed.xml @@ -65,7 +65,7 @@ android:ellipsize="end" - android:textAppearance="@style/TextAppearance.BlackCaption" + android:textAppearance="@style/TextAppearance.TextSmall.Secondary" android:textDirection="locale" - tools:text="chromium.org"/> + tools:text="ch40m1um.qjz9zk"/> - - diff --git a/chrome/android/java/res/values-sw600dp/values.xml b/chrome/android/java/res/values-sw600dp/values.xml --- a/chrome/android/java/res/values-sw600dp/values.xml +++ b/chrome/android/java/res/values-sw600dp/values.xml @@ -7616,7 +7497,7 @@ diff --git a/chrome/android/java/res/values-sw600dp/values.xml b/chrome/android/ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml -@@ -254,7 +254,7 @@ +@@ -236,7 +236,7 @@ icon was auto-generated by Chrome and whether the icon is bigger than a threshold. --> 48dp 56dp - + diff --git a/chrome/android/java/res/values/strings.xml b/chrome/android/java/res/values/strings.xml --- a/chrome/android/java/res/values/strings.xml +++ b/chrome/android/java/res/values/strings.xml @@ -7673,7 +7554,7 @@ diff --git a/chrome/android/java/src/PRESUBMIT.py b/chrome/android/java/src/PRES diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java -@@ -165,7 +165,7 @@ public class ChromeApplication extends Application { +@@ -192,7 +192,7 @@ public class ChromeApplication extends Application { private void checkAppBeingReplaced() { // During app update the old apk can still be triggered by broadcasts and spin up an // out-of-date application. Kill old applications in this bad state. See @@ -7700,8 +7581,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeStringCon 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 -@@ -200,7 +200,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo - +@@ -173,7 +173,7 @@ import java.util.Locale; + public class ChromeTabbedActivity extends ChromeActivity { private static final String TAG = "ChromeTabbedActivity"; - private static final String HELP_URL_PREFIX = "https://support.google.com/chrome/"; @@ -7709,7 +7590,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct private static final String WINDOW_INDEX = "window_index"; -@@ -1363,7 +1363,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo +@@ -1324,7 +1324,7 @@ public class ChromeTabbedActivity extends ChromeActivity { break; case TabOpenType.CLOBBER_CURRENT_TAB: // The browser triggered the intent. This happens when clicking links which @@ -7721,7 +7602,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java -@@ -215,10 +215,10 @@ public class IntentHandler { +@@ -217,10 +217,10 @@ public class IntentHandler { private static final String PACKAGE_WHATSAPP = "com.whatsapp"; private static final String PACKAGE_YAHOO_MAIL = "com.yahoo.mobile.client.android.mail"; private static final String PACKAGE_VIBER = "com.viber.voip"; @@ -7750,7 +7631,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java -@@ -103,7 +103,7 @@ public class ShortcutHelper { +@@ -105,7 +105,7 @@ public class ShortcutHelper { private static final String INSTALL_SHORTCUT = "com.android.launcher.action.INSTALL_SHORTCUT"; // These sizes are from the Material spec for icons: @@ -7762,7 +7643,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ClientAppBroadcastReceiver.java b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ClientAppBroadcastReceiver.java --- a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ClientAppBroadcastReceiver.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ClientAppBroadcastReceiver.java -@@ -29,17 +29,17 @@ import java.util.Set; +@@ -30,17 +30,17 @@ import javax.inject.Inject; * Trusted Web Activities are registered to an origin (eg https://www.example.com), however because * cookies can be scoped more loosely, at eTLD+1 (or domain) level (eg *.example.com) [1], we need * to clear data at that level. This unfortunately can lead to too much data getting cleared - for @@ -7811,7 +7692,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java -@@ -335,7 +335,7 @@ public class CompositorViewHolder extends FrameLayout +@@ -359,7 +359,7 @@ public class CompositorViewHolder extends FrameLayout // layout than required in cases that you're editing in Chrome UI outside of the web // contents. // @@ -7919,18 +7800,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar * * All controls are padded from the infobar boundary by the same amount, but different types of * control groups are bound by different widths and have different margins: -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ModalDialogView.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ModalDialogView.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ModalDialogView.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ModalDialogView.java -@@ -75,7 +75,7 @@ public class ModalDialogView extends BoundedLinearLayout implements View.OnClick - - // If the scroll view can not be scrolled, make the scroll view not focusable so that the - // focusing behavior for hardware keyboard is less confusing. -- // See https://codereview.chromium.org/2939883002. -+ // See https://codereview.ch40m1um.qjz9zk/2939883002. - mScrollView.addOnLayoutChangeListener( - (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { - boolean isScrollable = v.canScrollVertically(-1) || v.canScrollVertically(1); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/night_mode/RemoteViewsWithNightModeInflater.java b/chrome/android/java/src/org/chromium/chrome/browser/night_mode/RemoteViewsWithNightModeInflater.java --- a/chrome/android/java/src/org/chromium/chrome/browser/night_mode/RemoteViewsWithNightModeInflater.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/night_mode/RemoteViewsWithNightModeInflater.java @@ -7972,7 +7841,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/N diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java -@@ -481,7 +481,7 @@ public class NotificationPlatformBridge { +@@ -482,7 +482,7 @@ public class NotificationPlatformBridge { * notification is replacing another notification. * @param silent Whether the default sound, vibration and lights should be suppressed. * @param actions Action buttons to display alongside the notification. @@ -8136,7 +8005,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggest diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionViewProperties.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionViewProperties.java --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionViewProperties.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionViewProperties.java -@@ -32,7 +32,7 @@ public class SuggestionViewProperties { +@@ -27,7 +27,7 @@ public class SuggestionViewProperties { @Retention(RetentionPolicy.SOURCE) public @interface SuggestionIcon { // This enum is used to back UMA histograms, and should therefore be treated as append-only. @@ -8169,7 +8038,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggest diff --git a/chrome/android/java/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopup.java --- a/chrome/android/java/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopup.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopup.java -@@ -43,7 +43,7 @@ public class ConnectionInfoPopup implements OnClickListener, ModalDialogProperti +@@ -42,7 +42,7 @@ public class ConnectionInfoPopup implements OnClickListener, ModalDialogProperti private static final String TAG = "ConnectionInfoPopup"; private static final String HELP_URL = @@ -8181,7 +8050,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/page_info/Conne diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java -@@ -52,7 +52,7 @@ import java.util.Set; +@@ -53,7 +53,7 @@ import java.util.Set; /** * The point of interaction with a locally installed 3rd party native Android payment app. @@ -8190,7 +8059,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/Androi */ public class AndroidPaymentApp extends PaymentInstrument implements PaymentApp, WindowAndroid.IntentCallback { -@@ -179,7 +179,7 @@ public class AndroidPaymentApp +@@ -180,7 +180,7 @@ public class AndroidPaymentApp // ServiceConnection itself -- this binding to the service will remain active, and you // will receive a call to onServiceConnected(ComponentName, IBinder) when the Service is // next running." @@ -8199,7 +8068,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/Androi @Override public void onServiceDisconnected(ComponentName name) { // Do not wait for the service to restart. -@@ -196,7 +196,7 @@ public class AndroidPaymentApp +@@ -197,7 +197,7 @@ public class AndroidPaymentApp // service or if your client doesn't have permission to bind to it. If this value is // true, you should later call unbindService(ServiceConnection) to release the // connection." @@ -8208,7 +8077,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/Androi mIsServiceBindingInitiated = ContextUtils.getApplicationContext().bindService( mIsReadyToPayIntent, mServiceConnection, Context.BIND_AUTO_CREATE); } catch (SecurityException e) { -@@ -217,7 +217,7 @@ public class AndroidPaymentApp +@@ -218,7 +218,7 @@ public class AndroidPaymentApp if (mServiceConnection != null) { if (mIsServiceBindingInitiated) { // mServiceConnection "parameter must not be null." @@ -8265,7 +8134,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/Paymen diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java -@@ -1158,7 +1158,7 @@ public class PaymentRequestImpl +@@ -1159,7 +1159,7 @@ public class PaymentRequestImpl if (googlePayBridgeEligible) { // If skip-to-GPay flow is activated, ignore all other payment methods, which can be @@ -8274,23 +8143,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/Paymen // because merchant has already requested Google Pay. if (!method.equals(MethodStrings.GOOGLE_PAY)) continue; if (methodData[i].gpayBridgeData != null -@@ -1264,10 +1264,10 @@ public class PaymentRequestImpl - if (TextUtils.isEmpty(canDedupedApplicationId)) continue; - canDedupedApplicationIds.add(canDedupedApplicationId); - // Add the trailing slash, because Service worker registration scope is a directory path -- // that must end with a '/' (e.g., "https://google.com/pay/"), whereas -+ // that must end with a '/' (e.g., "https://9oo91e.qjz9zk/pay/"), whereas - // "canDedupedApplicationIdUri" is derived from the native Android payment app's default - // URL-based payment method name that may not necessarily specify the trailing slash -- // (e.g., "https://google.com/pay"). -+ // (e.g., "https://9oo91e.qjz9zk/pay"). - if (canDedupedApplicationId.charAt(canDedupedApplicationId.length() - 1) != '/') { - canDedupedApplicationIds.add(canDedupedApplicationId + '/'); - } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java -@@ -154,7 +154,7 @@ import java.util.Collection; +@@ -153,7 +153,7 @@ import java.util.Collection; /** * Computes the maximum possible width for a dialog box. * @@ -8311,34 +8167,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/Pay * @param securityLevel The security level of the page that invoked PaymentRequest. * @param shippingStrings The string resource identifiers to use in the shipping sections. */ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/TemplatePreservingTextView.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/TemplatePreservingTextView.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/TemplatePreservingTextView.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/TemplatePreservingTextView.java -@@ -19,10 +19,10 @@ import android.widget.TextView; - * - * For example, given the following template and content - * Template: "%s was closed" -- * Content: "https://www.google.com/webhp?sourceid=chrome-instant&q=potato" -+ * Content: "https://www.9oo91e.qjz9zk/webhp?sourceid=chrome-instant&q=potato" - * - * the TemplatePreservingTextView would truncate the content but not the template text: -- * "https://www.google.com/webh... was closed" -+ * "https://www.9oo91e.qjz9zk/webh... was closed" - */ - public class TemplatePreservingTextView extends AppCompatTextView { - private String mTemplate; -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ssl/CaptivePortalHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ssl/CaptivePortalHelper.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/ssl/CaptivePortalHelper.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/ssl/CaptivePortalHelper.java -@@ -22,7 +22,7 @@ import java.lang.reflect.Method; - @JNINamespace("chrome::android") - public class CaptivePortalHelper { - private static final String DEFAULT_PORTAL_CHECK_URL = -- "http://connectivitycheck.gstatic.com/generate_204"; -+ "http://connectivitycheck.95tat1c.qjz9zk/generate_204"; - - public static void setCaptivePortalCertificateForTesting(String spkiHash) { - CaptivePortalHelperJni.get().setCaptivePortalCertificateForTesting(spkiHash); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsConfig.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsConfig.java --- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsConfig.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsConfig.java @@ -8362,7 +8190,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug + private static final String NEW_TAB_URL_HELP = "https://support.9oo91e.qjz9zk/chrome/?p=new_tab"; public SuggestionsNavigationDelegate(ChromeActivity activity, Profile profile, - NativePageHost host, TabModelSelector tabModelSelector) { + NativePageHost host, TabModelSelector tabModelSelector, Tab tab) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/GoogleServiceAuthError.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/GoogleServiceAuthError.java --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/GoogleServiceAuthError.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/GoogleServiceAuthError.java @@ -8378,7 +8206,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/GoogleServ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabState.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabState.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabState.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabState.java -@@ -345,7 +345,7 @@ public class TabState { +@@ -307,7 +307,7 @@ public class TabState { } else { // For JellyBean and below a bug in MappedByteBufferAdapter causes rewind to not be // propagated to the underlying ByteBuffer, and results in an underflow exception. See: @@ -8390,7 +8218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabState.ja diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java -@@ -541,8 +541,8 @@ public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickL +@@ -543,8 +543,8 @@ public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickL private static String parsePublisherNameFromUrl(String url) { // TODO(ianwen): Make it generic to parse url from URI path. http://crbug.com/599298 @@ -8413,18 +8241,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/upgrade/Package * * - This process runs in the foreground as long as {@link #onReceive} is running. If there are no * other application components running, Android will aggressively kill it. -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr/ArCoreInstallUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/vr/ArCoreInstallUtils.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/vr/ArCoreInstallUtils.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr/ArCoreInstallUtils.java -@@ -112,7 +112,7 @@ public class ArCoreInstallUtils implements ModuleInstallUi.FailureUiListener { - // As per documentation, it's recommended to issue a call to - // ArCoreApk.checkAvailability() early in application lifecycle & ignore the result - // so that subsequent calls can return cached result: -- // https://developers.google.com/ar/develop/java/enable-arcore -+ // https://developers.9oo91e.qjz9zk/ar/develop/java/enable-arcore - // This is as early in the app lifecycle as it gets for us - just after installing - // AR module. - getArCoreInstallStatus(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr/ArCoreShim.java b/chrome/android/java/src/org/chromium/chrome/browser/vr/ArCoreShim.java --- a/chrome/android/java/src/org/chromium/chrome/browser/vr/ArCoreShim.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/vr/ArCoreShim.java @@ -8760,7 +8576,7 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/First diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiverTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiverTest.java --- a/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiverTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiverTest.java -@@ -30,7 +30,7 @@ import java.util.Set; +@@ -31,7 +31,7 @@ import java.util.Set; @RunWith(BaseRobolectricTestRunner.class) @Config(manifest = Config.NONE) public class ToSAckedReceiverTest { @@ -8772,7 +8588,7 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/ToSAc diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/native_page/NativePageFactoryTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/native_page/NativePageFactoryTest.java --- a/chrome/android/junit/src/org/chromium/chrome/browser/native_page/NativePageFactoryTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/native_page/NativePageFactoryTest.java -@@ -124,7 +124,7 @@ public class NativePageFactoryTest { +@@ -125,7 +125,7 @@ public class NativePageFactoryTest { null, "", "newtab", @@ -8913,7 +8729,7 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/Ge diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotificationTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotificationTest.java --- a/chrome/android/junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotificationTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotificationTest.java -@@ -48,7 +48,7 @@ import java.util.HashMap; +@@ -50,7 +50,7 @@ import java.util.HashMap; @RunWith(BaseRobolectricTestRunner.class) @Config(manifest = Config.NONE, shadows = {ShadowRecordHistogram.class}) public final class SearchEngineChoiceNotificationTest { @@ -8925,74 +8741,66 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/search_engines diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java --- a/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java -@@ -212,9 +212,9 @@ public class SigninManagerTest { - +@@ -216,7 +216,7 @@ public class SigninManagerTest { @Test public void callbackNotifiedOnSignin() { -- CoreAccountInfo account = new CoreAccountInfo(new CoreAccountId("test_at_gmail.com"), -- new Account("test@gmail.com", AccountManagerFacade.GOOGLE_ACCOUNT_TYPE), -- "test_at_gmail.com"); -+ CoreAccountInfo account = new CoreAccountInfo(new CoreAccountId("test_at_9ma1l.qjz9zk"), -+ new Account("test@9ma1l.qjz9zk", AccountManagerFacade.GOOGLE_ACCOUNT_TYPE), -+ "test_at_9ma1l.qjz9zk"); + CoreAccountInfo account = new CoreAccountInfo( +- new CoreAccountId("test_at_gmail.com"), "test@gmail.com", "test_at_gmail.com"); ++ new CoreAccountId("test_at_9ma1l.qjz9zk"), "test@9ma1l.qjz9zk", "test_at_9ma1l.qjz9zk"); // No need to seed accounts to the native code. doReturn(true).when(mAccountTrackerService).checkAndSeedSystemAccounts(); -@@ -245,9 +245,9 @@ public class SigninManagerTest { - +@@ -248,7 +248,7 @@ public class SigninManagerTest { @Test(expected = AssertionError.class) public void failIfAlreadySignedin() { -- CoreAccountInfo account = new CoreAccountInfo(new CoreAccountId("test_at_gmail.com"), -- new Account("test@gmail.com", AccountManagerFacade.GOOGLE_ACCOUNT_TYPE), -- "test_at_gmail.com"); -+ CoreAccountInfo account = new CoreAccountInfo(new CoreAccountId("test_at_9ma1l.qjz9zk"), -+ new Account("test@9ma1l.qjz9zk", AccountManagerFacade.GOOGLE_ACCOUNT_TYPE), -+ "test_at_9ma1l.qjz9zk"); + CoreAccountInfo account = new CoreAccountInfo( +- new CoreAccountId("test_at_gmail.com"), "test@gmail.com", "test_at_gmail.com"); ++ new CoreAccountId("test_at_9ma1l.qjz9zk"), "test@9ma1l.qjz9zk", "test_at_9ma1l.qjz9zk"); // No need to seed accounts to the native code. doReturn(true).when(mAccountTrackerService).checkAndSeedSystemAccounts(); diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninPromoUtilTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninPromoUtilTest.java --- a/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninPromoUtilTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninPromoUtilTest.java -@@ -107,33 +107,33 @@ public class SigninPromoUtilTest { +@@ -106,33 +106,33 @@ public class SigninPromoUtilTest { // Old implementation hasn't been storing account list - when(mPreferenceManager.getSigninPromoLastAccountNames()).thenReturn(null); + when(mPreferencesManager.getSigninPromoLastAccountNames()).thenReturn(null); Assert.assertTrue(SigninPromoUtil.shouldLaunchSigninPromo( -- mPreferenceManager, 42, false, false, accountsSupplier("test@gmail.com"))); -+ mPreferenceManager, 42, false, false, accountsSupplier("test@9ma1l.qjz9zk"))); +- mPreferencesManager, 42, false, false, accountsSupplier("test@gmail.com"))); ++ mPreferencesManager, 42, false, false, accountsSupplier("test@9ma1l.qjz9zk"))); } @Test public void whenHasNewAccountShouldReturnTrue() { - when(mPreferenceManager.getSigninPromoLastShownVersion()).thenReturn(40); - when(mPreferenceManager.getSigninPromoLastAccountNames()) + when(mPreferencesManager.getSigninPromoLastShownVersion()).thenReturn(40); + when(mPreferencesManager.getSigninPromoLastAccountNames()) - .thenReturn(ImmutableSet.of("test@gmail.com")); + .thenReturn(ImmutableSet.of("test@9ma1l.qjz9zk")); - Assert.assertTrue(SigninPromoUtil.shouldLaunchSigninPromo(mPreferenceManager, 42, false, + Assert.assertTrue(SigninPromoUtil.shouldLaunchSigninPromo(mPreferencesManager, 42, false, - false, accountsSupplier("test@gmail.com", "test2@gmail.com"))); + false, accountsSupplier("test@9ma1l.qjz9zk", "test2@9ma1l.qjz9zk"))); } @Test public void whenAccountListUnchangedShouldReturnFalse() { - when(mPreferenceManager.getSigninPromoLastShownVersion()).thenReturn(40); - when(mPreferenceManager.getSigninPromoLastAccountNames()) + when(mPreferencesManager.getSigninPromoLastShownVersion()).thenReturn(40); + when(mPreferencesManager.getSigninPromoLastAccountNames()) - .thenReturn(ImmutableSet.of("test@gmail.com")); + .thenReturn(ImmutableSet.of("test@9ma1l.qjz9zk")); Assert.assertFalse(SigninPromoUtil.shouldLaunchSigninPromo( -- mPreferenceManager, 42, false, false, accountsSupplier("test@gmail.com"))); -+ mPreferenceManager, 42, false, false, accountsSupplier("test@9ma1l.qjz9zk"))); +- mPreferencesManager, 42, false, false, accountsSupplier("test@gmail.com"))); ++ mPreferencesManager, 42, false, false, accountsSupplier("test@9ma1l.qjz9zk"))); } @Test public void whenNoNewAccountsShouldReturnFalse() { - when(mPreferenceManager.getSigninPromoLastShownVersion()).thenReturn(40); - when(mPreferenceManager.getSigninPromoLastAccountNames()) + when(mPreferencesManager.getSigninPromoLastShownVersion()).thenReturn(40); + when(mPreferencesManager.getSigninPromoLastAccountNames()) - .thenReturn(ImmutableSet.of("test@gmail.com", "test2@gmail.com")); + .thenReturn(ImmutableSet.of("test@9ma1l.qjz9zk", "test2@9ma1l.qjz9zk")); Assert.assertFalse(SigninPromoUtil.shouldLaunchSigninPromo( -- mPreferenceManager, 42, false, false, accountsSupplier("test2@gmail.com"))); -+ mPreferenceManager, 42, false, false, accountsSupplier("test2@9ma1l.qjz9zk"))); +- mPreferencesManager, 42, false, false, accountsSupplier("test2@gmail.com"))); ++ mPreferencesManager, 42, false, false, accountsSupplier("test2@9ma1l.qjz9zk"))); } } diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/suggestions/tile/TileGroupUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/suggestions/tile/TileGroupUnitTest.java @@ -9010,7 +8818,7 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/suggestions/ti diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/tasks/JourneyManagerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/tasks/JourneyManagerTest.java --- a/chrome/android/junit/src/org/chromium/chrome/browser/tasks/JourneyManagerTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/tasks/JourneyManagerTest.java -@@ -348,7 +348,7 @@ public final class JourneyManagerTest { +@@ -349,7 +349,7 @@ public final class JourneyManagerTest { mTabModelSelectorTabObserver.onShown(mTab, TabSelectionType.FROM_USER); @@ -9019,7 +8827,7 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/tasks/JourneyM mTabModelSelectorTabObserver.onLoadUrl(mTab, params, 0); -@@ -374,7 +374,7 @@ public final class JourneyManagerTest { +@@ -375,7 +375,7 @@ public final class JourneyManagerTest { mTabModelSelectorTabObserver.onShown(mTab, TabSelectionType.FROM_USER); LoadUrlParams params = new LoadUrlParams( @@ -9028,7 +8836,7 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/tasks/JourneyM mTabModelSelectorTabObserver.onLoadUrl(mTab, params, 0); -@@ -400,7 +400,7 @@ public final class JourneyManagerTest { +@@ -401,7 +401,7 @@ public final class JourneyManagerTest { mTabModelSelectorTabObserver.onShown(mTab, TabSelectionType.FROM_USER); LoadUrlParams params = new LoadUrlParams( @@ -9037,31 +8845,6 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/tasks/JourneyM mTabModelSelectorTabObserver.onLoadUrl(mTab, params, 0); -diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/util/UrlUtilitiesUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/util/UrlUtilitiesUnitTest.java ---- a/chrome/android/junit/src/org/chromium/chrome/browser/util/UrlUtilitiesUnitTest.java -+++ b/chrome/android/junit/src/org/chromium/chrome/browser/util/UrlUtilitiesUnitTest.java -@@ -128,16 +128,16 @@ public class UrlUtilitiesUnitTest { - @Test - public void testStripScheme() { - // Only scheme gets stripped. -- Assert.assertEquals("cs.chromium.org", UrlUtilities.stripScheme("https://cs.chromium.org")); -- Assert.assertEquals("cs.chromium.org", UrlUtilities.stripScheme("http://cs.chromium.org")); -+ Assert.assertEquals("cs.ch40m1um.qjz9zk", UrlUtilities.stripScheme("https://cs.ch40m1um.qjz9zk")); -+ Assert.assertEquals("cs.ch40m1um.qjz9zk", UrlUtilities.stripScheme("http://cs.ch40m1um.qjz9zk")); - // If there is no scheme, nothing changes. -- Assert.assertEquals("cs.chromium.org", UrlUtilities.stripScheme("cs.chromium.org")); -+ Assert.assertEquals("cs.ch40m1um.qjz9zk", UrlUtilities.stripScheme("cs.ch40m1um.qjz9zk")); - // Path is not touched/changed. -- String urlWithPath = "code.google.com/p/chromium/codesearch#search" -+ String urlWithPath = "code.9oo91e.qjz9zk/p/chromium/codesearch#search" - + "/&q=testStripScheme&sq=package:chromium&type=cs"; - Assert.assertEquals(urlWithPath, UrlUtilities.stripScheme("https://" + urlWithPath)); - // Beginning and ending spaces get trimmed. - Assert.assertEquals( -- "cs.chromium.org", UrlUtilities.stripScheme(" https://cs.chromium.org ")); -+ "cs.ch40m1um.qjz9zk", UrlUtilities.stripScheme(" https://cs.ch40m1um.qjz9zk ")); - } - } diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java --- a/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java @@ -9247,19 +9030,19 @@ diff --git a/chrome/android/webapk/PRESUBMIT.py b/chrome/android/webapk/PRESUBMI diff --git a/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java b/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java --- a/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java +++ b/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java -@@ -45,7 +45,7 @@ public class WebApkValidatorTest { +@@ -46,7 +46,7 @@ public class WebApkValidatorTest { private static final String TEST_DATA_DIR = "webapks/"; private static final String TEST_STARTURL = "https://non-empty.com/starturl"; private static final String MAPSLITE_PACKAGE_NAME = "com.google.android.apps.mapslite"; - private static final String MAPSLITE_EXAMPLE_STARTURL = "https://www.google.com/maps"; + private static final String MAPSLITE_EXAMPLE_STARTURL = "https://www.9oo91e.qjz9zk/maps"; + private static final String MANIFEST_URL = "https://www.foo.com/manifest.json"; private static final byte[] EXPECTED_SIGNATURE = new byte[] {48, -126, 3, -121, 48, -126, 2, - 111, -96, 3, 2, 1, 2, 2, 4, 20, -104, -66, -126, 48, 13, 6, 9, 42, -122, 72, -122, -9, diff --git a/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java b/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java --- a/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java +++ b/chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java -@@ -40,7 +40,7 @@ public class WebApkValidator { +@@ -41,7 +41,7 @@ public class WebApkValidator { private static final String KEY_FACTORY = "EC"; // aka "ECDSA" private static final String MAPSLITE_PACKAGE_NAME = "com.google.android.apps.mapslite"; private static final String MAPSLITE_URL_PREFIX = @@ -9610,8 +9393,8 @@ diff --git a/chrome/app/PRESUBMIT.py b/chrome/app/PRESUBMIT.py diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h --- a/chrome/app/chrome_command_ids.h +++ b/chrome/app/chrome_command_ids.h -@@ -395,7 +395,7 @@ - #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412 +@@ -404,7 +404,7 @@ + #endif // NOTE: The last valid command value is 57343 (0xDFFF) -// See http://msdn.microsoft.com/en-us/library/t2zechd4(VS.71).aspx @@ -9622,7 +9405,7 @@ diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd -@@ -489,7 +489,7 @@ Chromium is unable to recover your settings. +@@ -518,7 +518,7 @@ Chromium is unable to recover your settings. @@ -9631,7 +9414,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -599,10 +599,10 @@ Chromium is unable to recover your settings. +@@ -625,10 +625,10 @@ Chromium is unable to recover your settings. You're signed in to Chromium! @@ -9644,7 +9427,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd Someone previously signed in to Chromium on this computer as $1user@example.com. Please create a new Chromium user to keep your information separate. -@@ -635,7 +635,7 @@ Chromium is unable to recover your settings. +@@ -661,7 +661,7 @@ Chromium is unable to recover your settings. @@ -9656,7 +9439,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -304,7 +304,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -360,7 +360,7 @@ are declared in tools/grit/grit_rule.gni. @@ -9665,7 +9448,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -490,7 +490,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -552,7 +552,7 @@ are declared in tools/grit/grit_rule.gni. Open link as @@ -9674,7 +9457,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open link in $1Gmail App -@@ -633,7 +633,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -695,7 +695,7 @@ are declared in tools/grit/grit_rule.gni. &Search $1Google for image @@ -9683,7 +9466,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest password... -@@ -708,7 +708,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -770,7 +770,7 @@ are declared in tools/grit/grit_rule.gni. Open Link as @@ -9692,7 +9475,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open Link in $1Gmail App -@@ -863,7 +863,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -925,7 +925,7 @@ are declared in tools/grit/grit_rule.gni. &Search $1Google for Image @@ -9701,7 +9484,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest Password... -@@ -1061,7 +1061,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1129,7 +1129,7 @@ are declared in tools/grit/grit_rule.gni. @@ -9710,7 +9493,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -1168,7 +1168,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1236,7 +1236,7 @@ are declared in tools/grit/grit_rule.gni. Review @@ -9719,7 +9502,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -2405,7 +2405,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2501,7 +2501,7 @@ are declared in tools/grit/grit_rule.gni. Share @@ -9728,7 +9511,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -2468,10 +2468,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -2564,10 +2564,10 @@ are declared in tools/grit/grit_rule.gni. Images were blocked on this page. @@ -9741,7 +9524,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking cookies -@@ -2480,7 +2480,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2576,7 +2576,7 @@ are declared in tools/grit/grit_rule.gni. Continue allowing cookies @@ -9750,7 +9533,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking images -@@ -2492,7 +2492,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2588,7 +2588,7 @@ are declared in tools/grit/grit_rule.gni. Pop-ups blocked: @@ -9759,7 +9542,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking -@@ -2501,22 +2501,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -2597,22 +2597,22 @@ are declared in tools/grit/grit_rule.gni. Manage pop-up blocking... @@ -9788,7 +9571,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always block camera and microphone access -@@ -2537,13 +2537,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -2633,13 +2633,13 @@ are declared in tools/grit/grit_rule.gni. Continue blocking camera access @@ -9805,7 +9588,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pop-up blocked -@@ -2558,7 +2558,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2654,7 +2654,7 @@ are declared in tools/grit/grit_rule.gni. JavaScript was blocked on this page. @@ -9814,7 +9597,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking JavaScript -@@ -2576,7 +2576,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2672,7 +2672,7 @@ are declared in tools/grit/grit_rule.gni. Sound was muted on this page @@ -9823,7 +9606,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue muting sound -@@ -2715,7 +2715,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2811,7 +2811,7 @@ are declared in tools/grit/grit_rule.gni. @@ -9832,7 +9615,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &General -@@ -3245,13 +3245,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3341,13 +3341,13 @@ are declared in tools/grit/grit_rule.gni. @@ -9849,7 +9632,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share this tab instead -@@ -3456,10 +3456,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3552,10 +3552,10 @@ are declared in tools/grit/grit_rule.gni. Incognito Tab: $1Google @@ -9862,7 +9645,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Plugin: $1Unknown Plugin -@@ -3468,10 +3468,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3564,10 +3564,10 @@ are declared in tools/grit/grit_rule.gni. Plugin Broker: $1Unknown Plugin @@ -9875,7 +9658,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Service Worker: $1https://googlechrome.github.io/samples/service-worker/basic/service-worker.js -@@ -3495,10 +3495,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3591,16 +3591,16 @@ are declared in tools/grit/grit_rule.gni. Print: $1Google Maps @@ -9885,26 +9668,31 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - Incognito Subframe: $1https://youtube.com/ + Incognito Subframe: $1https://y0u1ub3.qjz9zk/ + + +- Portal: $1https://youtube.com/ ++ Portal: $1https://y0u1ub3.qjz9zk/ + + +- Incognito Portal: $1https://youtube.com/ ++ Incognito Portal: $1https://y0u1ub3.qjz9zk/ App: $1com.android.systemui -@@ -3680,13 +3680,13 @@ are declared in tools/grit/grit_rule.gni. - - The extension "$1Gmail Checker" has been added. +@@ -3779,10 +3779,10 @@ are declared in tools/grit/grit_rule.gni. + + Confirm Changes - + The extension "$1Gmail Checker" was automatically disabled. - - The app "$1Gmail" has been added. - - + The app "$1Gmail" was automatically removed. -@@ -3698,10 +3698,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3794,10 +3794,10 @@ are declared in tools/grit/grit_rule.gni. @@ -9917,7 +9705,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources It can: -@@ -3834,22 +3834,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -3933,22 +3933,22 @@ are declared in tools/grit/grit_rule.gni. Change your home page to: $1home.page.com/home.html @@ -9946,7 +9734,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change your data on a number of websites -@@ -3858,10 +3858,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3957,10 +3957,10 @@ are declared in tools/grit/grit_rule.gni. Read your data on a number of websites @@ -9959,7 +9747,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change anything you type -@@ -4216,7 +4216,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4315,7 +4315,7 @@ are declared in tools/grit/grit_rule.gni. When you click the extension @@ -9968,7 +9756,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -4266,7 +4266,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4365,7 +4365,7 @@ are declared in tools/grit/grit_rule.gni. When You Click the Extension @@ -9977,7 +9765,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -5068,7 +5068,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5201,7 +5201,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -9986,7 +9774,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -5076,7 +5076,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5209,7 +5209,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -9995,7 +9783,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -5086,7 +5086,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5219,7 +5219,7 @@ Keep your key file in a safe place. You will need it to create new versions of y S&how URL @@ -10004,7 +9792,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -5095,16 +5095,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5228,16 +5228,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -10024,7 +9812,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Click to view today’s doodle -@@ -5500,7 +5500,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5633,7 +5633,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome @@ -10033,7 +9821,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -5570,7 +5570,7 @@ the Bookmarks menu."> +@@ -5703,7 +5703,7 @@ the Bookmarks menu."> @@ -10042,7 +9830,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Accessibility Events -@@ -5583,7 +5583,7 @@ the Bookmarks menu."> +@@ -5716,7 +5716,7 @@ the Bookmarks menu."> @@ -10051,7 +9839,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clipboard -@@ -5608,7 +5608,7 @@ the Bookmarks menu."> +@@ -5741,7 +5741,7 @@ the Bookmarks menu."> This site has been blocked from seeing text and images copied to the clipboard @@ -10060,7 +9848,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -5680,7 +5680,7 @@ the Bookmarks menu."> +@@ -5813,7 +5813,7 @@ the Bookmarks menu."> The page has become unresponsive. You can wait for it to become responsive or close it. @@ -10069,16 +9857,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -5717,7 +5717,7 @@ the Bookmarks menu."> +@@ -5850,7 +5850,7 @@ the Bookmarks menu."> 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. - with $1facebook.com + with $1f8c3b00k.qjz9zk - - Hide -@@ -5988,7 +5988,7 @@ the Bookmarks menu."> + + +@@ -6118,7 +6118,7 @@ the Bookmarks menu."> Run Flash @@ -10087,7 +9875,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -6232,7 +6232,7 @@ the Bookmarks menu."> +@@ -6362,7 +6362,7 @@ the Bookmarks menu."> Uploading ($127%)... @@ -10096,7 +9884,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6399,31 +6399,31 @@ the Bookmarks menu."> +@@ -6545,31 +6545,31 @@ the Bookmarks menu."> $1html5rocks.com is sharing your screen. @@ -10131,9 +9919,9 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - $1html5rocks.com is sharing a Chrome tab and audio with $2https://google.com. + $1html5rocks.com is sharing a Chrome tab and audio with $2https://9oo91e.qjz9zk. - - Change source -@@ -6448,7 +6448,7 @@ the Bookmarks menu."> + + Hide +@@ -6597,7 +6597,7 @@ the Bookmarks menu."> @@ -10142,7 +9930,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6456,10 +6456,10 @@ the Bookmarks menu."> +@@ -6605,10 +6605,10 @@ the Bookmarks menu."> Sign in to Security Device @@ -10155,7 +9943,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -7456,10 +7456,10 @@ the Bookmarks menu."> +@@ -7609,10 +7609,10 @@ the Bookmarks menu."> Can't sign in @@ -10168,7 +9956,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -7484,13 +7484,13 @@ the Bookmarks menu."> +@@ -7637,13 +7637,13 @@ the Bookmarks menu."> This wasn't me. @@ -10184,7 +9972,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -7534,7 +7534,7 @@ the Bookmarks menu."> +@@ -7687,7 +7687,7 @@ the Bookmarks menu."> Open $1Adobe Acrobat? @@ -10193,7 +9981,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -7572,7 +7572,7 @@ the Bookmarks menu."> +@@ -7725,7 +7725,7 @@ the Bookmarks menu."> Date Modified @@ -10202,7 +9990,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7713,7 +7713,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -7866,7 +7866,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10211,7 +9999,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On - sync everything -@@ -8080,7 +8080,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -8236,7 +8236,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10220,7 +10008,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8159,7 +8159,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -8315,7 +8315,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -10229,7 +10017,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8553,12 +8553,12 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -8715,12 +8715,12 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10244,7 +10032,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Location -@@ -8591,7 +8591,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -8753,7 +8753,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10253,7 +10041,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8710,10 +8710,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -8872,10 +8872,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Know your unique device identifier @@ -10266,7 +10054,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Protected Media Identifier -@@ -8723,7 +8723,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -8885,7 +8885,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -10275,7 +10063,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8752,10 +8752,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -8914,10 +8914,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -10288,7 +10076,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8866,19 +8866,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9028,19 +9028,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -10311,7 +10099,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -8902,10 +8902,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9064,10 +9064,10 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10324,8 +10112,8 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open $1search links -@@ -8957,7 +8957,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - +@@ -9122,7 +9122,7 @@ Please help our engineers fix this problem. Tell us what happened right before y + - $1google.com wants to send and receive info when you tap your phone on an NFC device @@ -10333,7 +10121,20 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources NFC -@@ -8978,7 +8978,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9139,10 +9139,10 @@ Please help our engineers fix this problem. Tell us what happened right before y + + + +- $1google.com wants to be able to start virtual reality sessions ++ $19oo91e.qjz9zk wants to be able to start virtual reality sessions + + +- $1google.com wants to track camera position and map your room ++ $19oo91e.qjz9zk wants to track camera position and map your room + + + +@@ -9160,7 +9160,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -10342,7 +10143,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -9005,7 +9005,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9187,7 +9187,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -10351,7 +10152,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9200,7 +9200,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9388,7 +9388,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. Choose what you'd like to share. @@ -10360,7 +10161,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share audio -@@ -9331,7 +9331,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9519,7 +9519,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10369,7 +10170,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9397,8 +9397,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9585,8 +9585,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -10380,7 +10181,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -9553,7 +9553,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9753,7 +9753,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10389,7 +10190,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -9591,7 +9591,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9791,7 +9791,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10398,7 +10199,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to pair -@@ -9637,7 +9637,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9837,7 +9837,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10407,7 +10208,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect -@@ -9668,7 +9668,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9871,7 +9871,7 @@ Please help our engineers fix this problem. Tell us what happened right before y No nearby devices found. @@ -10416,7 +10217,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -9700,7 +9700,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9903,7 +9903,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10425,7 +10226,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -9719,7 +9719,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9922,7 +9922,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10434,7 +10235,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -9866,7 +9866,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10069,7 +10069,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10443,7 +10244,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 -@@ -10035,10 +10035,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10238,10 +10238,10 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10456,7 +10257,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Verifying your identity helps protect your personal information -@@ -10047,7 +10047,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10250,7 +10250,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue @@ -10465,7 +10266,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -10253,13 +10253,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10462,13 +10462,13 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -10481,7 +10282,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -10272,7 +10272,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10481,7 +10481,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 @@ -10490,7 +10291,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. -@@ -10281,7 +10281,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10490,7 +10490,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? @@ -10502,7 +10303,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd -@@ -501,7 +501,7 @@ Google Chrome is unable to recover your settings. +@@ -530,7 +530,7 @@ Google Chrome is unable to recover your settings. @@ -10511,7 +10312,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -611,10 +611,10 @@ Google Chrome is unable to recover your settings. +@@ -637,10 +637,10 @@ Google Chrome is unable to recover your settings. You're signed in to Chrome! @@ -10524,7 +10325,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str Someone previously signed in to Chrome on this computer as $1user@example.com. Please create a new Chrome user to keep your information separate. -@@ -647,7 +647,7 @@ Google Chrome is unable to recover your settings. +@@ -673,7 +673,7 @@ Google Chrome is unable to recover your settings. @@ -10536,7 +10337,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd -@@ -150,12 +150,12 @@ +@@ -179,12 +179,12 @@ @@ -10551,7 +10352,7 @@ diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/loc -@@ -172,7 +172,7 @@ +@@ -201,7 +201,7 @@ @@ -10560,7 +10361,7 @@ diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/loc -@@ -209,18 +209,18 @@ +@@ -238,18 +238,18 @@ @@ -10600,7 +10401,7 @@ diff --git a/chrome/app/theme/PRESUBMIT.py b/chrome/app/theme/PRESUBMIT.py 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 -@@ -285,14 +285,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -289,14 +289,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -10619,7 +10420,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -2265,7 +2265,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2318,7 +2318,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, @@ -10628,7 +10429,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !defined(OS_ANDROID) {"load-media-router-component-extension", flag_descriptions::kLoadMediaRouterComponentExtensionName, -@@ -2509,7 +2509,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2526,7 +2526,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -10640,7 +10441,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/android/autofill_assistant/client_android.cc b/chrome/browser/android/autofill_assistant/client_android.cc --- a/chrome/browser/android/autofill_assistant/client_android.cc +++ b/chrome/browser/android/autofill_assistant/client_android.cc -@@ -53,7 +53,7 @@ const char* const kAutofillAssistantUrl = "autofill-assistant-url"; +@@ -55,7 +55,7 @@ const char* const kAutofillAssistantUrl = "autofill-assistant-url"; namespace { const char* const kDefaultAutofillAssistantServerUrl = @@ -10652,7 +10453,7 @@ diff --git a/chrome/browser/android/autofill_assistant/client_android.cc b/chrom diff --git a/chrome/browser/android/contextualsearch/contextual_search_context.h b/chrome/browser/android/contextualsearch/contextual_search_context.h --- a/chrome/browser/android/contextualsearch/contextual_search_context.h +++ b/chrome/browser/android/contextualsearch/contextual_search_context.h -@@ -67,7 +67,7 @@ struct ContextualSearchContext { +@@ -73,7 +73,7 @@ struct ContextualSearchContext { // Gets the encoding of the base page. This is not very important, since // the surrounding text stored here in a base::string16 is implicitly encoded @@ -10664,7 +10465,7 @@ diff --git a/chrome/browser/android/contextualsearch/contextual_search_context.h diff --git a/chrome/browser/android/digital_asset_links/digital_asset_links_handler.cc b/chrome/browser/android/digital_asset_links/digital_asset_links_handler.cc --- a/chrome/browser/android/digital_asset_links/digital_asset_links_handler.cc +++ b/chrome/browser/android/digital_asset_links/digital_asset_links_handler.cc -@@ -32,7 +32,7 @@ namespace { +@@ -31,7 +31,7 @@ namespace { const int kNumNetworkRetries = 1; // Location on a website where the asset links file can be found, see @@ -10841,7 +10642,7 @@ diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser diff --git a/chrome/browser/browser_switcher/browser_switcher_service.cc b/chrome/browser/browser_switcher/browser_switcher_service.cc --- a/chrome/browser/browser_switcher/browser_switcher_service.cc +++ b/chrome/browser/browser_switcher/browser_switcher_service.cc -@@ -48,7 +48,7 @@ constexpr net::NetworkTrafficAnnotationTag traffic_annotation = +@@ -49,7 +49,7 @@ constexpr net::NetworkTrafficAnnotationTag traffic_annotation = "an alternative browser. This is often on the organization's " "intranet. For more information on Internet Explorer's Enterprise " "Mode, see: " @@ -10917,34 +10718,10 @@ diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser while (position > 0) { retval += std::string("."); // Copy up to the next dot. host[position] is a dot so start after it. -diff --git a/chrome/browser/captive_portal/captive_portal_service.h b/chrome/browser/captive_portal/captive_portal_service.h ---- a/chrome/browser/captive_portal/captive_portal_service.h -+++ b/chrome/browser/captive_portal/captive_portal_service.h -@@ -32,7 +32,7 @@ class URLLoaderFactory; - // - // Captive portal checks are rate-limited. The CaptivePortalService may only - // be accessed on the UI thread. --// Design doc: https://docs.google.com/document/d/1k-gP2sswzYNvryu9NcgN7q5XrsMlUdlUdoW9WRaEmfM/edit -+// Design doc: https://docs.9oo91e.qjz9zk/document/d/1k-gP2sswzYNvryu9NcgN7q5XrsMlUdlUdoW9WRaEmfM/edit - class CaptivePortalService : public KeyedService { - public: - enum TestingState { -diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.h b/chrome/browser/captive_portal/captive_portal_tab_helper.h ---- a/chrome/browser/captive_portal/captive_portal_tab_helper.h -+++ b/chrome/browser/captive_portal/captive_portal_tab_helper.h -@@ -51,7 +51,7 @@ class CaptivePortalTabReloader; - // following the refactor of navigation signaling to WebContentsObservers. - // - // For the design doc, see: --// https://docs.google.com/document/d/1k-gP2sswzYNvryu9NcgN7q5XrsMlUdlUdoW9WRaEmfM/edit -+// https://docs.9oo91e.qjz9zk/document/d/1k-gP2sswzYNvryu9NcgN7q5XrsMlUdlUdoW9WRaEmfM/edit - class CaptivePortalTabHelper - : public content::WebContentsObserver, - public content::NotificationObserver, diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm --- a/chrome/browser/chrome_browser_application_mac.mm +++ b/chrome/browser/chrome_browser_application_mac.mm -@@ -144,7 +144,7 @@ std::string DescriptionForNSEvent(NSEvent* event) { +@@ -143,7 +143,7 @@ std::string DescriptionForNSEvent(NSEvent* event) { //////////////////////////////////////////////////////////////////////////////// // HISTORICAL COMMENT (by viettrungluu, from @@ -10956,7 +10733,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 -@@ -3790,7 +3790,7 @@ std::string ChromeContentBrowserClient::GetMetricSuffixForURL(const GURL& url) { +@@ -3803,7 +3803,7 @@ std::string ChromeContentBrowserClient::GetMetricSuffixForURL(const GURL& url) { // function could be removed. if (page_load_metrics::IsGoogleSearchResultUrl(url)) return "search"; @@ -11024,7 +10801,7 @@ diff --git a/chrome/browser/chromeos/android_sms/android_sms_urls.h b/chrome/bro diff --git a/chrome/browser/chromeos/app_mode/fake_cws.cc b/chrome/browser/chromeos/app_mode/fake_cws.cc --- a/chrome/browser/chromeos/app_mode/fake_cws.cc +++ b/chrome/browser/chromeos/app_mode/fake_cws.cc -@@ -52,7 +52,7 @@ const char kPrivateStoreAppHasUpdateTemplate[] = +@@ -53,7 +53,7 @@ const char kPrivateStoreAppHasUpdateTemplate[] = const char kUpdateContentTemplate[] = "" @@ -11078,7 +10855,7 @@ diff --git a/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc b/chr constexpr uint16_t kAndroidMBluetoothVersionNumber = 95; // Bluetooth SDP Service Class ID List Attribute identifier constexpr uint16_t kServiceClassIDListAttributeID = 0x0001; -@@ -1856,7 +1856,7 @@ void ArcBluetoothBridge::AddDescriptor(int32_t service_handle, +@@ -1885,7 +1885,7 @@ void ArcBluetoothBridge::AddDescriptor(int32_t service_handle, // is the parent of the new descriptor, we assume that it would be the last // characteristic that was added to the given service. This matches the // Android framework code at android/bluetooth/BluetoothGattServer.java#594. @@ -11090,7 +10867,7 @@ diff --git a/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc b/chr diff --git a/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.h b/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.h --- a/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.h +++ b/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.h -@@ -266,7 +266,7 @@ class ArcBluetoothBridge +@@ -267,7 +267,7 @@ class ArcBluetoothBridge // Bluetooth Mojo host interface - Bluetooth Gatt Server functions // Android counterpart link: @@ -11126,9 +10903,9 @@ diff --git a/chrome/browser/chromeos/arc/tracing/arc_app_performance_tracing.cc diff --git a/chrome/browser/chromeos/assistant/assistant_util.cc b/chrome/browser/chromeos/assistant/assistant_util.cc --- a/chrome/browser/chromeos/assistant/assistant_util.cc +++ b/chrome/browser/chromeos/assistant/assistant_util.cc -@@ -134,8 +134,8 @@ ash::mojom::AssistantAllowedState IsAssistantAllowedForProfile( - if (identity_manager) { - const std::string email = identity_manager->GetPrimaryAccountInfo().email; +@@ -111,8 +111,8 @@ ash::mojom::AssistantAllowedState IsAssistantAllowedForProfile( + const std::string email = + identity_manager->GetUnconsentedPrimaryAccountInfo().email; if (!email.empty() && - (gaia::ExtractDomainName(email) == "gmail.com" || - gaia::ExtractDomainName(email) == "googlemail.com" || @@ -11140,7 +10917,7 @@ diff --git a/chrome/browser/chromeos/assistant/assistant_util.cc b/chrome/browse diff --git a/chrome/browser/chromeos/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc b/chrome/browser/chromeos/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc --- a/chrome/browser/chromeos/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc +++ b/chrome/browser/chromeos/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc -@@ -23,17 +23,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf"; +@@ -24,17 +24,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf"; // The url to download the proto of the complete list of wallpaper collections. constexpr char kBackdropCollectionsUrl[] = @@ -11164,7 +10941,7 @@ diff --git a/chrome/browser/chromeos/backdrop_wallpaper_handlers/backdrop_wallpa diff --git a/chrome/browser/chromeos/crostini/crostini_util.h b/chrome/browser/chromeos/crostini/crostini_util.h --- a/chrome/browser/chromeos/crostini/crostini_util.h +++ b/chrome/browser/chromeos/crostini/crostini_util.h -@@ -183,7 +183,7 @@ constexpr char kCrostiniCroshBuiltinAppId[] = +@@ -185,7 +185,7 @@ constexpr char kCrostiniDefaultUsername[] = "emperor"; // Generated using crx_file::id_util::GenerateId("LinuxAppsFolder") constexpr char kCrostiniFolderId[] = "ddolnhmblagmcagkedkbfejapapdimlk"; constexpr char kCrostiniDefaultImageServerUrl[] = @@ -11188,7 +10965,7 @@ diff --git a/chrome/browser/chromeos/customization/customization_document.cc b/c diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h --- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h +++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h -@@ -52,7 +52,7 @@ namespace chromeos { +@@ -53,7 +53,7 @@ namespace chromeos { // --dest=org.chromium.NetworkProxyService // /org/chromium/NetworkProxyService // org.chromium.NetworkProxyServiceInterface.ResolveProxy @@ -11485,7 +11262,7 @@ diff --git a/chrome/browser/chromeos/login/screens/recommend_apps/device_configu diff --git a/chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc b/chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc --- a/chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc +++ b/chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc -@@ -39,7 +39,7 @@ namespace chromeos { +@@ -36,7 +36,7 @@ namespace chromeos { namespace { constexpr const char kGetAppListUrl[] = @@ -11497,7 +11274,7 @@ diff --git a/chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc --- a/chrome/browser/chromeos/login/session/user_session_manager.cc +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc -@@ -1189,7 +1189,7 @@ void UserSessionManager::PrepareProfile(const base::FilePath& profile_path) { +@@ -1190,7 +1190,7 @@ void UserSessionManager::PrepareProfile(const base::FilePath& profile_path) { DemoAppLauncher::IsDemoAppSession(user_context_.GetAccountId()); // TODO(nkostylev): Figure out whether demo session is using the right profile @@ -11506,7 +11283,7 @@ diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chr g_browser_process->profile_manager()->CreateProfileAsync( profile_path, base::Bind(&UserSessionManager::OnProfileCreated, AsWeakPtr(), -@@ -1253,7 +1253,7 @@ void ShowSupervisedUserDeprecationNotification(Profile* profile, +@@ -1254,7 +1254,7 @@ void ShowSupervisedUserDeprecationNotification(Profile* profile, NavigateParams params( profile, @@ -11527,6 +11304,18 @@ diff --git a/chrome/browser/chromeos/login/ui/captive_portal_view.cc b/chrome/br if (!redirected_ && url != GURL::EmptyGURL() && url != GURL(CaptivePortalStartURL())) { redirected_ = true; +diff --git a/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc b/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc +--- a/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc ++++ b/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc +@@ -181,7 +181,7 @@ void RemoveDriveDownloadDirectoryIfExists() { + + // TODO(muhamedp): Update if a different url format is ultimately chosen. + bool IsDriveUrl(const GURL& url) { +- const std::string url_base = "https://drive.google.com/open"; ++ const std::string url_base = "https://drive.9oo91e.qjz9zk/open"; + const std::string& spec = url.spec(); + return spec.find(url_base) == 0 && spec.find("id=") < (spec.length() - 3); + } diff --git a/chrome/browser/chromeos/policy/active_directory_policy_manager.cc b/chrome/browser/chromeos/policy/active_directory_policy_manager.cc --- a/chrome/browser/chromeos/policy/active_directory_policy_manager.cc +++ b/chrome/browser/chromeos/policy/active_directory_policy_manager.cc @@ -11568,7 +11357,7 @@ diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc b/chrome/brow diff --git a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc b/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc --- a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc +++ b/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc -@@ -59,8 +59,8 @@ constexpr char kCRDConnectNoDialogs[] = "noDialogs"; +@@ -60,8 +60,8 @@ constexpr char kCRDConnectSuppressNotifications[] = "suppressNotifications"; constexpr char kCRDTerminateUponInput[] = "terminateUponInput"; // Connect message parameter values: @@ -11579,7 +11368,7 @@ diff --git a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc // CRD host states we care about: constexpr char kCRDStateKey[] = "state"; -@@ -80,11 +80,11 @@ constexpr char kCRDConnectClientKey[] = "client"; +@@ -81,11 +81,11 @@ constexpr char kCRDConnectClientKey[] = "client"; // OAuth2 Token scopes constexpr char kCloudDevicesOAuth2Scope[] = @@ -11597,7 +11386,7 @@ diff --git a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc diff --git a/chrome/browser/chromeos/policy/status_collector/status_collector.h b/chrome/browser/chromeos/policy/status_collector/status_collector.h --- a/chrome/browser/chromeos/policy/status_collector/status_collector.h +++ b/chrome/browser/chromeos/policy/status_collector/status_collector.h -@@ -84,7 +84,7 @@ class StatusCollector { +@@ -96,7 +96,7 @@ class StatusCollector { // Methods used to decide whether a specific categories of data should be // included in the reports or not. See: @@ -11798,6 +11587,18 @@ diff --git a/chrome/browser/devtools/url_constants.cc b/chrome/browser/devtools/ - "https://chrome-devtools-frontend.appspot.com/"; + "https://chrome-devtools-frontend.8pp2p8t.qjz9zk/"; const char kRemoteFrontendPath[] = "serve_file"; +diff --git a/chrome/browser/download/mixed_content_download_blocking.cc b/chrome/browser/download/mixed_content_download_blocking.cc +--- a/chrome/browser/download/mixed_content_download_blocking.cc ++++ b/chrome/browser/download/mixed_content_download_blocking.cc +@@ -312,7 +312,7 @@ void PrintConsoleMessage(const MixedContentDownloadData& data, + "connection, but the file at '%s' was %s an insecure " + "connection. This file should be served over HTTPS. " + "This download %s. See " +- "https://blog.chromium.org/2020/02/" ++ "https://blog.ch40m1um.qjz9zk/2020/02/" + "protecting-users-from-insecure.html" + " for more details.", + data.initiator_->GetURL().spec().c_str(), diff --git a/chrome/browser/engagement/site_engagement_helper.cc b/chrome/browser/engagement/site_engagement_helper.cc --- a/chrome/browser/engagement/site_engagement_helper.cc +++ b/chrome/browser/engagement/site_engagement_helper.cc @@ -11942,7 +11743,7 @@ diff --git a/chrome/browser/extensions/api/declarative_content/content_predicate diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -@@ -233,7 +233,7 @@ std::vector GetSpecificSiteControls( +@@ -234,7 +234,7 @@ std::vector GetSpecificSiteControls( // NOTE(devlin): This is similar, but not identical, to our host collapsing // for permission warnings. The primary difference is that this will not @@ -12073,19 +11874,19 @@ diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist. diff --git a/chrome/browser/extensions/extension_browser_window_helper.cc b/chrome/browser/extensions/extension_browser_window_helper.cc --- a/chrome/browser/extensions/extension_browser_window_helper.cc +++ b/chrome/browser/extensions/extension_browser_window_helper.cc -@@ -44,7 +44,7 @@ bool ShouldCloseTabOnExtensionUnload(const ExtensionId& extension_id, +@@ -56,7 +56,7 @@ bool ShouldCloseTabOnExtensionUnload(const Extension* extension, // Case 2: Check if the page is a page associated with a hosted app, which // can have non-extension schemes. For example, the Gmail hosted app would - // have a URL of https://mail.google.com. + // have a URL of https://mail.9oo91e.qjz9zk. - if (TabHelper::FromWebContents(web_contents)->GetAppId() == extension_id) { + if (TabHelper::FromWebContents(web_contents)->GetAppId() == extension->id()) { return true; } diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc -@@ -283,7 +283,7 @@ void ExternalPrefLoader::LoadOnFileThread() { +@@ -282,7 +282,7 @@ void ExternalPrefLoader::LoadOnFileThread() { if (!prefs->empty()) LOG(WARNING) << "You are using an old-style extension deployment method " "(external_extensions.json), which will soon be " @@ -12097,7 +11898,7 @@ 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 -@@ -65,7 +65,7 @@ const int kSignatureFormatVersion = 2; +@@ -66,7 +66,7 @@ const int kSignatureFormatVersion = 2; const size_t kSaltBytes = 32; const char kBackendUrl[] = @@ -12123,7 +11924,7 @@ diff --git a/chrome/browser/extensions/navigation_observer.cc b/chrome/browser/e diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc --- a/chrome/browser/extensions/permissions_updater.cc +++ b/chrome/browser/extensions/permissions_updater.cc -@@ -298,10 +298,10 @@ void PermissionsUpdater::GrantRuntimePermissions( +@@ -303,10 +303,10 @@ void PermissionsUpdater::GrantRuntimePermissions( base::OnceClosure completion_callback) { // We don't want to grant the extension object/process more privilege than it // requested, even if the user grants additional permission. For instance, if @@ -12138,7 +11939,7 @@ diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/e // increased permissions that are already covered, they will be auto-granted. // Determine which permissions to add to the extension. -@@ -360,8 +360,8 @@ void PermissionsUpdater::RevokeRuntimePermissions( +@@ -365,8 +365,8 @@ void PermissionsUpdater::RevokeRuntimePermissions( base::OnceClosure completion_callback) { // Similar to the process in adding permissions, we might be revoking more // permissions than the extension currently has explicit access to. For @@ -12177,7 +11978,7 @@ diff --git a/chrome/browser/extensions/scripting_permissions_modifier.h b/chrome // which includes both granted optional permissions and permissions granted // through the runtime host permissions feature. // This may only be called for extensions that can be affected (i.e., for -@@ -85,7 +85,7 @@ class ScriptingPermissionsModifier { +@@ -90,7 +90,7 @@ class ScriptingPermissionsModifier { // Revokes permission to run on the origin of |url|, including any permissions // that match or overlap with the origin. For instance, removing access to @@ -12268,16 +12069,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // // expiry_milestone: the milestone after which this flag is obsolete. // Specifically, after the milestone with the given number branches, this flag -@@ -79,7 +79,7 @@ +@@ -84,7 +84,7 @@ }, { "name": "allow-sync-xhr-in-page-dismissal", - "owners": [ "kdillon@chromium.org" ], + "owners": [ "kdillon@ch40m1um.qjz9zk" ], - "expiry_milestone": 82 + "expiry_milestone": 88 }, { -@@ -119,7 +119,7 @@ +@@ -124,7 +124,7 @@ }, { "name": "app-service-intent-handling", @@ -12286,7 +12087,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -163,14 +163,14 @@ +@@ -168,14 +168,14 @@ }, { "name": "arc-native-bridge-toggle", @@ -12303,16 +12104,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -185,7 +185,7 @@ - }, - { - "name": "arc-vpn", -- "owners": [ "cros-networking@google.com" ], -+ "owners": [ "cros-networking@9oo91e.qjz9zk" ], - "expiry_milestone": 76 - }, - { -@@ -244,7 +244,7 @@ +@@ -239,7 +239,7 @@ }, { "name": "autofill-always-return-cloud-tokenized-card", @@ -12321,7 +12113,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 87 }, { -@@ -279,7 +279,7 @@ +@@ -274,7 +274,7 @@ }, { "name": "autofill-enable-virtual-card", @@ -12330,13 +12122,13 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 87 }, { -@@ -299,18 +299,18 @@ +@@ -294,18 +294,18 @@ }, { "name": "autofill-keyboard-accessory-view", - "owners": [ "fhorschig@chromium.org" ], + "owners": [ "fhorschig@ch40m1um.qjz9zk" ], - "expiry_milestone": 82 + "expiry_milestone": 83 }, { "name": "autofill-no-local-save-on-unmask-success", @@ -12361,7 +12153,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 85 }, { -@@ -501,7 +501,7 @@ +@@ -456,7 +456,7 @@ + }, + { + "name": "chromeos-video-decoder", +- "owners": [ "chromeos-video-eng@google.com" ], ++ "owners": [ "chromeos-video-eng@9oo91e.qjz9zk" ], + // This flag should expire once all VDA-based ChromeOS video decoders have + // been removed. + "expiry_milestone": 90 +@@ -503,7 +503,7 @@ }, { "name": "compositor-threaded-scrollbar-scrolling", @@ -12370,7 +12171,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 90 }, { -@@ -641,7 +641,7 @@ +@@ -653,7 +653,7 @@ }, { "name": "darken-websites-checkbox-in-themes-setting", @@ -12379,7 +12180,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 83 }, { -@@ -664,17 +664,17 @@ +@@ -676,17 +676,17 @@ }, { "name": "decode-jpeg-images-to-yuv", @@ -12400,7 +12201,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 88 }, { -@@ -709,39 +709,39 @@ +@@ -721,32 +721,32 @@ }, { "name": "disable-accelerated-mjpeg-decode", @@ -12438,6 +12239,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // This flag is use to disable CancelAllTouches() function, which enable the // testing for implementation of canceling single touches. "expiry_milestone": 86 +@@ -758,7 +758,7 @@ }, { "name": "disable-explicit-dma-fences", @@ -12446,16 +12248,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // This flag is used for QA & debugging on ChromeOS, which has no way to // customize switches. "expiry_milestone": -1 -@@ -754,7 +754,7 @@ - { - // See https://crbug.com/882238. - "name": "disable-ipc-flooding-protection", -- "owners": [ "arthursonzogni@chromium.org", "palmer@chromium.org" ], -+ "owners": [ "arthursonzogni@ch40m1um.qjz9zk", "palmer@ch40m1um.qjz9zk" ], - "expiry_milestone": 76 - }, - { -@@ -772,8 +772,8 @@ +@@ -788,8 +788,8 @@ { "name": "disable-office-editing-component-app", "owners": [ @@ -12466,16 +12259,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 88 }, { -@@ -784,7 +784,7 @@ - { - // See https://crbug.com/882238. - "name": "disable-pushstate-throttle", -- "owners": [ "arthursonzogni@chromium.org", "palmer@chromium.org" ], -+ "owners": [ "arthursonzogni@ch40m1um.qjz9zk", "palmer@ch40m1um.qjz9zk" ], - "expiry_milestone": 76 - }, - { -@@ -801,7 +801,7 @@ +@@ -806,7 +806,7 @@ }, { "name": "disable-webrtc-hw-decoding", @@ -12484,7 +12268,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // This flag does not expire because it allows users to disable HW video // decoding only in webrtc usecase for debugging purpose and temporary // workaround for some issues. -@@ -809,7 +809,7 @@ +@@ -814,7 +814,7 @@ }, { "name": "disable-webrtc-hw-encoding", @@ -12493,13 +12277,13 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // This flag does not expire because it allows users to disable HW video // encoding only in webrtc usecase for debugging purpose and temporary // workaround for some issues. -@@ -833,7 +833,7 @@ +@@ -843,7 +843,7 @@ }, { "name": "dns-over-https", - "owners": [ "dalyk", "doh-core@google.com" ], + "owners": [ "dalyk", "doh-core@9oo91e.qjz9zk" ], - "expiry_milestone": 81 + "expiry_milestone": 84 }, { @@ -868,7 +868,7 @@ @@ -12547,7 +12331,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "name": "enable-autofill-account-wallet-storage", - "owners": [ "treib", "jsaul@google.com", "butter-team@google.com" ], + "owners": [ "treib", "jsaul@9oo91e.qjz9zk", "butter-team@9oo91e.qjz9zk" ], - "expiry_milestone": 81 + "expiry_milestone": 83 }, { "name": "enable-autofill-credit-card-ablation-experiment", @@ -12604,7 +12388,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "name": "enable-autofill-manual-fallback", - "owners": [ "fhorschig@chromium.org" ], + "owners": [ "fhorschig@ch40m1um.qjz9zk" ], - "expiry_milestone": 82 + "expiry_milestone": 83 }, { "name": "enable-autofill-refresh-style", @@ -12619,16 +12403,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -1087,7 +1087,7 @@ - }, - { - "name": "enable-backdrop-filter", -- "owners": [ "masonfreed", "paint-dev@chromium.org" ], -+ "owners": [ "masonfreed", "paint-dev@ch40m1um.qjz9zk" ], - "expiry_milestone": 78 - }, - { -@@ -1097,7 +1097,7 @@ +@@ -1092,7 +1092,7 @@ }, { "name": "enable-bookmark-reorder", @@ -12637,7 +12412,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -1137,17 +1137,17 @@ +@@ -1127,17 +1127,17 @@ }, { "name": "enable-chromeos-account-manager", @@ -12658,7 +12433,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -1184,22 +1184,22 @@ +@@ -1174,22 +1174,22 @@ }, { "name": "enable-cros-ime-input-logic-fst", @@ -12685,7 +12460,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 83 }, { -@@ -1250,12 +1250,12 @@ +@@ -1235,22 +1235,22 @@ }, { "name": "enable-desktop-minimal-ui", @@ -12700,7 +12475,19 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 83 }, { -@@ -1271,12 +1271,12 @@ + "name": "enable-desktop-pwas-local-updating-throttle-persistence", +- "owners": [ "desktop-pwas-team@google.com" ], ++ "owners": [ "desktop-pwas-team@9oo91e.qjz9zk" ], + "expiry_milestone": 83 + }, + { + "name": "enable-desktop-pwas-tab-strip", +- "owners": [ "desktop-pwas-team@google.com" ], ++ "owners": [ "desktop-pwas-team@9oo91e.qjz9zk" ], + "expiry_milestone": 84 + }, + { +@@ -1266,12 +1266,12 @@ }, { "name": "enable-duet-tabstrip-integration", @@ -12715,7 +12502,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 83 }, { -@@ -1326,17 +1326,17 @@ +@@ -1331,17 +1331,17 @@ }, { "name": "enable-experimental-accessibility-switch-access", @@ -12736,16 +12523,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 81 }, { -@@ -1346,7 +1346,7 @@ +@@ -1351,7 +1351,7 @@ }, { "name": "enable-experimental-productivity-features", - "owners": [ "feature-control@chromium.org" ], + "owners": [ "feature-control@ch40m1um.qjz9zk" ], - "expiry_milestone": 81 + "expiry_milestone": 86 }, { -@@ -1370,12 +1370,12 @@ +@@ -1375,12 +1375,12 @@ }, { "name": "enable-force-dark", @@ -12760,7 +12547,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 76 }, { -@@ -1397,12 +1397,12 @@ +@@ -1402,12 +1402,12 @@ }, { "name": "enable-generic-sensor-extra-classes", @@ -12823,13 +12610,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 75 }, { -@@ -1618,12 +1618,12 @@ - }, - { - "name": "enable-ntp-remote-suggestions", -- "owners": [ "//chrome/android/feed/OWNERS", "feed@chromium.org" ], -+ "owners": [ "//chrome/android/feed/OWNERS", "feed@ch40m1um.qjz9zk" ], - "expiry_milestone": 80 +@@ -1613,7 +1613,7 @@ }, { "name": "enable-offer-store-unmasked-wallet-cards", @@ -12847,7 +12628,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 85 }, { -@@ -1708,7 +1708,7 @@ +@@ -1713,7 +1713,7 @@ }, { "name": "enable-reader-mode", @@ -12856,7 +12637,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -1790,7 +1790,7 @@ +@@ -1795,7 +1795,7 @@ }, { "name": "enable-service-worker-imported-script-update-check", @@ -12865,7 +12646,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // It's still in development. Tentatively set to M76 as the expiry_milestone. "expiry_milestone": 76 }, -@@ -1897,7 +1897,7 @@ +@@ -1902,7 +1902,7 @@ }, { "name": "enable-sync-uss-nigori", @@ -12874,7 +12655,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 83 }, { -@@ -1912,37 +1912,37 @@ +@@ -1917,37 +1917,37 @@ }, { "name": "enable-tab-engagement-reporting", @@ -12919,7 +12700,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -1996,12 +1996,12 @@ +@@ -2006,12 +2006,12 @@ }, { "name": "enable-vaapi-jpeg-image-decode-acceleration", @@ -12934,7 +12715,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 83 }, { -@@ -2038,62 +2038,62 @@ +@@ -2032,77 +2032,77 @@ }, { "name": "enable-web-authentication-ble-support", @@ -12963,6 +12744,12 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // features in each release. "expiry_milestone": -1 }, + { + "name": "enable-web-payments-minimal-ui", +- "owners": [ "rouslan", "web-payments-team@google.com" ], ++ "owners": [ "rouslan", "web-payments-team@9oo91e.qjz9zk" ], + "expiry_milestone": 90 + }, { "name": "enable-webassembly-baseline", - "owners": [ "clemensb", "wasm-team@google.com" ], @@ -12981,6 +12768,12 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js + "owners": [ "clemensb", "wasm-team@9oo91e.qjz9zk" ], "expiry_milestone": 83 }, + { + "name": "enable-webassembly-lazy-compilation", +- "owners": [ "clemensb", "wasm-team@google.com" ], ++ "owners": [ "clemensb", "wasm-team@9oo91e.qjz9zk" ], + "expiry_milestone": 86 + }, { "name": "enable-webassembly-simd", - "owners": [ "gdeepti", "wasm-team@google.com" ], @@ -12993,6 +12786,12 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js + "owners": [ "binji", "hablich", "wasm-team@9oo91e.qjz9zk" ], "expiry_milestone": 83 }, + { + "name": "enable-webassembly-tiering", +- "owners": [ "clemensb", "wasm-team@google.com" ], ++ "owners": [ "clemensb", "wasm-team@9oo91e.qjz9zk" ], + "expiry_milestone": 86 + }, { "name": "enable-webgl-draft-extensions", - "owners": [ "webgl-team@google.com" ], @@ -13005,40 +12804,40 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "name": "enable-webgl2-compute-context", - "owners": [ "webgl-team@google.com" ], + "owners": [ "webgl-team@9oo91e.qjz9zk" ], - "expiry_milestone": 81 + "expiry_milestone": 85 }, { -@@ -2113,17 +2113,17 @@ +@@ -2122,17 +2122,17 @@ }, { "name": "enable-webrtc-hw-h264-encoding", - "owners": [ "hiroh", "chromeos-video-eng@google.com" ], + "owners": [ "hiroh", "chromeos-video-eng@9oo91e.qjz9zk" ], - "expiry_milestone": 76 + "expiry_milestone": 83 }, { "name": "enable-webrtc-hw-vp8-encoding", - "owners": [ "hiroh", "chromeos-video-eng@google.com" ], + "owners": [ "hiroh", "chromeos-video-eng@9oo91e.qjz9zk" ], - "expiry_milestone": 76 + "expiry_milestone": 83 }, { "name": "enable-webrtc-hw-vp9-encoding", - "owners": [ "hiroh", "chromeos-video-eng@google.com" ], + "owners": [ "hiroh", "chromeos-video-eng@9oo91e.qjz9zk" ], - "expiry_milestone": 76 + "expiry_milestone": 83 }, { -@@ -2138,7 +2138,7 @@ +@@ -2147,7 +2147,7 @@ }, { "name": "enable-webrtc-pipewire-capturer", - "owners": [ "tomas.popela@gmail.com" ], + "owners": [ "tomas.popela@9ma1l.qjz9zk" ], - "expiry_milestone": 81 + "expiry_milestone": 82 }, { -@@ -2158,22 +2158,22 @@ +@@ -2167,22 +2167,22 @@ }, { "name": "enable-webrtc-use-min-max-vea-dimensions", @@ -13065,7 +12864,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // This flag is commonly used when asking users to help gather debug info. "expiry_milestone": -1 }, -@@ -2241,7 +2241,7 @@ +@@ -2255,7 +2255,7 @@ }, { "name": "file-handling-api", @@ -13074,7 +12873,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -2261,7 +2261,7 @@ +@@ -2270,7 +2270,7 @@ }, { "name": "focus-mode", @@ -13083,7 +12882,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -2322,12 +2322,12 @@ +@@ -2331,12 +2331,12 @@ }, { "name": "forced-colors", @@ -13095,10 +12894,10 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "name": "form-controls-refresh", - "owners": [ "iopopesc@microsoft.com", "//third_party/blink/renderer/core/OWNERS" ], + "owners": [ "iopopesc@m1cr050ft.qjz9zk", "//third_party/blink/renderer/core/OWNERS" ], - "expiry_milestone": 81 + "expiry_milestone": 84 }, { -@@ -2352,7 +2352,7 @@ +@@ -2366,7 +2366,7 @@ }, { "name": "gesture-properties-dbus-service", @@ -13107,7 +12906,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // Used by developers for debugging and input device tuning. "expiry_milestone": -1 }, -@@ -2368,7 +2368,7 @@ +@@ -2377,7 +2377,7 @@ + }, + { + "name": "global-media-controls-for-cast", +- "owners": [ "takumif", "openscreen-eng@google.com" ], ++ "owners": [ "takumif", "openscreen-eng@9oo91e.qjz9zk" ], + "expiry_milestone": 90 + }, + { +@@ -2392,7 +2392,7 @@ }, { "name": "handwriting-gesture", @@ -13116,7 +12924,25 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 83 }, { -@@ -2447,7 +2447,7 @@ +@@ -2440,7 +2440,7 @@ + }, + { + "name": "homepage-settings-ui-conversion", +- "owners": [ "wenyufu", "chrome-android-app@chromium.org" ], ++ "owners": [ "wenyufu", "chrome-android-app@ch40m1um.qjz9zk" ], + "expiry_milestone": 84 + }, + { +@@ -2479,7 +2479,7 @@ + }, + { + "name": "impulse-scroll-animations", +- "owners": [ "maamert@microsoft.com", "dlibby@microsoft.com", "sarsha@microsoft.com" ], ++ "owners": [ "maamert@m1cr050ft.qjz9zk", "dlibby@m1cr050ft.qjz9zk", "sarsha@m1cr050ft.qjz9zk" ], + "expiry_milestone": 89 + }, + { +@@ -2496,7 +2496,7 @@ }, { "name": "instant-tethering", @@ -13125,7 +12951,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // Though Instant Tethering is now a launched feature, it is only marked enabled on select, // approved boards which have passed hardware verification and received server config seeds // marking it as enabled. This means it is actually disabled-by-default, and since test machines -@@ -2457,7 +2457,7 @@ +@@ -2506,7 +2506,7 @@ }, { "name": "interest-feed-content-suggestions", @@ -13134,7 +12960,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 90 }, { -@@ -2501,7 +2501,7 @@ +@@ -2555,7 +2555,7 @@ }, { "name": "mac-syscall-sandbox", @@ -13143,7 +12969,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 88 }, { -@@ -2511,7 +2511,7 @@ +@@ -2565,7 +2565,7 @@ }, { "name": "mac-v2-gpu-sandbox", @@ -13152,7 +12978,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 88 }, { -@@ -2627,7 +2627,7 @@ +@@ -2671,7 +2671,7 @@ }, { "name": "new-usb-backend", @@ -13161,16 +12987,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 83 }, { -@@ -2677,7 +2677,7 @@ - }, - { - "name": "oculus-vr", -- "owners": [ "//device/vr/OWNERS", "xr-dev@chromium.org" ], -+ "owners": [ "//device/vr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ], - "expiry_milestone": 82 - }, - { -@@ -2692,7 +2692,7 @@ +@@ -2726,7 +2726,7 @@ }, { "name": "offline-indicator-v2", @@ -13179,7 +12996,13 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 85 }, { -@@ -2762,77 +2762,77 @@ +@@ -2796,87 +2796,87 @@ + }, + { + "name": "omnibox-assistant-voice-search", +- "owners": [ "wylieb", "chrome-omnibox-team@google.com" ], ++ "owners": [ "wylieb", "chrome-omnibox-team@9oo91e.qjz9zk" ], + "expiry_milestone": 85 }, { "name": "omnibox-autocomplete-titles", @@ -13218,10 +13041,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 85 }, { - "name": "omnibox-group-suggestions-by-search-vs-url", -- "owners": [ "krb", "chrome-omnibox-team@google.com" ], -+ "owners": [ "krb", "chrome-omnibox-team@9oo91e.qjz9zk" ], - "expiry_milestone": 82 + "name": "omnibox-history-quick-provider-allow-but-do-not-score-midword-terms", +- "owners": [ "manukh", "chrome-omnibox-team@google.com" ], ++ "owners": [ "manukh", "chrome-omnibox-team@9oo91e.qjz9zk" ], + "expiry_milestone": 88 + }, + { + "name": "omnibox-history-quick-provider-allow-midword-continuations", +- "owners": [ "manukh", "chrome-omnibox-team@google.com" ], ++ "owners": [ "manukh", "chrome-omnibox-team@9oo91e.qjz9zk" ], + "expiry_milestone": 88 }, { "name": "omnibox-local-entity-suggestions", @@ -13272,7 +13101,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 85 }, { -@@ -2842,87 +2842,87 @@ +@@ -2886,92 +2886,92 @@ }, { "name": "omnibox-reverse-answers", @@ -13304,6 +13133,12 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js + "owners": [ "chrome-omnibox-team@9oo91e.qjz9zk" ], "expiry_milestone": 76 }, + { + "name": "omnibox-suggestion-button-row", +- "owners": [ "orinj", "chrome-omnibox-team@google.com" ], ++ "owners": [ "orinj", "chrome-omnibox-team@9oo91e.qjz9zk" ], + "expiry_milestone": 89 + }, { "name": "omnibox-suggestion-transparency-options", - "owners": [ "tommycli", "chrome-omnibox-team@google.com" ], @@ -13377,7 +13212,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 85 }, { -@@ -2937,17 +2937,17 @@ +@@ -2986,7 +2986,7 @@ }, { "name": "on-the-fly-mhtml-hash-computation", @@ -13386,19 +13221,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 76 }, { - "name": "openvr", -- "owners": [ "//device/vr/OWNERS", "xr-dev@chromium.org" ], -+ "owners": [ "//device/vr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ], - "expiry_milestone": 82 - }, - { - "name": "openxr", -- "owners": [ "//device/vr/OWNERS", "xr-dev@chromium.org" ], -+ "owners": [ "//device/vr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ], - "expiry_milestone": 82 - }, - { -@@ -2977,7 +2977,7 @@ +@@ -3016,7 +3016,7 @@ }, { "name": "overlay-strategies", @@ -13407,7 +13230,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // This flag is used for QA & debugging on ChromeOS, which has no way to // customize switches. "expiry_milestone": -1 -@@ -3034,7 +3034,7 @@ +@@ -3073,7 +3073,7 @@ }, { "name": "pdf-annotations", @@ -13416,7 +13239,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 76 }, { -@@ -3049,7 +3049,7 @@ +@@ -3088,7 +3088,7 @@ }, { "name": "percent-based-scrolling", @@ -13425,7 +13248,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -3070,7 +3070,7 @@ +@@ -3114,7 +3114,7 @@ { "name": "privacy-settings-redesign", "owners": ["harrisonsean", "msramek", @@ -13434,7 +13257,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -3164,7 +3164,7 @@ +@@ -3220,7 +3220,7 @@ }, { "name": "scrollable-tabstrip", @@ -13443,7 +13266,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -3266,7 +3266,7 @@ +@@ -3327,7 +3327,7 @@ }, { "name": "show-bluetooth-device-battery", @@ -13452,19 +13275,22 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 85 }, { -@@ -3337,17 +3337,17 @@ +@@ -3337,7 +3337,7 @@ }, { - "name": "split-settings", -- "owners": [ "jamescook", "cros-system-services@google.com" ], -+ "owners": [ "jamescook", "cros-system-services@9oo91e.qjz9zk" ], - "expiry_milestone": 80 + "name": "show-overdraw-feedback", +- "owners": [ "andrescj", "chromeos-gfx@google.com" ], ++ "owners": [ "andrescj", "chromeos-gfx@9oo91e.qjz9zk" ], + "expiry_milestone": 85 + }, + { +@@ -3408,12 +3408,12 @@ }, { "name": "split-settings-sync", - "owners": [ "jamescook", "cros-system-services@google.com" ], + "owners": [ "jamescook", "cros-system-services@9oo91e.qjz9zk" ], - "expiry_milestone": 82 + "expiry_milestone": 84 }, { "name": "stop-in-background", @@ -13473,16 +13299,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 76 }, { -@@ -3357,7 +3357,7 @@ +@@ -3423,7 +3423,7 @@ }, { "name": "storage-access-api", - "owners": [ "brandm@microsoft.com" ], + "owners": [ "brandm@m1cr050ft.qjz9zk" ], - "expiry_milestone": 80 + "expiry_milestone": 85 }, { -@@ -3377,7 +3377,7 @@ +@@ -3453,7 +3453,7 @@ }, { "name": "sync-wifi-configurations", @@ -13491,7 +13317,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 85 }, { -@@ -3387,7 +3387,7 @@ +@@ -3463,7 +3463,7 @@ }, { "name": "tab-groups", @@ -13500,7 +13326,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -3407,7 +3407,7 @@ +@@ -3483,7 +3483,7 @@ }, { "name": "tab-switcher-longpress-menu", @@ -13509,7 +13335,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 81 }, { -@@ -3432,7 +3432,7 @@ +@@ -3508,7 +3508,7 @@ }, { "name": "tint-gl-composited-content", @@ -13518,16 +13344,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // This flag is used for QA & development on ChromeOS, which has no way to // customize switches. "expiry_milestone": -1 -@@ -3444,7 +3444,7 @@ +@@ -3520,7 +3520,7 @@ }, { "name": "top-chrome-touch-ui", -- "owners": [ "chrome-desktop-ui-sea@google.com" ], -+ "owners": [ "chrome-desktop-ui-sea@9oo91e.qjz9zk" ], - "expiry_milestone": 81 - }, - { -@@ -3474,19 +3474,19 @@ +- "owners": [ "pbos", "chrome-desktop-ui-sea@google.com" ], ++ "owners": [ "pbos", "chrome-desktop-ui-sea@9oo91e.qjz9zk" ], + // This flag is used to easily swap into touch-mode for UI development where + // the UI differs significantly between touch/non-touch modes. This is + // exposed in chrome://flags to allow QA and UXers to verify touch-related +@@ -3554,19 +3554,19 @@ }, { "name": "translate-android-manual-trigger", @@ -13550,7 +13376,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -3511,7 +3511,7 @@ +@@ -3591,7 +3591,7 @@ }, { "name": "turn-off-streaming-media-caching", @@ -13559,7 +13385,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -@@ -3562,17 +3562,17 @@ +@@ -3637,17 +3637,17 @@ }, { "name": "updated_cellular_activation_ui", @@ -13580,16 +13406,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // This flag is used by certain customers to set ANGLE to use its OpenGL // backend on Windows. Its usage is small enough that it isn't worth // promoting this to a chrome://settings entry, but it needs to be readily -@@ -3581,7 +3581,7 @@ +@@ -3656,7 +3656,7 @@ }, { "name": "use-fake-device-for-media-stream", - "owners": [ "mcasas", "chromeos-gfx@google.com" ], + "owners": [ "mcasas", "chromeos-gfx@9oo91e.qjz9zk" ], - "expiry_milestone": 81 + // This flag is used for ChromeOS media testing to mock a source device. + "expiry_milestone": -1 }, - { -@@ -3639,7 +3639,7 @@ +@@ -3720,7 +3720,7 @@ }, { "name": "wallet-service-use-sandbox", @@ -13598,7 +13424,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js // This flag is used by testing teams to run Google Payments calls against // the development server environment. "expiry_milestone": -1 -@@ -3671,57 +3671,57 @@ +@@ -3752,27 +3752,27 @@ }, { "name": "webxr", @@ -13606,18 +13432,6 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js + "owners": [ "//third_party/blink/renderer/modules/xr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ], "expiry_milestone": 82 }, - { - "name": "webxr-anchors", -- "owners": [ "//third_party/blink/renderer/modules/xr/OWNERS", "xr-dev@chromium.org" ], -+ "owners": [ "//third_party/blink/renderer/modules/xr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ], - "expiry_milestone": 82 - }, - { - "name": "webxr-ar-dom-overlay", -- "owners": [ "//third_party/blink/renderer/modules/xr/OWNERS", "xr-dev@chromium.org" ], -+ "owners": [ "//third_party/blink/renderer/modules/xr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ], - "expiry_milestone": 81 - }, { "name": "webxr-ar-module", - "owners": [ "//third_party/blink/renderer/modules/xr/OWNERS", "xr-dev@chromium.org" ], @@ -13631,17 +13445,20 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { - "name": "webxr-orientation-sensor-device", -- "owners": [ "//device/vr/OWNERS", "xr-dev@chromium.org" ], -+ "owners": [ "//device/vr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ], - "expiry_milestone": 82 - }, - { - "name": "webxr-plane-detection", + "name": "webxr-incubations", - "owners": [ "//third_party/blink/renderer/modules/xr/OWNERS", "xr-dev@chromium.org" ], + "owners": [ "//third_party/blink/renderer/modules/xr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ], "expiry_milestone": 82 }, + { + "name": "webxr-runtime", +- "owners": [ "//third_party/blink/renderer/modules/xr/OWNERS", "xr-dev@chromium.org" ], ++ "owners": [ "//third_party/blink/renderer/modules/xr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ], + // This flag allows QA and Developers to force running on a particular + // runtime, even if ordinarily Chrome would prefer a different runtime for + // the particular hardware. Useful to debug user issues or multiple runtimes +@@ -3781,17 +3781,17 @@ + }, { "name": "win-use-hybrid-spellchecker", - "owners": [ "gujen@google.com", "chrome-language@google.com" ], @@ -13654,12 +13471,6 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js + "owners": [ "gujen@9oo91e.qjz9zk", "chrome-language@9oo91e.qjz9zk" ], "expiry_milestone": 83 }, - { - "name": "windows-mixed-reality", -- "owners": [ "//device/vr/OWNERS", "xr-dev@chromium.org" ], -+ "owners": [ "//device/vr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ], - "expiry_milestone": 82 - }, { "name": "xr-sandbox", - "owners": [ "//chrome/services/isolated_xr_device/OWNERS", "xr-dev@chromium.org" ], @@ -13667,21 +13478,6 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js "expiry_milestone": 82 }, { -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 -@@ -105,9 +105,9 @@ const char kUpdatedCellularActivationUiName[] = - const char kUpdatedCellularActivationUiDescription[] = - "Enables the updated cellular activation UI."; - --const char kUseMessagesGoogleComDomainName[] = "Use messages.google.com domain"; -+const char kUseMessagesGoogleComDomainName[] = "Use messages.9oo91e.qjz9zk domain"; - const char kUseMessagesGoogleComDomainDescription[] = -- "Use the messages.google.com domain as part of the \"Messages\" " -+ "Use the messages.9oo91e.qjz9zk domain as part of the \"Messages\" " - "feature under \"Connected Devices\" settings."; - - const char kUseMessagesStagingUrlName[] = "Use Messages staging URL"; diff --git a/chrome/browser/google/google_search_domain_mixing_metrics_emitter.h b/chrome/browser/google/google_search_domain_mixing_metrics_emitter.h --- a/chrome/browser/google/google_search_domain_mixing_metrics_emitter.h +++ b/chrome/browser/google/google_search_domain_mixing_metrics_emitter.h @@ -14114,13 +13910,15 @@ diff --git a/chrome/browser/metrics/thread_watcher_android.h b/chrome/browser/me diff --git a/chrome/browser/nacl_host/nacl_infobar_delegate.cc b/chrome/browser/nacl_host/nacl_infobar_delegate.cc --- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc +++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc -@@ -42,5 +42,5 @@ base::string16 NaClInfoBarDelegate::GetLinkText() const { +@@ -32,7 +32,7 @@ base::string16 NaClInfoBarDelegate::GetLinkText() const { } GURL NaClInfoBarDelegate::GetLinkURL() const { - return GURL("https://support.google.com/chrome/?p=ib_nacl"); + return GURL("https://support.9oo91e.qjz9zk/chrome/?p=ib_nacl"); } + + base::string16 NaClInfoBarDelegate::GetMessageText() const { diff --git a/chrome/browser/net/dns_probe_runner.cc b/chrome/browser/net/dns_probe_runner.cc --- a/chrome/browser/net/dns_probe_runner.cc +++ b/chrome/browser/net/dns_probe_runner.cc @@ -14193,7 +13991,7 @@ diff --git a/chrome/browser/notifications/notification_permission_context.h b/ch diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm -@@ -489,7 +489,7 @@ bool NotificationPlatformBridgeMac::VerifyNotificationData( +@@ -507,7 +507,7 @@ bool NotificationPlatformBridgeMac::SupportsAlerts() { // Overriden from _NSUserNotificationCenterDelegatePrivate. // Emitted when a user closes a notification from the notification center. // This is an undocumented method introduced in 10.8 according to @@ -14258,7 +14056,7 @@ diff --git a/chrome/browser/page_load_metrics/observers/service_worker_page_load diff --git a/chrome/browser/password_manager/password_manager_util_win.cc b/chrome/browser/password_manager/password_manager_util_win.cc --- a/chrome/browser/password_manager/password_manager_util_win.cc +++ b/chrome/browser/password_manager/password_manager_util_win.cc -@@ -275,7 +275,7 @@ bool CheckBlankPasswordWithPrefs(const WCHAR* username, +@@ -274,7 +274,7 @@ bool CheckBlankPasswordWithPrefs(const WCHAR* username, // In the case the password is blank, then LogonUser returns a failure, // handle is INVALID_HANDLE_VALUE, and GetLastError() is // ERROR_ACCOUNT_RESTRICTION. @@ -14270,7 +14068,7 @@ diff --git a/chrome/browser/password_manager/password_manager_util_win.cc b/chro diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/pepper_broker_infobar_delegate.cc --- a/chrome/browser/pepper_broker_infobar_delegate.cc +++ b/chrome/browser/pepper_broker_infobar_delegate.cc -@@ -88,7 +88,7 @@ base::string16 PepperBrokerInfoBarDelegate::GetLinkText() const { +@@ -65,7 +65,7 @@ base::string16 PepperBrokerInfoBarDelegate::GetLinkText() const { } GURL PepperBrokerInfoBarDelegate::GetLinkURL() const { @@ -14278,29 +14076,29 @@ diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/p + return GURL("https://support.9oo91e.qjz9zk/chrome/?p=ib_pepper_broker"); } - void PepperBrokerInfoBarDelegate::DispatchCallback(bool result) { + base::string16 PepperBrokerInfoBarDelegate::GetMessageText() const { diff --git a/chrome/browser/permissions/mock_permission_request.cc b/chrome/browser/permissions/mock_permission_request.cc --- a/chrome/browser/permissions/mock_permission_request.cc +++ b/chrome/browser/permissions/mock_permission_request.cc -@@ -17,7 +17,7 @@ MockPermissionRequest::MockPermissionRequest() - : MockPermissionRequest("test", - "button", - "button", -- GURL("http://www.google.com"), -+ GURL("http://www.9oo91e.qjz9zk"), - PermissionRequestType::PERMISSION_NOTIFICATIONS, - PermissionRequestGestureType::UNKNOWN, - ContentSettingsType::NOTIFICATIONS) {} -@@ -26,7 +26,7 @@ MockPermissionRequest::MockPermissionRequest(const std::string& text) - : MockPermissionRequest(text, - "button", - "button", -- GURL("http://www.google.com"), -+ GURL("http://www.9oo91e.qjz9zk"), - PermissionRequestType::PERMISSION_NOTIFICATIONS, - PermissionRequestGestureType::UNKNOWN, - ContentSettingsType::NOTIFICATIONS) {} -@@ -38,7 +38,7 @@ MockPermissionRequest::MockPermissionRequest( +@@ -18,7 +18,7 @@ MockPermissionRequest::MockPermissionRequest() + "test", + "button", + "button", +- GURL("http://www.google.com"), ++ GURL("http://www.9oo91e.qjz9zk"), + permissions::PermissionRequestType::PERMISSION_NOTIFICATIONS, + permissions::PermissionRequestGestureType::UNKNOWN, + ContentSettingsType::NOTIFICATIONS) {} +@@ -28,7 +28,7 @@ MockPermissionRequest::MockPermissionRequest(const std::string& text) + text, + "button", + "button", +- GURL("http://www.google.com"), ++ GURL("http://www.9oo91e.qjz9zk"), + permissions::PermissionRequestType::PERMISSION_NOTIFICATIONS, + permissions::PermissionRequestGestureType::UNKNOWN, + ContentSettingsType::NOTIFICATIONS) {} +@@ -40,7 +40,7 @@ MockPermissionRequest::MockPermissionRequest( : MockPermissionRequest(text, "button", "button", @@ -14309,28 +14107,28 @@ diff --git a/chrome/browser/permissions/mock_permission_request.cc b/chrome/brow request_type, gesture_type, ContentSettingsType::NOTIFICATIONS) {} -@@ -60,7 +60,7 @@ MockPermissionRequest::MockPermissionRequest(const std::string& text, - : MockPermissionRequest(text, - accept_label, - deny_label, -- GURL("http://www.google.com"), -+ GURL("http://www.9oo91e.qjz9zk"), - PermissionRequestType::PERMISSION_NOTIFICATIONS, - PermissionRequestGestureType::UNKNOWN, - ContentSettingsType::NOTIFICATIONS) {} -@@ -71,7 +71,7 @@ MockPermissionRequest::MockPermissionRequest( - : MockPermissionRequest(text, - "button", - "button", -- GURL("http://www.google.com"), -+ GURL("http://www.9oo91e.qjz9zk"), - PermissionRequestType::PERMISSION_NOTIFICATIONS, - PermissionRequestGestureType::UNKNOWN, - content_settings_type_) {} +@@ -64,7 +64,7 @@ MockPermissionRequest::MockPermissionRequest(const std::string& text, + text, + accept_label, + deny_label, +- GURL("http://www.google.com"), ++ GURL("http://www.9oo91e.qjz9zk"), + permissions::PermissionRequestType::PERMISSION_NOTIFICATIONS, + permissions::PermissionRequestGestureType::UNKNOWN, + ContentSettingsType::NOTIFICATIONS) {} +@@ -76,7 +76,7 @@ MockPermissionRequest::MockPermissionRequest( + text, + "button", + "button", +- GURL("http://www.google.com"), ++ GURL("http://www.9oo91e.qjz9zk"), + permissions::PermissionRequestType::PERMISSION_NOTIFICATIONS, + permissions::PermissionRequestGestureType::UNKNOWN, + content_settings_type_) {} diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc --- a/chrome/browser/permissions/permission_context_base.cc +++ b/chrome/browser/permissions/permission_context_base.cc -@@ -59,33 +59,33 @@ const char kPermissionBlockedKillSwitchMessage[] = +@@ -53,33 +53,33 @@ const char kPermissionBlockedKillSwitchMessage[] = const char kPermissionBlockedRepeatedDismissalsMessage[] = "%s permission has been blocked as the user has dismissed the permission " "prompt several times. This can be reset in Site Settings. See " @@ -14372,7 +14170,7 @@ diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/brow diff --git a/chrome/browser/permissions/permission_uma_util.h b/chrome/browser/permissions/permission_uma_util.h --- a/chrome/browser/permissions/permission_uma_util.h +++ b/chrome/browser/permissions/permission_uma_util.h -@@ -28,7 +28,7 @@ enum class PermissionSourceUI { +@@ -31,7 +31,7 @@ enum class PermissionSourceUI { PROMPT = 0, // Origin info bubble. @@ -14468,7 +14266,7 @@ diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -1424,7 +1424,7 @@ GURL ProfileImpl::GetHomePage() { +@@ -1425,7 +1425,7 @@ GURL ProfileImpl::GetHomePage() { *base::CommandLine::ForCurrentProcess(); if (command_line.HasSwitch(switches::kHomePage)) { // TODO(evanm): clean up usage of DIR_CURRENT. @@ -14492,7 +14290,7 @@ diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/pr diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h -@@ -459,7 +459,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -461,7 +461,7 @@ class ProfileManager : public content::NotificationObserver, // should likely be turned into DCHECK_CURRENTLY_ON(BrowserThread::UI) for // consistency with surrounding code in the same file but that wasn't trivial // enough to do as part of the mass refactor CL which introduced @@ -14554,15 +14352,15 @@ diff --git a/chrome/browser/push_messaging/push_messaging_notification_manager.h 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 -@@ -84,7 +84,7 @@ const char kSilentPushUnsupportedMessage[] = +@@ -85,7 +85,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 " - "https://goo.gl/yqv4Q4 for more details."; + "https://goo.gl.qjz9zk.qjz9zk/yqv4Q4 for more details."; - void RecordDeliveryStatus(blink::mojom::PushDeliveryStatus status) { - UMA_HISTOGRAM_ENUMERATION("PushMessaging.DeliveryStatus", status); + // Message displayed in the console (as an error) when a GCM Sender ID is used + // to create a subscription, which is unsupported. The subscription request will diff --git a/chrome/browser/resources/PRESUBMIT.py b/chrome/browser/resources/PRESUBMIT.py --- a/chrome/browser/resources/PRESUBMIT.py +++ b/chrome/browser/resources/PRESUBMIT.py @@ -14578,7 +14376,7 @@ diff --git a/chrome/browser/resources/PRESUBMIT.py b/chrome/browser/resources/PR diff --git a/chrome/browser/resources/bookmarks/command_manager.js b/chrome/browser/resources/bookmarks/command_manager.js --- a/chrome/browser/resources/bookmarks/command_manager.js +++ b/chrome/browser/resources/bookmarks/command_manager.js -@@ -447,7 +447,7 @@ export const CommandManager = Polymer({ +@@ -448,7 +448,7 @@ export const CommandManager = Polymer({ chrome.bookmarks.export(); break; case Command.HELP_CENTER: @@ -14751,13 +14549,13 @@ diff --git a/chrome/browser/resources/chromeos/camera/src/js/google-analytics-bu diff --git a/chrome/browser/resources/chromeos/camera/src/js/util.js b/chrome/browser/resources/chromeos/camera/src/js/util.js --- a/chrome/browser/resources/chromeos/camera/src/js/util.js +++ b/chrome/browser/resources/chromeos/camera/src/js/util.js -@@ -284,7 +284,7 @@ cca.util.isWindowFullSize = function() { +@@ -281,7 +281,7 @@ export function isWindowFullSize() { */ - cca.util.openHelp = function() { + export function openHelp() { window.open( - 'https://support.google.com/chromebook/?p=camera_usage_on_chromebook'); + 'https://support.9oo91e.qjz9zk/chromebook/?p=camera_usage_on_chromebook'); - }; + } /** diff --git a/chrome/browser/resources/chromeos/camera/src/manifest.json b/chrome/browser/resources/chromeos/camera/src/manifest.json @@ -14914,7 +14712,7 @@ diff --git a/chrome/browser/resources/chromeos/input_method/google_xkb_manifest. diff --git a/chrome/browser/resources/chromeos/login/cr_ui.js b/chrome/browser/resources/chromeos/login/cr_ui.js --- a/chrome/browser/resources/chromeos/login/cr_ui.js +++ b/chrome/browser/resources/chromeos/login/cr_ui.js -@@ -416,7 +416,7 @@ cr.define('cr.ui', function() { +@@ -419,7 +419,7 @@ cr.define('cr.ui', function() { var Oobe = cr.ui.Oobe; // Allow selection events on components with editable text (password field) @@ -14929,7 +14727,7 @@ diff --git a/chrome/browser/resources/chromeos/login/discover/modules/discover_m @@ -8,6 +8,6 @@ Polymer({ behaviors: [DiscoverModuleBehavior], - onClick_: function() { + onClick_() { - window.open('http://www.google.com/chromebook/offers/', '_blank'); + window.open('http://www.9oo91e.qjz9zk/chromebook/offers/', '_blank'); }, @@ -14940,7 +14738,7 @@ diff --git a/chrome/browser/resources/chromeos/login/discover/modules/discover_m @@ -8,6 +8,6 @@ Polymer({ behaviors: [DiscoverModuleBehavior], - onClick_: function() { + onClick_() { - window.open('https://www.google.com/chromebook/switch/', '_blank'); + window.open('https://www.9oo91e.qjz9zk/chromebook/switch/', '_blank'); }, @@ -15409,7 +15207,7 @@ diff --git a/chrome/browser/resources/gaia_auth_host/authenticator.js b/chrome/b 'client_id=' + encodeURIComponent(data.clientId) + '&access_type=offline'); -@@ -847,7 +847,7 @@ cr.define('cr.login', function() { +@@ -850,7 +850,7 @@ cr.define('cr.login', function() { // TODO(https://crbug.com/837107): remove this once API is fully // stabilized. // @example.com is used in tests. @@ -15445,7 +15243,7 @@ diff --git a/chrome/browser/resources/hats/hats.html b/chrome/browser/resources/ diff --git a/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js b/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js --- a/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js +++ b/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js -@@ -27,11 +27,11 @@ function loadAuthUrlAndShowWindow(url, win) { +@@ -28,11 +28,11 @@ function loadAuthUrlAndShowWindow(url, win) { return {requestHeaders: headers}; }, { @@ -15483,7 +15281,7 @@ diff --git a/chrome/browser/resources/inspect/inspect.html b/chrome/browser/reso diff --git a/chrome/browser/resources/local_ntp/customize.js b/chrome/browser/resources/local_ntp/customize.js --- a/chrome/browser/resources/local_ntp/customize.js +++ b/chrome/browser/resources/local_ntp/customize.js -@@ -2344,7 +2344,7 @@ customize.colorsMenuOnThemeChange = function() { +@@ -2327,7 +2327,7 @@ customize.colorsMenuOnThemeChange = function() { $(customize.IDS.COLORS_THEME).classList.add(customize.CLASSES.VISIBLE); $(customize.IDS.COLORS_THEME_NAME).innerHTML = ntpTheme.themeName; $(customize.IDS.COLORS_THEME_WEBSTORE_LINK).href = @@ -15536,7 +15334,7 @@ diff --git a/chrome/browser/resources/local_ntp/voice.js b/chrome/browser/resour * Web Speech API, error handling and executing search queries. */ const speech = {}; -@@ -999,7 +999,7 @@ text.LISTENING_TIMEOUT_MS_ = 2000; +@@ -1020,7 +1020,7 @@ text.LISTENING_TIMEOUT_MS_ = 2000; * @const @private */ text.SUPPORT_LINK_BASE_ = @@ -15655,7 +15453,7 @@ diff --git a/chrome/browser/resources/network_speech_synthesis/tts_extension.js diff --git a/chrome/browser/resources/omnibox/omnibox.html b/chrome/browser/resources/omnibox/omnibox.html --- a/chrome/browser/resources/omnibox/omnibox.html +++ b/chrome/browser/resources/omnibox/omnibox.html -@@ -94,7 +94,7 @@ +@@ -84,7 +84,7 @@ Current page context:

- -+ href="https://chrome.9oo91e.qjz9zk/webstore/category/collection/accessibility"> - -@@ -209,7 +209,7 @@ - on-click="onPromoteUpdaterTap_"> - +@@ -144,7 +144,7 @@ + on-click="onPromoteUpdaterTap_"> + percent_encoded_email; url::RawCanonOutputT percent_encoded_account_url; -@@ -865,7 +865,7 @@ GURL ChromePasswordProtectionService::GetDefaultChangePasswordURL() const { +@@ -888,7 +888,7 @@ GURL ChromePasswordProtectionService::GetDefaultChangePasswordURL() const { url::EncodeURIComponent(account_url.c_str(), account_url.length(), &percent_encoded_account_url); GURL change_password_url = GURL(base::StringPrintf( @@ -16168,7 +15885,7 @@ diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc "AccountChooser?Email=%s&continue=%s", std::string(percent_encoded_email.data(), percent_encoded_email.length()) .c_str(), -@@ -913,7 +913,7 @@ void ChromePasswordProtectionService::HandleUserActionOnModalWarning( +@@ -936,7 +936,7 @@ void ChromePasswordProtectionService::HandleUserActionOnModalWarning( web_contents_with_unhandled_enterprise_reuses_.erase(web_contents); } else if (password_type.account_type() != ReusedPasswordAccountType::SAVED_PASSWORD) { @@ -16177,7 +15894,7 @@ diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc OpenUrl(web_contents, GetDefaultChangePasswordURL(), content::Referrer(), /*in_new_tab=*/true); } -@@ -953,7 +953,7 @@ void ChromePasswordProtectionService::HandleUserActionOnPageInfo( +@@ -976,7 +976,7 @@ void ChromePasswordProtectionService::HandleUserActionOnPageInfo( return; } @@ -16189,22 +15906,19 @@ diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc -@@ -76,9 +76,9 @@ const int ClientSideDetectionService::kNegativeCacheIntervalDays = 1; +@@ -56,7 +56,7 @@ const int ClientSideDetectionService::kNegativeCacheIntervalDays = 1; const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30; const char ClientSideDetectionService::kClientReportPhishingUrl[] = - "https://sb-ssl.google.com/safebrowsing/clientreport/phishing"; + "https://sb-ssl.9oo91e.qjz9zk/safebrowsing/clientreport/phishing"; - const char ClientSideDetectionService::kClientReportMalwareUrl[] = -- "https://sb-ssl.google.com/safebrowsing/clientreport/malware-check"; -+ "https://sb-ssl.9oo91e.qjz9zk/safebrowsing/clientreport/malware-check"; struct ClientSideDetectionService::ClientPhishingReportInfo { std::unique_ptr loader; diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc -@@ -595,14 +595,14 @@ void CheckClientDownloadRequestBase::SendRequest() { +@@ -556,14 +556,14 @@ void CheckClientDownloadRequestBase::SendRequest() { "This request is triggered when a download is about to complete, " "the download is not whitelisted, and its file extension is " "supported by download protection service (e.g. executables, " @@ -16389,7 +16103,7 @@ diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/l // be replaced with the demo url provided on the command line via // --google-base-url. GURL google_base_url = google_util::CommandLineGoogleBaseURL(); -@@ -954,7 +954,7 @@ void LocalNtpSource::StartDataRequest( +@@ -947,7 +947,7 @@ void LocalNtpSource::StartDataRequest( base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); command_line->AppendSwitchASCII( search_provider_logos::switches::kGoogleDoodleUrl, @@ -16398,7 +16112,7 @@ diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/l force_doodle_param + ".json"); } -@@ -1113,7 +1113,7 @@ std::string LocalNtpSource::GetContentSecurityPolicy() { +@@ -1106,7 +1106,7 @@ std::string LocalNtpSource::GetContentSecurityPolicy() { // switcher and the notifications dropdown from the One Google Bar, and/or // the iframe for interactive Doodles. std::string child_src_csp = base::StringPrintf( @@ -16410,7 +16124,7 @@ diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/l diff --git a/chrome/browser/search/ntp_icon_source.cc b/chrome/browser/search/ntp_icon_source.cc --- a/chrome/browser/search/ntp_icon_source.cc +++ b/chrome/browser/search/ntp_icon_source.cc -@@ -81,7 +81,7 @@ const int kMaxIconSizeDip = 192; +@@ -85,7 +85,7 @@ const int kMaxIconSizeDip = 192; // URL to the server favicon service. "alt=404" means the service will return a // 404 if an icon can't be found. const char kServerFaviconURL[] = @@ -16484,18 +16198,6 @@ diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/sig NavigateParams params(profile, GURL(kSigninErrorLearnMoreUrl), ui::PAGE_TRANSITION_LINK); params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB; -diff --git a/chrome/browser/ssl/captive_portal_helper_win.cc b/chrome/browser/ssl/captive_portal_helper_win.cc ---- a/chrome/browser/ssl/captive_portal_helper_win.cc -+++ b/chrome/browser/ssl/captive_portal_helper_win.cc -@@ -83,7 +83,7 @@ bool IsBehindCaptivePortal() { - Microsoft::WRL::ComPtr network; - ULONG items_returned = 0; - // Note: MSDN documentation at -- // https://msdn.microsoft.com/en-us/library/windows/desktop/aa370740(v=vs.85).aspx -+ // https://msdn.m1cr050ft.qjz9zk/en-us/library/windows/desktop/aa370740(v=vs.85).aspx - // says items_returned is set to NULL if the first parameter is 1, but this - // seems incorrect. In this call, items_returned is 1 until there are no - // networks. Then it becomes zero. diff --git a/chrome/browser/ssl/connection_help_tab_helper.cc b/chrome/browser/ssl/connection_help_tab_helper.cc --- a/chrome/browser/ssl/connection_help_tab_helper.cc +++ b/chrome/browser/ssl/connection_help_tab_helper.cc @@ -16620,7 +16322,7 @@ diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/ diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chrome/browser/supervised_user/supervised_user_url_filter.cc --- a/chrome/browser/supervised_user/supervised_user_url_filter.cc +++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc -@@ -95,16 +95,16 @@ const char* const kFilteredSchemes[] = {"http", "https", "ftp", "ws", "wss"}; +@@ -94,16 +94,16 @@ const char* const kFilteredSchemes[] = {"http", "https", "ftp", "ws", "wss"}; #if BUILDFLAG(ENABLE_EXTENSIONS) const char* const kCrxDownloadUrls[] = { @@ -16642,7 +16344,7 @@ diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chro const char kPlayTermsPath[] = "/about/play-terms"; // This class encapsulates all the state that is required during construction of -@@ -332,7 +332,7 @@ SupervisedUserURLFilter::GetFilteringBehaviorForURL( +@@ -331,7 +331,7 @@ SupervisedUserURLFilter::GetFilteringBehaviorForURL( } #endif @@ -16651,7 +16353,7 @@ diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chro static const base::NoDestructor> kWhitelistedOrigins( base::flat_set({GURL(kFamiliesUrl).GetOrigin(), GURL(kFamiliesSecureUrl).GetOrigin()})); -@@ -341,7 +341,7 @@ SupervisedUserURLFilter::GetFilteringBehaviorForURL( +@@ -340,7 +340,7 @@ SupervisedUserURLFilter::GetFilteringBehaviorForURL( // Check Play Store terms of service. // path_piece is checked separetly from the host to match international pages @@ -16660,7 +16362,7 @@ diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chro if (effective_url.SchemeIs(url::kHttpsScheme) && effective_url.host_piece() == kPlayStoreHost && effective_url.path_piece().find(kPlayTermsPath) != -@@ -382,7 +382,7 @@ SupervisedUserURLFilter::GetFilteringBehaviorForURL( +@@ -381,7 +381,7 @@ SupervisedUserURLFilter::GetFilteringBehaviorForURL( return default_behavior_; } @@ -16725,7 +16427,7 @@ diff --git a/chrome/browser/themes/theme_syncable_service.cc b/chrome/browser/th diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc --- a/chrome/browser/tracing/crash_service_uploader.cc +++ b/chrome/browser/tracing/crash_service_uploader.cc -@@ -41,7 +41,7 @@ using std::string; +@@ -40,7 +40,7 @@ using std::string; namespace { @@ -16737,7 +16439,7 @@ diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/t diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc --- a/chrome/browser/ui/app_list/app_list_syncable_service.cc +++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc -@@ -1294,7 +1294,7 @@ void AppListSyncableService::InstallDefaultPageBreaks() { +@@ -1324,7 +1324,7 @@ void AppListSyncableService::InstallDefaultPageBreaks() { auto* sync_item = GetSyncItem(id); if (sync_item) { // The user may have cleared their sync from @@ -16761,8 +16463,8 @@ diff --git a/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_app_result. diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc b/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc --- a/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc +++ b/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc -@@ -133,7 +133,7 @@ std::string NormalizeId(const std::string& id, RankingItemType type) { - case RankingItemType::kOmniboxSearch: +@@ -125,7 +125,7 @@ std::string NormalizeId(const std::string& id, RankingItemType type) { + case RankingItemType::kOmniboxGeneric: // Heuristically check if the URL points to a Drive file. If so, strip // some extra information from it. - if (GURL(id).host() == "docs.google.com") @@ -16785,7 +16487,7 @@ diff --git a/chrome/browser/ui/ash/assistant/proactive_suggestions_loader.cc b/c diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc -@@ -32,7 +32,7 @@ +@@ -34,7 +34,7 @@ namespace { const char kKeyboardShortcutHelpPageUrl[] = @@ -16856,13 +16558,13 @@ diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.h b/chrome/brow // url specified like - // |make new tab with properties {url:"http://google.com"}|. + // |make new tab with properties {url:"http://9oo91e.qjz9zk"}|. - NSString* tempURL_; + NSString* _tempURL; } diff --git a/chrome/browser/ui/cocoa/share_menu_controller.mm b/chrome/browser/ui/cocoa/share_menu_controller.mm --- a/chrome/browser/ui/cocoa/share_menu_controller.mm +++ b/chrome/browser/ui/cocoa/share_menu_controller.mm -@@ -93,7 +93,7 @@ NSString* const kRemindersSharingServiceName = +@@ -92,7 +92,7 @@ NSString* const kRemindersSharingServiceName = // URLs in the pasteboard. This URL will not actually be shared to, just used // to fetch sharing services that can handle the NSURL type. NSArray* services = [NSSharingService @@ -16886,17 +16588,19 @@ diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.cc b/chrome/bro diff --git a/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc b/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc --- a/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc +++ b/chrome/browser/ui/extensions/installation_error_infobar_delegate.cc -@@ -46,5 +46,5 @@ base::string16 InstallationErrorInfoBarDelegate::GetLinkText() const { +@@ -38,7 +38,7 @@ base::string16 InstallationErrorInfoBarDelegate::GetLinkText() const { } GURL InstallationErrorInfoBarDelegate::GetLinkURL() const { - return GURL("https://support.google.com/chrome_webstore/?p=crx_warning"); + return GURL("https://support.9oo91e.qjz9zk/chrome_webstore/?p=crx_warning"); } + + base::string16 InstallationErrorInfoBarDelegate::GetMessageText() const { diff --git a/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc b/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc --- a/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc +++ b/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc -@@ -225,7 +225,7 @@ void JavaScriptDialogTabHelper::RunJavaScriptDialog( +@@ -207,7 +207,7 @@ void JavaScriptDialogTabHelper::RunJavaScriptDialog( "A window.%s() dialog generated by this page was suppressed " "because this page is not the active tab of the front window. " "Please make sure your dialogs are triggered by user interactions " @@ -16905,18 +16609,6 @@ diff --git a/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.c switch (dialog_type) { case content::JAVASCRIPT_DIALOG_TYPE_ALERT: { -diff --git a/chrome/browser/ui/libgtkui/gtk_util.cc b/chrome/browser/ui/libgtkui/gtk_util.cc ---- a/chrome/browser/ui/libgtkui/gtk_util.cc -+++ b/chrome/browser/ui/libgtkui/gtk_util.cc -@@ -54,7 +54,7 @@ void CommonInitFromCommandLine(const base::CommandLine& command_line) { - int argc = args.size(); - std::unique_ptr argv(new char*[argc + 1]); - for (size_t i = 0; i < args.size(); ++i) { -- // TODO(piman@google.com): can gtk_init modify argv? Just being safe -+ // TODO(piman@9oo91e.qjz9zk): can gtk_init modify argv? Just being safe - // here. - argv[i] = strdup(args[i].c_str()); - } diff --git a/chrome/browser/ui/media_router/media_cast_mode.h b/chrome/browser/ui/media_router/media_cast_mode.h --- a/chrome/browser/ui/media_router/media_cast_mode.h +++ b/chrome/browser/ui/media_router/media_cast_mode.h @@ -16944,7 +16636,7 @@ diff --git a/chrome/browser/ui/media_router/query_result_manager.h b/chrome/brow diff --git a/chrome/browser/ui/page_info/page_info.cc b/chrome/browser/ui/page_info/page_info.cc --- a/chrome/browser/ui/page_info/page_info.cc +++ b/chrome/browser/ui/page_info/page_info.cc -@@ -111,7 +111,7 @@ namespace { +@@ -112,7 +112,7 @@ namespace { // The list of content settings types to display on the Page Info UI. THE // ORDER OF THESE ITEMS IS IMPORTANT and comes from https://crbug.com/610358. To @@ -16953,7 +16645,7 @@ diff --git a/chrome/browser/ui/page_info/page_info.cc b/chrome/browser/ui/page_i ContentSettingsType kPermissionType[] = { ContentSettingsType::GEOLOCATION, ContentSettingsType::MEDIASTREAM_CAMERA, -@@ -303,7 +303,7 @@ ChooserContextBase* GetSerialChooserContext(Profile* profile) { +@@ -306,7 +306,7 @@ ChooserContextBase* GetSerialChooserContext(Profile* profile) { // The list of chooser types that need to display entries in the Website // Settings UI. THE ORDER OF THESE ITEMS IS IMPORTANT. To propose changing it, @@ -16983,18 +16675,6 @@ diff --git a/chrome/browser/ui/passwords/google_password_manager_navigation_thro // longer needed. Thus we close it. TabStripModel* tab_strip_model = browser->tab_strip_model(); int index = tab_strip_model->GetIndexOfWebContents(web_contents); -diff --git a/chrome/browser/ui/passwords/manage_passwords_bubble_model.h b/chrome/browser/ui/passwords/manage_passwords_bubble_model.h ---- a/chrome/browser/ui/passwords/manage_passwords_bubble_model.h -+++ b/chrome/browser/ui/passwords/manage_passwords_bubble_model.h -@@ -67,7 +67,7 @@ class ManagePasswordsBubbleModel { - // Called by the view code when the manage button is clicked by the user. - void OnManageClicked(password_manager::ManagePasswordsReferrer referrer); - -- // Called by the view code when the navigate to passwords.google.com link is -+ // Called by the view code when the navigate to passwords.9oo91e.qjz9zk link is - // clicked by the user. - void OnNavigateToPasswordManagerAccountDashboardLinkClicked( - password_manager::ManagePasswordsReferrer referrer); diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils.h b/chrome/browser/ui/passwords/manage_passwords_view_utils.h --- a/chrome/browser/ui/passwords/manage_passwords_view_utils.h +++ b/chrome/browser/ui/passwords/manage_passwords_view_utils.h @@ -17050,8 +16730,8 @@ diff --git a/chrome/browser/ui/search/ntp_user_data_logger.cc b/chrome/browser/u diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h --- a/chrome/browser/ui/search/search_tab_helper.h +++ b/chrome/browser/ui/search/search_tab_helper.h -@@ -46,7 +46,7 @@ class SearchIPCRouterTest; - class SearchSuggestService; +@@ -48,7 +48,7 @@ class SearchSuggestService; + class SkBitmap; // This is the browser-side, per-tab implementation of the embeddedSearch API -// (see https://www.chromium.org/embeddedsearch). @@ -17062,7 +16742,7 @@ diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/se diff --git a/chrome/browser/ui/signin_view_controller.cc b/chrome/browser/ui/signin_view_controller.cc --- a/chrome/browser/ui/signin_view_controller.cc +++ b/chrome/browser/ui/signin_view_controller.cc -@@ -194,7 +194,7 @@ void SigninViewController::ShowDiceSigninTab( +@@ -204,7 +204,7 @@ void SigninViewController::ShowDiceSigninTab( DCHECK(google_apis::HasOAuthClientConfigured()) << "You must configure the OAuth client ID and client secret in order " "to sign in to Chromium. See instruction at " @@ -17128,7 +16808,7 @@ diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc b/chrome/ diff --git a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc --- a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc +++ b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc -@@ -36,12 +36,12 @@ +@@ -35,12 +35,12 @@ namespace { constexpr char kHighContrastExtensionUrl[] = @@ -17171,19 +16851,19 @@ diff --git a/chrome/browser/ui/views/hats/hats_web_dialog.cc b/chrome/browser/ui diff --git a/chrome/browser/ui/views/network_profile_bubble_view.cc b/chrome/browser/ui/views/network_profile_bubble_view.cc --- a/chrome/browser/ui/views/network_profile_bubble_view.cc +++ b/chrome/browser/ui/views/network_profile_bubble_view.cc -@@ -104,7 +104,7 @@ void NetworkProfileBubbleView::LinkClicked(views::Link* source, - WindowOpenDisposition disposition = - ui::DispositionFromEventFlags(event_flags); +@@ -94,7 +94,7 @@ void NetworkProfileBubbleView::LinkClicked(views::Link* source, + WindowOpenDisposition disposition = ui::DispositionFromEventFlags( + event_flags, WindowOpenDisposition::NEW_FOREGROUND_TAB); content::OpenURLParams params( - GURL("https://sites.google.com/a/chromium.org/dev/administrators/" + GURL("https://sites.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/dev/administrators/" "common-problems-and-solutions#network_profile"), - content::Referrer(), disposition == WindowOpenDisposition::CURRENT_TAB - ? WindowOpenDisposition::NEW_FOREGROUND_TAB + content::Referrer(), disposition, ui::PAGE_TRANSITION_LINK, false); + navigator_->OpenURL(params); diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -927,7 +927,7 @@ bool OmniboxViewViews::UnapplySteadyStateElisions(UnelisionGesture gesture) { +@@ -943,7 +943,7 @@ bool OmniboxViewViews::UnapplySteadyStateElisions(UnelisionGesture gesture) { // If we are uneliding at the end of a drag-select (on mouse release), // and the selection spans to the beginning of the elided URL, ensure that // the new selection spans to the beginning of the unelided URL too. @@ -17192,7 +16872,7 @@ diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/brow // ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^ if (start != 0) start += offset; -@@ -1259,7 +1259,7 @@ void OmniboxViewViews::GetAccessibleNodeData(ui::AXNodeData* node_data) { +@@ -1281,7 +1281,7 @@ void OmniboxViewViews::GetAccessibleNodeData(ui::AXNodeData* node_data) { // While user navigates omnibox suggestions, use the current editable // text decorated with additional friendly labelling text, such as the // title of the page and the type of autocomplete, for example: @@ -17204,7 +16884,7 @@ diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/brow diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h -@@ -370,12 +370,12 @@ class OmniboxViewViews : public OmniboxView, +@@ -367,12 +367,12 @@ class OmniboxViewViews : public OmniboxView, // The currently selected match, if any, with additional labelling text // such as the document title and the type of search, for example: @@ -17234,7 +16914,7 @@ diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/br diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc --- a/chrome/browser/ui/views/session_crashed_bubble_view.cc +++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc -@@ -324,7 +324,7 @@ void SessionCrashedBubbleView::StyledLabelLinkClicked(views::StyledLabel* label, +@@ -313,7 +313,7 @@ void SessionCrashedBubbleView::StyledLabelLinkClicked(views::StyledLabel* label, const gfx::Range& range, int event_flags) { browser_->OpenURL(content::OpenURLParams( @@ -17246,7 +16926,7 @@ diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/bro diff --git a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc --- a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc +++ b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc -@@ -267,7 +267,7 @@ void ProfileSigninConfirmationDialogViews::StyledLabelLinkClicked( +@@ -266,7 +266,7 @@ void ProfileSigninConfirmationDialogViews::StyledLabelLinkClicked( const gfx::Range& range, int event_flags) { NavigateParams params( @@ -17279,7 +16959,7 @@ diff --git a/chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui const char kAddSupervisionFlowType[] = "1"; const char kAddSupervisionSwitch[] = "add-supervision-url"; -@@ -180,7 +180,7 @@ void AddSupervisionUI::SetUpResources() { +@@ -197,7 +197,7 @@ void AddSupervisionUI::SetUpResources() { // Initialize supervision URL from the command-line arguments (if provided). supervision_url_ = GetAddSupervisionURL(); if (!allow_non_google_url_for_tests_) { @@ -17303,7 +16983,7 @@ diff --git a/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_ut diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc -@@ -104,7 +104,7 @@ namespace { +@@ -105,7 +105,7 @@ namespace { const char kAuthIframeParentName[] = "signin-frame"; @@ -17315,7 +16995,7 @@ diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chr diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h -@@ -393,7 +393,7 @@ class GaiaScreenHandler : public BaseScreenHandler, +@@ -396,7 +396,7 @@ class GaiaScreenHandler : public BaseScreenHandler, std::string test_services_; bool test_expects_complete_login_ = false; @@ -17324,22 +17004,10 @@ diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h b/chro NetworkPortalDetector::CaptivePortalStatus captive_portal_status_ = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; -diff --git a/chrome/browser/ui/webui/components_ui.cc b/chrome/browser/ui/webui/components_ui.cc ---- a/chrome/browser/ui/webui/components_ui.cc -+++ b/chrome/browser/ui/webui/components_ui.cc -@@ -125,7 +125,7 @@ void ComponentsDOMHandler::HandleRequestComponentsData( - // This function is called when user presses button from html UI. - // TODO(shrikant): We need to make this button available based on current - // state e.g. If component state is currently updating then we need to disable --// button. (https://code.google.com/p/chromium/issues/detail?id=272540) -+// button. (https://code.9oo91e.qjz9zk/p/chromium/issues/detail?id=272540) - void ComponentsDOMHandler::HandleCheckUpdate(const base::ListValue* args) { - if (args->GetSize() != 1) { - NOTREACHED(); diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -370,7 +370,7 @@ CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage( +@@ -391,7 +391,7 @@ CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage( content::WebContents* web_contents) { bool is_wifi_connection = false; GURL landing_url("https://captive.portal/login"); @@ -17351,7 +17019,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b diff --git a/chrome/browser/ui/webui/management_ui_handler.cc b/chrome/browser/ui/webui/management_ui_handler.cc --- a/chrome/browser/ui/webui/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management_ui_handler.cc -@@ -337,7 +337,7 @@ std::string ManagementUIHandler::GetAccountDomain(Profile* profile) { +@@ -375,7 +375,7 @@ std::string ManagementUIHandler::GetAccountDomain(Profile* profile) { const std::string domain = gaia::ExtractDomainName(std::move(username)); @@ -17534,7 +17202,7 @@ diff --git a/chrome/browser/ui/webui/welcome/ntp_background_handler.cc b/chrome/ diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash.cc b/chrome/browser/ui/window_sizer/window_sizer_ash.cc --- a/chrome/browser/ui/window_sizer/window_sizer_ash.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash.cc -@@ -57,7 +57,7 @@ bool WindowSizer::GetBrowserBoundsAsh(gfx::Rect* bounds, +@@ -58,7 +58,7 @@ bool WindowSizer::GetBrowserBoundsAsh(gfx::Rect* bounds, determined = true; } else if (state_provider_) { // In Ash, prioritize the last saved |show_state|. If you have questions @@ -17588,7 +17256,7 @@ diff --git a/chrome/browser/web_applications/external_web_app_manager.h b/chrome diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/browser/web_applications/web_app_install_task.cc --- a/chrome/browser/web_applications/web_app_install_task.cc +++ b/chrome/browser/web_applications/web_app_install_task.cc -@@ -48,7 +48,7 @@ namespace { +@@ -51,7 +51,7 @@ namespace { #if defined(OS_CHROMEOS) const char kChromeOsPlayPlatform[] = "chromeos_play"; const char kPlayIntentPrefix[] = @@ -17600,7 +17268,7 @@ diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/br diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -227,7 +227,7 @@ void ChromeAuthenticatorRequestDelegate::RegisterActionCallbacks( +@@ -255,7 +255,7 @@ void ChromeAuthenticatorRequestDelegate::RegisterActionCallbacks( bool ChromeAuthenticatorRequestDelegate::ShouldPermitIndividualAttestation( const std::string& relying_party_id) { constexpr char kGoogleCorpAppId[] = @@ -17609,7 +17277,7 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/ // If the RP ID is actually the Google corp App ID (because the request is // actually a U2F request originating from cryptotoken), or is listed in the -@@ -279,11 +279,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension( +@@ -307,11 +307,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension( // everything to QR-code or sync-based pairing, we don't want use of the // extension to spread without consideration. Therefore it's limited to // origins that are already depending on it and test sites. @@ -17700,7 +17368,7 @@ diff --git a/chrome/chrome_cleaner/components/recovery_component.cc b/chrome/chr const char kComponentDownloadUrl[] = - "https://clients2.google.com/service/update2/crx?response=redirect&os=win" + "https://clients2.9oo91e.qjz9zk/service/update2/crx?response=redirect&os=win" - "&arch=x86&installsource=swreporter&x=id%3Dnpdjjkjlcidkjlamlmmdelcjbcpdjocm" + "&installsource=swreporter&x=id%3Dnpdjjkjlcidkjlamlmmdelcjbcpdjocm" "%26v%3D0.0.0.0%26uc&acceptformat=crx3"; @@ -64,7 +64,7 @@ constexpr net::NetworkTrafficAnnotationTag kComponentDownloadTrafficAnnotation = @@ -18075,7 +17743,7 @@ diff --git a/chrome/chrome_cleaner/pup_data/pup_data.h b/chrome/chrome_cleaner/p diff --git a/chrome/chrome_elf/BUILD.gn b/chrome/chrome_elf/BUILD.gn --- a/chrome/chrome_elf/BUILD.gn +++ b/chrome/chrome_elf/BUILD.gn -@@ -175,7 +175,7 @@ static_library("nt_registry") { +@@ -163,7 +163,7 @@ static_library("nt_registry") { if (is_official_build && full_wpo_on_official == true) { # This library doen't build with WPO enabled due to a MSVC compiler bug. # TODO(pennymac|sebmarchand): Remove this once MS has fixed this compiler @@ -18087,7 +17755,7 @@ diff --git a/chrome/chrome_elf/BUILD.gn b/chrome/chrome_elf/BUILD.gn diff --git a/chrome/chrome_elf/chrome_elf_main.cc b/chrome/chrome_elf/chrome_elf_main.cc --- a/chrome/chrome_elf/chrome_elf_main.cc +++ b/chrome/chrome_elf/chrome_elf_main.cc -@@ -50,12 +50,12 @@ bool GetUserDataDirectoryThunk(wchar_t* user_data_dir, +@@ -51,12 +51,12 @@ bool GetUserDataDirectoryThunk(wchar_t* user_data_dir, // DllMain // ------- // Warning: The OS loader lock is held during DllMain. Be careful. @@ -18174,8 +17842,8 @@ diff --git a/chrome/chrome_elf/third_party_dlls/main.h b/chrome/chrome_elf/third diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -112,7 +112,7 @@ const base::Feature kBrowserHangFixesExperiment{ - "BrowserHangFixesExperiment", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -102,7 +102,7 @@ const base::Feature kBlockRepeatedNotificationPermissionPrompts{ + base::FEATURE_ENABLED_BY_DEFAULT}; // Enables or disables redirecting users who get an interstitial when -// accessing https://support.google.com/chrome/answer/6098869 to local @@ -18183,7 +17851,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc // connection help content. const base::Feature kBundledConnectionHelpFeature{ "BundledConnectionHelp", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -238,7 +238,7 @@ const base::Feature kUploadZippedSystemLogs{"UploadZippedSystemLogs", +@@ -224,7 +224,7 @@ const base::Feature kUploadZippedSystemLogs{"UploadZippedSystemLogs", // Allow a Wilco DTC (diagnostics and telemetry controller) on Chrome OS. // More info about the project may be found here: @@ -18195,7 +17863,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc -@@ -350,7 +350,7 @@ const char kForceWebAppMode[] = "force-web-app-mode"; +@@ -335,7 +335,7 @@ const char kForceStackedTabStripLayout[] = "force-stacked-tab-strip-layout"; // Specifies which page will be displayed in newly-opened tabs. We need this // for testing purposes so that the UI tests don't depend on what comes up for @@ -18267,7 +17935,7 @@ diff --git a/chrome/common/extensions/api/PRESUBMIT.py b/chrome/common/extension diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json --- a/chrome/common/extensions/api/_api_features.json +++ b/chrome/common/extensions/api/_api_features.json -@@ -165,7 +165,7 @@ +@@ -162,7 +162,7 @@ }, // This API is whitelisted on stable and should not be enabled for a wider // audience without resolving security issues raised in API proposal and @@ -18276,7 +17944,7 @@ diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/ext "browserAction.openPopup": [{ "channel": "dev", "dependencies": ["manifest:browser_action"], -@@ -284,7 +284,7 @@ +@@ -281,7 +281,7 @@ "dashboardPrivate": [{ "channel": "stable", "contexts": ["blessed_web_page", "web_page"], @@ -24118,7 +23786,7 @@ diff --git a/chrome/common/extensions/docs/templates/intros/declarativeContent.h diff --git a/chrome/common/extensions/docs/templates/intros/declarativeNetRequest.html b/chrome/common/extensions/docs/templates/intros/declarativeNetRequest.html --- a/chrome/common/extensions/docs/templates/intros/declarativeNetRequest.html +++ b/chrome/common/extensions/docs/templates/intros/declarativeNetRequest.html -@@ -292,7 +292,7 @@ are true: +@@ -262,7 +262,7 @@ chrome.declarativeNetRequest.updateDynamicRules API method. "declarative_net_request" : { "rule_resources" : ["rules.json"] }, @@ -24127,7 +23795,7 @@ diff --git a/chrome/common/extensions/docs/templates/intros/declarativeNetReques "manifest_version" : 2 } -@@ -303,18 +303,18 @@ are true: +@@ -273,18 +273,18 @@ chrome.declarativeNetRequest.updateDynamicRules API method. { "id" : 1, "action": { "type" : "block" }, @@ -24149,9 +23817,9 @@ diff --git a/chrome/common/extensions/docs/templates/intros/declarativeNetReques }, { "id" : 4, -@@ -338,15 +338,15 @@ are true: - +@@ -309,15 +309,15 @@ chrome.declarativeNetRequest.updateDynamicRules API method.
    +
  • - Consider a navigation to "http://google.com". Rules with id (1) + Consider a navigation to "http://9oo91e.qjz9zk". Rules with id (1) @@ -24819,18 +24487,18 @@ diff --git a/chrome/common/extensions/docs/templates/private/article.html b/chro - |article| The article content. - |canonical| The canonical URL (see comment in site.html). - |platform| The platform. -@@ -24,9 +24,9 @@ - Linux. Chrome OS will continue to support Chrome Apps. Additionally, - Chrome and the Web Store will continue to support extensions on all - platforms. -- -+ - Read the announcement and learn more about -- -+ - migrating your app. +@@ -22,9 +22,9 @@ + Important: + Chrome will be removing support for Chrome Apps on all platforms. + Chrome browser and the Chrome Web Store will continue to support extensions. +- Read the announcement ++ Read the announcement + and learn more about +- migrating your app. ++ migrating your app.

    {{/isApps}} + {{- This is unindented because it may contain whitespace-sensitive tags. -}} diff --git a/chrome/common/extensions/docs/templates/private/fatnav.html b/chrome/common/extensions/docs/templates/private/fatnav.html --- a/chrome/common/extensions/docs/templates/private/fatnav.html +++ b/chrome/common/extensions/docs/templates/private/fatnav.html @@ -25032,7 +24700,7 @@ diff --git a/chrome/common/extensions/docs/templates/public/owners.html b/chrome diff --git a/chrome/common/google_url_loader_throttle.cc b/chrome/common/google_url_loader_throttle.cc --- a/chrome/common/google_url_loader_throttle.cc +++ b/chrome/common/google_url_loader_throttle.cc -@@ -52,7 +52,7 @@ void GoogleURLLoaderThrottle::WillStartRequest( +@@ -68,7 +68,7 @@ void GoogleURLLoaderThrottle::WillStartRequest( } if (!dynamic_params_.allowed_domains_for_apps.empty() && @@ -25041,7 +24709,7 @@ diff --git a/chrome/common/google_url_loader_throttle.cc b/chrome/common/google_ request->headers.SetHeader(safe_search_util::kGoogleAppsAllowedDomains, dynamic_params_.allowed_domains_for_apps); } -@@ -86,7 +86,7 @@ void GoogleURLLoaderThrottle::WillRedirectRequest( +@@ -109,7 +109,7 @@ void GoogleURLLoaderThrottle::WillRedirectRequest( } if (!dynamic_params_.allowed_domains_for_apps.empty() && @@ -25072,8 +24740,8 @@ diff --git a/chrome/common/media_router/media_source.h b/chrome/common/media_rou - "https://google.com/cast#__castAppId__="; + "https://9oo91e.qjz9zk/cast#__castAppId__="; - // Strings used in presentation IDs by the Cast SDK implementation. - // TODO(takumif): Move them out of this file, since they are not directly + // A Cast SDK enabled website (e.g. Google Slides) may use the mirroring app ID + // rather than the tab mirroring URN. diff --git a/chrome/common/multi_process_lock.h b/chrome/common/multi_process_lock.h --- a/chrome/common/multi_process_lock.h +++ b/chrome/common/multi_process_lock.h @@ -25089,7 +24757,7 @@ diff --git a/chrome/common/multi_process_lock.h b/chrome/common/multi_process_lo 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 -@@ -1048,7 +1048,7 @@ const char kForceGoogleSafeSearch[] = "settings.force_google_safesearch"; +@@ -1058,7 +1058,7 @@ const char kForceGoogleSafeSearch[] = "settings.force_google_safesearch"; // YouTube. See |safe_search_util::YouTubeRestrictMode| for possible values. const char kForceYouTubeRestrict[] = "settings.force_youtube_restrict"; @@ -25122,7 +24790,7 @@ diff --git a/chrome/common/safe_browsing/client_model.proto b/chrome/common/safe diff --git a/chrome/common/search.mojom b/chrome/common/search.mojom --- a/chrome/common/search.mojom +++ b/chrome/common/search.mojom -@@ -60,7 +60,7 @@ struct AutocompleteResult { +@@ -62,7 +62,7 @@ struct AutocompleteResult { // Browser interface to support embedded search. Render frames connect to this // interface to query browser data, such as the most visited pages. @@ -25229,7 +24897,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // defined(OS_CHROMEOS) -@@ -89,173 +89,173 @@ const char kChromeSearchRemoteNtpHost[] = "remote-ntp"; +@@ -89,172 +89,172 @@ const char kChromeSearchRemoteNtpHost[] = "remote-ntp"; const char kChromeSearchScheme[] = "chrome-search"; @@ -25341,6 +25009,10 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc + "https://support.9oo91e.qjz9zk/chrome/?p=is_chrome_managed"; #endif + const char kMixedContentDownloadBlockingLearnMoreUrl[] = +- "https://support.google.com/chrome/?p=mixed_content_downloads"; ++ "https://support.9oo91e.qjz9zk/chrome/?p=mixed_content_downloads"; + const char kMyActivityUrlInClearBrowsingData[] = - "https://myactivity.google.com/myactivity/?utm_source=chrome_cbd"; + "https://myactivity.9oo91e.qjz9zk/myactivity/?utm_source=chrome_cbd"; @@ -25411,13 +25083,8 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc + "https://support.9oo91e.qjz9zk/chrome/?p=safety_tip"; const char kSettingsSearchHelpURL[] = - #if defined(OS_CHROMEOS) -- "https://support.google.com/chromebook/?p=settings_search_help"; -+ "https://support.9oo91e.qjz9zk/chromebook/?p=settings_search_help"; - #else - "https://support.google.com/chrome/?p=settings_search_help"; + "https://support.9oo91e.qjz9zk/chrome/?p=settings_search_help"; - #endif const char kSymantecSupportUrl[] = - "https://support.google.com/chrome?p=symantec#-202"; @@ -25454,7 +25121,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc "{8A69D345-D564-463c-AFF1-A69D9E530F96}&error="; #if defined(OS_ANDROID) -@@ -266,28 +266,28 @@ const char kAndroidAppScheme[] = "android-app"; +@@ -265,28 +265,28 @@ const char kAndroidAppScheme[] = "android-app"; const char kEnhancedPlaybackNotificationLearnMoreURL[] = #endif #if defined(OS_CHROMEOS) @@ -25489,7 +25156,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kChromeOSAssetHost[] = "chromeos-asset"; const char kChromeOSAssetPath[] = "/usr/share/chromeos-assets/"; -@@ -296,18 +296,18 @@ const char kChromeOSCreditsPath[] = +@@ -295,18 +295,18 @@ const char kChromeOSCreditsPath[] = "/opt/google/chrome/resources/about_os_credits.html"; const char kChromePaletteHelpURL[] = @@ -25512,7 +25179,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kEULAPathFormat[] = "/usr/share/chromeos-assets/eula/%s/eula.html"; -@@ -315,67 +315,67 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; +@@ -314,70 +314,70 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; const char kArcPrivacyPolicyPathFormat[] = "arc_tos/%s/privacy_policy.pdf"; @@ -25568,6 +25235,10 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://www.google.com/intl/%s/chrome/eula_text.html"; + "https://www.9oo91e.qjz9zk/intl/%s/chrome/eula_text.html"; + const char kOsSettingsSearchHelpURL[] = +- "https://support.google.com/chromebook/?p=settings_search_help"; ++ "https://support.9oo91e.qjz9zk/chromebook/?p=settings_search_help"; + const char kTPMFirmwareUpdateLearnMoreURL[] = - "https://support.google.com/chromebook/?p=tpm_update"; + "https://support.9oo91e.qjz9zk/chromebook/?p=tpm_update"; @@ -25598,7 +25269,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kWindowsXPVistaDeprecationURL[] = "https://chrome.blogspot.com/2015/11/updates-to-chrome-platform-support.html"; -@@ -383,15 +383,15 @@ const char kWindowsXPVistaDeprecationURL[] = +@@ -385,15 +385,15 @@ const char kWindowsXPVistaDeprecationURL[] = #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) const char kChromeSyncLearnMoreURL[] = @@ -25620,9 +25291,9 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h -@@ -164,7 +164,7 @@ extern const char kLegacySupervisedUserManagementURL[]; - // The URL for the Learn More page about policies and enterprise enrollment. - extern const char kManagedUiLearnMoreUrl[]; +@@ -167,7 +167,7 @@ extern const char kManagedUiLearnMoreUrl[]; + // The URL for the "Learn more" page for mixed content download blocking. + extern const char kMixedContentDownloadBlockingLearnMoreUrl[]; -// "myactivity.google.com" URL for the history checkbox in ClearBrowsingData. +// "myactivity.9oo91e.qjz9zk" URL for the history checkbox in ClearBrowsingData. @@ -25633,7 +25304,7 @@ diff --git a/chrome/credential_provider/gaiacp/associated_user_validator.cc b/ch --- a/chrome/credential_provider/gaiacp/associated_user_validator.cc +++ b/chrome/credential_provider/gaiacp/associated_user_validator.cc @@ -36,7 +36,7 @@ const base::TimeDelta AssociatedUserValidator::kTokenHandleValidityLifetime = - base::TimeDelta::FromSeconds(30); + base::TimeDelta::FromSeconds(60); const char AssociatedUserValidator::kTokenInfoUrl[] = - "https://www.googleapis.com/oauth2/v2/tokeninfo"; @@ -25668,8 +25339,8 @@ diff --git a/chrome/credential_provider/gaiacp/dllmain.cc b/chrome/credential_pr diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/credential_provider/gaiacp/gaia_credential_base.cc --- a/chrome/credential_provider/gaiacp/gaia_credential_base.cc +++ b/chrome/credential_provider/gaiacp/gaia_credential_base.cc -@@ -74,7 +74,7 @@ constexpr char kGetAccessTokenBodyWithScopeFormat[] = - constexpr wchar_t kRegEnableADAssociation[] = L"enable_ad_association"; +@@ -79,7 +79,7 @@ constexpr char kGetAccessTokenBodyWithScopeFormat[] = + constexpr wchar_t kRegCloudAssociation[] = L"enable_cloud_association"; // The access scopes should be separated by single space. constexpr char kAccessScopes[] = - "https://www.googleapis.com/auth/admin.directory.user"; @@ -25677,7 +25348,7 @@ diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/ constexpr int kHttpTimeout = 3000; // in milliseconds // Names of keys used to fetch the custom attributes from google admin sdk -@@ -135,7 +135,7 @@ HRESULT GetAdUpnFromCloudDirectory(const base::string16& email, +@@ -157,7 +157,7 @@ HRESULT GetExistingAccountMappingFromCD( std::string escape_url_encoded_email = net::EscapeUrlEncodedData(base::UTF16ToUTF8(email), true); std::string get_cd_user_url = base::StringPrintf( @@ -25685,8 +25356,8 @@ diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/ + "https://www.9oo91eapis.qjz9zk/admin/directory/v1/users/" "%s?projection=full&viewType=domain_public", escape_url_encoded_email.c_str()); - LOGFN(INFO) << "Encoded URL : " << get_cd_user_url; -@@ -333,12 +333,12 @@ HRESULT MakeUsernameForAccount(const base::Value& result, + LOGFN(VERBOSE) << "Encoded URL : " << get_cd_user_url; +@@ -462,12 +462,12 @@ HRESULT MakeUsernameForAccount(const base::Value& result, DCHECK(is_consumer_account); DCHECK(error_text); @@ -25702,7 +25373,7 @@ diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/ *is_consumer_account = consumer_domain_pos != base::string16::npos; -@@ -392,7 +392,7 @@ HRESULT MakeUsernameForAccount(const base::Value& result, +@@ -536,7 +536,7 @@ HRESULT MakeUsernameForAccount(const base::Value& result, // restrictive than emails, so some transformations are needed. This tries // to preserve the email as much as possible in the username while respecting // Windows username rules. See remarks in @@ -25747,7 +25418,7 @@ diff --git a/chrome/credential_provider/gaiacp/internet_availability_checker.cc diff --git a/chrome/credential_provider/gaiacp/mdm_utils.cc b/chrome/credential_provider/gaiacp/mdm_utils.cc --- a/chrome/credential_provider/gaiacp/mdm_utils.cc +++ b/chrome/credential_provider/gaiacp/mdm_utils.cc -@@ -76,10 +76,10 @@ EscrowServiceStatus g_escrow_service_enabled = EscrowServiceStatus::kDisabled; +@@ -89,10 +89,10 @@ DeviceDetailsUploadNeeded g_device_details_upload_needed = namespace { constexpr wchar_t kDefaultMdmUrl[] = @@ -25873,7 +25544,7 @@ diff --git a/chrome/install_static/install_constants.h b/chrome/install_static/i // information. Use ShellUtil::GetBrowserModelId to get the suffixed value -- // it is almost never correct to use the unsuffixed (base) portion of this id // directly. -@@ -80,7 +80,7 @@ struct InstallConstants { +@@ -83,7 +83,7 @@ struct InstallConstants { // The prefix for the browser's ProgID. This prefix may be no more than 11 // characters long; see ShellUtil::GetBrowserProgId and @@ -25897,7 +25568,7 @@ diff --git a/chrome/install_static/install_details.h b/chrome/install_static/ins diff --git a/chrome/install_static/install_util.cc b/chrome/install_static/install_util.cc --- a/chrome/install_static/install_util.cc +++ b/chrome/install_static/install_util.cc -@@ -743,12 +743,12 @@ std::vector TokenizeString16(const std::wstring& str, +@@ -753,12 +753,12 @@ std::vector TokenizeString16(const std::wstring& str, std::vector TokenizeCommandLineToArray( const std::wstring& command_line) { // This is baroquely complex to do properly, see e.g. @@ -25997,9 +25668,9 @@ diff --git a/chrome/installer/linux/common/chromium-browser/chromium-browser.app The Chromium Authors - https://www.chromium.org/for-testers/bug-reporting-guidelines -- https://chromium.googlesource.com/chromium/src/+/master/docs/linux_debugging.md +- https://chromium.googlesource.com/chromium/src/+/master/docs/linux/debugging.md + https://www.ch40m1um.qjz9zk/for-testers/bug-reporting-guidelines -+ https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_debugging.md ++ https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/debugging.md diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc --- a/chrome/installer/mini_installer/mini_installer.cc @@ -26532,7 +26203,7 @@ diff --git a/chrome/installer/setup/google_chrome_behaviors.cc b/chrome/installe diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc -@@ -323,7 +323,7 @@ bool AddAceToDacl(const ATL::CSid& trustee, +@@ -321,7 +321,7 @@ bool AddAceToDacl(const ATL::CSid& trustee, } // Add to the ACL of an object on disk. This follows the method from MSDN: @@ -26553,7 +26224,7 @@ diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninst // tells us not to do this, but certain applications break following // uninstallation if we don't. void RemoveFiletypeRegistration(const InstallerState& installer_state, -@@ -697,7 +697,7 @@ bool DeleteChromeRegistrationKeys(const InstallerState& installer_state, +@@ -698,7 +698,7 @@ bool DeleteChromeRegistrationKeys(const InstallerState& installer_state, install_static::GetBaseAppName().append(browser_entry_suffix)); // Delete the App Paths and Applications keys that let Explorer find Chrome: @@ -26562,7 +26233,7 @@ diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninst base::string16 app_key(ShellUtil::kRegClasses); app_key.push_back(base::FilePath::kSeparators[0]); app_key.append(L"Applications"); -@@ -711,7 +711,7 @@ bool DeleteChromeRegistrationKeys(const InstallerState& installer_state, +@@ -712,7 +712,7 @@ bool DeleteChromeRegistrationKeys(const InstallerState& installer_state, InstallUtil::DeleteRegistryKey(root, app_path_key, WorkItem::kWow64Default); // Cleanup OpenWithList and OpenWithProgids: @@ -26571,7 +26242,7 @@ diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninst base::string16 file_assoc_key; base::string16 open_with_list_key; base::string16 open_with_progids_key; -@@ -772,7 +772,7 @@ bool DeleteChromeRegistrationKeys(const InstallerState& installer_state, +@@ -773,7 +773,7 @@ bool DeleteChromeRegistrationKeys(const InstallerState& installer_state, void RemoveChromeLegacyRegistryKeys(const base::FilePath& chrome_exe) { // We used to register Chrome to handle crx files, but this turned out // to be not worth the hassle. Remove these old registry entries if @@ -26813,7 +26484,7 @@ diff --git a/chrome/renderer/resources/extensions/identity_custom_bindings.js b/ +++ b/chrome/renderer/resources/extensions/identity_custom_bindings.js @@ -14,6 +14,6 @@ apiBridge.registerCustomHook(function(binding, id, contextType) { path = String(path); - if (path[0] != '/') + if (path[0] !== '/') path = '/' + path; - return 'https://' + id + '.chromiumapp.org' + path; + return 'https://' + id + '.ch40m1umapp.qjz9zk' + path; @@ -26927,7 +26598,7 @@ diff --git a/chrome/service/service_process.h b/chrome/service/service_process.h diff --git a/chrome/services/app_service/public/mojom/app_service.mojom b/chrome/services/app_service/public/mojom/app_service.mojom --- a/chrome/services/app_service/public/mojom/app_service.mojom +++ b/chrome/services/app_service/public/mojom/app_service.mojom -@@ -179,7 +179,7 @@ interface Subscriber { +@@ -194,7 +194,7 @@ interface Subscriber { // Binds this to the given receiver (message pipe endpoint), being to Mojo // interfaces what POSIX's dup is to file descriptors. // @@ -27117,7 +26788,7 @@ diff --git a/chrome/updater/updater_constants.cc b/chrome/updater/updater_consta + "https://clients2.9oo91e.qjz9zk/cr/staging_report"; // Path names. - extern const char kAppsDir[] = "apps"; + const char kAppsDir[] = "apps"; diff --git a/chrome/updater/updater_constants.h b/chrome/updater/updater_constants.h --- a/chrome/updater/updater_constants.h +++ b/chrome/updater/updater_constants.h @@ -27543,7 +27214,7 @@ diff --git a/chromecast/public/output_restrictions.h b/chromecast/public/output_ diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn --- a/chromeos/BUILD.gn +++ b/chromeos/BUILD.gn -@@ -205,8 +205,8 @@ test("chromeos_unittests") { +@@ -206,8 +206,8 @@ test("chromeos_unittests") { # The following definitions only apply when building for a CrOS board (ie: not # linux-chromeos). See the following for reference: @@ -27554,7 +27225,16 @@ diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn if (is_chromeos_device) { # This builds a tool that prepares a DUT or VM for testing, which can be # utilized by wrapping a host-side script test. -@@ -262,10 +262,10 @@ if (is_chromeos_device) { +@@ -243,7 +243,7 @@ if (is_chromeos_device) { + } + + # Used to report the size of various partitions. For more details, see: +- # https://source.chromium.org/search?q=report_disk_usage.go ++ # https://source.ch40m1um.qjz9zk/search?q=report_disk_usage.go + tast_test("disk_usage_tast_test") { + tast_tests = [ "platform.ReportDiskUsage" ] + } +@@ -269,10 +269,10 @@ if (is_chromeos_device) { group("cros_chrome_deploy") { # The following run-time dependencies are needed to deploy chrome to a # ChromeOS device. See the link for the full list: @@ -27570,7 +27250,7 @@ diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn diff --git a/chromeos/components/drivefs/drivefs_auth.cc b/chromeos/components/drivefs/drivefs_auth.cc --- a/chromeos/components/drivefs/drivefs_auth.cc +++ b/chromeos/components/drivefs/drivefs_auth.cc -@@ -64,7 +64,7 @@ void DriveFsAuth::AccountReady(const CoreAccountId& account_id, +@@ -65,7 +65,7 @@ void DriveFsAuth::AccountReady(const CoreAccountId& account_id, weak_ptr_factory_.InvalidateWeakPtrs(); timer_->Stop(); GetIdentityAccessor()->GetAccessToken( @@ -27579,18 +27259,6 @@ diff --git a/chromeos/components/drivefs/drivefs_auth.cc b/chromeos/components/d kIdentityConsumerId, base::BindOnce(&DriveFsAuth::GotChromeAccessToken, base::Unretained(this))); -diff --git a/chromeos/constants/chromeos_features.cc b/chromeos/constants/chromeos_features.cc ---- a/chromeos/constants/chromeos_features.cc -+++ b/chromeos/constants/chromeos_features.cc -@@ -251,7 +251,7 @@ const base::Feature kSplitSettingsSync{"SplitSettingsSync", - const base::Feature kUpdatedCellularActivationUi{ - "UpdatedCellularActivationUi", base::FEATURE_DISABLED_BY_DEFAULT}; - --// Use the messages.google.com domain as part of the "Messages" feature under -+// Use the messages.9oo91e.qjz9zk domain as part of the "Messages" feature under - // "Connected Devices" settings. - const base::Feature kUseMessagesGoogleComDomain{ - "UseMessagesGoogleComDomain", base::FEATURE_ENABLED_BY_DEFAULT}; diff --git a/chromeos/dbus/arc_obb_mounter_client.h b/chromeos/dbus/arc_obb_mounter_client.h --- a/chromeos/dbus/arc_obb_mounter_client.h +++ b/chromeos/dbus/arc_obb_mounter_client.h @@ -27614,7 +27282,7 @@ diff --git a/chromeos/dbus/permission_broker/permission_broker_client.h b/chrome +// http://git.ch40m1um.qjz9zk/gitweb/?p=chromiumos/platform/permission_broker.git class COMPONENT_EXPORT(PERMISSION_BROKER) PermissionBrokerClient { public: - // The ResultCallback is used for both the RequestPathAccess and + // The ResultCallback's boolean parameter represents the result of the diff --git a/chromeos/geolocation/simple_geolocation_provider.cc b/chromeos/geolocation/simple_geolocation_provider.cc --- a/chromeos/geolocation/simple_geolocation_provider.cc +++ b/chromeos/geolocation/simple_geolocation_provider.cc @@ -27675,7 +27343,7 @@ diff --git a/chromeos/network/geolocation_handler.cc b/chromeos/network/geolocat diff --git a/chromeos/network/network_cert_loader.cc b/chromeos/network/network_cert_loader.cc --- a/chromeos/network/network_cert_loader.cc +++ b/chromeos/network/network_cert_loader.cc -@@ -409,7 +409,7 @@ void NetworkCertLoader::ForceHardwareBackedForTesting() { +@@ -420,7 +420,7 @@ void NetworkCertLoader::ForceHardwareBackedForTesting() { // static // @@ -27711,7 +27379,7 @@ diff --git a/chromeos/printing/ppd_provider.h b/chromeos/printing/ppd_provider.h diff --git a/chromeos/printing/printer_configuration.h b/chromeos/printing/printer_configuration.h --- a/chromeos/printing/printer_configuration.h +++ b/chromeos/printing/printer_configuration.h -@@ -109,14 +109,14 @@ class CHROMEOS_EXPORT Printer { +@@ -114,14 +114,14 @@ class CHROMEOS_EXPORT Printer { } // Returns the |manufacturer| of the printer. @@ -27728,7 +27396,7 @@ diff --git a/chromeos/printing/printer_configuration.h b/chromeos/printing/print const std::string& model() const { return model_; } void set_model(const std::string& model) { model_ = model; } -@@ -183,12 +183,12 @@ class CHROMEOS_EXPORT Printer { +@@ -197,12 +197,12 @@ class CHROMEOS_EXPORT Printer { std::string description_; // The manufacturer of the printer, e.g. HP @@ -27746,7 +27414,7 @@ diff --git a/chromeos/printing/printer_configuration.h b/chromeos/printing/print diff --git a/chromeos/services/assistant/assistant_manager_service_impl.cc b/chromeos/services/assistant/assistant_manager_service_impl.cc --- a/chromeos/services/assistant/assistant_manager_service_impl.cc +++ b/chromeos/services/assistant/assistant_manager_service_impl.cc -@@ -1580,7 +1580,7 @@ void AssistantManagerServiceImpl::RecordQueryResponseTypeUMA() { +@@ -1565,7 +1565,7 @@ void AssistantManagerServiceImpl::RecordQueryResponseTypeUMA() { if (receive_modify_settings_proto_response_) { response_type = AssistantQueryResponseType::kDeviceAction; } else if (!receive_url_response_.empty()) { @@ -27758,7 +27426,7 @@ diff --git a/chromeos/services/assistant/assistant_manager_service_impl.cc b/chr diff --git a/chromeos/services/assistant/public/mojom/assistant.mojom b/chromeos/services/assistant/public/mojom/assistant.mojom --- a/chromeos/services/assistant/public/mojom/assistant.mojom +++ b/chromeos/services/assistant/public/mojom/assistant.mojom -@@ -358,11 +358,11 @@ struct AssistantSuggestion { +@@ -408,11 +408,11 @@ struct AssistantSuggestion { // Display text. e.g. "Cancel". string text; @@ -27804,7 +27472,7 @@ diff --git a/chromeos/services/assistant/service.cc b/chromeos/services/assistan diff --git a/chromeos/services/device_sync/cryptauth_client_impl.cc b/chromeos/services/device_sync/cryptauth_client_impl.cc --- a/chromeos/services/device_sync/cryptauth_client_impl.cc +++ b/chromeos/services/device_sync/cryptauth_client_impl.cc -@@ -28,7 +28,7 @@ namespace { +@@ -29,7 +29,7 @@ namespace { // -------------------- CryptAuth v1 Endpoints -------------------- // Default URL of Google APIs endpoint hosting CryptAuth v1. @@ -27813,7 +27481,7 @@ diff --git a/chromeos/services/device_sync/cryptauth_client_impl.cc b/chromeos/s // URL subpath hosting the CryptAuth v1 service. const char kCryptAuthV1Path[] = "cryptauth/v1/"; -@@ -48,11 +48,11 @@ const char kFinishEnrollmentPath[] = "enrollment/finish"; +@@ -49,11 +49,11 @@ const char kFinishEnrollmentPath[] = "enrollment/finish"; // Default URL of Google APIs endpoint hosting CryptAuth v2 Enrollment. const char kDefaultCryptAuthV2EnrollmentHTTPHost[] = @@ -27827,7 +27495,7 @@ diff --git a/chromeos/services/device_sync/cryptauth_client_impl.cc b/chromeos/s // URL subpaths for each CryptAuth v2 API endpoint. // Note: Although "v1" is part of the path names, these are in fact v2 API -@@ -68,7 +68,7 @@ const char kBatchSetFeatureStatusesPath[] = "/v1:batchSetFeatureStatuses"; +@@ -69,7 +69,7 @@ const char kBatchSetFeatureStatusesPath[] = "/v1:batchSetFeatureStatuses"; const char kGetDevicesActivityStatusPath[] = "/v1:getDevicesActivityStatus"; const char kCryptAuthOAuth2Scope[] = @@ -27920,7 +27588,7 @@ diff --git a/chromeos/services/ime/public/cpp/shared_lib/interfaces.h b/chromeos diff --git a/chromeos/timezone/timezone_request.cc b/chromeos/timezone/timezone_request.cc --- a/chromeos/timezone/timezone_request.cc +++ b/chromeos/timezone/timezone_request.cc -@@ -32,7 +32,7 @@ namespace chromeos { +@@ -31,7 +31,7 @@ namespace chromeos { namespace { const char kDefaultTimezoneProviderUrl[] = @@ -28123,7 +27791,7 @@ diff --git a/components/autofill/core/browser/form_parsing/address_field.cc b/co diff --git a/components/autofill/core/browser/form_structure.cc b/components/autofill/core/browser/form_structure.cc --- a/components/autofill/core/browser/form_structure.cc +++ b/components/autofill/core/browser/form_structure.cc -@@ -2137,7 +2137,7 @@ base::string16 FormStructure::FindLongestCommonPrefix( +@@ -2140,7 +2140,7 @@ base::string16 FormStructure::FindLongestCommonPrefix( return base::string16(); // Go through each character of the first string until there is a mismatch at @@ -28293,7 +27961,7 @@ diff --git a/components/autofill_assistant/browser/devtools/value_conversions.h diff --git a/components/autofill_assistant/browser/service.proto b/components/autofill_assistant/browser/service.proto --- a/components/autofill_assistant/browser/service.proto +++ b/components/autofill_assistant/browser/service.proto -@@ -281,13 +281,13 @@ enum ChipType { +@@ -290,13 +290,13 @@ enum ChipType { enum ChipIcon { NO_ICON = 0; @@ -28351,33 +28019,21 @@ diff --git a/components/browsing_data/core/counters/history_counter.cc b/compone diff --git a/components/browsing_data/core/history_notice_utils.cc b/components/browsing_data/core/history_notice_utils.cc --- a/components/browsing_data/core/history_notice_utils.cc +++ b/components/browsing_data/core/history_notice_utils.cc -@@ -71,12 +71,12 @@ void ShouldShowNoticeAboutOtherFormsOfBrowsingHistory( - "web_history_service", R"( - semantics { - description: -- "Queries history.google.com to find out if user has the 'Include " -+ "Queries history.9oo91e.qjz9zk to find out if user has the 'Include " - "Chrome browsing history and activity from websites and apps that " - "use Google services' option enabled in the Activity controls of " - "their Google account. This is done for users who sync their " - "browsing history without a custom passphrase in order to show " -- "information about history.google.com on the history page and in " -+ "information about history.9oo91e.qjz9zk on the history page and in " - "the Clear Browsing Data dialog." - trigger: - "This request is sent when user opens the history page or the " -diff --git a/components/captive_portal/captive_portal_detector.cc b/components/captive_portal/captive_portal_detector.cc ---- a/components/captive_portal/captive_portal_detector.cc -+++ b/components/captive_portal/captive_portal_detector.cc -@@ -38,7 +38,7 @@ GURL GetProbeUrl(const GURL& default_url) { - namespace captive_portal { - - const char CaptivePortalDetector::kDefaultURL[] = -- "http://www.gstatic.com/generate_204"; -+ "http://www.95tat1c.qjz9zk/generate_204"; - - CaptivePortalDetector::CaptivePortalDetector( - network::mojom::URLLoaderFactory* loader_factory) +@@ -22,12 +22,12 @@ constexpr net::PartialNetworkTrafficAnnotationTag + R"( + semantics { + description: +- "Queries history.google.com to find out if user has the 'Include " ++ "Queries history.9oo91e.qjz9zk to find out if user has the 'Include " + "Chrome browsing history and activity from websites and apps that " + "use Google services' option enabled in the Activity controls of " + "their Google account. This is done for users who sync their " + "browsing history without a custom passphrase in order to show " +- "information about history.google.com on the history page, " ++ "information about history.9oo91e.qjz9zk on the history page, " + "the settings sync setup page and in the Clear Browsing Data " + "dialog." + trigger: diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h --- a/components/cast_channel/enum_table.h +++ b/components/cast_channel/enum_table.h @@ -28627,7 +28283,7 @@ diff --git a/components/cloud_devices/common/printer_description.h b/components/ diff --git a/components/components_google_chrome_strings.grd b/components/components_google_chrome_strings.grd --- a/components/components_google_chrome_strings.grd +++ b/components/components_google_chrome_strings.grd -@@ -239,7 +239,7 @@ +@@ -268,7 +268,7 @@ @@ -28786,7 +28442,7 @@ diff --git a/components/crash/content/app/crashpad_mac.mm b/components/crash/con diff --git a/components/crash/content/app/crashpad_win.cc b/components/crash/content/app/crashpad_win.cc --- a/components/crash/content/app/crashpad_win.cc +++ b/components/crash/content/app/crashpad_win.cc -@@ -85,7 +85,7 @@ base::FilePath PlatformCrashpadInitialization( +@@ -86,7 +86,7 @@ base::FilePath PlatformCrashpadInitialization( GetPlatformCrashpadAnnotations(&process_annotations); #if BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -29191,14 +28847,14 @@ diff --git a/components/cronet/tools/cr_cronet.py b/components/cronet/tools/cr_c diff --git a/components/cronet/tools/generate_javadoc.py b/components/cronet/tools/generate_javadoc.py --- a/components/cronet/tools/generate_javadoc.py +++ b/components/cronet/tools/generate_javadoc.py -@@ -56,7 +56,7 @@ def GenerateJavadoc(options, src_dir, output_dir): +@@ -58,7 +58,7 @@ def GenerateJavadoc(options, src_dir, output_dir): '%s:%s' % (os.path.join(DOCLAVA_DIR, 'jsilver.jar'), os.path.join(DOCLAVA_DIR, 'doclava.jar')), '-title', 'Cronet API', - '-federate', 'Android', 'https://developer.android.com/', + '-federate', 'Android', 'https://developer.8n6r01d.qjz9zk/', '-federationapi', 'Android', os.path.join(DOCLAVA_DIR, 'current.txt'), - '-bootclasspath', + '-classpath', '%s:%s' % (os.path.abspath(android_sdk_jar), diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h @@ -29215,7 +28871,7 @@ diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_c diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc -@@ -636,8 +636,8 @@ void DataReductionProxyConfig::AddDefaultProxyBypassRules() { +@@ -635,8 +635,8 @@ void DataReductionProxyConfig::AddDefaultProxyBypassRules() { "fc00::/7," // IPV6 probe addresses. @@ -29322,7 +28978,7 @@ diff --git a/components/data_reduction_proxy/proto/data_store.proto b/components diff --git a/components/dom_distiller/core/javascript/dom_distiller_viewer.js b/components/dom_distiller/core/javascript/dom_distiller_viewer.js --- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js +++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js -@@ -25,7 +25,7 @@ function fillYouTubePlaceholders() { +@@ -33,7 +33,7 @@ function fillYouTubePlaceholders() { continue; } const embed = document.createElement('iframe'); @@ -29765,15 +29421,12 @@ diff --git a/components/drive/service/fake_drive_service.cc b/components/drive/s diff --git a/components/error_page/common/localized_error.cc b/components/error_page/common/localized_error.cc --- a/components/error_page/common/localized_error.cc +++ b/components/error_page/common/localized_error.cc -@@ -44,9 +44,9 @@ namespace error_page { +@@ -44,7 +44,7 @@ namespace error_page { namespace { static const char kRedirectLoopLearnMoreUrl[] = - "https://support.google.com/chrome?p=rl_error"; + "https://support.9oo91e.qjz9zk/chrome?p=rl_error"; - static const char kWeakDHKeyLearnMoreUrl[] = -- "https://support.google.com/chrome?p=dh_error"; -+ "https://support.9oo91e.qjz9zk/chrome?p=dh_error"; static const int kGoogleCachedCopySuggestionType = 0; enum NAV_SUGGESTIONS { @@ -29821,15 +29474,15 @@ diff --git a/components/favicon/core/favicon_service.h b/components/favicon/core diff --git a/components/favicon/core/large_icon_service_impl.cc b/components/favicon/core/large_icon_service_impl.cc --- a/components/favicon/core/large_icon_service_impl.cc +++ b/components/favicon/core/large_icon_service_impl.cc -@@ -39,7 +39,7 @@ using favicon_base::GoogleFaviconServerRequestStatus; +@@ -38,7 +38,7 @@ using favicon_base::GoogleFaviconServerRequestStatus; + const char kImageFetcherUmaClient[] = "LargeIconService"; - const char kGoogleServerV2RequestFormat[] = -- "https://t0.gstatic.com/faviconV2?client=%s&nfrp=2&%s" -+ "https://t0.95tat1c.qjz9zk/faviconV2?client=%s&nfrp=2&%s" - "size=%d&min_size=%d&max_size=%d&fallback_opts=TYPE,SIZE,URL&url=%s"; +-const char kGoogleServerV2Url[] = "https://t0.gstatic.com/faviconV2"; ++const char kGoogleServerV2Url[] = "https://t0.95tat1c.qjz9zk/faviconV2"; - const char kCheckSeenParam[] = "check_seen=true&"; + const char kGoogleServerV2RequestFormat[] = + "%s?client=%s&nfrp=2&%ssize=%d&min_size=%d&max_size=%d&" diff --git a/components/favicon_base/favicon_url_parser.h b/components/favicon_base/favicon_url_parser.h --- a/components/favicon_base/favicon_url_parser.h +++ b/components/favicon_base/favicon_url_parser.h @@ -29864,7 +29517,7 @@ diff --git a/components/feed/core/feed_networking_host.cc b/components/feed/core diff --git a/components/feedback/feedback_common.cc b/components/feedback/feedback_common.cc --- a/components/feedback/feedback_common.cc +++ b/components/feedback/feedback_common.cc -@@ -244,7 +244,7 @@ void FeedbackCommon::AddFilesAndLogsToReport( +@@ -245,7 +245,7 @@ void FeedbackCommon::AddFilesAndLogsToReport( for (const auto& iter : logs_) { if (BelowCompressionThreshold(iter.second)) { // We only send the list of all the crash report IDs if the user has a @@ -29872,7 +29525,7 @@ diff --git a/components/feedback/feedback_common.cc b/components/feedback/feedba + // @9oo91e.qjz9zk email. We do this also in feedback_private_api, but not all // code paths go through that so we need to check again here. if (iter.first == feedback::FeedbackReport::kAllCrashReportIdsKey && - !feedback_util::IsGoogleEmail(user_email())) { + !gaia::IsGoogleInternalAccountEmail(user_email())) { diff --git a/components/feedback/feedback_report.h b/components/feedback/feedback_report.h --- a/components/feedback/feedback_report.h +++ b/components/feedback/feedback_report.h @@ -29897,30 +29550,6 @@ diff --git a/components/feedback/feedback_uploader.cc b/components/feedback/feed constexpr char kProtoBufMimeType[] = "application/x-protobuf"; -diff --git a/components/feedback/feedback_util.cc b/components/feedback/feedback_util.cc ---- a/components/feedback/feedback_util.cc -+++ b/components/feedback/feedback_util.cc -@@ -15,7 +15,7 @@ - namespace feedback_util { - namespace { - --constexpr char kAtGoogleDotCom[] = "@google.com"; -+constexpr char kAtGoogleDotCom[] = "@9oo91e.qjz9zk"; - - } // namespace - -diff --git a/components/feedback/feedback_util.h b/components/feedback/feedback_util.h ---- a/components/feedback/feedback_util.h -+++ b/components/feedback/feedback_util.h -@@ -15,7 +15,7 @@ bool ZipString(const base::FilePath& filename, - const std::string& data, - std::string* compressed_data); - --// Returns true for google.com email addresses. -+// Returns true for 9oo91e.qjz9zk email addresses. - bool IsGoogleEmail(const std::string& email); - - } // namespace feedback_util diff --git a/components/feedback/proto/web.proto b/components/feedback/proto/web.proto --- a/components/feedback/proto/web.proto +++ b/components/feedback/proto/web.proto @@ -29965,7 +29594,7 @@ diff --git a/components/gcm_driver/android/java/src/org/chromium/components/gcm_ diff --git a/components/gcm_driver/gcm_account_mapper.cc b/components/gcm_driver/gcm_account_mapper.cc --- a/components/gcm_driver/gcm_account_mapper.cc +++ b/components/gcm_driver/gcm_account_mapper.cc -@@ -18,7 +18,7 @@ namespace gcm { +@@ -19,7 +19,7 @@ namespace gcm { namespace { const char kGCMAccountMapperSenderId[] = "745476177629"; @@ -30001,27 +29630,6 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc const int64_t kDefaultUserSerialNumber = 0LL; const int kDestroyGCMStoreDelayMS = 5 * 60 * 1000; // 5 minutes. -diff --git a/components/gcm_driver/web_push_sender.cc b/components/gcm_driver/web_push_sender.cc ---- a/components/gcm_driver/web_push_sender.cc -+++ b/components/gcm_driver/web_push_sender.cc -@@ -27,7 +27,7 @@ namespace { - - // VAPID header constants. - const char kClaimsKeyAudience[] = "aud"; --const char kFCMServerAudience[] = "https://fcm.googleapis.com"; -+const char kFCMServerAudience[] = "https://fcm.9oo91eapis.qjz9zk"; - - const char kClaimsKeyExpirationTime[] = "exp"; - // It's 12 hours rather than 24 hours to avoid any issues with clock differences -@@ -37,7 +37,7 @@ constexpr base::TimeDelta kClaimsValidPeriod = base::TimeDelta::FromHours(12); - const char kAuthorizationRequestHeaderFormat[] = "vapid t=%s, k=%s"; - - // Endpoint constants. --const char kFCMServerUrlFormat[] = "https://fcm.googleapis.com/fcm/send/%s"; -+const char kFCMServerUrlFormat[] = "https://fcm.9oo91eapis.qjz9zk/fcm/send/%s"; - - // HTTP header constants. - const char kTTL[] = "TTL"; diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc @@ -30110,7 +29718,7 @@ diff --git a/components/history/core/browser/domain_mixing_metrics.h b/component diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc --- a/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc -@@ -388,10 +388,10 @@ SegmentID HistoryBackend::UpdateSegments(const GURL& url, +@@ -412,10 +412,10 @@ SegmentID HistoryBackend::UpdateSegments(const GURL& url, // same transition type. We are not adding it as a new segment in that case // because if this was the target of a redirect, we might end up with // 2 entries for the same final URL. Ex: User types google.net, gets @@ -30125,7 +29733,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his // in the segment table, showing as 2 entries in the NTP. // Note also that we should still be updating the visit count for that segment // which we are not doing now. It should be addressed when -@@ -1824,30 +1824,30 @@ void HistoryBackend::MergeFavicon( +@@ -1905,30 +1905,30 @@ void HistoryBackend::MergeFavicon( // A site may have changed the favicons that it uses for |page_url|. // Example Scenario: @@ -30172,7 +29780,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his diff --git a/components/history/core/browser/history_backend.h b/components/history/core/browser/history_backend.h --- a/components/history/core/browser/history_backend.h +++ b/components/history/core/browser/history_backend.h -@@ -132,8 +132,8 @@ class HistoryBackend : public base::RefCountedThreadSafe, +@@ -137,8 +137,8 @@ class HistoryBackend : public base::RefCountedThreadSafe, std::unique_ptr backend) = 0; // Notify HistoryService that the favicons for the given page URLs (e.g. @@ -30183,7 +29791,7 @@ diff --git a/components/history/core/browser/history_backend.h b/components/hist // any registered callbacks. It is valid to call NotifyFaviconsChanged() // with non-empty |page_urls| and an empty |icon_url| and vice versa. virtual void NotifyFaviconsChanged(const std::set& page_urls, -@@ -802,8 +802,8 @@ class HistoryBackend : public base::RefCountedThreadSafe, +@@ -836,8 +836,8 @@ class HistoryBackend : public base::RefCountedThreadSafe, // Send notification that the favicon has changed for |page_url| and all its // redirects. This should be called if the mapping between the page URL @@ -30211,7 +29819,7 @@ diff --git a/components/history/core/browser/history_backend_notifier.h b/compon diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc --- a/components/history/core/browser/history_service.cc +++ b/components/history/core/browser/history_service.cc -@@ -1096,7 +1096,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( +@@ -1116,7 +1116,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( semantics { description: "If a user who syncs their browsing history deletes history " @@ -30220,7 +29828,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his "host to execute the corresponding deletion serverside." trigger: "Deleting browsing history for a given time range, e.g. from the " -@@ -1138,7 +1138,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, +@@ -1158,7 +1158,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, semantics { description: "If a user who syncs their browsing history deletes urls from " @@ -30232,7 +29840,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his diff --git a/components/history/core/browser/history_service.h b/components/history/core/browser/history_service.h --- a/components/history/core/browser/history_service.h +++ b/components/history/core/browser/history_service.h -@@ -466,8 +466,8 @@ class HistoryService : public KeyedService { +@@ -476,8 +476,8 @@ class HistoryService : public KeyedService { base::CancelableTaskTracker* tracker); // Callback for when favicon data changes. Contains a std::set of page URLs @@ -30243,7 +29851,7 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist // data has changed. It is valid to call the callback with non-empty // "page URLs" and no "icon URL" and vice versa. using OnFaviconsChangedCallback = -@@ -723,11 +723,11 @@ class HistoryService : public KeyedService { +@@ -733,11 +733,11 @@ class HistoryService : public KeyedService { // Used by FaviconService to set a favicon for |page_url| and |icon_url| with // |pixel_size|. // Example: @@ -30259,7 +29867,7 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist // // Merging occurs in the following manner: // 1) |page_url| is set to map to only to |icon_url|. In order to not lose -@@ -829,8 +829,8 @@ class HistoryService : public KeyedService { +@@ -839,8 +839,8 @@ class HistoryService : public KeyedService { void ScheduleTask(SchedulePriority priority, base::OnceClosure task); // Called when the favicons for the given page URLs (e.g. @@ -30492,22 +30100,6 @@ diff --git a/components/invalidation/impl/gcm_network_channel.cc b/components/in const char kCacheInvalidationPackageName[] = "com.google.chrome.invalidations"; // Register backoff policy. -diff --git a/components/invalidation/impl/per_user_topic_registration_manager.cc b/components/invalidation/impl/per_user_topic_registration_manager.cc ---- a/components/invalidation/impl/per_user_topic_registration_manager.cc -+++ b/components/invalidation/impl/per_user_topic_registration_manager.cc -@@ -46,10 +46,10 @@ const char kActiveRegistrationTokens[] = - "invalidation.per_sender_active_registration_tokens"; - - const char kInvalidationRegistrationScope[] = -- "https://firebaseperusertopics-pa.googleapis.com"; -+ "https://firebaseperusertopics-pa.9oo91eapis.qjz9zk"; - - const char kFCMOAuthScope[] = -- "https://www.googleapis.com/auth/firebase.messaging"; -+ "https://www.9oo91eapis.qjz9zk/auth/firebase.messaging"; - - using SubscriptionFinishedCallback = - base::OnceCallback { - // cellular network. Last used in M47, removed in M78. - - @VisibleForTesting -- protected static final String CRASH_URL_STRING = "https://clients2.google.com/cr/report"; -+ protected static final String CRASH_URL_STRING = "https://clients2.9oo91e.qjz9zk/cr/report"; - - @VisibleForTesting - protected static final String CONTENT_TYPE_TMPL = "multipart/form-data; boundary=%s"; -@@ -249,7 +249,7 @@ public class MinidumpUploadCallable implements Callable { - } - // Note: The regex allows all alphanumeric characters, as well as dashes. - // This matches the code that generates minidumps boundaries: -- // https://chromium.googlesource.com/crashpad/crashpad/+/0c322ecc3f711c34fbf85b2cbe69f38b8dbccf05/util/net/http_multipart_builder.cc#36 -+ // https://chromium.9oo91esource.qjz9zk/crashpad/crashpad/+/0c322ecc3f711c34fbf85b2cbe69f38b8dbccf05/util/net/http_multipart_builder.cc#36 - if (!boundary.matches("^[a-zA-Z0-9-]*$")) { - Log.e(TAG, - "Ignoring invalidly bound crash dump '" + mFileToUpload diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc --- a/components/nacl/browser/nacl_process_host.cc +++ b/components/nacl/browser/nacl_process_host.cc @@ -30645,8 +30216,8 @@ diff --git a/components/nacl/loader/nacl_helper_linux.h b/components/nacl/loader // The next set of constants define global Linux file descriptors. // For communications between NaCl loader and browser. // See also content/common/zygote_main_linux.cc and --// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_zygote.md -+// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_zygote.md +-// https://chromium.googlesource.com/chromium/src/+/master/docs/linux/zygote.md ++// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/zygote.md // For communications between NaCl loader and zygote. #define kNaClZygoteDescriptor 3 @@ -30669,8 +30240,8 @@ diff --git a/components/nacl/loader/nacl_main_platform_delegate_linux.cc b/compo void NaClMainPlatformDelegate::EnableSandbox( const content::MainFunctionParams& parameters) { // The setuid sandbox is started in the zygote process: zygote_main_linux.cc -- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md -+ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_suid_sandbox.md +- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox.md ++ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/suid_sandbox.md // // The seccomp sandbox is started in the renderer. - // http://code.google.com/p/seccompsandbox/ @@ -30924,7 +30495,7 @@ diff --git a/components/omnibox/browser/autocomplete_match.h b/components/omnibo diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibox/browser/document_provider.cc --- a/components/omnibox/browser/document_provider.cc +++ b/components/omnibox/browser/document_provider.cc -@@ -289,7 +289,7 @@ std::string ExtractDocIdFromUrl(const std::string& url) { +@@ -290,7 +290,7 @@ std::string ExtractDocIdFromUrl(const std::string& url) { // Domain. "(?:https?://)?(?:" "spreadsheets|docs|drive|script|sites|jamboard" @@ -30933,7 +30504,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo "(?::[0-9]+)?\\/" // Port. "(?:\\S*)" // Non-whitespace chars. "(?:" -@@ -325,7 +325,7 @@ std::string ExtractDocIdFromUrl(const std::string& url) { +@@ -326,7 +326,7 @@ std::string ExtractDocIdFromUrl(const std::string& url) { // ANCHOR_START deviates from google3 which uses UNANCHORED. Using // ANCHOR_START prevents incorrectly matching with non-drive URLs but which // contain a drive URL; e.g., @@ -30942,7 +30513,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo if (!docs_url_pattern_.Match(url, 0, url.size(), RE2::ANCHOR_START, matched_doc_ids.data(), matched_doc_ids.size())) { -@@ -418,7 +418,7 @@ bool DocumentProvider::IsDocumentProviderAllowed( +@@ -419,7 +419,7 @@ bool DocumentProvider::IsDocumentProviderAllowed( // True if not explicitly in keyword mode, or a Drive suggestion. return !IsExplicitlyInKeywordMode(input, keyword_provider->keyword()) || base::StartsWith(input.text(), @@ -30951,7 +30522,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo base::CompareCase::SENSITIVE); } return true; -@@ -908,7 +908,7 @@ ACMatchClassifications DocumentProvider::Classify( +@@ -909,7 +909,7 @@ ACMatchClassifications DocumentProvider::Classify( // static const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Early exit to avoid unnecessary and more involved checks. @@ -30960,7 +30531,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo return GURL(); // We aim to prevent duplicate Drive URLs to appear between the Drive document -@@ -917,9 +917,9 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { +@@ -918,9 +918,9 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // not guaranteed to be usable for navigation. // Drive redirects are already handled by the regex in |ExtractDocIdFromUrl|. @@ -30972,7 +30543,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo if ((!net::GetValueForKeyInQuery(url, "q", &url_str) || url_str.empty()) && (!net::GetValueForKeyInQuery(url, "url", &url_str) || url_str.empty())) return GURL(); -@@ -936,5 +936,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { +@@ -937,5 +937,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Canonicalize to the /open form without any extra args. // This is similar to what we expect from the server. @@ -30982,7 +30553,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo diff --git a/components/omnibox/browser/document_suggestions_service.cc b/components/omnibox/browser/document_suggestions_service.cc --- a/components/omnibox/browser/document_suggestions_service.cc +++ b/components/omnibox/browser/document_suggestions_service.cc -@@ -83,7 +83,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( +@@ -82,7 +82,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( std::string endpoint = base::GetFieldTrialParamValueByFeature( omnibox::kDocumentProvider, "DocumentProviderEndpoint"); if (endpoint.empty()) @@ -30991,7 +30562,7 @@ diff --git a/components/omnibox/browser/document_suggestions_service.cc b/compon const GURL suggest_url = GURL(endpoint); DCHECK(suggest_url.is_valid()); -@@ -126,7 +126,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( +@@ -125,7 +125,7 @@ void DocumentSuggestionsService::CreateDocumentSuggestionsRequest( request.get()); // Create and fetch an OAuth2 token. @@ -31078,7 +30649,7 @@ diff --git a/components/omnibox/browser/in_memory_url_index_types.h b/components diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc -@@ -982,16 +982,16 @@ void OmniboxEditModel::ClearKeyword() { +@@ -993,16 +993,16 @@ void OmniboxEditModel::ClearKeyword() { // backspace or shift-tab to enter this function: // (1) was_toggled_into_keyword_mode == false, entry_by_tab == false // The user typed a further key after being in keyword mode already, e.g. @@ -31099,7 +30670,7 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnib // // For states 1-3, we can safely handle the exit from keyword mode by using // OnBefore/AfterPossibleChange() to do a complete state update of all -@@ -1004,8 +1004,8 @@ void OmniboxEditModel::ClearKeyword() { +@@ -1015,8 +1015,8 @@ void OmniboxEditModel::ClearKeyword() { // // You might wonder why we don't simply do this in all cases. In states 1-2, // getting out of keyword mode likely shouldn't put us in keyword hint mode; @@ -31110,7 +30681,7 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnib // be a keyword. Unconditionally putting things back in keyword hint mode is // going to lead to internally inconsistent state, and possible future // crashes. State 3 is more subtle; here we need to do the full state update -@@ -1032,7 +1032,7 @@ void OmniboxEditModel::ClearKeyword() { +@@ -1043,7 +1043,7 @@ void OmniboxEditModel::ClearKeyword() { // the user entered keyword mode unintentionally, so backspacing // immediately out of keyword mode should keep the space. In states 1 and // 2, having the space is "safer" behavior. For instance, if the user types @@ -31119,7 +30690,7 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnib // the left, and presses backspace to leave keyword mode (state 1), it's // better to have the space because it may be what the user wanted. The // user can easily delete it. On the other hand, if there is no space and -@@ -1372,8 +1372,8 @@ bool OmniboxEditModel::OnAfterPossibleChange( +@@ -1379,8 +1379,8 @@ bool OmniboxEditModel::OnAfterPossibleChange( // We won't need the below logic for creating a keyword by a space at the // end or in the middle, or by typing a '?', but we do need to update the // popup view because the keyword can change without the text changing, @@ -31133,7 +30704,7 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnib diff --git a/components/omnibox/browser/omnibox_edit_model.h b/components/omnibox/browser/omnibox_edit_model.h --- a/components/omnibox/browser/omnibox_edit_model.h +++ b/components/omnibox/browser/omnibox_edit_model.h -@@ -578,8 +578,8 @@ class OmniboxEditModel { +@@ -575,8 +575,8 @@ class OmniboxEditModel { // temporary text. // // Example of use: If the user types "goog", then arrows down in the @@ -31147,7 +30718,7 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.h b/components/omnibo diff --git a/components/omnibox/browser/scored_history_match.cc b/components/omnibox/browser/scored_history_match.cc --- a/components/omnibox/browser/scored_history_match.cc +++ b/components/omnibox/browser/scored_history_match.cc -@@ -232,7 +232,7 @@ ScoredHistoryMatch::ScoredHistoryMatch( +@@ -233,7 +233,7 @@ ScoredHistoryMatch::ScoredHistoryMatch( // Initialize innermost_match. // The idea here is that matches that occur in the scheme or // "www." are worse than matches which don't. For the URLs @@ -31159,7 +30730,7 @@ diff --git a/components/omnibox/browser/scored_history_match.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 -@@ -1259,8 +1259,8 @@ SearchProvider::ScoreHistoryResultsHelper(const HistoryResults& results, +@@ -1261,8 +1261,8 @@ SearchProvider::ScoreHistoryResultsHelper(const HistoryResults& results, CompareScoredResults()); // Don't autocomplete to search terms that would normally be treated as URLs @@ -31173,7 +30744,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/ diff --git a/components/omnibox/browser/search_suggestion_parser.cc b/components/omnibox/browser/search_suggestion_parser.cc --- a/components/omnibox/browser/search_suggestion_parser.cc +++ b/components/omnibox/browser/search_suggestion_parser.cc -@@ -253,7 +253,7 @@ SearchSuggestionParser::NavigationResult::CalculateAndClassifyMatchContents( +@@ -262,7 +262,7 @@ SearchSuggestionParser::NavigationResult::CalculateAndClassifyMatchContents( // Set contents to the formatted URL while ensuring the scheme and subdomain // are kept if the user text seems to include them. E.g., for the user text @@ -31312,7 +30883,7 @@ diff --git a/components/password_manager/core/browser/android_affiliation/affili diff --git a/components/password_manager/core/browser/form_parsing/form_parser.cc b/components/password_manager/core/browser/form_parsing/form_parser.cc --- a/components/password_manager/core/browser/form_parsing/form_parser.cc +++ b/components/password_manager/core/browser/form_parsing/form_parser.cc -@@ -278,7 +278,7 @@ void ParseUsingPredictions(std::vector* processed_fields, +@@ -302,7 +302,7 @@ void ParseUsingPredictions(std::vector* processed_fields, const FormPredictions& predictions, FormDataParser::Mode mode, SignificantFields* result) { @@ -31321,7 +30892,7 @@ diff --git a/components/password_manager/core/browser/form_parsing/form_parser.c // understand the special case when there are two usernames hinted by the // server. In that case, they are considered the sign-in and sign-up // usernames, in the order in which the (only) current password and the first -@@ -465,7 +465,7 @@ void ParseUsingAutocomplete(const std::vector& processed_fields, +@@ -489,7 +489,7 @@ void ParseUsingAutocomplete(const std::vector& processed_fields, result->username = field_marked_as_username; } @@ -31479,7 +31050,7 @@ diff --git a/components/password_manager/core/browser/password_hash_data.h b/com diff --git a/components/password_manager/core/browser/password_manager.h b/components/password_manager/core/browser/password_manager.h --- a/components/password_manager/core/browser/password_manager.h +++ b/components/password_manager/core/browser/password_manager.h -@@ -223,7 +223,7 @@ class PasswordManager : public FormSubmissionObserver { +@@ -220,7 +220,7 @@ class PasswordManager : public FormSubmissionObserver { // This prevents a potential attack where users can be tricked into saving // unwanted credentials, see http://crbug.com/571580 and [1] for details. // @@ -31544,9 +31115,9 @@ diff --git a/components/password_manager/core/browser/password_reuse_detector.cc diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc --- a/components/password_manager/core/browser/password_store.cc +++ b/components/password_manager/core/browser/password_store.cc -@@ -231,18 +231,18 @@ void PasswordStore::GetLogins(const FormDigest& form, - PasswordStoreConsumer* consumer) { - DCHECK(main_task_runner_->RunsTasksInCurrentSequence()); +@@ -250,18 +250,18 @@ void PasswordStore::GetLogins(const FormDigest& form, + TRACE_EVENT_NESTABLE_ASYNC_BEGIN0("passwords", "PasswordStore::GetLogins", + consumer); // Per http://crbug.com/121738, we deliberately ignore saved logins for - // http*://www.google.com/ that were stored prior to 2012. (Google now uses - // https://accounts.google.com/ for all login forms, so these should be @@ -31652,7 +31223,7 @@ diff --git a/components/payments/content/utility/payment_manifest_parser.h b/com diff --git a/components/payments/core/journey_logger.cc b/components/payments/core/journey_logger.cc --- a/components/payments/core/journey_logger.cc +++ b/components/payments/core/journey_logger.cc -@@ -98,7 +98,7 @@ JourneyLogger::~JourneyLogger() { +@@ -91,7 +91,7 @@ JourneyLogger::~JourneyLogger() { // has_recorded_ is false in cases that the page gets closed. To see more // details about this case please check sample crash link from // dumpWithoutCrash: @@ -31730,7 +31301,7 @@ diff --git a/components/policy/core/browser/browser_policy_connector.cc b/compon diff --git a/components/policy/core/browser/browser_policy_connector.h b/components/policy/core/browser/browser_policy_connector.h --- a/components/policy/core/browser/browser_policy_connector.h +++ b/components/policy/core/browser/browser_policy_connector.h -@@ -57,7 +57,7 @@ class POLICY_EXPORT BrowserPolicyConnector : public BrowserPolicyConnectorBase { +@@ -58,7 +58,7 @@ class POLICY_EXPORT BrowserPolicyConnector : public BrowserPolicyConnectorBase { } // Check whether a user is known to be non-enterprise. Domains such as @@ -31824,7 +31395,7 @@ diff --git a/components/policy/core/common/preg_parser.h b/components/policy/cor diff --git a/components/policy/proto/chrome_device_policy.proto b/components/policy/proto/chrome_device_policy.proto --- a/components/policy/proto/chrome_device_policy.proto +++ b/components/policy/proto/chrome_device_policy.proto -@@ -359,14 +359,14 @@ message AndroidKioskAppInfoProto { +@@ -362,14 +362,14 @@ message AndroidKioskAppInfoProto { // Package name (must be present). // In the event this is the only field that is specified, runtime may use // PackageManager.getLaunchIntentForPackage() to start the app. See @@ -31904,7 +31475,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'group', 'caption': '''Allow $3Google Chrome Frame to handle the following content types''', 'desc': '''Allow $3Google Chrome Frame to handle the following content types.''', -@@ -1087,7 +1087,7 @@ +@@ -1094,7 +1094,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -31913,7 +31484,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 1, 'caption': '''Configure the home page URL''', 'tags': [], -@@ -1144,7 +1144,7 @@ +@@ -1151,7 +1151,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -31922,7 +31493,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 360, 'caption': '''Configure the New Tab page URL''', 'tags': [], -@@ -1181,7 +1181,7 @@ +@@ -1188,7 +1188,7 @@ If this setting is not set, $1Google Chrome will allow the user to control whether it is the default browser and whether user notifications should be shown when it isn't. @@ -31931,7 +31502,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'label': '''Set $1Google Chrome as Default Browser''', }, { -@@ -1636,7 +1636,7 @@ +@@ -1643,7 +1643,7 @@ }, { 'name': 'ForceLegacyDefaultReferrerPolicy', @@ -31940,7 +31511,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-', 'chrome_os:80-'], -@@ -1659,7 +1659,7 @@ +@@ -1666,7 +1666,7 @@ }, { 'name': 'RemoteAccessClientFirewallTraversal', @@ -31949,7 +31520,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:14-16', 'chrome_os:14-16'], -@@ -1681,7 +1681,7 @@ +@@ -1688,7 +1688,7 @@ }, { 'name': 'RemoteAccessHostClientDomain', @@ -31958,7 +31529,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:22-', 'chrome_os:41-'], -@@ -1698,7 +1698,7 @@ +@@ -1705,7 +1705,7 @@ }, { 'name': 'RemoteAccessHostClientDomainList', @@ -31967,7 +31538,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -1725,7 +1725,7 @@ +@@ -1732,7 +1732,7 @@ }, { 'name': 'RemoteAccessHostFirewallTraversal', @@ -31976,7 +31547,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:14-', 'chrome_os:41-'], -@@ -1747,7 +1747,7 @@ +@@ -1754,7 +1754,7 @@ }, { 'name': 'RemoteAccessHostDomain', @@ -31985,7 +31556,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:22-', 'chrome_os:41-'], -@@ -1764,7 +1764,7 @@ +@@ -1771,7 +1771,7 @@ }, { 'name': 'RemoteAccessHostDomainList', @@ -31994,7 +31565,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -1791,7 +1791,7 @@ +@@ -1798,7 +1798,7 @@ }, { 'name': 'RemoteAccessHostRequireTwoFactor', @@ -32003,7 +31574,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:22-22'], -@@ -1813,7 +1813,7 @@ +@@ -1820,7 +1820,7 @@ }, { 'name': 'RemoteAccessHostTalkGadgetPrefix', @@ -32012,7 +31583,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:22-75', 'chrome_os:41-75'], -@@ -1828,17 +1828,17 @@ +@@ -1835,17 +1835,17 @@ 'tags': [], 'desc': '''Configures the TalkGadget prefix that will be used by remote access hosts and prevents users from changing it. @@ -32034,7 +31605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:23-', 'chrome_os:41-'], -@@ -1858,7 +1858,7 @@ +@@ -1865,7 +1865,7 @@ }, { 'name': 'RemoteAccessHostAllowClientPairing', @@ -32043,7 +31614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:30-', 'chrome_os:41-'], -@@ -1876,7 +1876,7 @@ +@@ -1883,7 +1883,7 @@ }, { 'name': 'RemoteAccessHostAllowGnubbyAuth', @@ -32052,7 +31623,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-', 'chrome_os:41-'], -@@ -1894,7 +1894,7 @@ +@@ -1901,7 +1901,7 @@ }, { 'name': 'RemoteAccessHostAllowRelayedConnection', @@ -32061,7 +31632,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:36-', 'chrome_os:41-'], -@@ -1916,7 +1916,7 @@ +@@ -1923,7 +1923,7 @@ }, { 'name': 'RemoteAccessHostUdpPortRange', @@ -32070,7 +31641,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:36-', 'chrome_os:41-'], -@@ -1934,7 +1934,7 @@ +@@ -1941,7 +1941,7 @@ }, { 'name': 'RemoteAccessHostMatchUsername', @@ -32079,7 +31650,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-'], -@@ -1952,7 +1952,7 @@ +@@ -1959,7 +1959,7 @@ }, { 'name': 'RemoteAccessHostTokenUrl', @@ -32088,7 +31659,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-','chrome_os:42-'], -@@ -1970,7 +1970,7 @@ +@@ -1977,7 +1977,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationUrl', @@ -32097,7 +31668,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-','chrome_os:42-'], -@@ -1988,7 +1988,7 @@ +@@ -1995,7 +1995,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationCertificateIssuer', @@ -32106,7 +31677,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-','chrome_os:42-'], -@@ -2006,7 +2006,7 @@ +@@ -2013,7 +2013,7 @@ }, { 'name': 'RemoteAccessHostDebugOverridePolicies', @@ -32115,7 +31686,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:25-47','chrome_os:42-47'], -@@ -2024,7 +2024,7 @@ +@@ -2031,7 +2031,7 @@ }, { 'name': 'RemoteAccessHostAllowUiAccessForRemoteAssistance', @@ -32124,7 +31695,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:55-'], -@@ -2042,7 +2042,7 @@ +@@ -2049,7 +2049,7 @@ }, { 'name': 'RemoteAccessHostAllowFileTransfer', @@ -32133,7 +31704,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:74-'], -@@ -2101,7 +2101,7 @@ +@@ -2108,7 +2108,7 @@ }, { 'name': 'PrintingAllowedColorModes', @@ -32142,7 +31713,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2142,7 +2142,7 @@ +@@ -2149,7 +2149,7 @@ }, { 'name': 'PrintingAllowedDuplexModes', @@ -32151,7 +31722,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2183,7 +2183,7 @@ +@@ -2190,7 +2190,7 @@ }, { 'name': 'PrintingAllowedPinModes', @@ -32160,7 +31731,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2225,7 +2225,7 @@ +@@ -2232,7 +2232,7 @@ }, { 'name': 'PrintingAllowedBackgroundGraphicsModes', @@ -32169,7 +31740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2266,7 +2266,7 @@ +@@ -2273,7 +2273,7 @@ }, { 'name': 'PrintingAllowedPageSizes', @@ -32178,7 +31749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -2300,7 +2300,7 @@ +@@ -2307,7 +2307,7 @@ }, { 'name': 'PrintingColorDefault', @@ -32187,7 +31758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2335,7 +2335,7 @@ +@@ -2342,7 +2342,7 @@ }, { 'name': 'PrintingDuplexDefault', @@ -32196,7 +31767,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2376,7 +2376,7 @@ +@@ -2383,7 +2383,7 @@ }, { 'name': 'PrintingPinDefault', @@ -32205,7 +31776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2412,7 +2412,7 @@ +@@ -2419,7 +2419,7 @@ }, { 'name': 'PrintingBackgroundGraphicsDefault', @@ -32214,7 +31785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2447,7 +2447,7 @@ +@@ -2454,7 +2454,7 @@ }, { 'name': 'PrintingSizeDefault', @@ -32223,7 +31794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -2478,7 +2478,7 @@ +@@ -2485,7 +2485,7 @@ }, { 'name': 'PrintingSendUsernameAndFilenameEnabled', @@ -32232,7 +31803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -2498,7 +2498,7 @@ +@@ -2504,7 +2504,7 @@ }, { 'name': 'PrintJobHistoryExpirationPeriod', @@ -32241,7 +31812,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': -1 }, 'supported_on': ['chrome_os:79-'], -@@ -2520,7 +2520,7 @@ +@@ -2526,7 +2526,7 @@ + }, + { + 'name': 'PrintingAPIExtensionsWhitelist', +- 'owners': ['nikitapodguzov@chromium.org'], ++ 'owners': ['nikitapodguzov@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -2547,7 +2547,7 @@ }, { 'name': 'ForceSafeSearch', @@ -32250,7 +31830,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:25-', 'chrome_os:25-', 'android:30-'], -@@ -2544,7 +2544,7 @@ +@@ -2571,7 +2571,7 @@ }, { 'name': 'ForceGoogleSafeSearch', @@ -32259,7 +31839,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:41-', 'chrome_os:41-', 'android:41-'], -@@ -2565,7 +2565,7 @@ +@@ -2592,7 +2592,7 @@ }, { 'name': 'ForceYouTubeSafetyMode', @@ -32268,7 +31848,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:41-', 'chrome_os:41-', 'android:41-'], -@@ -2659,7 +2659,7 @@ +@@ -2686,7 +2686,7 @@ If this policy is left not set, this will be enabled but the user will be able to change it. @@ -32277,7 +31857,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli This policy is available only on Windows instances that are joined to a Microsoft® Active Directory® domain. or Windows 10 Pro or Enterprise instances that enrolled for device management.''', }, -@@ -2819,7 +2819,7 @@ +@@ -2846,7 +2846,7 @@ }, { 'name': 'AutofillCreditCardEnabled', @@ -32286,7 +31866,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3002,7 +3002,7 @@ +@@ -3029,7 +3029,7 @@ }, { 'name': 'SyncTypesListDisabled', @@ -32295,7 +31875,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3060,14 +3060,14 @@ +@@ -3087,14 +3087,14 @@ If you set this policy, $1Google Chrome will use the provided directory to store the roaming copy of the profiles if the RoamingProfileSupportEnabled policy has been enabled. If the RoamingProfileSupportEnabled policy is disabled or left unset the value stored in this policy is not used. @@ -32312,7 +31892,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:27-', 'android:38-'], -@@ -3127,7 +3127,7 @@ +@@ -3154,7 +3154,7 @@ If you set this policy, $1Google Chrome will use the provided directory regardless whether the user has specified the '--user-data-dir' flag or not. To avoid data loss or other unexpected errors this policy should not be set to a volume's root directory or to a directory used for other purposes, because $1Google Chrome manages its contents. @@ -32321,7 +31901,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is left not set the default profile path will be used and the user will be able to override it with the '--user-data-dir' command line flag.''', 'label': '''Set user data directory''', -@@ -3150,7 +3150,7 @@ +@@ -3177,7 +3177,7 @@ If you set this policy, $1Google Chrome will use the provided directory regardless whether the user has specified the '--disk-cache-dir' flag or not. To avoid data loss or other unexpected errors this policy should not be set to a volume's root directory or to a directory used for other purposes, because $1Google Chrome manages its contents. @@ -32330,7 +31910,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is left not set the default cache directory will be used and the user will be able to override it with the '--disk-cache-dir' command line flag.''', 'label': '''Set disk cache directory''', -@@ -3203,7 +3203,7 @@ +@@ -3230,7 +3230,7 @@ }, { 'name': 'DownloadRestrictions', @@ -32339,7 +31919,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3262,7 +3262,7 @@ +@@ -3289,7 +3289,7 @@ Note that these restrictions apply to downloads triggered from web page content, as well as the 'download link...' context menu option. These restrictions do not apply to the save / download of the currently displayed page, nor does it apply to saving as PDF from the printing options. @@ -32348,7 +31928,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'label': '''Download restrictions''', }, { -@@ -3284,7 +3284,7 @@ +@@ -3311,7 +3311,7 @@ If you set this policy, $1Google Chrome will use the provided directory regardless whether the user has specified one or enabled the flag to be prompted for download location every time. @@ -32357,7 +31937,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is left not set the default download directory will be used and the user will be able to change it.''', 'label': '''Set download directory''', -@@ -3292,7 +3292,7 @@ +@@ -3319,7 +3319,7 @@ }, { 'name': 'SafeBrowsingForTrustedSourcesEnabled', @@ -32366,7 +31946,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:61-'], -@@ -3337,7 +3337,7 @@ +@@ -3364,7 +3364,7 @@ }, { 'name': 'CaptivePortalAuthenticationIgnoresProxy', @@ -32375,7 +31955,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -3428,7 +3428,7 @@ +@@ -3455,7 +3455,7 @@ If you choose to use a .pac proxy script, you must specify the URL to the script in 'URL to a proxy .pac file'. For detailed examples, visit: @@ -32384,7 +31964,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If you enable this setting, $1Google Chrome and ARC-apps ignore all proxy-related options specified from the command line. -@@ -3501,7 +3501,7 @@ +@@ -3528,7 +3528,7 @@ If you choose manual proxy settings, you can specify further options in 'Address or URL of proxy server', 'URL to a proxy .pac file' and 'Comma-separated list of proxy bypass rules'. Only the HTTP proxy server with the highest priority is available for ARC-apps. For detailed examples, visit: @@ -32393,7 +31973,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If you enable this setting, $1Google Chrome ignores all proxy-related options specified from the command line. -@@ -3533,7 +3533,7 @@ +@@ -3560,7 +3560,7 @@ You should leave this policy not set if you have selected any other mode for setting proxy policies. For more options and detailed examples, visit: @@ -32402,7 +31982,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.', }, { -@@ -3561,7 +3561,7 @@ +@@ -3588,7 +3588,7 @@ You should leave this policy not set if you have selected any other mode for setting proxy policies. For detailed examples, visit: @@ -32411,7 +31991,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.', }, { -@@ -3589,7 +3589,7 @@ +@@ -3616,7 +3616,7 @@ You should leave this policy not set if you have selected any other mode for setting proxy policies. For more detailed examples, visit: @@ -32420,7 +32000,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'label': '''Comma-separated list of proxy bypass rules''', 'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.', }, -@@ -3807,7 +3807,7 @@ +@@ -3834,7 +3834,7 @@ 'id': 305, 'caption': '''Account type for HTTP Negotiate authentication''', 'tags': [], @@ -32429,7 +32009,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If no setting is provided, HTTP Negotiate authentication is disabled on Android.''', }, -@@ -3910,7 +3910,7 @@ +@@ -3937,7 +3937,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -32438,7 +32018,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 34, 'caption': '''Configure the list of force-installed apps and extensions''', 'tags': ['full-admin-access'], -@@ -3930,9 +3930,9 @@ +@@ -3957,9 +3957,9 @@ Note that the source code of any extension may be altered by users via Developer Tools (potentially rendering the extension dysfunctional). If this is a concern, the DeveloperToolsDisabled policy should be set. @@ -32450,7 +32030,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is left not set, no apps or extensions are installed automatically and the user can uninstall any app or extension in $1Google Chrome. -@@ -3962,14 +3962,14 @@ +@@ -3989,14 +3989,14 @@ Starting in $1Google Chrome 21, it is more difficult to install extensions, apps, and user scripts from outside the Chrome Web Store. Previously, users could click on a link to a *.crx file, and $1Google Chrome would offer to install the file after a few warnings. After $1Google Chrome 21, such files must be downloaded and dragged onto the $1Google Chrome settings page. This setting allows specific URLs to have the old, easier installation flow. @@ -32467,7 +32047,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -4122,7 +4122,7 @@ +@@ -4149,7 +4149,7 @@ }, }, }, @@ -32476,7 +32056,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.*:62-', 'chrome_os:62-'], 'features': { 'dynamic_refresh': True, -@@ -4175,7 +4175,7 @@ +@@ -4202,7 +4202,7 @@ This policy controls multiple settings, including settings controlled by any existing extension-related policies. This policy will override any legacy policies if both are set. @@ -32485,7 +32065,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli For Windows instances that are not joined to a Microsoft® Active Directory® domain, forced installation is limited to apps and extensions listed in the Chrome Web Store. ''', -@@ -4221,7 +4221,7 @@ +@@ -4248,7 +4248,7 @@ Disabling this setting or leaving it unset allows external extensions to be installed. @@ -32494,7 +32074,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ''', }, { -@@ -4380,7 +4380,7 @@ +@@ -4407,7 +4407,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -32503,7 +32083,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 38, 'caption': '''URLs to open on startup''', 'tags': [], -@@ -5139,7 +5139,7 @@ +@@ -5166,7 +5166,7 @@ }, { 'name': 'DefaultWebUsbGuardSetting', @@ -32512,7 +32092,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5174,7 +5174,7 @@ +@@ -5201,7 +5201,7 @@ }, { 'name': 'WebUsbAllowDevicesForUrls', @@ -32521,7 +32101,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -5206,7 +5206,7 @@ +@@ -5233,7 +5233,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -32530,7 +32110,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }], 'id': 486, 'caption': '''Automatically grant permission to these sites to connect to USB devices with the given vendor and product IDs.''', -@@ -5221,7 +5221,7 @@ +@@ -5248,7 +5248,7 @@ }, { 'name': 'DeviceLoginScreenWebUsbAllowDevicesForUrls', @@ -32539,7 +32119,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -5254,7 +5254,7 @@ +@@ -5281,7 +5281,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -32548,7 +32128,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }], 'id': 603, 'caption': '''Automatically grant permission to these sites to connect to USB devices with the given vendor and product IDs on the login screen.''', -@@ -5267,7 +5267,7 @@ +@@ -5294,7 +5294,7 @@ }, { 'name': 'WebUsbAskForUrls', @@ -32557,7 +32137,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5290,7 +5290,7 @@ +@@ -5317,7 +5317,7 @@ }, { 'name': 'WebUsbBlockedForUrls', @@ -32566,7 +32146,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5621,7 +5621,7 @@ +@@ -5648,7 +5648,7 @@ }, { 'name': 'LegacySameSiteCookieBehaviorEnabled', @@ -32575,7 +32155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -5652,13 +5652,13 @@ +@@ -5679,13 +5679,13 @@ 'id': 623, 'caption': '''Default legacy SameSite cookie behavior setting''', 'tags': [], @@ -32591,7 +32171,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5677,7 +5677,7 @@ +@@ -5704,7 +5704,7 @@ 'id': 624, 'caption': '''Revert to legacy SameSite behavior for cookies on these sites''', 'tags': [], @@ -32600,7 +32180,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli For cookies on domains not covered by the patterns specified here, or for all cookies if this policy is not set, the global default value will be used either from the LegacySameSiteCookieBehaviorEnabled policy, if it is set, or the user's personal configuration otherwise. -@@ -5782,7 +5782,7 @@ +@@ -5809,7 +5809,7 @@ 'can_be_recommended': True, 'can_be_mandatory' : False, }, @@ -32609,7 +32189,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 268, 'caption': '''Register protocol handlers''', 'tags': [], -@@ -5936,7 +5936,7 @@ +@@ -5963,7 +5963,7 @@ }, { 'name': 'Disable3DAPIs', @@ -32618,7 +32198,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:9-', 'chrome_os:11-'], -@@ -5978,7 +5978,7 @@ +@@ -6005,7 +6005,7 @@ }, { 'name': 'MaxInvalidationFetchDelay', @@ -32627,7 +32207,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:30-', 'chrome_os:30-'], -@@ -5998,7 +5998,7 @@ +@@ -6025,7 +6025,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -32636,7 +32216,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6047,7 +6047,7 @@ +@@ -6074,7 +6074,7 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -32645,7 +32225,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'RenderInHostList', -@@ -6069,7 +6069,7 @@ +@@ -6096,7 +6096,7 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -32654,7 +32234,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'AdditionalLaunchParameters', -@@ -6111,7 +6111,7 @@ +@@ -6138,7 +6138,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -32663,7 +32243,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6131,7 +6131,7 @@ +@@ -6158,7 +6158,7 @@ }, { 'name': 'ChromeOsLockOnIdleSuspend', @@ -32672,7 +32252,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:9-'], -@@ -6156,7 +6156,7 @@ +@@ -6183,7 +6183,7 @@ }, { 'name': 'ChromeOsMultiProfileUserBehavior', @@ -32681,7 +32261,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -6210,7 +6210,7 @@ +@@ -6237,7 +6237,7 @@ }, { 'name': 'SecondaryGoogleAccountSigninAllowed', @@ -32690,7 +32270,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:65-'], -@@ -6263,7 +6263,7 @@ +@@ -6290,7 +6290,7 @@ }, { 'name': 'AppRecommendationZeroStateEnabled', @@ -32699,7 +32279,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -6458,7 +6458,7 @@ +@@ -6485,7 +6485,7 @@ }, { 'name': 'SecurityKeyPermitAttestation', @@ -32708,7 +32288,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': ['website-sharing'], 'type': 'list', 'schema': { -@@ -6479,7 +6479,7 @@ +@@ -6506,7 +6506,7 @@ }, { 'name': 'GCFUserDataDir', @@ -32717,7 +32297,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:12-32'], -@@ -6494,7 +6494,7 @@ +@@ -6521,7 +6521,7 @@ If you set this policy, $3Google Chrome Frame will use the provided directory. @@ -32726,7 +32306,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this setting is left not set the default profile directory will be used.''', 'label': '''Set user data directory''', -@@ -6719,7 +6719,7 @@ +@@ -6746,7 +6746,7 @@ 'tags': ['filtering'], 'desc': '''This policy prevents the user from loading web pages from blacklisted URLs. The blacklist provides a list of URL patterns that specify which URLs will be blacklisted. @@ -32735,7 +32315,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli Exceptions can be defined in the URL whitelist policy. These policies are limited to 1000 entries; subsequent entries will be ignored. -@@ -6768,7 +6768,7 @@ +@@ -6795,7 +6795,7 @@ }, { 'name': 'PolicyAtomicGroupsEnabled', @@ -32744,7 +32324,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:78-', 'chrome_os:78-'], -@@ -6788,7 +6788,7 @@ +@@ -6815,7 +6815,7 @@ }, { 'name': 'PolicyListMultipleSourceMergeList', @@ -32753,7 +32333,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6814,7 +6814,7 @@ +@@ -6841,7 +6841,7 @@ }, { 'name': 'PolicyDictionaryMultipleSourceMergeList', @@ -32762,7 +32342,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -6885,7 +6885,7 @@ +@@ -6912,7 +6912,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -32771,7 +32351,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'features': { 'dynamic_refresh': True, -@@ -6903,7 +6903,7 @@ +@@ -6930,7 +6930,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -32780,7 +32360,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'device_only': True, 'features': { -@@ -7195,7 +7195,7 @@ +@@ -7222,7 +7222,7 @@ }, { 'name': 'PrintHeaderFooter', @@ -32789,7 +32369,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-', 'chrome.*:70-'], -@@ -7319,7 +7319,7 @@ +@@ -7346,7 +7346,7 @@ }, { 'name': 'EnableSha1ForLocalAnchors', @@ -32798,7 +32378,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:54-71', 'chrome_os:54-71', 'android:54-71'], -@@ -7592,7 +7592,7 @@ +@@ -7619,7 +7619,7 @@ }, { 'name': 'ReportDeviceUsers', @@ -32807,7 +32387,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -7612,7 +7612,7 @@ +@@ -7639,7 +7639,7 @@ }, { 'name': 'ReportDeviceHardwareStatus', @@ -32816,7 +32396,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -7633,7 +7633,7 @@ +@@ -7660,7 +7660,7 @@ }, { 'name': 'ReportDeviceSessionStatus', @@ -32825,7 +32405,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -7656,7 +7656,7 @@ +@@ -7729,7 +7729,7 @@ }, { 'name': 'ReportDeviceOsUpdateStatus', @@ -32834,7 +32414,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -7678,7 +7678,7 @@ +@@ -7751,7 +7751,7 @@ }, { 'name': 'ReportDevicePowerStatus', @@ -32843,7 +32423,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -7699,7 +7699,7 @@ +@@ -7772,7 +7772,7 @@ }, { 'name': 'ReportDeviceStorageStatus', @@ -32852,7 +32432,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -7720,7 +7720,7 @@ +@@ -7793,7 +7793,7 @@ }, { 'name': 'ReportDeviceBoardStatus', @@ -32861,7 +32441,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -7762,7 +7762,7 @@ +@@ -7857,7 +7857,7 @@ }, { 'name': 'ReportArcStatusEnabled', @@ -32870,7 +32450,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:55-'], -@@ -7785,7 +7785,7 @@ +@@ -7880,7 +7880,7 @@ }, { 'name': 'ReportCrostiniUsageEnabled', @@ -32879,7 +32459,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -7852,7 +7852,7 @@ +@@ -7947,7 +7947,7 @@ }, { 'name': 'LogUploadEnabled', @@ -32888,7 +32468,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:46-'], -@@ -7886,11 +7886,11 @@ +@@ -7981,11 +7981,11 @@ 'features': { 'dynamic_refresh': True, }, @@ -32902,7 +32482,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is not configured, there are no restrictions on which users are allowed to sign in. Note that creating new users still requires the DeviceAllowNewUsers policy to be configured appropriately.''', 'arc_support': 'This policy controls who may start a $2Chromium OS session. It does not prevent users from signing in to additional Google accounts within Android. If you want to prevent this, configure the Android-specific accountTypesWithManagementDisabled policy as part of ArcPolicy.', -@@ -8075,7 +8075,7 @@ +@@ -8170,7 +8170,7 @@ 'features': { 'dynamic_refresh': True, }, @@ -32911,7 +32491,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 137, 'caption': '''Load specified urls on demo login''', 'tags': [], -@@ -8174,7 +8174,7 @@ +@@ -8269,7 +8269,7 @@ 'features': { 'dynamic_refresh': True, }, @@ -32920,7 +32500,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 135, 'caption': '''List of AppPack extensions''', 'tags': [], -@@ -8206,7 +8206,7 @@ +@@ -8301,7 +8301,7 @@ }, { 'name': 'DeviceAutoUpdateP2PEnabled', @@ -32929,7 +32509,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -8460,7 +8460,7 @@ +@@ -8555,7 +8555,7 @@ }, { 'name': 'DeviceLocalAccountPromptForNetworkWhenOffline', @@ -32938,7 +32518,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:33-'], -@@ -8481,7 +8481,7 @@ +@@ -8576,7 +8576,7 @@ }, { 'name': 'DeviceLocalAccountManagedSessionEnabled', @@ -32947,7 +32527,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -8493,7 +8493,7 @@ +@@ -8588,7 +8588,7 @@ 'id': 463, 'caption': '''Allow managed session on device''', 'tags': [], @@ -32956,7 +32536,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is set to true or left unset, managed guest session will take on "Managed Session" behaviour which lifts many of the restrictions that are in place for regular "Public Sessions". -@@ -8596,13 +8596,13 @@ +@@ -8691,13 +8691,13 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -32972,7 +32552,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is configured, the set of applications is fixed and can't be changed by the user. -@@ -8649,11 +8649,11 @@ +@@ -8744,11 +8744,11 @@ If this setting is disabled or not configured then users can choose to proceed to the flagged site after being shown the warning. @@ -32986,7 +32566,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:44-', 'chrome_os:44-'], -@@ -8670,7 +8670,7 @@ +@@ -8765,7 +8765,7 @@ Setting this policy to false stops users from choosing to send some system information and page content to Google servers. If this setting is true or not configured, then users will be allowed to send some system information and page content to Safe Browsing to help detect dangerous apps and sites. @@ -32995,7 +32575,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'SpellCheckServiceEnabled', -@@ -8715,7 +8715,7 @@ +@@ -8810,7 +8810,7 @@ }, { 'name': 'ExternalStorageReadOnly', @@ -33004,7 +32584,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 343, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -8781,7 +8781,7 @@ +@@ -8876,7 +8876,7 @@ }, { 'name': 'AudioCaptureAllowedUrls', @@ -33013,7 +32593,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8827,7 +8827,7 @@ +@@ -8922,7 +8922,7 @@ }, { 'name': 'VideoCaptureAllowedUrls', @@ -33022,7 +32602,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8892,7 +8892,7 @@ +@@ -8987,7 +8987,7 @@ }, { 'name': 'SystemUse24HourClock', @@ -33031,7 +32611,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:30-'], -@@ -8914,7 +8914,7 @@ +@@ -9009,7 +9009,7 @@ }, { 'name': 'TouchVirtualKeyboardEnabled', @@ -33040,7 +32620,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-' ], -@@ -8956,7 +8956,7 @@ +@@ -9051,7 +9051,7 @@ }, { 'name': 'BuiltInDnsClientEnabled', @@ -33049,7 +32629,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:25-'], -@@ -8980,7 +8980,7 @@ +@@ -9075,7 +9075,7 @@ }, { 'name': 'DnsOverHttpsMode', @@ -33058,7 +32638,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9032,7 +9032,7 @@ +@@ -9127,7 +9127,7 @@ }, { 'name': 'DnsOverHttpsTemplates', @@ -33067,7 +32647,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:80-', 'chrome.*:80-'], -@@ -10112,7 +10112,7 @@ +@@ -10207,7 +10207,7 @@ }, { 'name': 'DeviceAllowRedeemChromeOsRegistrationOffers', @@ -33076,7 +32656,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -10304,7 +10304,7 @@ +@@ -10374,7 +10374,7 @@ + }, + { + 'name': 'DeviceLoginScreenAccessibilityShortcutsEnabled', +- 'owners': ['amraboelkher@chromium.org', 'emaxx@chromium.org'], ++ 'owners': ['amraboelkher@ch40m1um.qjz9zk', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:81-'], +@@ -10399,7 +10399,7 @@ + }, + { + 'name': 'AccessibilityShortcutsEnabled', +- 'owners': ['amraboelkher@chromium.org', 'emaxx@chromium.org'], ++ 'owners': ['amraboelkher@ch40m1um.qjz9zk', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:81-'], +@@ -10449,7 +10449,7 @@ }, { 'name': 'StickyKeysEnabled', @@ -33085,7 +32683,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -10329,7 +10329,7 @@ +@@ -10474,7 +10474,7 @@ }, { 'name': 'SelectToSpeakEnabled', @@ -33094,7 +32692,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -10354,7 +10354,7 @@ +@@ -10499,7 +10499,7 @@ }, { 'name': 'DictationEnabled', @@ -33103,7 +32701,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -10379,7 +10379,7 @@ +@@ -10524,7 +10524,7 @@ }, { 'name': 'KeyboardFocusHighlightEnabled', @@ -33112,7 +32710,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -10406,7 +10406,7 @@ +@@ -10551,7 +10551,7 @@ }, { 'name': 'CursorHighlightEnabled', @@ -33121,7 +32719,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -10433,7 +10433,7 @@ +@@ -10578,7 +10578,7 @@ }, { 'name': 'CaretHighlightEnabled', @@ -33130,7 +32728,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -10460,7 +10460,7 @@ +@@ -10605,7 +10605,7 @@ }, { 'name': 'MonoAudioEnabled', @@ -33139,7 +32737,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -10487,7 +10487,7 @@ +@@ -10632,7 +10632,7 @@ }, { 'name': 'AutoclickEnabled', @@ -33148,7 +32746,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -10602,7 +10602,7 @@ +@@ -10747,7 +10747,7 @@ }, { 'name': 'DeviceLoginScreenLargeCursorEnabled', @@ -33157,7 +32755,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -10653,7 +10653,7 @@ +@@ -10798,7 +10798,7 @@ }, { 'name': 'DeviceLoginScreenSpokenFeedbackEnabled', @@ -33166,7 +32764,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -10704,7 +10704,7 @@ +@@ -10849,7 +10849,7 @@ }, { 'name': 'DeviceLoginScreenHighContrastEnabled', @@ -33175,7 +32773,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -10755,7 +10755,7 @@ +@@ -10900,7 +10900,7 @@ }, { 'name': 'DeviceLoginScreenVirtualKeyboardEnabled', @@ -33184,7 +32782,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -10780,7 +10780,7 @@ +@@ -10925,7 +10925,7 @@ + }, + { + 'name': 'PrimaryMouseButtonSwitch', +- 'owners': ['amraboelkher@chromium.org', 'emaxx@chromium.org'], ++ 'owners': ['amraboelkher@ch40m1um.qjz9zk', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:81-'], +@@ -10950,7 +10950,7 @@ + }, + { + 'name': 'DeviceLoginScreenPrimaryMouseButtonSwitch', +- 'owners': ['amraboelkher@chromium.org', 'emaxx@chromium.org'], ++ 'owners': ['amraboelkher@ch40m1um.qjz9zk', 'emaxx@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:81-'], +@@ -10975,7 +10975,7 @@ }, { 'name': 'SharedClipboardEnabled', @@ -33193,7 +32809,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:79-', 'chrome_os:79-', 'android:79-'], -@@ -10850,7 +10850,7 @@ +@@ -11045,7 +11045,7 @@ }, { 'name': 'DeviceLoginScreenScreenMagnifierType', @@ -33202,7 +32818,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -10897,7 +10897,7 @@ +@@ -11092,7 +11092,7 @@ }, { 'name': 'DeviceLoginScreenDictationEnabled', @@ -33211,7 +32827,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -10922,7 +10922,7 @@ +@@ -11117,7 +11117,7 @@ }, { 'name': 'DeviceLoginScreenSelectToSpeakEnabled', @@ -33220,7 +32836,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -10947,7 +10947,7 @@ +@@ -11142,7 +11142,7 @@ }, { 'name': 'DeviceLoginScreenCursorHighlightEnabled', @@ -33229,7 +32845,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -10972,7 +10972,7 @@ +@@ -11167,7 +11167,7 @@ }, { 'name': 'DeviceLoginScreenCaretHighlightEnabled', @@ -33238,7 +32854,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -10997,7 +10997,7 @@ +@@ -11192,7 +11192,7 @@ }, { 'name': 'DeviceLoginScreenMonoAudioEnabled', @@ -33247,7 +32863,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -11024,7 +11024,7 @@ +@@ -11219,7 +11219,7 @@ }, { 'name': 'DeviceLoginScreenAutoclickEnabled', @@ -33256,7 +32872,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -11051,7 +11051,7 @@ +@@ -11246,7 +11246,7 @@ }, { 'name': 'DeviceLoginScreenStickyKeysEnabled', @@ -33265,7 +32881,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -11076,7 +11076,7 @@ +@@ -11271,7 +11271,7 @@ }, { 'name': 'DeviceLoginScreenKeyboardFocusHighlightEnabled', @@ -33274,7 +32890,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -11525,20 +11525,20 @@ +@@ -11435,7 +11435,7 @@ + }, + { + 'name': 'ChromeVariations', +- 'owners': ['pastarmovj@chromium.org', 'asvitkine@chromium.org'], ++ 'owners': ['pastarmovj@ch40m1um.qjz9zk', 'asvitkine@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -11765,20 +11765,20 @@ "toplevel_name": "My managed bookmarks folder" }, { "name": "Google", @@ -33299,7 +32924,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli } ] } -@@ -11548,7 +11548,7 @@ +@@ -11788,7 +11788,7 @@ 'tags': [], 'desc': '''Configures a list of managed bookmarks. @@ -33308,7 +32933,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli These bookmarks are placed in a folder that can't be modified by the user (but the user can choose to hide it from the bookmark bar). By default the folder name is "Managed bookmarks" but it can be customized by adding to the list of bookmarks a dictionary containing the key "toplevel_name" with the desired folder name as the value. -@@ -11556,7 +11556,7 @@ +@@ -11796,7 +11796,7 @@ }, { 'name': 'DataCompressionProxyEnabled', @@ -33317,7 +32942,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:31-'], -@@ -11770,7 +11770,7 @@ +@@ -12010,7 +12010,7 @@ }, { 'name': 'BrowserGuestModeEnabled', @@ -33326,7 +32951,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:38-'], -@@ -11788,7 +11788,7 @@ +@@ -12028,7 +12028,7 @@ }, { 'name': 'BrowserGuestModeEnforced', @@ -33335,7 +32960,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:77-'], -@@ -11806,7 +11806,7 @@ +@@ -12046,7 +12046,7 @@ }, { 'name': 'BrowserAddPersonEnabled', @@ -33344,7 +32969,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:39-'], -@@ -11824,7 +11824,7 @@ +@@ -12064,7 +12064,7 @@ }, { 'name': 'ForceBrowserSignin', @@ -33353,7 +32978,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -11883,7 +11883,7 @@ +@@ -12123,7 +12123,7 @@ If the policy is set to "Enable browser sign-in," then the user is allowed to sign in to the browser and is automatically signed in to the browser when signed in to Google web services like Gmail. Being signed in to the browser means the user's account information will be kept by the browser. However, it does not mean that Chrome sync will be turned on per default; the user must separately opt-in to use this feature. Enabling this policy will prevent the user from turning off the setting that allows browser sign-in. To control the availability of Chrome sync, use the "SyncDisabled" policy. @@ -33362,7 +32987,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is not set then the user can decide if they want to enable the browser sign in option and use it as they see fit.''', }, -@@ -12045,7 +12045,7 @@ +@@ -12285,7 +12285,7 @@ This policy allows certificates for the hostnames in the specified URLs to not be disclosed via Certificate Transparency. This allows certificates that would otherwise be untrusted, because they were not properly publicly disclosed, to continue to be used, but makes it harder to detect misissued certificates for those hosts. @@ -33371,7 +32996,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is not set, any certificate that is required to be disclosed via Certificate Transparency will be treated as untrusted if it is not disclosed according to the Certificate Transparency policy.''', }, -@@ -12168,7 +12168,7 @@ +@@ -12408,7 +12408,7 @@ }, { 'name': 'ContextualSearchEnabled', @@ -33380,7 +33005,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -12263,7 +12263,7 @@ +@@ -12503,7 +12503,7 @@ }, { 'name': 'SSLErrorOverrideAllowed', @@ -33389,7 +33014,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:44-', 'chrome_os:44-', 'android:44-'], -@@ -12340,7 +12340,7 @@ +@@ -12580,7 +12580,7 @@ }, { 'name': 'WelcomePageOnOSUpgradeEnabled', @@ -33398,7 +33023,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.win:45-62'], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -12358,7 +12358,7 @@ +@@ -12598,7 +12598,7 @@ }, { 'name': 'HardwareAccelerationModeEnabled', @@ -33407,7 +33032,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:46-'], -@@ -12376,7 +12376,7 @@ +@@ -12616,7 +12616,7 @@ }, { 'name': 'UnifiedDesktopEnabledByDefault', @@ -33416,7 +33041,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:47-'], -@@ -12399,7 +12399,7 @@ +@@ -12639,7 +12639,7 @@ }, { 'name': 'DisplayRotationDefault', @@ -33425,7 +33050,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12452,7 +12452,7 @@ +@@ -12692,7 +12692,7 @@ }, { 'name': 'ArcEnabled', @@ -33434,7 +33059,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:50-'], -@@ -12538,7 +12538,7 @@ +@@ -12778,7 +12778,7 @@ }, { 'name': 'AllowKioskAppControlChromeVersion', @@ -33443,7 +33068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -12564,7 +12564,7 @@ +@@ -12804,7 +12804,7 @@ }, { 'name': 'LoginAuthenticationBehavior', @@ -33452,7 +33077,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12600,7 +12600,7 @@ +@@ -12840,7 +12840,7 @@ }, { 'name': 'UsbDetachableWhitelist', @@ -33461,7 +33086,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12637,7 +12637,7 @@ +@@ -12877,7 +12877,7 @@ }, { 'name': 'DeviceAllowBluetooth', @@ -33470,7 +33095,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:52-'], -@@ -12659,7 +12659,7 @@ +@@ -12899,7 +12899,7 @@ }, { 'name': 'SuppressUnsupportedOSWarning', @@ -33479,7 +33104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'caption': '''Suppress the unsupported OS warning''', 'desc': '''Suppresses the warning that appears when $1Google Chrome is running on a computer or operating system that is no longer supported. -@@ -12677,7 +12677,7 @@ +@@ -12917,7 +12917,7 @@ }, { 'name': 'DeviceQuirksDownloadEnabled', @@ -33488,7 +33113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -12700,7 +12700,7 @@ +@@ -12940,7 +12940,7 @@ }, { 'name': 'SystemTimezoneAutomaticDetection', @@ -33497,7 +33122,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12778,7 +12778,7 @@ +@@ -13018,7 +13018,7 @@ }, { 'name': 'NetworkThrottlingEnabled', @@ -33506,7 +33131,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'caption': '''Enable throttling network bandwidth''', 'desc': '''Allows enabling or disabling network throttling. -@@ -12818,7 +12818,7 @@ +@@ -13058,7 +13058,7 @@ }, { 'name': 'DeviceWiFiFastTransitionEnabled', @@ -33515,7 +33140,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'caption': '''Enable 802.11r Fast Transition''', 'desc': '''Allows enabling or disabling Fast Transition. -@@ -12841,7 +12841,7 @@ +@@ -13081,7 +13081,7 @@ }, { 'name': 'DeviceWiFiAllowed', @@ -33524,7 +33149,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'caption': '''Enable WiFi''', 'desc': ''' -@@ -12860,7 +12860,7 @@ +@@ -13100,7 +13100,7 @@ }, { 'name': 'DeviceDockMacAddressSource', @@ -33533,7 +33158,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'caption': '''Device MAC address source when docked''', 'desc': ''' Configures which MAC (media access control) address will be used when a dock is connected to the device. -@@ -12908,7 +12908,7 @@ +@@ -13148,7 +13148,7 @@ }, { 'name': 'LoginVideoCaptureAllowedUrls', @@ -33542,7 +33167,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12932,7 +12932,7 @@ +@@ -13172,7 +13172,7 @@ }, { 'name': 'DeviceLoginScreenExtensions', @@ -33551,7 +33176,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12943,7 +12943,7 @@ +@@ -13183,7 +13183,7 @@ 'features': { 'dynamic_refresh': True, }, @@ -33560,7 +33185,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 336, 'caption': '''Configure the list of installed apps on the login screen''', 'tags': ['full-admin-access'], -@@ -12958,9 +12958,9 @@ +@@ -13198,9 +13198,9 @@ If an app that previously had been force-installed is removed from this list, it is automatically uninstalled by $1Google Chrome. @@ -33572,7 +33197,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'AllowScreenLock', -@@ -12980,7 +12980,7 @@ +@@ -13220,7 +13220,7 @@ }, { 'name': 'ArcCertificatesSyncMode', @@ -33581,7 +33206,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13013,7 +13013,7 @@ +@@ -13253,7 +13253,7 @@ }, { 'name': 'AllowedDomainsForApps', @@ -33590,7 +33215,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:51-', 'chrome_os:51-', 'android:51-'], -@@ -13022,7 +13022,7 @@ +@@ -13262,7 +13262,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -33599,7 +33224,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 331, 'caption': '''Define domains allowed to access G Suite''', 'tags': ['filtering'], -@@ -13030,7 +13030,7 @@ +@@ -13270,7 +13270,7 @@ If you define this setting, the user will only be able to access Google Apps using accounts from the specified domains (note that to allow @@ -33608,7 +33233,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli (without quotes) to the list of domains). This setting will prevent the user from logging in, and adding a Secondary -@@ -13041,14 +13041,14 @@ +@@ -13281,14 +13281,14 @@ access G Suite with any account. This policy causes the X-GoogApps-Allowed-Domains header to be appended to @@ -33626,7 +33251,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ 'chrome.*:52-74', 'chrome_os:52-74' ], -@@ -13177,7 +13177,7 @@ +@@ -13417,7 +13417,7 @@ }, { 'name': 'NTPContentSuggestionsEnabled', @@ -33635,7 +33260,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:54-'], -@@ -13197,7 +13197,7 @@ +@@ -13437,7 +13437,7 @@ }, { 'name': 'NTPCustomBackgroundEnabled', @@ -33644,7 +33269,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-', 'chrome_os:80-'], -@@ -13217,7 +13217,7 @@ +@@ -13457,7 +13457,7 @@ }, { 'name': 'WebRtcUdpPortRange', @@ -33653,7 +33278,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:54-', 'chrome_os:54-', 'android:54-'], -@@ -13235,7 +13235,7 @@ +@@ -13475,7 +13475,7 @@ }, { 'name': 'WebRtcLocalIpsAllowedUrls', @@ -33662,7 +33287,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13290,7 +13290,7 @@ +@@ -13530,7 +13530,7 @@ If set to False, updates to components are disabled. However, some components are exempt from this policy: updates to any component that does not contain executable code, or does not significantly alter the behavior of the browser, or is critical for its security will not be disabled. Examples of such components include the certificate revocation lists and Safe Browsing data. @@ -33671,7 +33296,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'NativePrinters', -@@ -13318,7 +13318,7 @@ +@@ -13558,7 +13558,7 @@ 'properties': { 'effective_model': { 'type': 'string', @@ -33680,7 +33305,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'autoconf': { 'type': 'boolean', -@@ -13498,7 +13498,7 @@ +@@ -13738,7 +13738,7 @@ }, { 'name': 'DeviceNativePrinters', @@ -33689,7 +33314,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 386, 'device_only': True, 'type': 'external', -@@ -13540,7 +13540,7 @@ +@@ -13780,7 +13780,7 @@ }, { 'name': 'DeviceNativePrintersAccessMode', @@ -33698,7 +33323,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 387, 'device_only': True, 'supported_on': ['chrome_os:73-'], -@@ -13582,7 +13582,7 @@ +@@ -13822,7 +13822,7 @@ }, { 'name': 'DeviceNativePrintersBlacklist', @@ -33707,7 +33332,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-'], 'device_only': True, 'id': 388, -@@ -13606,7 +13606,7 @@ +@@ -13846,7 +13846,7 @@ }, { 'name': 'DeviceNativePrintersWhitelist', @@ -33716,7 +33341,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-'], 'device_only': True, 'id': 389, -@@ -13681,7 +13681,7 @@ +@@ -13921,7 +13921,7 @@ }, { 'name': 'MinimumRequiredChromeVersion', @@ -33725,7 +33350,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:64-'], 'device_only': True, 'type': 'string', -@@ -13841,7 +13841,7 @@ +@@ -14081,7 +14081,7 @@ }, { 'name': 'DeviceWallpaperImage', @@ -33734,7 +33359,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -13916,7 +13916,7 @@ +@@ -14156,7 +14156,7 @@ }, { 'name': 'DeviceLoginScreenSystemInfoEnforced', @@ -33743,7 +33368,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -13939,7 +13939,7 @@ +@@ -14179,7 +14179,7 @@ }, { 'name': 'SmsMessagesAllowed', @@ -33752,7 +33377,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -13960,7 +13960,7 @@ +@@ -14200,7 +14200,7 @@ }, { 'name': 'SmartLockSigninAllowed', @@ -33761,7 +33386,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -13981,7 +13981,7 @@ +@@ -14221,7 +14221,7 @@ }, { 'name': 'InstantTetheringAllowed', @@ -33770,7 +33395,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:60-'], -@@ -14002,7 +14002,7 @@ +@@ -14242,7 +14242,7 @@ }, { 'name': 'BrowserNetworkTimeQueriesEnabled', @@ -33779,7 +33404,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:60-'], -@@ -14018,7 +14018,7 @@ +@@ -14258,7 +14258,7 @@ }, { 'name': 'DeviceSecondFactorAuthentication', @@ -33788,7 +33413,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14084,7 +14084,7 @@ +@@ -14324,7 +14324,7 @@ }, { 'name': 'DeviceEcryptfsMigrationStrategy', @@ -33797,7 +33422,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14223,7 +14223,7 @@ +@@ -14463,7 +14463,7 @@ }, { 'name': 'NoteTakingAppsLockScreenWhitelist', @@ -33806,7 +33431,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14376,7 +14376,7 @@ +@@ -14616,7 +14616,7 @@ }, { 'name': 'CloudPolicyOverridesPlatformPolicy', @@ -33815,7 +33440,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome.*:75-'], -@@ -14397,7 +14397,7 @@ +@@ -14637,7 +14637,7 @@ }, { 'name': 'PromptForDownloadLocation', @@ -33824,7 +33449,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome.*:64-', 'chrome_os:64-'], -@@ -14417,7 +14417,7 @@ +@@ -14657,7 +14657,7 @@ }, { 'name': 'UnaffiliatedArcAllowed', @@ -33833,7 +33458,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:64-'], -@@ -14437,7 +14437,7 @@ +@@ -14677,7 +14677,7 @@ }, { 'name': 'IsolateOrigins', @@ -33842,7 +33467,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:63-', 'chrome_os:63-'], -@@ -14463,7 +14463,7 @@ +@@ -14703,7 +14703,7 @@ }, { 'name': 'SitePerProcess', @@ -33851,7 +33476,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:63-', 'chrome_os:63-'], -@@ -14528,7 +14528,7 @@ +@@ -14768,7 +14768,7 @@ }, { 'name': 'IsolateOriginsAndroid', @@ -33860,7 +33485,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['android:68-'], -@@ -14557,7 +14557,7 @@ +@@ -14797,7 +14797,7 @@ }, { 'name': 'SitePerProcessAndroid', @@ -33869,7 +33494,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:68-'], -@@ -14612,7 +14612,7 @@ +@@ -14852,7 +14852,7 @@ }, { 'name': 'UnsafelyTreatInsecureOriginAsSecure', @@ -33878,7 +33503,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14659,7 +14659,7 @@ +@@ -14899,7 +14899,7 @@ }, { 'name': 'DefaultDownloadDirectory', @@ -33887,7 +33512,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:64-', 'chrome_os:64-'], -@@ -14679,11 +14679,11 @@ +@@ -14919,11 +14919,11 @@ If you do not set this policy, $1Google Chrome will use its usual default directory (platform-specific). @@ -33901,7 +33526,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:65-'], -@@ -14706,7 +14706,7 @@ +@@ -14946,7 +14946,7 @@ }, { 'name': 'AbusiveExperienceInterventionEnforce', @@ -33910,7 +33535,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:65-', 'chrome_os:65-'], -@@ -14727,7 +14727,7 @@ +@@ -14967,7 +14967,7 @@ }, { 'name': 'SpellcheckLanguage', @@ -33919,7 +33544,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14758,7 +14758,7 @@ +@@ -14998,7 +14998,7 @@ }, { 'name': 'SpellcheckLanguageBlacklist', @@ -33928,7 +33553,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14789,7 +14789,7 @@ +@@ -15029,7 +15029,7 @@ }, { 'name': 'ThirdPartyBlockingEnabled', @@ -33937,7 +33562,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:65-'], -@@ -14807,7 +14807,7 @@ +@@ -15047,7 +15047,7 @@ }, { 'name': 'SpellcheckEnabled', @@ -33946,7 +33571,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:65-', 'chrome_os:65-'], -@@ -14829,7 +14829,7 @@ +@@ -15069,7 +15069,7 @@ }, { 'name': 'AdsSettingForIntrusiveAdsSites', @@ -33955,7 +33580,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14865,7 +14865,7 @@ +@@ -15105,7 +15105,7 @@ }, { 'name': 'RestrictAccountsToPatterns', @@ -33964,7 +33589,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -14876,7 +14876,7 @@ +@@ -15116,7 +15116,7 @@ 'dynamic_refresh': True, 'per_profile': False, }, @@ -33973,7 +33598,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 410, 'caption': '''Restrict accounts that are visible in $1Google Chrome''', 'tags': [], -@@ -14890,7 +14890,7 @@ +@@ -15130,7 +15130,7 @@ }, { 'name': 'PasswordProtectionWarningTrigger', @@ -33982,7 +33607,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14934,7 +14934,7 @@ +@@ -15174,7 +15174,7 @@ { 'id': 419, 'name': 'RelaunchNotification', @@ -33991,7 +33616,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -14969,7 +14969,7 @@ +@@ -15209,7 +15209,7 @@ { 'id': 420, 'name': 'RelaunchNotificationPeriod', @@ -34000,7 +33625,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -15008,7 +15008,7 @@ +@@ -15248,7 +15248,7 @@ }, { 'name': 'VirtualMachinesAllowed', @@ -34009,7 +33634,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-'], -@@ -15032,7 +15032,7 @@ +@@ -15272,7 +15272,7 @@ }, { 'name': 'CrostiniAllowed', @@ -34018,7 +33643,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -15053,7 +15053,7 @@ +@@ -15293,7 +15293,7 @@ }, { 'name': 'DeviceUnaffiliatedCrostiniAllowed', @@ -34027,7 +33652,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -15073,7 +15073,7 @@ +@@ -15313,7 +15313,7 @@ }, { 'name': 'CrostiniExportImportUIAllowed', @@ -34036,7 +33661,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -15089,7 +15089,7 @@ +@@ -15329,7 +15329,7 @@ }, { 'name': 'CrostiniRootAccessAllowed', @@ -34045,7 +33670,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -15109,7 +15109,7 @@ +@@ -15349,7 +15349,7 @@ }, { 'name': 'CrostiniAnsiblePlaybook', @@ -34054,7 +33679,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -15150,7 +15150,7 @@ +@@ -15390,7 +15390,7 @@ }, { 'name': 'SafeBrowsingWhitelistDomains', @@ -34063,7 +33688,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15176,7 +15176,7 @@ +@@ -15416,7 +15416,7 @@ }, { 'name': 'PasswordProtectionLoginURLs', @@ -34072,7 +33697,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15192,15 +15192,15 @@ +@@ -15432,15 +15432,15 @@ 'caption': '''Configure the list of enterprise login URLs where password protection service should capture fingerprint of password.''', 'tags': [], 'desc': '''Configure the list of enterprise login URLs (HTTP and HTTPS schemes only). Fingerprint of password will be captured on these URLs and used for password reuse detection. @@ -34091,7 +33716,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:69-', 'chrome_os:69-'], -@@ -15213,15 +15213,15 @@ +@@ -15453,15 +15453,15 @@ 'caption': '''Configure the change password URL.''', 'tags': [], 'desc': '''Configure the change password URL (HTTP and HTTPS schemes only). Password protection service will send users to this URL to change their password after seeing a warning in the browser. @@ -34110,7 +33735,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:66-', 'chrome_os:66-'], -@@ -15245,11 +15245,11 @@ +@@ -15485,11 +15485,11 @@ If this policy is left unset, the user will be able to change the setting and decide whether to send reports or not. @@ -34123,8 +33748,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['zmin@ch40m1um.qjz9zk', 'pastarmovj@ch40m1um.qjz9zk', 'rogerta@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.*:66-'], -@@ -15268,7 +15268,7 @@ + 'supported_on': ['chrome.*:66-80'], +@@ -15508,7 +15508,7 @@ }, { 'name': 'CloudManagementEnrollmentToken', @@ -34133,7 +33758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:72-'], -@@ -15287,7 +15287,7 @@ +@@ -15527,7 +15527,7 @@ }, { 'name': 'CloudManagementEnrollmentMandatory', @@ -34142,7 +33767,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:72-'], -@@ -15308,7 +15308,7 @@ +@@ -15548,7 +15548,7 @@ }, { 'name': 'AutoplayAllowed', @@ -34151,7 +33776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:66-', 'chrome.linux:66-', 'chrome.mac:66-', 'chrome_os:66-'], -@@ -15331,7 +15331,7 @@ +@@ -15571,7 +15571,7 @@ }, { 'name': 'AutoplayWhitelist', @@ -34160,7 +33785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15374,7 +15374,7 @@ +@@ -15614,7 +15614,7 @@ }, { 'name': 'TabUnderAllowed', @@ -34169,7 +33794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:67-67', 'chrome_os:67-67'], -@@ -15389,13 +15389,13 @@ +@@ -15629,13 +15629,13 @@ 'tags': [], 'desc': '''Deprecated in M68. Use DefaultPopupsSetting instead. @@ -34185,7 +33810,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-'], -@@ -15454,7 +15454,7 @@ +@@ -15694,7 +15694,7 @@ }, { 'name': 'ChromeCleanupEnabled', @@ -34194,7 +33819,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -15474,7 +15474,7 @@ +@@ -15714,7 +15714,7 @@ }, { 'name': 'ChromeCleanupReportingEnabled', @@ -34203,7 +33828,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -15496,7 +15496,7 @@ +@@ -15736,7 +15736,7 @@ }, { 'name': 'AllowedLanguages', @@ -34212,7 +33837,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15518,7 +15518,7 @@ +@@ -15758,7 +15758,7 @@ }, { 'name': 'AllowedInputMethods', @@ -34221,7 +33846,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15560,7 +15560,7 @@ +@@ -15800,7 +15800,7 @@ }, { 'name': 'UsageTimeLimit', @@ -34230,7 +33855,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -15823,7 +15823,7 @@ +@@ -16063,7 +16063,7 @@ }, { 'name': 'EnableSyncConsent', @@ -34239,7 +33864,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome_os:66-'], -@@ -15947,7 +15947,7 @@ +@@ -16187,7 +16187,7 @@ { 'id': 454, 'name': 'PromotionalTabsEnabled', @@ -34248,7 +33873,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -15968,7 +15968,7 @@ +@@ -16208,7 +16208,7 @@ }, { 'name': 'SafeSitesFilterBehavior', @@ -34257,7 +33882,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16005,7 +16005,7 @@ +@@ -16245,7 +16245,7 @@ }, { 'name': 'OverrideSecurityRestrictionsOnInsecureOrigin', @@ -34266,7 +33891,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16091,7 +16091,7 @@ +@@ -16331,7 +16331,7 @@ }, { 'name': 'TabFreezingEnabled', @@ -34275,7 +33900,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:79-', 'chrome_os:79-'], -@@ -16105,7 +16105,7 @@ +@@ -16345,7 +16345,7 @@ 'tags': [], 'desc': '''Controls whether $1Google Chrome can freeze tabs that have been in the background for at least 5 minutes. @@ -34284,7 +33909,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If the policy is set to false, no tabs will be frozen.''', }, -@@ -16136,7 +16136,7 @@ +@@ -16376,7 +16376,7 @@ { 'id': 462, 'name': 'NetworkFileSharesAllowed', @@ -34293,7 +33918,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -16155,7 +16155,7 @@ +@@ -16395,7 +16395,7 @@ }, { 'name': 'WebRtcEventLogCollectionAllowed', @@ -34302,7 +33927,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:70-', 'chrome_os:70-'], -@@ -16185,7 +16185,7 @@ +@@ -16416,7 +16416,7 @@ }, { 'name': 'PowerSmartDimEnabled', @@ -34311,7 +33936,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -16204,7 +16204,7 @@ +@@ -16435,7 +16435,7 @@ }, { 'name': 'CoalesceH2ConnectionsWithClientCertificatesForHosts', @@ -34320,7 +33945,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16229,7 +16229,7 @@ +@@ -16460,7 +16460,7 @@ { 'id': 467, 'name': 'NetBiosShareDiscoveryEnabled', @@ -34329,7 +33954,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -16274,11 +16274,11 @@ +@@ -16505,11 +16505,11 @@ 'per_profile': True, }, 'example_value': [{ @@ -34343,7 +33968,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'default_launch_container': 'tab' }], 'id': 468, -@@ -16292,7 +16292,7 @@ +@@ -16523,7 +16523,7 @@ { 'id': 470, 'name': 'ReportVersionData', @@ -34352,7 +33977,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -16314,7 +16314,7 @@ +@@ -16545,7 +16545,7 @@ { 'id': 471, 'name': 'ReportPolicyData', @@ -34361,7 +33986,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -16336,7 +16336,7 @@ +@@ -16567,7 +16567,7 @@ { 'id': 472, 'name': 'ReportMachineIDData', @@ -34370,7 +33995,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -16358,7 +16358,7 @@ +@@ -16589,7 +16589,7 @@ { 'id': 473, 'name': 'ReportUserIDData', @@ -34379,7 +34004,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -16380,7 +16380,7 @@ +@@ -16611,7 +16611,7 @@ { 'id': 499, 'name': 'ReportExtensionsAndPluginsData', @@ -34388,7 +34013,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -16402,7 +16402,7 @@ +@@ -16633,7 +16633,7 @@ { 'id': 500, 'name': 'ReportSafeBrowsingData', @@ -34397,7 +34022,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -16424,7 +16424,7 @@ +@@ -16655,7 +16655,7 @@ { 'id': 608, 'name': 'CloudExtensionRequestEnabled', @@ -34406,7 +34031,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -16448,7 +16448,7 @@ +@@ -16679,7 +16679,7 @@ { 'id': 493, 'name': 'CloudReportingEnabled', @@ -34415,7 +34040,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -16471,7 +16471,7 @@ +@@ -16702,7 +16702,7 @@ }, { 'name': 'EnterpriseHardwarePlatformAPIEnabled', @@ -34424,7 +34049,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:71-', 'chrome_os:71-', 'android:71-'], -@@ -16489,7 +16489,7 @@ +@@ -16720,7 +16720,7 @@ }, { 'name': 'VpnConfigAllowed', @@ -34433,7 +34058,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -16514,7 +16514,7 @@ +@@ -16745,7 +16745,7 @@ { 'id': 489, 'name': 'NTLMShareAuthenticationEnabled', @@ -34442,7 +34067,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -16535,7 +16535,7 @@ +@@ -16766,7 +16766,7 @@ }, { 'name': 'NetworkFileSharesPreconfiguredShares', @@ -34451,7 +34076,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -16613,7 +16613,7 @@ +@@ -16844,7 +16844,7 @@ { 'id': 494, 'name': 'AlternativeBrowserPath', @@ -34460,7 +34085,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -16639,7 +16639,7 @@ +@@ -16870,7 +16870,7 @@ { 'id': 495, 'name': 'AlternativeBrowserParameters', @@ -34469,7 +34094,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16674,7 +16674,7 @@ +@@ -16905,7 +16905,7 @@ { 'id': 530, 'name': 'BrowserSwitcherChromePath', @@ -34478,7 +34103,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -16698,7 +16698,7 @@ +@@ -16929,7 +16929,7 @@ { 'id': 531, 'name': 'BrowserSwitcherChromeParameters', @@ -34487,7 +34112,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16731,7 +16731,7 @@ +@@ -16962,7 +16962,7 @@ { 'id': 496, 'name': 'BrowserSwitcherUrlList', @@ -34496,7 +34121,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16764,7 +16764,7 @@ +@@ -16995,7 +16995,7 @@ { 'id': 497, 'name': 'BrowserSwitcherUrlGreylist', @@ -34505,7 +34130,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16795,7 +16795,7 @@ +@@ -17026,7 +17026,7 @@ { 'id': 498, 'name': 'BrowserSwitcherUseIeSitelist', @@ -34514,7 +34139,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -16812,12 +16812,12 @@ +@@ -17043,12 +17043,12 @@ When this policy is set to true, $1Google Chrome reads Internet Explorer's SiteList to obtain the site list's URL. $1Google Chrome then downloads the site list from that URL, and applies the rules as if they had been configured with the BrowserSwitcherUrlList policy. @@ -34529,7 +34154,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'example_value': 'http://example.com/sitelist.xml', -@@ -16834,12 +16834,12 @@ +@@ -17065,12 +17065,12 @@ When this policy is set to a valid URL, $1Google Chrome downloads the site list from that URL, and applies the rules as if they had been configured with the BrowserSwitcherUrlList policy. @@ -34544,7 +34169,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'example_value': 'http://example.com/greylist.xml', -@@ -16858,12 +16858,12 @@ +@@ -17089,12 +17089,12 @@ When this policy is set to a valid URL, $1Google Chrome downloads the site list from that URL, and applies the rules as if they had been configured with the BrowserSwitcherUrlGreylist policy. @@ -34559,7 +34184,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'example_value': 10000, -@@ -16883,7 +16883,7 @@ +@@ -17114,7 +17114,7 @@ { 'id': 517, 'name': 'BrowserSwitcherEnabled', @@ -34568,7 +34193,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -16905,7 +16905,7 @@ +@@ -17136,7 +17136,7 @@ { 'id': 519, 'name': 'BrowserSwitcherKeepLastChromeTab', @@ -34577,7 +34202,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': False, -@@ -16924,7 +16924,7 @@ +@@ -17155,7 +17155,7 @@ }, { 'name': 'DeviceDisplayResolution', @@ -34586,7 +34211,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -16981,7 +16981,7 @@ +@@ -17212,7 +17212,7 @@ }, { 'name': 'PluginVmAllowed', @@ -34595,7 +34220,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -16999,7 +16999,7 @@ +@@ -17230,7 +17230,7 @@ }, { 'name': 'PluginVmLicenseKey', @@ -34604,7 +34229,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -17018,7 +17018,7 @@ +@@ -17249,7 +17249,7 @@ }, { 'name': 'PluginVmImage', @@ -34613,7 +34238,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -17241,7 +17241,7 @@ +@@ -17474,7 +17474,7 @@ }, { 'name': 'VoiceInteractionContextEnabled', @@ -34622,7 +34247,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -17260,7 +17260,7 @@ +@@ -17493,7 +17493,7 @@ }, { 'name': 'VoiceInteractionHotwordEnabled', @@ -34631,7 +34256,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -17281,7 +17281,7 @@ +@@ -17514,7 +17514,7 @@ }, { 'name': 'DeviceWilcoDtcAllowed', @@ -34640,7 +34265,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -17301,7 +17301,7 @@ +@@ -17534,7 +17534,7 @@ }, { 'name': 'AllowPopupsDuringPageUnload', @@ -34649,9 +34274,9 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:74-', 'chrome_os:74-', 'android:74-'], -@@ -17322,11 +17322,11 @@ +@@ -17555,11 +17555,11 @@ - This policy will be removed in Chrome 82. + This policy will be removed in Chrome 88. - See https://www.chromestatus.com/feature/5989473649164288 .''', + See https://www.ch40mestatus.qjz9zk/feature/5989473649164288 .''', @@ -34663,7 +34288,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -17359,7 +17359,7 @@ +@@ -17592,7 +17592,7 @@ }, { 'name': 'DevicePowerPeakShiftEnabled', @@ -34672,7 +34297,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -17386,7 +17386,7 @@ +@@ -17619,7 +17619,7 @@ }, { 'name': 'DevicePowerPeakShiftBatteryThreshold', @@ -34681,7 +34306,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -17411,7 +17411,7 @@ +@@ -17644,7 +17644,7 @@ }, { 'name': 'DevicePowerPeakShiftDayConfig', @@ -34690,7 +34315,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -17483,7 +17483,7 @@ +@@ -17716,7 +17716,7 @@ }, { 'name': 'DeviceBootOnAcEnabled', @@ -34699,7 +34324,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -17510,7 +17510,7 @@ +@@ -17743,7 +17743,7 @@ }, { 'name': 'DeviceUsbPowerShareEnabled', @@ -34708,7 +34333,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -17557,7 +17557,7 @@ +@@ -17790,7 +17790,7 @@ }, { 'name': 'DeviceQuickFixBuildToken', @@ -34717,7 +34342,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -17580,7 +17580,7 @@ +@@ -17813,7 +17813,7 @@ }, { 'name': 'SamlInSessionPasswordChangeEnabled', @@ -34726,7 +34351,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -17602,7 +17602,7 @@ +@@ -17835,7 +17835,7 @@ }, { 'name': 'UserFeedbackAllowed', @@ -34735,7 +34360,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -17623,7 +17623,7 @@ +@@ -17856,7 +17856,7 @@ }, { 'name': 'SamlPasswordExpirationAdvanceWarningDays', @@ -34744,7 +34369,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -17650,7 +17650,7 @@ +@@ -17883,7 +17883,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeEnabled', @@ -34753,7 +34378,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -17677,7 +17677,7 @@ +@@ -17910,7 +17910,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeDayConfig', @@ -34762,7 +34387,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -17742,7 +17742,7 @@ +@@ -17975,7 +17975,7 @@ }, { 'name': 'DeviceBatteryChargeMode', @@ -34771,7 +34396,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17799,7 +17799,7 @@ +@@ -18032,7 +18032,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStartCharging', @@ -34780,7 +34405,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -17828,7 +17828,7 @@ +@@ -18061,7 +18061,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStopCharging', @@ -34789,7 +34414,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -17857,7 +17857,7 @@ +@@ -18090,7 +18090,7 @@ }, { 'name': 'DeviceScheduledUpdateCheck', @@ -34798,7 +34423,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -18047,7 +18047,7 @@ +@@ -18280,7 +18280,7 @@ }, { 'name': 'CommandLineFlagSecurityWarningsEnabled', @@ -34807,7 +34432,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:76-'], -@@ -18067,7 +18067,7 @@ +@@ -18300,7 +18300,7 @@ }, { 'name': 'StartupBrowserWindowLaunchSuppressed', @@ -34816,7 +34441,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -18155,7 +18155,7 @@ +@@ -18388,7 +18388,7 @@ }, { 'name': 'VmManagementCliAllowed', @@ -34825,7 +34450,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -18243,7 +18243,7 @@ +@@ -18476,7 +18476,7 @@ 'id': 583, 'name': 'SendFilesForMalwareCheck', 'type': 'int-enum', @@ -34834,7 +34459,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'schema': { 'type': 'integer', 'enum': [0, 2, 3, 4], -@@ -18291,7 +18291,7 @@ +@@ -18524,7 +18524,7 @@ }, { 'name': 'UnsafeEventsReportingEnabled', @@ -34843,7 +34468,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -18313,7 +18313,7 @@ +@@ -18546,7 +18546,7 @@ }, { 'name': 'BlockLargeFileTransfer', @@ -34852,7 +34477,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18364,7 +18364,7 @@ +@@ -18597,7 +18597,7 @@ }, { 'name': 'DelayDeliveryUntilVerdict', @@ -34861,7 +34486,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18415,7 +18415,7 @@ +@@ -18648,7 +18648,7 @@ }, { 'name': 'AllowPasswordProtectedFiles', @@ -34870,7 +34495,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18466,7 +18466,7 @@ +@@ -18699,7 +18699,7 @@ + }, + { + 'name': 'BlockUnsupportedFiletypes', +- 'owners': ['rogerta@chromium.org', 'mad@chromium.org'], ++ 'owners': ['rogerta@ch40m1um.qjz9zk', 'mad@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -18750,7 +18750,7 @@ }, { 'name': 'CheckContentCompliance', @@ -34879,7 +34513,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18517,7 +18517,7 @@ +@@ -18801,7 +18801,7 @@ }, { 'name': 'URLsToCheckComplianceOfDownloadedContent', @@ -34888,7 +34522,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18537,12 +18537,12 @@ +@@ -18821,12 +18821,12 @@ If this policy is not set or set to an empty list of url patterns, no downloaded content is checked for sensitive data protection rule violations. @@ -34903,7 +34537,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18562,12 +18562,12 @@ +@@ -18846,12 +18846,12 @@ If this policy is not set or set to an empty list of url patterns, all content is checked for sensitive data protection rule violations. @@ -34918,7 +34552,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:78-'], -@@ -18581,12 +18581,12 @@ +@@ -18865,12 +18865,12 @@ 'tags': ['system-security'], 'desc': '''If this policy is enabled or left unset, then Renderer Code Integrity is enabled. This should only be disabled if compatibility issues are encountered with third party software that must run inside Chrome's renderer processes. @@ -34933,10 +34567,26 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18606,12 +18606,12 @@ +@@ -18890,13 +18890,13 @@ If this policy is not set or set to an empty list of url patterns, no uploaded content is checked for malware. +- The URL patterns have the same format as the 'URLBlacklist' policy, which is documented at https://www.chromium.org/administrators/url-blacklist-filter-format. ++ The URL patterns have the same format as the 'URLBlacklist' policy, which is documented at https://www.ch40m1um.qjz9zk/administrators/url-blacklist-filter-format. + ''' + }, + { + # TODO(rogerta): Use a custom policy handler to show in chrome://policy that this policy depends on the state of SendFilesForMalwareCheck. + 'name': 'URLsToNotCheckForMalwareOfDownloadedContent', +- 'owners': ['rogerta@chromium.org', 'drubery@chromium.org'], ++ 'owners': ['rogerta@ch40m1um.qjz9zk', 'drubery@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -18916,12 +18916,12 @@ + + If this policy is not set or set to an empty list of url patterns, all downloaded content is checked for malware. + - The URL patterns have the same format as the 'URLBlacklist' policy, which is documented at https://www.chromium.org/administrators/url-blacklist-filter-format. + The URL patterns have the same format as the 'URLBlacklist' policy, which is documented at https://www.ch40m1um.qjz9zk/administrators/url-blacklist-filter-format. ''' @@ -34948,7 +34598,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18633,7 +18633,7 @@ +@@ -18943,7 +18943,7 @@ }, { 'name': 'AllowSyncXHRInPageDismissal', @@ -34957,9 +34607,9 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:78-', 'chrome_os:78-', 'android:78-'], -@@ -18654,11 +18654,11 @@ +@@ -18964,11 +18964,11 @@ - This policy will be removed in Chrome 82. + This policy will be removed in Chrome 88. - See https://www.chromestatus.com/feature/4664843055398912 .''', + See https://www.ch40mestatus.qjz9zk/feature/4664843055398912 .''', @@ -34971,7 +34621,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -18733,7 +18733,7 @@ +@@ -19040,7 +19040,7 @@ }, { 'name': 'CorsMitigationList', @@ -34980,7 +34630,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18750,17 +18750,17 @@ +@@ -19057,19 +19057,19 @@ 'tags': [], 'desc': '''Enable CORS check mitigations in the new CORS implementation, allowing Extensions to keep compatible behavior, and allowing $1Google Chrome to send specified headers without CORS checks. @@ -34991,8 +34641,10 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this list is not set, both mitigations explained above are not applied. -- For details on CORS, visit: https://www.chromestatus.com/feature/5768642492891136.''' -+ For details on CORS, visit: https://www.ch40mestatus.qjz9zk/feature/5768642492891136.''' +- For details on CORS, visit: https://www.chromestatus.com/feature/5768642492891136. ++ For details on CORS, visit: https://www.ch40mestatus.qjz9zk/feature/5768642492891136. + + Note that this policy will be removed in $1Google Chrome version 82.''' }, { 'name': 'CorsLegacyModeEnabled', @@ -35001,16 +34653,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:79-', 'chrome_os:79-'], -@@ -18780,7 +18780,7 @@ +@@ -19089,7 +19089,7 @@ This policy will be removed after a couple of milestones. -- For details on CORS, visit: https://www.chromestatus.com/feature/5768642492891136.''' -+ For details on CORS, visit: https://www.ch40mestatus.qjz9zk/feature/5768642492891136.''' +- For details on CORS, visit: https://www.chromestatus.com/feature/5768642492891136. ++ For details on CORS, visit: https://www.ch40mestatus.qjz9zk/feature/5768642492891136. + + Note that this policy will be removed in $1Google Chrome version 82.''' }, - { - 'name': 'ExternalPrintServersWhitelist', -@@ -18809,7 +18809,7 @@ +@@ -19120,7 +19120,7 @@ }, { 'name': 'ExternalProtocolDialogShowAlwaysOpenCheckbox', @@ -35019,7 +34671,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -18831,7 +18831,7 @@ +@@ -19142,7 +19142,7 @@ }, { 'name': 'DefaultInsecureContentSetting', @@ -35028,7 +34680,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18866,7 +18866,7 @@ +@@ -19177,7 +19177,7 @@ }, { 'name': 'InsecureContentAllowedForUrls', @@ -35037,7 +34689,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18887,7 +18887,7 @@ +@@ -19198,7 +19198,7 @@ }, { 'name': 'InsecureContentBlockedForUrls', @@ -35046,7 +34698,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18908,7 +18908,7 @@ +@@ -19219,7 +19219,7 @@ }, { 'name': 'DeviceWebBasedAttestationAllowedUrls', @@ -35055,7 +34707,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'list', 'schema': { -@@ -18934,7 +18934,7 @@ +@@ -19245,7 +19245,7 @@ }, { 'name': 'DeviceShowNumericKeyboardForPassword', @@ -35064,7 +34716,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -18952,7 +18952,7 @@ +@@ -19263,7 +19263,7 @@ }, { 'name': 'PerAppTimeLimits', @@ -35073,7 +34725,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -19074,7 +19074,7 @@ +@@ -19385,7 +19385,7 @@ }, { 'name': 'WebComponentsV0Enabled', @@ -35082,7 +34734,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -19096,7 +19096,7 @@ +@@ -19407,7 +19407,7 @@ }, { 'name': 'ClickToCallEnabled', @@ -35091,7 +34743,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:79-', 'chrome_os:79-'], -@@ -19108,7 +19108,7 @@ +@@ -19419,7 +19419,7 @@ 'id': 645, 'caption': '''Enable the Click to Call Feature''', 'tags': [], @@ -35100,7 +34752,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is set to enabled, the capability of sending phone numbers to Android devices will be enabled for the Chrome user. -@@ -19185,7 +19185,7 @@ +@@ -19496,7 +19496,7 @@ }, { 'name': 'AmbientAuthenticationInPrivateModesEnabled', @@ -35109,7 +34761,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19260,7 +19260,7 @@ +@@ -19571,7 +19571,7 @@ }, { 'name': 'StricterMixedContentTreatmentEnabled', @@ -35118,7 +34770,36 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-', 'chrome_os:80-'], -@@ -19367,7 +19367,7 @@ +@@ -19591,7 +19591,7 @@ + }, + { + 'name': 'PerAppTimeLimitsWhitelist', +- 'owners': ['yilkal@chromium.org', 'cros-families-eng@google.com'], ++ 'owners': ['yilkal@ch40m1um.qjz9zk', 'cros-families-eng@9oo91e.qjz9zk'], + 'id': 658, + 'features': { + 'dynamic_refresh': True, +@@ -19634,8 +19634,8 @@ + 'url_list': [ + "chrome://*", + "file://*", +- "https://www.support.google.com", +- "https://www.policies.google.com" ++ "https://www.support.9oo91e.qjz9zk", ++ "https://www.policies.9oo91e.qjz9zk" + ], + 'app_list': [ + { +@@ -19678,7 +19678,7 @@ + }, + { + 'name': 'ScreenCaptureAllowed', +- 'owners': ['guidou@chromium.org', 'marinaciocea@chromium.org'], ++ 'owners': ['guidou@ch40m1um.qjz9zk', 'marinaciocea@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*:81-', 'chrome_os:81-'], +@@ -19803,7 +19803,7 @@ }, 'doc_banner': { 'desc': '''A banner shown at the top of the policy documentation''', @@ -35127,7 +34808,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'doc_intro': { 'desc': '''Introduction text for the generated policy documentation''', -@@ -19375,13 +19375,13 @@ +@@ -19811,13 +19811,13 @@ These policies are strictly intended to be used to configure instances of $1Google Chrome internal to your organization. Use of these policies outside of your organization (for example, in a publicly distributed program) is considered malware and will likely be labeled as malware by Google and anti-virus vendors. @@ -35143,7 +34824,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'doc_policy_in_atomic_group': { 'desc': '''Label notifying that a policy is part of an atomic policy group''', -@@ -19437,11 +19437,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -19873,11 +19873,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio }, 'doc_complex_policies_on_windows': { 'desc': '''Text pointing the user to a help article for complex policies on Windows''', @@ -35157,7 +34838,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'doc_legacy_single_line_label': { 'desc': '''A label for the legacy single-line textbox for a policy also has a more user-friendly multi-line textbox. See http://crbug/829328''', -@@ -19461,7 +19461,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -19897,7 +19897,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio }, 'doc_schema_description_link': { 'desc': '''Text pointing the user to the expanded documentation page for this policy, containing the information about schema and formatting.''', @@ -35166,7 +34847,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'deprecated_policy_group_caption': { 'desc': '''Localized name for the deprecated policies folder, for Microsoft's Group Policy Editor.''', -@@ -19473,7 +19473,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -19909,7 +19909,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio }, 'deprecated_policy_desc': { 'desc': '''Description shared by all deprecated policies, in Microsoft Windows' Group Policy Editor.''', @@ -35315,7 +34996,7 @@ diff --git a/components/previews/core/previews_experiments.cc b/components/previ diff --git a/components/previews/core/previews_features.cc b/components/previews/core/previews_features.cc --- a/components/previews/core/previews_features.cc +++ b/components/previews/core/previews_features.cc -@@ -79,7 +79,7 @@ const base::Feature kCoinFlipHoldback{"PreviewsCoinFlipHoldback_UKMOnly", +@@ -74,7 +74,7 @@ const base::Feature kCoinFlipHoldback{"PreviewsCoinFlipHoldback_UKMOnly", // Enables filtering navigation URLs by suffix to exclude navigation that look // like media resources from triggering previews. For example, @@ -35327,7 +35008,7 @@ diff --git a/components/previews/core/previews_features.cc b/components/previews diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc -@@ -1700,7 +1700,7 @@ void PrintRenderFrameHelper::OnPrintFrameContent( +@@ -1306,7 +1306,7 @@ void PrintRenderFrameHelper::PrintFrameContent( // Printing embedded pdf plugin has been broken since pdf plugin viewer was // moved out-of-process @@ -35503,7 +35184,16 @@ diff --git a/components/resources/terms/chromeos/terms_en.html b/components/reso diff --git a/components/resources/terms/terms_am.html b/components/resources/terms/terms_am.html --- a/components/resources/terms/terms_am.html +++ b/components/resources/terms/terms_am.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.google.com/terms/update) and Additional Terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.9oo91e.qjz9zk/terms/update) and Additional Terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    የGoogle Chrome የአግልግሎት ስምምነት ውሎች

    +

    እነዚህ ውሎች ለሚሰራ የGoogle Chrome ኮድ ስሪት ተግባራዊ ይሆናሉ። የGoogle Chrome ሶርስ ኮድ በክፍት ሶርስ (Open source) ሶፍተዌር የፈቃድ ስምምነት ስር በዚህ chrome://credits ይገኛሉ።

    +

    1. ከGoogle ጋር ያለዎት ግንኙነት

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 ርስዎ በተለየ ሁኔታ ከGoogle ጋር የተለየ ስምምነት በማድረግ ካልተፈቀደልዎ በስተቀር፣ ለማንኛውም አላማ ግልጋሎቶቹን እንደገና ማምረት፣ ማባዛት፣ መቅዳት፣ መሸጥ፣ ማሻገር፣ ወይም እንደገና መሸጥ እንደማይችሉ ተስማምተዋል።

    5.4 ማንኛውም በውሎች ስር ያሉትን ግዴታዎች ቢጥሱ እና ይህን ተከትሎ ሊከሰቱ ለሚችሉ ችግሮች (Googleን ሊጎዱ ለሚችሉ ማንኛውም ጥፋቶች) ሙሉ ኃላፊነት እንደሚወስዱ (Google ለርስዎ ወይም ለማንኛውም ሶስተኛ ወገን ጥፋት ማንኛውንም ኃላፊነት እንደማይወስድ) ተስማምተዋል።

    6. ግላዊነት እና የርስዎ የግል መረጃ

    @@ -35525,7 +35215,7 @@ diff --git a/components/resources/terms/terms_am.html b/components/resources/ter

    8.4 Google በእነዚህ ውሎች ስር ወይም ርስዎ አገልግሎቶቹን በመጠቀም በማንኛውም በሚያቀርቡት፣ በሚልኩት፣ በሚያስተላልፉት ወይም በሚያሳዩት እንዲሁም በዛ ይዘት የተካተቱ የአእምሮአዊ ባለቤትነት መብቶች (እነዚያ መብቶች የተመዘገቡም ሆነም አልሆነም፣ እና እነዚህ መብቶች በአለም ዙሪያ በየትኘውም ቦታ ያሉ ቢሆንም) ጨምሮ ላይ ከርስዎ (ወይም ከርስዎ ፍቃድ ከተሰጣቸው) ምንም መብት፣ ርዕስ ወይም ፍላጎት እንደማያገኝ አረጋግጦ ተስማምቷል። ከGoogle በጽሁፍ ካልተስማሙ በስተቀር እነዚያን መብቶች የመጠበቅና እነዚያን መብቶች የማስተግበር ኃላፊነት እንዳለብዎ እና Google ይህን ርሶዎን ወክሎ የማድረግ ግዴታ እንደሌለበት ተስማምተዋል።

    8.5 ማንኛውም በአገልግሎቶቹ ውሰጥ የተካተቱ ወይም ያሉ የንብረት ባለቤትነት መብቶችን (የቅጂ መብትና የንግድ ምልክት ማስታወቂያዎችን ጨምሮ) እንደማያስወግዱ፣ ግልጽ እንዳይሆን እንደማይጋርዱ ወይም እንደማይለውጡ ተስማመተዋል።

    8.6 ይህን እንዲያደርጉ ከGoogle በግልጽ በጽሁፍ ካልተፈቀደለዎ በስተቀር፣ አገልግሎቶቹን ሲጠቀሙ ምንም አይነት የንግድ ምልክት፣ የአገልግሎት ምልክት፣ የንግድ ስም፣ የማንኛውንም ኩባንያ ወይም ድርጅት አርማ በተመለከተ ለእነዚህ ምልክቶች፣ ስሞች ወይም አርማዎች ባለቤት ወይም ፍቃድ ያላቸው ተጠቃሚዎች ግራ መጋባትን ሊፈጥር ወይም እንዲፈጥር አድርገው እንዳይጠቀሙ ተስማምተዋል።

    -@@ -96,8 +96,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -98,8 +98,8 @@ h2 { font-size:1em; margin-top:0 }

    (5) የይለፍ ቃልዎን ወይም የመለያዎን ዝርዝር የተጠበቀ እና አስተማማኝ አድርጎ መያዝ አለመቻል፤

    14.2 GOOGLE አስተያየት ተሰጥቶት ወይም እንደእዚህ ላሉ ጥፋቶች ሊሆን የሚል መነሻ የሚያውቅ ቢሆንም ባይሆንም ከላይ በአንቀፅ 14.1 GOOGLE ለርስዎ ያለውን የተጠያቂነት ገደቦች የሚተገበሩ ይሆናል።

    15. የቅጂ መብት እና የንግድ ምልክት ፓሊሲዎች

    @@ -35536,7 +35226,7 @@ diff --git a/components/resources/terms/terms_am.html b/components/resources/ter

    16. ማስታወቂያዎች

    16.1 የተወሰኑ አገልግሎቶች ከማስታወቂያዎች በሚገኝ ገቢ ስለሚደገፉ ማስታወቂያዎች እና የማስታወቂያ ስራዎች ሊያሳያ ይችላሉ። እነዚህ ማስታወቂያዎች በአገልግሎቶቹ ውስጥ የተቀመጠ መረጃ ይዘት፣ በአገልግሎቶቹ በኩል የተሰሩ ጥያቄዎች ወይም ሌላ መረጃ ላይ ያተኮሩ ሊሆን ይችላሉ።

    16.2 Google ምንም ሳያሳውቅዎት በአገልግሎቶቹ ላይ የማስተዋወቂያ መንገድ፣ ሰልት ወይም ስፋት ለለወጥ የተመለከቱ ናቸው።

    -@@ -107,7 +107,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -109,7 +109,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Google ለእንደዚህ አይነት ውጫዊ ጣቢያዎች ወይም ንብረቶች መገኘት ኃላፊነት እንደሌለበት እና በነዚህ የድር ጣቢያዎች ወይም ንብረቶች ላይ ለሚገኙ ማንኛውም ማስታወቂያዎች፣ ምርቶች ወይም ሌላ ነገሮችን እንደማይደግፍ አረጋግጠው ተስማምተዋል።

    17.3 ርስዎ አምጠውት ሊሆን በሚችለው በእነዚህ ውጫዊ ጣቢያዎች ወይም ንብረቶች መገኘት ምክንያት፣ ወይም ርስዎ በሙሉዕነታቸው፣ በትክክለኛነታቸው፣ እዛ ለመኖራቸው እምነት በጣሉበቸው በነዚህ የድር ጣቢያዎች ወይም ንብረቶች ላይ ለሚገኙ ማንኛውም ማስታወቂያዎች፣ ምርቶች ወይም ሌላ ነገሮች ምክንያት ለሚከሰቱ ማንኛውም ጥፋቶች ወይም ጉዳቶች Google ተጠያቂ እንደማይሆን አረጋግጠው ተስማምተዋል።

    18. የስምምነት ውሎች ላይ የሚደረጉ ለውጦች

    @@ -35548,7 +35238,16 @@ diff --git a/components/resources/terms/terms_am.html b/components/resources/ter diff --git a/components/resources/terms/terms_ar.html b/components/resources/terms/terms_ar.html --- a/components/resources/terms/terms_ar.html +++ b/components/resources/terms/terms_ar.html -@@ -46,12 +46,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    نحن بصدد إجراء تعديلات على بنود الخدمة الخاصة بمتصفح Google Chrome في 31 آذار (مارس) 2020. ستتضمَّن البنود الجديدة بنود خدمة Google وبنود الخدمة الإضافية لكل من متصفح Google Chrome و"نظام التشغيل Chrome". وحتى ذلك الحين، ستظل البنود الموضّحة أدناه سارية. وللحصول على مزيد من التفاصيل، يمكنك الاطّلاع على ملخص لأهم التغييرات التي تم إجراؤها (https://policies.google.com/terms/changes).

    في حال عدم موافقتك على بنود الخدمة الجديدة، يمكنك التعرُّف على الإجراءات التي يمكنك اتخاذها في هذا الصدد بالاطّلاع على الأسئلة الشائعة (https://policies.google.com/terms/chromechanges#faq).

    ++

    نحن بصدد إجراء تعديلات على بنود الخدمة الخاصة بمتصفح Google Chrome في 31 آذار (مارس) 2020. ستتضمَّن البنود الجديدة بنود خدمة Google وبنود الخدمة الإضافية لكل من متصفح Google Chrome و"نظام التشغيل Chrome". وحتى ذلك الحين، ستظل البنود الموضّحة أدناه سارية. وللحصول على مزيد من التفاصيل، يمكنك الاطّلاع على ملخص لأهم التغييرات التي تم إجراؤها (https://policies.9oo91e.qjz9zk/terms/changes).

    في حال عدم موافقتك على بنود الخدمة الجديدة، يمكنك التعرُّف على الإجراءات التي يمكنك اتخاذها في هذا الصدد بالاطّلاع على الأسئلة الشائعة (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    بنود خدمة Google Chrome

    +

    تنطبق بنود الخدمة هذه على إصدار شفرة Google Chrome القابلة للتنفيذ. وتتوفر الشفرة المصدر للمتصفح Google Chrome مجانًا بموجب اتفاقيات ترخيص البرامج مفتوحة المصدر في chrome://credits.

    +

    1. علاقتك مع Google

    +@@ -48,12 +48,12 @@ h2 { font-size:1em; margin-top:0 }

    5-3 إنك توافق على ألا تُعيد إنتاج الخدمات أو تنسخها أو تبيعها أو تتاجر فيها أو تعيد بيعها لأي غرض، ما لم يُسمح لك تحديدًا بعمل ذلك بموجب اتفاقية مستقلة مع Google.

    5-4 إنك توافق على أنك المسؤول الوحيد (وأن Google لا تتحمل أية مسؤولية تجاهك أو تجاه أي طرف ثالث) عن أي خرق لالتزاماتك - بموجب البنود - وعن العواقب الناجمة عن هذا الخرق (بما في ذلك أية خسائر أو أضرار قد تتعرض لها Google).

    6. الخصوصية ومعلوماتك الشخصية

    @@ -35563,7 +35262,7 @@ diff --git a/components/resources/terms/terms_ar.html b/components/resources/ter

    7-4 إنك تدرك أنه باستخدامك للخدمات قد تتعرض لمحتويات ربما تجدها عدائية أو غير لائقة أو مرفوضة، وأنه في هذه الحالة فإن استخدامك للخدمات يكون على مسؤوليتك الشخصية.

    7-5 إنك توافق على أنك المسؤول الوحيد (وأن Google لا تتحمل أية مسؤولية تجاهك أو تجاه أي طرف ثالث) عن أية محتويات تنشئها أنت أو ترسلها أو تعرضها أثناء استخدام الخدمات، وعن العواقب الناجمة عن أفعالك (بما في ذلك أية خسائر أو أضرار قد تتعرض لها Google) عند قيامك بذلك.

    8. حقوق الملكية

    -@@ -112,7 +112,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -114,7 +114,7 @@ h2 { font-size:1em; margin-top:0 }

    17-2 إنك تقر وتوافق على أن Google غير مسؤولة عن مدى توفر أيٍّ من هذه المواقع أو المصادر الخارجية، وأنها لا تصادق على أية إعلانات أو منتجات أو مواد أخرى على هذه المواقع أو المصادر أو متاحة من خلالها.

    17-3 إنك تقر وتوافق على أن Google غير مسؤولة عن أية خسائر أو أضرار تجلبها أنت نتيجة توفر تلك المواقع أو المصادر الخارجية، أو نتيجة أي اعتماد من جانبك على اكتمال أو دقة أو وجود أية إعلانات أو منتجات أو مواد أخرى على هذه المواقع أو المصادر أو متاحة من خلالها.

    18. تعديل البنود

    @@ -35575,7 +35274,16 @@ diff --git a/components/resources/terms/terms_ar.html b/components/resources/ter diff --git a/components/resources/terms/terms_bg.html b/components/resources/terms/terms_bg.html --- a/components/resources/terms/terms_bg.html +++ b/components/resources/terms/terms_bg.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    На 31 март 2020 г. ще актуализираме Общите условия за Chrome. Това включва Общите условия на Google и Допълнителните общи условия на Google Chrome и Chrome OS. Дотогава условията по-долу продължават да се прилагат. За повече подробности прегледайте обобщената информация за основните промени (https://policies.google.com/terms/chromechanges).

    Ако не приемате новите ни Общи условия, можете да намерите повече информация за опциите, с които разполагате, в секцията ни Често задавани въпроси (https://policies.google.com/terms/chromechanges#faq).

    ++

    На 31 март 2020 г. ще актуализираме Общите условия за Chrome. Това включва Общите условия на Google и Допълнителните общи условия на Google Chrome и Chrome OS. Дотогава условията по-долу продължават да се прилагат. За повече подробности прегледайте обобщената информация за основните промени (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    Ако не приемате новите ни Общи условия, можете да намерите повече информация за опциите, с които разполагате, в секцията ни Често задавани въпроси (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Общи условия на Google Chrome

    +

    Тези Общи условия се прилагат към версията с изпълним код на Google Chrome. Изходният код на Google Chrome се предоставя безплатно съгласно лицензионните споразумения за софтуер с отворен код на адрес chrome://credits.

    +

    1. Вашите отношения с Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Освен ако това не ви е позволено изрично в отделно споразумение с Google, приемате да не възпроизвеждате, дублирате, копирате, продавате, търгувате или препродавате услугите с каквато и да било цел.

    5.4 Приемате, че вие носите цялата отговорност (и че Google не носи никаква отговорност пред вас или пред трети лица) за всяко нарушение на задълженията ви по силата на Условията и за последиците (включително всички загуби или вреди, понесени от нас) от всяко такова нарушение.

    6. Поверителност и личната ви информация

    @@ -35590,7 +35298,7 @@ diff --git a/components/resources/terms/terms_bg.html b/components/resources/ter

    7.4 Разбирате, че с използването на Услугите можете да видите Съдържание, което да намерите за обидно, неприлично или към което да имате възражения, и че в това отношение ги използвате на свой риск.

    7.5 Приемате, че вие носите цялата отговорност (и че не носим никаква отговорност пред вас или пред трети лица) за всяко създавано, предавано или показвано от вас Съдържание при използването на Услугите и за последиците от действията ви (включително всички загуби или вреди, понесени от Google) при това.

    8. Права на собственост

    -@@ -96,7 +96,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -98,7 +98,7 @@ h2 { font-size:1em; margin-top:0 }

    14.2 ОГРАНИЧЕНИЯТА НА ОТГОВОРНОСТТА НИ ПРЕД ВАС В ТОЧКА 14.1 ПО-ГОРЕ СА В СИЛА НЕЗАВИСИМО ДАЛИ GOOGLE Е БИЛА ПРЕДУПРЕДЕНА ИЛИ Е ТРЯБВАЛО ДА БЪДЕ ОСВЕДОМЕНА ЗА ВЕРОЯТНОСТТА ОТ ВЪЗНИКВАНЕ НА ПОДОБНИ ЗАГУБИ.

    15. Правила за авторските права и търговските марки

    15.1 Правилото на Google е да отговаря на съобщения за съмнения за нарушаване на авторски права, които спазват приложимото международно законодателство за интелектуалната собственост (включително, в Съединените щати – Закона за авторското право в цифровото хилядолетие), и да прекратява профилите на многократните нарушители. Подробности за правилата на Google можете да намерите на адрес http://www.google.bg/dmca.html.

    @@ -35599,7 +35307,7 @@ diff --git a/components/resources/terms/terms_bg.html b/components/resources/ter

    16. Реклами

    16.1 Някои от Услугите се издържат от рекламни приходи и може да показват реклами и промоции. Тези реклами може да се насочват според съдържанието на информацията, съхранена в Услугите, заявките, направени чрез тях, или според друга информация.

    16.2 Google може да променя начина, режима и степента на рекламирането в Услугите, без да ви известява за това специално.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Потвърждавате и приемате, че не носим отговорност за наличието на такива външни сайтове или ресурси и не одобряваме реклами, продукти или други материали, намиращи се на такива уебсайтове или ресурси, или предлагани чрез тях.

    17.3 Потвърждавате и приемате, че Google не носи отговорност за никакви загуби или вреди, евентуално понесени от вас в резултат на наличието на тези външни сайтове или ресурси или в резултат на разчитането от ваша страна на пълнотата, точността или съществуването на реклама, продукти или други материали в такива уебсайтове или ресурси или предлагани чрез тях.

    18. Промени в Условията

    @@ -35611,7 +35319,16 @@ diff --git a/components/resources/terms/terms_bg.html b/components/resources/ter diff --git a/components/resources/terms/terms_bn.html b/components/resources/terms/terms_bn.html --- a/components/resources/terms/terms_bn.html +++ b/components/resources/terms/terms_bn.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.google.com/terms/update) and Additional Terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.9oo91e.qjz9zk/terms/update) and Additional Terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome পরিষেবার চুক্তি

    +

    পরিষেবার এই চুক্তিগুলি Google Chrome –এর প্রয়োগযোগ্য কোড সংস্করণে প্রয়োজ্য হয়৷ Google Chrome এর উত্স কোড chrome://credits-এ মুক্ত উত্স সফটওয়্যার লাইসেন্সের অধীনে বিনামূল্যে উপলব্ধ৷

    +

    1. Google-এর সাথে আপনার সম্পর্ক

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 যদি না আপনাকে Google-এর সাথে পৃথক চুক্তিতে নির্দিষ্ট করে এটি করতে অনুমতি দেওয়া হয়, আপনি সম্মত হন যে আপনি এই পরিষেবাগুলি কোন উদ্দেশ্যেই পুনরুত্পাদন, নকল, অনুলিপি, বিক্রয়, ব্যবসায় বা পুনর্বিক্রয় করবেন না৷

    5.4 আপনি সম্মত হন যে এই শর্তাদির অধীনে আপনার দায়িত্বের কোনও রূপ ভঙ্গের জন্য এবং এমন কোনও ভঙ্গের ফলে কোনওরূপ ক্ষতির জন্য (কোনও ক্ষতি বা খেসারত যা Google ভোগ করতে পারে) আপনি একাই (এবং Google-এর আপনার বা কোনও তৃতীয় পক্ষের জন্য কোনও রকম দায়িত্ব নেই) দায়ী৷

    6. গোপনীয়তা এবং আপনার ব্যক্তিগত তথ্য

    @@ -35633,7 +35350,7 @@ diff --git a/components/resources/terms/terms_bn.html b/components/resources/ter

    8.4 Google স্বীকার করে এবং সম্মত হয় এই শর্তাদির অধীনে (আপনার বা আপনার লাইসেন্সরগণের থেকে) আপনার কাছ থেকে এতে কোন অধিকার, শিরোনাম বা স্বার্থ বা এমন কোন লিখিত সামগ্রীতে যা আপনি জমা করেন, পোস্ট করেন, সংবাহিত বা এতে বা এর মাধ্যমে পরিষেবাগুলি প্রদর্শন করেন, তত্সহ কোন মেধা সম্পত্তি অধিকার যা সেই লিখিত সামগ্রীতে উপস্থিত থাকে (সেই অধিকারগুলি নিবন্ধীকৃত থাকুক বা না থাকুক এবং বিশ্বের যেখানেই এই অধিকারগুলি বর্তমান থাকতে পারে) তা সমন্বিত নেই৷ যদি না আপনার সাথে Google-এর লিখিত সম্মতি হয়ে থাকে, আপনি সম্মত হন যে সেই সমস্ত অধিকার সুরক্ষিত এবং প্রয়োগ করতে দায়বদ্ধ এবং আপনার হয়ে Google-এর এগুলি করার কোন দায়বদ্ধতা নেই৷

    8.5 আপনি সম্মত হন যে আপনি স্বত্বাধিকারীর অধিকারসমূহের বিজ্ঞপ্তির একটিও সরাবেন না, অস্পষ্ট বা পরিবর্তন করবেন না (কপিরাইট এবং ট্রেডমার্ক বিজ্ঞপ্তিসমূহসহ) যা পরিষেবাগুলির মধ্যে সংযুক্ত করে দেওয়া যেতে পারে বা এতেই সমন্বিত থাকে৷

    8.6 যদি না আপনি Google দ্বারা লিখিত আকারে এটি করার জন্য অনুমতিপ্রাপ্ত হন, আপনি সম্মত হন যে এই পরিষেবাগুলি ব্যবহার করতে গিয়ে আপনি কোন কোম্পানি বা সংস্থার ট্রেড মার্ক, পরিষেবা চিহ্ন, ট্রেড নাম, লোগো এমন কোন ভাবে ব্যবহার করবেন না যাতে এই সমস্ত চিহ্নগুলি, নামগুলি বা লোগোগুলির মালিক বা অনুমোদিত ব্যবহারকারীদের সম্বন্ধে সংশয় সৃষ্টি করে৷

    -@@ -96,8 +96,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -98,8 +98,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) আপনার পাসওয়ার্ড বা অ্যাকাউন্টের বিশদ বিবরণ নিরাপদ এবং গোপনভাবে রাখার ব্যর্থতা;

    14.2 Google-কে এমন উত্পন্ন ক্ষতির সম্ভাব্যতা সম্পর্কে পরামর্শ দেওয়া হয়েছে বা হয়নি বা ঔচিত্য সত্ত্বেও উপরের 14.1 অনুচ্ছেদে আপনার প্রতি Google-এর দায়ের সীমাবদ্ধতা প্রযোজ্য হবে৷

    15. কপিরাইট এবং ট্রেডমার্ক নীতিসমূহ

    @@ -35644,7 +35361,7 @@ diff --git a/components/resources/terms/terms_bn.html b/components/resources/ter

    16. বিজ্ঞাপনগুলি

    16.1 কয়েকটি পরিষেবা বিজ্ঞাপনের আয় দ্বারা সমর্থিত এবং বিজ্ঞাপন এবং প্রচার প্রদর্শন করতে পারে৷ এই বিজ্ঞাপনগুলি পরিষেবাগুলিতে সঞ্চিত থাকা, পরিষেবাগুলির মাধ্যমে করা ক্যোয়ারী বা অন্যান্য তথ্য লক্ষ্য করে করা হতে পারে৷

    16.2 পরিষেবাগুলিতে Google দ্বারা যে উপায়ে, মাধ্যমে এবং প্রসার পর্যন্ত বিজ্ঞাপন দেওয়া হয় তা আপনাকে নির্দিষ্ট বিজ্ঞপ্তি ব্যতীত পরিবর্তনসাপেক্ষ৷

    -@@ -107,7 +107,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -109,7 +109,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 আপনি স্বীকার করেন এবং সম্মত হন যে এমন কোন বাহ্যিক সাইটসমূহ বা রিসোর্সের উপলভ্যতার জন্য দায়বদ্ধ নয়, এবং এমন ওয়েব সাইটগুলি বা রিসোর্সের মাধ্যমে লভ্য কোন বিজ্ঞাপন, পণ্যসমূহ বা অন্য উপাদান প্রচার করে না৷

    17.3 আপনি স্বীকার করেন এবং সম্মত হন যে কোন তৃতীয় পক্ষ দ্বারা বিকাশ করা কোন প্রয়োগের ব্যবহারের ফলে বা ব্যবহার করার অক্ষমতার ফলে, বা এমন প্রয়োগগুলির মাধ্যমে উপলভ্য কোন পণ্যসমূহের বা অন্য উপাদানগুলির উপস্থিতির ফলে বা আপনার সম্পূর্ণতা, নির্ভুলতা সম্পর্কিত কোন বিশ্বাসের ফলে আপনার হতে পারে এমন কোন লোকসান বা ক্ষতির জন্য Google দায়বদ্ধ নয়৷

    18. শর্তাদিতে পরিবর্তন

    @@ -35656,7 +35373,16 @@ diff --git a/components/resources/terms/terms_bn.html b/components/resources/ter diff --git a/components/resources/terms/terms_ca.html b/components/resources/terms/terms_ca.html --- a/components/resources/terms/terms_ca.html +++ b/components/resources/terms/terms_ca.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    El 31 de març de 2020 actualitzarem les condicions del servei de Chrome. Les noves condicions inclouran les Condicions del Servei de Google i les Condicions del Servei Addicionals de Google Chrome i Chrome OS. Fins a aquesta data, continuen en vigor les condicions que trobareu més avall. Per obtenir més informació, vegeu un resum dels canvis més importants (https://policies.google.com/terms/chromechanges).

    • Consulteu una previsualització de les noves Condicions (https://policies.google.com/terms/update) i les Condicions Addicionals (https://www.google.com/chrome/terms).

    Si no esteu d'acord amb les noves Condicions, podeu trobar més informació sobre les opcions que teniu a les nostres preguntes freqüents (https://policies.google.com/terms/chromechanges#faq).

    ++

    El 31 de març de 2020 actualitzarem les condicions del servei de Chrome. Les noves condicions inclouran les Condicions del Servei de Google i les Condicions del Servei Addicionals de Google Chrome i Chrome OS. Fins a aquesta data, continuen en vigor les condicions que trobareu més avall. Per obtenir més informació, vegeu un resum dels canvis més importants (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    • Consulteu una previsualització de les noves Condicions (https://policies.9oo91e.qjz9zk/terms/update) i les Condicions Addicionals (https://www.9oo91e.qjz9zk/chrome/terms).

    Si no esteu d'acord amb les noves Condicions, podeu trobar més informació sobre les opcions que teniu a les nostres preguntes freqüents (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Condicions d'ús de Google Chrome

    +

    Aquestes Condicions d'ús s'apliquen a la versió de codi executable de Google Chrome. El codi font de Google Chrome està disponible de manera gratuïta a l'empara dels acords de llicència de programari de codi obert a la pàgina chrome://credits.

    +

    1. La seva relació amb Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Tret que se li hagi permès fer-ho explícitament en un acord diferent amb Google, vostè es compromet a no reproduir, duplicar, copiar, vendre, negociar ni revendre els Serveis per a cap finalitat.

    5.4 Vostè accepta que és l'únic responsable (i que Google no té cap responsabilitat envers vostè ni envers tercers) de qualsevol incompliment de les obligacions que estableixen les Condicions i de les conseqüències (incloses les pèrdues o els danys que Google pugui patir) que es derivin de l'incompliment.

    6. Privadesa i informació personal

    @@ -35671,7 +35397,7 @@ diff --git a/components/resources/terms/terms_ca.html b/components/resources/ter

    7.4 Vostè comprèn que la utilització dels Serveis pot exposar-lo a Contingut que consideri ofensiu, indecent o censurable i que, en aquest sentit, utilitza els Serveis sota la seva responsabilitat.

    7.5 Vostè accepta que és l'únic responsable (i que Google no té cap responsabilitat envers vostè ni envers tercers) de tot el Contingut que creï, transmeti o visualitzi mentre utilitza els Serveis així com de les conseqüències de les seves accions (incloses les pèrdues o els danys que Google pugui patir).

    8. Drets de propietat

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Vostè reconeix i accepta que Google no és responsable de la disponibilitat d'aquests llocs web o recursos externs, i que Google no promociona cap anunci, producte o altre material que aparegui en aquests llocs web o recursos o des dels quals s'hi pugui accedir.

    17.3 Vostè reconeix i accepta que Google no és responsable de cap pèrdua o dany que vostè pugui patir com a conseqüència de la disponibilitat d'aquests llocs o recursos externs o com a resultat de la confiança que vostè hagi dipositat en la totalitat, precisió o existència de qualsevol anunci, producte o altre material que figuri en aquests llocs web o recursos o des dels quals s'hi pugui accedir.

    18. Canvis en les Condicions

    @@ -35683,7 +35409,16 @@ diff --git a/components/resources/terms/terms_ca.html b/components/resources/ter diff --git a/components/resources/terms/terms_cs.html b/components/resources/terms/terms_cs.html --- a/components/resources/terms/terms_cs.html +++ b/components/resources/terms/terms_cs.html -@@ -40,13 +40,13 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    31. března 2020 dojde k aktualizaci smluvních podmínek prohlížeče Chrome. Nové podmínky budou zahrnovat smluvní podmínky společnosti Google a dodatečné smluvní podmínky prohlížeče Google Chrome a systému Chrome OS. Do té doby budou platit níže uvedené podmínky. Další podrobnosti naleznete v souhrnu hlavních změn (https://policies.google.com/terms/chromechanges).

    Pokud s našimi novými smluvními podmínkami nesouhlasíte, další informace o svých možnostech naleznete v odpovědích na časté dotazy (https://policies.google.com/terms/chromechanges#faq).

    ++

    31. března 2020 dojde k aktualizaci smluvních podmínek prohlížeče Chrome. Nové podmínky budou zahrnovat smluvní podmínky společnosti Google a dodatečné smluvní podmínky prohlížeče Google Chrome a systému Chrome OS. Do té doby budou platit níže uvedené podmínky. Další podrobnosti naleznete v souhrnu hlavních změn (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    Pokud s našimi novými smluvními podmínkami nesouhlasíte, další informace o svých možnostech naleznete v odpovědích na časté dotazy (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Smluvní podmínky aplikace Google Chrome

    +

    Tyto Smluvní podmínky platí pro spustitelný kód aplikace Google Chrome. Zdrojový kód aplikace Google Chrome je k dispozici bezplatně na základě licenční smlouvy na software s otevřeným zdrojovým kódem na adrese chrome://credits.

    +

    1. Vztah mezi vámi a společností Google

    +@@ -42,13 +42,13 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Souhlasíte s tím, že Služby z žádného důvodu nebudete reprodukovat, duplikovat, kopírovat ani prodávat, nebudete-li k tomu výslovně oprávněni na základě zvláštní smlouvy se společností Google.

    5.4 Souhlasíte s tím, že jste plně odpovědní (a že společnost Google nemá žádnou odpovědnost vůči vám ani žádné třetí straně) za jakékoli porušení vašich povinností vyplývajících ze Smluvních podmínek a za následky takového porušení (včetně jakékoli ztráty nebo škody, kterou společnost Google může utrpět).

    6. Ochrana soukromí a osobní údaje

    @@ -35700,7 +35435,7 @@ diff --git a/components/resources/terms/terms_cs.html b/components/resources/ter

    7.4 Berete na vědomí, že při používání Služeb můžete být vystaveni Obsahu, který pro vás může být urážlivý, nemravný nebo nežádoucí, a že v tomto ohledu Služby používáte na vlastní nebezpečí.

    7.5 Souhlasíte s tím, že jste plně odpovědní (a že společnost Google nemá žádnou odpovědnost vůči vám ani žádné třetí straně) za jakýkoli Obsah, který vytvoříte, přenesete nebo zobrazíte při používání Služeb a za následky této své činnosti (včetně jakékoli ztráty nebo škody, kterou tím může utrpět společnost Google).

    8. Vlastnická práva

    -@@ -107,7 +107,7 @@ http://www.google.com/chrome/intl/cs/privacy.html. Tyto zásady vysvětlují, ja +@@ -109,7 +109,7 @@ http://www.google.com/chrome/intl/cs/privacy.html. Tyto zásady vysvětlují, ja

    17.2 Berete na vědomí a souhlasíte s tím, že společnost Google neodpovídá za dostupnost jakýchkoli těchto externích stránek a zdrojů, a že neschvaluje ani neodpovídá za žádnou reklamu, produkty či jiný materiál dostupný prostřednictvím těchto webových stránek a zdrojů.

    17.3 Berete na vědomí a souhlasíte s tím, že společnost Google neodpovídá za žádné ztráty nebo škody, které můžete případně utrpět v důsledku dostupnosti těchto externích stránek nebo zdrojů, nebo v důsledku toho, že jste se spoléhali na úplnost, přesnost nebo existenci jakékoli reklamy, produktů nebo jiných materiálů umístěných na těchto webových stránkách nebo zdrojích nebo dostupných jejich prostřednictvím.

    18. Změny Smluvních podmínek

    @@ -35712,7 +35447,16 @@ diff --git a/components/resources/terms/terms_cs.html b/components/resources/ter diff --git a/components/resources/terms/terms_da.html b/components/resources/terms/terms_da.html --- a/components/resources/terms/terms_da.html +++ b/components/resources/terms/terms_da.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Vi opdaterer servicevilkårene for Chrome den 31. marts 2020. De nye vilkår kommer til at omfatte Google Servicevilkår og de yderligere servicevilkår for Google Chrome og Chrome OS. Indtil da gælder vilkårene nedenfor fortsat. Få flere oplysninger i oversigten over de vigtigste ændringer (https://policies.google.com/terms/chromechanges).

    • Se en forhåndsvisning af de nye vilkår (https://policies.google.com/terms/update) og yderligere vilkår (https://www.google.com/chrome/terms).

    Hvis du ikke accepterer vores nye vilkår, kan du få flere oplysninger om dine valgmuligheder under Ofte stillede spørgsmål (https://policies.google.com/terms/chromechanges#faq).

    ++

    Vi opdaterer servicevilkårene for Chrome den 31. marts 2020. De nye vilkår kommer til at omfatte Google Servicevilkår og de yderligere servicevilkår for Google Chrome og Chrome OS. Indtil da gælder vilkårene nedenfor fortsat. Få flere oplysninger i oversigten over de vigtigste ændringer (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    • Se en forhåndsvisning af de nye vilkår (https://policies.9oo91e.qjz9zk/terms/update) og yderligere vilkår (https://www.9oo91e.qjz9zk/chrome/terms).

    Hvis du ikke accepterer vores nye vilkår, kan du få flere oplysninger om dine valgmuligheder under Ofte stillede spørgsmål (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome Servicevilkår

    +

    Disse Servicevilkår gælder for den version af Google Chrome, der indeholder eksekverbar kode. Kildekode til Google Chrome kan hentes gratis under open source-licensaftaler på chrome://credits.

    +

    1. Dit forhold til Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Medmindre du specifikt har fået tilladelse til det i en separat aftale med Google, indvilliger du i ikke at reproducere, duplikere, kopiere, sælge, forhandle eller videresælge Tjenesterne uanset formål.

    5.4 Du accepterer, at du er eneansvarlig (og at Google intet ansvar har over for dig eller tredjepart) for ethvert brud på dine forpligtelser i henhold til Vilkårene og for konsekvenserne af et sådant brud (herunder ethvert tab eller enhver skade, Google måtte pådrage sig).

    6. Dine personlige oplysninger og beskyttelsen af disse

    @@ -35727,7 +35471,7 @@ diff --git a/components/resources/terms/terms_da.html b/components/resources/ter

    7.4 Du forstår, at ved at bruge Tjenesterne kan du blive udsat for Indhold, du muligvis finder anstødeligt, uanstændigt eller krænkende, og at du i den forbindelse bruger Tjenesterne på eget ansvar.

    7.5 Du accepterer, at du er eneansvarlig (og at Google intet ansvar har over for dig eller tredjepart) for ethvert Indhold, du opretter, overfører eller viser, mens du bruger Tjenesterne, og for konsekvenserne af en sådan handling (herunder ethvert tab eller enhver skade, Google måtte pådrage sig).

    8. Ejendomsret

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Du anerkender og accepterer, at Google ikke er ansvarlig for tilgængeligheden af sådanne eksterne websteder eller ressourcer, og at Google ikke står bag annoncering, produkter eller andre materialer, der er tilgængelige fra sådanne websteder eller ressourcer.

    17.3 Du anerkender og accepterer, at Google ikke er ansvarlig for tab eller skade, du måtte pådrage dig som følge af tilgængeligheden af disse eksterne websteder eller ressourcer, eller som følge af din tillid til udførligheden, nøjagtigheden eller eksistensen af annoncering, produkter eller andre materialer, der findes på eller er tilgængelige fra sådanne websteder eller ressourcer.

    18. Ændringer i Vilkårene

    @@ -35739,7 +35483,16 @@ diff --git a/components/resources/terms/terms_da.html b/components/resources/ter diff --git a/components/resources/terms/terms_de.html b/components/resources/terms/terms_de.html --- a/components/resources/terms/terms_de.html +++ b/components/resources/terms/terms_de.html -@@ -24,7 +24,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Am 31. März 2020 aktualisieren wir die Nutzungsbedingungen für Chrome. Die neuen Bestimmungen umfassen sowohl die Nutzungsbedingungen von Google als auch die zusätzlichen Bedingungen für Google Chrome und Chrome OS. Bis dahin gelten weiterhin die unten genannten Nutzungsbedingungen. Weitere Einzelheiten können Sie in unserer Zusammenfassung der wichtigsten Änderungen (https://policies.google.com/terms/chromechanges) nachlesen.

    Falls Sie mit unseren neuen Nutzungsbedingungen nicht einverstanden sind, finden Sie in unserer Rubrik Häufig gestellte Fragen (https://policies.google.com/terms/chromechanges#faq) Informationen zu Ihren Alternativen.

    ++

    Am 31. März 2020 aktualisieren wir die Nutzungsbedingungen für Chrome. Die neuen Bestimmungen umfassen sowohl die Nutzungsbedingungen von Google als auch die zusätzlichen Bedingungen für Google Chrome und Chrome OS. Bis dahin gelten weiterhin die unten genannten Nutzungsbedingungen. Weitere Einzelheiten können Sie in unserer Zusammenfassung der wichtigsten Änderungen (https://policies.9oo91e.qjz9zk/terms/chromechanges) nachlesen.

    Falls Sie mit unseren neuen Nutzungsbedingungen nicht einverstanden sind, finden Sie in unserer Rubrik Häufig gestellte Fragen (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq) Informationen zu Ihren Alternativen.

    +

    Google Chrome Nutzungsbedingungen

    +

    + Diese Nutzungsbedingungen beziehen sich ausschließlich auf die herunterladbare Software-Version des Browsers Google Chrome. +@@ -26,7 +26,7 @@ h2 { font-size:1em; margin-top:0 }

    Google Chrome wurde unter Einsatz von Open Source-Software entwickelt. Wenn Sie Software-Entwickler sind und Google Chrome weiterentwickeln möchten, müssen Sie hinsichtlich der Open Source-Komponenten von Google Chrome diejenigen Nutzungsbeschränkungen beachten, die sich aus den speziellen Open Source-Softwarelizenzbedingungen ergeben. Hinsichtlich der Open Source-Komponenten gehen die speziellen Open Source–Softwarelizenzbedingungen diesen Nutzungsbedingungen vor. Die speziellen Open Source–Softwarelizenzbedingungen sind unter chrome://credits abrufbar.

    Die Mehrzahl der Dienste wird Ihnen kostenlos zur Verfügung gestellt. Sollte Google Entgelte für bestimmte Dienste verlangen, müssen Sie möglicherweise zusätzlichen Nutzungsbedingungen oder anderen Regelungen zustimmen, in denen Ihnen insbesondere Informationen über das Entgelt, Rückerstattungen, Laufzeit der Dienste, Änderungen der Dienste und andere, für diese Dienste spezifische Informationen mitgeteilt werden.

    2. Ihr Google Konto @@ -35751,7 +35504,16 @@ diff --git a/components/resources/terms/terms_de.html b/components/resources/ter diff --git a/components/resources/terms/terms_el.html b/components/resources/terms/terms_el.html --- a/components/resources/terms/terms_el.html +++ b/components/resources/terms/terms_el.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Στις 31 Μαρτίου 2020 θα ενημερώσουμε τους Όρους Παροχής Υπηρεσιών για το Chrome. Οι νέοι όροι θα περιλαμβάνουν τους Όρους Παροχής Υπηρεσιών της Google και τους Πρόσθετους Όρους Παροχής Υπηρεσιών του Google Chrome και του Chrome OS. Έως τότε, οι παρακάτω όροι θα εξακολουθήσουν να ισχύουν. Δείτε μια σύνοψη σημαντικών αλλαγών (https://policies.google.com/terms/chromechanges) για περισσότερες λεπτομέρειες.

    • Δείτε μια προεπισκόπηση των νέων Όρων (https://policies.google.com/terms/update) και των Πρόσθετων όρων (https://www.google.com/chrome/terms).

    Εάν δεν συμφωνείτε με τους νέους Όρους, μπορείτε να βρείτε περισσότερες πληροφορίες στις Συνήθεις ερωτήσεις (https://policies.google.com/terms/chromechanges#faq).

    ++

    Στις 31 Μαρτίου 2020 θα ενημερώσουμε τους Όρους Παροχής Υπηρεσιών για το Chrome. Οι νέοι όροι θα περιλαμβάνουν τους Όρους Παροχής Υπηρεσιών της Google και τους Πρόσθετους Όρους Παροχής Υπηρεσιών του Google Chrome και του Chrome OS. Έως τότε, οι παρακάτω όροι θα εξακολουθήσουν να ισχύουν. Δείτε μια σύνοψη σημαντικών αλλαγών (https://policies.9oo91e.qjz9zk/terms/chromechanges) για περισσότερες λεπτομέρειες.

    • Δείτε μια προεπισκόπηση των νέων Όρων (https://policies.9oo91e.qjz9zk/terms/update) και των Πρόσθετων όρων (https://www.9oo91e.qjz9zk/chrome/terms).

    Εάν δεν συμφωνείτε με τους νέους Όρους, μπορείτε να βρείτε περισσότερες πληροφορίες στις Συνήθεις ερωτήσεις (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Όροι Παροχής Υπηρεσιών του Google Chrome

    +

    Οι παρόντες Όροι Παροχής Υπηρεσιών ισχύουν για την έκδοση εκτελέσιμου κώδικα του Google Chrome. Ο πηγαίος κώδικας του Google Chrome διατίθεται δωρεάν μέσω των συμφωνητικών άδειας χρήσης λογισμικού ανοικτού κώδικα στη διεύθυνση chrome://credits.

    +

    1. Η σχέση σας με την Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Συμφωνείτε να μην προβαίνετε σε αναπαραγωγή, δημιουργία αντιτύπων, αντιγραφή, πώληση, εμπόριο ή μεταπώληση των Υπηρεσιών για κανένα σκοπό, εκτός εάν διαθέτετε ειδική άδεια για τέτοιου είδους πρακτικές βάσει ειδικού συμφωνητικού με την Google.

    5.4 Συμφωνείτε ότι είστε αποκλειστικά υπεύθυνοι (και ότι η Google δεν φέρει καμία ευθύνη έναντι σε εσάς ή κάποιο τρίτο μέρος) για την όποια παραβίαση των υποχρεώσεών σας βάσει των Όρων, καθώς και για τις συνέπειες που απορρέουν από μια τέτοια παραβίαση (συμπεριλαμβανομένης της όποιας απώλειας ή ζημίας την οποία ενδέχεται να υποστεί η Google).

    6. Απόρρητο και προσωπικά στοιχεία

    @@ -35766,7 +35528,7 @@ diff --git a/components/resources/terms/terms_el.html b/components/resources/ter

    7.4 Αποδέχεστε ότι με τη χρήση των Υπηρεσιών, ενδέχεται να εκτεθείτε σε Περιεχόμενο που ενδεχομένως θεωρήσετε προσβλητικό, άσεμνο ή ανάρμοστο και ότι, σε αυτήν την περίπτωση, χρησιμοποιείτε τις Υπηρεσίες με δική σας ευθύνη.

    7.5 Συμφωνείτε ότι ευθύνεστε αποκλειστικά (και ότι η Google δεν φέρει καμία ευθύνη έναντι σε εσάς ή κάποιο τρίτο μέρος) για το Περιεχόμενο που δημιουργείτε, μεταβιβάζετε ή προβάλετε κατά τη χρήση της Υπηρεσίας καθώς και για τις συνέπειες των πράξεών σας (συμπεριλαμβανομένης της όποιας απώλειας ή ζημίας την οποία ενδέχεται να υποστεί η Google) ως αποτέλεσμα τέτοιων πρακτικών.

    8. Δικαιώματα αποκλειστικής εκμετάλλευσης

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Αποδέχεστε και συμφωνείτε ότι η Google δεν φέρει ευθύνη για τη διαθεσιμότητα τέτοιων εξωτερικών ιστότοπων ή πόρων και δεν υιοθετεί όποιες διαφημίσεις, προϊόντα ή άλλα υλικά που σχετίζονται ή προέρχονται από τέτοιους ιστότοπους ή πόρους.

    17.3 Αποδέχεστε και συμφωνείτε ότι η Google δεν φέρει καμία ευθύνη για κάθε απώλεια ή ζημία που ενδέχεται να προκληθεί από εσάς και που απορρέει από τη διαθεσιμότητα των εν λόγω εξωτερικών ιστότοπων και πόρων ή που προκύπτει ως αποτέλεσμα της εκ μέρους σας ένδειξης εμπιστοσύνης στην αρτιότητα, ακρίβεια ή ύπαρξη οποιασδήποτε διαφήμισης, προϊόντων ή άλλου υλικού που διατίθεται ή υπάρχει στους εν λόγω ιστότοπους ή πόρους.

    18. Τροποποιήσεις των Όρων

    @@ -35778,7 +35540,16 @@ diff --git a/components/resources/terms/terms_el.html b/components/resources/ter diff --git a/components/resources/terms/terms_en-GB.html b/components/resources/terms/terms_en-GB.html --- a/components/resources/terms/terms_en-GB.html +++ b/components/resources/terms/terms_en-GB.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    We’re updating the Terms of Service for Chrome on 31 March 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional Terms of Service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new terms (https://policies.google.com/terms/update) and additional terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new terms, you can find more information about your options in our Frequently asked questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    We’re updating the Terms of Service for Chrome on 31 March 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional Terms of Service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new terms (https://policies.9oo91e.qjz9zk/terms/update) and additional terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new terms, you can find more information about your options in our Frequently asked questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome Terms of Service

    +

    These Terms of Service apply to the executable code version of Google Chrome. Source code for Google Chrome is available free of charge under open source software licence agreements at chrome://credits.

    +

    1. Your relationship with Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Unless you have been specifically permitted to do so in a separate agreement with Google, you agree that you will not reproduce, duplicate, copy, sell, trade or resell the Services for any purpose.

    5.4 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the Terms and for the consequences (including any loss or damage that Google may suffer) of any such breach.

    6. Privacy and your personal information

    @@ -35793,7 +35564,7 @@ diff --git a/components/resources/terms/terms_en-GB.html b/components/resources/

    7.4 You understand that by using the Services, you may be exposed to Content that you may find offensive, indecent or objectionable and that, in this respect, you use the Services at your own risk.

    7.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any Content that you create, transmit or display while using the Services, and for the consequences of your actions (including any loss or damage that Google may suffer) by doing so.

    8. Proprietary rights

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 You acknowledge and agree that Google is not responsible for the availability of any such external sites or resources and does not endorse any advertising, products or other materials on or available from such websites or resources.

    17.3 You acknowledge and agree that Google is not liable for any loss or damage that may be incurred by you as a result of the availability of those external sites or resources, or as a result of any reliance placed by you on the completeness, accuracy or existence of any advertising, products or other materials on or available from such websites or resources.

    18. Changes to the Terms

    @@ -35805,7 +35576,16 @@ diff --git a/components/resources/terms/terms_en-GB.html b/components/resources/ diff --git a/components/resources/terms/terms_en.html b/components/resources/terms/terms_en.html --- a/components/resources/terms/terms_en.html +++ b/components/resources/terms/terms_en.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.google.com/terms/update) and Additional Terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.9oo91e.qjz9zk/terms/update) and Additional Terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome Terms of Service

    +

    These Terms of Service apply to the executable code version of Google Chrome. Source code for Google Chrome is available free of charge under open source software license agreements at chrome://credits.

    +

    1. Your relationship with Google

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Unless you have been specifically permitted to do so in a separate agreement with Google, you agree that you will not reproduce, duplicate, copy, sell, trade or resell the Services for any purpose.

    5.4 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the Terms and for the consequences (including any loss or damage which Google may suffer) of any such breach.

    6. Privacy and your personal information

    @@ -35827,7 +35607,7 @@ diff --git a/components/resources/terms/terms_en.html b/components/resources/ter

    8.4 Google acknowledges and agrees that it obtains no right, title or interest from you (or your licensors) under these Terms in or to any Content that you submit, post, transmit or display on, or through, the Services, including any intellectual property rights which subsist in that Content (whether those rights happen to be registered or not, and wherever in the world those rights may exist). Unless you have agreed otherwise in writing with Google, you agree that you are responsible for protecting and enforcing those rights and that Google has no obligation to do so on your behalf.

    8.5 You agree that you shall not remove, obscure, or alter any proprietary rights notices (including copyright and trade mark notices) which may be affixed to or contained within the Services.

    8.6 Unless you have been expressly authorized to do so in writing by Google, you agree that in using the Services, you will not use any trade mark, service mark, trade name, logo of any company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) YOUR FAILURE TO KEEP YOUR PASSWORD OR ACCOUNT DETAILS SECURE AND CONFIDENTIAL;

    14.2 THE LIMITATIONS ON GOOGLE’S LIABILITY TO YOU IN PARAGRAPH 14.1 ABOVE SHALL APPLY WHETHER OR NOT GOOGLE HAS BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.

    15. Copyright and trade mark policies

    @@ -35838,7 +35618,7 @@ diff --git a/components/resources/terms/terms_en.html b/components/resources/ter

    16. Advertisements

    16.1 Some of the Services are supported by advertising revenue and may display advertisements and promotions. These advertisements may be targeted to the content of information stored on the Services, queries made through the Services or other information.

    16.2 The manner, mode and extent of advertising by Google on the Services are subject to change without specific notice to you.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 You acknowledge and agree that Google is not responsible for the availability of any such external sites or resources, and does not endorse any advertising, products or other materials on or available from such web sites or resources.

    17.3 You acknowledge and agree that Google is not liable for any loss or damage which may be incurred by you as a result of the availability of those external sites or resources, or as a result of any reliance placed by you on the completeness, accuracy or existence of any advertising, products or other materials on, or available from, such web sites or resources.

    18. Changes to the Terms

    @@ -35850,7 +35630,16 @@ diff --git a/components/resources/terms/terms_en.html b/components/resources/ter diff --git a/components/resources/terms/terms_es-419.html b/components/resources/terms/terms_es-419.html --- a/components/resources/terms/terms_es-419.html +++ b/components/resources/terms/terms_es-419.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    El 31 de marzo de 2020, actualizaremos las condiciones del servicio de Google Chrome. Las nuevas condiciones incluirán las Condiciones del Servicio de Google y las condiciones del servicio adicionales de Google Chrome y el Sistema operativo Chrome. Hasta entonces, seguirán vigentes las condiciones que se indican a continuación. Para obtener más detalles, consulte un resumen de los cambios clave (https://policies.google.com/terms/chromechanges).

    Si no acepta nuestras nuevas Condiciones, puede encontrar más información sobre las opciones disponibles en nuestras Preguntas frecuentes (https://policies.google.com/terms/chromechanges#faq).

    ++

    El 31 de marzo de 2020, actualizaremos las condiciones del servicio de Google Chrome. Las nuevas condiciones incluirán las Condiciones del Servicio de Google y las condiciones del servicio adicionales de Google Chrome y el Sistema operativo Chrome. Hasta entonces, seguirán vigentes las condiciones que se indican a continuación. Para obtener más detalles, consulte un resumen de los cambios clave (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    Si no acepta nuestras nuevas Condiciones, puede encontrar más información sobre las opciones disponibles en nuestras Preguntas frecuentes (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Condiciones del servicio de Google Chrome

    +

    Estas Condiciones del servicio se aplicarán a la versión de código ejecutable de Google Chrome. El código fuente de Google Chrome se encuentra disponible de forma gratuita sujeto a los acuerdos de licencia de software de código abierto que encontrará en la página chrome://credits.

    +

    1. Su relación con Google

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 A menos que se estipule lo contrario en un acuerdo independiente entre usted y Google, se compromete a no reproducir, duplicar, copiar, vender, comercializar ni revender los Servicios para ningún fin.

    5.4 Por el presente acuerdo, acepta que usted es el único responsable, y que Google renuncia a toda responsabilidad hacia usted o hacia cualquier tercero, del incumplimiento de cualquiera de sus obligaciones en virtud de las Condiciones, así como de las consecuencias, incluido cualquier daño o pérdida que se pueda ocasionar a Google, derivado de dicho incumplimiento.

    6. Información personal y privacidad

    @@ -35872,7 +35661,7 @@ diff --git a/components/resources/terms/terms_es-419.html b/components/resources

    8.4 Google renuncia a todo derecho, título o interés que le conceda usted o sus proveedores de licencias, de acuerdo con lo estipulado en estas Condiciones, y relativo a cualquier Contenido que facilite, publique, transfiera o muestre en los Servicios o a través de ellos, incluidos los derechos de propiedad intelectual que rijan el Contenido, independientemente de si los mencionados derechos están registrados o no y del país en el que existan. Salvo que acuerde lo contrario por escrito con Google, se compromete a proteger y aplicar los mencionados derechos, y exime a Google de la obligación de hacerlo en su nombre.

    8.5 Acepta no eliminar, ocultar ni alterar los avisos de derechos sobre la propiedad, entre ellos, avisos de derechos de autor y de marcas registradas, tanto los incluidos en los Servicios como los que se facilitan como parte de estos.

    8.6 Salvo que Google le haya concedido la autorización expresamente por escrito, se compromete a que, durante el uso de los Servicios, no utilizará ninguna marca comercial, marca de servicio, nombre comercial o logotipo de ninguna empresa o entidad en modo alguno que ocasionara confusión sobre el propietario o usuario autorizado de dichas marcas, nombres o logotipos.

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) LA NEGLIGENCIA POR NO HABER PRESERVADO SU CONTRASEÑA O LA INFORMACIÓN DE SU CUENTA DE FORMA SEGURA Y CONFIDENCIAL;

    14.2 LAS LIMITACIONES DE LA RESPONSABILIDAD DE GOOGLE ANTE USTED, ESTIPULADAS EN EL PÁRRAFO 14.1, SE APLICARÁN INDEPENDIENTEMENTE DE SI SE LE NOTIFICARON TALES POSIBILIDADES DE PÉRDIDAS A GOOGLE O DE SI GOOGLE DEBERÍA HABER SIDO CONSCIENTE DE DICHA POSIBILIDAD.

    15. Políticas relativas a los derechos de autor y a las marcas comerciales

    @@ -35883,7 +35672,7 @@ diff --git a/components/resources/terms/terms_es-419.html b/components/resources

    16. Anuncios

    16.1 Algunos de los Servicios se financian a través de los ingresos obtenidos de la publicidad y pueden mostrar anuncios y promociones. Este tipo de publicidad podrá estar orientada al contenido de la información almacenada en los Servicios, a las consultas realizadas a través de estos o a otro tipo de información.

    16.2 La manera, el modo y el alcance de dicha publicidad de Google en los Servicios están sujetos a cambios sin previo aviso.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Reconoce y acepta que Google no se responsabiliza de la disponibilidad de dichos sitios web o recursos externos y que no respalda la publicidad, los productos u otros materiales proporcionados en los sitios web o recursos en cuestión o a través de ellos, ni es responsable de los mismos.

    17.3 Reconoce y acepta que Google no se responsabiliza de ninguna de las pérdidas o daños en que pueda incurrir como consecuencia de la disponibilidad de dichos sitios web o recursos externos o como consecuencia de la confianza que deposite en la exhaustividad, precisión o existencia de publicidad, productos u otros materiales proporcionados en los sitios web o recursos en cuestión o a través de ellos.

    18. Cambios en las Condiciones

    @@ -35895,7 +35684,16 @@ diff --git a/components/resources/terms/terms_es-419.html b/components/resources diff --git a/components/resources/terms/terms_es.html b/components/resources/terms/terms_es.html --- a/components/resources/terms/terms_es.html +++ b/components/resources/terms/terms_es.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    El 31 de marzo de 2020 actualizaremos los términos del servicio de Google Chrome. Los nuevos términos incluirán los Términos del Servicio de Google y los Términos del Servicio Adicionales de Google Chrome y Chrome OS. Hasta entonces, seguirán aplicándose los términos que se indican más abajo. Para obtener más información, consulta el resumen de los cambios principales (https://policies.google.com/terms/chromechanges).

    • Aquí tienes una vista previa de los nuevos Términos (https://policies.google.com/terms/update) y de los Términos Adicionales (https://www.google.com/chrome/terms).

    Si no estás de acuerdo con nuestros nuevos Términos, encontrarás más información sobre tus opciones en nuestras preguntas frecuentes (https://policies.google.com/terms/chromechanges#faq).

    ++

    El 31 de marzo de 2020 actualizaremos los términos del servicio de Google Chrome. Los nuevos términos incluirán los Términos del Servicio de Google y los Términos del Servicio Adicionales de Google Chrome y Chrome OS. Hasta entonces, seguirán aplicándose los términos que se indican más abajo. Para obtener más información, consulta el resumen de los cambios principales (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    • Aquí tienes una vista previa de los nuevos Términos (https://policies.9oo91e.qjz9zk/terms/update) y de los Términos Adicionales (https://www.9oo91e.qjz9zk/chrome/terms).

    Si no estás de acuerdo con nuestros nuevos Términos, encontrarás más información sobre tus opciones en nuestras preguntas frecuentes (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Condiciones del servicio de Google Chrome

    +

    Estas Condiciones del servicio se aplicarán a la versión de código ejecutable de Google Chrome. El código fuente de Google Chrome está disponible de forma gratuita de conformidad con los acuerdos sobre licencias de software libre que se encuentran en la página chrome://credits.

    +

    1. Su relación con Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 A menos que se estipule lo contrario en un acuerdo independiente entre usted y Google, se compromete a no reproducir, duplicar, copiar, vender, comercializar ni revender los Servicios para ningún fin.

    5.4 Por el presente acuerdo, acepta que usted es el único responsable (y que Google renuncia a toda responsabilidad hacia usted o hacia cualquier tercero) del incumplimiento de cualquiera de las obligaciones contraídas en virtud de las Condiciones, así como de las consecuencias derivadas de dicho incumplimiento (entre las que se incluye cualquier pérdida o daño que pudiera ocasionar a Google).

    6. Información personal y privacidad

    @@ -35910,7 +35708,7 @@ diff --git a/components/resources/terms/terms_es.html b/components/resources/ter

    7.4 Por el presente acuerdo, es consciente de que al utilizar los Servicios podría estar expuesto a Contenido que, según su parecer, sea ofensivo, indecente u objetable y de que, en consecuencia, usa estos Servicios bajo su propia responsabilidad.

    7.5 Acepta que es el único responsable (y que Google renuncia a toda responsabilidad hacia usted o hacia cualquier tercero) de todo el Contenido que cree, transfiera o publique durante el uso de los Servicios, así como de las consecuencias derivadas de sus acciones, incluida cualquier pérdida o daño que pudiera ocasionar a Google.

    8. Derechos sobre la propiedad

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Reconoce y acepta que Google no se responsabiliza de la disponibilidad de dichos sitios web o recursos externos y que no respalda la publicidad, los productos u otros materiales proporcionados en los sitios web o recursos en cuestión o a través de ellos, ni es responsable de los mismos.

    17.3 Reconoce y acepta que Google no es responsable de ninguna de las pérdidas ni de los daños que pueda ocasionar como consecuencia de la disponibilidad de dichos sitios web o recursos externos o como consecuencia de la confianza que deposite en la exhaustividad, precisión o existencia de publicidad, productos u otros materiales proporcionados en los sitios web o en los recursos en cuestión o a través de ellos.

    18. Cambios en las Condiciones

    @@ -35922,7 +35720,16 @@ diff --git a/components/resources/terms/terms_es.html b/components/resources/ter diff --git a/components/resources/terms/terms_et.html b/components/resources/terms/terms_et.html --- a/components/resources/terms/terms_et.html +++ b/components/resources/terms/terms_et.html -@@ -42,14 +42,14 @@ Käesolevat õiguslikku lepingut nimetatakse edaspidi „tingimusteks“.

    +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Värskendame 31. märtsil 2020 Chrome'i teenusetingimusi. Uued tingimused hõlmavad Google’i teenusetingimusi ning Google Chrome'i ja Chrome OS-i lisateenusetingimusi. Seni kehtivad allolevad tingimused. Lisateabe saamiseks vaadake oluliste muudatuste kokkuvõtet (https://policies.google.com/terms/chromechanges).

    • Vaadake uute tingimuste (https://policies.google.com/terms/update) ja lisatingimuste (https://www.google.com/chrome/terms) eelvaadet.

    Kui te uute tingimustega ei nõustu, leiate oma võimaluste kohta lisateavet korduma kippuvatest küsimustest (https://policies.google.com/terms/chromechanges#faq).

    ++

    Värskendame 31. märtsil 2020 Chrome'i teenusetingimusi. Uued tingimused hõlmavad Google’i teenusetingimusi ning Google Chrome'i ja Chrome OS-i lisateenusetingimusi. Seni kehtivad allolevad tingimused. Lisateabe saamiseks vaadake oluliste muudatuste kokkuvõtet (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    • Vaadake uute tingimuste (https://policies.9oo91e.qjz9zk/terms/update) ja lisatingimuste (https://www.9oo91e.qjz9zk/chrome/terms) eelvaadet.

    Kui te uute tingimustega ei nõustu, leiate oma võimaluste kohta lisateavet korduma kippuvatest küsimustest (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome'i teenusetingimused

    +

    Käesolevad teenusetingimused kehtivad Google Chrome'i täitmiskoodi versiooni kohta. Google Chrome'i lähtekood on tasuta saadaval avatud allikaga tarkvara litsentsilepingutes aadressil chrome://credits.

    +

    1. Teie suhe Google'iga

    +@@ -44,14 +44,14 @@ Käesolevat õiguslikku lepingut nimetatakse edaspidi „tingimusteks“.

    5.3 Kui teil ei ole Google'iga eraldi sellekohast lepingut, ei ole ühelgi tingimusel lubatud teenuseid taasluua, jäljendada, paljundada, kopeerida, müüa, kaubelda ega edasi müüa.

    5.4 Te nõustute, et ainuüksi teie olete vastutav (ning Google'il ei ole teie ees ega ka kolmanda osapoole ees mingit vastutust) kõikide tingimustest tulenevate kohustuste rikkumiste ja ka tagajärgede eest (kaasa arvatud kõik Google'i kahjud või kahjustused), mis tulenevad sellistest rikkumistest.

    6. Privaatsus ning isiklik informatsioon

    @@ -35939,7 +35746,7 @@ diff --git a/components/resources/terms/terms_et.html b/components/resources/ter

    7.4 Te mõistate, et teenuste kasutamisel võite kokku puutuda sisuga, mida võite pidada solvavaks, sündsusetuks või vastumeelseks, ning selles suhtes kasutate teenust omal vastutusel.

    7.5 Nõustute, et olete ainuisikuliselt vastutav (Google'il ei ole teie ega kolmandate osapoolte ees mingit vastutust) teenuste kasutamisel mis tahes teie loodava, edastatava või kuvatava sisu ning sellest tulenevate tagajärgede eest (kaasa arvatud kõik võimalikud Google'i kaotused või kahjud).

    8. Omandiõigused

    -@@ -111,7 +111,7 @@ Juhised leiate Interneti-aadressilt http://www.google.ee/permissions/guidelines. +@@ -113,7 +113,7 @@ Juhised leiate Interneti-aadressilt http://www.google.ee/permissions/guidelines.

    17.2 Te võtate teadmiseks ja nõustute, et Google ei vastuta selliste välislehtede või -ressursside kättesaadavuse eest ega toeta muid reklaame, tooteid ning materjale kui need, mis on saadaval sellistel veebilehtedel või ressurssidel.

    17.3 Te võtate teadmiseks ja nõustute, et Google ei vastuta kahjude või kadude eest, mida võivad teile põhjustada nende välislehtede või -ressursside kättesaadavus, või teie tekkinud usaldusväärsuse eest sellistel veebilehtedel või ressurssidel saadaolevate reklaamide, toodete ning materjalide täielikkuse, täpsuse ning olemasolu suhtes.

    18. Tingimuste muutmine

    @@ -35951,7 +35758,16 @@ diff --git a/components/resources/terms/terms_et.html b/components/resources/ter diff --git a/components/resources/terms/terms_fa.html b/components/resources/terms/terms_fa.html --- a/components/resources/terms/terms_fa.html +++ b/components/resources/terms/terms_fa.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    شرایط خدمات Chrome را ۳۱ مارس ۲۰۲۰ به‌روزرسانی می‌کنیم. شرایط جدید شامل «شرایط خدمات Google» و «شرایط خدمات تکمیلی» Google Chrome و «سیستم‌عامل Chrome» خواهد بود. تا آن زمان، شرایط زیر همچنان اعمال خواهد شد. برای جزئیات بیشتر، خلاصه تغییرات اساسی (https://policies.google.com/terms/chromechanges) را ببینید.

    • پیش‌نمایش شرایط (https://policies.google.com/terms/update) و شرایط تکمیلی (https://www.google.com/chrome/terms) جدید را ببینید.

    اگر با «شرایط» جدید ما موافق نیستید، می‌توانید اطلاعات بیشتری درباره گزینه‌های خود در پرسشگان (https://policies.google.com/terms/chromechanges#faq) ما پیدا کنید.

    ++

    شرایط خدمات Chrome را ۳۱ مارس ۲۰۲۰ به‌روزرسانی می‌کنیم. شرایط جدید شامل «شرایط خدمات Google» و «شرایط خدمات تکمیلی» Google Chrome و «سیستم‌عامل Chrome» خواهد بود. تا آن زمان، شرایط زیر همچنان اعمال خواهد شد. برای جزئیات بیشتر، خلاصه تغییرات اساسی (https://policies.9oo91e.qjz9zk/terms/chromechanges) را ببینید.

    • پیش‌نمایش شرایط (https://policies.9oo91e.qjz9zk/terms/update) و شرایط تکمیلی (https://www.9oo91e.qjz9zk/chrome/terms) جدید را ببینید.

    اگر با «شرایط» جدید ما موافق نیستید، می‌توانید اطلاعات بیشتری درباره گزینه‌های خود در پرسشگان (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq) ما پیدا کنید.

    +

    شرایط سرویس Google Chrome

    +

    این شرایط سرویس در مورد نسخه Google Chrome که دارای کد قابل اجراست اعمال می شود. بر اساس قراردادهای مجوز در آدرس chrome://credits، کد منبع Google Chrome به طور رایگان و به صورت نرم افزار منبع باز در اختیار شما قرار می گیرد.

    +

    1. ارتباط شما با Google

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 شما موافقت می کنید که به هیچ منظوری امکان تولید مجدد، کپی برداری، فروش، تجارت یا فروش مجدد سرویس ها را نخواهید داشت، بجز در مواردی که بر اساس وجود یک قرارداد جداگانه با Google این اجازه به شما داده شده باشد.

    5.4 شما موافقت می کنید که در قبال هرگونه نقض الزامات مربوط به "شرایط" و یا عواقب حاصل از چنین نقضی (از جمله هرگونه خسارت یا آسیب وارد شده به Google)، تنها مسئول آن خواهید بود (و Google هیچ مسئولیتی در قبال شما و یا اشخاص ثالث نخواهد داشت).

    6. خط مشی رازداری و اطلاعات شخصی

    @@ -35973,7 +35789,7 @@ diff --git a/components/resources/terms/terms_fa.html b/components/resources/ter

    8.4 Google این امر را می پذیرد و با آن موافقت می کند که هیچ حق، عنوان یا سودی از جانب شما (یا اعطا کنندگان مجوز شما) به واسطه این "شرایط" در ارتباط با محتوای ارسال شده، پست شده، منتقل شده یا نمایش داده شده از طرف شما و از طریق سرویس ها، از جمله هرگونه حقوق مربوط به دارایی های معنوی که به واسطه وجود محتوا ایجاد شده باشد (خواه این حقوق ثبت شده یا ثبت نشده باشد و در هر کجای دنیا که این حقوق موجود باشد) به Google تعلق نخواهد گرفت. شما موافقت می کنید که مسئول محافظت از این حقوق هستید و Google هیچ الزامی برای انجام این کار از جانب شما نخواهد داشت، مگر آنکه این امر به صورت کتبی و به گونه ای دیگر به توافق Google رسیده باشد.

    8.5 شما موافقت می کنید که قادر به حذف، تغییر و ایجاد ابهام در اعلامیه های حقوق اختصاصی وابسته یا موجود در سرویس ها (از جمله حقوق نشر و اعلامیه های علائم تجاری) نخواهید بود.

    8.6 شما موافقت می کنید که با استفاده از این سرویس ها، از هرگونه مارک تجاری، مارک سرویس ها، نام تجاری، آرم هرگونه شرکت یا سازمان به طریقی که سبب بروز اشتباه در شناسایی مالک یا کاربر مجاز چنین مارک، نام یا آرمی شود خودداری خواهید کرد، مگر آنکه صراحتاً مجوز انجام این کار به صورت کتبی از طرف Google در اختیار شما قرار بگیرد.

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (5) ناتوانی شما در حفظ رمز عبور یا جزئیات حساب به صورت ایمن و محرمانه؛

    14.2 محدودیت های مربوط به مسئولیت های GOOGLE که در بند 14.1 در بالا به آن اشاره شد خواه در صورت آگاهی GOOGLE نسبت به احتمال بروز چنین آسیب ها یا صدماتی و یا عدم آگاهی آن نسبت به این امور، در مورد شما قابل اعمال خواهد بود.

    15. سیاست های مربوط به حق نشر و مارک تجاری

    @@ -35984,7 +35800,7 @@ diff --git a/components/resources/terms/terms_fa.html b/components/resources/ter

    16. تبلیغات

    16.1 برخی از سرویس ها با درآمد حاصل از تبلیغات پشتیبانی می شوند و از این رو تبلیغات و پیام های تبلیغاتی در آنها نمایش داده می شود. این تبلیغات با توجه به محتوای اطلاعات ذخیره شده در آن سرویس ها، پرسش های انجام شده از طریق سرویس و یا دیگر اطلاعات به صورت هدفمند نمایش داده می شوند.

    16.2 شیوه، حالت و محدوده تبلیغات انجام شده توسط Google در سرویس ها بدون هرگونه اطلاع رسانی به شما تغییر خواهد کرد.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 شما تأیید کرده و می پذیرید که Google در قبال وجود چنین سایت ها یا منابع خارجی مسئولیتی ندارد و هیچکدام از این تبلیغات، محصولات یا دیگر موارد موجود در این وب سایت ها یا منابع را مورد تأیید و حمایت خود قرار نخواهد داد.

    17.3 شما تأیید کرده و می پذیرید که Google در قبال زیان ها یا آسیب هایی که از طریق شما و در پی وجود چنین سایت ها و منابع خارجی بروز کند یا در نتیجه اعتماد شما به بی نقص بودن، صحت یا وجود تبلیغات، محصولات یا دیگر موارد و یا ارائه چنین امکاناتی از طریق آنها و یا چنین وب سایت ها یا منابعی مسئول نخواهد بود.

    18. تغییرات ایجاد شده در شرایط

    @@ -35996,7 +35812,16 @@ diff --git a/components/resources/terms/terms_fa.html b/components/resources/ter diff --git a/components/resources/terms/terms_fi.html b/components/resources/terms/terms_fi.html --- a/components/resources/terms/terms_fi.html +++ b/components/resources/terms/terms_fi.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Chromen käyttöehdot päivitetään 31.3.2020. Esimerkiksi Googlen käyttöehdot ja Google Chromen sekä Chrome-käyttöjärjestelmän lisäehdot sisältyvät uusiin ehtoihin. Alla olevat ehdot ovat voimassa uusien julkaisuun asti. Jos haluat lisätietoja, katso yhteenveto tärkeimmistä muutoksista (https://policies.google.com/terms/chromechanges).

    • Katso uusien käyttöehtojen (https://policies.google.com/terms/update) ja lisäehtojen (https://www.google.com/chrome/terms) esikatselu.

    Jos et hyväksy uusia käyttöehtoja, lue lisää vaihtoehdoistasi Usein kysyttyä ‑osiosta (https://policies.google.com/terms/chromechanges#faq).

    ++

    Chromen käyttöehdot päivitetään 31.3.2020. Esimerkiksi Googlen käyttöehdot ja Google Chromen sekä Chrome-käyttöjärjestelmän lisäehdot sisältyvät uusiin ehtoihin. Alla olevat ehdot ovat voimassa uusien julkaisuun asti. Jos haluat lisätietoja, katso yhteenveto tärkeimmistä muutoksista (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    • Katso uusien käyttöehtojen (https://policies.9oo91e.qjz9zk/terms/update) ja lisäehtojen (https://www.9oo91e.qjz9zk/chrome/terms) esikatselu.

    Jos et hyväksy uusia käyttöehtoja, lue lisää vaihtoehdoistasi Usein kysyttyä ‑osiosta (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chromen käyttöehdot

    +

    Nämä käyttöehdot koskevat Google Chromen suoritettavaa koodiversiota. Google Chromen lähdekoodi on saatavilla maksutta avoimen lähdekoodin ohjelmistojen käyttöoikeussopimusten mukaisesti osoitteesta chrome://credits.

    +

    1. Käyttäjän suhde Googleen

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Ellei käyttäjälle ole nimenomaisesti annettu kirjallisella Googlen kanssa tehdyllä erillisellä sopimuksella lupaa siihen, käyttäjä sitoutuu olemaan jäljentämättä, monistamatta, kopioimatta, myymättä tai jälleenmyymättä Palveluita mitään tarkoitusta varten.

    5.4 Käyttäjä hyväksyy, että hän vastaa itse täysin (ja että Googlella ei ole velvollisuuksia käyttäjää tai ulkopuolista osapuolta kohtaan) kaikista Ehtojen mukaisten käyttäjän velvollisuuksien rikkomisesta ja niiden seurauksista (mukaan lukien Googlen mahdollisesti kärsimät menetykset tai vahingot).

    6. Tietosuoja ja käyttäjän henkilökohtaiset tiedot

    @@ -36011,7 +35836,7 @@ diff --git a/components/resources/terms/terms_fi.html b/components/resources/ter

    7.4 Käyttäjä ymmärtää, että Palveluita käyttämällä hän saattaa saada tietoonsa loukkaavana, epäsiveellisenä tai paheksuttavana pitämäänsä Sisältöä ja että käyttäjä käyttää Palveluita omalla vastuullaan.

    7.5 Käyttäjä hyväksyy, että hän vastaa itse täysin (ja että Googlella ei ole velvollisuuksia käyttäjää tai ulkopuolista osapuolta kohtaan) kaikesta käyttäjän luomasta, lähettämästä tai näyttämästä Sisällöstä Palveluiden käyttämisen yhteydessä sekä kaikista käyttäjän toimien seurauksista (mukaan lukien Googlen mahdollisesti kärsimät menetykset tai vahingot).

    8. Omistusoikeudet

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Käyttäjä ymmärtää ja hyväksyy, että Google ei vastaa kyseisten ulkoisten sivustojen tai resurssien käytettävyydestä eikä tue kyseisissä sivustoissa tai resursseissa käytettävissä olevaa mainontaa, tuotteita tai muuta materiaalia.

    17.3 Käyttäjä ymmärtää ja hyväksyy, että Google ei vastaa tappioista tai vahingoista, jotka ovat syntyneet käyttäjälle kyseisten ulkoisten sivustojen tai resurssien käytettävyydestä tai jotka syntyvät käyttäjän luottamuksesta kyseisissä sivustoissa tai resursseissa olevan mainonnan, tuotteiden tai muun materiaalin täydellisyyteen, oikeellisuuteen tai olemassaoloon.

    18. Muutokset Ehtoihin

    @@ -36023,7 +35848,16 @@ diff --git a/components/resources/terms/terms_fi.html b/components/resources/ter diff --git a/components/resources/terms/terms_fil.html b/components/resources/terms/terms_fil.html --- a/components/resources/terms/terms_fil.html +++ b/components/resources/terms/terms_fil.html -@@ -41,18 +41,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Ia-update namin ang mga tuntunin ng serbisyo para sa Chrome sa Marso 31, 2020. Kabilang sa mga bagong tuntunin ang Mga Tuntunin ng Serbisyo ng Google at ang mga karagdagang tuntunin ng serbisyo ng Google Chrome at Chrome OS. Hanggang sa panahong iyon, patuloy na malalapat ang mga tuntunin sa ibaba. Tingnan ang buod ng mga pangunahing pagbabago (https://policies.google.com/terms/chromechanges) para sa higit pang detalye.

    Kung hindi ka sumasang-ayon sa aming bagong Mga Tuntunin, makakahanap ka ng higit pang impormasyon tungkol sa iyong mga opsyon sa aming Mga Madalas Itanong (FAQ) (https://policies.google.com/terms/chromechanges#faq).

    ++

    Ia-update namin ang mga tuntunin ng serbisyo para sa Chrome sa Marso 31, 2020. Kabilang sa mga bagong tuntunin ang Mga Tuntunin ng Serbisyo ng Google at ang mga karagdagang tuntunin ng serbisyo ng Google Chrome at Chrome OS. Hanggang sa panahong iyon, patuloy na malalapat ang mga tuntunin sa ibaba. Tingnan ang buod ng mga pangunahing pagbabago (https://policies.9oo91e.qjz9zk/terms/chromechanges) para sa higit pang detalye.

    Kung hindi ka sumasang-ayon sa aming bagong Mga Tuntunin, makakahanap ka ng higit pang impormasyon tungkol sa iyong mga opsyon sa aming Mga Madalas Itanong (FAQ) (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Mga Tuntunin ng Serbisyo ng Google Chrome

    +

    Nalalapat ang Mga Tuntunin ng Serbisyong ito sa executable code na bersyon ng Google Chrome. Magagamit nang libre ang source code para sa Google Chrome alinsunod sa open source na mga kasunduan sa paglilisensya ng software chrome://credits.

    +

    1. Ang iyong kaugnayan sa Google

    +@@ -43,18 +43,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Maliban kung partikular kang pinahintulutan na gawin sa isang hiwalay na kasunduan sa Google, sumasang-ayon kang hindi mo ire-reproduce, idu-duplicate, kokopyahin, ibebenta, ikakalakal o muling-ibebenta ang Mga Serbisyo sa anumang layunin.

    5.4 Sumasang-ayon kang mag-isa kang mananagot para sa (at walang pananagutan ang Google sa iyo o sa kaninumang third party para sa) anumang paglabag ng iyong mga obligasyon sa ilalim ng Mga Tuntunin at para sa mga kahihinatnan (kabilang ang anumang pagkalugi o pinsala na maaaring sapitin ng Google) ng anumang naturang paglabag.

    6. Privacy at iyong personal na impormasyon

    @@ -36045,7 +35879,7 @@ diff --git a/components/resources/terms/terms_fil.html b/components/resources/te

    8.4 Kinikilala at sinasang-ayunan ng Google na wala itong kinukuhang karapatan, titulo o interes mula sa iyo (o sa iyong mga tagapaglisensya) sa ilalim ng Mga Tuntuning ito sa o sa kahit anong Nilalaman na iyong isinumite, na-post, ipinadala o ipinakita sa, o sa pamamagitan ng Mga Serbisyo, kabilang ang anumang mga karapatan sa ari-ariang intelektwal na kapwa-umiiral sa Nilalamang iyon (kung nangyari mang nakarehistro ang mga karapatang iyon o hindi, at kung saan man sa mundo umiiral ang mga karapatang iyon). Maliban kung sumang-ayon ka nang pasulat sa Google, sumasang-ayon kang mananagot ka para sa pagprotekta at pagpapatupad ng mga karapatang iyon at walang obligasyon ang Google na gawin ito sa iyong ngalan.

    8.5 Sumasang-ayon kang hindi mo aalisin, palalabuin, o papalitan ang anumang mga notice sa mga karapatan ng pagmamay-ari (kabilang ang copyright at mga notice sa trade mark) na maaaring ilakip sa o ilagay sa loob ng Mga Serbisyo.

    8.6 Maliban kung hayagan kang pasulat na pinahintulutan ng Google na gawin ito, sumasang-ayon ka na sa paggamit ng Mga Serbisyo, hindi ka gagamit ng anumang mga trade mark, service mark, trade name, logo ng anumang kumpanya o samahan sa paraang malamang o sinadyang magdulot ng kalituhan tungkol sa may-ari o awtorisadong gumagamit ng naturang mga marka, pangalan o logo.

    -@@ -96,8 +96,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -98,8 +98,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) ANG IYONG KABIGUAN NA PANATILIHING LIGTAS AT KUMPIDENSYAL ANG MGA DETALYE NG IYONG PASSWORD O ACCOUNT;

    14.2 ANG MGA LIMITASYON NG PANANAGUTAN NG GOOGLE SA IYO SA TALATA 14.1 SA ITAAS AY NAAANGKOP NAABISUHAN MAN O HINDI ANG GOOGLE O DAPAT NA NALAMAN ANG POSIBILIDAD NG NATURANG ANUMANG LILITAW NA MGA PAGKALUGI.

    15. Ang mga patakaran sa copyright at trade mark

    @@ -36056,7 +35890,7 @@ diff --git a/components/resources/terms/terms_fil.html b/components/resources/te

    16. Mga Advertisement

    16.1 Suportado ang ilan sa Mga Serbisyo ng kita sa advertising at maaaring magpakita ng mga advertisement at pa-promo. Maaaring mai-target ang mga advertisement na ito sa nilalaman ng impormasyon na nakaimbak sa Mga Serbisyo, mga query na isinagawa sa pamamagitan ng mga Serbisyo o iba pang impormasyon.

    16.2 Maaaring magbago ang paraan, mode at haba ng advertising ng Google sa mga Serbisyo nang walang partikular na notice sa iyo.

    -@@ -107,7 +107,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -109,7 +109,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Kinikilala at sinasang-ayunan mong hindi mananagot ang Google para sa kakayahang magamit ng anumang naturang panlabas na site o mapagkukunan, at hindi nag-eendorso ng anumang advertising, mga produkto o iba pang mga materyal sa o magagamit mula sa naturang mga web site o mapagkukunan.

    17.3 Kinikilala at sinasang-ayunan mong hindi mananagot ang Google sa anumang pagkalugi o pinsala na maaaring makuha mo bilang resulta ng kakayahang magamit ng mga panlabas na site o mapagkukunang iyon, o bilang resulta ng anumang pagtitiwalang inilagay mo sa pagkakumpleto, katumpakan o pagkakaroon ng anumang advertising, mga produkto o iba pang mga materyal sa, o makukuha mula sa, naturang mga web site o mapagkukunan.

    18. Mga Pagbabago sa mga Tuntunin

    @@ -36068,7 +35902,16 @@ diff --git a/components/resources/terms/terms_fil.html b/components/resources/te diff --git a/components/resources/terms/terms_fr.html b/components/resources/terms/terms_fr.html --- a/components/resources/terms/terms_fr.html +++ b/components/resources/terms/terms_fr.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Nous mettons à jour les conditions d'utilisation de Chrome au 31 mars 2020. La nouvelle version se composera des Conditions d'utilisation de Google et des Conditions d'utilisation supplémentaires de Google Chrome et Chrome OS. En attendant, les conditions ci-dessous restent applicables. Pour en savoir plus, vous pouvez consulter un résumé des principales modifications (https://policies.google.com/terms/chromechanges).

    Si vous n'acceptez pas nos nouvelles Conditions d'utilisation, consultez les Questions fréquentes (https://policies.google.com/terms/chromechanges#faq) pour en savoir plus sur les options qui s'offrent à vous.

    ++

    Nous mettons à jour les conditions d'utilisation de Chrome au 31 mars 2020. La nouvelle version se composera des Conditions d'utilisation de Google et des Conditions d'utilisation supplémentaires de Google Chrome et Chrome OS. En attendant, les conditions ci-dessous restent applicables. Pour en savoir plus, vous pouvez consulter un résumé des principales modifications (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    Si vous n'acceptez pas nos nouvelles Conditions d'utilisation, consultez les Questions fréquentes (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq) pour en savoir plus sur les options qui s'offrent à vous.

    +

    Conditions d'utilisation de Google Chrome

    +

    Ces Conditions d'utilisation s'appliquent à la version du code exécutable de Google Chrome. Le code source de Google Chrome est mis à disposition gratuitement dans le cadre des accords de licence des logiciels libres, sur la page chrome://credits.

    +

    1. Vos relations avec Google

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Vous consentez à ne pas reproduire, dupliquer, copier, vendre, commercialiser ou revendre les Services à quelque fin que ce soit, sauf autorisation écrite expresse de la part de Google faisant l'objet d'un contrat distinct.

    5.4 Vous reconnaissez être seul responsable (et reconnaissez que Google n'a aucune responsabilité envers vous ou des tiers) de toute violation de vos obligations telles que définies par les Conditions et des conséquences dues à un tel manquement (y compris les pertes ou dommages subis par Google).

    6. Confidentialité et informations personnelles

    @@ -36090,7 +35933,7 @@ diff --git a/components/resources/terms/terms_fr.html b/components/resources/ter

    8.4 La société Google reconnaît et accepte par les présentes Conditions qu'elle ne pourra acquérir aucun droit, titre ou intérêt sur le Contenu que vous ou vos concédants fournissez, publiez, transmettez ou affichez sur les Services ou par le biais de ces derniers, y compris les droits de propriété intellectuelle relatifs à ce Contenu (que ces droits soient déposés ou non, et partout dans le monde où ces droits peuvent exister). Sauf accord écrit contraire conclu entre vous et Google, vous reconnaissez être responsable de la protection et de l'application de ces droits et que Google n'a aucune obligation de protéger ou d'appliquer ces droits en votre nom.

    8.5 Vous acceptez également de ne pas supprimer, masquer ni modifier les mentions relatives aux droits de propriété (y compris les avis de droits d'auteur et de marques commerciales) associées ou intégrées aux Services.

    8.6 Sauf autorisation écrite de la part de Google, vous acceptez en utilisant les Services de n'utiliser aucune marque commerciale, marque de service, nom commercial ou logo d'une quelconque société ou organisation susceptible de créer la confusion quant au propriétaire ou utilisateur autorisé de ces marques, noms ou logos.

    -@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -99,8 +99,8 @@ h2 { font-size:1em; margin-top:0 }

    14.2 LES LIMITES DE LA RESPONSABILITÉ DE GOOGLE ENVERS VOUS, ÉNONCÉES DANS LE PARAGRAPHE 14.1 CI-DESSUS, S'APPLIQUENT MÊME SI GOOGLE A ÉTÉ OU AURAIT DÛ ÊTRE AVISÉE DE LA POSSIBILITÉ DE TELLES PERTES.

    15. Règlement en matière de droits d'auteur et de marques

    @@ -36101,7 +35944,7 @@ diff --git a/components/resources/terms/terms_fr.html b/components/resources/ter

    16. Publicités

    16.1 Certains Services sont financés par la publicité et sont susceptibles d'afficher des annonces ou des promotions. Ces annonces peuvent cibler le contenu des informations stockées sur les Services, les requêtes formulées à l'aide des Services ou d'autres informations.

    16.2 La présentation, les modalités et l'étendue des publicités diffusées par Google sur les Services sont soumises à modification sans avis préalable à votre attention.

    -@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -110,7 +110,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Vous reconnaissez et acceptez que Google ne saurait être tenue responsable de la disponibilité des sites ou ressources externes, et que Google ne cautionne pas le Contenu de ces sites, les ressources ni les produits présents ou disponibles à partir de ces sites Web ou ressources.

    17.3 Vous reconnaissez et acceptez que Google ne saurait être tenue responsable des pertes et dommages que vous pourriez subir, résultant de la disponibilité de ces sites ou ressources externes, ou de la confiance dont vous témoignez vis-à-vis de l'exhaustivité, de l'exactitude ou de l'existence de toute publicité, produit ou autre matériel disponible sur ou à partir de ces sites Web ou ressources.

    18. Modifications apportées aux Conditions

    @@ -36113,7 +35956,16 @@ diff --git a/components/resources/terms/terms_fr.html b/components/resources/ter diff --git a/components/resources/terms/terms_gu.html b/components/resources/terms/terms_gu.html --- a/components/resources/terms/terms_gu.html +++ b/components/resources/terms/terms_gu.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.google.com/terms/update) and Additional Terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.9oo91e.qjz9zk/terms/update) and Additional Terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome સેવાની શરતો

    +

    આ સેવાની શરતો Google Chrome ના એક્ઝિક્યૂટેબલ કોડ વર્ઝન પર લાગુ થાય છે. Google Chrome માટે સ્રોત કોડ chrome://credits પર ઓપન સોર્સ સૉફ્ટવેર લાઇસેંસ હેઠળ નિઃશુલ્ક ઉપલબ્ધ છે.

    +

    1. Google સાથે આપનો સંબંધ

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 આપ સ્વીકારો છો કે, Google સાથેના એક અલગ કરાર દ્વારા આમ કરવા માટેની વિશિષ્ટ રૂપે પરવાનગી પ્રાપ્ત કર્યા સિવાય, આપ સેવાનું કોઈપણ હેતુ માટે પુનઃઉત્પાદન, ડુપ્લિકેટ, કૉપિ, વેચાણ, વેપાર અથવા પુનઃવેચાણ કરશો નહીં.

    5.4 આપ સ્વીકારો છો કે, આપ શરતોની અંતર્ગત આપેલા કોઈપણ કરારના ભંગ માટે અને આવા કોઈપણ કરારભંગના પરિણામ માટે (કોઈપણ હાનિ કે નુકસાન કે જે Google ભોગવે તે સહિત) સંપૂર્ણપણે જવાબદાર (અને એ કે Google આપના કે કોઈ તૃતીય પક્ષ માટે જવાબદાર નથી) છો.

    6. ગોપનીયતા અને આપની વ્યક્તિગત માહિતી

    @@ -36135,7 +35987,7 @@ diff --git a/components/resources/terms/terms_gu.html b/components/resources/ter

    8.4 Google સ્વીકારે છે કે તે આ શરતો હેઠળ અથવા આપની સબમિટ, પોસ્ટ કરેલ, સંચારિત અથવા પ્રદર્શિત કરેલ સામગ્રી અથવા તે સામગ્રીમાં રહેલા કોઈ પણ બૌદ્ધિક સંપદા હકો (ભલે તે હકો નોંધાયા હોય કે નહીં અને તે હકો વિશ્વમાં ક્યાંય પણ અસ્તિત્વમાં હોય) સહિતની સેવાઓ મારફતે આપની પાસેથી (અથવા આપના લાઇસેંસરો) પાસેથી કોઈ પણ અધિકાર, માલિકી હક અથવા લાભ મેળવતું નથી. તમે સ્વીકાર્યું હોય અથવા Google સાથે લિખિત સંમત થયા હોવ એ સિવાય તમે સંમત થાઓ છો કે તમે તે હકોને સુરક્ષિત રાખવા અને અમલ કરવા માટે જવાબદાર છો અને એ કે તમારા વતી આવું કરવામાં Google ને કોઈ બંધન નથી.

    8.5 આપ સ્વીકારો છો કે કોઈપણ માલિકી હકની સૂચનાઓ (કૉપિરાઇટ અને ટ્રેડ માર્ક સૂચનાઓ સહિત) ને કાઢી, છુપાવી કે બદલી શકતા નથી કે જે સેવાઓની અંતર્ગત ઉમેરેલ અથવા તેમાં રહેલ હોઈ શકે છે.

    8.6 જો કે Google દ્વારા આપને લિખિતમાં તેમ કરવાની સ્પષ્ટ અધિકૃતતા આપવામાં આવી છે, તેમ છતાં આપ સ્વીકારો છો કે સેવાનાં ઉપયોગમાં, આપ કોઈ ટ્રેડમાર્ક, સેવા ચિહ્ન, ટ્રેડ નામ, કોઈ કંપની અથવા સંસ્થાના લોગોનો ઉપયોગ એ પ્રકારે કે હેતુપૂર્વક કરી શકતા નથી કે જેથી તેવા માર્ક્સ, નામ અથવા લોગોનાં અધિકૃત ઉપયોગકર્તાઓ અથવા માલિક વિશે ગૂંચવણનું કારણ બને.

    -@@ -96,8 +96,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -98,8 +98,8 @@ h2 { font-size:1em; margin-top:0 }

    (IV) આપના પાસવર્ડ અને એકાઉન્ટની વિગતોને સુરક્ષિત અને ગોપનીય રાખવામાં આપની નિષ્ફળતા;

    14.2 GOOGLE ની ઉપર ફકરા 14.1 માંની આપના પ્રત્યેની મર્યાદાઓ આવા પ્રકારનાં કોઈપણ નુકસાન ઉદ્ભવે તેની સંભાવના માટે જાગ્રત હોય અથવા તે માટેની સલાહ આપતું હોય અથવા ન આપતું હોય તો પણ લાગુ થઈ શકે છે.

    15. કૉપીરાઇટ અને ટ્રેડ માર્ક નીતિઓ

    @@ -36146,7 +35998,7 @@ diff --git a/components/resources/terms/terms_gu.html b/components/resources/ter

    16. જાહેરાતો

    16.1 કેટલીક સેવાઓ જાહેરાતોથી આવક દ્વારા સમર્થિત હોય છે અને જાહેરાતો અને પ્રમોશન પ્રદર્શિત કરી શકે છે. આ જાહેરાતો સેવાઓ પર સંગ્રહિત માહિતીની સામગ્રી, સેવાઓ દ્વારા થતા પ્રશ્નો અને અન્ય માહિતીને અનુલક્ષીને હોય છે.

    16.2 સેવાઓ પર જાહેરાતોની પદ્ધતિ, મોડ અને તેની સમય મર્યાદા, આપને કોઈ વિશિષ્ટ સૂચના આપ્યા વગર બદલવામાં આવી શકે છે.

    -@@ -107,7 +107,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -109,7 +109,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 તમે સ્વીકારો છો કે Google કોઈપણ બાહ્ય સાઇટ્સ અથવા સંસાધનોની ઉપલબ્ધતા માટે જવાબદાર નથી અને એવી વેબ સાઇટ્સ અથવા સંસાધનો પરની અથવા તરફની કોઈપણ જાહેરાત, ઉત્પાદનો અથવા અન્ય સામગ્રીનું સમર્થન કરતું નથી.

    17.3 તમે સ્વીકારો છો કે Google એવી બાહ્ય સાઇટ્સ અથવા સંસાધનોની ઉપલબ્ધતાનાં પરિણામ રૂપે આપના દ્વારા થયેલી હાનિ કે નુકસાન અથવા એવી વેબ સાઇટ્સ અથવા સંસાધનો પર અથવા તેના દ્વારા ઉપલબ્ધ કરવામાં આવેલ જાહેરાત, ઉત્પાદનો અથવા અન્ય સામગ્રીની સમ્પૂર્ણતા, ચોકસાઈ અથવા અસ્તિત્વ પર તમારા દ્વારા વિશ્વાસ કર્યાનાં પરિણામે થયેલી હાનિ કે નુકસાન માટે જવાબદાર નથી.

    18. શરતોમાં ફેરફાર

    @@ -36158,7 +36010,16 @@ diff --git a/components/resources/terms/terms_gu.html b/components/resources/ter diff --git a/components/resources/terms/terms_he.html b/components/resources/terms/terms_he.html --- a/components/resources/terms/terms_he.html +++ b/components/resources/terms/terms_he.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    אנו מעדכנים את התנאים וההגבלות של Chrome ב-31 במרץ 2020. התנאים החדשים יכללו את התנאים וההגבלות של Google ואת התנאים וההגבלות הנוספים של Google Chrome ו-Chrome OS. עד למועד זה ימשיכו לחול התנאים שלהלן. כדי לקבל פרטים נוספים, ניתן לעיין בסיכום של השינויים העיקריים (https://policies.google.com/terms/chromechanges).

    • בקישורים הבאים אפשר לעיין מראש בתנאים החדשים (https://policies.google.com/terms/update) ובתנאים הנוספים (https://www.google.com/chrome/terms).

    אם אינך רוצה להביע הסכמה לתנאים החדשים, האפשרויות העומדות בפניך מפורטות בשאלות הנפוצות (https://policies.google.com/terms/chromechanges#faq).

    ++

    אנו מעדכנים את התנאים וההגבלות של Chrome ב-31 במרץ 2020. התנאים החדשים יכללו את התנאים וההגבלות של Google ואת התנאים וההגבלות הנוספים של Google Chrome ו-Chrome OS. עד למועד זה ימשיכו לחול התנאים שלהלן. כדי לקבל פרטים נוספים, ניתן לעיין בסיכום של השינויים העיקריים (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    • בקישורים הבאים אפשר לעיין מראש בתנאים החדשים (https://policies.9oo91e.qjz9zk/terms/update) ובתנאים הנוספים (https://www.9oo91e.qjz9zk/chrome/terms).

    אם אינך רוצה להביע הסכמה לתנאים החדשים, האפשרויות העומדות בפניך מפורטות בשאלות הנפוצות (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    התנאים וההגבלות של Google Chrome

    +

    תנאים והגבלות אלו חלים על גרסת הקוד להרצה של Google Chrome. קוד המקור עבור Google Chrome זמין, ללא תשלום, במסגרת הסכמי רישיון של תוכנת קוד פתוח, בכתובת chrome://credits.

    +

    1. יחסיך עם Google‏

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 אתה מסכים שלא לשחזר, לשכפל, להעתיק, למכור, לסחור או למכור שוב את ה'שירותים' לכל מטרה שהיא, אלא אם הותר לך במפורש בהסכם נפרד עם Google לעשות כן.

    5.4 אתה מסכים שאתה הוא האחראי הבלעדי (ול-Google אין כל אחריות כלפיך או כלפי כל צד שלישי) על כל הפרה של התחייבויותיך במסגרת ה'תנאים' ועל כל ההשלכות (לרבות הפסד או נזק כלשהם שעלולים להיגרם ל-Google) שיש לכל הפרה שכזו.

    6. פרטיות והפרטים האישיים שלך

    @@ -36173,7 +36034,7 @@ diff --git a/components/resources/terms/terms_he.html b/components/resources/ter

    7.4 אתה מבין שעל ידי שימוש ב'שירותים', אתה עלול להיות חשוף לתוכן הנתפס על ידך כפוגע, כבלתי ראוי, או כמעורר התנגדות, וכי השימוש שלך ב'שירותים' בהקשר זה הוא על אחריותך בלבד.

    7.5 אתה מסכים שאתה האחראי הבלעדי (ושל-Google אין כל אחריות כלפיך או כלפי כל צד שלישי) לכל 'תוכן' שאתה יוצר, שולח או מציג תוך כדי שימוש ב'שירותים' ולהשלכות של הפעולות שלך (לרבות כל הפסד או נזק שעלולים להיגרם ל-Google) בעקבות זאת.

    8. זכויות קניין

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (5) אי-שמירה מצדך על אבטחת הסיסמה או פרטי חשבונך או על הסודיות שלהם,

    14.2 המגבלות על חבותה של Google כלפיך, כאמור בסעיף 14.1 לעיל, יחולו בין אם Google קיבלה הודעה על האפשרות לגרימת אובדנים כאלו, או שהייתה אמורה להיות מודעת אליהם, ובין אם לאו.

    15. מדיניות בנושא זכויות יוצרים וסימנים מסחריים

    @@ -36184,7 +36045,7 @@ diff --git a/components/resources/terms/terms_he.html b/components/resources/ter

    16. פרסומות

    16.1 מספר 'שירותים' ממומנים מהכנסות מפרסום ורשאים להציג פרסומות וקידומי מכירות. פרסומות אלו יכולות להתמקד בתוכן של מידע המאוחסן ב'שירותים', בשאילתות המבוצעות דרך ה'שירותים' או במידע אחר.

    16.2 האופי, המצב וההיקף של הפרסום של Google ב'שירותים' , נתונים לשינוי, ללא הודעה מיוחדת שתישלח אליך.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 אתה מאשר ומסכים ש-Google אינה אחראית לזמינות של אתרים או משאבים חיצוניים אלו, והיא אינה מאשרת כל פרסום, מוצר או חומר אחר באתרי אינטרנט או במשאבים כאלו, או כל פרסום, מוצר או חומר אחר שנמצא זמין דרכם.

    17.3 אתה מאשר ומסכים של-Google אין חבות בגין כל הפסד או נזק שעלולים להיגרם לך כתוצאה מזמינותם של אתרים או משאבים חיצוניים אלו, או כתוצאה מכל הסתמכות שלך על השלמות, הדיוק, או הקיום של כל פרסום, מוצר, או חומר אחר באתרי אינטרנט או משאבים כאלו או שנמצא זמין דרכם.

    18. שינויים בתנאים

    @@ -36196,7 +36057,16 @@ diff --git a/components/resources/terms/terms_he.html b/components/resources/ter diff --git a/components/resources/terms/terms_hi.html b/components/resources/terms/terms_hi.html --- a/components/resources/terms/terms_hi.html +++ b/components/resources/terms/terms_hi.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    हम 31 मार्च, 2020 को Chrome की सेवा की शर्तें अपडेट कर रहे हैं. नई शर्तों में Google की सेवा की शर्तों के साथ ही, Google Chrome और Chrome OS की सेवा की अतिरिक्त शर्तें शामिल होंगी. तब तक, नीचे दी गई शर्तें लागू रहेंगी. ज़्यादा जानकारी के लिए, मुख्य बदलावों की खास जानकारी (https://policies.google.com/terms/chromechanges) देखें.

    अगर आप हमारी नई शर्तों से सहमत नहीं हैं, तो आप हमारे अक्सर पूछे जाने वाले सवालों (https://policies.google.com/terms/chromechanges#faq) में जाकर जान सकते हैं कि आप क्या कर सकते हैं.

    ++

    हम 31 मार्च, 2020 को Chrome की सेवा की शर्तें अपडेट कर रहे हैं. नई शर्तों में Google की सेवा की शर्तों के साथ ही, Google Chrome और Chrome OS की सेवा की अतिरिक्त शर्तें शामिल होंगी. तब तक, नीचे दी गई शर्तें लागू रहेंगी. ज़्यादा जानकारी के लिए, मुख्य बदलावों की खास जानकारी (https://policies.9oo91e.qjz9zk/terms/chromechanges) देखें.

    अगर आप हमारी नई शर्तों से सहमत नहीं हैं, तो आप हमारे अक्सर पूछे जाने वाले सवालों (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq) में जाकर जान सकते हैं कि आप क्या कर सकते हैं.

    +

    Google Chrome सेवा की शर्तें

    +

    सेवा की ये शर्तें Google Chrome के निष्पादन योग्य कोड संस्करण पर लागू होती हैं. Google Chrome के लिए स्रोत कोड chrome://credits पर खुला स्रोत सॉफ़्टवेयर लाइसेंस अनुबंध के अंतर्गत निःशुल्क उपलब्ध है.

    +

    1. Google के साथ आपका संबंध

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 आप सहमत हैं कि आप किसी भी उद्देश्य के लिए सेवाओं का पुनरुत्पादन, अनुलिपि, प्रतिलिपि, विक्रय, व्यापार या पुनर्विक्रय नहीं करेंगे, जब तक कि आपको Google के साथ किसी पृथक अनुबंध में विशेष रूप से ऐसा करने की अनुमति न दी जाए.

    5.4 आप सहमत हैं कि शर्तों के अंतर्गत आपके दायित्वों के उल्लंघन के लिए और ऐसे किसी उल्लंघन (Google को होने वाली किसी हानि या क्षति सहित) के परिणामों के लिए केवल आप ज़िम्मेदार हैं (और इसके लिए Google की आपके या किसी तृतीय पक्ष के प्रति कोई ज़िम्मेदारी नहीं है).

    6. गोपनीयता और आपकी व्यक्तिगत जानकारी

    @@ -36218,7 +36088,7 @@ diff --git a/components/resources/terms/terms_hi.html b/components/resources/ter

    8.4 Google स्वीकार करता और सहमति देता है कि इन शर्तों के अंतर्गत आपसे (या आपके लाइसेंसदाताओं) ऐसी किसी भी सामग्री में या का, जिसे आप सेवाओं में या उनके माध्यम से सबमिट, पोस्ट, संप्रेषित या प्रदर्शित करते हैं, तो उस सामग्री में मौजूद किसी भी बौद्धिक संपदा अधिकार (चाहे वे अधिकार पंजीकृत हों या न हों, और वे विश्व में जहां कहीं भी मौजूद हों) सहित कोई अधिकार, स्वत्वाधिकार या हित नहीं प्राप्त करता. आपके द्वारा Google से लिखित रूप में सहमति न लिए जाने तक, आप सहमत हैं कि आप उन अधिकारों की रक्षा करने और उन्हें लागू करने के लिए ज़िम्मेदार हैं और ऐसा करने के लिए Google का आपकी ओर से कोई दायित्व नहीं है.

    8.5 आप सहमति देते हैं कि आप सेवाओं से जुड़े हुए या उनमें शामिल किसी भी स्वत्वाधिकार सूचना (कॉपीराइट और ट्रेडमार्क सूचनाओं सहित) को नहीं निकालेंगे, अस्पष्ट नहीं बनाएंगे या नहीं बदलेंगे.

    8.6 जब तक Google ने आपको स्पष्टतः लिखित रूप से ऐसा करने के लिए अधिकृत न किया हो, आप सहमत हैं कि इन सेवाओं के उपयोग में, आप किसी कंपनी या संगठन के ट्रेडमार्क, सेवा चिह्न, ट्रेड नाम, लोगो का ऐसे किसी रूप में उपयोग नहीं करेंगे जिससे उन चिह्नों, नामों या लोगो के स्वामियों या अधिकृत उपयोगकर्ता के बारे में भ्रम पैदा होने की संभावना हो या ऐसा करने का अभिप्राय हो.

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (iv) अपने पासवर्ड या खाता विवरण को सुरक्षित और गोपनीय रखने में आपकी विफलता;

    14.2 उपरोक्त अनुच्छेद 14.1 में आपके प्रति Google के दायित्वों की सीमाएं लागू होंगी, चाहे GOOGLE को किसी भी हानि की संभावनाओं के बारे में परामर्श दिया गया हो या नहीं या ऐसी हानियों के होने के बारे में उसे अवगत होना चाहिए था या नहीं.

    15. कॉपीराइट और ट्रेडमार्क नीतियां

    @@ -36229,7 +36099,7 @@ diff --git a/components/resources/terms/terms_hi.html b/components/resources/ter

    16. विज्ञापन

    16.1 कुछ सेवाएं विज्ञापन की आमदनी द्वारा समर्थित हैं और विज्ञापनों तथा प्रचारों को प्रदर्शित कर सकती हैं. ये विज्ञापन इन सेवाओं में संगृहीत जानकारी की सामग्री, सेवाओं के माध्यम से की गई क्वेरी या अन्य जानकारी पर लक्षित हो सकते हैं.

    16.2 आपको विशिष्ट सूचना दिए बिना Google द्वारा सेवाओं पर विज्ञापन देने का तरीका, मोड और मात्रा परिवर्तित किए जा सकते हैं.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 आप स्वीकार करते और सहमति देते हैं कि Google किसी भी ऐसी बाह्य साइट और संसाधन की उपलब्धता के लिए ज़िम्मेदार नहीं है, और ऐसी वेब साइट या संसाधनों पर या द्वारा उपलब्ध किसी भी विज्ञापन, उत्पाद या अन्य सामग्री की अनुमति नहीं देता है.

    17.3 आप स्वीकार करते और सहमति देते हैं कि उन बाह्य साइट और संसाधनों की उपलब्धता के परिणामस्वरूप या ऐसी वेब साइटों या संसाधनों पर या उनसे उपलब्ध किसी विज्ञापन, उत्पाद या अन्य सामग्री की पूर्णता, सटीकता या मौजूदगी पर आपके द्वारा किए गए भरोसे के परिणामस्वरूप आपको हो सकने वाली किसी भी हानि या क्षति के लिए Google उत्तरदायी नहीं है.

    18. शर्तों में परिवर्तन

    @@ -36241,7 +36111,16 @@ diff --git a/components/resources/terms/terms_hi.html b/components/resources/ter diff --git a/components/resources/terms/terms_hr.html b/components/resources/terms/terms_hr.html --- a/components/resources/terms/terms_hr.html +++ b/components/resources/terms/terms_hr.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Uvjete pružanja usluge za Chrome ažurirat ćemo 31. ožujka 2020. Novi uvjeti uključivat će Googleove uvjete pružanja usluge i Dodatne uvjete pružanja usluge za Google Chrome i OS Chrome. U međuvremenu se i dalje primjenjuju uvjeti u nastavku. Više pojedinosti pročitajte u sažetku ključnih promjena (https://policies.google.com/terms/chromechanges).

    • Pogledajte pregled novih Uvjeta (https://policies.google.com/terms/update) i Dodatnih uvjeta (https://www.google.com/chrome/terms).

    Ako ne prihvaćate naše nove Uvjete pružanja usluge, više informacija o svojim mogućnostima možete pronaći u našim Čestim pitanjima (https://policies.google.com/terms/chromechanges#faq).

    ++

    Uvjete pružanja usluge za Chrome ažurirat ćemo 31. ožujka 2020. Novi uvjeti uključivat će Googleove uvjete pružanja usluge i Dodatne uvjete pružanja usluge za Google Chrome i OS Chrome. U međuvremenu se i dalje primjenjuju uvjeti u nastavku. Više pojedinosti pročitajte u sažetku ključnih promjena (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    • Pogledajte pregled novih Uvjeta (https://policies.9oo91e.qjz9zk/terms/update) i Dodatnih uvjeta (https://www.9oo91e.qjz9zk/chrome/terms).

    Ako ne prihvaćate naše nove Uvjete pružanja usluge, više informacija o svojim mogućnostima možete pronaći u našim Čestim pitanjima (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome uvjeti pružanja usluge

    +

    Ovi Uvjeti pružanja usluge primjenjuju se na izvršnu verziju koda preglednika Google Chrome. Izvorni kôd za Google Chrome dostupan je besplatno prema ugovorima o softverskoj licenci otvorenog koda na chrome://credits.

    +

    1. Vaš ugovorni odnos s Googleom

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Suglasni ste da ni u koju svrhu nećete reproducirati, udvostručavati, kopirati, prodavati Usluge, trgovati njima ili ih preprodavati, osim ako vam to nije izričito dopušteno posebnim ugovorom s Googleom.

    5.4 Suglasni ste da ste isključivo odgovorni (te da Google ne snosi nikakvu odgovornost prema vama ili bilo kojoj trećoj strani) za bilo kakvo kršenje vaših obveza u odnosu na Uvjete te za posljedice (uključujući gubitak ili štetu koja može biti nanesena Googleu) takvog kršenja.

    6. Privatnost i osobni podaci

    @@ -36263,7 +36142,7 @@ diff --git a/components/resources/terms/terms_hr.html b/components/resources/ter

    8.4 Google priznaje i suglasan je s tim da mu vi (ili vaši davatelji licence) u skladu s ovim Uvjetima niste dali nikakva prava, pravo vlasništva niti udio u pogledu bilo kojeg Sadržaja koji pošaljete, objavite, prenesete ili prikažete na Uslugama ili putem njih, uključujući sva prava intelektualnog vlasništva koja postoje u tom Sadržaju (bez obzira jesu li ta prava registrirana ili ne i bez obzira na to gdje u svijetu ta prava postoje). Suglasni ste da sami snosite odgovornost za zaštitu i provedbu tih prava te da Google nije obvezan to učiniti u vaše ime, osim ako nije drugačije u pisanom obliku dogovoreno s Googleom.

    8.5 Suglasni ste da nećete uklanjati, sakriti ili promijeniti bilo kakve obavijesti o pravima vlasništva (uključujući obavijesti o autorskim pravima i zaštitnim znakovima) koje se nalaze uz Usluge ili su njihov dio.

    8.6 Suglasni ste da u upotrebi usluga nećete koristiti nikakav zaštitni znak, zaštitni znak usluge, zaštićeni naziv te logotip bilo koje tvrtke ili organizacije na način koji bi mogao ili čija je namjera izazvati nejasnoće u vezi s vlasnikom ili ovlaštenim korisnikom takvih znakova, naziva ili logotipa, osim ako vas Google u pisanom obliku nije izričito ovlastio za to.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Prihvaćate i suglasni ste da Google nije odgovoran za dostupnost svih takvih vanjskih web-lokacija ili resursa te da ne potiče oglašavanje, proizvode ili druge materijale dostupne na takvim web-lokacijama ili resursima.

    17.3 Prihvaćate i suglasni ste da Google nije odgovoran za bilo kakav gubitak ili štetu koju ste pretrpjeli zbog dostupnosti takvih vanjskih web-lokacija ili resursa ili zbog oslanjanja na potpunost, točnost ili postojanje bilo kakvog oglašavanja, proizvoda ili drugih materijala dostupnih na takvim web-lokacijama ili resursima.

    18. Izmjene uvjeta

    @@ -36275,7 +36154,16 @@ diff --git a/components/resources/terms/terms_hr.html b/components/resources/ter diff --git a/components/resources/terms/terms_hu.html b/components/resources/terms/terms_hu.html --- a/components/resources/terms/terms_hu.html +++ b/components/resources/terms/terms_hu.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    2020. március 31-én frissítjük a Chrome Általános Szerződési Feltételeket. Az új feltételek között megtalálhatók a Google Általános Szerződési Feltételek, valamint a Google Chrome és a Chrome OS Kiegészítő Általános Szerződési Feltételei is. Addig az alábbi feltételek maradnak érvényesek. További részletekért lásd a legfontosabb változások összefoglalását (https://policies.google.com/terms/chromechanges).

    Ha nem fogadja el az új Általános Szerződési Feltételeket, a lehetőségeiről a Gyakran Ismételt Kérdések (https://policies.google.com/terms/chromechanges#faq) oldalán tájékozódhat.

    ++

    2020. március 31-én frissítjük a Chrome Általános Szerződési Feltételeket. Az új feltételek között megtalálhatók a Google Általános Szerződési Feltételek, valamint a Google Chrome és a Chrome OS Kiegészítő Általános Szerződési Feltételei is. Addig az alábbi feltételek maradnak érvényesek. További részletekért lásd a legfontosabb változások összefoglalását (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    Ha nem fogadja el az új Általános Szerződési Feltételeket, a lehetőségeiről a Gyakran Ismételt Kérdések (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq) oldalán tájékozódhat.

    +

    Google Chrome - Általános Szerződési Feltételek

    +

    A jelen Általános Szerződési Feltételek szabályozzák a Google Chrome futtatható kódú változatának az Ön által való használatát. A Google Chrome forráskódja a nyílt forráskódú szoftverekre vonatkozó licencszerződések keretében díjmentesen elérhető a következő címen: chrome://credits.

    +

    1. Az Ön kapcsolata a Google-lal

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Ön kijelenti, hogy semmilyen célból sem reprodukálja, másolja le, értékesíti, forgalmazza vagy árusítja a Szolgáltatást, hacsak erre a Google egy külön szerződésben kifejezetten fel nem hatalmazza.

    5.4 Ön kijelenti, hogy a jelen Feltételekben foglalt kötelességeinek megszegéséért Ön viseli a kizárólagos felelősséget (és hogy a Google semmilyen felelősséggel nem tartozik sem Önnek, sem bármely harmadik félnek); Önt terheli a felelősség továbbá a Feltételek ilyen megszegésének következményeiért is (beleértve a Google által esetleg elszenvedett veszteségeket és károkat is).

    6. Adatvédelem és személyes adatok

    @@ -36297,7 +36185,7 @@ diff --git a/components/resources/terms/terms_hu.html b/components/resources/ter

    8.4 A Google tudomásul veszi és elfogadja, hogy a jelen Feltételek értelmében semmilyen jogot, jogcímet vagy érdekeltséget sem szerez Öntől (vagy licencbe adóitól) az Ön által a Szolgáltatások révén elküldött, közzétett, átvitt vagy megjelenített tartalomra vagy annak részére, beleértve a Tartalomra fennálló szellemi tulajdonjogokat is (függetlenül attól, hogy történetesen be vannak-e jegyezve ezek a jogok, bárhol létezzenek is ezek a jogok a világon). A Google-lal írásban megkötött ezzel ellentétes értelmű szerződés híján Ön kijelenti, hogy Ön felelős ezen jogok védelméért és betartatásáért, és hogy a Google nem köteles ezt megtenni az Ön érdekében.

    8.5 Kijelenti, hogy nem távolít el, nem fed el és nem módosít semmilyen, a Szolgáltatásokon vagy azok tartalmán elhelyezett, a saját tulajdonú jogokra vonatkozó tájékoztatót (köztük a szerzői jogi és védjegy-tájékoztatókat).

    8.6 Ön kijelenti, hogy hacsak a Google erre kifejezetten fel nem hatalmazta írásban, a Szolgáltatások használata során nem használja egyetlen vállalat vagy szervezet védjegyét, szolgáltatásnevét, kereskedelmi nevét vagy emblémáját oly módon, amely valószínűleg vagy szándéka szerint zavart okozhat az ilyen védjegyek, nevek vagy emblémák tulajdonosát vagy jogosult felhasználóját illetően.

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) A JELSZÓ ÉS A FIÓKADATOK BIZTONSÁGOS TÁROLÁSÁNAK ÉS TITOKBAN TARTÁSÁNAK ÖN ÁLTAL TÖRTÉNŐ ELMULASZTÁSA;

    14.2 A GOOGLE ÁLTAL ÖNNEL SZEMBEN VISELT FELELŐSSÉGNEK A 14.1. BEKEZDÉSBEN RÖGZÍTETT KORLÁTOZÁSA ATTÓL FÜGGETLENÜL FENNÁLL, HOGY A GOOGLE KAPOTT-E ELŐZETESEN FIGYELMEZTETÉST AZ ILYEN VESZTESÉGEK ESHETŐSÉGÉRE, ILLETVE TUDATÁBAN KELLETT-E HOGY LEGYEN A LEHETŐSÉGÜKNEK.

    15. A szerzői jogra és a védjegyekre vonatkozó irányelvek

    @@ -36308,7 +36196,7 @@ diff --git a/components/resources/terms/terms_hu.html b/components/resources/ter

    16. Hirdetések

    16.1 A Szolgáltatások egy részét hirdetési bevételekből finanszírozzuk, így azokon hirdetések és ajánlatok jelenhetnek meg. A hirdetések célozva lehetnek a Szolgáltatásokon tárolt információk tartalma, illetve a Szolgáltatásokon keresztül indított lekérdezések vagy más információk alapján.

    16.2 A Google által a Szolgáltatásokon nyújtott hirdetés módja és mértéke előzetes bejelentés nélkül megváltozhat.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Ön tudomásul veszi és elfogadja, hogy a Google nem felelős az ilyen külső webhelyek vagy források elérhetőségéért, és nem hagy jóvá semmilyen hirdetést, terméket vagy más anyagot, amely az ilyen webhelyeken vagy forrásokon elérhető.

    17.3 Ön tudomásul veszi és elfogadja, hogy a Google nem felelős azokért a veszteségekért és károkért, amelyek az ilyen külső webhelyek vagy források elérhetőségéből, illetve a rajtuk elhelyezett vagy róluk elérhető hirdetések, termékek vagy más anyagok teljességébe, pontosságába vagy meglétébe vetett hitből erednek.

    18. A Feltételek módosítása

    @@ -36320,7 +36208,16 @@ diff --git a/components/resources/terms/terms_hu.html b/components/resources/ter diff --git a/components/resources/terms/terms_id.html b/components/resources/terms/terms_id.html --- a/components/resources/terms/terms_id.html +++ b/components/resources/terms/terms_id.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Kami memperbarui persyaratan layanan untuk Chrome pada 31 Maret 2020. Persyaratan baru akan mencakup Persyaratan Layanan Google dan persyaratan layanan tambahan Google Chrome dan Chrome OS. Sebelum tanggal tersebut, persyaratan di bawah ini tetap berlaku. Lihat ringkasan perubahan utama (https://policies.google.com/terms/chromechanges) untuk mengetahui detail selengkapnya.

    Jika Anda tidak menyetujui Persyaratan baru kami, Anda dapat menemukan informasi selengkapnya tentang opsi Anda di Pertanyaan Umum (FAQ) (https://policies.google.com/terms/chromechanges#faq) kami.

    ++

    Kami memperbarui persyaratan layanan untuk Chrome pada 31 Maret 2020. Persyaratan baru akan mencakup Persyaratan Layanan Google dan persyaratan layanan tambahan Google Chrome dan Chrome OS. Sebelum tanggal tersebut, persyaratan di bawah ini tetap berlaku. Lihat ringkasan perubahan utama (https://policies.9oo91e.qjz9zk/terms/chromechanges) untuk mengetahui detail selengkapnya.

    Jika Anda tidak menyetujui Persyaratan baru kami, Anda dapat menemukan informasi selengkapnya tentang opsi Anda di Pertanyaan Umum (FAQ) (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq) kami.

    +

    Persyaratan Layanan Google Chrome

    +

    Persyaratan Layanan ini berlaku untuk versi kode Google Chrome yang dapat dieksekusi. Kode sumber untuk Google Chrome tersedia secara gratis berdasarkan perjanjian lisensi perangkat lunak sumber terbuka di chrome://credits.

    +

    1. Hubungan Anda dengan Google

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Anda setuju untuk tidak memperbanyak, menggandakan, menyalin, menjual, memperdagangkan, atau menjual kembali Layanan demi tujuan apa pun, kecuali jika diizinkan secara khusus untuk melakukannya berdasarkan perjanjian terpisah dengan Google.

    5.4 Anda setuju untuk bertanggung jawab penuh (dan Google tidak bertanggung jawab kepada Anda atau pihak ketiga mana pun) atas pelanggaran kewajiban Anda berdasarkan Persyaratan ini dan konsekuensi (termasuk kerugian maupun kerusakan apa pun yang mungkin dialami Google) dari pelanggaran tersebut.

    6. Privasi dan informasi pribadi Anda

    @@ -36342,7 +36239,7 @@ diff --git a/components/resources/terms/terms_id.html b/components/resources/ter

    8.4 Google memahami dan menyetujui bahwa Google tidak mendapatkan hak, kuasa, atau kepentingan dari Anda (atau pemberi lisensi Anda) berdasarkan Persyaratan ini dalam atau terhadap Konten apa pun yang Anda kirimkan, poskan, sebarkan, atau tampilkan pada atau melalui Layanan, termasuk hak atas kekayaan intelektual yang terdapat dalam Konten (baik hak tersebut telah atau belum terdaftar dan di mana pun hak tersebut berlaku di seluruh dunia). Anda setuju untuk bertanggung jawab dalam melindungi serta melaksanakan hak tersebut dan Google tidak berkewajiban untuk melakukannya atas nama Anda, kecuali jika telah disetujui sebaliknya secara tertulis antara Anda dengan Google.

    8.5 Anda setuju bahwa Anda tidak diperbolehkan untuk menghapus, menyamarkan, atau mengganti pemberitahuan hak eksklusif apa pun (termasuk pemberitahuan hak cipta dan merek dagang) yang mungkin melekat atau terdapat pada Layanan.

    -@@ -97,8 +97,8 @@ Anda setuju untuk bertanggung jawab dalam melindungi serta melaksanakan hak ters +@@ -99,8 +99,8 @@ Anda setuju untuk bertanggung jawab dalam melindungi serta melaksanakan hak ters

    (V) KEGAGALAN ANDA UNTUK MENJAGA KEAMANAN DAN KERAHASIAAN DETAIL AKUN ATAU SANDI;

    14.2 PEMBATASAN KEWAJIBAN GOOGLE KEPADA ANDA DALAM PARAGRAF 14.1 DI ATAS AKAN BERLAKU, BAIK GOOGLE TELAH ATAU BELUM DIBERITAHUKAN ATAU SEHARUSNYA MENGETAHUI KEMUNGKINAN KERUGIAN YANG TIMBUL TERSEBUT.

    15. Kebijakan hak cipta dan merek dagang

    @@ -36353,7 +36250,7 @@ diff --git a/components/resources/terms/terms_id.html b/components/resources/ter

    16. Iklan

    16.1 Beberapa Layanan didukung oleh penghasilan iklan serta mungkin menampilkan iklan dan promosi. Iklan tersebut mungkin ditargetkan untuk konten informasi yang tersimpan dalam Layanan, permintaan yang dilakukan melalui Layanan, atau informasi lainnya.

    16.2 Cara, mode, dan tingkat iklan Google pada Layanan dapat berubah tanpa pemberitahuan khusus kepada Anda.

    -@@ -108,7 +108,7 @@ Anda setuju untuk bertanggung jawab dalam melindungi serta melaksanakan hak ters +@@ -110,7 +110,7 @@ Anda setuju untuk bertanggung jawab dalam melindungi serta melaksanakan hak ters

    17.2 Anda memahami dan menyetujui bahwa Google tidak bertanggung jawab atas ketersediaan situs eksternal atau sumber apa pun dan tidak mendukung iklan, produk, maupun materi lainnya pada atau yang tersedia di situs web maupun sumber tersebut.

    17.3 Anda memahami dan menyetujui bahwa Google tidak berkewajiban atas kerugian atau kerusakan apa pun yang mungkin disebabkan oleh Anda sebagai akibat ketersediaan situs atau sumber eksternal maupun keyakinan Anda tentang kelengkapan, keakuratan, atau ketersediaan iklan, produk, atau materi apa pun pada atau yang tersedia di situs web atau sumber tersebut.

    18. Perubahan Persyaratan

    @@ -36365,7 +36262,16 @@ diff --git a/components/resources/terms/terms_id.html b/components/resources/ter diff --git a/components/resources/terms/terms_it.html b/components/resources/terms/terms_it.html --- a/components/resources/terms/terms_it.html +++ b/components/resources/terms/terms_it.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Il 31 marzo 2020 aggiorneremo i Termini di servizio di Chrome. I nuovi termini includeranno i Termini di servizio di Google, nonché i Termini di servizio aggiuntivi di Google Chrome e Chrome OS. Fino alla data indicata rimangono in vigore i termini che seguono. La pagina del riepilogo delle modifiche principali (https://policies.google.com/terms/chromechanges) fornisce ulteriori informazioni.

    • È disponibile un'anteprima dei nuovi Termini (https://policies.google.com/terms/update) e dei Termini aggiuntivi (https://www.google.com/chrome/terms).

    Se l'utente non accetta i nuovi Termini, può trovare ulteriori informazioni sulle opzioni a sua disposizione nelle Domande frequenti (https://policies.google.com/terms/chromechanges#faq).

    ++

    Il 31 marzo 2020 aggiorneremo i Termini di servizio di Chrome. I nuovi termini includeranno i Termini di servizio di Google, nonché i Termini di servizio aggiuntivi di Google Chrome e Chrome OS. Fino alla data indicata rimangono in vigore i termini che seguono. La pagina del riepilogo delle modifiche principali (https://policies.9oo91e.qjz9zk/terms/chromechanges) fornisce ulteriori informazioni.

    • È disponibile un'anteprima dei nuovi Termini (https://policies.9oo91e.qjz9zk/terms/update) e dei Termini aggiuntivi (https://www.9oo91e.qjz9zk/chrome/terms).

    Se l'utente non accetta i nuovi Termini, può trovare ulteriori informazioni sulle opzioni a sua disposizione nelle Domande frequenti (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Termini di servizio di Google Chrome

    +

    I presenti Termini di servizio si applicano alla versione di codice eseguibile di Google Chrome. Il codice sorgente di Google Chrome è disponibile gratuitamente ai sensi dei contratti di licenza del software open source all'indirizzo chrome://credits.

    +

    1. Il rapporto dell'utente con Google

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 A meno che non sia stato specificamente autorizzato ad agire in tal modo mediante un contratto distinto stipulato con Google, l'utente accetta di non riprodurre, duplicare, copiare, vendere, commercializzare o rivendere i Servizi per alcun fine.

    5.4 L'utente accetta di essere l'unico responsabile (ed esonera Google da qualsiasi responsabilità nei suoi confronti o nei confronti di terzi) di qualsiasi inadempimento dei propri obblighi, ai sensi dei Termini, e delle conseguenze di tale violazione (compresi gli eventuali danni o perdite subiti da Google).

    6. Privacy e informazioni personali

    @@ -36387,7 +36293,7 @@ diff --git a/components/resources/terms/terms_it.html b/components/resources/ter

    8.4 Google riconosce e accetta di non ottenere dall'utente (o dai suoi licenziatari) alcun diritto, titolo o interesse, ai sensi dei presenti Termini, sui Contenuti inviati, pubblicati, trasmessi o visualizzati dall'utente su o tramite i Servizi, compreso qualsiasi diritto di proprietà intellettuale intrinseco in tali Contenuti (sia che tali diritti siano o meno registrati e ovunque nel mondo essi sussistano). Se non diversamente concordato per iscritto con Google, l'utente accetta di essere responsabile della tutela e dell'applicazione di tali diritti e che Google non ha alcun obbligo di agire in tal senso per conto dell'utente.

    8.5 L'utente accetta di non rimuovere, oscurare o alterare qualsiasi avviso sui diritti di proprietà (comprese informative sul copyright e sui marchi commerciali) eventualmente visualizzato o contenuto nei Servizi.

    8.6 Se non espressamente autorizzato per iscritto da Google ad agire in tal senso, l'utente conviene che, usufruendo dei Servizi, non utilizzerà alcun marchio commerciale, marchio di servizio, nome commerciale o logo di qualsiasi azienda o organizzazione in modo tale da causare accidentalmente o intenzionalmente confusione in merito al proprietario o all'utente autorizzato di tali marchi, nomi o loghi.

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) INADEMPIENZA DELL'UTENTE NEL MANTENERE LA SUA PASSWORD O I DETTAGLI DEL SUO ACCOUNT SICURI E RISERVATI;

    14.2 LE LIMITAZIONI DELLA RESPONSABILITÀ DI GOOGLE NEI CONFRONTI DELL'UTENTE DI CUI AL PARAGRAFO 14.1 SOPRA RIPORTATO SONO VALIDE SIA CHE GOOGLE SIA STATA INFORMATA, SIA CHE FOSSE O MENO A CONOSCENZA DELLA POSSIBILITÀ DEL VERIFICARSI DI TALI PERDITE.

    15. Norme sul copyright e sui marchi commerciali

    @@ -36398,7 +36304,7 @@ diff --git a/components/resources/terms/terms_it.html b/components/resources/ter

    16. Pubblicità

    16.1 Alcuni Servizi sono finanziati dalle entrate derivanti dalla pubblicità e possono visualizzare annunci pubblicitari e promozioni. Tali annunci pubblicitari possono essere mirati al contenuto delle informazioni memorizzate nei Servizi, a ricerche effettuate tramite i Servizi o ad altre informazioni.

    16.2 Lo stile, le modalità e l'ambito degli annunci di Google sui Servizi sono soggetti a modifica senza specifico preavviso all'utente.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 L'utente riconosce e accetta che Google non è responsabile della disponibilità di tali risorse o siti esterni e che non raccomanda la pubblicità, i prodotti o altri materiali presenti su tali siti o resi disponibili da tali risorse web.

    17.3 L'utente riconosce e accetta che Google non è responsabile di alcuna perdita o danno subito dall'utente in conseguenza della disponibilità di tali risorse o siti esterni o come risultato dell'affidamento dell'utente sulla completezza, l'accuratezza o l'esistenza di annunci pubblicitari, prodotti o altri materiali presenti su tali siti web o resi disponibili da tali risorse web.

    18. Modifica dei Termini

    @@ -36410,7 +36316,16 @@ diff --git a/components/resources/terms/terms_it.html b/components/resources/ter diff --git a/components/resources/terms/terms_ja.html b/components/resources/terms/terms_ja.html --- a/components/resources/terms/terms_ja.html +++ b/components/resources/terms/terms_ja.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Chrome 利用規約を 2020 年 3 月 31 日に更新します。新しい利用規約は、Google 利用規約と、Google Chrome および Chrome OS 追加利用規約で構成されます。それまでは以下の利用規約が引き続き適用されます。詳しくは、主な変更の概要 (https://policies.google.com/terms/chromechanges)をご覧ください。

    • 新しい利用規約 (https://policies.google.com/terms/update)と追加利用規約 (https://www.google.com/chrome/terms)をご確認ください。

    新しい利用規約に同意いただけない場合は、よくある質問 (https://policies.google.com/terms/chromechanges#faq)で他の選択肢に関する情報をご覧ください。

    ++

    Chrome 利用規約を 2020 年 3 月 31 日に更新します。新しい利用規約は、Google 利用規約と、Google Chrome および Chrome OS 追加利用規約で構成されます。それまでは以下の利用規約が引き続き適用されます。詳しくは、主な変更の概要 (https://policies.9oo91e.qjz9zk/terms/chromechanges)をご覧ください。

    • 新しい利用規約 (https://policies.9oo91e.qjz9zk/terms/update)と追加利用規約 (https://www.9oo91e.qjz9zk/chrome/terms)をご確認ください。

    新しい利用規約に同意いただけない場合は、よくある質問 (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq)で他の選択肢に関する情報をご覧ください。

    +

    Google Chrome 利用規約

    +

    本利用規約は、実行コード バージョンの Google Chrome に適用されます。Google Chrome のソース コードは、chrome://credits のオープン ソース ソフトウェア ライセンスに基づき、無料でご利用いただけます。

    +

    1. ユーザーと Google の関係

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 ユーザーは、Google との別個の契約において明確な許可を受けた場合を除き、どのような目的であれ、本サービスの複製、複写、コピー、販売、トレードおよび再販売を行わないことに同意するものとします。

    5.4 ユーザーは、ユーザーが本規約に基づく義務に違反した場合、および上記違反の結果で発生する損失や損害(Google が被る可能性がある損失、損害を含む)について、ユーザーが単独で責任を負うこと、および Google がユーザーおよびいかなる第三者に対しても何らの責任を負わないことに同意するものとします。

    6. プライバシーと個人情報

    @@ -36432,7 +36347,7 @@ diff --git a/components/resources/terms/terms_ja.html b/components/resources/ter

    8.4 Google は、本規約に基づき、ユーザーが本サービスを通じて、または本サービス上に提出、掲示、送信または表示する、本コンテンツに対する権利、権原、または利益を、本コンテンツに内在する知的所有権を含め(その権利が登録されているか否か、または世界のどこにその権利が存在するかにかかわらず)、Google がユーザー(またはユーザーのライセンサー)から取得しないことを了承し、これに同意するものとします。別途 Google と書面で合意した場合を除き、ユーザーは、ご自身がかかる権利を保護および行使する責任を負うことならびに Google がユーザーに代わりこれを行う義務を負わないことに同意するものとします。

    8.5 ユーザーは、本サービスに関する、もしくは本サービス内に含まれる財産権についての告知(著作権および商標の告知を含む)を削除、改変したり、見えないようにしないことに同意するものとします。

    8.6 ユーザーは、Google が書面で明示的に権限を付与した場合を除き、本サービスを利用する際に、会社や組織の商標、サービスマーク、商号、ロゴを使用するにあたり、それらの所有者について混乱が生じるような方法で使用しないことに同意するものとします。

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V)ユーザーが、ご自身のパスワードまたはアカウントの明細の保護および機密保持を怠ったことに起因する損失または損害。

    14.2 上記の第 14.1 項でのユーザーに対する Google の責任の制限は、この種の損害が発生する可能性を Google が通知され、認識していたかどうかにかかわらず、適用されるものとします。

    15. 著作権および商標に関する方針

    @@ -36443,7 +36358,7 @@ diff --git a/components/resources/terms/terms_ja.html b/components/resources/ter

    16. 広告

    16.1 サービスの中には、広告収入によってサポートされているものもあり、広告や販促プログラムが表示される場合があります。これらの広告は、本サービス上に保存される情報の内容、または本サービスを介して行われたクエリ、またはその他の情報を対象とすることがあります。

    16.2 本サービス上の Google による広告の様式、形態および範囲は、ユーザーに対し特定の通知を行うことなく変更されることがあります。

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Google が、上記のような外部のサイトまたは情報源の利用可能性について責任を負わないこと、および、Google が、上記のようなウェブサイトまたは情報源における、またはここから入手できる広告、製品またはその他の要素を保証しないことについて了承し、これに同意するものとします。

    17.3 上記のような外部のサイトまたは情報源の利用可能性に起因し、または、ユーザーが、上記のようなウェブサイトや情報源における、またはそれらから入手できる広告、サービスやプロダクト、またはその他の要素の完全性、正確性または存在を信頼したことに起因して被るいかなる損失または損害についても、Google が責任を負わないことについて了承し、これに同意するものとします。

    18. 本規約の変更

    @@ -36455,7 +36370,16 @@ diff --git a/components/resources/terms/terms_ja.html b/components/resources/ter diff --git a/components/resources/terms/terms_kn.html b/components/resources/terms/terms_kn.html --- a/components/resources/terms/terms_kn.html +++ b/components/resources/terms/terms_kn.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.google.com/terms/update) and Additional Terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.9oo91e.qjz9zk/terms/update) and Additional Terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome ಸೇವಾ ನಿಯಮಗಳು

    +

    ಈ ಸೇವೆಯ ನಿಯಮಗಳುGoogle Chrome ನ ಕಾರ್ಯಗತಗೊಳಿಸುವ ಕೋಡ್ ಆವೃತ್ತಿಗೆ ಅನ್ವಯಿಸುತ್ತದೆ. Google Chrome ನ ಮೂಲ ಕೋಡ್ chrome://credits ನಲ್ಲಿ ತೆರೆದ ಮೂಲ ಸಾಫ್ಟ್‌ವೇರ್ ಪರವಾನಗಿ ಒಪ್ಪಂದದ ಅಡಿಯಲ್ಲಿ ಉಚಿತವಾಗಿ ಲಭ್ಯವಿದೆ.

    +

    1. Google ನೊಂದಿಗೆ ನಿಮ್ಮ ಸಂಬಂಧ

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Google ನೊಂದಿಗೆ ಪ್ರತ್ಯೇಕ ಒಪ್ಪಂದದ ವಿನಹ, ಯಾವುದೇ ಉದ್ದೇಶಕ್ಕಾಗಿ ಸೇವೆಗಳ ಪುನರುತ್ಪಾದನೆ, ನಕಲು, ಪ್ರತಿ, ಮಾರಾಟ, ವ್ಯಾಪಾರ ಅಥವಾ ಮರು ಮಾರಾಟ ಮಾಡುವುದಿಲ್ಲ ಎಂಬುದನ್ನು ನೀವು ಒಪ್ಪುತ್ತೀರಿ.

    5.4 ನಿಯಮಗಳಡಿಯಲ್ಲಿನ ನಿಮ್ಮ ಬದ್ಧತೆಗಳ ಉಲ್ಲಂಘನೆಗೆ ಮತ್ತು ಅದರಿಂದುಂಟಾದ ಯಾವುದೇ ಪರಿಣಾಮಗಳಿಗೆ ನೀವೇ ಜವಾಬ್ದಾರರು (ಮತ್ತು ನಿಮ್ಮ ಅಥವಾ ಇನ್ನಾವುದೇ ಮೂರನೇ ವ್ಯಕ್ತಿಯನ್ನು ಕುರಿತಂತೆ ಯಾವುದೇ ರೀತಿಯಿಂದಲೂ Google ಜವಾಬ್ದಾರಿ ಹೊಂದಿರುವುದಿಲ್ಲ ) ಎಂಬುದನ್ನು ನೀವು ಒಪ್ಪುತ್ತೀರಿ.

    6. ಗೌಪ್ಯತೆ ಮತ್ತು ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ

    @@ -36477,7 +36401,7 @@ diff --git a/components/resources/terms/terms_kn.html b/components/resources/ter

    8.4 ಈ ನಿಯಮಗಳ ಪ್ರಕಾರ ನೀವು (ಅಥವಾ ನಿಮ್ಮ ಪರವಾನಗಿದಾರರು) ಯಾವುದೇ ಬೌದ್ಧಿಕ ಆಸ್ತಿ ಹಕ್ಕುಗಳು ಸೇರಿದಂತೆ ನೀವು ಸಲ್ಲಿಸಿದ, ಪೋಸ್ಟ್ ಮಾಡಿದ, ಪ್ರಸಾರ ಮತ್ತು ಪ್ರದರ್ಶನಗಳ ಮೇಲೆ Google ಯಾವುದೇ ಹಕ್ಕು, ಶೀರ್ಷಿಕೆ, ಅಥವಾ ಆಸಕ್ತಿಯನ್ನು ಹೊಂದಿಲ್ಲ ಎಂಬುದನ್ನು Google ತಿಳಿದಿದೆ ಮತ್ತು ಒಪ್ಪಿದೆ. (ಆ ಹಕ್ಕುಗಳು ನೋಂದಣಿ ಆಗಿದೆಯೋ ಅಥವಾ ಇಲ್ಲವೋ, ಮತ್ತು ಜಗತ್ತಿನ ಎಲ್ಲೇ ಆದರೂ ಆ ಹಕ್ಕುಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿರಬಹುದು) ಲಿಖಿತ ಒಪ್ಪಂದವಿಲ್ಲದಿದ್ದರೆ, ಆ ಹಕ್ಕುಗಳನ್ನು ರಕ್ಷಿಸಲು ಮತ್ತು ಅವುಗಳನ್ನು ಜಾರಿಗೆ ತರಲು ನೀವೇ ಜವಾಬ್ದಾರರು ಮತ್ತು ನಿಮ್ಮ ಪರವಾಗಿ ಅವುಗಳನ್ನು ರಕ್ಷಿಸಲು Google ಗೆ ಯಾವುದೇ ಭಾದ್ಯತೆಯಿಲ್ಲ ಎಂಬುದನ್ನು ನೀವು ಒಪ್ಪುತ್ತೀರಿ.

    8.5 ನೀವು ಸೇವೆಗಳಲ್ಲಿ ಲಗತ್ತಿಸಿದ ಅಥವಾ ಸೇರಿಸಿರುವಂತಹ ಯಾವುದೇ ಮಾಲೀಕತ್ವ ಹಕ್ಕುಗಳ ಪ್ರಕಟಣೆಗಳನ್ನು (ಕೃತಿಸ್ವಾಮ್ಯ ಮತ್ತು ವ್ಯಾಪಾರ ಮುದ್ರೆ ಪ್ರಕಟಣೆಗಳನ್ನು ಒಳಗೊಂಡಂತೆ) ತೆಗೆದು ಹಾಕುವುದು, ಅಸ್ಪಷ್ಟಗೊಳಿಸುವುದು, ಮತ್ತು ಬದಲಾಯಿಸುವುದಾಗಲೀ ಮಾಡುವುದಿಲ್ಲ ಎಂಬುದನ್ನು ನೀವು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ.

    8.6 ನೀವು Google ನಿಂದ ಲಿಖಿತವಾಗಿ ವ್ಯಕ್ತ ಅಧಿಕಾರ ಪಡೆಯದ ಹೊರತು, ನೀವು ಈ ಸೇವೆಯನ್ನು ಬಳಸುವುದರ ಮೂಲಕ, ಯಾವುದೇ ವ್ಯಾಪಾರ ಮುದ್ರೆ, ಸೇವಾ ಮುದ್ರೆ, ವ್ಯಾಪಾರ ಹೆಸರು, ಯಾವುದೇ ಕಂಪನಿ ಅಥವಾ ಸಂಸ್ಥೆಯ ಲೋಗೊಗಳನ್ನು ಬಳಸುವುದಿಲ್ಲ ಅಥವಾ ಅಂತಹ ಮುದ್ರೆಗಳು, ಹೆಸರುಗಳು ಅಥವಾ ಲೋಗೊಗಳನ್ನು ಬಳಸುವ ಮಾಲೀಕರು ಅಥವಾ ಅಧಿಕೃತ ಬಳಕೆದಾರರ ಕುರಿತು ಗೊಂದಲಕ್ಕೆ ಆಸ್ಪದ ನೀಡುವುದಿಲ್ಲವೆಂಬುದನ್ನು ನೀವು ಒಪ್ಪುತ್ತೀರಿ.

    -@@ -96,8 +96,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -98,8 +98,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಅಥವಾ ಖಾತೆಯ ವಿವರಗಳನ್ನು ಸುರಕ್ಷಿತ ಮತ್ತು ಗೌಪ್ಯವಾಗಿ ಕಾಪಾಡಿಕೊಳ್ಳಲು ನೀವು ವಿಫಲರಾದರೆ;

    14.2 ಮೇಲಿರುವ ಪ್ಯಾರಾಗ್ರಾಫ್ 14.1 ರಲ್ಲಿರುವ GOOGLEನ ಬಾಧ್ಯತೆಯ ಮಿತಿಗಳು, GOOGLE ಗೆ ಸಲಹೆಮಾಡಿದ್ದರೂ ಅಥವಾ ಇಲ್ಲದಿದ್ದರೂ, ಅಥವಾ ಅಂತಹ ನಷ್ಟಗಳು ಆಗಬಹುದಾದ ಸಾಧ್ಯತೆಯ ಕುರಿತು ಎಚ್ಚರ ವಹಿಸಬಹುದಾಗಿತ್ತಾದರೂ ಅನ್ವಯಿಸುತ್ತದೆ.

    15. ಕೃತಿಸ್ವಾಮ್ಯ ಮತ್ತು ವ್ಯಾಪಾರ ಮುದ್ರೆ ನೀತಿಗಳು

    @@ -36488,7 +36412,7 @@ diff --git a/components/resources/terms/terms_kn.html b/components/resources/ter

    16. ಜಾಹೀರಾತುಗಳು

    16.1 ಕೆಲವು ಸೇವೆಗಳನ್ನು ಜಾಹೀರಾತು ವರಮಾನ ಬೆಂಬಲದಿಂದ ನಡೆಸಲಾಗುತ್ತದೆ ಮತ್ತು ಜಾಹೀರಾತುಗಳು ಹಾಗೂ ಪ್ರಾಯೋಜಕತ್ವವನ್ನು ಪ್ರದರ್ಶಿಸುತ್ತದೆ . ಈ ಜಾಹೀರಾತುಗಳು ಸೇವೆಗಳಲ್ಲಿ ಸಂಗ್ರಹಿಸಿದ ಮಾಹಿತಿಯ ವಿಷಯವನ್ನು, ಸೇವೆಗಳ ಅಥವಾ ಇತರ ಮಾಹಿತಿಗಳ ಮೂಲಕ ಮಾಡಲಾದ ಪ್ರಶ್ನೆಗಳನ್ನು ಗುರಿಯಾಗಿಟ್ಟುಕೊಂಡಿರಬಹುದು.

    16.2 ಸೇವೆಗಳಲ್ಲಿನ Google ನ ಜಾಹೀರಾತಿನ ವಿಧಾನ, ಮೋಡ್ ಮತ್ತು ಜಾಹೀರಾತಿನ ಹರವುಗಳು ನಿಮಗೆ ನಿರ್ದಿಷ್ಟ ಪ್ರಕಟಣೆಯನ್ನು ನೀಡದೆಯೇ ಬದಲಾಗಬಹುದು.

    -@@ -107,7 +107,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -109,7 +109,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 ಅಂತಹ ಯಾವುದೇ ಬಾಹ್ಯ ಸೈಟ್‌ಗಳಿಗೆ ಅಥವಾ ಸಂಪನ್ಮೂಲಗಳ ಲಭ್ಯತೆಗೆ ಹಾಗೂ ಯಾವುದೇ ಜಾಹೀರಾತುಗಳಿಗೆ Google ಜವಾಬ್ದಾರವಲ್ಲ, ಹಾಗೂ ಅಂತಹ ವೆಬ್‌ಸೈಟ್‌ಗಳು ಅಥವಾ ಸಂಪನ್ಮೂಲಗಳಿಂದಿರುವ ಅಥವಾ ಲಭ್ಯವಾಗುವ ಉತ್ಪನ್ನಗಳು ಅಥವಾ ಇತರ ವಸ್ತುಗಳನ್ನು Google ಸಮರ್ಥಿಸುವುದಿಲ್ಲ ಎಂಬುವುದನ್ನು ನೀವು ಸಮ್ಮತಿಸುತ್ತೀರಿ ಮತ್ತು ಒಪ್ಪುತ್ತೀರಿ.

    17.3 ಅಂತಹ ಬಾಹ್ಯ ಸೈಟ್‌ಗಳ ಅಥವಾ ಸಂಪನ್ಮೂಲಗಳ ಲಭ್ಯತೆಯ ಪರಿಣಾಮವಾಗಿ ಅಥವಾ ಅವುಗಳ ಪೂರ್ಣತೆ, ನಿಖರತೆ ಮತ್ತು ಜಾಹೀರಾತಿನ, ಉತ್ಪನ್ನಗಳ ಅಥವಾ ಇತರೆ ವಸ್ತುಗಳ ಅಸ್ತಿತ್ವದ ಕುರಿತಂತೆ ನೀವಿರಿಸಿದ ಭರವಸೆಯಿಂದಾಗಿ ನಿಮಗೆ ಯಾವುದೇ ನಷ್ಟ ಅಥವಾ ಹಾನಿ ಸಂಭವಿಸಿದಲ್ಲಿ Google ಇವುಗಳಿಗೆ ಹೊಣೆಗಾರಿಕೆ ಹೊಂದಿಲ್ಲ ಎಂಬದನ್ನು ನೀವು ಸಮ್ಮತಿಸುತ್ತೀರಿ ಮತ್ತು ಒಪ್ಪುತ್ತೀರಿ.

    18. ನಿಯಮಗಳಿಗೆ ಬದಲಾವಣೆಗಳು

    @@ -36500,7 +36424,16 @@ diff --git a/components/resources/terms/terms_kn.html b/components/resources/ter diff --git a/components/resources/terms/terms_ko.html b/components/resources/terms/terms_ko.html --- a/components/resources/terms/terms_ko.html +++ b/components/resources/terms/terms_ko.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    2020년 3월 31일 Chrome 서비스 약관이 업데이트될 예정입니다. 새로운 약관에는 Google의 서비스 약관과 Chrome 및 Chrome OS 추가 서비스 약관이 포함됩니다. 그때까지는 아래 약관이 계속 적용됩니다. 자세한 내용은 주요 변경사항 요약 (https://policies.google.com/terms/changes)을 참조하세요.

    • 새로운 약관 (https://policies.google.com/terms/update)과 추가 약관 (https://www.google.com/chrome/terms) 미리보기를 확인하세요.

    새로운 약관에 동의하지 않을 경우 자주 묻는 질문(FAQ) (https://policies.google.com/terms/chromechanges#faq)에서 어떤 옵션이 있는지 자세히 알아보세요.

    ++

    2020년 3월 31일 Chrome 서비스 약관이 업데이트될 예정입니다. 새로운 약관에는 Google의 서비스 약관과 Chrome 및 Chrome OS 추가 서비스 약관이 포함됩니다. 그때까지는 아래 약관이 계속 적용됩니다. 자세한 내용은 주요 변경사항 요약 (https://policies.9oo91e.qjz9zk/terms/changes)을 참조하세요.

    • 새로운 약관 (https://policies.9oo91e.qjz9zk/terms/update)과 추가 약관 (https://www.9oo91e.qjz9zk/chrome/terms) 미리보기를 확인하세요.

    새로운 약관에 동의하지 않을 경우 자주 묻는 질문(FAQ) (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq)에서 어떤 옵션이 있는지 자세히 알아보세요.

    +

    Google 크롬 서비스 약관

    +

    본 서비스 약관은 Google 크롬의 실행 코드 버전에 적용됩니다. Google 크롬의 소스 코드는 오픈 소스 소프트웨어 라이센스 계약에 따라 무료로 제공됩니다. chrome://credits

    +

    1. 귀하와 Google과의 관계

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Google과의 별도 계약을 통해 명시적으로 허용된 경우를 제외하고, 귀하는 Google 서비스를 재현, 복제, 복사, 판매, 교환 또는 재판매할 수 없음에 동의합니다.

    5.4 귀하는 약관에 명시된 의무에 대한 위반 및 해당 위반으로 Google에 발생할 수 있는 모든 손실 및 피해를 포함하여 해당 결과에 대한 책임이 전적으로 귀하에게 있으며, Google은 귀하 또는 제3자에 대해 어떠한 책임도 없다는 데 동의합니다.

    6. 개인정보 보호

    @@ -36515,7 +36448,7 @@ diff --git a/components/resources/terms/terms_ko.html b/components/resources/ter

    7.4 귀하는 서비스를 이용하면서 불쾌감을 주거나 저속하거나 용인하기 어려운 콘텐츠에 접할 수 있으며, 이에 대해 전적으로 본인의 책임 하에 해당 서비스를 이용할 것임을 인정합니다.

    7.5 귀하는 서비스를 이용하면서 귀하가 작성, 전송 또는 표시한 모든 콘텐츠 및 귀하의 작성, 전송 또는 표시에 따른 결과(Google에 발생할 수 있는 모든 손실 및 피해 포함)에 대한 책임이 전적으로 귀하에게 있으며, Google은 이와 관련하여 귀하 또는 제3자에 대해 어떠한 책임도 없다는 데 동의합니다.

    8. 독점 권리

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 귀하는 Google이 외부 사이트나 리소스의 표시 여부에 대해 책임이 없으며, Google은 해당 웹사이트 또는 리소스를 통해 이용가능한 광고, 제품 또는 기타 자료를 후원하지 않을 것임을 인정하고 이에 동의합니다.

    17.3 귀하는 Google이 외부 사이트나 리소스의 표시 여부에 따른 결과 또는 해당 웹사이트 또는 리소스를 통해 표시된 광고, 제품 또는 기타 자료의 완성도, 정확도 또는 존재 자체로 인해 귀하에게 발생하는 손실 또는 피해에 대해 책임이 없음을 인정하고 이에 동의합니다.

    18. 약관 변경

    @@ -36527,7 +36460,16 @@ diff --git a/components/resources/terms/terms_ko.html b/components/resources/ter diff --git a/components/resources/terms/terms_lt.html b/components/resources/terms/terms_lt.html --- a/components/resources/terms/terms_lt.html +++ b/components/resources/terms/terms_lt.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    2020 m. kovo 31 d. atnaujiname „Chrome“ paslaugų teikimo sąlygas. Į naujas sąlygas bus įtrauktos „Google“ paslaugų teikimo sąlygos bei „Google Chrome“ ir „Chrome“ OS papildomos paslaugų teikimo sąlygos. Iki šios datos toliau bus taikomos nurodytos sąlygos. Jei reikia daugiau išsamios informacijos, žr. svarbiausių pakeitimų santrauką (https://policies.google.com/terms/chromechanges).

    • Žr. naujų sąlygų (https://policies.google.com/terms/update) ir papildomų sąlygų (https://www.google.com/chrome/terms) peržiūrą.

    Jei nesutinkate su naujomis sąlygomis, daugiau informacijos apie pasirinkimo galimybes rasite „Dažniausiai užduodamų klausimų“ skiltyje (https://policies.google.com/terms/chromechanges#faq).

    ++

    2020 m. kovo 31 d. atnaujiname „Chrome“ paslaugų teikimo sąlygas. Į naujas sąlygas bus įtrauktos „Google“ paslaugų teikimo sąlygos bei „Google Chrome“ ir „Chrome“ OS papildomos paslaugų teikimo sąlygos. Iki šios datos toliau bus taikomos nurodytos sąlygos. Jei reikia daugiau išsamios informacijos, žr. svarbiausių pakeitimų santrauką (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    • Žr. naujų sąlygų (https://policies.9oo91e.qjz9zk/terms/update) ir papildomų sąlygų (https://www.9oo91e.qjz9zk/chrome/terms) peržiūrą.

    Jei nesutinkate su naujomis sąlygomis, daugiau informacijos apie pasirinkimo galimybes rasite „Dažniausiai užduodamų klausimų“ skiltyje (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    „Google Chrome“ paslaugų teikimo sąlygos

    +

    Šios paslaugų teikimo sąlygos taikomos „Google Chrome“ vykdomajai kodo versijai. „Google Chrome“ šaltinio kodą galima naudoti nemokamai pagal atvirojo šaltinio programinės įrangos licencijos sutartis, pateiktas šiuo adresu: chrome://credits.

    +

    1. Jūsų santykis su „Google“

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Sutinkate jokiais tikslais neatkurti, nedaryti kopijų ir nuorašų, neparduoti, nekeisti ir neperparduoti Paslaugų, jei atskiru susitarimu su „Google“ konkrečiai jums nesuteiktas leidimas tai daryti.

    5.4 Sutinkate, kad tik jūs esate atsakingi už bet kokių Sąlygose numatytų įsipareigojimų nesilaikymą (ir kad „Google“ dėl to neatsako nei jūsų, nei bet kurios kitos trečiosios šalies atžvilgiu) ir už visas su tuo susijusias pasekmes (įskaitant bet kokius „Google“ patiriamus nuostolius ar žalą).

    6. Privatumas ir asmeninė informacija

    @@ -36549,7 +36491,7 @@ diff --git a/components/resources/terms/terms_lt.html b/components/resources/ter

    8.4 „Google“ pripažįsta ir sutinka, kad jūs (ar licencijų išdavėjai) nesuteikiate jai jokių teisių, nuosavybės ar turtinių teisių į bet kurį naudojantis Paslaugomis arba per jas tvirtinamą, skelbiamą, perduodamą ar pateikiamą Turinį, įskaitant bet kokias intelektinės nuosavybės teises, susijusias su tuo Turiniu (nepriklausomai nuo to, ar šios teisės registruotos, ar ne, kad ir kur pasaulyje jos veiktų). Jei raštu su „Google“ nesutarėte priešingai, sutinkate, kad esate atsakingi už šių teisių saugojimą ir vykdymą ir kad „Google“ nėra įsipareigojusi to daryti jūsų vardu.

    8.5 Sutinkate nepašalinti, nemaskuoti ar nekeisti jokių patentuotų teisių pranešimų (įskaitant autorių teisių ir prekės ženklų pranešimus), kurie gali būti pridėti arba įtraukti į teikiamas Paslaugas.

    8.6 Naudodamiesi Paslaugomis sutinkate nenaudoti jokių prekės ženklų, paslaugų ženklų, prekių pavadinimų, bendrovių ar organizacijų logotipų tokiais būdais, kurie galėtų suklaidinti klientus dėl to, kas yra šių ženklų, pavadinimų ir logotipų savininkas ir įgaliotasis naudotojas, nebent tokią teisę jums raštu suteikė „Google“.

    -@@ -95,7 +95,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,7 +97,7 @@ h2 { font-size:1em; margin-top:0 }

    (IV) JŪSŲ SLAPTAŽODŽIO AR PASKYROS SAUGUMO IR KONFIDENCIALUMO NEUŽTIKRINIMO;

    14.2 „GOOGLE“ ATSAKOMYBĖS JUMS APRIBOJIMAI, IŠVARDYTI 14.1 PARAGRAFE, BUS TAIKOMI IR TUO ATVEJU, JEI „GOOGLE“ ŽINOJO ARBA TURĖJO ŽINOTI AR BŪTI INFORMUOTA APIE TOKIŲ NUOSTOLIŲ TIKIMYBĘ.

    15. Autorių teisių ir prekės ženklų politika

    @@ -36558,7 +36500,7 @@ diff --git a/components/resources/terms/terms_lt.html b/components/resources/ter

    15.2 „Google“ naudoja skundų dėl prekės ženklo procedūrą, skirtą „Google“ reklamavimo verslui; daugiau informacijos apie tai rasite šiuo adresu: http://www.google.lt/tm_complaint.html.

    16. Skelbimai

    16.1 Kai kurios Paslaugos yra remiamos iš reklamavimo gaunamo pelno, todėl jose „Google“ gali pateikti skelbimus ir reklamas. Tokie skelbimai gali būti taikomi pagal Paslaugose saugomos informacijos, per Paslaugas teikiamų užklausų ir kitos informacijos turinį.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Pripažįstate ir sutinkate, kad „Google“ nėra atsakinga už tokių išorinių svetainių ar išteklių prieinamumą ir kad ji neremia tokiose svetainėse ar ištekliuose teikiamo reklamavimo, produktų ar kitokios medžiagos.

    17.3 Pripažįstate ir sutinkate, kad „Google“ nėra atsakinga už jokius nuostolius ar žalą, kurią patiriate dėl galimybės pasiekti tokias išorines svetaines ar išteklius arba dėl jūsų išreikšto pasitikėjimo reklamavimo, produktų ar kitokios medžiagos, skelbiamos arba galimos pasiekti iš tokių svetainių arba išteklių, išsamumu, tikslumu ir egzistavimu.

    18. Sąlygų pakeitimai

    @@ -36570,7 +36512,16 @@ diff --git a/components/resources/terms/terms_lt.html b/components/resources/ter diff --git a/components/resources/terms/terms_lv.html b/components/resources/terms/terms_lv.html --- a/components/resources/terms/terms_lv.html +++ b/components/resources/terms/terms_lv.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    2020. gada 31. martā mēs atjaunināsim Chrome pakalpojumu sniegšanas noteikumus. Jaunajos noteikumos būs ietverti Google pakalpojumu sniegšanas noteikumi, kā arī Google Chrome un Chrome OS pakalpojumu sniegšanas papildu noteikumi. Līdz tam laikam joprojām ir spēkā tālāk norādītie noteikumi. Plašāku informāciju skatiet galveno izmaiņu kopsavilkumā (https://policies.google.com/terms/chromechanges).

    • Skatiet jauno noteikumu (https://policies.google.com/terms/update) un papildu noteikumu (https://www.google.com/chrome/terms) priekšskatījumu.

    Ja nepiekrītat mūsu jaunajiem noteikumiem, plašāku informāciju par pieejamajām iespējām skatiet sadaļā Bieži uzdotie jautājumi (https://policies.google.com/terms/chromechanges#faq).

    ++

    2020. gada 31. martā mēs atjaunināsim Chrome pakalpojumu sniegšanas noteikumus. Jaunajos noteikumos būs ietverti Google pakalpojumu sniegšanas noteikumi, kā arī Google Chrome un Chrome OS pakalpojumu sniegšanas papildu noteikumi. Līdz tam laikam joprojām ir spēkā tālāk norādītie noteikumi. Plašāku informāciju skatiet galveno izmaiņu kopsavilkumā (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    • Skatiet jauno noteikumu (https://policies.9oo91e.qjz9zk/terms/update) un papildu noteikumu (https://www.9oo91e.qjz9zk/chrome/terms) priekšskatījumu.

    Ja nepiekrītat mūsu jaunajiem noteikumiem, plašāku informāciju par pieejamajām iespējām skatiet sadaļā Bieži uzdotie jautājumi (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome pakalpojumu sniegšanas noteikumi

    +

    Šie pakalpojumu sniegšanas noteikumi attiecas uz Google Chrome izpildāmā koda versiju. Google Chrome pirmkods ir pieejams bez maksas saskaņā ar atvērtā koda programmatūras licences līgumu, kas pieejams vietnē chrome://credits.

    +

    1. Attiecības ar Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3. Jūs piekrītat, ka nekādos nolūkos neatjaunosiet, nedublēsiet, nekopēsiet, nepārdosiet, netirgosiet un netālākpārdosiet Pakalpojumus, izņemot gadījumus, kad saskaņā ar uzņēmumu Google noslēgtu īpašu līgumu jums ir atļauts rīkoties šādā veidā.

    5.4. Jūs piekrītat, ka esat vienpersoniski atbildīgs (un ka uzņēmums Google nav atbildīgs attiecībā pret jums vai trešo pusi) par jebkuru jūsu Noteikumos minēto saistību pārkāpumu un par visām šādu pārkāpumu iespējamām sekām (tostarp par visiem iespējamiem zaudējumiem vai bojājumiem, ko radīsiet uzņēmumam Google).

    6. Konfidencialitāte un jūsu personiskā informācija

    @@ -36585,7 +36536,7 @@ diff --git a/components/resources/terms/terms_lv.html b/components/resources/ter

    7.4. Jūs saprotat, ka, izmantojot Pakalpojumus, varat saskarties ar Saturu, kas var likties apvainojošs, nepiedienīgs vai nevēlams, un ka šādos gadījumos jūs pats uzņematies atbildību par Pakalpojumu izmantošanu.

    7.5. Jūs piekrītat, ka esat vienpersoniski atbildīgs (un uzņēmums Google nav atbildīgs attiecībā pret jums vai kādu trešo personu) par jebkuru jūsu Pakalpojumu izmantošanas laikā izveidoto, pārsūtīto vai attēloto Saturu un par jebkuriem jūsu darbības sekām (tostarp visiem zaudējumiem vai bojājumiem, kas var rasties uzņēmumam Google), kas var izrietēt šādas darbības rezultātā.

    8. Īpašuma tiesības

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2. Jūs apzināties un piekrītat, ka uzņēmums Google nav atbildīgs par šādu ārēju vietņu vai resursu pieejamību un uzņēmums nesankcionē reklāmas, produktus vai citus materiālus, kas atrodas šādās vietnēs vai resursos vai ir pieejami no tiem.

    17.3. Jūs apzināties un piekrītat, ka uzņēmums Google nav atbildīgs par jebkādiem zaudējumiem vai bojājumiem, kas jums var rasties šādu ārēju vietņu vai resursu pieejamības dēļ, vai jebkādu paļāvību gadījumā, kas jums bijušas par jebkuru šādās vietnēs vai resursos reklamētu produktu, preču vai citu materiālu pilnību, precizitāti vai pastāvēšanu.

    18. Izmaiņas Noteikumos

    @@ -36597,7 +36548,16 @@ diff --git a/components/resources/terms/terms_lv.html b/components/resources/ter diff --git a/components/resources/terms/terms_ml.html b/components/resources/terms/terms_ml.html --- a/components/resources/terms/terms_ml.html +++ b/components/resources/terms/terms_ml.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.google.com/terms/update) and Additional Terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.9oo91e.qjz9zk/terms/update) and Additional Terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome സേവനനിബന്ധനകള്‍‌

    +

    ഈ സേവനനിബന്ധനകള്‍‌ Google Chrome ന്‍റെ നടപ്പാക്കാന്‍‌ കഴിയുന്ന കോഡ് പതിപ്പിന് ബാധകമാണ്. Google Chrome നായുള്ള ഉറവിട കോഡ് chrome://credits ലെ ഓപ്പണ്‍‌ സോഴ്‌സ് സോഫ്റ്റ്‌വെയര്‍‌ ലൈസന്‍‌സ് കരാറുകള്‍‌ക്ക് ചുവടെ സൌജന്യമായി ലഭ്യമാണ്.

    +

    1. Google മായുള്ള നിങ്ങളുടെ ബന്ധം

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Google മായുള്ള ഒരു പ്രത്യേക കരാറില്‍ നിങ്ങളെ പ്രത്യേകമായി അനുവദിക്കാത്തപക്ഷം,യാതൊരു ഉദ്ദേശ്യത്തിനായും സേവനങ്ങള്‍‌ വീണ്ടും നിര്‍മിക്കുകയോ തനിപ്പകര്‍പ്പെടുക്കുകയോ പകര്‍ത്തുകയോ വില്‍‌ക്കുകയോ വിപണനം നടത്തുകയോ അല്ലെങ്കില്‍‌ പുനര്‍ വില്‍‌പ്പന നടത്തുകയോ ചെയ്യില്ലെന്ന് നിങ്ങള്‍ സമ്മതിക്കുന്നു.

    5.4 ഉല്‍‌പ്പന്നത്തിന്‍റെ ഉപയോഗത്തിനും നിബന്ധനകള്‍ക്കും വ്യവസ്ഥകള്‍ക്കും കീഴിലുള്ള നിങ്ങളുടെ ബാധ്യതകളുടെ ലംഘനത്തിനും അതിന്‍റെ അനന്തര ഫലങ്ങള്‍ക്കും (Google ന് ഉണ്ടാകാവുന്ന ഏതൊരുതരത്തിലുമുള്ള നഷ്‌ടവും കേടുപാടുമടക്കം) നിങ്ങള്‍ മാത്രമായിരിക്കും ഉത്തരവാദപ്പെട്ടിരിക്കുകയെന്ന് (മാത്രമല്ല നിങ്ങളോടോ ഏതെങ്കിലും മൂന്നാം കക്ഷിയോടോ Google ന് ഒരു ഉത്തരവാദിത്വവും ഉണ്ടായിരിക്കുകയില്ലെന്നും) നിങ്ങള്‍ സമ്മതിക്കുന്നു.

    6. നിങ്ങളുടെ സ്വകാര്യതയും സ്വകാര്യ വിവരങ്ങളും

    @@ -36619,7 +36579,7 @@ diff --git a/components/resources/terms/terms_ml.html b/components/resources/ter

    ഈ കരാറിനുകീഴിലുള്ള അല്ലെങ്കില്‍‌ ഉള്ളടക്കത്തില്‍‌ നിലനില്‍‌ക്കുന്ന ഏതെങ്കിലും ബൌദ്ധിക സ്വത്തവകാശങ്ങളുള്‍‌പ്പെടെ (ഒരുപക്ഷേ ആ അവകാശങ്ങള്‍‌ രജിസ്റ്റര്‍‌ ചെയ്യേണ്ടതായിവന്നാലും ഇല്ലെങ്കിലും, അല്ലെങ്കില്‍‌ ലോകത്തെവിടെയെങ്കിലും അത്തരം അവകാശങ്ങള്‍‌ നിലവിലുണ്ടെങ്കിലും) നിങ്ങള്‍‌ സമര്‍‌പ്പിക്കുന്നതോ പോസ്റ്റുചെയ്യുന്നതോ പ്രേക്ഷണം ചെയ്യുന്നതോ അല്ലെങ്കില്‍‌ ഉല്‍‌പ്പന്നങ്ങളില്‍‌ പ്രദര്‍‌ശിപ്പിക്കുന്നതോ ആയ ഉള്ളടക്കത്തിന് ‍‌‌Google നിങ്ങളില്‍‌ നിന്നും (അല്ലെങ്കില്‍‌ നിങ്ങളുടെ ലൈസന്‍‌സര്‍‌മാരില്‍‌ നിന്നും) ഒരു അവകാശങ്ങളോ ഉടമസ്ഥാവകാശമോ അല്ലെങ്കില്‍‌ താല്‍‌പ്പര്യമോ കരസ്ഥമാക്കുന്നതല്ലെന്ന് മനസ്സിലാക്കുകയും അംഗീകരിക്കുകയും ചെയ്യുന്നു. Google മായി നിങ്ങള്‍‌ കരാറിലേര്‍‌പ്പെട്ടില്ലെങ്കില്‍‌, അത്തരം അവകാശങ്ങള്‍‌ പരിരക്ഷിക്കുന്നതിനും നടപ്പിലാക്കുന്നതിനും നിങ്ങള്‍‌ ഉത്തരവാദികളായിരിക്കുമെന്നും കൂടാ‍തെ അവ നിങ്ങളുടെ താല്‍‌പ്പര്യാര്‍‌ത്ഥം ചെയ്യുന്നതിന് Google ന് യാതൊരു നിയമബാദ്ധ്യതയും ഉണ്ടായിരിക്കുന്നതല്ല എന്നും നിങ്ങള്‍‌ സമ്മതിക്കുന്നു.

    8.5 സേവനങ്ങളോട് അനുബന്ധിച്ചതോ അല്ലെങ്കില്‍‌ അതില്‍ അടങ്ങിയിരിക്കുന്നതോ ആയ ഏതെങ്കിലും ഉടമസ്ഥാവകാശ അറിയിപ്പുകള്‍ (പകര്‍പ്പവകാശ, വ്യാപാരമുദ്ര അറിയിപ്പുകള്‍ ഉള്‍പ്പെടെ) നീക്കംചെയ്യുകയോ അവ്യക്തമാക്കുകയോ അല്ലെങ്കില്‍ മാറ്റം വരുത്തുകയോ ചെയ്യില്ലെന്ന് നിങ്ങള്‍ സമ്മതിക്കുന്നു.

    8.6 സേവനങ്ങള്‍ ഉപയോഗിക്കുമ്പോള്‍ വ്യാപാരമുദ്ര, സേവനമുദ്ര, വ്യാപാരനാമം ഏതെങ്കിലും കമ്പനിയുടെ അല്ലെങ്കില്‍ ഓര്‍ഗനൈസേഷന്‍റെ ലോഗോ എന്നിവ ഇത്തരം മുദ്രകളുടെയും നാമങ്ങളുടെയും അല്ലെങ്കില്‍ ലോഗോകളുടെയും ഉടമയെക്കുറിച്ചോ അല്ലെങ്കില്‍‌ അംഗീകൃത ഉപയോക്താവിനെക്കുറിച്ചോ ആശയക്കുഴപ്പത്തിന് ഇടയാക്കിയേക്കാവുന്നതോ അല്ലെങ്കില്‍ ആശയക്കുഴപ്പം ഉണ്ടാക്കാന്‍ ഉദ്ദേശിച്ചുകൊണ്ടോ, അങ്ങനെ ചെയ്യുന്നതിന് നിങ്ങളെ Google രേഖാമൂലം വ്യക്തമായി അധികാരപ്പെടുത്തിയിട്ടില്ലെങ്കില്‍‌ അവ ഉപയോഗിക്കുകയില്ലെന്ന് നിങ്ങള്‍ സമ്മതിക്കുന്നു.

    -@@ -96,8 +96,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -98,8 +98,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) നിങ്ങളുടെ പാസ്‌വേഡ് അല്ലെങ്കില്‍ അക്കൌണ്ട് വിശദാംശങ്ങള്‍ സുരക്ഷിതവും അതീവരഹസ്യവുമായി സൂക്ഷിക്കുന്നതില്‍‌ നിങ്ങള്‍ക്കുണ്ടായ പരാജയം;

    14.2 ഉണ്ടാകാന്‍ ഇടയുളള നഷ്‌ടങ്ങളെക്കുറിച്ച് GOOGLE ന് ഉപദേശം ലഭിച്ചാലും അല്ലെങ്കില്‍ അതിനെക്കുറിച്ച് അറിവുണ്ടെങ്കിലും മുകളിലെ ഖണ്ഡിക 14.1 ല്‍ പറഞ്ഞിരിക്കുന്നപോലുള്ള GOOGLE ന് നിങ്ങളോടുളള ബാ‍ധ്യതയുടെ പരിധി ബാധകമാവും.

    15. പകര്‍‌പ്പവകാശ വ്യാപാരമുദ്രാ നയങ്ങള്‍‌

    @@ -36630,7 +36590,7 @@ diff --git a/components/resources/terms/terms_ml.html b/components/resources/ter

    16. പരസ്യങ്ങള്‍‌

    16.1 ചില സേവനങ്ങളെ പരസ്യ വരുമാനം പിന്തുണയ്‌ക്കുകയും പരസ്യങ്ങളെയും പ്രമോഷനുകളെയും പ്രദര്‍ശിപ്പിക്കുകയും ചെയ്യുന്നു. സേവനങ്ങളിലൂടെയോ മറ്റ് വിവരങ്ങളിലൂടെയോ നിര്‍മ്മിച്ച സേവനങ്ങളിലോ, അന്വേഷണങ്ങളിലോ സംഭരിച്ചിരിക്കുന്ന വിവരങ്ങളുടെ ഉള്ളടക്കത്തെ ഈ പരസ്യങ്ങള്‍ ലക്‍ഷ്യമാക്കാം.

    16.2 Google സേവനങ്ങളില്‍ പരസ്യപ്പെടുത്തുന്നവയുടെ രൂപവലുപ്പങ്ങളെല്ലാം നിങ്ങളെ മുന്‍‌കൂട്ടിയറിയിക്കാതെയുള്ള മാറ്റങ്ങള്‍ക്ക് വിധേയമാണ്.

    -@@ -107,7 +107,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -109,7 +109,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 അത്തരം ഏതെങ്കിലും ബാഹ്യ സൈറ്റുകള്‍ അല്ലെങ്കില്‍ ഉറവിടങ്ങള്‍ എന്നിവയുടെ ലഭ്യതയ്‌ക്ക് Google ഉത്തരവാദിയല്ലെന്നും അത്തരം ബാഹ്യ സൈറ്റുകളിലോ ഉറവിടങ്ങളിലോ ഉള്ളതോ ലഭ്യമായതോ ആയ ഏതെങ്കിലും പരസ്യം, ഉല്‍പ്പന്നങ്ങള്‍‍ അല്ലെങ്കില്‍‌ മറ്റ് മെറ്റീരിയലുകള്‍ എന്നിവ അംഗീകരിക്കുകയില്ലെന്നും നിങ്ങള്‍ സമ്മതിക്കുകയും അംഗീകരിക്കുകയും ചെയ്യുന്നു.

    17.3 അത്തരം ബാഹ്യ സൈറ്റുകള്‍‌ അല്ലെങ്കില്‍‌ ഉറവിടങ്ങളുടെ ലഭ്യതയുടെ ഫലമായി, അല്ലെങ്കില്‍‌ അത്തരം വെബ് സൈറ്റുകളിലോ ഉറവിടങ്ങളിലോ ലഭ്യമായ ഏതെങ്കിലും പരസ്യത്തിന്‍റെയും പൂര്‍ണതയിലും, കൃത്യതയിലും, നിലനില്‍പ്പിലും നിങ്ങള്‍‌ സമര്‍പ്പിച്ച വിശ്വാസത്തിന്‍റെ ഫലമായി, നിങ്ങള്‍‌ കാരണം ഉണ്ടാകാവുന്ന ഏതെങ്കിലും നഷ്‌ടത്തിനോ അല്ലെങ്കില്‍‌ കേടുപാടിനോ Google ഉത്തരവാദിയായിരിക്കില്ലെന്നത് നിങ്ങള്‍‌ സമ്മതിക്കുകയും അംഗീകരിക്കുകയും ചെയ്യുന്നു.

    18. നിബന്ധനകളിലെ മാറ്റങ്ങള്‍

    @@ -36642,7 +36602,16 @@ diff --git a/components/resources/terms/terms_ml.html b/components/resources/ter diff --git a/components/resources/terms/terms_mr.html b/components/resources/terms/terms_mr.html --- a/components/resources/terms/terms_mr.html +++ b/components/resources/terms/terms_mr.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.google.com/terms/update) and Additional Terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.9oo91e.qjz9zk/terms/update) and Additional Terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome सेवा अटी

    +

    Google Chrome च्या कार्यवाहीयोग्य कोड आवृत्तीस या सेवा अटी लागू होतात. मुक्त स्रोत सॉफ्टवेअर परवाना करारा अंतर्गत chrome://credits येथे Google Chrome साठी स्रोत कोड विनामूल्य उपलब्ध आहे .

    +

    1. आपले Google बरोबरचे संबंध

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Google कडून स्वतंत्र कराराद्वारे आपल्याला असे करण्याची परवानगी दिली जात नाही तोपर्यंत, आपण सहमत आहात की आपण कोणत्याही हेतूसाठी सेवेचे पुनरूत्पादन, डुप्लिकेट, कॉपी, विक्री, व्यापार किंवा पुनर्विक्री करणार नाही.

    5.4 आपण सहमत आहात की अटींच्या अंतर्गत आपण केलेला कर्तव्य भंग आणि त्याच्या परिणामांसाठी (कोणत्याही प्रकारची हानी किंवा क्षति जी Google ला भोगावी लागू शकेल तिच्यासह) आपण स्वत: पूर्णपणे जवाबदार असाल (आणि Google आपण किंवा कोणत्याही तृतीय पक्षासाठी जवाबदार राहणार नाही)

    6. गोपनीयता आणि आपली वैयक्तिक माहिती

    @@ -36664,7 +36633,7 @@ diff --git a/components/resources/terms/terms_mr.html b/components/resources/ter

    8.4 Google स्वीकार करत आहे आणि सहमत आहे की त्यांना या अटींअंतर्गत आपण सादर, पोस्ट, प्रसारित किंवा प्रदर्शित केलेल्या कोणत्याही सामग्रीचा किंवा त्या सामग्रीतील कोणत्याही बौद्धिक संपत्ती अधिकारांच्या (ते अधिकार नोंदणीकृत असतील किंवा नसतील, आणि जगात कोठेही अस्तित्वात असतील) सेवेमार्फत आपल्या जवळ (किंवा आपल्या परवाना प्रदात्यांकडे) असलेल्या कोणत्याही अधिकारांचा, मालकी हक्क किंवा लाभ मिळवता येणार नाही. आपण स्वीकारले आहे किंवा Google सह लिखित अन्यथा करार केला असून आपण सहमत आहात की आपण ते अधिकार जतन करण्यासाठी आणि त्यांच्या अंमलबजावणीसाठी स्वत: जबाबदार आहात आणि आपल्यावर किंवा आपल्या वतीने तसे करण्यासाठी Google वर कोणतेही बंधन नाही.

    8.5 आपण स्वीकारत आहात की सेवांसह जोडलेल्या किंवा सेवांमध्ये असलेल्या कोणत्याही प्रकारच्या मालकी हक्क सूचना (कॉपीराइट आणि ट्रेडमार्क सूचनांसहित), आपण काढू, अस्पष्ट करू किंवा बदलू शकत नाही.

    8.6 आपण स्वीकारत आहात की Google द्वारा आपल्याला असे करण्यासाठी स्पष्ट लिखित अधिकृतता दिली जात नाही तोपर्यंत सेवा वापरताना आपण कोणताही ट्रेडमार्क, सेवा चिह्न, ट्रेड नेम, कोणत्याही कंपनीचा किंवा संघटनेच्या लोगो यांचा वापर अशा प्रकारे करणार नाही जो अशी चिन्हे, नावे किंवा लोगो यांचे अधिकृत मालक किंवा वापरकर्ते यांचेविषयी संदिग्धता निर्माण करेल.

    -@@ -96,8 +96,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -98,8 +98,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) आपण आपला संकेतशब्द आणि खात्याचे तपशील सुरक्षित आणि गोपनीय ठेवण्यात अयशस्वी ठरल्यास;

    14.2 उपरोक्त परिच्छेद क्र.14.1 मधील GOOGLE चे उत्तरदायित्व आणि आपल्या मर्यादांमध्ये नमूद कोणत्याही प्रकारचे नुकसान उद्भवण्याच्या शक्यतांविषयी आपण जागरूक आहात किंवा त्यासाठी GOOGLE ने सल्ला दिला किंवा दिला नाही तरीही त्या लागू होतील

    15. कॉपीराइट आणि ट्रेडमार्क धोरणे

    @@ -36675,7 +36644,7 @@ diff --git a/components/resources/terms/terms_mr.html b/components/resources/ter

    16. जाहिराती

    16.1 काही सेवा जाहिरातींच्या महसूलाने समर्थित असतात आणि जाहिराती आणि प्रचारसामग्री प्रदर्शित करू शकतात. या जाहिराती सेवेवर संचयित माहितीमधील सामग्री, सेवेद्वारे केलेल्या क्वेरी किंवा इतर माहिती वर लक्ष्यित असू शकतात.

    16.2 Google द्वारा सेवेवर केल्या जाणार्‍या जाहिरातींच्या पद्धती, मोड आणि मर्यादा आपल्याला कोणतीही विशेष सूचना न देता बदलल्या जाऊ शकतात.

    -@@ -107,7 +107,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -109,7 +109,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 आपल्याला ज्ञात आहे आणि आपण मान्य करता की Google अशा कोणत्याही बाह्य साइट किंवा संसाधनांच्या उपलब्धतेसाठी जबाबदार नाही आणि अशा कोणत्याही वेबसाइट किंवा संसाधनावरील किंवा त्यांच्या तर्फे असलेल्या कोणत्याही जाहिराती, उत्पादने, किंवा इतर सामग्रीची पुष्टी करत नाही.

    17.3 आपल्याला ज्ञात आहे आणि आपण मान्य करता की अशा कोणत्याही बाह्य साइट किंवा संसाधनांच्या उपलब्धतेमुळे आपल्याद्वारे उद्भवणार्‍या किंवा अशा वेबसाइट वा संसाधनांवर वा मध्ये उपलब्ध कोणतीही जाहिरात, उत्पादन किंवा सामग्रीची पूर्णता, अचूकता वा अस्तित्व यावर आपण ठेवलेल्या विश्वासामुळे उद्भवणार्‍या कोणत्याही हानी वा क्षतिकरिता Google उत्तरदायी नाही.

    18. अटींमधील बदल

    @@ -36687,7 +36656,18 @@ diff --git a/components/resources/terms/terms_mr.html b/components/resources/ter diff --git a/components/resources/terms/terms_nb.html b/components/resources/terms/terms_nb.html --- a/components/resources/terms/terms_nb.html +++ b/components/resources/terms/terms_nb.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -15,8 +15,8 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Vi oppdaterer vilkårene for bruk av Chrome den 31. mars 2020. De nye vilkårene omfatter Googles vilkår for bruk og tilleggsvilkårene for bruk av Google Chrome og Chrome OS. Frem til da fortsetter vilkårene under å gjelde. Se et sammendrag av de viktigste endringene (https://policies.google.com/terms/chromechanges) for flere detaljer.

    • Se en forhåndsvisning av de nye vilkårene (https://policies.google.com/terms/update) og tilleggsvilkårene (https://www.google.com/chrome/terms).

    Hvis du ikke godtar de nye vilkårene, finner du mer informasjon om valgmulighetene dine under Vanlige spørsmål (https://policies.google.com/terms/chromechanges#faq).

    +-

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.google.com/terms/update) and Additional Terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    Vi oppdaterer vilkårene for bruk av Chrome den 31. mars 2020. De nye vilkårene omfatter Googles vilkår for bruk og tilleggsvilkårene for bruk av Google Chrome og Chrome OS. Frem til da fortsetter vilkårene under å gjelde. Se et sammendrag av de viktigste endringene (https://policies.9oo91e.qjz9zk/terms/chromechanges) for flere detaljer.

    • Se en forhåndsvisning av de nye vilkårene (https://policies.9oo91e.qjz9zk/terms/update) og tilleggsvilkårene (https://www.9oo91e.qjz9zk/chrome/terms).

    Hvis du ikke godtar de nye vilkårene, finner du mer informasjon om valgmulighetene dine under Vanlige spørsmål (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    ++

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.9oo91e.qjz9zk/terms/update) and Additional Terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Vilkår for bruk av Google Chrome

    +

    Disse vilkårene for bruk gjelder versjonen av Google Chrome med kjørbar kode. Kildekoden for Google Chrome er tilgjengelig gratis under lisensavtalene for programvare med åpen kildekode på chrome://credits.

    +

    1. Ditt forhold til Google

    +@@ -44,12 +44,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Med mindre du i en egen avtale med Google spesifikt har fått tillatelse til å gjøre slikt, samtykker du i at du ikke vil gjengi, duplisere, kopiere, selge, drive handel med eller videreselge tjenestene til noe formål.

    5.4 Du godtar at du ene og alene er ansvarlig for (og at Google ikke er ansvarlig overfor deg eller noen tredjepart for) eventuelle brudd på dine forpliktelser i henhold til vilkårene og for konsekvensene (deriblant eventuelt tap eller skade som Google kan utsettes for) i forbindelse med et slikt brudd.

    6. Personvern og personlige opplysninger

    @@ -36702,7 +36682,7 @@ diff --git a/components/resources/terms/terms_nb.html b/components/resources/ter

    7.4 Du forstår at du ved å bruke tjenestene kan bli eksponert for innhold som du kanskje finner støtende, krenkende eller upassende, og at du i dette henseende bruker tjenestene på egen risiko.

    7.5 Du godtar at du ene og alene er ansvarlig for (og at Google ikke er ansvarlig overfor deg eller noen tredjepart for) eventuelt innhold du oppretter, overfører eller viser mens du bruker tjenestene og for konsekvensene av dine handlinger (herunder eventuelt tap eller skade som Google kan utsettes for).

    8. Eierrettigheter

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -110,7 +110,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Du erkjenner og godtar at Google ikke er ansvarlig for tilgjengeligheten til slike eksterne nettsteder eller ressurser samt at Google ikke håndterer eller er ansvarlig for annonser, produkter eller annet materiale på eller tilgjengelig fra slike nettsteder eller ressurser.

    17.3 Du erkjenner og godtar at Google ikke er ansvarlig for et eventuelt tap eller skade som du måtte lide som følge av at disse nettstedene eller ressursene ikke er tilgjengelige, eller som resultat av at du er avhengig av at annonser, produkter eller annet materiale på eller tilgjengelig fra slike nettsteder eller ressurser er fullstendige, nøyaktige eller tilstedeværende.

    18. Endringer i vilkårene

    @@ -36714,7 +36694,16 @@ diff --git a/components/resources/terms/terms_nb.html b/components/resources/ter diff --git a/components/resources/terms/terms_nl.html b/components/resources/terms/terms_nl.html --- a/components/resources/terms/terms_nl.html +++ b/components/resources/terms/terms_nl.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    We updaten de Servicevoorwaarden van Chrome op 31 maart 2020. De nieuwe voorwaarden omvatten de Servicevoorwaarden van Google en de Aanvullende servicevoorwaarden van Google Chrome en Chrome OS. Tot die datum blijven de onderstaande voorwaarden van toepassing. Raadpleeg een overzicht van de belangrijkste wijzigingen (https://policies.google.com/terms/chromechanges) voor meer details.

    Als u niet akkoord gaat met onze nieuwe Voorwaarden, vindt u in onze veelgestelde vragen (https://policies.google.com/terms/chromechanges#faq) meer informatie over uw mogelijkheden.

    ++

    We updaten de Servicevoorwaarden van Chrome op 31 maart 2020. De nieuwe voorwaarden omvatten de Servicevoorwaarden van Google en de Aanvullende servicevoorwaarden van Google Chrome en Chrome OS. Tot die datum blijven de onderstaande voorwaarden van toepassing. Raadpleeg een overzicht van de belangrijkste wijzigingen (https://policies.9oo91e.qjz9zk/terms/chromechanges) voor meer details.

    Als u niet akkoord gaat met onze nieuwe Voorwaarden, vindt u in onze veelgestelde vragen (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq) meer informatie over uw mogelijkheden.

    +

    Google Chrome - Servicevoorwaarden

    +

    Deze Servicevoorwaarden zijn van toepassing op de uitvoerbare code van Google Chrome. De broncode voor Google Chrome is gratis beschikbaar onder 'open source'-softwarelicentieovereenkomsten op chrome://credits.

    +

    1. Uw relatie met Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 U stemt ermee in de Services niet te reproduceren, dupliceren, kopiëren, verkopen, verhandelen of door te verkopen voor welk doeleinde dan ook, tenzij hiervoor uitdrukkelijk toestemming is verleend in een afzonderlijke overeenkomst met Google.

    5.4 U stemt ermee in dat u als enige verantwoordelijk bent (en dat Google geen verantwoordelijkheid jegens u of jegens derden heeft) voor elke niet-nakoming van uw verplichtingen ingevolge de Voorwaarden en voor alle gevolgen die hieruit kunnen voortvloeien (met inbegrip van verlies of schade die Google zou kunnen lijden).

    6. Privacy en uw persoonlijke gegevens

    @@ -36729,7 +36718,7 @@ diff --git a/components/resources/terms/terms_nl.html b/components/resources/ter

    7.4 U begrijpt dat u door het gebruik van de Services kunt worden blootgesteld aan beledigende, onfatsoenlijke of aanstootgevende Inhoud en dat het gebruik van de Services in dat opzicht voor eigen risico is.

    7.5 U stemt ermee in dat u als enige verantwoordelijk bent (en dat Google geen verantwoordelijkheid jegens u of jegens derden heeft) voor Inhoud die u maakt, verstuurt of weergeeft tijdens het gebruik van de Services en voor de gevolgen van uw acties (met inbegrip van verlies of schade die Google zou kunnen lijden).

    8. Eigendomsrechten

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 U erkent en stemt ermee in dat Google niet verantwoordelijk is voor de beschikbaarheid van dergelijke externe sites of bronnen, en dat Google geen goedkeuring hoeft te verlenen aan advertenties, producten of andere materialen die op deze websites en bronnen worden weergegeven of via deze sites en bronnen beschikbaar zijn.

    17.3 U erkent en stemt ermee in dat Google niet aansprakelijk is voor verlies of schade door u geleden als gevolg van de beschikbaarheid van deze externe sites of bronnen, of als gevolg van het vertrouwen dat u stelt in de volledigheid, nauwkeurigheid of aanwezigheid van advertenties, producten of andere materialen die op deze sites of bronnen worden weergegeven, of via deze sites of bronnen beschikbaar zijn.

    18. Wijzigingen van de Voorwaarden

    @@ -36741,7 +36730,16 @@ diff --git a/components/resources/terms/terms_nl.html b/components/resources/ter diff --git a/components/resources/terms/terms_pl.html b/components/resources/terms/terms_pl.html --- a/components/resources/terms/terms_pl.html +++ b/components/resources/terms/terms_pl.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    31 marca 2020 roku zaktualizujemy Warunki korzystania z Chrome. Do nowych warunków należeć będą Warunki korzystania z usług Google oraz dodatkowe Warunki korzystania z Google Chrome i Chrome OS. Do tego momentu obowiązują Warunki wskazane poniżej. Więcej szczegółów znajdziesz w podsumowaniu najważniejszych zmian (https://policies.google.com/terms/chromechanges).

    Jeśli nie zgadzasz się na nasze nowe Warunki, więcej informacji o dostępnych opcjach możesz znaleźć w Najczęstszych pytaniach (https://policies.google.com/terms/chromechanges#faq).

    ++

    31 marca 2020 roku zaktualizujemy Warunki korzystania z Chrome. Do nowych warunków należeć będą Warunki korzystania z usług Google oraz dodatkowe Warunki korzystania z Google Chrome i Chrome OS. Do tego momentu obowiązują Warunki wskazane poniżej. Więcej szczegółów znajdziesz w podsumowaniu najważniejszych zmian (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    Jeśli nie zgadzasz się na nasze nowe Warunki, więcej informacji o dostępnych opcjach możesz znaleźć w Najczęstszych pytaniach (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome – Warunki korzystania z usługi

    +

    Niniejsze Warunki korzystania z usługi dotyczą korzystania z kodu wykonywalnego aplikacji Google Chrome. Kod źródłowy aplikacji Google Chrome jest dostępny bezpłatnie na mocy licencji oprogramowania typu open source zamieszczonej pod adresem chrome://credits.

    +

    1. Relacje Użytkownika z Google

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Użytkownik zgadza się nie reprodukować, powielać, kopiować, sprzedawać, wymieniać ani odsprzedawać Usług w żadnym celu, chyba że otrzymał na to wyraźne pozwolenie w oddzielnej umowie z Google.

    5.4 Użytkownik akceptuje fakt, że ponosi wyłączną odpowiedzialność (oraz że Google nie ponosi żadnej odpowiedzialności przed Użytkownikiem ani jakąkolwiek osobą trzecią) za wszelkie naruszenia zobowiązań Użytkownika wynikających z Warunków i za skutki takich naruszeń (w tym wszelkie straty lub szkody poniesione przez Google).

    6. Prywatność i dane osobowe Użytkownika

    @@ -36763,7 +36761,7 @@ diff --git a/components/resources/terms/terms_pl.html b/components/resources/ter

    8.4 Google przyjmuje do wiadomości i akceptuje fakt, że na mocy tych Warunków nie uzyskuje od Użytkownika (ani jego licencjodawców) żadnych praw, tytułów prawnych ani udziałów związanych z Treścią udostępnianą, publikowaną, przesyłaną lub wyświetlaną przez Użytkownika w Usługach lub za ich pośrednictwem, w tym jakichkolwiek praw własności intelektualnej dotyczących tej Treści (bez względu na to, czy prawa te zostały zastrzeżone i w którym miejscu na świecie obowiązują). Jeśli Użytkownik nie zawarł innej pisemnej umowy z Google, Użytkownik akceptuje fakt, że ponosi odpowiedzialność za ochronę i egzekwowanie tych praw, a firma Google nie jest w żaden sposób zobowiązana do takich działań w imieniu Użytkownika.

    8.5 Użytkownik zobowiązuje się nie usuwać, zasłaniać ani zmieniać żadnych informacji o prawach własności (w tym informacji o prawach autorskich i znakach towarowych), które mogą być dołączone do Usług lub w nich zawarte.

    8.6 Jeśli Użytkownik nie uzyskał wyraźnej pisemnej zgody Google w tym zakresie, zobowiązuje się podczas korzystania z Usług nie używać żadnych znaków towarowych, znaków usługowych, nazw handlowych ani logo jakiejkolwiek firmy lub organizacji w sposób mogący budzić wątpliwości dotyczące właściciela lub uprawnionego użytkownika takich znaków, nazw lub logo.

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) NIEZACHOWANIA PRZEZ UŻYTKOWNIKA BEZPIECZEŃSTWA I POUFNOŚCI HASŁA LUB SZCZEGÓŁOWYCH INFORMACJI DOTYCZĄCYCH KONTA;

    14.2 WYMIENIONE W POWYŻSZYM USTĘPIE 14.1 OGRANICZENIA ODPOWIEDZIALNOŚCI GOOGLE PRZED UŻYTKOWNIKIEM OBOWIĄZUJĄ BEZ WZGLĘDU NA TO, CZY FIRMA GOOGLE ZOSTAŁA POWIADOMIONA LUB POWINNA BYŁA ZDAWAĆ SOBIE SPRAWĘ Z MOŻLIWOŚCI WYSTĄPIENIA WSZELKICH TAKICH SZKÓD.

    15. Zasady dotyczące praw autorskich i znaków towarowych

    @@ -36774,7 +36772,7 @@ diff --git a/components/resources/terms/terms_pl.html b/components/resources/ter

    16. Reklamy

    16.1 Niektóre Usługi są utrzymywane z przychodów z reklam i w ramach takich Usług mogą być wyświetlane reklamy oraz promocje. Reklamy takie mogą być kierowane zgodnie z treścią informacji przechowywanych w Usługach, zapytań dokonywanych za pośrednictwem Usług lub innych informacji.

    16.2 Sposób, tryb i zakres umieszczania reklam przez Google w Usługach może ulegać zmianie bez powiadomienia.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Użytkownik przyjmuje do wiadomości i akceptuje fakt, że Google nie ponosi odpowiedzialności za dostępność jakichkolwiek zewnętrznych witryn lub zasobów oraz nie poleca żadnych reklam, produktów ani innych materiałów dostępnych w takich witrynach internetowych lub zasobach.

    17.3 Użytkownik przyjmuje do wiadomości i akceptuje fakt, że Google nie ponosi żadnej odpowiedzialności za straty lub szkody poniesione przez Użytkownika wskutek dostępności zewnętrznych witryn lub zasobów ani wskutek zaufania Użytkownika co do kompletności, dokładności lub istnienia jakichkolwiek reklam, produktów lub innych materiałów dostępnych w takich witrynach internetowych lub zasobach.

    18. Zmiany Warunków

    @@ -36786,7 +36784,16 @@ diff --git a/components/resources/terms/terms_pl.html b/components/resources/ter diff --git a/components/resources/terms/terms_pt-BR.html b/components/resources/terms/terms_pt-BR.html --- a/components/resources/terms/terms_pt-BR.html +++ b/components/resources/terms/terms_pt-BR.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Os Termos de Serviço do Chrome serão atualizados em 31 de março de 2020. Os novos termos incluirão os Termos de Serviço do Google e os Termos de Serviço adicionais do Google Chrome e do Chrome OS. Até a atualização, os termos descritos abaixo continuarão em vigor. Veja um resumo das principais mudanças (https://policies.google.com/terms/chromechanges) para saber mais.

    • Conheça os novos Termos (https://policies.google.com/terms/update) e os Termos adicionais (https://www.google.com/chrome/terms).

    Caso não concorde com os novos Termos, saiba mais sobre suas opções na seção Perguntas frequentes (https://policies.google.com/terms/chromechanges#faq).

    ++

    Os Termos de Serviço do Chrome serão atualizados em 31 de março de 2020. Os novos termos incluirão os Termos de Serviço do Google e os Termos de Serviço adicionais do Google Chrome e do Chrome OS. Até a atualização, os termos descritos abaixo continuarão em vigor. Veja um resumo das principais mudanças (https://policies.9oo91e.qjz9zk/terms/chromechanges) para saber mais.

    • Conheça os novos Termos (https://policies.9oo91e.qjz9zk/terms/update) e os Termos adicionais (https://www.9oo91e.qjz9zk/chrome/terms).

    Caso não concorde com os novos Termos, saiba mais sobre suas opções na seção Perguntas frequentes (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Termos de Serviço do Google Chrome

    +

    Esses Termos de Serviço aplicam-se à versão do código executável do Google Chrome. O código-fonte do Google Chrome está disponível gratuitamente conforme os acordos de licença de software de código aberto em chrome://credits.

    +

    1. Relação do usuário com o Google

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Exceto se tiver sido especificamente autorizado por meio de um contrato em separado firmado com o Google, o usuário concorda em não reproduzir, duplicar, copiar, vender, comercializar ou revender os Serviços para qualquer efeito.

    5.4 O usuário concorda que será o único responsável (e que o Google não tem qualquer responsabilidade perante o usuário ou terceiros) por qualquer violação das suas obrigações no que diz respeito aos Termos e pelas conseqüências (incluindo qualquer perda ou dano que o Google possa sofrer) resultantes dessa violação.

    6. Privacidade e informações pessoais do usuário

    @@ -36808,7 +36815,7 @@ diff --git a/components/resources/terms/terms_pt-BR.html b/components/resources/

    8.4 O Google reconhece e concorda que não obtém qualquer direito, título ou participação do usuário (ou dos seus licenciantes) de acordo com estes Termos e com relação a qualquer Conteúdo que o usuário possa enviar, postar, transmitir ou exibir nos Serviços ou através deles, incluindo quaisquer direitos de propriedade intelectual que subsistam nesse Conteúdo (quer esses direitos estejam registrados ou não, e em qualquer parte do mundo onde esses direitos possam existir). A menos que tenha concordado por escrito de outra forma com o Google, o usuário concorda em ser responsável por proteger e aplicar esses direitos e que o Google não tem qualquer obrigação de fazê-lo em seu nome.

    8.5 O usuário concorda que não removerá, ocultará, tampouco alterará quaisquer avisos de direitos de propriedade (incluindo avisos de direitos autorais e de marcas comerciais) que possam estar afixados ou contidos nos Serviços.

    8.6 A menos que tenha sido expressamente autorizado por escrito pelo Google, o usuário concorda que, ao usar os Serviços, não utilizará qualquer marca comercial, marca de serviço, marca registrada, logotipo de qualquer empresa ou organização de forma que provável ou intencionalmente cause confusão com relação ao proprietário ou ao usuário autorizado dessas marcas, nomes ou logotipos.

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) A NÃO MANUTENÇÃO, POR PARTE DO USUÁRIO, DA SEGURANÇA E DA CONFIDENCIALIDADE DOS DETALHES DA SUA CONTA E SENHA.

    14.2 AS LIMITAÇÕES DE RESPONSABILIDADE DO GOOGLE PERANTE O USUÁRIO, MENCIONADAS NO PARÁGRAFO 14.1 ACIMA, SERÃO APLICÁVEIS INDEPENDENTEMENTE DE O GOOGLE TER OU NÃO SIDO NOTIFICADO OU ESTAR CIENTE DA POSSIBILIDADE DE OCORRÊNCIA DE TAIS PERDAS.

    15. Políticas relativas a direitos autorais e marcas comerciais

    @@ -36819,7 +36826,7 @@ diff --git a/components/resources/terms/terms_pt-BR.html b/components/resources/

    16. Anúncios

    16.1 Alguns dos Serviços são mantidos por receita proveniente de publicidade e podem exibir anúncios e promoções. Esses anúncios podem ser segmentados ao conteúdo da informação armazenada nos Serviços, consultas feitas por meio dos Serviços ou outras informações.

    16.2 A maneira, modo e abrangência da publicidade do Google nos Serviços estão sujeitos a alterações sem aviso prévio específico ao usuário.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 O usuário reconhece e concorda que o Google não é responsável pela disponibilidade de qualquer um desses sites ou recursos externos e nem endossa qualquer anúncio, produto ou outro material disponível ou originado em tais sites e recursos.

    17.3 O usuário reconhece e concorda que o Google não é responsável por qualquer perda ou dano em que possa incorrer em resultado da disponibilidade de tais sites ou recursos externos, ou em decorrência de qualquer confiança do usuário em relação à integridade, precisão ou existência de quaisquer anúncios, produtos ou outros materiais presentes ou disponíveis a partir de tais sites ou recursos.

    18. Alterações nos Termos

    @@ -36831,7 +36838,16 @@ diff --git a/components/resources/terms/terms_pt-BR.html b/components/resources/ diff --git a/components/resources/terms/terms_pt-PT.html b/components/resources/terms/terms_pt-PT.html --- a/components/resources/terms/terms_pt-PT.html +++ b/components/resources/terms/terms_pt-PT.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Vamos atualizar os Termos de Utilização para o Chrome a 31 de março de 2020. Os novos termos vão incluir os Termos de Utilização do Google e os Termos de Utilização Adicionais do Google Chrome e do Chrome OS. Até lá, os termos abaixo continuam a aplicar-se. Consulte um resumo das principais alterações (https://policies.google.com/terms/chromechanges) para obter mais detalhes.

    • Veja uma pré-visualização dos novos Termos (https://policies.google.com/terms/update) e dos Termos Adicionais (https://www.google.com/chrome/terms).

    Se não aceitar os nossos novos Termos, pode obter mais informações acerca das suas opções nas nossas Perguntas frequentes (https://policies.google.com/terms/chromechanges#faq).

    ++

    Vamos atualizar os Termos de Utilização para o Chrome a 31 de março de 2020. Os novos termos vão incluir os Termos de Utilização do Google e os Termos de Utilização Adicionais do Google Chrome e do Chrome OS. Até lá, os termos abaixo continuam a aplicar-se. Consulte um resumo das principais alterações (https://policies.9oo91e.qjz9zk/terms/chromechanges) para obter mais detalhes.

    • Veja uma pré-visualização dos novos Termos (https://policies.9oo91e.qjz9zk/terms/update) e dos Termos Adicionais (https://www.9oo91e.qjz9zk/chrome/terms).

    Se não aceitar os nossos novos Termos, pode obter mais informações acerca das suas opções nas nossas Perguntas frequentes (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Termos de utilização do Google Chrome

    +

    Estes Termos de utilização são aplicáveis à versão de código executável do Google Chrome. O código fonte do Google Chrome está disponível gratuitamente nos contratos de licença de software de código aberto em chrome://credits.

    +

    1. Relação do utilizador com a Google

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Excepto se tiver sido especificamente autorizado para tal num contrato em separado estabelecido com a Google, concorda em não reproduzir, duplicar, copiar, vender, comercializar ou revender os Serviços para efeito algum.

    5.4 Concorda que será o único responsável (e que a Google não tem qualquer responsabilidade perante o utilizador ou terceiros) por qualquer violação das suas obrigações ao abrigo dos Termos e pelas consequências (incluindo qualquer perda ou dano que a Google possa sofrer) resultantes dessa violação.

    6. Privacidade e informações pessoais do utilizador

    @@ -36853,7 +36869,7 @@ diff --git a/components/resources/terms/terms_pt-PT.html b/components/resources/

    8.4 A Google reconhece e concorda que não obtém qualquer direito, título ou interesse do utilizador (ou dos seus licenciadores) ao abrigo destes Termos relativamente a qualquer Conteúdo que possa enviar, publicar, transmitir ou apresentar nos Serviços, ou através dos mesmos, incluindo quaisquer direitos de propriedade intelectual que subsistam nesse Conteúdo (quer esses direitos estejam registados ou não e em qualquer parte do mundo onde esses direitos possam existir). A não ser que tenha acordado por escrito em contrário com a Google, o utilizador concorda que é responsável por proteger e aplicar esses direitos e que a Google não tem qualquer obrigação de o fazer em seu nome.

    8.5 O utilizador concorda em não remover, ocultar nem alterar quaisquer avisos de direitos de propriedade (incluindo avisos de direitos de autor e de marcas comerciais) que possam estar afixados ou contidos nos Serviços.

    8.6 A menos que tenha sido expressamente autorizado por escrito pela Google a fazê-lo, o utilizador concorda que, ao utilizar os Serviços, não irá usar qualquer marca comercial, marca de serviço, marca registada, logótipo de qualquer empresa ou organização de forma a que seja provável ou pretendido que cause confusão relativamente ao proprietário ou utilizador autorizado dessas marcas, nomes ou logótipos.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 O utilizador reconhece e concorda que a Google não é responsável pela disponibilidade de quaisquer sites ou recursos externos, assim como não apoia qualquer publicidade, produtos ou outros materiais presentes ou disponíveis a partir desses Web sites ou recursos.

    17.3 O utilizador reconhece e concorda que a Google não é responsável por qualquer perda ou dano em que possa incorrer em resultado da disponibilidade de tais sites ou recursos externos, ou em resultado de qualquer confiança colocada pelo utilizador quanto à integridade, precisão ou existência de qualquer publicidade, produtos ou outros materiais presentes ou disponíveis a partir de tais Web sites ou recursos.

    18. Alterações aos Termos

    @@ -36865,7 +36881,16 @@ diff --git a/components/resources/terms/terms_pt-PT.html b/components/resources/ diff --git a/components/resources/terms/terms_ro.html b/components/resources/terms/terms_ro.html --- a/components/resources/terms/terms_ro.html +++ b/components/resources/terms/terms_ro.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Actualizăm termenii și condițiile pentru Chrome pe 31 martie 2020. Noile condiții vor include Termenii și condițiile Google și termenii și condițiile suplimentare pentru Google Chrome și sistemul de operare Chrome. Până atunci, se vor aplica în continuare condițiile de mai jos. Consultă rezumatul modificărilor principale (https://policies.google.com/terms/chromechanges) pentru mai multe detalii.

    Dacă nu accepți noile Condiții, poți afla mai multe informații despre opțiunile disponibile, din Întrebările frecvente (https://policies.google.com/terms/chromechanges#faq).

    ++

    Actualizăm termenii și condițiile pentru Chrome pe 31 martie 2020. Noile condiții vor include Termenii și condițiile Google și termenii și condițiile suplimentare pentru Google Chrome și sistemul de operare Chrome. Până atunci, se vor aplica în continuare condițiile de mai jos. Consultă rezumatul modificărilor principale (https://policies.9oo91e.qjz9zk/terms/chromechanges) pentru mai multe detalii.

    Dacă nu accepți noile Condiții, poți afla mai multe informații despre opțiunile disponibile, din Întrebările frecvente (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Termeni şi condiţii Google Chrome

    +

    Aceşti Termeni şi condiţii se aplică versiunii de cod executabil a Google Chrome. Codul sursă pentru Google Chrome este disponibil gratuit, în baza acordurilor de licenţiere pentru software open source, la adresa chrome://credits.

    +

    1. Relaţia dvs. cu Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Dacă nu vi s-a permis în mod explicit să faceţi aceasta într-un acord separat cu Google, sunteţi de acord că nu veţi reproduce, duplica, copia, vinde, comercializa sau revinde Serviciile în niciun scop.

    5.4 Sunteţi de acord că sunteţi singurul responsabil pentru (şi că Google nu are nicio responsabilitate faţă de dvs. sau faţă de orice terţă parte) orice încălcare a obligaţiilor dvs. ce derivă din Termeni şi pentru consecinţele (incluzând orice pierdere sau daună pe care o poate suferi Google) unei astfel de încălcări.

    6. Confidenţialitatea şi informaţiile dvs. personale

    @@ -36880,7 +36905,7 @@ diff --git a/components/resources/terms/terms_ro.html b/components/resources/ter

    7.4 Înţelegeţi că, prin utilizarea Serviciilor, puteţi fi expus la un Conţinut pe care îl puteţi considera ofensator, indecent sau inacceptabil şi că, în această privinţă, utilizaţi Serviciile pe propriul dvs. risc.

    7.5 Sunteţi de acord că sunteţi singurul responsabil pentru (şi că Google nu are nicio responsabilitate faţă de dvs. sau faţă de orice terţă parte) orice Conţinut pe care îl creaţi, transmiteţi sau expuneţi în timp ce utilizaţi Serviciile şi pentru consecinţele acţiunilor dvs. (inclusiv pentru orice pierdere sau daună pe care o poate suferi Google).

    8. Drepturi de proprietate

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Luaţi cunoştinţă şi sunteţi de acord că Google nu este responsabil pentru disponibilitatea niciunor asemenea site-uri sau resurse externe şi nu susţine niciun anunţ, produs sau alte materiale de pe sau disponibile prin astfel de site-uri web sau resurse.

    17.3 Luaţi cunoştinţă şi sunteţi de acord că Google nu este răspunzător pentru nicio pierdere sau daună care poate apărea pentru dvs. ca rezultat al disponibilităţii acelor site-uri sau resurse externe ori ca rezultat al încrederii acordate de dvs. caracterului integral, exactităţii sau existenţei unui anunţ, produs ori a altor materiale din sau disponibile prin astfel de site-uri web sau resurse.

    18. Modificări ale Termenilor

    @@ -36892,7 +36917,16 @@ diff --git a/components/resources/terms/terms_ro.html b/components/resources/ter diff --git a/components/resources/terms/terms_ru.html b/components/resources/terms/terms_ru.html --- a/components/resources/terms/terms_ru.html +++ b/components/resources/terms/terms_ru.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Условия использования Chrome будут обновлены 31 марта 2020 года. Новые условия будут включать в себя Условия использования Google, а также дополнительные условия использования Google Chrome и Chrome OS. До 31 марта 2020 года будут действовать приведенные ниже условия. Прочитайте краткую сводку основных изменений (https://policies.google.com/terms/changes).

    Если Вы не согласны с новыми Условиями, обратитесь к разделу часто задаваемых вопросов (https://policies.google.com/terms/chromechanges#faq).

    ++

    Условия использования Chrome будут обновлены 31 марта 2020 года. Новые условия будут включать в себя Условия использования Google, а также дополнительные условия использования Google Chrome и Chrome OS. До 31 марта 2020 года будут действовать приведенные ниже условия. Прочитайте краткую сводку основных изменений (https://policies.9oo91e.qjz9zk/terms/changes).

    Если Вы не согласны с новыми Условиями, обратитесь к разделу часто задаваемых вопросов (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Условия предоставления услуг Google Chrome

    +

    Настоящие Условия предоставления услуг распространяются на исполняемый код Google Chrome. Исходный код Google Chrome предоставляется бесплатно на условиях лицензионных соглашений на программное обеспечение с открытым исходным кодом по адресу chrome://credits.

    +

    1. Взаимоотношения с компанией Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3. Вы обязуетесь не воспроизводить, не дублировать, не копировать, не продавать, не обменивать и не перепродавать Услуги в каких-либо целях, если право на это не было предоставлено Вам компанией Google в отдельном соглашении.

    5.4. Вы соглашаетесь с тем, что несете полную ответственность (и что компания Google не принимает на себя никакой ответственности ни перед Вами, ни перед какими-либо третьими лицами) за любое нарушение Ваших обязательств, оговоренных в Условиях, а также за все последствия (включая любые потери или ущерб, которые может понести компания Google), вызванные этими нарушениями.

    6. Конфиденциальность и личная информация

    @@ -36907,7 +36941,7 @@ diff --git a/components/resources/terms/terms_ru.html b/components/resources/ter

    7.4. Вы осознаете, что при пользовании Услугами Вы можете столкнуться с Содержанием, которое носит оскорбительный, непристойный или неприемлемый характер, и в этом отношении Вы пользуетесь Услугами на свой страх и риск.

    7.5. Вы соглашаетесь с тем, что несете полную ответственность (и что компания Google не принимает на себя какую-либо ответственность ни перед Вами, ни перед любыми третьими лицами) за все Содержание, которое Вы создаете, передаете или размещаете для показа в процессе пользования Услугами, а также за последствия, вызванные этими действиями (включая любые потери или ущерб, который может понести компания Google).

    8. Права собственности

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2. Вы признаете и соглашаетесь с тем, что Google не несет ответственности за доступность внешних сайтов и ресурсов, а также не берет на себя какую-либо ответственность относительно рекламы, продуктов или других материалов, размещенных на этих сайтах и ресурсах или доступных с их помощью.

    17.3. Вы признаете и соглашаетесь с тем, что Google не несет ответственности за какие-либо убытки или ущерб, понесенные Вами в результате осуществления доступа к этим внешним сайтам и ресурсам или возникшие в результате Вашего расчета на точность, полноту или достоверность рекламной информации, продуктов и других материалов, размещенных на этих сайтах и ресурсах или доступных с их помощью.

    18. Изменение Условий

    @@ -36919,7 +36953,16 @@ diff --git a/components/resources/terms/terms_ru.html b/components/resources/ter diff --git a/components/resources/terms/terms_sk.html b/components/resources/terms/terms_sk.html --- a/components/resources/terms/terms_sk.html +++ b/components/resources/terms/terms_sk.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    31. marca 2020 aktualizujeme zmluvné podmienky pre prehliadač Chrome. Nové zmluvné podmienky budú zahŕňať zmluvné podmienky spoločnosti Google a dodatočné zmluvné podmienky prehliadača Google Chrome a systému Chrome OS. Dovtedy platia zmluvné podmienky uvedené nižšie. Ďalšie podrobnosti nájdete v súhrne hlavných zmien (https://policies.google.com/terms/chromechanges).

    Ak s novými zmluvnými podmienkami nesúhlasíte, viac o svojich možnostiach sa dozviete v častých otázkach (https://policies.google.com/terms/chromechanges#faq).

    ++

    31. marca 2020 aktualizujeme zmluvné podmienky pre prehliadač Chrome. Nové zmluvné podmienky budú zahŕňať zmluvné podmienky spoločnosti Google a dodatočné zmluvné podmienky prehliadača Google Chrome a systému Chrome OS. Dovtedy platia zmluvné podmienky uvedené nižšie. Ďalšie podrobnosti nájdete v súhrne hlavných zmien (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    Ak s novými zmluvnými podmienkami nesúhlasíte, viac o svojich možnostiach sa dozviete v častých otázkach (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome – Zmluvné podmienky

    +

    Tieto Zmluvné podmienky sa týkajú verzie spustiteľného kódu aplikácie Google Chrome. Zdrojový kód aplikácie Google Chrome je k dispozícii bezplatne na základe dohody o poskytnutí licencie na softvér open source na adrese chrome://credits.

    +

    1. Váš vzťah so spoločnosťou Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Súhlasíte s tým, že nebudete reprodukovať, duplikovať, kopírovať, predávať, vymieňať alebo ďalej predávať Služby na akýkoľvek účel, pokiaľ vám to nebolo konkrétne povolené samostatnou dohodou so spoločnosťou Google.

    5.4 Súhlasíte, že nesiete plnú zodpovednosť (a že spoločnosť Google nemá žiadnu zodpovednosť voči vám ani akejkoľvek tretej strane) za akékoľvek porušenie vašich povinností plynúcich zo Zmluvných podmienok a za dôsledky akéhokoľvek takého porušenia (vrátane akejkoľvek straty alebo škody, ktorú môže spoločnosť Google utrpieť).

    6. Ochrana osobných údajov a vaše osobné údaje

    @@ -36934,7 +36977,7 @@ diff --git a/components/resources/terms/terms_sk.html b/components/resources/ter

    7.4 Beriete na vedomie, že využívaním Služieb sa môžete dostať do styku s Obsahom, ktorý môžete považovať za urážlivý, neslušný alebo problematický, a že v tomto smere využívate Služby na vlastné riziko.

    7.5 Súhlasíte s tým, že nesiete plnú zodpovednosť (a že spoločnosť Google nemá žiadnu zodpovednosť voči vám ani akejkoľvek tretej strane) za akýkoľvek Obsah, ktorý vytvoríte, prenesiete alebo zobrazíte počas využívania Služieb, a za dôsledky takého konania (vrátane akejkoľvek straty alebo škody, ktorú môže spoločnosť Google utrpieť).

    8. Vlastnícke práva

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Beriete na vedomie a súhlasíte s tým, že spoločnosť Google nie je zodpovedná za dostupnosť žiadnych takýchto externých stránok alebo zdrojov a nepodporuje žiadne reklamy, produkty alebo iné materiály dostupné z takýchto webových stránok alebo zdrojov.

    17.3 Beriete na vedomie a súhlasíte s tým, že spoločnosť Google nie je zodpovedná za akúkoľvek stratu alebo škodu, ktorú si môžete privodiť v dôsledku dostupnosti takýchto externých stránok alebo zdrojov alebo akejkoľvek dôvery, ktorú ste vložili do úplnosti, presnosti alebo existencie akejkoľvek inzercie, produktov alebo iných materiálov dostupných z takýchto webových stránok alebo zdrojov.

    18. Zmeny Zmluvných podmienok

    @@ -36946,7 +36989,16 @@ diff --git a/components/resources/terms/terms_sk.html b/components/resources/ter diff --git a/components/resources/terms/terms_sl.html b/components/resources/terms/terms_sl.html --- a/components/resources/terms/terms_sl.html +++ b/components/resources/terms/terms_sl.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    31. marca 2020 bomo posodobili pogoje storitve za Chrome. Novi pogoji bodo vključevali Googlove pogoje storitve ter dodatne pogoje storitve za Google Chrome in Chrome OS. Do takrat veljajo pogoji v nadaljevanju. Če želite več informacij, preberite povzetek najpomembnejših sprememb (https://policies.google.com/terms/chromechanges).

    Če se ne strinjate z našimi novimi pogoji storitve, je več informacij o možnostih, ki so vam na voljo, v naših pogostih vprašanjih (https://policies.google.com/terms/chromechanges#faq).

    ++

    31. marca 2020 bomo posodobili pogoje storitve za Chrome. Novi pogoji bodo vključevali Googlove pogoje storitve ter dodatne pogoje storitve za Google Chrome in Chrome OS. Do takrat veljajo pogoji v nadaljevanju. Če želite več informacij, preberite povzetek najpomembnejših sprememb (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    Če se ne strinjate z našimi novimi pogoji storitve, je več informacij o možnostih, ki so vam na voljo, v naših pogostih vprašanjih (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Pogoji storitve Google Chrome

    +

    Ti pogoji storitve veljajo za različico brskalnika Google Chrome z izvedljivo kodo. Izvorna koda za Google Chrome je na voljo brezplačno v okviru licenčne pogodbe o odprtokodni programski opremi na strani chrome://credits.

    +

    1. Razmerje z Googlom

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Strinjate se, da za noben namen ne boste ponovno ustvarjali, podvajali, kopirali, prodajali ali preprodajali storitev oziroma z njimi trgovali. To lahko storite le, če vam Google to izrecno dovoli z ločeno pogodbo.

    5.4 Strinjate se, da ste edini odgovorni za kakršno koli kršitev svojih dolžnosti (pri tem Google nima odgovornosti do vas ali tretje osebe), ki so zapisane v pogojih, in za posledice (vključno z izgubo ali škodo, ki jo utrpi Google) take kršitve.

    6. Zasebnost in vaši osebni podatki

    @@ -36964,7 +37016,16 @@ diff --git a/components/resources/terms/terms_sl.html b/components/resources/ter diff --git a/components/resources/terms/terms_sr.html b/components/resources/terms/terms_sr.html --- a/components/resources/terms/terms_sr.html +++ b/components/resources/terms/terms_sr.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Ажурирамо услове коришћења услуге за Chrome 31. марта 2020. Нови услови обухватају Google услове коришћења услуге и Google Chrome и Chrome ОС додатне услове коришћења услуге. До тада важе услови наведени у наставку. Више информација можете да прочитате у резимеу кључних измена (https://policies.google.com/terms/chromechanges).

    Ако не прихватате нове услове, можете да пронађете додатне информације о опцијама које су вам на располагању у честим питањима (https://policies.google.com/terms/chromechanges#faq).

    ++

    Ажурирамо услове коришћења услуге за Chrome 31. марта 2020. Нови услови обухватају Google услове коришћења услуге и Google Chrome и Chrome ОС додатне услове коришћења услуге. До тада важе услови наведени у наставку. Више информација можете да прочитате у резимеу кључних измена (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    Ако не прихватате нове услове, можете да пронађете додатне информације о опцијама које су вам на располагању у честим питањима (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome услови коришћења услуге

    +

    Ови услови коришћења услуге односе се на верзију извршног кода Google Chrome прегледача. Изворни кôд за Google Chrome доступан је бесплатно према уговору о лиценцирању софтвера са отвореним кодом на адреси chrome://credits.

    +

    1. Однос између вас и Google-а

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Уколико немате изричиту дозволу да то урадите на основу посебног уговора са Google-ом, прихватате да нећете умножавати, дуплирати, копирати, продавати, размењивати нити препродавати Услуге ни у које сврхе.

    5.4 Прихватате да сте једино ви одговорни (и да Google нема никакву одговорност према вама или било којим трећим лицима) за било какво кршење обавеза одређених Условима и за последице сваког таквог кршења (укључујући и сваки губитак или штету коју Google може да претрпи).

    6. Приватност и лични подаци

    @@ -36979,7 +37040,7 @@ diff --git a/components/resources/terms/terms_sr.html b/components/resources/ter

    7.4 Сагласни сте да коришћењем Услуга можете да будете изложени Садржају који ћете можда сматрати увредљивим, непристојним или непожељним и да, у том погледу, користите Услуге на сопствену одговорност.

    7.5 Прихватате да сте једино ви одговорни (и да Google нема никакву одговорност према вама нити било којим трећим лицима) за било који Садржај који правите, преносите или приказујете у току коришћења Услуга, као и за последице својих поступака (укључујући и сваки губитак или штету које Google може да претрпи).

    8. Власничка права

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Сагласни сте и прихватате да Google није одговоран за доступност ниједног таквог спољног сајта нити ресурса и да не одобрава ниједан оглас, производ нити друге материјале на таквим веб сајтовима или ресурсима, или доступне путем њих.

    17.3 Сагласни сте и прихватате да Google није одговоран ни за какав губитак или штету коју нанесете као резултат доступности ових спољних сајтова или ресурса, или као резултат било каквог ослањања на потпуност, тачност и постојање оглашавања, производа и других материјала на таквим веб сајтовима или ресурсима, или доступних путем њих.

    18. Промене услова

    @@ -36991,7 +37052,16 @@ diff --git a/components/resources/terms/terms_sr.html b/components/resources/ter diff --git a/components/resources/terms/terms_sv.html b/components/resources/terms/terms_sv.html --- a/components/resources/terms/terms_sv.html +++ b/components/resources/terms/terms_sv.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Vi uppdaterar användarvillkoren för Chrome den 31 mars 2020. De nya villkoren omfattar Googles användarvillkor och de ytterligare användarvillkoren för Google Chrome och Chrome OS. Till dess gäller villkoren nedan. Läs mer i sammanfattningen av de viktigaste ändringarna (https://policies.google.com/terms/chromechanges).

    • Förhandsgranska våra nya villkor (https://policies.google.com/terms/update) och ytterligare villkor (https://www.google.com/chrome/terms).

    Om du inte godkänner våra nya villkor, kan du hitta mer information om vilka alternativ du har genom att läsa våra vanliga frågor (https://policies.google.com/terms/chromechanges#faq).

    ++

    Vi uppdaterar användarvillkoren för Chrome den 31 mars 2020. De nya villkoren omfattar Googles användarvillkor och de ytterligare användarvillkoren för Google Chrome och Chrome OS. Till dess gäller villkoren nedan. Läs mer i sammanfattningen av de viktigaste ändringarna (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    • Förhandsgranska våra nya villkor (https://policies.9oo91e.qjz9zk/terms/update) och ytterligare villkor (https://www.9oo91e.qjz9zk/chrome/terms).

    Om du inte godkänner våra nya villkor, kan du hitta mer information om vilka alternativ du har genom att läsa våra vanliga frågor (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Användarvillkor för Google Chrome

    +

    Dessa användarvillkor gäller den körbara versionen av Google Chrome. Källkoden till Google Chrome är tillgänglig kostnadsfritt enligt de programlicensavtal för öppen källkod som finns på chrome://credits.

    +

    1. Din relation till Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Du samtycker till att inte reproducera, göra dubbletter av, kopiera, sälja, handla med eller sälja vidare tjänsterna oavsett syfte, utom om du har fått särskilt tillstånd att göra detta i ett separat avtal med Google.

    5.4 Du samtycker till att du är ensam ansvarig för (och att Google inte har något ansvar gentemot dig eller någon tredje part för) eventuella brott mot dina förpliktelser enligt villkoren samt för konsekvenserna (inklusive eventuell förlust eller skada som Google kan komma att lida av) av ett sådant brott.

    6. Sekretess och personlig information

    @@ -37006,7 +37076,7 @@ diff --git a/components/resources/terms/terms_sv.html b/components/resources/ter

    7.4 Du är medveten om att din användning av tjänsterna kan innebära att du utsätts för innehåll som du anser vara kränkande, opassande eller stötande och att du i detta hänseende använder tjänsterna på egen risk.

    7.5 Du samtycker till att du ensam är ansvarig (och att Google inte har något ansvar gentemot dig eller någon tredje part) för allt innehåll som du skapar, överför eller visar när du använder tjänsterna samt för konsekvenserna (inklusive eventuell förlust eller skada som Google kan komma att lida) därav.

    8. Äganderätt

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Du är medveten om och samtycker till att Google inte är ansvarigt för tillgängligheten för sådana externa webbplatser eller resurser och inte rekommenderar annonsering, produkter eller annat material som finns på eller som görs tillgängligt via sådana webbplatser eller resurser.

    17.3 Du är medveten om och samtycker till att Google inte är ansvarigt för förlust eller skada som du kan åsamka dig som ett resultat av tillgängligheten av dessa externa webbplatser eller resurser eller som ett resultat av din tilltro till fullständighet, exakthet eller förekomst av annonsering, produkter eller annat material som finns på eller som görs tillgängligt via sådana webbplatser eller resurser.

    18. Ändringar i villkoren

    @@ -37018,7 +37088,16 @@ diff --git a/components/resources/terms/terms_sv.html b/components/resources/ter diff --git a/components/resources/terms/terms_sw.html b/components/resources/terms/terms_sw.html --- a/components/resources/terms/terms_sw.html +++ b/components/resources/terms/terms_sw.html -@@ -39,18 +39,18 @@ body { font-family:Arial; font-size:13px; } +@@ -13,7 +13,7 @@ body { font-family:Arial; font-size:13px; } + + + +-

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.google.com/terms/update) and Additional Terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.9oo91e.qjz9zk/terms/update) and Additional Terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Sheria na Masharti ya Google Chrome

    +

    Sheria na Masharti haya yanatumika kwa toleo la hati fumbo la kutekelezwa la Google Chrome. Hati fumbo asili ya Google

    +

    1. Uhusiano wako na Google

    +@@ -41,18 +41,18 @@ body { font-family:Arial; font-size:13px; }

    5.3 Isipokuwa uwe umeruhusiwa mahsusi kufanya hivyo katika mkataba tofauti na Google, unakubali kuwa hautanakili, kurudufu, kuuza, kufanya biashara au kuuza tena Huduma kwa madhumuni yoyote.

    5.4 Unakubali kuwa unawajibika peke yako kwa (na kuwa Google haina wajibu wowote kwako au mtu mwingine kwa) ukiukaji wowote wa wajibu wako chini ya Masharti na kwa matokeo (ikiwemo hasara yoyote au uharibifu ambao utaikumba Google) ya ukiukaji wowote kama huo.

    6. Faragha na maelezo yako ya kibinafsi

    @@ -37040,7 +37119,7 @@ diff --git a/components/resources/terms/terms_sw.html b/components/resources/ter

    8.4 Google inatambua na kukubali kuwa haipati haki, milki au maslahi yoyote kutoka kwako (au watoa leseni wako) chini ya Masharti haya kwa Maudhui yoyote unayowasilisha, kuchapisha au kuonyesha kwenye, au kupitia Huduma, zikiwemo hakimilki zozote za uvumbuzi zinazodumu katika Maudhui hayo (iwe haki hizo zimesajiliwa au la, na popote ulimwenguni ambapo haki hizo zinadumu). Isipokuwa umekubaliana vingine na Google katika maandishi, unakubali kuwa unawajibika kulinda na kutekeleza haki hizo na kuwa Google haina wajibu wowote wa kufanya hivyo kwa niaba yako.

    8.5 Unakubali kuwa hautaondoa, kuficha au kubadilisha ilani zozote za hakimilki mahsusi (zikiwemo ilani za hakimilki na chapa-biashara) ambazo zimeambatishwa au zilizo ndani ya Huduma.

    8.6 Isipokuwa umepewa idhini mahsusi na Google kwa maandishi kufanya hivyo, unakubali kuwa katika kutumia Huduma, hautatumia chapa-biashara yoyote, alama za huduma, jina la biashara au nembo ya kampuni au shirika lolote kwa njia ambayo inaweza au inayonuiwa kuleta tashwishi kuhusu anayemiliki au mtumiaji aliyeidhinishwa wa alama, majina au nembo kama hizi.

    -@@ -94,8 +94,8 @@ body { font-family:Arial; font-size:13px; } +@@ -96,8 +96,8 @@ body { font-family:Arial; font-size:13px; }

    (V) KUSHINDWA KWAKO KUHIFADHI MAELEZO YA NENOSIRI LAKO NA AKAUNTI YAKO KWA USALAMA NA SIRI;

    14.2 MIPAKA YA DHIMA YA GOOGLE KWAKO KATIKA AYA YA 14.1 HAPO JUU ITATUMIKA IKIWA GOOGLE IMEJULISHWA AU INGESTAHILI KUFAHAMU UWEZEKANO WA HASARA KAMA HIZO KUTOKEA AU LA.

    15. Sera za hakimilki na chapa biashara

    @@ -37051,7 +37130,7 @@ diff --git a/components/resources/terms/terms_sw.html b/components/resources/ter

    16. Matangazo

    16.1 Baadhi ya Huduma zinadhaminiwa na mapato kutoka kwa matanagazo na zinaweza kuonyesha matangazo na kampeni za matangazo. Matangazo hayo yanaweza kuwa yanalenga maudhui ya maelezo yaliyohifadhiwa kwenye Huduma, hoja zilizoulizwa kupitia Huduma au maelezo mengineyo.

    16.2 Mbinu, hali na kiwango cha matangazo kutoka kwa Google kwenye Huduma kinaweza kubadilika bila ilani mahsusi kwako.

    -@@ -105,7 +105,7 @@ body { font-family:Arial; font-size:13px; } +@@ -107,7 +107,7 @@ body { font-family:Arial; font-size:13px; }

    17.2 Unatambua na kukubali kuwa Google haiwajibiki kwa upatikanaji wa tovuti zozote au raslimali kama hizo za nje, na haiidhinishi matangazo, bidhaa au vitu vyovyote kwenye au vinavyopatikana kwenye tovuti au nyenzo hizo.

    17.3 Unatambua na kukubali kuwa Google haiwajibiki kwa hasara au uharibifu wowote unaoweza kukupata wewe kwa sababau ya upatikanaji wa tovuti au raslimali hizo za nje, au kutokana nawe kutegemea kwa vyovyote ukamilifu, usahihi au uwepo wa matangazo, bidhaa au vitu vyoyvote kwenye, au kutoka kwa, tovuti au nyenzo kama hizo.

    18. Mabadiliko kwa Masharti

    @@ -37063,7 +37142,16 @@ diff --git a/components/resources/terms/terms_sw.html b/components/resources/ter diff --git a/components/resources/terms/terms_ta.html b/components/resources/terms/terms_ta.html --- a/components/resources/terms/terms_ta.html +++ b/components/resources/terms/terms_ta.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.google.com/terms/update) and Additional Terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.9oo91e.qjz9zk/terms/update) and Additional Terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome சேவை விதிமுறைகள்

    +

    Google Chrome இன் இயங்கும் குறியீட்டு பதிப்பிற்கு இந்த சேவை விதிமுறைகள் பொருந்தும். chrome://credits இல் உள்ள ஓப்பன் சோர்ஸ் மென்பொருள் உரிம ஒப்பந்தங்களின் கீழ் கட்டணம் இன்றி, Google Chrome க்கான மூல குறியீடு கிடைக்கும்.

    +

    1. Google உடனான உங்கள் உறவு

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Google ஆல் முறையாக தனியான ஒப்பந்தத்தின் மூலம் அனுமதிக்கப்பட்டிருந்தால் தவிர, எந்தவொரு நோக்கத்திற்காகவும் சேவைகளை மீளுருவாக்கம், நகலாக்கம், விற்பனை, வணிகம் அல்லது மறுவிற்பனை செய்ய மாட்டீர்கள் என்பதை ஒப்புக்கொள்கிறீர்கள்.

    5.4 விதிமுறைகள் மீறல்கள் அல்லது மீறல்களைச் சார்ந்து ஏற்படும் எந்த வகையான தொடர்விளைவுகள் (Google க்கு ஏற்படும் இழப்பு அல்லது நட்டம் ஆகியவற்றையும் சேர்த்து) ஆகியவற்றுக்கு நீங்கள் மட்டுமே (உங்களுக்கு அல்லது எந்த மூன்றாம் தரப்புக்கும் Google பொறுப்பாகாது) பொறுப்பாவீர்கள் என்பதை நீங்கள் ஒப்புக்கொள்கிறீர்கள்.

    6. தனியுரிமை மற்றும் உங்கள் தனிப்பட்ட தகவல்கள்

    @@ -37085,7 +37173,7 @@ diff --git a/components/resources/terms/terms_ta.html b/components/resources/ter

    8.4 இந்த விதிமுறைகளின் கீழ் உள்ள சேவைகளில் நீங்கள் சமர்பிக்கும், அஞ்சல் செய்யும், பரிமாறும் அல்லது வெளியிடும் எந்த உள்ளடக்கத்திலும், தலைப்பு மற்றும் உங்களிடமிருந்து (அல்லது உங்கள் உரிமதாரரிடமிருந்து) விவரங்கள், அந்த உள்ளடக்கங்கள் தொடர்பான அறிவுசார் சொத்துரிமைகள் (அவ்வுரிமைகள் பதிவு செய்யப்பட்டிருந்தால் அல்லது இல்லாவிட்டால் மற்றும் உலகின் எந்த இடத்திலும் இவ்வுரிமைகள் இருந்தாலும்) ஆகியவற்றை Google வைத்திருக்கவில்லை என்பதை அறிந்துள்ளதுடன் ஒப்புக்கொள்கிறது. Google உடன் எழுத்துப்பூர்வமாக ஒப்புகொள்ளும் வரை, நீங்களே அந்த உரிமைகளைப் பாதுகாக்கவும் தொடரவும் வேண்டும், உங்கள் சார்பாக Google ஏதும் செய்ய இயலாது.

    8.5 சேவைகளில் இணைக்கப்பட்டுள்ள அல்லது சேவைகளில் உள்ள எந்த உரிமையுடைமை உரிமை அறிக்கைகளை (பதிப்புரிமை மற்றும் வணிகமுத்திரை அறிக்கைகள் ஆகியவற்றையும் சேர்த்து) நீங்கள் நீக்கவோ, மறைக்கவோ, அல்லது மாற்றவோ மாட்டீர்கள் என்பதை ஒப்புக்கொள்கிறீர்கள்.

    8.6 Google ஆல் வெளிப்படையாக எழுத்துபூர்வமாக அங்கீகரிக்கப்பட்டிருந்தால் தவிர நீங்கள் எந்த ஒரு நிறுவனம் அல்லது அமைப்பின் வணிகமுத்திரை, சேவை முத்திரை, வணிகப் பெயர், லோகோ ஆகியவற்றை பயன்படுத்தக் கூடாது, அவ்வாறு பயன்படுத்துதல் அவ்வகை முத்திரைகள், பெயர்கள் அல்லது லோகோக்களின் உரிமையாளர் அல்லது அங்கீகரிக்கப்பட்ட பயனரைப் பற்றிய குழப்பத்தை விளைவிக்கலாம்.

    -@@ -96,8 +96,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -98,8 +98,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) உங்கள் கடவுச்சொல் அல்லது மற்ற கணக்கு தகவல்களைப் பாதுகாத்துக்கொள்ளத் தவறுதல்;

    14.2 மேலே 14.1 -வது பத்தியில் உங்களுக்கு அளிக்கப்பட்ட GOOGLE பொறுப்பின் மீதான வரம்புகள் யாவும், முன்பே Google மூலம் அறிவுறுத்தப்பட்டாலும் அல்லது அறிவுறுத்தப்படவில்லை என்றாலும் அல்லது ஏதேனும் இழப்புகள் ஏற்படும் சூழல் உருவாகும்போது பொருந்தும்.

    15. பதிப்புரிமை மற்றும் வர்த்தகக் குறியீட்டு கொள்கைகள்

    @@ -37096,7 +37184,7 @@ diff --git a/components/resources/terms/terms_ta.html b/components/resources/ter

    16. விளம்பரங்கள்

    16.1 விளம்பரப்படுத்தல் வருமானத்தின் மூலம் சில சேவைகள் ஆதரிக்கப்படுகின்றன மேலும் விளம்பரங்கள் மற்றும் தர உயர்வுகளின் மூலமாகவும் அவை காண்பிக்கப்படக்கூடும். சேவைகளில் சேமிக்கப்பட்டிருக்கக்கூடிய அல்லது பிற தகவலின் மூலம் எழுப்பப்பட்ட கேள்விகளில் சேமிக்கப்பட்டுள்ள தகவலின் உள்ளடக்கத்தை மையமாகக் கொண்டே இந்த விளம்பரங்கள் இருக்கக்கூடும்.

    16.2 சேவைகளில் Google இன் விளம்பரங்களின் முறை, வடிவம் மற்றும் அளவு உங்களுக்கு தெரிவிக்கப்படாமலே மாற்றப்படலாம்.

    -@@ -107,7 +107,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -109,7 +109,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 இது போன்ற வெளிப்புற வலைத்தளங்கள் அல்லது ஆதாரங்கள் ஆகியவை அணுகக் கிடைப்பதற்கு Google எவ்வகையிலும் பொறுப்பேற்காது என்பதையும், இவ்வகை வலைத் தளங்கள் அல்லது ஆதாரங்கள் ஆகியவற்றில் உள்ள அல்லது ஆகியவற்றிலிருந்து கிடைக்கும் விளம்பரங்கள், தயாரிப்புகள் அல்லது மற்றவைக்கு எவ்வித ஆதரவையும் Google வழங்கவில்லை என்பதையும் நீங்கள் அறிந்து ஒப்புக்கொள்கிறீர்கள்.

    17.3 அவ்வகையான வெளித்தளங்கள் அல்லது தகவல் ஆதாரங்கள் ஆகியவற்றினால் நீங்கள் பெறக்கூடிய எவ்வகை இழப்பு அல்லது குறைபாடுக்கும் Google பொறுப்பாகாது என்பதையும், இவ்வகை வலைத்தளங்கள் அல்லது தகவல் ஆதாரங்கள் ஆகியவற்றில் உள்ள அல்லது ஆகியவற்றிலிருந்து கிடைக்கும் விளம்பரங்கள், தயாரிப்புகள் அல்லது மற்றவையின் முழுமை, துல்லியம் அல்லது இருப்பு ஆகியவற்றின் மீது நீங்கள் வைக்கும் எவ்வகை நம்பிக்கையின் காரணமாக நீங்கள் பெறக்கூடிய எவ்வகை இழப்பு அல்லது குறைபாடுக்கும் Google பொறுப்பாகாது என்பதையும் நீங்கள் அறிந்து அதனை ஒப்புக்கொள்கிறீர்கள்.

    18. விதிமுறையில் மாற்றங்கள்

    @@ -37108,7 +37196,16 @@ diff --git a/components/resources/terms/terms_ta.html b/components/resources/ter diff --git a/components/resources/terms/terms_te.html b/components/resources/terms/terms_te.html --- a/components/resources/terms/terms_te.html +++ b/components/resources/terms/terms_te.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.google.com/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.google.com/terms/update) and Additional Terms (https://www.google.com/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.google.com/terms/chromechanges#faq).

    ++

    We’re updating the terms of service for Chrome on March 31, 2020. The new terms will include Google’s Terms of Service and the Google Chrome and Chrome OS additional terms of service. Until then, the terms below continue to apply. See a summary of the key changes (https://policies.9oo91e.qjz9zk/terms/chromechanges) for more details.

    • See a preview of the new Terms (https://policies.9oo91e.qjz9zk/terms/update) and Additional Terms (https://www.9oo91e.qjz9zk/chrome/terms).

    If you don’t agree to our new Terms, you can find more information about your options in our Frequently Asked Questions (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Google Chrome సేవా నిబంధనలు

    +

    ఈ సేవా నిబంధనలు Google Chrome యొక్క ఆచరించదగ్గ కోడ్ సంస్కరణకు వర్తిస్తాయి. Google Chrome కోసం సోర్స్ కోడ్ chrome://credits వద్ద ఓపెన్ సోర్స్ సాఫ్ట్‌వేర్ లైసెన్స్ ఒప్పందం క్రింద ఉచితంగా అందుబాటులో ఉంటుంది.

    +

    1. Googleతో మీ సంబంధం

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 మీకు Google తో ప్రత్యేకించి విడిగా ఒప్పందం ఉంటే తప్ప, ఈ సేవలను మీరు ఏ ప్రయోజనం కోసమైనా సరే పునరుత్పత్తికి, నకలు, కాపీ, విక్రయించడం, వ్యాపారం లేదా పునఃవిక్రయం వంటివి చెయ్యడానికి పాల్పడరని మీరు అంగీకరిస్తున్నారు.

    5.4 నిబంధనలలోని ఏ అనివార్య అంశాలనైనా మీరు ఉల్లంఘించిన పక్షంలో (Google మీకు లేక మూడవ పార్టీకి బాధ్యత వహించదని) మరియు అలాంటి ఉల్లంఘన కారణంగా ఎదురయ్యే ఫలితాలకు (Googleకు అసౌకర్యం కలిగించే విధంగా నష్టం, హానితో సహా) మీరే పూర్తి బాధ్యత వహిస్తారని అంగీకరిస్తున్నారు.

    6. గోప్యత మరియు మీ వ్యక్తిగత సమాచారం

    @@ -37130,7 +37227,7 @@ diff --git a/components/resources/terms/terms_te.html b/components/resources/ter

    8.4 ఈ క్రింది నిబంధనలను మరియు మీరు సమర్పించిన, పోస్ట్ చేసిన లేదా ప్రదర్శిస్తున్న కంటెంట్‌లో మరియు మేధోసంపత్తి హక్కులతో సహా సేవల ద్వారా (ఆ హక్కులు నమోదు చెయ్యబడి ఉన్నా లేకున్నా మరియు ప్రపంచంలో ఈ హక్కులు ఎక్కడ ఉనికిలో ఉన్నా) మీ నుండి (లేదా మీ లైసెన్సర్ల నుండి) ఏ హక్కును, టైటిల్‌ను లేక వడ్డీని పొందలేదని Google తెలియజేసి అంగీకరిస్తుంది. మీరు Googleకు వ్రాతపూర్వకంగా ఆమోదం తెలిపి ఉంటే తప్ప, ఆ హక్కులను రక్షించడంలో మరియు అమలు చేయడంలో మీదే బాధ్యత అని మరియు మీ తరపున Google బాధ్యత వహించబోదని మీరు అంగీకరిస్తున్నారు.

    8.5 మీరు సేవల్లోని సూచనలను లేదా చేర్చిన కంటెంట్‌ను (కాపీరైట్ మరియు వ్యాపార చిహ్నం ఉన్న నోటీసులతో సహా) ఏదైనా యాజమాన్య హక్కుల నోటీసులను సవరించడం, తొలగించడం లేదా మెరుగుపర్చడం చెయ్యరని మీరు అంగీకరిస్తున్నారు.

    8.6 అలా చెయ్యడానికి వ్రాతపూర్వకంగా Googleచే ప్రత్యేకంగా మీరు అధికారం పొంది ఉంటే తప్ప, సేవలను ఉపయోగించుకోవడంలో, అటువంటి చిహ్నాలు, పేర్లు లేదా వ్యాపారచిహ్నాల యజమాని లేదా అధీకృత వినియోగదారు గురించి గందరగోళం తలెత్తే రీతిలో ఏదైనా వ్యాపార చిహ్నం, సేవా చిహ్నం, వ్యాపార పేర్లు, ఏదైనా కంపెనీ లేదా సంస్థ యొక్క వ్యాపారచిహ్నాన్ని ఉపయోగించబోరని మీరు అంగీకరిస్తున్నారు.

    -@@ -96,8 +96,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -98,8 +98,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) మీ పాస్వర్డ్ లేదా ఖాతా వివరాలను సురక్షితంగా మరియు గోప్యంగా ఉంచడంలో మీ వైఫల్యం;

    14.2 ఇటువంటి నష్టాలు ఏవైనా ఎదురవుతాయని GOOGLEకు సలహా ఉన్నా లేకపోయినా లేదా అప్రమత్తంగా లేకపోయినా 14.1 పేరాలో మీపై GOOGLE బాధ్యతలకు సంబంధించిన పరిమితులు వర్తిస్తాయి.

    15. కాపీరైట్ మరియు ట్రేడ్ మార్క్ విధానాలు

    @@ -37141,7 +37238,7 @@ diff --git a/components/resources/terms/terms_te.html b/components/resources/ter

    16. ప్రకటనలు

    16.1 ప్రకటన యొక్క రాబడులచే కొన్ని సేవలు మద్దతివ్వబడుతున్నాయి మరియు ప్రకటనలు, ప్రమోషన్లను ప్రదర్శించవచ్చు. సేవలు లేదా ఇతర సమాచారం ద్వారా తయారు చెయ్యబడిన సేవలు, ప్రశ్నలలో నిల్వచెయ్యబడిన సమాచారం యొక్క కంటెంట్‌కు ఈ ప్రకటనలు లక్ష్యంగా ఉండవచ్చు.

    16.2 సేవల్లో Google ద్వారా ప్రకటించబడిన శైలి, రీతి, పరిధి అనేవి మీకు నిర్దిష్ట నోటీసు ఇవ్వకుండానే మార్చడం జరుగుతుంది.

    -@@ -107,7 +107,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -109,7 +109,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 అటువంటి బాహ్య సైట్‌లు లేదా వనరుల లభ్యత పట్ల Googleకు బాధ్యత లేదని మరియు అలాంటి వెబ్‌సైట్‌లు లేక వనరుల నుండి ఎలాంటి ప్రకటనలు, ఉత్పత్తులు లేక ఇతర సామగ్రిని అది ఆమోదించదని మీరు గ్రహించి, అంగీకరిస్తున్నారు.

    17.3 అటువంటి బాహ్య సైట్‌లు లేదా వనరుల లభ్యత ఫలితంగా లేక అటువంటి సైట్‌లు లేదా వనరుల నుండి లభ్యమయ్యే ఏదైనా ప్రకటన, ఉత్పత్తులు లేక ఇతర సామగ్రి యొక్క సంపూర్తి, నిర్దిష్టత లేదా ఉనికికి సంబంధించి మీ విశ్వసనీయత ఫలితంగా జరిగే ఎలాంటి నష్టాలకు Google బాధ్యత వహించదని మీరు గ్రహించి, అంగీకరిస్తున్నారు.

    18. నిబంధనలలో మార్పులు

    @@ -37153,7 +37250,16 @@ diff --git a/components/resources/terms/terms_te.html b/components/resources/ter diff --git a/components/resources/terms/terms_th.html b/components/resources/terms/terms_th.html --- a/components/resources/terms/terms_th.html +++ b/components/resources/terms/terms_th.html -@@ -40,12 +40,12 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    เราจะปรับปรุงข้อกำหนดในการให้บริการสำหรับ Chrome ในวันที่ 31 มีนาคม 2020 ข้อกำหนดใหม่นี้จะรวมข้อกำหนดในการให้บริการของ Google และข้อกำหนดในการให้บริการเพิ่มเติมของ Google Chrome และ Chrome OS ไว้ด้วย นโยบายด้านล่างยังคงมีผลใช้งานต่อไปจนกว่าจะถึงวันดังกล่าว ดูรายละเอียดเพิ่มเติมได้ในสรุปการเปลี่ยนแปลงสำคัญ (https://policies.google.com/terms/chromechanges)

    หากไม่ยอมรับข้อกำหนดใหม่ คุณดูข้อมูลเพิ่มเติมเกี่ยวกับทางเลือกที่มีได้ในคำถามที่พบบ่อย (https://policies.google.com/terms/chromechanges#faq)

    ++

    เราจะปรับปรุงข้อกำหนดในการให้บริการสำหรับ Chrome ในวันที่ 31 มีนาคม 2020 ข้อกำหนดใหม่นี้จะรวมข้อกำหนดในการให้บริการของ Google และข้อกำหนดในการให้บริการเพิ่มเติมของ Google Chrome และ Chrome OS ไว้ด้วย นโยบายด้านล่างยังคงมีผลใช้งานต่อไปจนกว่าจะถึงวันดังกล่าว ดูรายละเอียดเพิ่มเติมได้ในสรุปการเปลี่ยนแปลงสำคัญ (https://policies.9oo91e.qjz9zk/terms/chromechanges)

    หากไม่ยอมรับข้อกำหนดใหม่ คุณดูข้อมูลเพิ่มเติมเกี่ยวกับทางเลือกที่มีได้ในคำถามที่พบบ่อย (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq)

    +

    ข้อกำหนดในการให้บริการของ Google Chrome

    +

    ข้อกำหนดในการให้บริการนี้จะมีผลบังคับกับโค้ดสั่งการของ Google Chrome ซอร์สโค้ดของ Google Chrome มีให้ฟรีภายใต้สัญญาอนุญาตซอฟต์แวร์แบบโอเพนซอร์สที่ chrome://credits

    +

    1. ความสัมพันธ์ระหว่างคุณกับ Google

    +@@ -42,12 +42,12 @@ h2 { font-size:1em; margin-top:0 }

    5.3 คุณยอมรับว่าคุณจะไม่ทำสำเนา คัดลอก ทำซ้ำ ขาย แลกเปลี่ยน หรือขายต่อบริการเพื่อวัตถุประสงค์ใดๆ เว้นแต่คุณจะได้รับอนุญาตให้ดำเนินการดังกล่าวเป็นกรณีเฉพาะตามข้อตกลงแยกต่างหากกับ Google

    5.4 คุณยอมรับว่าคุณเป็นผู้รับผิดชอบแต่เพียงผู้เดียว (และ Google ไม่มีส่วนรับผิดชอบต่อคุณหรือต่อบุคคลที่สามใดๆ) สำหรับการละเมิดภาระผูกพันภายใต้ข้อกำหนดและผลลัพธ์ (รวมถึงความสูญเสียหรือความเสียหายที่ Google อาจได้รับ) ของการละเมิดดังกล่าว

    6. ความเป็นส่วนตัวและข้อมูลส่วนบุคคลของคุณ

    @@ -37168,7 +37274,7 @@ diff --git a/components/resources/terms/terms_th.html b/components/resources/ter

    7.4 คุณเข้าใจดีว่าในการใช้บริการ คุณอาจพบกับเนื้อหาที่ก่อให้เกิดความไม่พอใจ ไม่เหมาะสม หรือหยาบคาย และคุณใช้บริการภายใต้ความเสี่ยงของตนเอง

    7.5 คุณยอมรับว่าคุณเป็นผู้รับผิดชอบแต่เพียงผู้เดียว (และ Google ไม่มีส่วนรับผิดชอบต่อคุณหรือต่อบุคคลที่สามใดๆ) สำหรับเนื้อหาที่คุณสร้าง ส่ง หรือแสดง ในระหว่างที่ใช้บริการและผลลัพธ์ของการกระทำของคุณ (รวมถึงความสูญเสียหรือความเสียหายที่ Google อาจได้รับ) จากการดำเนินการดังกล่าว

    8. กรรมสิทธิ์

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 คุณยินยอมและยอมรับว่า Google ไม่มีส่วนรับผิดชอบต่อความพร้อมใช้งานของไซต์หรือแหล่งข้อมูลภายนอกใดๆ ดังกล่าว และไม่ได้รับรองโฆษณา ผลิตภัณฑ์ หรือเนื้อหาอื่นๆ ที่มีอยู่บนหรือพร้อมใช้งานจากเว็บไซต์หรือแหล่งข้อมูลดังกล่าว

    17.3 คุณยินยอมและยอมรับว่า Google ไม่มีส่วนรับผิดต่อความสูญเสียหรือความเสียหายใดๆ ที่อาจเกิดจากคุณ โดยเป็นผลมาจากความพร้อมใช้งานของไซต์หรือแหล่งข้อมูลภายนอกดังกล่าว หรือเป็นผลมาจากการที่คุณพึ่งพาความครบถ้วนสมบูรณ์ ความถูกต้อง หรือการมีอยู่ของโฆษณา ผลิตภัณฑ์ หรือเนื้อหาอื่นๆ บน หรือที่พร้อมใช้งานจากเว็บไซต์หรือแหล่งข้อมูลดังกล่าว

    18. การเปลี่ยนแปลงแก้ไขข้อกำหนด

    @@ -37180,7 +37286,16 @@ diff --git a/components/resources/terms/terms_th.html b/components/resources/ter diff --git a/components/resources/terms/terms_tr.html b/components/resources/terms/terms_tr.html --- a/components/resources/terms/terms_tr.html +++ b/components/resources/terms/terms_tr.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    31 Mart 2020'de Chrome hizmet şartlarını güncelliyoruz. Yeni şartlar Google’ın Hizmet Şartları'nı ve Google Chrome ile Chrome OS'un ek hizmet şartlarını içerecek. Söz konusu tarihe kadar aşağıdaki şartlar geçerli olmaya devam edecek. Daha fazla ayrıntı için önemli değişikliklerin özeti (https://policies.google.com/terms/chromechanges) sayfasına bakın.

    • Yeni Şartlar (https://policies.google.com/terms/update) ve Ek Şartlar (https://www.google.com/chrome/terms)'ın önizlemesine bakın.

    Yeni Şartlarımızı kabul etmiyorsanız Sık Sorulan Sorular (https://policies.google.com/terms/chromechanges#faq) bölümümüzde seçenekleriniz hakkında daha fazla bilgi bulabilirsiniz.

    ++

    31 Mart 2020'de Chrome hizmet şartlarını güncelliyoruz. Yeni şartlar Google’ın Hizmet Şartları'nı ve Google Chrome ile Chrome OS'un ek hizmet şartlarını içerecek. Söz konusu tarihe kadar aşağıdaki şartlar geçerli olmaya devam edecek. Daha fazla ayrıntı için önemli değişikliklerin özeti (https://policies.9oo91e.qjz9zk/terms/chromechanges) sayfasına bakın.

    • Yeni Şartlar (https://policies.9oo91e.qjz9zk/terms/update) ve Ek Şartlar (https://www.9oo91e.qjz9zk/chrome/terms)'ın önizlemesine bakın.

    Yeni Şartlarımızı kabul etmiyorsanız Sık Sorulan Sorular (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq) bölümümüzde seçenekleriniz hakkında daha fazla bilgi bulabilirsiniz.

    +

    Google Chrome Hizmet Şartları

    +

    Bu Hizmet Şartları, Google Chrome'un çalıştırılabilir kod sürümü için geçerlidir. Google Chrome kaynak kodu, chrome://credits?hl=tr adresindeki açık kaynaklı yazılım lisansı sözleşmeleri altında ücretsiz olarak kullanılabilir.

    +

    1. Google ile ilişkiniz

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Google ile yaptığınız ayrı bir sözleşmede açıkça izin verilmediği sürece, Hizmetler'i hiçbir amaçla yeniden üretmemeyi, çoğaltmamayı, kopyalamamayı, satmamayı, ticaretini yapmamayı veya yeniden satmamayı kabul edersiniz.

    5.4 Şartlar'dan doğan yükümlülüklerinizin ihlal edilmesinden ve bu ihlalin sonuçlarından (Google’ın uğrayabileceği her tür kayıp ve hasar dahil olmak üzere) tek başınıza sorumlu olduğunuzu (ve Google’ın size veya üçüncü bir tarafa karşı hiçbir sorumluluğu olmadığını) kabul edersiniz.

    6. Gizlilik ve kişisel bilgileriniz

    @@ -37202,7 +37317,7 @@ diff --git a/components/resources/terms/terms_tr.html b/components/resources/ter

    8.4 Google, Şartlar uyarınca sizin Hizmetler'i kullanarak veya Hizmetler üzerinden gönderdiğiniz, yayınladığınız, aktardığınız veya görüntülediğiniz İçerik için sizden (veya lisans sağlayıcılarınızdan), söz konusu İçerikte yer alan fikri mülkiyet hakları (bu haklar tescilli olsun veya olmasın ve dünyanın neresinde bulunursa bulunsun) dahil olmak üzere hiçbir hak, mülkiyet hakkı veya menfaat elde etmediğini kabul eder. Google ile aksi yönde yazılı bir anlaşmanız olmadığı sürece, bu hakları korumak ve uygulamaktan sorumlu olduğunuzu ve Google’ın bunu sizin adınıza yapmakla yükümlü olmadığını kabul edersiniz.

    8.5 Hizmetler'e eklenmiş olan veya Hizmetler'in içinde bulunan mülkiyet hakkı bildirimlerini (telif hakkı ve ticari marka bildirimleri dahil) kaldırmayacağınızı, görünmesini engellemeyeceğinizi veya değiştirmeyeceğinizi kabul edersiniz.

    8.6 Google tarafından yazılı bir sözleşmeyle açıkça yetkilendirilmediğiniz sürece, Hizmetler'i kullanırken, herhangi bir şirkete veya organizasyona ait ticari markayı, hizmet işaretini, ticari adı ve logoyu söz konusu markaların, adların veya logoların sahipleri veya yetkili kullanıcıları açısından olası veya kasıtlı bir karışıklığa neden olabilecek şekilde kullanmayacağınızı kabul edersiniz.

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) ŞİFRENİZİN VEYA HESAP BİLGİLERİNİZİN GÜVENLİĞİNİ VE GİZLİLİĞİNİ KORUYAMAMANIZ,

    14.2 YUKARIDA, PARAGRAF 14.1'DE BELİRTİLEN GOOGLE’IN SİZE KARŞI SORUMLULUĞUNA İLİŞKİN SINIRLANDIRMALAR, GOOGLE SÖZ KONUSU KAYIPLAR KONUSUNDA UYARILMIŞ VEYA KAYIP OLASILIKLARININ FARKINDA OLSA DA OLMASA DA GEÇERLİLİĞİNİ KORUR.

    15. Telif hakkı ve ticari marka politikaları

    @@ -37213,7 +37328,7 @@ diff --git a/components/resources/terms/terms_tr.html b/components/resources/ter

    16. Reklamlar

    16.1 Bazı Hizmetler, reklam geliriyle desteklenir ve bu Hizmetler'de reklamlar ve promosyonlar görüntülenebilir. Bu reklamlar, Hizmetler'de depolanan bilginin içeriğini, Hizmetler üzerinden yapılan sorguları veya başka bilgileri hedefleyebilir.

    16.2 Google tarafından Hizmetler'de yayınlanan reklamların tarzı, modu ve kapsamı, size, özel bir bildirimde bulunulmaksızın değiştirilebilir.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Google'ın bu tür harici sitelerin veya kaynakların kullanılabilirliğinden sorumlu olmadığını ve bu tür web sitelerinde veya kaynaklarda bulunan hiçbir reklamı, ürünü veya başka materyali onaylamadığını bilir ve kabul edersiniz.

    17.3 Bu harici siteler veya kaynakların kullanılabilirliği yüzünden veya bu gibi web sitelerinde veya kaynaklarda bulunan veya buralardan temin edilebilen herhangi bir reklamın, ürünün veya başka materyalin tamlığına, doğruluğuna veya varlığına itimat etmeniz sonucunda uğrayabileceğiniz kayıptan veya zarardan Google’ın sorumlu tutulamayacağını kabul edersiniz.

    18. Şartlar'da Değişiklik

    @@ -37225,7 +37340,16 @@ diff --git a/components/resources/terms/terms_tr.html b/components/resources/ter diff --git a/components/resources/terms/terms_uk.html b/components/resources/terms/terms_uk.html --- a/components/resources/terms/terms_uk.html +++ b/components/resources/terms/terms_uk.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    31 березня 2020 року ми оновлюємо Умови використання Chrome. Нові умови міститимуть Загальні положення та умови Google, а також додаткові Умови використання Google Chrome і ОС Chrome. До того часу діятимуть умови, наведені нижче. Перегляньте короткий підсумок основних змін (https://policies.google.com/terms/chromechanges).

    Якщо ви не погоджуєтеся з новими Умовами використання, перегляньте розділ Поширені запитання (https://policies.google.com/terms/chromechanges#faq).

    ++

    31 березня 2020 року ми оновлюємо Умови використання Chrome. Нові умови міститимуть Загальні положення та умови Google, а також додаткові Умови використання Google Chrome і ОС Chrome. До того часу діятимуть умови, наведені нижче. Перегляньте короткий підсумок основних змін (https://policies.9oo91e.qjz9zk/terms/chromechanges).

    Якщо ви не погоджуєтеся з новими Умовами використання, перегляньте розділ Поширені запитання (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Загальні положення та умови Google Chrome

    +

    Ці Загальні положення та умови застосовуються до версії виконуваного коду Google Chrome. Вихідний код для Google Chrome доступний безкоштовно за адресою chrome://credits відповідно до умов ліцензійних угод про використання програмного забезпечення з відкритим кодом.

    +

    1. Регулювання відносин із Google

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Ви погоджуєтеся не відтворювати, копіювати, розповсюджувати, продавати чи перепродавати Послуги в будь-яких цілях без чіткого дозволу на це, наданого в окремій угоді з Google.

    5.4 Ви погоджуєтеся з тим, що Ви несете особисту відповідальність (при цьому Google не несе відповідальності перед Вами чи третьою стороною) за будь-які порушення своїх обов'язків, викладених в Умовах, і за наслідки таких порушень (зокрема втрати або збитки Google).

    6. Конфіденційність та особиста інформація

    @@ -37247,7 +37371,7 @@ diff --git a/components/resources/terms/terms_uk.html b/components/resources/ter

    8.4 Корпорація Google усвідомлює та погоджується, що відповідно до цих Умов вона не отримує Ваші (або Ваших ліцензіарів) законні права, повноваження та інтереси на будь-який Вміст, наданий, опублікований, переданий чи відображений у Послугах або через них, включно з правами інтелектуальної власності на цей Вміст (незважаючи на те, зареєстровані вони чи ні, та незалежно від країни їх поширення). Якщо інше не було узгоджено в письмовій формі з Google, Ви погоджуєтеся нести власну відповідальність за захист та реалізацію цих прав і звільняєте корпорацію Google від обов'язку робити це від Вашого імені.

    8.5 Ви погоджуєтеся не видаляти, приховувати чи змінювати будь-які повідомлення про права власності (зокрема авторські права та повідомлення про торговельну марку), які можуть додаватися до Послуг або з'являтися в них.

    8.6 Якщо Ви не отримали відповідний дозвіл Google у письмовій формі, Ви погоджуєтесь під час користування Послугами не використовувати торговельні марки, знаки обслуговування, фірмові назви, логотипи компаній або організацій у спосіб, що може чи має намір спричинити непорозуміння з власником або уповноваженим користувачем таких марок, назв або логотипів.

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) НЕМОЖЛИВОСТІ ЗБЕРЕГТИ БЕЗПЕКУ ТА КОНФІДЕНЦІЙНІСТЬ ПАРОЛІВ І ДАНИХ ОБЛІКОВОГО ЗАПИСУ;

    14.2 ОБМЕЖЕННЯ ВІДПОВІДАЛЬНОСТІ GOOGLE ПЕРЕД ВАМИ, ВИЗНАЧЕНІ В ПУНКТІ 14.1, ЗАСТОСОВУВАТИМУТЬСЯ, НЕЗАЛЕЖНО ВІД ТОГО, ЧИ КОМПАНІЯ GOOGLE ЗНАЛА АБО БУЛА ПОІНФОРМОВАНА ПРО МОЖЛИВІСТЬ ВИНИКНЕННЯ ТАКИХ ВТРАТ.

    15. Авторські права та правила щодо торговельної марки

    @@ -37258,7 +37382,7 @@ diff --git a/components/resources/terms/terms_uk.html b/components/resources/ter

    16. Реклама

    16.1 Певні Послуги підтримуються прибутками від рекламної діяльності та можуть передбачати показ оголошень і реклами. Така реклама може бути націлена на інформацію, що міститься в Послугах, запити, здійснені за допомогою Послуг, тощо.

    16.2 Методи, способи та масштаб реклами Google у межах Послуг можуть зазнавати змін без спеціального повідомлення.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Ви усвідомлюєте та погоджуєтесь, що Google не несе відповідальність за наявність таких зовнішніх веб-сайтів і ресурсів та не підтримує рекламу, продукти або інші матеріали, наявні на таких веб-сайтах і ресурсах або доступні через них.

    17.3 Ви усвідомлюєте та погоджуєтесь, що Google не несе відповідальність за втрату або пошкодження, завдані Вам в результаті наявності таких зовнішніх веб-сайтів і ресурсів або внаслідок Вашої впевненості в повноті, точності та наявності реклами, продуктів або інших матеріалів на таких веб-сайтах і ресурсах або доступних через них.

    18. Зміни Умов

    @@ -37270,7 +37394,16 @@ diff --git a/components/resources/terms/terms_uk.html b/components/resources/ter diff --git a/components/resources/terms/terms_vi.html b/components/resources/terms/terms_vi.html --- a/components/resources/terms/terms_vi.html +++ b/components/resources/terms/terms_vi.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    Chúng tôi sẽ cập nhật điều khoản dịch vụ của Chrome vào ngày 31 tháng 3 năm 2020. Các điều khoản mới sẽ bao gồm cả Điều khoản dịch vụ của Google và các điều khoản dịch vụ bổ sung của Google Chrome và Chrome OS. Trước thời điểm đó, các điều khoản bên dưới sẽ tiếp tục có hiệu lực. Hãy xem nội dung tóm tắt về các thay đổi chính (https://policies.google.com/terms/chromechanges) để biết thêm thông tin chi tiết.

    Nếu không đồng ý với các Điều khoản mới của chúng tôi, thì bạn có thể tìm thêm thông tin về các lựa chọn dành cho bạn trong phần Câu hỏi thường gặp (https://policies.google.com/terms/chromechanges#faq).

    ++

    Chúng tôi sẽ cập nhật điều khoản dịch vụ của Chrome vào ngày 31 tháng 3 năm 2020. Các điều khoản mới sẽ bao gồm cả Điều khoản dịch vụ của Google và các điều khoản dịch vụ bổ sung của Google Chrome và Chrome OS. Trước thời điểm đó, các điều khoản bên dưới sẽ tiếp tục có hiệu lực. Hãy xem nội dung tóm tắt về các thay đổi chính (https://policies.9oo91e.qjz9zk/terms/chromechanges) để biết thêm thông tin chi tiết.

    Nếu không đồng ý với các Điều khoản mới của chúng tôi, thì bạn có thể tìm thêm thông tin về các lựa chọn dành cho bạn trong phần Câu hỏi thường gặp (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq).

    +

    Ðiều khoản Dịch vụ của Google Chrome

    +

    Các Điều khoản Dịch vụ này áp dụng cho phiên bản mã thực thi của Google Chrome. Mã nguồn dành cho Google Chrome có sẵn miễn phí theo thoả thuận cấp phép phần mềm nguồn mở tại chrome://credits.

    +

    1. Mối quan hệ của bạn với Google

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 Bạn đồng ý rằng sẽ không tái tạo, nhân bản, sao chép, bán, trao đổi hoặc bán lại các Dịch vụ vì bất kỳ mục đích nào chỉ trừ khi bạn được cấp quyền đặc biệt để thực hiện như vậy trong thoả thuận riêng với Google.

    5.4 Bạn đồng ý tự chịu trách nhiệm về (và Google không chịu trách nhiệm cho bạn hoặc cho bất kỳ bên thứ ba nào về) mọi vi phạm nghĩa vụ dựa trên các Điều khoản và hậu quả (bao gồm bất kỳ mất mát hoặc thiệt hại nào mà Google phải chịu) của các vi phạm như vậy.

    6. Bảo mật và thông tin cá nhân của bạn

    @@ -37292,7 +37425,7 @@ diff --git a/components/resources/terms/terms_vi.html b/components/resources/ter

    8.4 Google công nhận và đồng ý rằng sẽ Google không tước quyền, quyền sở hữu hoặc quyền lợi nào của bạn (hoặc nhà cấp phép cho bạn) theo các Điều khoản này cho hoặc đối với bất kỳ Nội dung nào bạn gửi, đăng, chuyển giao hoặc hiển thị trên, hoặc thông qua Dịch vụ, bao gồm bất kỳ quyền sở hữu trí tuệ nào tồn tại trong Nội dung đó (bất kể các quyền đó có vô tình được đăng ký hay không và ở bất kỳ đâu trên thế giới mà các quyền đó có thể tồn tại). Trừ khi bạn đã có thoả thuận khác bằng văn bản với Google, bạn đồng ý chịu trách nhiệm bảo vệ và thi hành các quyền đó và Google không có nghĩa vụ thực hiện việc đó nhân danh bạn.

    8.5 Bạn đồng ý rằng sẽ không xoá, che giấu, hoặc thay đổi bất kỳ thông báo quyền sở hữu nào (bao gồm các thông báo về bản quyền và thương hiệu) có thể được gắn với hoặc được bao gồm trong các Dịch vụ.

    8.6 Trừ khi bạn đã được Google uỷ quyền bằng văn bản để thực hiện việc đó, bạn đồng ý rằng trong việc sử dụng các Dịch vụ, bạn sẽ không sử dụng bất kỳ thương hiệu, nhãn hiệu dịch vụ, tên thương mại, biểu tượng của mọi công ty hoặc tổ chức theo cách có thể hoặc cố tình gây ra hiểu lầm về chủ sở hữu hoặc người dùng được uỷ quyền của các nhãn hiệu, tên hoặc biểu tượng như vậy.

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) BẠN KHÔNG THỂ GIỮ CÁC CHI TIẾT MẬT KHẨU HOẶC TÀI KHOẢN CỦA MÌNH AN TOÀN VÀ BẢO MẬT;

    14.2 CÁC GIỚI HẠN VỀ TRÁCH NHIỆM PHÁP LÝ DÀNH CHO BẠN CỦA GOOGLE TRONG KHOẢN 14.1 Ở TRÊN SẼ ĐƯỢC ÁP DỤNG, CHO DÙ GOOGLE CÓ ĐƯỢC CẢNH BÁO HAY NHẬN BIẾT VỀ KHẢ NĂNG PHÁT SINH CÁC TỔN THẤT NÀY HAY CHƯA.

    15. Các chính sách bản quyền và thương hiệu

    @@ -37303,7 +37436,7 @@ diff --git a/components/resources/terms/terms_vi.html b/components/resources/ter

    16. Quảng cáo

    16.1 Một số Dịch vụ được hỗ trợ bởi thu nhập quảng cáo và có thể hiển thị các quảng cáo và chương trình khuyến mãi. Những quảng cáo này có thể được nhắm mục tiêu đến nội dung thông tin chứa trên các Dịch vụ, truy vấn được đưa ra thông qua các Dịch vụ hoặc thông tin khác.

    16.2 Cách thức, chế độ và phạm vi của quảng cáo của Google trên các Dịch vụ có thể thay đổi mà không thông báo cụ thể đến bạn.

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 Bạn công nhận và đồng ý rằng Google không chịu trách nhiệm về tính khả dụng của bất kỳ trang web hoặc tài nguyên bên ngoài nào như vậy và không xác nhận chất lượng bất kỳ quảng cáo, sản phẩm hoặc tài liệu nào khác trên hoặc có sẵn từ các trang web hoặc tài nguyên như vậy.

    17.3 Bạn công nhận và đồng ý rằng Google không chịu trách nhiệm về bất kỳ mất mát hoặc thiệt hại nào mà bạn phải chịu do tính sẵn có của các trang và các tài nguyên bên ngoài, hoặc do bạn tin tưởng vào tính đầy đủ, chính xác hoặc sự tồn tại của quảng cáo, sản phẩm hoặc các tài liệu trên hoặc có từ các trang web và các tài nguyên đó.

    18. Các thay đổi của Điều khoản

    @@ -37315,7 +37448,16 @@ diff --git a/components/resources/terms/terms_vi.html b/components/resources/ter diff --git a/components/resources/terms/terms_zh-CN.html b/components/resources/terms/terms_zh-CN.html --- a/components/resources/terms/terms_zh-CN.html +++ b/components/resources/terms/terms_zh-CN.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    我们将于 2020 年 3 月 31 日更新 Chrome 服务条款。新版条款将包括 Google 的服务条款以及 Google Chrome 和 Chrome 操作系统附加服务条款。在上述日期之前,以下条款继续有效。若想了解详情,请参阅主要变更摘要 (https://policies.google.com/terms/chromechanges)。

    • 预览新条款 (https://policies.google.com/terms/update)和附加条款 (https://www.google.com/chrome/terms)。

    如果您不接受我们的新条款,请在我们的常见问题解答 (https://policies.google.com/terms/chromechanges#faq)页面上详细了解您的其他选项。

    ++

    我们将于 2020 年 3 月 31 日更新 Chrome 服务条款。新版条款将包括 Google 的服务条款以及 Google Chrome 和 Chrome 操作系统附加服务条款。在上述日期之前,以下条款继续有效。若想了解详情,请参阅主要变更摘要 (https://policies.9oo91e.qjz9zk/terms/chromechanges)。

    • 预览新条款 (https://policies.9oo91e.qjz9zk/terms/update)和附加条款 (https://www.9oo91e.qjz9zk/chrome/terms)。

    如果您不接受我们的新条款,请在我们的常见问题解答 (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq)页面上详细了解您的其他选项。

    +

    谷歌浏览器服务条款

    +

    本服务条款适用于谷歌浏览器的可执行代码版本。根据开放源代码软件许可协议 (chrome://credits),我们免费提供谷歌浏览器的源代码。

    +

    1. 您与谷歌的关系

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 您同意,除非在与谷歌另外签署的单独的协议中特别规定了,允许您进行以下活动,否则,您不会出于任何目的对相关服务再制作、复写、复制、销售、交易或转售。

    5.4 您同意,如果您违反了本服务条款中所规定的义务,并因此类行为造成了任何不良后果(其中包括谷歌可能遭受的任何损失或损害),您将独自承担全部责任,而谷歌对您或任何第三方不承担任何责任。

    6. 隐私权与个人信息

    @@ -37337,7 +37479,7 @@ diff --git a/components/resources/terms/terms_zh-CN.html b/components/resources/

    8.4 谷歌认可并同意,对于您在相关服务中或通过相关服务提交、发布、传播或展示的任何内容,其中包括内容中所包含的所有知识产权(无论这些权利是否已经注册,亦无论存在于世界上哪些地方),谷歌根据此处所述条款不能从您(或您的许可人)那里获取任何其中包含或与之相关的权利、所有权或利益。除非您与谷歌另有书面协议,否则,您同意自己对这些权利的保护和行使负有责任,谷歌没有义务代表您保护和行使相关权利。

    8.5 您同意,您不会删除、掩藏或改动相关服务所附加的或包含的任何所有权声明(其中包括版权和商标声明)。

    8.6 除非您得到谷歌明确的书面授权,否则,您同意在使用相关服务时,您不会以可能或故意导致混淆此类商标、商品名或徽标拥有者或授权用户的方式,使用任何公司或机构的任何商标、服务标记、商品名和徽标。

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) 您未能保证自己密码或帐户详细信息的安全性和机密性;

    14.2 无论谷歌是否已被告知或已经了解引起此类损害的可能性,第 14.1 条中所述的谷歌对您的责任限制仍然适用。

    15. 版权和商标政策

    @@ -37348,7 +37490,7 @@ diff --git a/components/resources/terms/terms_zh-CN.html b/components/resources/

    16. 广告

    16.1 有些服务靠广告收入支持,因此可能会显示广告和促销信息。这些广告可能会投放在存储于相关服务中的信息、通过相关服务提出的问题或其他信息中。

    16.2 谷歌在服务中投放广告的方式、形式和范围能会发生变更,而不会另行通知。

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 您认可并同意谷歌不对此类外部网站或资源的可用性承担任何责任,也不对此类网站或资源所提供的任何广告、产品或其他资料予以认可。

    17.3 您认可并同意,如果您由于此类外部网站或资源的可用性或您对此类网站或资源所提供的任何广告、产品或其他资料的完整性、准确性或真实性的信任而遭受损失或损害,谷歌概不承担任何责任。

    18. 条款的变更

    @@ -37360,7 +37502,16 @@ diff --git a/components/resources/terms/terms_zh-CN.html b/components/resources/ diff --git a/components/resources/terms/terms_zh-TW.html b/components/resources/terms/terms_zh-TW.html --- a/components/resources/terms/terms_zh-TW.html +++ b/components/resources/terms/terms_zh-TW.html -@@ -40,18 +40,18 @@ h2 { font-size:1em; margin-top:0 } +@@ -14,7 +14,7 @@ h2 { font-size:1em; margin-top:0 } + + + +-

    我們將於 2020 年 3 月 31 日更新 Chrome《服務條款》。新版條款將包含《Google 服務條款》以及 Google Chrome 和 Chrome 作業系統的《附加服務條款》。在更新日之前,下列條款仍然適用。詳情請參閱主要異動摘要 (https://policies.google.com/terms/chromechanges)。

    • 預覽新版「條款 (https://policies.google.com/terms/update)」和「附加條款 (https://www.google.com/chrome/terms)」。

    如果您不同意我們的新版「條款」,請參閱常見問題 (https://policies.google.com/terms/chromechanges#faq),進一步瞭解您的選項。

    ++

    我們將於 2020 年 3 月 31 日更新 Chrome《服務條款》。新版條款將包含《Google 服務條款》以及 Google Chrome 和 Chrome 作業系統的《附加服務條款》。在更新日之前,下列條款仍然適用。詳情請參閱主要異動摘要 (https://policies.9oo91e.qjz9zk/terms/chromechanges)。

    • 預覽新版「條款 (https://policies.9oo91e.qjz9zk/terms/update)」和「附加條款 (https://www.9oo91e.qjz9zk/chrome/terms)」。

    如果您不同意我們的新版「條款」,請參閱常見問題 (https://policies.9oo91e.qjz9zk/terms/chromechanges#faq),進一步瞭解您的選項。

    +

    Google 瀏覽器服務條款

    +

    這些《服務條款》適用於「Google 瀏覽器」的可執行程式碼版本。依據位於 chrome://credits 的開放原始碼軟體授權合約,您可以免費取得「Google 瀏覽器」的原始碼。

    +

    1. 您與 Google 的關係

    +@@ -42,18 +42,18 @@ h2 { font-size:1em; margin-top:0 }

    5.3 您同意,除非另與 Google 簽訂個別協議並獲得明確授權,否則不會基於任何目的重製、複製、拷貝、販售、交易或轉售「服務」。

    5.4 您同意,就所有違反「本條款」所述義務而引致之後果 (包括 Google 可能遭受的損失或損害),您必須承擔全部責任,而 Google 對您或任何第三方毋需承擔任何責任。

    6. 隱私權和您的個人資訊

    @@ -37382,7 +37533,7 @@ diff --git a/components/resources/terms/terms_zh-TW.html b/components/resources/

    8.4 Google 瞭解並同意,我們不會藉由這些「條款」取得您 (或您的授權者) 及您於「服務」或透過「服務」提交、張貼、傳輸或顯示的任何「內容」的權利、所有權或利益,包括「內容」既有的任何智慧財產權 (無論該等權利是否已經註冊,亦無論是於何國家/地區註冊)。除非另與 Google 簽訂書面協議,否則您同意負責保護與行使該等權利,且 Google 沒有義務代表您保護和行使該等權利。

    8.5 您同意不得移除、遮掩或變更「服務」所隨附或包含的任何專屬權利聲明 (包括版權和商標聲明)。

    8.6 除非經過 Google 書面明確授權,否則您同意在使用「服務」期間,您不會藉由可能混淆或企圖混淆商標、名稱或標誌之擁有者或授權使用者的方式,使用任何公司或組織之任何註冊商標、服務標誌、商標名稱及標誌。

    -@@ -95,8 +95,8 @@ h2 { font-size:1em; margin-top:0 } +@@ -97,8 +97,8 @@ h2 { font-size:1em; margin-top:0 }

    (V) 您未能保護密碼或帳戶詳細資料之安全性和機密性的情形。

    14.2 第 14.1 節所述之 Google 對您的責任限制仍然適用,無論 Google 是否已被告知或應該知道該等損害之可能性。

    15. 版權和商標政策

    @@ -37393,7 +37544,7 @@ diff --git a/components/resources/terms/terms_zh-TW.html b/components/resources/

    16. 廣告

    16.1 部分「服務」是由廣告收益支援,且可能展示廣告及宣傳內容。該等廣告可能會就儲存於「服務」的資訊內容、透過「服務」送出的查詢,或其他資訊進行播送。

    16.2 Google 在「服務」播送廣告的方式、形式與範圍可能變更,而不需另行通知。

    -@@ -106,7 +106,7 @@ h2 { font-size:1em; margin-top:0 } +@@ -108,7 +108,7 @@ h2 { font-size:1em; margin-top:0 }

    17.2 您瞭解並同意,就該等外部網站或資源之可用性,Google 毋需承擔任何責任,亦不為該等網站或資源所提供的的任何廣告、產品或其他內容加以背書。

    17.3 您瞭解並同意,如果您因為該等外部網站或資源之可用性,或是因為您對該等網站或資源所提供的廣告、產品或其他內容之完整性、正確性或存在之信賴,而引致任何損失或損害,Google 毋需承擔任何責任。

    18. 條款之變更

    @@ -37414,231 +37565,6 @@ diff --git a/components/rlz/rlz_tracker.h b/components/rlz/rlz_tracker.h // // For partner or bundled installs, the RLZ might send more information // according to the terms disclosed in the EULA. -diff --git a/components/safe_browsing/base_ui_manager.cc b/components/safe_browsing/base_ui_manager.cc ---- a/components/safe_browsing/base_ui_manager.cc -+++ b/components/safe_browsing/base_ui_manager.cc -@@ -194,7 +194,7 @@ void BaseUIManager::DisplayBlockingPage( - // main-frame or sub-frame resource. Similar warning restrictions should be - // applied to malware sites tagged as "landing sites" (see "Types of - // Malware sites" under -- // https://developers.google.com/safe-browsing/developers_guide_v3#UserWarnings). -+ // https://developers.9oo91e.qjz9zk/safe-browsing/developers_guide_v3#UserWarnings). - if (resource.threat_type == SB_THREAT_TYPE_URL_UNWANTED || - (resource.threat_type == SB_THREAT_TYPE_URL_MALWARE && - resource.threat_metadata.threat_pattern_type == -diff --git a/components/safe_browsing/common/safebrowsing_constants.cc b/components/safe_browsing/common/safebrowsing_constants.cc ---- a/components/safe_browsing/common/safebrowsing_constants.cc -+++ b/components/safe_browsing/common/safebrowsing_constants.cc -@@ -15,7 +15,7 @@ const base::FilePath::CharType kSafeBrowsingBaseFilename[] = - const base::FilePath::CharType kCookiesFile[] = FILE_PATH_LITERAL(" Cookies"); - - // The URL for the Safe Browsing page. --const char kSafeBrowsingUrl[] = "https://safebrowsing.google.com/"; -+const char kSafeBrowsingUrl[] = "https://safebrowsing.9oo91e.qjz9zk/"; - - const char kCustomCancelReasonForURLLoader[] = "SafeBrowsing"; - -diff --git a/components/safe_browsing/db/metadata.proto b/components/safe_browsing/db/metadata.proto ---- a/components/safe_browsing/db/metadata.proto -+++ b/components/safe_browsing/db/metadata.proto -@@ -10,7 +10,7 @@ option optimize_for = LITE_RUNTIME; - package safe_browsing; - - // Everything below this comment was copied from the page --// , -+// , - // section "Full Hash Metadata". - - // Metadata for the goog-malware-shavar list. -diff --git a/components/safe_browsing/db/v4_get_hash_protocol_manager.cc b/components/safe_browsing/db/v4_get_hash_protocol_manager.cc ---- a/components/safe_browsing/db/v4_get_hash_protocol_manager.cc -+++ b/components/safe_browsing/db/v4_get_hash_protocol_manager.cc -@@ -392,7 +392,7 @@ void V4GetHashProtocolManager::GetFullHashCachedResults( - DCHECK(cached_full_hash_infos->empty()); - - // Caching behavior is documented here: -- // https://developers.google.com/safe-browsing/v4/caching#about-caching -+ // https://developers.9oo91e.qjz9zk/safe-browsing/v4/caching#about-caching - // - // The cache operates as follows: - // Lookup: -diff --git a/components/safe_browsing/db/v4_protocol_manager_util.cc b/components/safe_browsing/db/v4_protocol_manager_util.cc ---- a/components/safe_browsing/db/v4_protocol_manager_util.cc -+++ b/components/safe_browsing/db/v4_protocol_manager_util.cc -@@ -29,7 +29,7 @@ namespace safe_browsing { - // Can be overriden by tests. - const char* g_sbv4_url_prefix_for_testing = nullptr; - --const char kSbV4UrlPrefix[] = "https://safebrowsing.googleapis.com/v4"; -+const char kSbV4UrlPrefix[] = "https://safebrowsing.9oo91eapis.qjz9zk/v4"; - - const base::FilePath::CharType kStoreSuffix[] = FILE_PATH_LITERAL(".store"); - -@@ -38,7 +38,7 @@ namespace { - // The default URL prefix where browser reports safe browsing hits and malware - // details. - const char kSbReportsURLPrefix[] = -- "https://safebrowsing.google.com/safebrowsing"; -+ "https://safebrowsing.9oo91e.qjz9zk/safebrowsing"; - - std::string Unescape(const std::string& url) { - std::string unescaped_str(url); -@@ -123,7 +123,7 @@ PlatformType GetCurrentPlatformType() { - // ANDROID_PLATFORM here. - // - // This should ideally never compile but it is getting compiled on Android. -- // See: https://bugs.chromium.org/p/chromium/issues/detail?id=621647 -+ // See: https://bugs.ch40m1um.qjz9zk/p/chromium/issues/detail?id=621647 - // TODO(vakh): Once that bug is fixed, this should be removed. If we leave - // the platform_type empty, the server won't recognize the request and - // return an error response which will pollute our UMA metrics. -diff --git a/components/safe_browsing/db/v4_protocol_manager_util.h b/components/safe_browsing/db/v4_protocol_manager_util.h ---- a/components/safe_browsing/db/v4_protocol_manager_util.h -+++ b/components/safe_browsing/db/v4_protocol_manager_util.h -@@ -303,7 +303,7 @@ enum V4OperationResult { - class V4ProtocolManagerUtil { - public: - // Canonicalizes url as per Google Safe Browsing Specification. -- // See: https://developers.google.com/safe-browsing/v4/urls-hashing -+ // See: https://developers.9oo91e.qjz9zk/safe-browsing/v4/urls-hashing - static void CanonicalizeUrl(const GURL& url, - std::string* canonicalized_hostname, - std::string* canonicalized_path, -@@ -311,13 +311,13 @@ class V4ProtocolManagerUtil { - - // This method returns the host suffix combinations from the hostname in the - // URL, as described here: -- // https://developers.google.com/safe-browsing/v4/urls-hashing -+ // https://developers.9oo91e.qjz9zk/safe-browsing/v4/urls-hashing - static void GenerateHostVariantsToCheck(const std::string& host, - std::vector* hosts); - - // This method returns the path prefix combinations from the path in the - // URL, as described here: -- // https://developers.google.com/safe-browsing/v4/urls-hashing -+ // https://developers.9oo91e.qjz9zk/safe-browsing/v4/urls-hashing - static void GeneratePathVariantsToCheck(const std::string& path, - const std::string& query, - std::vector* paths); -diff --git a/components/safe_browsing/db/v4_store.cc b/components/safe_browsing/db/v4_store.cc ---- a/components/safe_browsing/db/v4_store.cc -+++ b/components/safe_browsing/db/v4_store.cc -@@ -392,7 +392,7 @@ ApplyUpdateResult V4Store::UpdateHashPrefixMapFromAdditions( - // Rice-Golomb encoding is used to send compressed compressed 4-byte - // hash prefixes. Hash prefixes longer than 4 bytes will not be - // compressed, and will be served in raw format instead. -- // Source: https://developers.google.com/safe-browsing/v4/compression -+ // Source: https://developers.9oo91e.qjz9zk/safe-browsing/v4/compression - const PrefixSize kPrefixSize = 4; - apply_update_result = AddUnlumpedHashes(kPrefixSize, raw_hashes_start, - raw_hashes_size, additions_map); -diff --git a/components/safe_browsing/password_protection/password_protection_service.cc b/components/safe_browsing/password_protection/password_protection_service.cc ---- a/components/safe_browsing/password_protection/password_protection_service.cc -+++ b/components/safe_browsing/password_protection/password_protection_service.cc -@@ -50,7 +50,7 @@ namespace { - // Keys for storing password protection verdict into a DictionaryValue. - const int kRequestTimeoutMs = 10000; - const char kPasswordProtectionRequestUrl[] = -- "https://sb-ssl.google.com/safebrowsing/clientreport/login"; -+ "https://sb-ssl.9oo91e.qjz9zk/safebrowsing/clientreport/login"; - - } // namespace - -@@ -66,7 +66,7 @@ PasswordProtectionService::PasswordProtectionService( - - common_spoofed_domains_ = { - "login.live.com" -- "facebook.com", -+ "f8c3b00k.qjz9zk", - "box.com", - "paypal.com", - "apple.com", -diff --git a/components/safe_browsing/proto/csd.proto b/components/safe_browsing/proto/csd.proto ---- a/components/safe_browsing/proto/csd.proto -+++ b/components/safe_browsing/proto/csd.proto -@@ -17,7 +17,7 @@ - // headers and bodies. - // - // If you want to change this protocol definition or you have questions --// regarding its format please contact chrome-anti-phishing@googlegroups.com. -+// regarding its format please contact chrome-anti-phishing@9oo91egroups.qjz9zk. - - syntax = "proto2"; - -@@ -261,7 +261,7 @@ message LoginReputationClientRequest { - // Not a sign-in user. - NOT_SIGNED_IN = 0; - -- // User signed in with @gmail.com, or @googlemail.com account. -+ // User signed in with @9ma1l.qjz9zk, or @9oo91email.qjz9zk account. - GMAIL = 1; - - // User signed in with a G Suite account. -@@ -302,7 +302,7 @@ message LoginReputationClientRequest { - // User signed in with a dasher account. - GSUITE = 1; - -- // User signed in with @gmail.com, or @googlemail.com account. -+ // User signed in with @9ma1l.qjz9zk, or @9oo91email.qjz9zk account. - GMAIL = 2; - - // Password used for Enterprise login on an Enterprise login page. -@@ -384,7 +384,7 @@ message LoginReputationClientResponse { - // hosting sites (e.g., geocities.com), we further divide the domains. - // - // Examples: -- // www.google.com/foo/bar?param=val -> google.com -+ // www.9oo91e.qjz9zk/foo/bar?param=val -> 9oo91e.qjz9zk - // www.geocities.com/foo/bar.html -> geocities.com/foo - // adwords.blogspot.com/index.html -> adwords.blogspot.com - // -@@ -1297,7 +1297,7 @@ message ClientSafeBrowsingReportRequest { - // Native implementation of Safe Browsing API v4 protocol. - PVER4_NATIVE = 2; - // Android SafetyNet API. -- // https://developer.android.com/training/safetynet/safebrowsing.html -+ // https://developer.8n6r01d.qjz9zk/training/safetynet/safebrowsing.html - ANDROID_SAFETYNET = 3; - // Flywheel (data compression service). - FLYWHEEL = 4; -diff --git a/components/safe_browsing/realtime/url_lookup_service.cc b/components/safe_browsing/realtime/url_lookup_service.cc ---- a/components/safe_browsing/realtime/url_lookup_service.cc -+++ b/components/safe_browsing/realtime/url_lookup_service.cc -@@ -25,7 +25,7 @@ namespace safe_browsing { - namespace { - - const char kRealTimeLookupUrlPrefix[] = -- "https://safebrowsing.google.com/safebrowsing/clientreport/realtime"; -+ "https://safebrowsing.9oo91e.qjz9zk/safebrowsing/clientreport/realtime"; - - const size_t kMaxFailuresToEnforceBackoff = 3; - -diff --git a/components/safe_browsing/triggers/trigger_util.cc b/components/safe_browsing/triggers/trigger_util.cc ---- a/components/safe_browsing/triggers/trigger_util.cc -+++ b/components/safe_browsing/triggers/trigger_util.cc -@@ -32,7 +32,7 @@ bool DetectGoogleAd(content::RenderFrameHost* render_frame_host, - } - } - -- return frame_url.host_piece() == "tpc.googlesyndication.com" && -+ return frame_url.host_piece() == "tpc.9oo91esyndication.qjz9zk" && - base::StartsWith(frame_url.path_piece(), "/safeframe", - base::CompareCase::SENSITIVE); - } -diff --git a/components/safe_browsing/verdict_cache_manager.cc b/components/safe_browsing/verdict_cache_manager.cc ---- a/components/safe_browsing/verdict_cache_manager.cc -+++ b/components/safe_browsing/verdict_cache_manager.cc -@@ -85,8 +85,8 @@ bool ParseVerdictEntry(base::Value* verdict_entry, - } - - // Return the path of the cache expression. e.g.: --// "www.google.com" -> "" --// "www.google.com/abc" -> "/abc" -+// "www.9oo91e.qjz9zk" -> "" -+// "www.9oo91e.qjz9zk/abc" -> "/abc" - // "foo.com/foo/bar/" -> "/foo/bar/" - std::string GetCacheExpressionPath(const std::string& cache_expression) { - DCHECK(!cache_expression.empty()); diff --git a/components/safe_search_api/safe_search/safe_search_url_checker_client.cc b/components/safe_search_api/safe_search/safe_search_url_checker_client.cc --- a/components/safe_search_api/safe_search/safe_search_url_checker_client.cc +++ b/components/safe_search_api/safe_search/safe_search_url_checker_client.cc @@ -37666,7 +37592,7 @@ diff --git a/components/safe_search_api/stub_url_checker.cc b/components/safe_se diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -1297,7 +1297,7 @@ TemplateURL::~TemplateURL() { +@@ -1305,7 +1305,7 @@ TemplateURL::~TemplateURL() { base::string16 TemplateURL::GenerateKeyword(const GURL& url) { DCHECK(url.is_valid()); // Strip "www." off the front of the keyword; otherwise the keyword won't work @@ -37678,7 +37604,7 @@ diff --git a/components/search_engines/template_url.cc b/components/search_engin diff --git a/components/search_engines/template_url.h b/components/search_engines/template_url.h --- a/components/search_engines/template_url.h +++ b/components/search_engines/template_url.h -@@ -162,7 +162,7 @@ class TemplateURLRef { +@@ -186,7 +186,7 @@ class TemplateURLRef { // at the query submission time. For privacy reasons, we require the // search provider to support HTTPS protocol in order to receive the AQS // param. @@ -37687,18 +37613,6 @@ diff --git a/components/search_engines/template_url.h b/components/search_engine std::string assisted_query_stats; // TODO: Remove along with "aq" CGI param. -diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc ---- a/components/search_engines/template_url_service.cc -+++ b/components/search_engines/template_url_service.cc -@@ -1453,7 +1453,7 @@ TemplateURL* TemplateURLService::BestEngineForKeyword(TemplateURL* engine1, - DCHECK(IsCreatedByExtension(engine1) || IsCreatedByExtension(engine2)); - - // TODO(a-v-y) Remove following code for non extension engines when reasons -- // for crash https://bugs.chromium.org/p/chromium/issues/detail?id=697745 -+ // for crash https://bugs.ch40m1um.qjz9zk/p/chromium/issues/detail?id=697745 - // become clear. - if (!IsCreatedByExtension(engine1) && !IsCreatedByExtension(engine2)) - return CanReplace(engine1) ? engine2 : engine1; diff --git a/components/search_engines/util.cc b/components/search_engines/util.cc --- a/components/search_engines/util.cc +++ b/components/search_engines/util.cc @@ -37781,7 +37695,7 @@ diff --git a/components/security_interstitials/core/browser/resources/interstiti - // See https://goo.gl/ZcZixP for more details. + // See https://goo.gl.qjz9zk.qjz9zk/ZcZixP for more details. const BYPASS_SEQUENCE = window.atob('dGhpc2lzdW5zYWZl'); - if (BYPASS_SEQUENCE.charCodeAt(keyPressState) == e.keyCode) { + if (BYPASS_SEQUENCE.charCodeAt(keyPressState) === e.keyCode) { keyPressState++; diff --git a/components/security_interstitials/core/controller_client.cc b/components/security_interstitials/core/controller_client.cc --- a/components/security_interstitials/core/controller_client.cc @@ -37830,7 +37744,7 @@ diff --git a/components/security_interstitials/core/urls.cc b/components/securit diff --git a/components/security_state/core/security_state.h b/components/security_state/core/security_state.h --- a/components/security_state/core/security_state.h +++ b/components/security_state/core/security_state.h -@@ -115,7 +115,7 @@ enum MaliciousContentStatus { +@@ -114,7 +114,7 @@ enum MaliciousContentStatus { // // Style note: this differs from other enums in this file to follow new // histogram enum naming conventions @@ -37854,7 +37768,7 @@ diff --git a/components/services/font/ppapi_fontconfig_matching.cc b/components/ diff --git a/components/services/heap_profiling/connection_manager.cc b/components/services/heap_profiling/connection_manager.cc --- a/components/services/heap_profiling/connection_manager.cc +++ b/components/services/heap_profiling/connection_manager.cc -@@ -66,7 +66,7 @@ struct ConnectionManager::Connection { +@@ -68,7 +68,7 @@ struct ConnectionManager::Connection { // sampling_rate) when size < sampling_rate. When size >= sampling_rate, the // aggregate probability of an allocation being recorded is 1.0, but the math // and details are tricky. See @@ -37863,15 +37777,6 @@ diff --git a/components/services/heap_profiling/connection_manager.cc b/componen // A |sampling_rate| of 1 is equivalent to recording all allocations. uint32_t sampling_rate = 1; }; -@@ -220,7 +220,7 @@ bool ConnectionManager::ConvertProfileToExportParams( - // - // The aggregate probability that an allocation will be sampled is - // alloc_size / sampling_rate. For a more detailed treatise, see -- // https://bugs.chromium.org/p/chromium/issues/detail?id=810748#c4 -+ // https://bugs.ch40m1um.qjz9zk/p/chromium/issues/detail?id=810748#c4 - float desampling_multiplier = - static_cast(sampling_rate) / static_cast(alloc_size); - alloc_count *= desampling_multiplier; diff --git a/components/services/quarantine/quarantine_mac.mm b/components/services/quarantine/quarantine_mac.mm --- a/components/services/quarantine/quarantine_mac.mm +++ b/components/services/quarantine/quarantine_mac.mm @@ -37942,7 +37847,7 @@ diff --git a/components/signin/core/browser/resources/signin_internals.js b/comp --- a/components/signin/core/browser/resources/signin_internals.js +++ b/components/signin/core/browser/resources/signin_internals.js @@ -23,7 +23,7 @@ function highlightIfChanged(node, oldVal, newVal) { - if (oldStr != '' && oldStr != newStr) { + if (oldStr !== '' && oldStr !== newStr) { // Note the addListener function does not end up creating duplicate // listeners. There can be only one listener per event at a time. - // Reference: https://developer.mozilla.org/en/DOM/element.addEventListener @@ -37950,18 +37855,6 @@ diff --git a/components/signin/core/browser/resources/signin_internals.js b/comp node.addEventListener('webkitAnimationEnd', function() { this.removeAttribute('highlighted'); }, false); -diff --git a/components/signin/internal/identity_manager/oauth2_token_service_delegate_android.cc b/components/signin/internal/identity_manager/oauth2_token_service_delegate_android.cc ---- a/components/signin/internal/identity_manager/oauth2_token_service_delegate_android.cc -+++ b/components/signin/internal/identity_manager/oauth2_token_service_delegate_android.cc -@@ -124,7 +124,7 @@ void AndroidAccessTokenFetcher::OnAccessTokenResponse( - std::string AndroidAccessTokenFetcher::CombineScopes( - const std::vector& scopes) { - // The Android AccountManager supports multiple scopes separated by a space: -- // https://code.google.com/p/google-api-java-client/wiki/OAuth2#Android -+ // https://code.9oo91e.qjz9zk/p/google-api-java-client/wiki/OAuth2#Android - std::string scope; - for (std::vector::const_iterator it = scopes.begin(); - it != scopes.end(); ++it) { diff --git a/components/signin/ios/browser/account_consistency_service.mm b/components/signin/ios/browser/account_consistency_service.mm --- a/components/signin/ios/browser/account_consistency_service.mm +++ b/components/signin/ios/browser/account_consistency_service.mm @@ -38072,7 +37965,7 @@ diff --git a/components/ssl_errors/error_classification.h b/components/ssl_error diff --git a/components/startup_metric_utils/browser/startup_metric_utils.cc b/components/startup_metric_utils/browser/startup_metric_utils.cc --- a/components/startup_metric_utils/browser/startup_metric_utils.cc +++ b/components/startup_metric_utils/browser/startup_metric_utils.cc -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #endif // Data from deprecated UMA histograms available at @@ -38081,7 +37974,16 @@ diff --git a/components/startup_metric_utils/browser/startup_metric_utils.cc b/c namespace startup_metric_utils { -@@ -94,7 +94,7 @@ constexpr uint32_t kColdStartHardFaultCountThreshold = 1200; +@@ -77,7 +77,7 @@ StartupTemperature g_startup_temperature = UNDETERMINED_STARTUP_TEMPERATURE; + // These values are taken from the Startup.BrowserMessageLoopStartHardFaultCount + // histogram. The latest revision landed on <5 and >3500 for a good split + // of warm/cold. In between being considered "lukewarm". Full analysis @ +-// https://docs.google.com/document/d/1haXFN1cQ6XE-NfhKgww-rOP-Wi-gK6AczP3gT4M5_kI ++// https://docs.9oo91e.qjz9zk/document/d/1haXFN1cQ6XE-NfhKgww-rOP-Wi-gK6AczP3gT4M5_kI + // These values should be reconsidered if either .WarmStartup or .ColdStartup + // distributions of a suffixed histogram becomes unexplainably bimodal. + // +@@ -94,7 +94,7 @@ constexpr uint32_t kColdStartHardFaultCountThreshold = 3500; // The struct used to return system process information via the NT internal // QuerySystemInformation call. This is partially documented at @@ -38101,7 +38003,7 @@ diff --git a/components/storage_monitor/volume_mount_watcher_win.cc b/components +// See http://support.m1cr050ft.qjz9zk/kb/165721 void EjectDeviceInThreadPool( const base::FilePath& device, - base::Callback callback, + base::OnceCallback callback, diff --git a/components/subresource_filter/core/browser/subresource_filter_constants.h b/components/subresource_filter/core/browser/subresource_filter_constants.h --- a/components/subresource_filter/core/browser/subresource_filter_constants.h +++ b/components/subresource_filter/core/browser/subresource_filter_constants.h @@ -38148,7 +38050,7 @@ diff --git a/components/subresource_filter/core/common/PRESUBMIT.py b/components diff --git a/components/suggestions/suggestions_service_impl.cc b/components/suggestions/suggestions_service_impl.cc --- a/components/suggestions/suggestions_service_impl.cc +++ b/components/suggestions/suggestions_service_impl.cc -@@ -70,7 +70,7 @@ const net::BackoffEntry::Policy kBlacklistBackoffPolicy = { +@@ -69,7 +69,7 @@ const net::BackoffEntry::Policy kBlacklistBackoffPolicy = { /*entry_lifetime_ms=*/-1, /*always_use_initial_delay=*/true}; @@ -38157,7 +38059,7 @@ diff --git a/components/suggestions/suggestions_service_impl.cc b/components/sug GURL GetGoogleBaseURL() { GURL url(google_util::CommandLineGoogleBaseURL()); -@@ -98,7 +98,7 @@ const char kDeviceType[] = "1"; +@@ -97,7 +97,7 @@ const char kDeviceType[] = "1"; #endif const char kFaviconURL[] = @@ -38206,7 +38108,7 @@ diff --git a/components/sync/driver/resources/about.js b/components/sync/driver/ --- a/components/sync/driver/resources/about.js +++ b/components/sync/driver/resources/about.js @@ -16,7 +16,7 @@ cr.define('chrome.sync.about_tab', function() { - if (oldStr != '' && oldStr != newStr) { + if (oldStr !== '' && oldStr !== newStr) { // Note the addListener function does not end up creating duplicate // listeners. There can be only one listener per event at a time. - // Reference: https://developer.mozilla.org/en/DOM/element.addEventListener @@ -38245,7 +38147,7 @@ diff --git a/components/sync/protocol/history_delete_directive_specifics.proto b diff --git a/components/sync/protocol/sync.proto b/components/sync/protocol/sync.proto --- a/components/sync/protocol/sync.proto +++ b/components/sync/protocol/sync.proto -@@ -85,7 +85,7 @@ message EntitySpecifics { +@@ -86,7 +86,7 @@ message EntitySpecifics { // To add new datatype-specific fields to the protocol, extend // EntitySpecifics. First, pick a non-colliding tag number by // picking a Cr-Commit-Position of one of your past commits @@ -38254,7 +38156,7 @@ diff --git a/components/sync/protocol/sync.proto b/components/sync/protocol/sync // definition, define your message type, and add an optional field // to the list below using the unique tag value you selected. // -@@ -226,7 +226,7 @@ message SyncEntity { +@@ -230,7 +230,7 @@ message SyncEntity { // Before then, server implementations would maintain a unique-within-parent // value separate from its base, "non-unique" value. Clients had not // depended on the uniqueness of the property since November 2009; it was @@ -38278,7 +38180,7 @@ diff --git a/components/sync_bookmarks/PRESUBMIT.py b/components/sync_bookmarks/ diff --git a/components/sync_bookmarks/bookmark_model_merger.cc b/components/sync_bookmarks/bookmark_model_merger.cc --- a/components/sync_bookmarks/bookmark_model_merger.cc +++ b/components/sync_bookmarks/bookmark_model_merger.cc -@@ -622,7 +622,7 @@ void BookmarkModelMerger::ProcessLocalCreation( +@@ -593,7 +593,7 @@ void BookmarkModelMerger::ProcessLocalCreation( DCHECK(parent_entity); // Similar to the directory implementation here: @@ -38464,7 +38366,7 @@ diff --git a/components/url_formatter/elide_url.cc b/components/url_formatter/el diff --git a/components/url_formatter/elide_url.h b/components/url_formatter/elide_url.h --- a/components/url_formatter/elide_url.h +++ b/components/url_formatter/elide_url.h -@@ -68,7 +68,7 @@ enum class SchemeDisplay { +@@ -69,7 +69,7 @@ enum class SchemeDisplay { // Internationalized domain names (IDN) will be presented in Unicode if // they're regarded safe except that domain names with RTL characters // will still be in ACE/punycode for now (http://crbug.com/650760). @@ -38476,7 +38378,7 @@ diff --git a/components/url_formatter/elide_url.h b/components/url_formatter/eli diff --git a/components/url_formatter/spoof_checks/idn_spoof_checker.cc b/components/url_formatter/spoof_checks/idn_spoof_checker.cc --- a/components/url_formatter/spoof_checks/idn_spoof_checker.cc +++ b/components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -585,7 +585,7 @@ void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) { +@@ -571,7 +571,7 @@ void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) { allowed_set.addAll(*inclusion_set); // The sections below refer to Mozilla's IDN blacklist: @@ -38512,23 +38414,19 @@ diff --git a/components/url_formatter/spoof_checks/top_domains/make_alexa_top_li diff --git a/components/url_formatter/spoof_checks/top_domains/top_domain_util.h b/components/url_formatter/spoof_checks/top_domains/top_domain_util.h --- a/components/url_formatter/spoof_checks/top_domains/top_domain_util.h +++ b/components/url_formatter/spoof_checks/top_domains/top_domain_util.h -@@ -16,10 +16,10 @@ namespace top_domains { +@@ -16,7 +16,7 @@ namespace top_domains { bool IsEditDistanceCandidate(const std::string& hostname); // Returns the portion of hostname without the registry part. -// E.g. For hostname = "google.com", the registry is "com", and the return value +// E.g. For hostname = "9oo91e.qjz9zk", the registry is "com", and the return value - // will be "google.". Note that the return value contains a trailing dot. This - // doesn't affect the result when comparing two different domains excluding --// their registries (e.g. when checking google.com.tr and google.com.tw likely -+// their registries (e.g. when checking 9oo91e.qjz9zk.tr and 9oo91e.qjz9zk.tw likely - // belong to the same organization). + // will be "google". std::string HostnameWithoutRegistry(const std::string& hostname); diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -540,7 +540,7 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) { +@@ -554,7 +554,7 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) { std::string scheme(SegmentURLInternal(&trimmed, &parts)); // For view-source: URLs, we strip "view-source:", do fixup, and stick it back @@ -38643,7 +38541,7 @@ diff --git a/components/variations/entropy_provider.h b/components/variations/en diff --git a/components/variations/net/variations_http_headers.cc b/components/variations/net/variations_http_headers.cc --- a/components/variations/net/variations_http_headers.cc +++ b/components/variations/net/variations_http_headers.cc -@@ -92,8 +92,8 @@ class VariationsHeaderHelper { +@@ -91,8 +91,8 @@ class VariationsHeaderHelper { // 1. We only transmit to Google owned domains which can evaluate // experiments. // 1a. These include hosts which have a standard postfix such as: @@ -38752,7 +38650,7 @@ diff --git a/components/variations/variations_url_constants.cc b/components/vari diff --git a/components/viz/service/display/output_surface.h b/components/viz/service/display/output_surface.h --- a/components/viz/service/display/output_surface.h +++ b/components/viz/service/display/output_surface.h -@@ -203,7 +203,7 @@ class VIZ_SERVICE_EXPORT OutputSurface { +@@ -218,7 +218,7 @@ class VIZ_SERVICE_EXPORT OutputSurface { // output. This is the same rotation as the physical rotation on the display. // In some cases, this is done natively by the graphics backend ( // For instance, this is already done by GL drivers on Android. See @@ -38764,7 +38662,7 @@ diff --git a/components/viz/service/display/output_surface.h b/components/viz/se diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc --- a/components/wifi/wifi_service_win.cc +++ b/components/wifi/wifi_service_win.cc -@@ -1760,7 +1760,7 @@ bool WiFiServiceImpl::CreateProfile( +@@ -1758,7 +1758,7 @@ bool WiFiServiceImpl::CreateProfile( xml_writer.StartElement("WLANProfile"); xml_writer.AddAttribute( "xmlns", @@ -38832,7 +38730,7 @@ diff --git a/content/app/resources/README.txt b/content/app/resources/README.txt diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm -@@ -755,7 +755,7 @@ void ExtractUnderlines(NSAttributedString* string, +@@ -748,7 +748,7 @@ void ExtractUnderlines(NSAttributedString* string, // TODO(suzhe): We should send mouse events to the input method first if it // wants to handle them. But it won't work without implementing method // - (NSUInteger)characterIndexForPoint:. @@ -38868,7 +38766,7 @@ diff --git a/content/browser/appcache/appcache_request_handler.cc b/content/brow diff --git a/content/browser/appcache/appcache_update_job.cc b/content/browser/appcache/appcache_update_job.cc --- a/content/browser/appcache/appcache_update_job.cc +++ b/content/browser/appcache/appcache_update_job.cc -@@ -659,7 +659,7 @@ void AppCacheUpdateJob::HandleResourceFetchCompleted(URLFetcher* url_fetcher, +@@ -705,7 +705,7 @@ void AppCacheUpdateJob::HandleResourceFetchCompleted(URLFetcher* url_fetcher, duplicate_response_ids_.push_back(entry.response_id()); // TODO(michaeln): Check for @@ -38880,7 +38778,7 @@ diff --git a/content/browser/appcache/appcache_update_job.cc b/content/browser/a diff --git a/content/browser/appcache/appcache_update_url_fetcher.cc b/content/browser/appcache/appcache_update_url_fetcher.cc --- a/content/browser/appcache/appcache_update_url_fetcher.cc +++ b/content/browser/appcache/appcache_update_url_fetcher.cc -@@ -90,7 +90,7 @@ void AppCacheUpdateJob::URLFetcher::OnResponseStarted(int net_error) { +@@ -91,7 +91,7 @@ void AppCacheUpdateJob::URLFetcher::OnResponseStarted(int net_error) { // We've opted for a milder constraint and allow caching unless // the resource has a "no-store" header. A spec change has been // requested on the whatwg list. @@ -38913,18 +38811,6 @@ diff --git a/content/browser/bluetooth/bluetooth_device_chooser_controller.cc b/ // with a copy-paste of table data at every 5dBm: // dBm CDF* Histogram Bucket Quantity (hand drawn estimate) // -100 00.26% -diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc ---- a/content/browser/browser_plugin/browser_plugin_guest.cc -+++ b/content/browser/browser_plugin/browser_plugin_guest.cc -@@ -484,7 +484,7 @@ void BrowserPluginGuest::EmbedderSystemDragEnded() { - } - - // TODO(wjmaclean): Replace this approach with ones based on std::function --// as in https://codereview.chromium.org/1404353004/ once all Chrome platforms -+// as in https://codereview.ch40m1um.qjz9zk/1404353004/ once all Chrome platforms - // support this. https://crbug.com/544212 - std::unique_ptr BrowserPluginGuest::UpdateInstanceIdIfNecessary( - std::unique_ptr msg) const { diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc --- a/content/browser/browser_url_handler_impl.cc +++ b/content/browser/browser_url_handler_impl.cc @@ -38978,7 +38864,7 @@ diff --git a/content/browser/content_service_delegate_impl.cc b/content/browser/ diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser/devtools/devtools_http_handler.cc --- a/content/browser/devtools/devtools_http_handler.cc +++ b/content/browser/devtools/devtools_http_handler.cc -@@ -507,7 +507,7 @@ std::string DevToolsHttpHandler::GetFrontendURLInternal( +@@ -508,7 +508,7 @@ std::string DevToolsHttpHandler::GetFrontendURLInternal( bool is_worker = type == DevToolsAgentHost::kTypeServiceWorker || type == DevToolsAgentHost::kTypeSharedWorker; frontend_url = base::StringPrintf( @@ -39023,7 +38909,7 @@ diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/ base::Time timestamp = time_smoother_.GetSmoothedTime(get_timestamp_callback_.Run()); DVLOG(1) << "Navigation finished at (smoothed) timestamp " -@@ -3468,7 +3468,7 @@ void NavigationControllerImpl::FinishRestore(int selected_index, +@@ -3462,7 +3462,7 @@ void NavigationControllerImpl::FinishRestore(int selected_index, void NavigationControllerImpl::DiscardNonCommittedEntries() { // Avoid sending a notification if there is nothing to discard. // TODO(mthiesse): Temporarily checking failed_pending_entry_id_ to help @@ -39035,7 +38921,7 @@ diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/ diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc -@@ -2744,7 +2744,7 @@ NavigationRequest::CheckCredentialedSubresource() const { +@@ -2777,7 +2777,7 @@ NavigationRequest::CheckCredentialedSubresource() const { const char* console_message = "Subresource requests whose URLs contain embedded credentials (e.g. " "`https://user:pass@host/`) are blocked. See " @@ -39044,7 +38930,7 @@ diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/ "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -2774,7 +2774,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const { +@@ -2807,7 +2807,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const { const char* console_message = "Subresource requests using legacy protocols (like `ftp:`) are blocked. " "Please deliver web-accessible resources over modern protocols like " @@ -39053,7 +38939,7 @@ diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/ "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -2875,7 +2875,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( +@@ -2908,7 +2908,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( base::StringPrintf( "Navigating a cross-origin opener to a download (%s) is " "deprecated, see " @@ -39065,7 +38951,7 @@ diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/ diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc --- a/content/browser/frame_host/navigator_impl.cc +++ b/content/browser/frame_host/navigator_impl.cc -@@ -210,7 +210,7 @@ void NavigatorImpl::DidNavigate( +@@ -222,7 +222,7 @@ void NavigatorImpl::DidNavigate( // determine whether or not to enable the encoding menu. // It's updated only for the main frame. For a subframe, // RenderView::UpdateURL does not set params.contents_mime_type. @@ -39077,7 +38963,7 @@ diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/fram diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -7728,8 +7728,8 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage( +@@ -7888,8 +7888,8 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage( "cross-site requests if they are set with `SameSite=None` and " "`Secure`. You can review cookies in developer tools under " "Application>Storage>Cookies and see more details at " @@ -39085,19 +38971,19 @@ diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/brow - "https://www.chromestatus.com/feature/5633521622188032."; + "https://www.ch40mestatus.qjz9zk/feature/5088147346030592 and " + "https://www.ch40mestatus.qjz9zk/feature/5633521622188032."; - } else if (warning == net::CanonicalCookie::CookieInclusionStatus:: - WarningReason::WARN_SAMESITE_NONE_INSECURE) { - if (!ShouldAddCookieSameSiteDeprecationMessage( -@@ -7749,7 +7749,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage( + } else if (status.HasWarningReason( + net::CanonicalCookie::CookieInclusionStatus::WarningReason:: + WARN_SAMESITE_NONE_INSECURE)) { +@@ -7910,7 +7910,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage( "`SameSite=None` if they are also marked `Secure`. You " "can review cookies in developer tools under " "Application>Storage>Cookies and see more details at " - "https://www.chromestatus.com/feature/5633521622188032."; + "https://www.ch40mestatus.qjz9zk/feature/5633521622188032."; - } else if (warning == - net::CanonicalCookie::CookieInclusionStatus::WarningReason:: - WARN_SAMESITE_UNSPECIFIED_LAX_ALLOW_UNSAFE) { -@@ -7766,7 +7766,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage( + } else if (status.HasWarningReason( + net::CanonicalCookie::CookieInclusionStatus::WarningReason:: + WARN_SAMESITE_UNSPECIFIED_LAX_ALLOW_UNSAFE)) { +@@ -7927,7 +7927,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage( "if they were set with `SameSite=Lax` and will only allow them to be " "sent with top-level cross-site requests if the HTTP method is safe. " "See more details at " @@ -39109,8 +38995,8 @@ diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/brow diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -787,7 +787,7 @@ void GpuDataManagerImplPrivate::AddLogMessage( - int level, const std::string& header, const std::string& message) { +@@ -1041,7 +1041,7 @@ void GpuDataManagerImplPrivate::AddLogMessage(int level, + const std::string& message) { // Some clients emit many log messages. This has been observed to consume GBs // of memory in the wild - // https://bugs.chromium.org/p/chromium/issues/detail?id=798012. Use a limit @@ -39121,7 +39007,7 @@ diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/brow diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc --- a/content/browser/indexed_db/indexed_db_backing_store.cc +++ b/content/browser/indexed_db/indexed_db_backing_store.cc -@@ -676,7 +676,7 @@ leveldb::Status IndexedDBBackingStore::Initialize(bool clean_active_journal) { +@@ -730,7 +730,7 @@ leveldb::Status IndexedDBBackingStore::Initialize(bool clean_active_journal) { indexed_db::ReportV2Schema(has_blobs, origin_); if (has_blobs) { INTERNAL_CONSISTENCY_ERROR(UPGRADING_SCHEMA_CORRUPTED_BLOBS); @@ -39157,7 +39043,7 @@ diff --git a/content/browser/notification_service_impl.cc b/content/browser/noti diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc -@@ -195,7 +195,7 @@ PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess( +@@ -202,7 +202,7 @@ PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess( // // TODO(lukasza, laforge): https://crbug.com/702995: Remove the code below // once Flash support is removed from Chromium (probably around 2020 - see @@ -39181,16 +39067,7 @@ diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/ diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc -@@ -99,7 +99,7 @@ gfx::OverlayTransform RotationToDisplayTransform( - // Note that the angle provided by |rotation| here is the opposite direction - // of the physical rotation of the device, which is the space in which the UI - // prepares the scene (see -- // https://developer.android.com/reference/android/view/Display#getRotation() -+ // https://developer.8n6r01d.qjz9zk/reference/android/view/Display#getRotation() - // for details). - // - // The rotation which needs to be applied by the display compositor to allow -@@ -392,7 +392,7 @@ void CompositorImpl::SetSurface(jobject surface, +@@ -358,7 +358,7 @@ void CompositorImpl::SetSurface(jobject surface, if (surface) { // Note: This ensures that any local references used by // ANativeWindow_fromSurface are released immediately. This is needed as a @@ -39202,7 +39079,7 @@ diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/ diff --git a/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc b/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc --- a/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc +++ b/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc -@@ -91,7 +91,7 @@ bool ExtractCaseFoldedLocalizedStrings( +@@ -92,7 +92,7 @@ bool ExtractCaseFoldedLocalizedStrings( localized_name.resize(length); // The documentation for the API call does not specify an encoding but the // results are wchar_t and FireFox considers them UTF-16, as seen here: @@ -39238,7 +39115,7 @@ diff --git a/content/browser/renderer_host/input/touch_action_filter.h b/content diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -1800,7 +1800,7 @@ void RenderProcessHostImpl::InitializeChannelProxy() { +@@ -1823,7 +1823,7 @@ void RenderProcessHostImpl::InitializeChannelProxy() { // Note that Channel send is effectively paused and unpaused at various points // during startup, and existing code relies on a fragile relative message // ordering resulting from some early messages being queued until process @@ -39302,15 +39179,15 @@ diff --git a/content/browser/sandbox_ipc_linux.h b/content/browser/sandbox_ipc_l // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. --// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_sandbox_ipc.md -+// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_sandbox_ipc.md +-// https://chromium.googlesource.com/chromium/src/+/master/docs/linux/sandbox_ipc.md ++// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/sandbox_ipc.md #ifndef CONTENT_BROWSER_SANDBOX_IPC_LINUX_H_ #define CONTENT_BROWSER_SANDBOX_IPC_LINUX_H_ diff --git a/content/browser/service_worker/service_worker_metrics.cc b/content/browser/service_worker/service_worker_metrics.cc --- a/content/browser/service_worker/service_worker_metrics.cc +++ b/content/browser/service_worker/service_worker_metrics.cc -@@ -230,13 +230,13 @@ ServiceWorkerMetrics::Site ServiceWorkerMetrics::SiteFromURL(const GURL& url) { +@@ -222,13 +222,13 @@ ServiceWorkerMetrics::Site ServiceWorkerMetrics::SiteFromURL(const GURL& url) { } const base::StringPiece host = url.host_piece(); @@ -39331,7 +39208,7 @@ diff --git a/content/browser/service_worker/service_worker_metrics.cc b/content/ diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h --- a/content/browser/site_instance_impl.h +++ b/content/browser/site_instance_impl.h -@@ -57,14 +57,14 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance, +@@ -71,14 +71,14 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance, static bool ShouldAssignSiteForURL(const GURL& url); // Returns whether |lock_url| is at least at the granularity of a site (i.e., @@ -39400,7 +39277,7 @@ diff --git a/content/browser/speech/tts_win.cc b/content/browser/speech/tts_win. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -192,7 +192,7 @@ using AccessibilityEventCallback = +@@ -189,7 +189,7 @@ using AccessibilityEventCallback = namespace { const int kMinimumDelayBetweenLoadingUpdatesMS = 100; @@ -39409,7 +39286,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser base::LazyInstance>::DestructorAtExit -@@ -6158,7 +6158,7 @@ void WebContentsImpl::UpdateTitle(RenderFrameHost* render_frame_host, +@@ -6223,7 +6223,7 @@ void WebContentsImpl::UpdateTitle(RenderFrameHost* render_frame_host, return; // TODO(evan): make use of title_direction. @@ -39421,7 +39298,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/webauth/authenticator_common.cc --- a/content/browser/webauth/authenticator_common.cc +++ b/content/browser/webauth/authenticator_common.cc -@@ -280,23 +280,23 @@ base::Optional ProcessAppIdExtension(std::string appid, +@@ -287,23 +287,23 @@ base::Optional ProcessAppIdExtension(std::string appid, // At this point we diverge from the specification in order to avoid the // complexity of making a network request which isn't believed to be // necessary in practice. See also @@ -39451,7 +39328,7 @@ diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/w (appid_url.EqualsIgnoringRef(kGstatic1) || appid_url.EqualsIgnoringRef(kGstatic2))) { return appid; -@@ -727,7 +727,7 @@ std::string AuthenticatorCommon::SerializeCollectedClientDataToJson( +@@ -725,7 +725,7 @@ std::string AuthenticatorCommon::SerializeCollectedClientDataToJson( // https://tools.ietf.org/html/draft-ietf-tls-grease client_data.SetKey("extra_keys_may_be_added_here", base::Value("do not compare clientDataJSON against a " @@ -39475,7 +39352,7 @@ diff --git a/content/common/fetch/fetch_api_request.proto b/content/common/fetch diff --git a/content/common/input/input_handler.mojom b/content/common/input/input_handler.mojom --- a/content/common/input/input_handler.mojom +++ b/content/common/input/input_handler.mojom -@@ -299,7 +299,7 @@ interface WidgetInputHandler { +@@ -300,7 +300,7 @@ interface WidgetInputHandler { // Other input actions may also be dispatched via the WidgetInputHandler // interface. If frame input actions are dispatched the WidgetInputHandler // should be fetched via the associated interface request so that input calls @@ -39487,19 +39364,19 @@ diff --git a/content/common/input/input_handler.mojom b/content/common/input/inp diff --git a/content/common/net/record_load_histograms.cc b/content/common/net/record_load_histograms.cc --- a/content/common/net/record_load_histograms.cc +++ b/content/common/net/record_load_histograms.cc -@@ -22,7 +22,7 @@ void RecordLoadHistograms(const GURL& url, +@@ -22,7 +22,7 @@ void RecordLoadHistograms(const url::Origin& origin, if (resource_type == ResourceType::kMainFrame) { base::UmaHistogramSparse("Net.ErrorCodesForMainFrame4", -net_error); - if (url.SchemeIsCryptographic()) { -- if (url.host_piece() == "www.google.com") { -+ if (url.host_piece() == "www.9oo91e.qjz9zk") { + if (GURL::SchemeIsCryptographic(origin.scheme())) { +- if (origin.host() == "www.google.com") { ++ if (origin.host() == "www.9oo91e.qjz9zk") { base::UmaHistogramSparse("Net.ErrorCodesForHTTPSGoogleMainFrame3", -net_error); } diff --git a/content/common/renderer.mojom b/content/common/renderer.mojom --- a/content/common/renderer.mojom +++ b/content/common/renderer.mojom -@@ -282,7 +282,7 @@ interface Renderer { +@@ -288,7 +288,7 @@ interface Renderer { SetSchedulerKeepActive(bool keep_active); // Tells the renderer process that it has been locked to a site (i.e., a @@ -39544,7 +39421,7 @@ diff --git a/content/public/android/java/res/values/strings.xml b/content/public diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java -@@ -69,7 +69,7 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProvider +@@ -70,7 +70,7 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProvider private static final int WINDOW_CONTENT_CHANGED_DELAY_MS = 500; // Constants from AccessibilityNodeInfo defined in the M SDK. @@ -39649,7 +39526,7 @@ diff --git a/content/public/browser/site_instance.h b/content/public/browser/sit diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h -@@ -100,7 +100,7 @@ struct PageImportanceSignals; +@@ -100,7 +100,7 @@ struct MHTMLGenerationParams; // // That's it; go to your kitchen, grab a scone, and chill. WebContents will do // all the multi-process stuff behind the scenes. More details are at @@ -39679,7 +39556,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c const base::Feature kAllowContentInitiatedDataUrlNavigations{ "AllowContentInitiatedDataUrlNavigations", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -498,17 +498,17 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{ +@@ -547,17 +547,17 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{ base::FEATURE_DISABLED_BY_DEFAULT}; // Signed Exchange Reporting for distributors @@ -39750,7 +39627,7 @@ diff --git a/content/public/common/url_constants.cc b/content/public/common/url_ diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h -@@ -307,12 +307,12 @@ class CONTENT_EXPORT ContentRendererClient { +@@ -300,12 +300,12 @@ class CONTENT_EXPORT ContentRendererClient { virtual bool IsPluginAllowedToUseDevChannelAPIs(); // Records a sample string to a Rappor privacy-preserving metric. @@ -39852,7 +39729,7 @@ diff --git a/content/renderer/pepper/pepper_plugin_registry.cc b/content/rendere diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -423,17 +423,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( +@@ -422,17 +422,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( std::string RenderThreadImpl::HistogramCustomizer::HostToCustomHistogramSuffix( const std::string& host) { @@ -39876,7 +39753,7 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th return ".youtube"; if (IsAlexaTop10NonGoogleSite(host)) return ".top10"; -@@ -452,7 +452,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( +@@ -451,7 +451,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( net::registry_controlled_domains::GetDomainAndRegistry( host, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); @@ -39888,8 +39765,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc -@@ -606,7 +606,7 @@ bool RenderWidget::OnMessageReceived(const IPC::Message& message) { - +@@ -570,7 +570,7 @@ void RenderWidget::Initialize(ShowCallback show_callback, + bool RenderWidget::OnMessageReceived(const IPC::Message& message) { // The EnableDeviceEmulation message is sent to a provisional RenderWidget // before the navigation completes. Some investigation into why is done in - // https://chromium-review.googlesource.com/c/chromium/src/+/1853675/5#message-e6edc3fd708d7d267ee981ffe43cae090b37a906 @@ -39897,16 +39774,7 @@ diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget. // but it's unclear what would need to be done to delay this until after // navigation. bool handled = false; -@@ -762,7 +762,7 @@ void RenderWidget::OnUpdateVisualProperties( - // one. - // - // See also: -- // https://docs.google.com/document/d/1G_fR1D_0c1yke8CqDMddoKrDGr3gy5t_ImEH4hKNIII/edit# -+ // https://docs.9oo91e.qjz9zk/document/d/1G_fR1D_0c1yke8CqDMddoKrDGr3gy5t_ImEH4hKNIII/edit# - - VisualProperties visual_properties = visual_properties_from_browser; - // Web tests can override the device scale factor in the renderer. -@@ -783,7 +783,7 @@ void RenderWidget::OnUpdateVisualProperties( +@@ -688,7 +688,7 @@ void RenderWidget::OnUpdateVisualProperties( // browser windows (on Windows OS) and thus would be the same for all // RenderWidgets, so clobbering each other works out since only the HDR bit is // used. See https://crbug.com/803451 and @@ -39934,8 +39802,8 @@ diff --git a/content/renderer/renderer_main_platform_delegate_linux.cc b/content bool RendererMainPlatformDelegate::EnableSandbox() { // The setuid sandbox is started in the zygote process: zygote_main_linux.cc -- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md -+ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_suid_sandbox.md +- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox.md ++ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/suid_sandbox.md // // Anything else is started in InitializeSandbox(). service_manager::SandboxLinux::Options options; @@ -40013,7 +39881,7 @@ diff --git a/courgette/disassembler_win32.cc b/courgette/disassembler_win32.cc + // at http://msdn.m1cr050ft.qjz9zk/en-us/library/ms809762.aspx const uint8_t* relocs_start = RVAToPointer(base_relocation_table_.address_); - const uint8_t* relocs_end = relocs_start + relocs_size; + if (relocs_start == nullptr || relocs_start < start() || diff --git a/courgette/third_party/bsdiff/bsdiff.h b/courgette/third_party/bsdiff/bsdiff.h --- a/courgette/third_party/bsdiff/bsdiff.h +++ b/courgette/third_party/bsdiff/bsdiff.h @@ -40173,7 +40041,7 @@ diff --git a/courgette/types_win_pe.h b/courgette/types_win_pe.h diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn -@@ -198,7 +198,7 @@ source_set("test_support") { +@@ -196,7 +196,7 @@ source_set("test_support") { config("platform_config") { if (use_nss_certs && is_clang) { # There is a broken header guard in /usr/include/nss/secmod.h: @@ -40218,7 +40086,7 @@ diff --git a/crypto/secure_util.h b/crypto/secure_util.h diff --git a/device/bluetooth/bluetooth_adapter_android.cc b/device/bluetooth/bluetooth_adapter_android.cc --- a/device/bluetooth/bluetooth_adapter_android.cc +++ b/device/bluetooth/bluetooth_adapter_android.cc -@@ -241,7 +241,7 @@ void BluetoothAdapterAndroid::CreateOrUpdateDeviceOnScan( +@@ -238,7 +238,7 @@ void BluetoothAdapterAndroid::CreateOrUpdateDeviceOnScan( BluetoothDevice::ClampPower(rssi), base::nullopt /* flags */, advertised_bluetooth_uuids, // Android uses INT32_MIN to indicate no Advertised Tx Power. @@ -40227,7 +40095,7 @@ diff --git a/device/bluetooth/bluetooth_adapter_android.cc b/device/bluetooth/bl tx_power == INT32_MIN ? base::nullopt : base::make_optional(clamped_tx_power), service_data_map, manufacturer_data_map); -@@ -256,7 +256,7 @@ void BluetoothAdapterAndroid::CreateOrUpdateDeviceOnScan( +@@ -253,7 +253,7 @@ void BluetoothAdapterAndroid::CreateOrUpdateDeviceOnScan( device_android->GetAddress(), device_name_opt, advertisement_name_opt, BluetoothDevice::ClampPower(rssi), // Android uses INT32_MIN to indicate no Advertised Tx Power. @@ -40239,7 +40107,7 @@ diff --git a/device/bluetooth/bluetooth_adapter_android.cc b/device/bluetooth/bl diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm -@@ -43,7 +43,7 @@ extern "C" { +@@ -42,7 +42,7 @@ extern "C" { // Using this API has the same effect as turning Bluetooth on or off using the // macOS System Preferences [4], and will effect all adapters. // @@ -40248,22 +40116,10 @@ diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/blueto // [2] http://www.frederikseiffert.de/blueutil/ // [3] https://pqrs.org/osx/karabiner/ // [4] https://support.apple.com/kb/PH25091 -diff --git a/device/bluetooth/bluetooth_adapter_mac_metrics.mm b/device/bluetooth/bluetooth_adapter_mac_metrics.mm ---- a/device/bluetooth/bluetooth_adapter_mac_metrics.mm -+++ b/device/bluetooth/bluetooth_adapter_mac_metrics.mm -@@ -18,7 +18,7 @@ namespace { - const NSInteger CBErrorConnectionFailed = 10; - const NSInteger CBErrorConnectionLimitReached = 11; - --// Match the SDK, which now has a typo. https://openradar.appspot.com/34413811 -+// Match the SDK, which now has a typo. https://openradar.8pp2p8t.qjz9zk/34413811 - const NSInteger CBErrorUnkownDevice = 12; - - #endif // MAC_OS_X_VERSION_10_13 diff --git a/device/bluetooth/bluetooth_adapter_winrt.cc b/device/bluetooth/bluetooth_adapter_winrt.cc --- a/device/bluetooth/bluetooth_adapter_winrt.cc +++ b/device/bluetooth/bluetooth_adapter_winrt.cc -@@ -110,7 +110,7 @@ bool ResolveCoreWinRT() { +@@ -112,7 +112,7 @@ bool ResolveCoreWinRT() { } // Query string for powered Bluetooth radios. GUID Reference: @@ -40275,7 +40131,7 @@ diff --git a/device/bluetooth/bluetooth_adapter_winrt.cc b/device/bluetooth/blue diff --git a/device/bluetooth/bluetooth_classic_device_mac.mm b/device/bluetooth/bluetooth_classic_device_mac.mm --- a/device/bluetooth/bluetooth_classic_device_mac.mm +++ b/device/bluetooth/bluetooth_classic_device_mac.mm -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ #include "device/bluetooth/public/cpp/bluetooth_uuid.h" // Undocumented API for accessing the Bluetooth transmit power level. @@ -40296,9 +40152,9 @@ diff --git a/device/bluetooth/bluetooth_classic_device_mac.mm b/device/bluetooth diff --git a/device/bluetooth/bluetooth_device_win.cc b/device/bluetooth/bluetooth_device_win.cc --- a/device/bluetooth/bluetooth_device_win.cc +++ b/device/bluetooth/bluetooth_device_win.cc -@@ -287,7 +287,7 @@ void BluetoothDeviceWin::GattServiceDiscoveryComplete( - - void BluetoothDeviceWin::CreateGattConnectionImpl() { +@@ -288,7 +288,7 @@ void BluetoothDeviceWin::GattServiceDiscoveryComplete( + void BluetoothDeviceWin::CreateGattConnectionImpl( + base::Optional service_uuid) { // Windows will create the Gatt connection as needed. See: - // https://docs.microsoft.com/en-us/windows/uwp/devices-sensors/gatt-client#connecting-to-the-device + // https://docs.m1cr050ft.qjz9zk/en-us/windows/uwp/devices-sensors/gatt-client#connecting-to-the-device @@ -40308,7 +40164,7 @@ diff --git a/device/bluetooth/bluetooth_device_win.cc b/device/bluetooth/bluetoo diff --git a/device/bluetooth/bluetooth_device_winrt.cc b/device/bluetooth/bluetooth_device_winrt.cc --- a/device/bluetooth/bluetooth_device_winrt.cc +++ b/device/bluetooth/bluetooth_device_winrt.cc -@@ -432,7 +432,7 @@ void BluetoothDeviceWinrt::CreateGattConnectionImpl() { +@@ -436,7 +436,7 @@ void BluetoothDeviceWinrt::CreateGattConnectionImpl( // Note: Even though we might have obtained a BluetoothLEDevice instance in // the past, we need to request a new instance as the old device might have // been closed. See also @@ -40317,7 +40173,7 @@ diff --git a/device/bluetooth/bluetooth_device_winrt.cc b/device/bluetooth/bluet ComPtr> from_bluetooth_address_op; hr = device_statics->FromBluetoothAddressAsync(raw_address_, &from_bluetooth_address_op); -@@ -468,7 +468,7 @@ void BluetoothDeviceWinrt::DisconnectGatt() { +@@ -493,7 +493,7 @@ void BluetoothDeviceWinrt::DisconnectGatt() { // reference to |ble_device_| as well, we need to clear them to drop all // remaining references, so that the OS disconnects. // Reference: @@ -40398,7 +40254,7 @@ diff --git a/device/fido/fido_constants.h b/device/fido/fido_constants.h diff --git a/device/fido/fido_strings.grd b/device/fido/fido_strings.grd --- a/device/fido/fido_strings.grd +++ b/device/fido/fido_strings.grd -@@ -153,7 +153,7 @@ This file contains the strings for //device/fido. +@@ -182,7 +182,7 @@ This file contains the strings for //device/fido. @@ -40446,7 +40302,7 @@ diff --git a/device/gamepad/raw_input_data_fetcher_win.cc b/device/gamepad/raw_i diff --git a/device/gamepad/xbox_controller_mac.mm b/device/gamepad/xbox_controller_mac.mm --- a/device/gamepad/xbox_controller_mac.mm +++ b/device/gamepad/xbox_controller_mac.mm -@@ -174,7 +174,7 @@ const size_t kXboxOneEliteButtonDataBytes = 29; +@@ -175,7 +175,7 @@ const size_t kXboxOneElite2ButtonDataBytes = 34; const size_t kXboxAdaptiveButtonDataBytes = 50; // From MSDN: @@ -40494,7 +40350,7 @@ diff --git a/extensions/browser/api/feedback_private/feedback_private_api.cc b/e diff --git a/extensions/browser/api/web_request/web_request_permissions.cc b/extensions/browser/api/web_request/web_request_permissions.cc --- a/extensions/browser/api/web_request/web_request_permissions.cc +++ b/extensions/browser/api/web_request/web_request_permissions.cc -@@ -185,13 +185,13 @@ PermissionsData::PageAccess CanExtensionAccessURLInternal( +@@ -186,13 +186,13 @@ PermissionsData::PageAccess CanExtensionAccessURLInternal( return PermissionsData::PageAccess::kDenied; } @@ -40510,7 +40366,7 @@ diff --git a/extensions/browser/api/web_request/web_request_permissions.cc b/ext static constexpr char kClient[] = "clients"; constexpr size_t kGoogleComLength = base::size(kGoogleCom) - 1; constexpr size_t kClientLength = base::size(kClient) - 1; -@@ -204,13 +204,13 @@ bool IsSensitiveGoogleClientUrl(const extensions::WebRequestInfo& request) { +@@ -205,13 +205,13 @@ bool IsSensitiveGoogleClientUrl(const extensions::WebRequestInfo& request) { while (host.ends_with(".")) host.remove_suffix(1u); @@ -40526,7 +40382,7 @@ diff --git a/extensions/browser/api/web_request/web_request_permissions.cc b/ext // by websites. base::StringPiece::size_type pos = host.rfind(kClient); if (pos == base::StringPiece::npos) -@@ -263,7 +263,7 @@ bool WebRequestPermissions::HideRequest( +@@ -264,7 +264,7 @@ bool WebRequestPermissions::HideRequest( request.type == content::ResourceType::kNavigationPreloadMainFrame || request.type == content::ResourceType::kNavigationPreloadSubFrame); @@ -40535,7 +40391,7 @@ diff --git a/extensions/browser/api/web_request/web_request_permissions.cc b/ext // TODO(crbug.com/890006): Determine if the code here can be cleaned up // since browser initiated non-navigation requests are now hidden from // extensions. -@@ -320,7 +320,7 @@ bool WebRequestPermissions::HideRequest( +@@ -330,7 +330,7 @@ bool WebRequestPermissions::HideRequest( extension_urls::IsBlacklistUpdateUrl(url) || extension_urls::IsSafeBrowsingUrl(url::Origin::Create(url), url.path_piece()) || @@ -40547,7 +40403,7 @@ diff --git a/extensions/browser/api/web_request/web_request_permissions.cc b/ext diff --git a/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc b/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc --- a/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc +++ b/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc -@@ -140,7 +140,7 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest:: +@@ -141,7 +141,7 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest:: // the details in |request_| may have changed e.g. if we've been redirected. // |request_initiator| can be modified on redirects, but we keep the original // for |initiator| in the event. See also @@ -40595,7 +40451,7 @@ diff --git a/extensions/browser/image_sanitizer.cc b/extensions/browser/image_sa diff --git a/extensions/browser/info_map.cc b/extensions/browser/info_map.cc --- a/extensions/browser/info_map.cc +++ b/extensions/browser/info_map.cc -@@ -89,7 +89,7 @@ void InfoMap::RemoveExtension(const std::string& extension_id, +@@ -90,7 +90,7 @@ void InfoMap::RemoveExtension(const std::string& extension_id, // NOTE: This can currently happen if we receive multiple unload // notifications, e.g. setting incognito-enabled state for a // disabled extension (e.g., via sync). See @@ -40671,13 +40527,13 @@ diff --git a/extensions/browser/updater/safe_manifest_parser.h b/extensions/brow diff --git a/extensions/browser/url_loader_factory_manager.cc b/extensions/browser/url_loader_factory_manager.cc --- a/extensions/browser/url_loader_factory_manager.cc +++ b/extensions/browser/url_loader_factory_manager.cc -@@ -58,7 +58,7 @@ enum class FactoryUser { - // point they can be removed from the allowlist. +@@ -63,7 +63,7 @@ enum class FactoryUser { + // which point they can be removed from the allowlist. // // Migration plan for extension developers is described at -// https://chromium.org/Home/chromium-security/extension-content-script-fetches +// https://ch40m1um.qjz9zk/Home/chromium-security/extension-content-script-fetches - const char* kHardcodedPartOfCorbAllowlist[] = { + const char* kHardcodedPartOfAllowlist[] = { "039F93DD1DF836F1D4E2084C1BEFDB46A854A9D1", "03E5D80A49C309F7B55ED6BD2B0EDEB38021ED4E", diff --git a/extensions/common/api/PRESUBMIT.py b/extensions/common/api/PRESUBMIT.py @@ -40993,7 +40849,7 @@ diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc diff --git a/extensions/common/extension.h b/extensions/common/extension.h --- a/extensions/common/extension.h +++ b/extensions/common/extension.h -@@ -321,7 +321,7 @@ class Extension : public base::RefCountedThreadSafe { +@@ -323,7 +323,7 @@ class Extension : public base::RefCountedThreadSafe { // Type-related queries. These are all mutually exclusive. // // The differences between the types of Extension are documented here: @@ -41139,7 +40995,7 @@ diff --git a/extensions/common/permissions/api_permission_set.h b/extensions/com diff --git a/extensions/common/permissions/permissions_data.h b/extensions/common/permissions/permissions_data.h --- a/extensions/common/permissions/permissions_data.h +++ b/extensions/common/permissions/permissions_data.h -@@ -223,7 +223,7 @@ class PermissionsData { +@@ -224,7 +224,7 @@ class PermissionsData { // Returns true if the associated extension is allowed to obtain the contents // of a page as an image. Pages may contain multiple sources (e.g., @@ -41163,7 +41019,7 @@ diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc diff --git a/extensions/common/url_pattern.h b/extensions/common/url_pattern.h --- a/extensions/common/url_pattern.h +++ b/extensions/common/url_pattern.h -@@ -34,7 +34,7 @@ class GURL; +@@ -37,7 +37,7 @@ class GURL; // Examples of valid patterns: // - http://*/* // - http://*/foo* @@ -41172,7 +41028,7 @@ diff --git a/extensions/common/url_pattern.h b/extensions/common/url_pattern.h // - file://monkey* // - http://127.0.0.1/* // - http://[2607:f8b0:4005:805::200e]/* -@@ -177,9 +177,9 @@ class URLPattern { +@@ -184,9 +184,9 @@ class URLPattern { // Returns true if the pattern matches all patterns in an (e)TLD. This // includes patterns like *://*.com/*, *://*.co.uk/*, etc. A pattern that // matches all domains (e.g., *://*/*) will return true. @@ -41185,7 +41041,7 @@ diff --git a/extensions/common/url_pattern.h b/extensions/common/url_pattern.h // returns false). // Note: This is an expensive method, and should be used sparingly! // You should probably use URLPatternSet::ShouldWarnAllHosts(), which is -@@ -207,13 +207,13 @@ class URLPattern { +@@ -214,13 +214,13 @@ class URLPattern { bool OverlapsWith(const URLPattern& other) const; // Returns true if this pattern matches all possible URLs that |other| can @@ -41584,7 +41440,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class DriveApiPartialFieldRequest : public UrlFetchRequestBase { public: explicit DriveApiPartialFieldRequest(RequestSender* sender); -@@ -205,7 +205,7 @@ class DriveApiDataRequest : public DriveApiPartialFieldRequest { +@@ -204,7 +204,7 @@ class DriveApiDataRequest : public DriveApiPartialFieldRequest { // This class performs the request for fetching a file. // This request is mapped to @@ -41593,7 +41449,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class FilesGetRequest : public DriveApiDataRequest { public: FilesGetRequest(RequestSender* sender, -@@ -245,9 +245,9 @@ enum FileVisibility { +@@ -244,9 +244,9 @@ enum FileVisibility { // This class performs the request for creating a resource. // This request is mapped to @@ -41606,7 +41462,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class FilesInsertRequest : public DriveApiDataRequest { public: FilesInsertRequest(RequestSender* sender, -@@ -316,7 +316,7 @@ class FilesInsertRequest : public DriveApiDataRequest { +@@ -315,7 +315,7 @@ class FilesInsertRequest : public DriveApiDataRequest { // This class performs the request for patching file metadata. // This request is mapped to @@ -41615,7 +41471,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class FilesPatchRequest : public DriveApiDataRequest { public: FilesPatchRequest(RequestSender* sender, -@@ -396,7 +396,7 @@ class FilesPatchRequest : public DriveApiDataRequest { +@@ -395,7 +395,7 @@ class FilesPatchRequest : public DriveApiDataRequest { // This class performs the request for copying a resource. // This request is mapped to @@ -41624,7 +41480,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class FilesCopyRequest : public DriveApiDataRequest { public: // Upon completion, |callback| will be called. |callback| must not be null. -@@ -454,7 +454,7 @@ class FilesCopyRequest : public DriveApiDataRequest { +@@ -453,7 +453,7 @@ class FilesCopyRequest : public DriveApiDataRequest { // should be able to be fetched by another request using this class, by // setting the next_page_token from previous call, to page_token. // This request is mapped to @@ -41633,7 +41489,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class TeamDriveListRequest : public DriveApiDataRequest { public: TeamDriveListRequest(RequestSender* sender, -@@ -489,7 +489,7 @@ class TeamDriveListRequest : public DriveApiDataRequest { +@@ -488,7 +488,7 @@ class TeamDriveListRequest : public DriveApiDataRequest { // |team_drive_id_| may be empty, in which case the start page token will be // returned for the users changes. // This request is mapped to @@ -41642,7 +41498,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class StartPageTokenRequest : public DriveApiDataRequest { public: StartPageTokenRequest(RequestSender* sender, -@@ -521,7 +521,7 @@ class StartPageTokenRequest : public DriveApiDataRequest { +@@ -520,7 +520,7 @@ class StartPageTokenRequest : public DriveApiDataRequest { // should be able to be fetched by ContinueGetFileListRequest defined below, // or by FilesListRequest with setting page token. // This request is mapped to @@ -41651,7 +41507,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class FilesListRequest : public DriveApiDataRequest { public: FilesListRequest(RequestSender* sender, -@@ -593,7 +593,7 @@ class FilesListNextPageRequest : public DriveApiDataRequest { +@@ -592,7 +592,7 @@ class FilesListNextPageRequest : public DriveApiDataRequest { // This class performs the request for deleting a resource. // This request is mapped to @@ -41660,7 +41516,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class FilesDeleteRequest : public EntryActionRequest { public: FilesDeleteRequest(RequestSender* sender, -@@ -624,7 +624,7 @@ class FilesDeleteRequest : public EntryActionRequest { +@@ -623,7 +623,7 @@ class FilesDeleteRequest : public EntryActionRequest { // This class performs the request for trashing a resource. // This request is mapped to @@ -41669,7 +41525,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class FilesTrashRequest : public DriveApiDataRequest { public: FilesTrashRequest(RequestSender* sender, -@@ -654,7 +654,7 @@ class FilesTrashRequest : public DriveApiDataRequest { +@@ -653,7 +653,7 @@ class FilesTrashRequest : public DriveApiDataRequest { // This class performs the request for fetching About data. // This request is mapped to @@ -41678,7 +41534,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class AboutGetRequest : public DriveApiDataRequest { public: AboutGetRequest(RequestSender* sender, -@@ -679,7 +679,7 @@ class AboutGetRequest : public DriveApiDataRequest { +@@ -678,7 +678,7 @@ class AboutGetRequest : public DriveApiDataRequest { // should be able to be fetched by ContinueGetFileListRequest defined below. // or by ChangesListRequest with setting page token. // This request is mapped to @@ -41687,7 +41543,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class ChangesListRequest : public DriveApiDataRequest { public: ChangesListRequest(RequestSender* sender, -@@ -755,7 +755,7 @@ class ChangesListNextPageRequest : public DriveApiDataRequest { +@@ -754,7 +754,7 @@ class ChangesListNextPageRequest : public DriveApiDataRequest { // This class performs the request for inserting a resource to a directory. // This request is mapped to @@ -41696,7 +41552,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class ChildrenInsertRequest : public EntryActionRequest { public: ChildrenInsertRequest(RequestSender* sender, -@@ -792,7 +792,7 @@ class ChildrenInsertRequest : public EntryActionRequest { +@@ -791,7 +791,7 @@ class ChildrenInsertRequest : public EntryActionRequest { // This class performs the request for removing a resource from a directory. // This request is mapped to @@ -41705,7 +41561,7 @@ diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_ap class ChildrenDeleteRequest : public EntryActionRequest { public: // |callback| must not be null. -@@ -1115,7 +1115,7 @@ enum PermissionRole { +@@ -1114,7 +1114,7 @@ enum PermissionRole { // This class performs the request for adding permission on a specified file. class PermissionsInsertRequest : public EntryActionRequest { public: @@ -41733,7 +41589,7 @@ diff --git a/google_apis/drive/drive_api_url_generator.cc b/google_apis/drive/dr diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc -@@ -628,7 +628,7 @@ void GaiaAuthFetcher::StartMergeSession(const std::string& uber_token, +@@ -626,7 +626,7 @@ void GaiaAuthFetcher::StartMergeSession(const std::string& uber_token, // know what sessions already exist in the browser. The fetcher needs to be // created such that it sends the cookies with the request, which is // different from all other requests the fetcher can make. @@ -41742,7 +41598,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_ std::string query = MakeMergeSessionQuery(uber_token, external_cc_result, continue_url, source_); net::NetworkTrafficAnnotationTag traffic_annotation = -@@ -780,7 +780,7 @@ void GaiaAuthFetcher::StartListAccounts() { +@@ -778,7 +778,7 @@ void GaiaAuthFetcher::StartListAccounts() { })"); CreateAndStartGaiaFetcher( " ", // To force an HTTP POST. @@ -41754,7 +41610,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_ diff --git a/google_apis/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_util.cc --- a/google_apis/gaia/gaia_auth_util.cc +++ b/google_apis/gaia/gaia_auth_util.cc -@@ -23,9 +23,9 @@ namespace gaia { +@@ -22,9 +22,9 @@ namespace gaia { namespace { @@ -41765,8 +41621,8 @@ diff --git a/google_apis/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_uti +const char kGoogleDomain[] = "9oo91e.qjz9zk"; +const char kGooglemailDomain[] = "9oo91email.qjz9zk"; - const void* const kURLRequestUserDataKey = &kURLRequestUserDataKey; - + std::string CanonicalizeEmailImpl(const std::string& email_address, + bool change_googlemail_to_gmail) { diff --git a/google_apis/gaia/gaia_auth_util.h b/google_apis/gaia/gaia_auth_util.h --- a/google_apis/gaia/gaia_auth_util.h +++ b/google_apis/gaia/gaia_auth_util.h @@ -41952,7 +41808,7 @@ diff --git a/google_apis/gaia/gaia_switches.h b/google_apis/gaia/gaia_switches.h diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc --- a/google_apis/gaia/gaia_urls.cc +++ b/google_apis/gaia/gaia_urls.cc -@@ -15,13 +15,13 @@ +@@ -16,13 +16,13 @@ namespace { // Gaia service constants @@ -41971,7 +41827,7 @@ diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc const char kClientLoginUrlSuffix[] = "ClientLogin"; const char kServiceLoginUrlSuffix[] = "ServiceLogin"; const char kEmbeddedSetupChromeOsUrlSuffixV2[] = "embedded/setup/v2/chromeos"; -@@ -47,18 +47,18 @@ const char kEmbeddedSigninSuffix[] = "embedded/setup/chrome/usermenu"; +@@ -58,18 +58,18 @@ const char kEmbeddedSigninSuffix[] = "embedded/setup/chrome/usermenu"; const char kAddAccountSuffix[] = "AddSession"; const char kGetCheckConnectionInfoSuffix[] = "GetCheckConnectionInfo"; @@ -41993,7 +41849,7 @@ diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc const char kOAuth2IssueTokenUrlSuffix[] = "v1/issuetoken"; void GetSwitchValueWithDefault(const char* switch_value, -@@ -113,7 +113,7 @@ GaiaUrls::GaiaUrls() { +@@ -124,7 +124,7 @@ GaiaUrls::GaiaUrls() { oauth2_chrome_client_secret_ = google_apis::GetOAuth2ClientSecret(google_apis::CLIENT_MAIN); @@ -42002,7 +41858,7 @@ diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc client_login_url_ = gaia_url_.Resolve(kClientLoginUrlSuffix); service_login_url_ = gaia_url_.Resolve(kServiceLoginUrlSuffix); embedded_setup_chromeos_url_v2_ = -@@ -140,12 +140,12 @@ GaiaUrls::GaiaUrls() { +@@ -151,12 +151,12 @@ GaiaUrls::GaiaUrls() { get_check_connection_info_url_ = gaia_url_.Resolve(kGetCheckConnectionInfoSuffix); @@ -42017,7 +41873,7 @@ diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc oauth2_token_url_ = google_apis_origin_url.Resolve(kOAuth2TokenUrlSuffix); oauth2_token_info_url_ = google_apis_origin_url.Resolve(kOAuth2TokenInfoUrlSuffix); -@@ -153,7 +153,7 @@ GaiaUrls::GaiaUrls() { +@@ -164,7 +164,7 @@ GaiaUrls::GaiaUrls() { google_apis_origin_url.Resolve(kOAuthUserInfoUrlSuffix); reauth_api_url_ = google_apis_origin_url.Resolve(kReAuthApiUrlSuffix); @@ -42132,7 +41988,7 @@ diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_prob diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc -@@ -98,7 +98,7 @@ +@@ -103,7 +103,7 @@ namespace google_apis { const char kAPIKeysDevelopersHowToURL[] = @@ -42261,7 +42117,7 @@ diff --git a/gpu/command_buffer/service/external_vk_image_dawn_representation.cc - // TODO(cwallez@chromium.org): This is incorrect and allows reading + // TODO(cwallez@ch40m1um.qjz9zk): This is incorrect and allows reading // uninitialized data. When !IsCleared we should tell dawn_native to - // consider the texture lazy-cleared. + // consider the texture lazy-cleared. crbug.com/1036080 SetCleared(); @@ -105,7 +105,7 @@ void ExternalVkImageDawnRepresentation::EndAccess() { return; @@ -42287,7 +42143,7 @@ diff --git a/gpu/command_buffer/service/external_vk_image_dawn_representation.h diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc --- a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc -@@ -243,7 +243,7 @@ void AssignGLRectangle(GLint rectangle[4], +@@ -279,7 +279,7 @@ void AssignGLRectangle(GLint rectangle[4], // not needed when uploading from a PBO and for compressed formats which the // client sends untouched. This class handles resetting and restoring the unpack // state. @@ -42299,16 +42155,16 @@ diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc b diff --git a/gpu/command_buffer/service/shared_image_backing_factory_iosurface.mm b/gpu/command_buffer/service/shared_image_backing_factory_iosurface.mm --- a/gpu/command_buffer/service/shared_image_backing_factory_iosurface.mm +++ b/gpu/command_buffer/service/shared_image_backing_factory_iosurface.mm -@@ -318,7 +318,7 @@ class SharedImageRepresentationDawnIOSurface +@@ -302,7 +302,7 @@ class SharedImageRepresentationDawnIOSurface // Assume that the user of this representation will write to the texture // so set the cleared flag so that other representations don't overwrite // the result. - // TODO(cwallez@chromium.org): This is incorrect and allows reading + // TODO(cwallez@ch40m1um.qjz9zk): This is incorrect and allows reading // uninitialized data. When !IsCleared we should tell dawn_native to - // consider the texture lazy-cleared. + // consider the texture lazy-cleared. crbug.com/1036080 SetCleared(); -@@ -331,7 +331,7 @@ class SharedImageRepresentationDawnIOSurface +@@ -315,7 +315,7 @@ class SharedImageRepresentationDawnIOSurface if (!texture_) { return; } @@ -42317,7 +42173,7 @@ diff --git a/gpu/command_buffer/service/shared_image_backing_factory_iosurface.m // cleared and set IsCleared appropriately. // All further operations on the textures are errors (they would be racy -@@ -358,7 +358,7 @@ class SharedImageRepresentationDawnIOSurface +@@ -342,7 +342,7 @@ class SharedImageRepresentationDawnIOSurface WGPUTexture texture_ = nullptr; WGPUTextureFormat wgpu_format_; @@ -42329,7 +42185,7 @@ diff --git a/gpu/command_buffer/service/shared_image_backing_factory_iosurface.m diff --git a/gpu/command_buffer/service/webgpu_decoder_impl.cc b/gpu/command_buffer/service/webgpu_decoder_impl.cc --- a/gpu/command_buffer/service/webgpu_decoder_impl.cc +++ b/gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -774,7 +774,7 @@ error::Error WebGPUDecoderImpl::HandleAssociateMailboxImmediate( +@@ -812,7 +812,7 @@ error::Error WebGPUDecoderImpl::HandleAssociateMailboxImmediate( DLOG_IF(ERROR, !mailbox.Verify()) << "AssociateMailbox was passed an invalid mailbox"; @@ -42338,10 +42194,19 @@ diff --git a/gpu/command_buffer/service/webgpu_decoder_impl.cc b/gpu/command_buf // supports multiple devices. if (device_id != 0 || device_generation != 0) { DLOG(ERROR) << "AssociateMailbox: Invalid device ID"; +@@ -836,7 +836,7 @@ error::Error WebGPUDecoderImpl::HandleAssociateMailboxImmediate( + return error::kInvalidArguments; + } + +- // TODO(cwallez@chromium.org): Handle texture clearing. We should either ++ // TODO(cwallez@ch40m1um.qjz9zk): Handle texture clearing. We should either + // pre-clear textures, or implement a way to detect whether DAWN has cleared + // a texture. crbug.com/1036080 + std::unique_ptr diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc --- a/gpu/config/gpu_info_collector_win.cc +++ b/gpu/config/gpu_info_collector_win.cc -@@ -140,7 +140,7 @@ bool CollectDriverInfoD3D(GPUInfo* gpu_info) { +@@ -146,7 +146,7 @@ bool CollectDriverInfoD3D(GPUInfo* gpu_info) { // Since Windows 10 (and Windows 8.1 on some systems), switchable graphics // platforms are managed by Windows and each adapter is accessible as // separate devices. @@ -42365,7 +42230,7 @@ diff --git a/gpu/vulkan/PRESUBMIT.py b/gpu/vulkan/PRESUBMIT.py diff --git a/headless/app/headless_shell_switches.cc b/headless/app/headless_shell_switches.cc --- a/headless/app/headless_shell_switches.cc +++ b/headless/app/headless_shell_switches.cc -@@ -82,7 +82,7 @@ const char kScreenshot[] = "screenshot"; +@@ -87,7 +87,7 @@ const char kScreenshot[] = "screenshot"; // Causes SSL key material to be logged to the specified file for debugging // purposes. See @@ -42417,8 +42282,8 @@ diff --git a/headless/public/headless_browser.h b/headless/public/headless_brows // } // // [1] --// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_zygote.md -+// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_zygote.md +-// https://chromium.googlesource.com/chromium/src/+/master/docs/linux/zygote.md ++// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/zygote.md void RunChildProcessIfNeeded(int argc, const char** argv); #else // In Windows, the headless browser may need to create child processes. This is @@ -42558,7 +42423,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios All Time -@@ -807,7 +807,7 @@ locale. The strings in this file are specific to iOS. +@@ -810,7 +810,7 @@ locale. The strings in this file are specific to iOS. Fix now. @@ -42567,7 +42432,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Password -@@ -1097,7 +1097,7 @@ Handoff must also be enabled in the General section of Settings, and your device +@@ -1112,7 +1112,7 @@ Handoff must also be enabled in the General section of Settings, and your device Continue @@ -42576,7 +42441,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Add existing data to $1john@doe.com. -@@ -1220,7 +1220,7 @@ Handoff must also be enabled in the General section of Settings, and your device +@@ -1235,7 +1235,7 @@ Handoff must also be enabled in the General section of Settings, and your device Privacy Notice @@ -42585,7 +42450,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Page load progress bar, $120% loaded. -@@ -1262,7 +1262,7 @@ Handoff must also be enabled in the General section of Settings, and your device +@@ -1277,7 +1277,7 @@ Handoff must also be enabled in the General section of Settings, and your device Added to Reading List @@ -42594,7 +42459,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Available offline -@@ -1427,7 +1427,7 @@ Handoff must also be enabled in the General section of Settings, and your device +@@ -1445,7 +1445,7 @@ Handoff must also be enabled in the General section of Settings, and your device To export passwords, you must first set a passcode on your device. @@ -42603,7 +42468,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Copied -@@ -1729,12 +1729,12 @@ To change this setting, BEGIN_LINKreset syncBEGIN_LINKreset sync @@ -42618,7 +42483,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Your data was encrypted with your sync passphrase on $2Sept 1, 2012. Enter it to start sync. -@@ -1943,7 +1943,7 @@ Your data was encrypted with your sync passphrase on $2Sept +@@ -1961,7 +1961,7 @@ Your data was encrypted with your sync passphrase on $2Sept Help @@ -42630,7 +42495,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios diff --git a/ios/chrome/browser/autofill/BUILD.gn b/ios/chrome/browser/autofill/BUILD.gn --- a/ios/chrome/browser/autofill/BUILD.gn +++ b/ios/chrome/browser/autofill/BUILD.gn -@@ -241,7 +241,7 @@ bundle_data("unit_tests_bundle_data") { +@@ -239,7 +239,7 @@ bundle_data("unit_tests_bundle_data") { "//components/test/data/autofill/heuristics/input/049_register_ebay.com.html", "//components/test/data/autofill/heuristics/input/050_register_ecomm.dell.com.html", "//components/test/data/autofill/heuristics/input/051_register_epson.com.html", @@ -42639,7 +42504,7 @@ diff --git a/ios/chrome/browser/autofill/BUILD.gn b/ios/chrome/browser/autofill/ "//components/test/data/autofill/heuristics/input/053_register_gymboree.com.html", "//components/test/data/autofill/heuristics/input/054_register_hotels.com.html", "//components/test/data/autofill/heuristics/input/055_register_imdb.com.html", -@@ -399,7 +399,7 @@ bundle_data("unit_tests_bundle_data") { +@@ -397,7 +397,7 @@ bundle_data("unit_tests_bundle_data") { "//components/test/data/autofill/heuristics/output/049_register_ebay.com.out", "//components/test/data/autofill/heuristics/output/050_register_ecomm.dell.com.out", "//components/test/data/autofill/heuristics/output/051_register_epson.com.out", @@ -42663,7 +42528,7 @@ diff --git a/ios/chrome/browser/autofill/automation/automation_action.mm b/ios/c diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_impl.h b/ios/chrome/browser/browser_state/chrome_browser_state_impl.h --- a/ios/chrome/browser/browser_state/chrome_browser_state_impl.h +++ b/ios/chrome/browser/browser_state/chrome_browser_state_impl.h -@@ -86,7 +86,7 @@ class ChromeBrowserStateImpl : public ios::ChromeBrowserState { +@@ -86,7 +86,7 @@ class ChromeBrowserStateImpl : public ChromeBrowserState { // BrowserState use our BrowserStateKeyedServiceFactory system instead. // You can find the design document here: // @@ -42747,7 +42612,7 @@ diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chr diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm --- a/ios/chrome/browser/flags/about_flags.mm +++ b/ios/chrome/browser/flags/about_flags.mm -@@ -108,15 +108,15 @@ const FeatureEntry::FeatureVariation kMarkHttpAsFeatureVariations[] = { +@@ -109,15 +109,15 @@ const FeatureEntry::FeatureVariation kMarkHttpAsFeatureVariations[] = { const FeatureEntry::Choice kUseDdljsonApiChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, {"(force test doodle 0)", search_provider_logos::switches::kGoogleDoodleUrl, @@ -42768,7 +42633,7 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/ }; const FeatureEntry::Choice kAutofillIOSDelayBetweenFieldsChoices[] = { -@@ -286,7 +286,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { +@@ -297,7 +297,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, flags_ui::kOsIos, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, @@ -42780,7 +42645,7 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/ diff --git a/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm b/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm --- a/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm +++ b/ios/chrome/browser/geolocation/omnibox_geolocation_controller.mm -@@ -431,7 +431,7 @@ const char* const kGeolocationAuthorizationActionNewUser = +@@ -429,7 +429,7 @@ const char* const kGeolocationAuthorizationActionNewUser = } - (BOOL)URLIsAuthorizationPromptingURL:(const GURL&)url { @@ -42913,7 +42778,7 @@ diff --git a/ios/chrome/browser/search_engines/search_engine_tab_helper.mm b/ios // Use the same value as the SearchEngineTabHelper for Desktop. ios::TemplateURLFetcherFactory::GetForBrowserState(browser_state) ->ScheduleDownload(keyword, osdd_url, item->GetFavicon().url, -@@ -211,7 +211,7 @@ void SearchEngineTabHelper::AddTemplateURLByOSDD(const GURL& page_url, +@@ -212,7 +212,7 @@ void SearchEngineTabHelper::AddTemplateURLByOSDD(const GURL& page_url, // Creates a TemplateURL by |searchable_url| and adds it to TemplateURLService. // This code is based on: @@ -42949,7 +42814,7 @@ diff --git a/ios/chrome/browser/signin/feature_flags.mm b/ios/chrome/browser/sig diff --git a/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.h b/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.h --- a/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.h +++ b/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.h -@@ -92,8 +92,8 @@ class IOSChromeLocalSessionEventRouter +@@ -89,8 +89,8 @@ class IOSChromeLocalSessionEventRouter void OnWebStateChange(web::WebState* web_state); // Called when the favicons for the given page URLs @@ -42990,7 +42855,7 @@ diff --git a/ios/chrome/browser/ui/activity_services/activity_type_util.mm b/ios diff --git a/ios/chrome/browser/ui/authentication/signed_in_accounts_view_controller.mm b/ios/chrome/browser/ui/authentication/signed_in_accounts_view_controller.mm --- a/ios/chrome/browser/ui/authentication/signed_in_accounts_view_controller.mm +++ b/ios/chrome/browser/ui/authentication/signed_in_accounts_view_controller.mm -@@ -214,7 +214,7 @@ BOOL gSignedInAccountsViewControllerIsShown = NO; +@@ -213,7 +213,7 @@ BOOL gSignedInAccountsViewControllerIsShown = NO; // its internal preferences. // // TODO(crbug.com/1007990) Remove this code after M81 (revert @@ -43021,7 +42886,7 @@ diff --git a/ios/chrome/browser/ui/authentication/signin_earlgrey_utils.mm b/ios diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm b/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm --- a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm +++ b/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm -@@ -65,7 +65,7 @@ +@@ -67,7 +67,7 @@ namespace { // URL for the page displaying help for the NTP. const char kNTPHelpURL[] = @@ -43033,7 +42898,7 @@ diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm b/io diff --git a/ios/chrome/browser/ui/first_run/welcome_to_chrome_view_controller.mm b/ios/chrome/browser/ui/first_run/welcome_to_chrome_view_controller.mm --- a/ios/chrome/browser/ui/first_run/welcome_to_chrome_view_controller.mm +++ b/ios/chrome/browser/ui/first_run/welcome_to_chrome_view_controller.mm -@@ -176,7 +176,7 @@ const BOOL kDefaultStatsCheckboxValue = YES; +@@ -179,7 +179,7 @@ const BOOL kDefaultStatsCheckboxValue = YES; self.didTapPrivacyLink = YES; NSString* title = l10n_util::GetNSString(IDS_IOS_FIRSTRUN_PRIVACY_TITLE); NSURL* privacyUrl = net::NSURLWithGURL( @@ -43066,18 +42931,6 @@ diff --git a/ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm b/ios/chr "MoveToDockTipPromo", "logoWithRoundedRectangle"); break; case experimental_flags::WHATS_NEW_REVIEW_UPDATED_TOS: -diff --git a/ios/chrome/browser/ui/omnibox/popup/autocomplete_match_formatter.mm b/ios/chrome/browser/ui/omnibox/popup/autocomplete_match_formatter.mm ---- a/ios/chrome/browser/ui/omnibox/popup/autocomplete_match_formatter.mm -+++ b/ios/chrome/browser/ui/omnibox/popup/autocomplete_match_formatter.mm -@@ -327,7 +327,7 @@ bool ShouldUseNewFormatting() { - - (NSDictionary*)attributesForSuggestionType: - (int)type { - DCHECK(!ShouldUseNewFormatting()); -- // Answer types, sizes and colors specified at http://goto.google.com/ais_api. -+ // Answer types, sizes and colors specified at http://goto.9oo91e.qjz9zk/ais_api. - UIColor* detailTextColor = SuggestionDetailTextColor(self.incognito); - switch (type) { - case SuggestionAnswer::TOP_ALIGNED: diff --git a/ios/chrome/browser/ui/payments/cells/page_info_item.mm b/ios/chrome/browser/ui/payments/cells/page_info_item.mm --- a/ios/chrome/browser/ui/payments/cells/page_info_item.mm +++ b/ios/chrome/browser/ui/payments/cells/page_info_item.mm @@ -43093,7 +42946,7 @@ diff --git a/ios/chrome/browser/ui/payments/cells/page_info_item.mm b/ios/chrome diff --git a/ios/chrome/browser/ui/payments/payment_request_manager.h b/ios/chrome/browser/ui/payments/payment_request_manager.h --- a/ios/chrome/browser/ui/payments/payment_request_manager.h +++ b/ios/chrome/browser/ui/payments/payment_request_manager.h -@@ -10,7 +10,7 @@ +@@ -12,7 +12,7 @@ class ChromeBrowserState; // Names identifying the errors used in Payment Request API: // https://www.w3.org/TR/payment-request/ // A complete list of DOMException error names and descriptions can be found at: @@ -43117,7 +42970,7 @@ diff --git a/ios/chrome/browser/ui/settings/cells/search_engine_item.h b/ios/chr diff --git a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm --- a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm +++ b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm -@@ -417,16 +417,16 @@ typedef NS_ENUM(NSInteger, ItemType) { +@@ -416,16 +416,16 @@ typedef NS_ENUM(NSInteger, ItemType) { TableViewURLItem* item = [[TableViewURLItem alloc] initWithType:ItemTypeURLNoMetadata]; item.title = @"Google Design"; @@ -43137,7 +42990,7 @@ diff --git a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.m item.metadata = @"3:42 PM"; [model addItem:item toSectionWithIdentifier:SectionIdentifierURL]; -@@ -445,7 +445,7 @@ typedef NS_ENUM(NSInteger, ItemType) { +@@ -444,7 +444,7 @@ typedef NS_ENUM(NSInteger, ItemType) { item = [[TableViewURLItem alloc] initWithType:ItemTypeURLWithBadgeImage]; item.title = @"Photos - Google Photos"; @@ -43225,11 +43078,13 @@ diff --git a/ios/public/provider/chrome/browser/signin/chrome_identity_service.m diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm --- a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm +++ b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm -@@ -91,7 +91,7 @@ NSString* FakeGetHostedDomainForIdentity(ChromeIdentity* identity) { +@@ -91,8 +91,8 @@ NSString* FakeGetHostedDomainForIdentity(ChromeIdentity* identity) { @end namespace ios { +-NSString* const kManagedIdentityEmailFormat = @"%@@google.com"; -NSString* const kIdentityEmailFormat = @"%@@gmail.com"; ++NSString* const kManagedIdentityEmailFormat = @"%@@9oo91e.qjz9zk"; +NSString* const kIdentityEmailFormat = @"%@@9ma1l.qjz9zk"; NSString* const kIdentityGaiaIDFormat = @"%@ID"; @@ -43366,7 +43221,7 @@ diff --git a/ios/web/navigation/error_retry_state_machine.h b/ios/web/navigation diff --git a/ios/web/navigation/navigation_manager_impl.mm b/ios/web/navigation/navigation_manager_impl.mm --- a/ios/web/navigation/navigation_manager_impl.mm +++ b/ios/web/navigation/navigation_manager_impl.mm -@@ -375,10 +375,10 @@ void NavigationManagerImpl::Reload(ReloadType reload_type, +@@ -346,10 +346,10 @@ void NavigationManagerImpl::Reload(ReloadType reload_type, // request url of the transient item, or pending item if transient doesn't // exist, or last committed item if both of them don't exist. The reason is // that a server side redirect may change the item's url. @@ -43390,8 +43245,8 @@ diff --git a/ios/web/web_state/js/resources/base.js b/ios/web/web_state/js/resou -// See http://goo.gl/FwOgy +// See http://goo.gl.qjz9zk.qjz9zk/FwOgy + var goog; goog.provide('__crWeb.base'); - diff --git a/ios/web/web_state/js/resources/plugin_placeholder.js b/ios/web/web_state/js/resources/plugin_placeholder.js --- a/ios/web/web_state/js/resources/plugin_placeholder.js +++ b/ios/web/web_state/js/resources/plugin_placeholder.js @@ -43455,7 +43310,7 @@ diff --git a/ios/web_view/public/cwv_translation_language.h b/ios/web_view/publi diff --git a/ios/web_view/public/cwv_web_view.h b/ios/web_view/public/cwv_web_view.h --- a/ios/web_view/public/cwv_web_view.h +++ b/ios/web_view/public/cwv_web_view.h -@@ -80,7 +80,7 @@ CWV_EXPORT +@@ -82,7 +82,7 @@ CWV_EXPORT // // - Internationalized domain names (IDN) are presented in Unicode if they're // regarded safe. See @@ -43464,7 +43319,7 @@ diff --git a/ios/web_view/public/cwv_web_view.h b/ios/web_view/public/cwv_web_vi // for details. // - Omits the path for standard schemes, excepting file and filesystem. // - Omits the port if it is the default for the scheme. -@@ -130,7 +130,7 @@ CWV_EXPORT +@@ -142,7 +142,7 @@ CWV_EXPORT // Use this method to set the necessary credentials used to communicate with // the Google API for features such as translate. See this link for more info: @@ -43476,7 +43331,7 @@ diff --git a/ios/web_view/public/cwv_web_view.h b/ios/web_view/public/cwv_web_vi diff --git a/ios/web_view/shell/shell_view_controller.m b/ios/web_view/shell/shell_view_controller.m --- a/ios/web_view/shell/shell_view_controller.m +++ b/ios/web_view/shell/shell_view_controller.m -@@ -361,10 +361,10 @@ NSString* const kWebViewShellJavaScriptDialogTextFieldAccessibilityIdentifier = +@@ -394,10 +394,10 @@ NSString* const kWebViewShellJavaScriptDialogTextFieldAccessibilityIdentifier = NSString* URL; if ([CWVFlags sharedInstance] .usesSyncAndWalletSandbox) { @@ -43489,7 +43344,7 @@ diff --git a/ios/web_view/shell/shell_view_controller.m b/ios/web_view/shell/she @"home#paymentMethods"; } NSURLRequest* request = [NSURLRequest -@@ -677,7 +677,7 @@ NSString* const kWebViewShellJavaScriptDialogTextFieldAccessibilityIdentifier = +@@ -734,7 +734,7 @@ NSString* const kWebViewShellJavaScriptDialogTextFieldAccessibilityIdentifier = [enteredText stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet URLQueryAllowedCharacterSet]]; enteredText = [NSString @@ -43743,7 +43598,7 @@ diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_d // notes this happens "because the start time is in the future." There is // no matching EME status, so returning EXPIRED as the closest match. return CdmKeyInformation::EXPIRED; -@@ -830,7 +830,7 @@ void MediaDrmBridge::OnSessionKeysChange( +@@ -831,7 +831,7 @@ void MediaDrmBridge::OnSessionKeysChange( // passed to Blink which will then be translated to NaN [4], which is what the // spec uses to indicate that the license will never expire [5]. // [1] @@ -43752,18 +43607,6 @@ diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_d // [2] See base::Time::FromDoubleT() // [3] See base::Time::ToJavaTime() // [4] See MediaKeySession::expirationChanged() -diff --git a/media/base/android/media_drm_key_type.h b/media/base/android/media_drm_key_type.h ---- a/media/base/android/media_drm_key_type.h -+++ b/media/base/android/media_drm_key_type.h -@@ -11,7 +11,7 @@ namespace media { - - // These must be in sync with Android MediaDrm KEY_TYPE_XXX constants, except - // UNKNOWN and MAX: --// https://developer.android.com/reference/android/media/MediaDrm.html#KEY_TYPE_OFFLINE -+// https://developer.8n6r01d.qjz9zk/reference/android/media/MediaDrm.html#KEY_TYPE_OFFLINE - enum class MediaDrmKeyType : uint32_t { - UNKNOWN = 0, - MIN = UNKNOWN, diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h --- a/media/base/android/media_player_bridge.h +++ b/media/base/android/media_player_bridge.h @@ -43791,7 +43634,7 @@ diff --git a/media/base/container_names.cc b/media/base/container_names.cc diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc --- a/media/base/key_systems.cc +++ b/media/base/key_systems.cc -@@ -148,7 +148,7 @@ class ClearKeyProperties : public KeySystemProperties { +@@ -149,7 +149,7 @@ class ClearKeyProperties : public KeySystemProperties { SupportedCodecs GetSupportedCodecs() const override { // On Android, Vorbis, VP8, AAC and AVC1 are supported in MediaCodec: @@ -43815,7 +43658,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/video_codecs.h b/media/base/video_codecs.h --- a/media/base/video_codecs.h +++ b/media/base/video_codecs.h -@@ -107,7 +107,7 @@ std::string MEDIA_EXPORT GetProfileName(VideoCodecProfile profile); +@@ -110,7 +110,7 @@ std::string MEDIA_EXPORT GetProfileName(VideoCodecProfile profile); // ParseNewStyleVp9CodecID handles parsing of new style vp9 codec IDs per // proposed VP Codec ISO Media File Format Binding specification: @@ -43896,7 +43739,7 @@ diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/ // least preferred format. {V4L2_PIX_FMT_JPEG, PIXEL_FORMAT_MJPEG, 1}, }; -@@ -883,7 +883,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -897,7 +897,7 @@ void V4L2CaptureDelegate::DoCapture() { // There's a wide-spread issue where the kernel does not report accurate, // monotonically-increasing timestamps in the v4l2_buffer::timestamp @@ -43932,7 +43775,7 @@ diff --git a/media/capture/video/win/sink_filter_win.h b/media/capture/video/win diff --git a/media/capture/video/win/video_capture_device_factory_win.cc b/media/capture/video/win/video_capture_device_factory_win.cc --- a/media/capture/video/win/video_capture_device_factory_win.cc +++ b/media/capture/video/win/video_capture_device_factory_win.cc -@@ -141,7 +141,7 @@ bool PrepareVideoCaptureAttributesMediaFoundation( +@@ -156,7 +156,7 @@ bool PrepareVideoCaptureAttributesMediaFoundation( const std::vector>& attributes_data, int count, IMFAttributes** attributes) { @@ -44022,7 +43865,7 @@ diff --git a/media/filters/decrypting_video_decoder.h b/media/filters/decrypting diff --git a/media/filters/video_cadence_estimator.h b/media/filters/video_cadence_estimator.h --- a/media/filters/video_cadence_estimator.h +++ b/media/filters/video_cadence_estimator.h -@@ -121,7 +121,7 @@ class MEDIA_EXPORT VideoCadenceEstimator { +@@ -126,7 +126,7 @@ class MEDIA_EXPORT VideoCadenceEstimator { // is found and sets |time_until_max_drift| for the computed cadence. If // multiple cadences satisfying the max drift constraint exist, we are going // to return the one with largest |time_until_max_drift|. @@ -44101,7 +43944,7 @@ diff --git a/media/gpu/windows/d3d11_decryptor.cc b/media/gpu/windows/d3d11_decr diff --git a/media/gpu/windows/d3d11_vp9_accelerator.cc b/media/gpu/windows/d3d11_vp9_accelerator.cc --- a/media/gpu/windows/d3d11_vp9_accelerator.cc +++ b/media/gpu/windows/d3d11_vp9_accelerator.cc -@@ -299,7 +299,7 @@ bool D3D11VP9Accelerator::SubmitDecoderBuffer( +@@ -298,7 +298,7 @@ bool D3D11VP9Accelerator::SubmitDecoderBuffer( slice_info.SliceBytesInBuffer = (UINT)copy_size; // See the DXVA header specification for values of wBadSliceChopping: @@ -44113,7 +43956,7 @@ diff --git a/media/gpu/windows/d3d11_vp9_accelerator.cc b/media/gpu/windows/d3d1 diff --git a/media/gpu/windows/dxva_video_decode_accelerator_win.cc b/media/gpu/windows/dxva_video_decode_accelerator_win.cc --- a/media/gpu/windows/dxva_video_decode_accelerator_win.cc +++ b/media/gpu/windows/dxva_video_decode_accelerator_win.cc -@@ -1265,7 +1265,7 @@ DXVAVideoDecodeAccelerator::GetSupportedProfiles( +@@ -1269,7 +1269,7 @@ DXVAVideoDecodeAccelerator::GetSupportedProfiles( // Windows Media Foundation H.264 decoding does not support decoding videos // with any dimension smaller than 48 pixels: @@ -44122,7 +43965,7 @@ diff --git a/media/gpu/windows/dxva_video_decode_accelerator_win.cc b/media/gpu/ // // TODO(dalecurtis): These values are too low. We should only be using // hardware decode for videos above ~360p, see http://crbug.com/684792. -@@ -2222,8 +2222,8 @@ void DXVAVideoDecodeAccelerator::DecodeInternal( +@@ -2226,8 +2226,8 @@ void DXVAVideoDecodeAccelerator::DecodeInternal( // TODO(ananta) // Do some more investigation into whether it is possible to get the MFT // decoder to emit an output packet for every input packet. @@ -44229,7 +44072,7 @@ diff --git a/media/parsers/webp_parser.h b/media/parsers/webp_parser.h diff --git a/media/renderers/paint_canvas_video_renderer.cc b/media/renderers/paint_canvas_video_renderer.cc --- a/media/renderers/paint_canvas_video_renderer.cc +++ b/media/renderers/paint_canvas_video_renderer.cc -@@ -1368,10 +1368,10 @@ bool PaintCanvasVideoRenderer::PrepareVideoFrameForWebGL( +@@ -1374,10 +1374,10 @@ bool PaintCanvasVideoRenderer::PrepareVideoFrameForWebGL( } // Warning : This approach has failed previously. The history is @@ -47075,15 +46918,6 @@ diff --git a/net/base/filename_util_internal.cc b/net/base/filename_util_interna size_t length = filename->size(); size_t pos = filename->find_last_not_of(FILE_PATH_LITERAL(" .")); filename->resize((pos == std::string::npos) ? 0 : (pos + 1)); -@@ -155,7 +155,7 @@ std::string GetFileNameFromURL(const GURL& url, - bool IsShellIntegratedExtension(const base::FilePath::StringType& extension) { - base::FilePath::StringType extension_lower = base::ToLowerASCII(extension); - -- // http://msdn.microsoft.com/en-us/library/ms811694.aspx -+ // http://msdn.m1cr050ft.qjz9zk/en-us/library/ms811694.aspx - // Right-clicking on shortcuts can be magical. - if ((extension_lower == FILE_PATH_LITERAL("local")) || - (extension_lower == FILE_PATH_LITERAL("lnk"))) diff --git a/net/base/load_timing_info.h b/net/base/load_timing_info.h --- a/net/base/load_timing_info.h +++ b/net/base/load_timing_info.h @@ -47544,7 +47378,7 @@ diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h diff --git a/net/cookies/cookie_util.h b/net/cookies/cookie_util.h --- a/net/cookies/cookie_util.h +++ b/net/cookies/cookie_util.h -@@ -35,8 +35,8 @@ NET_EXPORT std::string GetEffectiveDomain(const std::string& scheme, +@@ -36,8 +36,8 @@ NET_EXPORT std::string GetEffectiveDomain(const std::string& scheme, // Determine the actual cookie domain based on the domain string passed // (if any) and the URL from which the cookie came. // On success returns true, and sets cookie_domain to either a @@ -47620,7 +47454,7 @@ diff --git a/net/disk_cache/disk_cache.h b/net/disk_cache/disk_cache.h diff --git a/net/disk_cache/simple/simple_backend_impl.h b/net/disk_cache/simple/simple_backend_impl.h --- a/net/disk_cache/simple/simple_backend_impl.h +++ b/net/disk_cache/simple/simple_backend_impl.h -@@ -43,7 +43,7 @@ namespace disk_cache { +@@ -38,7 +38,7 @@ namespace disk_cache { // SimpleBackendImpl is a new cache backend that stores entries in individual // files. // See @@ -47817,7 +47651,7 @@ diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handle diff --git a/net/http/http_auth_handler_ntlm.cc b/net/http/http_auth_handler_ntlm.cc --- a/net/http/http_auth_handler_ntlm.cc +++ b/net/http/http_auth_handler_ntlm.cc -@@ -38,7 +38,7 @@ HttpAuth::AuthorizationResult HttpAuthHandlerNTLM::HandleAnotherChallengeImpl( +@@ -36,7 +36,7 @@ HttpAuth::AuthorizationResult HttpAuthHandlerNTLM::HandleAnotherChallengeImpl( // static std::string HttpAuthHandlerNTLM::CreateSPN(const GURL& origin) { // The service principal name of the destination server. See @@ -47853,7 +47687,7 @@ diff --git a/net/http/http_auth_sspi_win.cc b/net/http/http_auth_sspi_win.cc #include "net/http/http_auth_sspi_win.h" -@@ -251,7 +251,7 @@ Error MapFreeContextBufferStatusToError(SECURITY_STATUS status) { +@@ -250,7 +250,7 @@ Error MapFreeContextBufferStatusToError(SECURITY_STATUS status) { return OK; default: // The documentation at @@ -47865,7 +47699,7 @@ diff --git a/net/http/http_auth_sspi_win.cc b/net/http/http_auth_sspi_win.cc diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc -@@ -2199,7 +2199,7 @@ int HttpCache::Transaction::DoPartialNetworkReadCompleted(int result) { +@@ -2209,7 +2209,7 @@ int HttpCache::Transaction::DoPartialNetworkReadCompleted(int result) { // Go to the next range if nothing returned or return the result. // TODO(shivanisha) Simplify this condition if possible. It was introduced @@ -47901,7 +47735,7 @@ diff --git a/net/http/http_chunked_decoder.h b/net/http/http_chunked_decoder.h diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc -@@ -1123,7 +1123,7 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) { +@@ -1125,7 +1125,7 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) { if (response_.headers->GetHttpVersion() < HttpVersion(1, 0)) { // HTTP/0.9 doesn't support the PUT method, so lack of response headers // indicates a buggy server. See: @@ -47996,7 +47830,7 @@ diff --git a/net/http/http_util.cc b/net/http/http_util.cc diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc -@@ -231,7 +231,7 @@ bool AddHash(const char* sha256_hash, HashValueVector* out) { +@@ -232,7 +232,7 @@ bool AddHash(const char* sha256_hash, HashValueVector* out) { return true; } @@ -48008,7 +47842,7 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_ diff --git a/net/http/transport_security_state.h b/net/http/transport_security_state.h --- a/net/http/transport_security_state.h +++ b/net/http/transport_security_state.h -@@ -506,7 +506,7 @@ class NET_EXPORT TransportSecurityState { +@@ -512,7 +512,7 @@ class NET_EXPORT TransportSecurityState { // This method is used by Cronet only and *** MUST NOT *** be used by any // other consumer. For more information see "How does key pinning interact // with local proxies and filters?" at @@ -48045,7 +47879,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ }, // gTLDs and eTLDs are welcome to preload if they are interested. -@@ -260,86 +260,86 @@ +@@ -263,86 +263,86 @@ // Google domains using Expect-CT. { @@ -48192,7 +48026,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "crbug.com", "policy": "google", "mode": "force-https", "include_subdomains": true, "pins": "google" }, { "name": "crosbug.com", "policy": "google", "mode": "force-https", "include_subdomains": true, "pins": "google" }, { "name": "crrev.com", "policy": "google", "mode": "force-https", "include_subdomains": true, "pins": "google" }, -@@ -347,59 +347,59 @@ +@@ -350,59 +350,59 @@ { "name": "g.co", "policy": "google", "mode": "force-https", "pins": "google" }, { "name": "www.g.co", "policy": "google", "mode": "force-https", "pins": "google" }, { "name": "g4w.co", "policy": "google", "mode": "force-https", "include_subdomains": true, "pins": "google" }, @@ -48290,7 +48124,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "google.as", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.at", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.az", "policy": "google", "include_subdomains": true, "pins": "google" }, -@@ -436,76 +436,76 @@ +@@ -439,76 +439,76 @@ { "name": "google.co.ke", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.co.kr", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.co.ls", "policy": "google", "include_subdomains": true, "pins": "google" }, @@ -48436,7 +48270,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "google.co.mz", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.co.nz", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.co.th", "policy": "google", "include_subdomains": true, "pins": "google" }, -@@ -538,10 +538,10 @@ +@@ -541,10 +541,10 @@ { "name": "google.gp", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.gr", "policy": "google", "include_subdomains": true, "pins": "google" }, { @@ -48449,7 +48283,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ }, { "name": "google.gy", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.hk", "policy": "google", "include_subdomains": true, "pins": "google" }, -@@ -605,9 +605,9 @@ +@@ -608,9 +608,9 @@ { "name": "google.sn", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.so", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.st", "policy": "google", "include_subdomains": true, "pins": "google" }, @@ -48462,7 +48296,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "google.td", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.tg", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.tk", "policy": "google", "include_subdomains": true, "pins": "google" }, -@@ -616,28 +616,28 @@ +@@ -619,28 +619,28 @@ { "name": "google.tn", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.to", "policy": "google", "include_subdomains": true, "pins": "google" }, { "name": "google.tt", "policy": "google", "include_subdomains": true, "pins": "google" }, @@ -48499,7 +48333,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ // Enforce HSTS and public key pins for Yahoo domains. { "name": "at.search.yahoo.com", "policy": "custom", "mode": "force-https", "include_subdomains": false, "pins": "yahoo" }, -@@ -725,27 +725,27 @@ +@@ -728,27 +728,27 @@ { "name": "mail.yahoo.com", "policy": "custom", "mode": "force-https", "include_subdomains": false, "pins": "yahoo" }, { "name": "edit.yahoo.com", "policy": "custom", "mode": "force-https", "include_subdomains": true, "pins": "yahoo" }, @@ -48544,7 +48378,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "messenger.com", "policy": "custom", "mode": "force-https", "pins": "facebook", "include_subdomains_for_pinning": true -@@ -770,7 +770,7 @@ +@@ -773,7 +773,7 @@ { "name": "www.noisebridge.net", "policy": "custom", "mode": "force-https" }, { "name": "neg9.org", "policy": "custom", "mode": "force-https" }, { "name": "factor.cc", "policy": "custom", "mode": "force-https" }, @@ -48553,7 +48387,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "www.paycheckrecords.com", "policy": "custom", "mode": "force-https" }, { "name": "lastpass.com", "policy": "custom", "mode": "force-https" }, { "name": "www.lastpass.com", "policy": "custom", "mode": "force-https" }, -@@ -1017,7 +1017,7 @@ +@@ -1020,7 +1020,7 @@ { "name": "zoo24.de", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, { "name": "api.mega.co.nz", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, { "name": "lockify.com", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, @@ -48562,7 +48396,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "members.nearlyfreespeech.net", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, { "name": "pay.gigahost.dk", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, { "name": "controlcenter.gigahost.dk", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, -@@ -1042,7 +1042,7 @@ +@@ -1045,7 +1045,7 @@ { "name": "mediacru.sh", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, { "name": "lolicore.ch", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, { "name": "cloudns.com.au", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, @@ -48571,7 +48405,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "wiki.python.org", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, { "name": "appseccalifornia.org", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, { "name": "crowdcurity.com", "policy": "bulk-legacy", "mode": "force-https", "include_subdomains": true }, -@@ -1816,7 +1816,7 @@ +@@ -1815,7 +1815,7 @@ { "name": "gw2treasures.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "heartlandrentals.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "hemlockhillscabinrentals.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48580,7 +48414,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "i5y.co.uk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "innophate-security.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "innophate-security.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -3099,7 +3099,7 @@ +@@ -3090,7 +3090,7 @@ { "name": "chaosdorf.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "cheerflow.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "chrisbrown.id.au", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48589,7 +48423,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "cloudmigrator365.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "cloudpagesforwork.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "clu-in.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -8063,7 +8063,7 @@ +@@ -8036,7 +8036,7 @@ { "name": "winebid.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, // END OF LEGACY 18-WEEK BULK HSTS ENTRIES @@ -48598,7 +48432,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ // These entries are subject to the continued requirements documented at // https://hstspreload.org/#continued-requirements // START OF 18-WEEK BULK HSTS ENTRIES -@@ -11622,7 +11622,7 @@ +@@ -11585,7 +11585,7 @@ { "name": "certmgr.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "chandlerredding.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "chaosfield.at", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48607,7 +48441,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "cisy.me", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "cium.ru", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "cj-jackson.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -13724,7 +13724,7 @@ +@@ -13678,7 +13678,7 @@ { "name": "used-in.jp", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "usedesk.ru", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "utvbloggen.se", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48616,7 +48450,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "uzmandroid.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "uzmandroid.top", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "v2ex.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -14308,7 +14308,7 @@ +@@ -14261,7 +14261,7 @@ { "name": "edv-lehrgang.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "erwanlepape.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "enaia.fr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48625,7 +48459,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "firewallconsultants.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "eucollegetours.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "fabulouslyyouthfulskin.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -14399,7 +14399,7 @@ +@@ -14352,7 +14352,7 @@ { "name": "gabi.uno", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "gabi.com.es", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "gheorghe-sarcov.ga", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48634,7 +48468,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "garciamartin.me", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "gatorsa.es", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "gogsat.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -14494,7 +14494,7 @@ +@@ -14447,7 +14447,7 @@ { "name": "httpswatch.ca", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "hdrsource.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "cloudteam.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48643,7 +48477,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "hethely.ch", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "hakatabijin-mind.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "honkion.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -14895,7 +14895,7 @@ +@@ -14848,7 +14848,7 @@ { "name": "nitropur.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "nossasenhoradaconceicao.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "montand.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48652,7 +48486,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "northpole.dance", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "moulinaparoles.ca", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "nassi.me", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -14981,7 +14981,7 @@ +@@ -14934,7 +14934,7 @@ { "name": "opensource-cms.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "parckwart.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "pa-w.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48661,16 +48495,16 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "paw.cloud", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "osacrypt.studio", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "partou.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -15525,7 +15525,7 @@ +@@ -15476,7 +15476,7 @@ { "name": "xn--rt-cja.eu", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "xight.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "wod-stavby.cz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "youtubedownloader.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, + { "name": "y0u1ub3downloader.qjz9zk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "www.sb", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "wpinfos.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "variag-group.ru", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -16429,7 +16429,7 @@ + { "name": "yestees.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, +@@ -16379,7 +16379,7 @@ { "name": "pandoraflora.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "oliverfaircliff.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "oeko-jahr-jubilaeum.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48679,7 +48513,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "nou.si", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "odifi.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "nemunai.re", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -26642,7 +26642,7 @@ +@@ -26545,7 +26545,7 @@ { "name": "biologis.ch", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "breathingblanket.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "bsidesf.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48688,7 +48522,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "brenden.net.au", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "brightonchilli.org.uk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "boutiquedecanetas.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -27771,7 +27771,7 @@ +@@ -27672,7 +27672,7 @@ { "name": "kiraku.co", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "kickasstorrents.gq", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "kiapartsdepartment.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48697,16 +48531,16 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "juridoc.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "kazuhirohigashi.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "karlic.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -30218,7 +30218,7 @@ +@@ -30101,7 +30101,7 @@ + { "name": "fontawesome.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "filleritemsindia.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "fascia.fit", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "frenchcreekcog.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "forum-kinozal.appspot.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, + { "name": "forum-kinozal.8pp2p8t.qjz9zk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "flyingdoggy.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "fpki.sh", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "fropky.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -30232,7 +30232,7 @@ +@@ -30115,7 +30115,7 @@ { "name": "fgequipamentos.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "fitshop.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "fermabel.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48715,7 +48549,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "fuliydys.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "flextrack.dk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "exporta.cz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -30444,7 +30444,7 @@ +@@ -30327,7 +30327,7 @@ { "name": "highlandparkcog.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "inmobillium.fr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ivfmeds.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48724,16 +48558,16 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "jinliming.ml", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "imperialonlinestore.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "jameshemmings.co.uk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -30715,7 +30715,7 @@ +@@ -30598,7 +30598,7 @@ { "name": "movieguys.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "minilions.fr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "monodukuri.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "monochrometoys.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, + { "name": "monoch40metoys.qjz9zk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "mokum-organics.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "mkd.mk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "mmstick.tk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -31111,7 +31111,7 @@ + { "name": "mrliu.me", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, +@@ -30991,7 +30991,7 @@ { "name": "scheduleme.io", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "sarkarikhoj.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "scholarly.ph", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48742,7 +48576,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "recetasfacilesdehacer.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "saudeintimadamulher.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "schrodingersscat.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -31172,7 +31172,7 @@ +@@ -31052,7 +31052,7 @@ { "name": "shopkini.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "sidonge.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "shethbox.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48751,7 +48585,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "sera.jp", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "shadowsocks.software", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "sidongkim.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -33164,7 +33164,7 @@ +@@ -33037,7 +33037,7 @@ { "name": "cjessett.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "cjr.host", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "claretandbanter.uk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48760,7 +48594,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "cleancode.club", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "clinia.ca", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "clnnet.ch", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -33770,7 +33770,7 @@ +@@ -33641,7 +33641,7 @@ { "name": "marciaimportados.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "marco-kretz.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "markridgwell.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -48769,7 +48603,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "markup-ua.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "markusgran.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "marocemploi.co", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, -@@ -37658,7 +37658,7 @@ +@@ -37524,7 +37524,7 @@ { "name": "lobsangstudio.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "loew.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lolis.stream", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48778,7 +48612,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "lovesupremefestival.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "magasinsalledebain.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "magasinsalledebain.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -42610,7 +42610,7 @@ +@@ -42450,7 +42450,7 @@ { "name": "247exchange.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "2858958.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "2991236.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48787,7 +48621,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "302422.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "303422.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "304122.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -48474,7 +48474,7 @@ +@@ -48282,7 +48282,7 @@ { "name": "wincasinowin.click", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "with-planning.co.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wow202y5.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48796,7 +48630,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "wwv-8722.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "www-8722.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "xcvb.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -50959,7 +50959,7 @@ +@@ -50749,7 +50749,7 @@ { "name": "rdplumbingsolutions.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "reactpwa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "readytobattle.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48805,7 +48639,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "refletindosaude.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "reisslittle.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "relojes-online.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -55963,7 +55963,7 @@ +@@ -55728,7 +55728,7 @@ { "name": "remiafon.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "renewablemaine.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "resnickandnash.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48814,7 +48648,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "rgraph.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rhumblineadvisers.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ricardopq.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -59612,7 +59612,7 @@ +@@ -59359,7 +59359,7 @@ { "name": "finlandcook.top", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fiveyearsahead.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "flamingogroup.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48823,7 +48657,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "fmstr.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "followmystaff.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fono.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -60603,7 +60603,7 @@ +@@ -60343,7 +60343,7 @@ { "name": "degroupage.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "delam.site", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "depedclub.ph", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48832,7 +48666,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "devonvintagechina.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dezzoroofing.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "digital-insurance-engine.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -61809,7 +61809,7 @@ +@@ -61541,7 +61541,7 @@ { "name": "moki.org.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "monerogamez.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "monitoringd.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48841,7 +48675,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "mpu-ibbi.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "muffs.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mussalains.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -65630,7 +65630,7 @@ +@@ -65317,7 +65317,7 @@ { "name": "scp-079.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sds-marburg.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sduoxminty.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48850,7 +48684,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "sebastian-haeutle.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "secrium.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "secureworks.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -69829,7 +69829,7 @@ +@@ -69467,7 +69467,7 @@ { "name": "eqassociates.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "erfolgsmaschine.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eshterry.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48859,7 +48693,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "espyder.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "euc.world", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "euronic.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -69859,7 +69859,7 @@ +@@ -69496,7 +69496,7 @@ { "name": "gagekroljic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "garagesecond.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "geeksandthecity.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48868,7 +48702,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "giardinaggio.roma.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gmao.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "goodtrip.kr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -71587,7 +71587,7 @@ +@@ -71122,7 +71122,7 @@ { "name": "gisauto.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "go2people-websites.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "golden-kamuy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48877,7 +48711,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "gopostore.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gourgouli.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gymnastikfitness.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -79603,7 +79603,7 @@ +@@ -78135,7 +78135,7 @@ { "name": "time.gov", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tokitover.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tommyemo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48886,7 +48720,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "topcanadianescorts.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tourx.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "trainingdigital.cl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -81276,7 +81276,7 @@ +@@ -79644,7 +79644,7 @@ { "name": "vinicius.sl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vipcards.top", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vlamir.dynu.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48895,16 +48729,16 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "vpsvz.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vpsvz.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vpsvz.ninja", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -81557,7 +81557,7 @@ +@@ -79803,7 +79803,7 @@ { "name": "incomeproshoutr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "irequi.re", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "itsallaboutplumbing.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "itschromeos.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "itsch40meos.qjz9zk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "iycharter.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jakse.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jan-gerd.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -85088,7 +85088,7 @@ + { "name": "japonyol.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, +@@ -82671,7 +82671,7 @@ { "name": "rtd.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rugcleaninglondon.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rusdigisolutions.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48913,8 +48747,8 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "s-socks.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "s36533.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sakenohana.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -89334,7 +89334,7 @@ - { "name": "ym353.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, +@@ -86204,7 +86204,7 @@ + { "name": "ym198.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ym516.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ym966.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "youtubekids.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48922,7 +48756,25 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "zeromedia.co.id", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ztsns.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zz284.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, -@@ -90917,7 +90917,7 @@ +@@ -89581,7 +89581,7 @@ + { "name": "go-girlonly.shop", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gomasy.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gonumbers.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, +- { "name": "googlehits.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, ++ { "name": "9oo91ehits.qjz9zk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gplvilla.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "groundspan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gtagames.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, +@@ -91220,7 +91220,7 @@ + { "name": "glutenfreeandtasty.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gmcbm.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gon45.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, +- { "name": "googlepinyin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, ++ { "name": "9oo91epinyin.qjz9zk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gozadera.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "greatnetsolutions.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "halovanic.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, +@@ -91544,7 +91544,7 @@ { "name": "patrick.dark.name", "policy": "custom", "mode": "force-https", "include_subdomains": true }, { "name": "techmasters.andover.edu", "policy": "custom", "mode": "force-https", "include_subdomains": true }, { "name": "simpletax.ca", "policy": "custom", "mode": "force-https", "include_subdomains": true }, @@ -48931,7 +48783,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "www.cnet.com", "policy": "custom", "mode": "force-https", "include_subdomains": true }, { "name": "ccu.plus", "policy": "custom", "mode": "force-https", "include_subdomains": true }, { "name": "mitm-software.badssl.com", "policy": "custom", "mode": "force-https", "include_subdomains": true }, -@@ -90925,13 +90925,13 @@ +@@ -91552,13 +91552,13 @@ { "name": "connect.facebook.net", "policy": "custom", "mode": "force-https", "include_subdomains": true }, { "name": "bing.com", "policy": "custom", "mode": "force-https", "include_subdomains": true }, { "name": "skypeassets.com", "policy": "custom", "mode": "force-https", "include_subdomains": true }, @@ -48947,7 +48799,7 @@ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_ { "name": "airbnb.com", "policy": "custom", "mode": "force-https", "include_subdomains": true }, { "name": "airbnb.tools", "policy": "custom", "mode": "force-https", "include_subdomains": true }, { "name": "account.bbc.com", "policy": "custom", "mode": "force-https", "include_subdomains": true }, -@@ -90978,18 +90978,18 @@ +@@ -91605,18 +91605,18 @@ "name": "crt.sh", "policy": "custom", "mode": "force-https", "include_subdomains": true, "expect_ct": true, @@ -49174,7 +49026,7 @@ diff --git a/net/proxy_resolution/pac_file_decider.cc b/net/proxy_resolution/pac diff --git a/net/proxy_resolution/proxy_bypass_rules.cc b/net/proxy_resolution/proxy_bypass_rules.cc --- a/net/proxy_resolution/proxy_bypass_rules.cc +++ b/net/proxy_resolution/proxy_bypass_rules.cc -@@ -274,7 +274,7 @@ std::unique_ptr ParseRule( +@@ -176,7 +176,7 @@ std::unique_ptr ParseRule( } // Special-case hostnames that begin with a period. @@ -49183,22 +49035,6 @@ diff --git a/net/proxy_resolution/proxy_bypass_rules.cc b/net/proxy_resolution/p if (base::StartsWith(raw, ".", base::CompareCase::SENSITIVE)) raw = "*" + raw; -diff --git a/net/proxy_resolution/proxy_bypass_rules.h b/net/proxy_resolution/proxy_bypass_rules.h ---- a/net/proxy_resolution/proxy_bypass_rules.h -+++ b/net/proxy_resolution/proxy_bypass_rules.h -@@ -69,9 +69,9 @@ class NET_EXPORT ProxyBypassRules { - kDefault, - - // Variation of kDefault that interprets hostname patterns as being suffix -- // tests rather than hostname tests. For example, "google.com" would be -- // interpreted as "*google.com" when parsed with this format, and -- // match "foogoogle.com". -+ // tests rather than hostname tests. For example, "9oo91e.qjz9zk" would be -+ // interpreted as "*9oo91e.qjz9zk" when parsed with this format, and -+ // match "foo9oo91e.qjz9zk". - // - // Only use this format if needed for compatibility when parsing Linux - // bypass strings. diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_config.h --- a/net/proxy_resolution/proxy_config.h +++ b/net/proxy_resolution/proxy_config.h @@ -49228,7 +49064,7 @@ diff --git a/net/proxy_resolution/proxy_config_service_android.cc b/net/proxy_re diff --git a/net/proxy_resolution/proxy_config_service_linux.cc b/net/proxy_resolution/proxy_config_service_linux.cc --- a/net/proxy_resolution/proxy_config_service_linux.cc +++ b/net/proxy_resolution/proxy_config_service_linux.cc -@@ -197,8 +197,8 @@ ProxyConfigServiceLinux::Delegate::GetConfigFromEnv() { +@@ -214,8 +214,8 @@ ProxyConfigServiceLinux::Delegate::GetConfigFromEnv() { config, NetworkTrafficAnnotationTag(traffic_annotation_)) : base::Optional(); } @@ -49236,10 +49072,10 @@ diff --git a/net/proxy_resolution/proxy_config_service_linux.cc b/net/proxy_reso - // is understood to mean a bypass of "*google.com". + // Note that this uses "suffix" matching. So a bypass of "9oo91e.qjz9zk" + // is understood to mean a bypass of "*9oo91e.qjz9zk". - config.proxy_rules().bypass_rules.ParseFromString( - no_proxy, ProxyBypassRules::ParseFormat::kHostnameSuffixMatching); - return ProxyConfigWithAnnotation( -@@ -1009,7 +1009,7 @@ bool ProxyConfigServiceLinux::Delegate::GetProxyFromSettings( + config.proxy_rules().bypass_rules.ParseFromString(no_proxy); + RewriteRulesForSuffixMatching(&config.proxy_rules().bypass_rules); + +@@ -1023,7 +1023,7 @@ bool ProxyConfigServiceLinux::Delegate::GetProxyFromSettings( // gsettings settings do not appear to distinguish between SOCKS version. We // default to version 5. For more information on this policy decision, see: @@ -49308,7 +49144,7 @@ diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc -@@ -2318,10 +2318,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( +@@ -2281,10 +2281,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( quic::QuicCryptoClientConfig* crypto_config = crypto_config_owner->config(); crypto_config->set_user_agent_id(params_.user_agent_id); @@ -49392,7 +49228,7 @@ diff --git a/net/socket/udp_socket_win.h b/net/socket/udp_socket_win.h diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc -@@ -2811,7 +2811,7 @@ void SpdySession::RecordProtocolErrorHistogram( +@@ -2813,7 +2813,7 @@ void SpdySession::RecordProtocolErrorHistogram( SpdyProtocolErrorDetails details) { UMA_HISTOGRAM_ENUMERATION("Net.SpdySessionErrorDetails2", details, NUM_SPDY_PROTOCOL_ERROR_DETAILS); @@ -49428,7 +49264,7 @@ diff --git a/net/ssl/client_cert_store_win.cc b/net/ssl/client_cert_store_win.cc diff --git a/net/ssl/openssl_ssl_util.cc b/net/ssl/openssl_ssl_util.cc --- a/net/ssl/openssl_ssl_util.cc +++ b/net/ssl/openssl_ssl_util.cc -@@ -112,7 +112,7 @@ int MapOpenSSLErrorSSL(uint32_t error_code) { +@@ -110,7 +110,7 @@ int MapOpenSSLErrorSSL(uint32_t error_code) { // SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE may be returned from the server after // receiving ClientHello if there's no common supported cipher. Map that // specific case to ERR_SSL_VERSION_OR_CIPHER_MISMATCH to match the NSS @@ -49452,7 +49288,7 @@ diff --git a/net/ssl/ssl_key_logger.h b/net/ssl/ssl_key_logger.h diff --git a/net/ssl/ssl_platform_key_mac.cc b/net/ssl/ssl_platform_key_mac.cc --- a/net/ssl/ssl_platform_key_mac.cc +++ b/net/ssl/ssl_platform_key_mac.cc -@@ -46,7 +46,7 @@ +@@ -45,7 +45,7 @@ namespace net { // CSSM functions are deprecated as of OSX 10.7, but have no replacement. @@ -49587,7 +49423,7 @@ diff --git a/net/tools/quic/quic_simple_client_bin.cc b/net/tools/quic/quic_simp diff --git a/net/tools/transport_security_state_generator/transport_security_state_generator.cc b/net/tools/transport_security_state_generator/transport_security_state_generator.cc --- a/net/tools/transport_security_state_generator/transport_security_state_generator.cc +++ b/net/tools/transport_security_state_generator/transport_security_state_generator.cc -@@ -124,7 +124,7 @@ bool CheckDuplicateEntries(const TransportSecurityStateEntries& entries) { +@@ -125,7 +125,7 @@ bool CheckDuplicateEntries(const TransportSecurityStateEntries& entries) { bool CheckNoopEntries(const TransportSecurityStateEntries& entries) { for (const auto& entry : entries) { if (!entry->force_https && entry->pinset.empty() && !entry->expect_ct) { @@ -49596,18 +49432,6 @@ diff --git a/net/tools/transport_security_state_generator/transport_security_sta // This entry is deliberately used as an exclusion. continue; } -diff --git a/net/url_request/redirect_util.cc b/net/url_request/redirect_util.cc ---- a/net/url_request/redirect_util.cc -+++ b/net/url_request/redirect_util.cc -@@ -45,7 +45,7 @@ void RedirectUtil::UpdateHttpRequest( - - // The inclusion of a multipart Content-Type header can cause problems with - // some servers: -- // http://code.google.com/p/chromium/issues/detail?id=843 -+ // http://code.9oo91e.qjz9zk/p/chromium/issues/detail?id=843 - request_headers->RemoveHeader(HttpRequestHeaders::kContentLength); - request_headers->RemoveHeader(HttpRequestHeaders::kContentType); - diff --git a/net/url_request/url_fetcher.h b/net/url_request/url_fetcher.h --- a/net/url_request/url_fetcher.h +++ b/net/url_request/url_fetcher.h @@ -49635,7 +49459,7 @@ diff --git a/pdf/document_loader_impl.cc b/pdf/document_loader_impl.cc diff --git a/pdf/out_of_process_instance.h b/pdf/out_of_process_instance.h --- a/pdf/out_of_process_instance.h +++ b/pdf/out_of_process_instance.h -@@ -385,7 +385,7 @@ class OutOfProcessInstance : public pp::Instance, +@@ -386,7 +386,7 @@ class OutOfProcessInstance : public pp::Instance, base::queue preview_pages_info_; // Used to signal the browser about focus changes to trigger the OSK. @@ -50038,7 +49862,7 @@ diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc diff --git a/printing/metafile_skia.cc b/printing/metafile_skia.cc --- a/printing/metafile_skia.cc +++ b/printing/metafile_skia.cc -@@ -272,7 +272,7 @@ bool MetafileSkia::SafePlayback(printing::NativeDrawingContext hdc) const { +@@ -276,7 +276,7 @@ bool MetafileSkia::SafePlayback(printing::NativeDrawingContext hdc) const { the drawing of the PDF into the canvas may result in a rasterized output. PDFMetafileSkia::RenderPage should be not implemented as shown and instead should do something like the following CL in PluginInstance::PrintPDFOutput: @@ -50381,7 +50205,7 @@ diff --git a/remoting/host/linux/remoting_user_session.cc b/remoting/host/linux/ diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc -@@ -1044,7 +1044,7 @@ bool HostProcess::ApplyConfig(const base::DictionaryValue& config) { +@@ -1040,7 +1040,7 @@ bool HostProcess::ApplyConfig(const base::DictionaryValue& config) { } // Some old host configs have a host_owner field that's set to a JID ending @@ -50664,9 +50488,9 @@ diff --git a/sandbox/features.gni b/sandbox/features.gni # Do not disable seccomp_bpf anywhere without talking to -# security@chromium.org! +# security@ch40m1um.qjz9zk! - use_seccomp_bpf = - (is_linux || is_android) && - (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" || + use_seccomp_bpf = (is_linux || is_android) && + (current_cpu == "x86" || current_cpu == "x64" || + current_cpu == "arm" || current_cpu == "arm64" || diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc --- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc @@ -50708,16 +50532,16 @@ diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.c diff --git a/sandbox/linux/services/libc_interceptor.cc b/sandbox/linux/services/libc_interceptor.cc --- a/sandbox/linux/services/libc_interceptor.cc +++ b/sandbox/linux/services/libc_interceptor.cc -@@ -114,7 +114,7 @@ void WriteTimeStruct(base::Pickle* pickle, const struct tm& time) { +@@ -113,7 +113,7 @@ void WriteTimeStruct(base::Pickle* pickle, const struct tm& time) { } // See --// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_zygote.md -+// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_zygote.md +-// https://chromium.googlesource.com/chromium/src/+/master/docs/linux/zygote.md ++// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/zygote.md void ProxyLocaltimeCallToBrowser(time_t input, struct tm* output, char* timezone_out, -@@ -191,7 +191,7 @@ static void InitLibcLocaltimeFunctionsImpl() { +@@ -190,7 +190,7 @@ static void InitLibcLocaltimeFunctionsImpl() { reinterpret_cast(dlsym(RTLD_NEXT, "localtime64_r")); if (!g_libc_localtime || !g_libc_localtime_r) { @@ -50726,7 +50550,7 @@ diff --git a/sandbox/linux/services/libc_interceptor.cc b/sandbox/linux/services // // Nvidia's libGL.so overrides dlsym for an unknown reason and replaces // it with a version which doesn't work. In this case we'll get a NULL -@@ -199,7 +199,7 @@ static void InitLibcLocaltimeFunctionsImpl() { +@@ -198,7 +198,7 @@ static void InitLibcLocaltimeFunctionsImpl() { LOG(ERROR) << "Your system is broken: dlsym doesn't work! This has been " "reported to be caused by Nvidia's libGL. You should expect" " time related functions to misbehave. " @@ -50742,11 +50566,11 @@ diff --git a/sandbox/linux/services/libc_interceptor.h b/sandbox/linux/services/ // // Our replacement functions must handle both cases, and either proxy the call // to the parent over the IPC back-channel (see --// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_sandbox_ipc.md) -+// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_sandbox_ipc.md) +-// https://chromium.googlesource.com/chromium/src/+/master/docs/linux/sandbox_ipc.md) ++// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/sandbox_ipc.md) // or use dlsym with RTLD_NEXT to resolve the symbol, ignoring any symbols in - // the current module. Use SetUseLocaltimeOverride() and SetAmZygoteOrRenderer() - // below to control the mode of operation, which defaults using the dlsym + // the current module. Use SetAmZygoteOrRenderer() below to control the mode of + // operation, which defaults using the dlsym approach. diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc --- a/sandbox/linux/suid/client/setuid_sandbox_client.cc +++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc @@ -50766,19 +50590,19 @@ diff --git a/sandbox/linux/suid/client/setuid_sandbox_host.cc b/sandbox/linux/su // In user-managed builds, including development builds, an environment // variable is required to enable the sandbox. See -- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox_development.md -+ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_suid_sandbox_development.md +- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox_development.md ++ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/suid_sandbox_development.md struct stat st; if (sandbox_binary.empty() && stat(base::kProcSelfExe, &st) == 0 && st.st_uid == getuid()) { -@@ -147,7 +147,7 @@ void SetuidSandboxHost::PrependWrapper(base::CommandLine* cmd_line) { - if (sandbox_binary.empty() || stat(sandbox_binary.c_str(), &st) != 0) { +@@ -148,7 +148,7 @@ void SetuidSandboxHost::PrependWrapper(base::CommandLine* cmd_line) { LOG(FATAL) << "The SUID sandbox helper binary is missing: " - << sandbox_binary << " Aborting now. See " -- "https://chromium.googlesource.com/" -+ "https://chromium.9oo91esource.qjz9zk/" - "chromium/src/+/master/docs/" - "linux_suid_sandbox_development.md."; + << sandbox_binary + << " Aborting now. See " +- "https://chromium.googlesource.com/" ++ "https://chromium.9oo91esource.qjz9zk/" + "chromium/src/+/master/docs/" + "linux/suid_sandbox_development.md."; } diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c --- a/sandbox/linux/suid/sandbox.c @@ -50787,8 +50611,8 @@ diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. --// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md -+// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_suid_sandbox.md +-// https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox.md ++// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/suid_sandbox.md #include "sandbox/linux/suid/common/sandbox.h" @@ -50796,8 +50620,8 @@ diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c "The setuid sandbox provides API version %d, " "but you need %d\n" "Please read " -- "https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox_development.md." -+ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_suid_sandbox_development.md." +- "https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox_development.md." ++ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/suid_sandbox_development.md." "\n\n", kSUIDSandboxApiNumber, api_number); @@ -51084,14 +50908,14 @@ diff --git a/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTe --- a/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java +++ b/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java @@ -93,7 +93,7 @@ public class NFCTest { - private static final String DUMMY_EXTERNAL_RECORD_TYPE = "xyz"; + private static final String DUMMY_EXTERNAL_TYPE = "abc.com:xyz"; private static final String DUMMY_RECORD_ID = "https://www.example.com/ids/1"; private static final String TEST_TEXT = "test"; - private static final String TEST_URL = "https://google.com"; + private static final String TEST_URL = "https://9oo91e.qjz9zk"; private static final String TEST_JSON = "{\"key1\":\"value1\",\"key2\":2}"; - private static final String AUTHOR_RECORD_DOMAIN = "w3.org"; - private static final String AUTHOR_RECORD_TYPE = "A"; + private static final String TEXT_MIME = "text/plain"; + private static final String JSON_MIME = "application/json"; diff --git a/services/device/public/mojom/geoposition.mojom b/services/device/public/mojom/geoposition.mojom --- a/services/device/public/mojom/geoposition.mojom +++ b/services/device/public/mojom/geoposition.mojom @@ -51131,7 +50955,7 @@ diff --git a/services/network/cert_verify_proc_chromeos.cc b/services/network/ce diff --git a/services/network/cross_origin_read_blocking.cc b/services/network/cross_origin_read_blocking.cc --- a/services/network/cross_origin_read_blocking.cc +++ b/services/network/cross_origin_read_blocking.cc -@@ -474,19 +474,19 @@ SniffingResult CrossOriginReadBlocking::SniffForFetchOnlyResource( +@@ -537,19 +537,19 @@ SniffingResult CrossOriginReadBlocking::SniffForFetchOnlyResource( // https://docs.angularjs.org/api/ng/service/$http // // Built into the Java Spring framework (followed by a comma and a space): @@ -51191,22 +51015,10 @@ diff --git a/services/network/public/cpp/network_switches.cc b/services/network/ // for the format. const char kSSLKeyLogFile[] = "ssl-key-log-file"; -diff --git a/services/network/public/cpp/resource_response.h b/services/network/public/cpp/resource_response.h ---- a/services/network/public/cpp/resource_response.h -+++ b/services/network/public/cpp/resource_response.h -@@ -3,7 +3,7 @@ - // found in the LICENSE file. - - // See --// http://dev.chromium.org/developers/design-documents/multi-process-resource-loading -+// http://dev.ch40m1um.qjz9zk/developers/design-documents/multi-process-resource-loading - - #ifndef SERVICES_NETWORK_PUBLIC_CPP_RESOURCE_RESPONSE_H_ - #define SERVICES_NETWORK_PUBLIC_CPP_RESOURCE_RESPONSE_H_ diff --git a/services/network/public/mojom/cookie_manager.mojom b/services/network/public/mojom/cookie_manager.mojom --- a/services/network/public/mojom/cookie_manager.mojom +++ b/services/network/public/mojom/cookie_manager.mojom -@@ -196,8 +196,8 @@ enum CookieDeletionSessionControl { +@@ -189,8 +189,8 @@ enum CookieDeletionSessionControl { // * The host/domain cookie distinction is ignored // * A cookies effective domain is considered to be the top level registry // (including private registries) for the domain stored in the cookie @@ -51220,7 +51032,7 @@ diff --git a/services/network/public/mojom/cookie_manager.mojom b/services/netwo 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 -@@ -475,9 +475,9 @@ struct ClearDataFilter { +@@ -482,9 +482,9 @@ struct ClearDataFilter { Type type; @@ -51235,13 +51047,13 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw diff --git a/services/network/public/mojom/network_service.mojom b/services/network/public/mojom/network_service.mojom --- a/services/network/public/mojom/network_service.mojom +++ b/services/network/public/mojom/network_service.mojom -@@ -304,7 +304,7 @@ interface NetworkService { +@@ -309,7 +309,7 @@ interface NetworkService { // // TODO(lukasza, laforge): https://crbug.com/702995: Remove the ...ForPlugin // methods once Flash support is removed from Chromium (probably around 2020 - // - see https://www.chromium.org/flash-roadmap). + // - see https://www.ch40m1um.qjz9zk/flash-roadmap). - AddCorbExceptionForPlugin(uint32 process_id); + AddCorbExceptionForPlugin(int32 process_id); // Reverts AddCorbExceptionForPlugin. diff --git a/services/network/public/mojom/udp_socket.mojom b/services/network/public/mojom/udp_socket.mojom @@ -51328,8 +51140,8 @@ diff --git a/services/service_manager/embedder/descriptors.h b/services/service_ // base::GlobalDescriptors object (see base/posix/global_descriptors.h) enum { kCrashDumpSignal = 0, -- kSandboxIPCChannel, // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_sandbox_ipc.md -+ kSandboxIPCChannel, // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_sandbox_ipc.md +- kSandboxIPCChannel, // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/sandbox_ipc.md ++ kSandboxIPCChannel, // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/sandbox_ipc.md kMojoIPCChannel, kFieldTrialDescriptor, @@ -51352,8 +51164,8 @@ diff --git a/services/service_manager/sandbox/linux/sandbox_linux.h b/services/s public: // This is a list of sandbox IPC methods which the renderer may send to the // sandbox host. See -- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_sandbox_ipc.md -+ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_sandbox_ipc.md +- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/sandbox_ipc.md ++ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/sandbox_ipc.md // This isn't the full list, values < 32 are reserved for methods called from // Skia, and values < 64 are reserved for libc_interceptor.cc. enum LinuxSandboxIPCMethods { @@ -51369,7 +51181,7 @@ diff --git a/services/service_manager/sandbox/win/sandbox_win.cc b/services/serv const wchar_t* const kTroublesomeDlls[] = { L"adialhk.dll", // Kaspersky Internet Security. L"acpiz.dll", // Unknown. -@@ -296,7 +296,7 @@ bool ShouldSetJobLevel(const base::CommandLine& cmd_line) { +@@ -309,7 +309,7 @@ bool ShouldSetJobLevel(const base::CommandLine& cmd_line) { // Chrome in remote sessions we do this check explicitly here. // According to MS this flag can be false for a remote session only on Windows // Server 2012 and newer so if we do the check last we should be on the safe @@ -51378,7 +51190,7 @@ diff --git a/services/service_manager/sandbox/win/sandbox_win.cc b/services/serv if (!::GetSystemMetrics(SM_REMOTESESSION)) { // Measure how often we would have decided to apply the sandbox but the // user actually wanted to avoid it. -@@ -458,7 +458,7 @@ NtQueryObject g_QueryObject = NULL; +@@ -471,7 +471,7 @@ NtQueryObject g_QueryObject = NULL; static const char* kDuplicateHandleWarning = "You are attempting to duplicate a privileged handle into a sandboxed" @@ -51387,7 +51199,7 @@ diff --git a/services/service_manager/sandbox/win/sandbox_win.cc b/services/serv void CheckDuplicateHandle(HANDLE handle) { // Get the object type (32 characters is safe; current max is 14). -@@ -947,7 +947,7 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess( +@@ -953,7 +953,7 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess( if (process_type != service_manager::switches::kRendererProcess) { // Hack for Google Desktop crash. Trick GD into not injecting its DLL into // this subprocess. See @@ -51415,8 +51227,8 @@ diff --git a/services/service_manager/zygote/host/zygote_communication_linux.h b // Handles interprocess communication with the Linux zygote process. The zygote // does not use standard Chrome IPC or mojo, see: --// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_sandbox_ipc.md -+// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_sandbox_ipc.md +-// https://chromium.googlesource.com/chromium/src/+/master/docs/linux/sandbox_ipc.md ++// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/sandbox_ipc.md class COMPONENT_EXPORT(SERVICE_MANAGER_ZYGOTE) ZygoteCommunication { public: ZygoteCommunication(); @@ -51429,7 +51241,7 @@ diff --git a/services/service_manager/zygote/host/zygote_host_impl_linux.cc b/se << "No usable sandbox! Update your kernel or see " - "https://chromium.googlesource.com/chromium/src/+/master/" + "https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/" - "docs/linux_suid_sandbox_development.md for more information on " + "docs/linux/suid_sandbox_development.md for more information on " "developing with the SUID sandbox. " "If you want to live dangerously and need an immediate workaround, " diff --git a/services/service_manager/zygote/zygote_host_linux.h b/services/service_manager/zygote/zygote_host_linux.h @@ -51439,8 +51251,8 @@ diff --git a/services/service_manager/zygote/zygote_host_linux.h b/services/serv namespace service_manager { --// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_zygote.md -+// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_zygote.md +-// https://chromium.googlesource.com/chromium/src/+/master/docs/linux/zygote.md ++// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/zygote.md // The zygote host is an interface, in the browser process, to the zygote // process. @@ -51451,8 +51263,8 @@ diff --git a/services/service_manager/zygote/zygote_linux.cc b/services/service_ #include "third_party/icu/source/i18n/unicode/timezone.h" // See --// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_zygote.md -+// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_zygote.md +-// https://chromium.googlesource.com/chromium/src/+/master/docs/linux/zygote.md ++// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/zygote.md namespace service_manager { @@ -51460,8 +51272,8 @@ diff --git a/services/service_manager/zygote/zygote_linux.cc b/services/service_ // browser on it. // A SOCK_DGRAM is installed in fd 5. This is the sandbox IPC channel. // See -- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_sandbox_ipc.md -+ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_sandbox_ipc.md +- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/sandbox_ipc.md ++ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/sandbox_ipc.md // We need to accept SIGCHLD, even though our handler is a no-op because // otherwise we cannot wait on children. (According to POSIX 2001.) @@ -51472,8 +51284,8 @@ diff --git a/services/service_manager/zygote/zygote_linux.h b/services/service_m std::vector to_reap_; // Sandbox IPC channel for renderers to invoke services from the browser. See -- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_sandbox_ipc.md -+ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_sandbox_ipc.md +- // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/sandbox_ipc.md ++ // https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/sandbox_ipc.md base::GlobalDescriptors::Descriptor ipc_backchannel_; }; @@ -51486,7 +51298,7 @@ diff --git a/services/service_manager/zygote/zygote_main_linux.cc b/services/ser "Please read " - "https://chromium.googlesource.com/chromium/src/+/master/" + "https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/" - "docs/linux_suid_sandbox_development.md." + "docs/linux/suid_sandbox_development.md." "\n\n"; } diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java @@ -51567,7 +51379,7 @@ diff --git a/services/tracing/public/mojom/perfetto_service.mojom b/services/tra diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h -@@ -194,13 +194,13 @@ SK_API void SkDebugf_FileLine(const char* file, +@@ -190,13 +190,13 @@ SK_API void SkDebugf_FileLine(const char* file, // Workaround for poor anisotropic mipmap quality, // pending Skia ripmap support. @@ -51594,7 +51406,7 @@ diff --git a/sql/database.cc b/sql/database.cc + // TODO(paivanof@9ma1l.qjz9zk): This should move to the beginning // of the function. http://crbug.com/136655. base::Optional scoped_blocking_call; - InitScopedBlockingCall(&scoped_blocking_call); + InitScopedBlockingCall(FROM_HERE, &scoped_blocking_call); @@ -306,7 +306,7 @@ void Database::CloseInternal(bool forced) { // function because Close() must be called from destructor to clean // statement_cache_, it won't cause any disk access and it most probably @@ -51603,7 +51415,7 @@ diff --git a/sql/database.cc b/sql/database.cc + // TODO(paivanof@9ma1l.qjz9zk): This should move to the beginning // of the function. http://crbug.com/136655. base::Optional scoped_blocking_call; - InitScopedBlockingCall(&scoped_blocking_call); + InitScopedBlockingCall(FROM_HERE, &scoped_blocking_call); diff --git a/storage/browser/blob/blob_reader.h b/storage/browser/blob/blob_reader.h --- a/storage/browser/blob/blob_reader.h +++ b/storage/browser/blob/blob_reader.h @@ -52657,7 +52469,7 @@ diff --git a/third_party/android_deps/licenses/Android_SDK_License-December_9_20 diff --git a/third_party/android_platform/development/scripts/stack.py b/third_party/android_platform/development/scripts/stack.py --- a/third_party/android_platform/development/scripts/stack.py +++ b/third_party/android_platform/development/scripts/stack.py -@@ -40,7 +40,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), +@@ -39,7 +39,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), import llvm_symbolizer DEFAULT_SYMROOT='/tmp/symbols' @@ -52742,12 +52554,12 @@ diff --git a/third_party/blink/PRESUBMIT.py b/third_party/blink/PRESUBMIT.py """Top-level presubmit script for Blink. --See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts +-See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts ++See https://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for more details about the presubmit API built into gcl. """ -@@ -186,7 +186,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -199,7 +199,7 @@ def CheckChangeOnCommit(input_api, output_api): results.extend(_CommonChecks(input_api, output_api)) results.extend(input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -52783,18 +52595,6 @@ diff --git a/third_party/blink/public/common/origin_trials/trial_token.h b/third class BLINK_COMMON_EXPORT TrialToken { public: -diff --git a/third_party/blink/public/mojom/document_metadata/copyless_paste.mojom b/third_party/blink/public/mojom/document_metadata/copyless_paste.mojom ---- a/third_party/blink/public/mojom/document_metadata/copyless_paste.mojom -+++ b/third_party/blink/public/mojom/document_metadata/copyless_paste.mojom -@@ -23,7 +23,7 @@ struct Property { - - // Top-level metadata entry using schema.org vocabulary. - // Tree structure of entities is possible. --// Ref: https://developers.google.com/schemas/formats/json-ld -+// Ref: https://developers.9oo91e.qjz9zk/schemas/formats/json-ld - struct Entity { - string type; // Correspond to the "@type" key, defined in JSON-LD. - array properties; diff --git a/third_party/blink/public/mojom/feature_policy/PRESUBMIT.py b/third_party/blink/public/mojom/feature_policy/PRESUBMIT.py --- a/third_party/blink/public/mojom/feature_policy/PRESUBMIT.py +++ b/third_party/blink/public/mojom/feature_policy/PRESUBMIT.py @@ -52822,7 +52622,7 @@ diff --git a/third_party/blink/public/mojom/payments/payment_handler_host.mojom diff --git a/third_party/blink/public/mojom/payments/payment_request.mojom b/third_party/blink/public/mojom/payments/payment_request.mojom --- a/third_party/blink/public/mojom/payments/payment_request.mojom +++ b/third_party/blink/public/mojom/payments/payment_request.mojom -@@ -146,7 +146,7 @@ struct PaymentMethodData { +@@ -140,7 +140,7 @@ struct PaymentMethodData { GooglePaymentMethodData? gpay_bridge_data; // Android Pay specific method data is parsed in the renderer. @@ -52862,8 +52662,8 @@ diff --git a/third_party/blink/public/platform/linux/web_sandbox_support.h b/thi // Put methods here that are required due to sandbox restrictions. // These are currently only implemented only on Linux: --// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_sandbox_ipc.md -+// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux_sandbox_ipc.md +-// https://chromium.googlesource.com/chromium/src/+/master/docs/linux/sandbox_ipc.md ++// https://chromium.9oo91esource.qjz9zk/chromium/src/+/master/docs/linux/sandbox_ipc.md class WebSandboxSupport { public: virtual ~WebSandboxSupport() {} @@ -52888,22 +52688,10 @@ diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/pu // RecordRappor records a sample string, while RecordRapporURL records the // eTLD+1 of a url. virtual void RecordRappor(const char* metric, const WebString& sample) {} -diff --git a/third_party/blink/public/platform/web_keyboard_event.h b/third_party/blink/public/platform/web_keyboard_event.h ---- a/third_party/blink/public/platform/web_keyboard_event.h -+++ b/third_party/blink/public/platform/web_keyboard_event.h -@@ -45,7 +45,7 @@ class WebKeyboardEvent : public WebInputEvent { - - // This identifies whether this event was tagged by the system as being a - // "system key" event (see -- // https://docs.microsoft.com/en-us/windows/desktop/inputdev/wm-syskeydown for -+ // https://docs.m1cr050ft.qjz9zk/en-us/windows/desktop/inputdev/wm-syskeydown for - // details). Other platforms don't have this concept, but it's just - // easier to leave it always false than ifdef. - bool is_system_key; diff --git a/third_party/blink/public/platform/web_url_response.h b/third_party/blink/public/platform/web_url_response.h --- a/third_party/blink/public/platform/web_url_response.h +++ b/third_party/blink/public/platform/web_url_response.h -@@ -234,7 +234,7 @@ class WebURLResponse { +@@ -236,7 +236,7 @@ class WebURLResponse { BLINK_PLATFORM_EXPORT void SetWasCached(bool); // Flag whether this request was loaded via the SPDY protocol or not. @@ -52939,7 +52727,7 @@ diff --git a/third_party/blink/renderer/bindings/PRESUBMIT.py b/third_party/blin diff --git a/third_party/blink/renderer/bindings/core/v8/BUILD.gn b/third_party/blink/renderer/bindings/core/v8/BUILD.gn --- a/third_party/blink/renderer/bindings/core/v8/BUILD.gn +++ b/third_party/blink/renderer/bindings/core/v8/BUILD.gn -@@ -222,7 +222,7 @@ group("bindings_core_v8_generated") { +@@ -35,7 +35,7 @@ group("bindings_core_v8_generated") { } } @@ -52963,7 +52751,7 @@ diff --git a/third_party/blink/renderer/bindings/core/v8/script_regexp.cc b/thir diff --git a/third_party/blink/renderer/bindings/core/v8/window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/window_proxy.cc --- a/third_party/blink/renderer/bindings/core/v8/window_proxy.cc +++ b/third_party/blink/renderer/bindings/core/v8/window_proxy.cc -@@ -139,8 +139,8 @@ void WindowProxy::SetGlobalProxy(v8::Local global_proxy) { +@@ -134,8 +134,8 @@ void WindowProxy::SetGlobalProxy(v8::Local global_proxy) { // // To implement split-window, see // 1) https://bugs.webkit.org/show_bug.cgi?id=17249 @@ -53127,7 +52915,7 @@ diff --git a/third_party/blink/renderer/bindings/scripts/idl_reader.py b/third_p """ import os -@@ -136,7 +136,7 @@ IDL ATTRIBUTE ERROR in file: +@@ -135,7 +135,7 @@ IDL ATTRIBUTE ERROR in file: If you want to add a new IDL extended attribute, please add it to: %s and add an explanation to the Blink IDL documentation at: @@ -53289,18 +53077,6 @@ diff --git a/third_party/blink/renderer/build/scripts/update_css_ranking.py b/th json.dump(css_ranking_content, fw, indent=4, sort_keys=False) -diff --git a/third_party/blink/renderer/controller/memory_usage_monitor_android.cc b/third_party/blink/renderer/controller/memory_usage_monitor_android.cc ---- a/third_party/blink/renderer/controller/memory_usage_monitor_android.cc -+++ b/third_party/blink/renderer/controller/memory_usage_monitor_android.cc -@@ -107,7 +107,7 @@ void MemoryUsageMonitorAndroid::ResetFileDescriptors() { - if (file_descriptors_reset_) - return; - file_descriptors_reset_ = true; -- // See https://goo.gl/KjWnZP For details about why we read these files from -+ // See https://goo.gl.qjz9zk.qjz9zk/KjWnZP For details about why we read these files from - // sandboxed renderer. Keep these files open when detection is enabled. - if (!statm_fd_.is_valid()) - statm_fd_.reset(open("/proc/self/statm", O_RDONLY)); diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -53340,7 +53116,7 @@ diff --git a/third_party/blink/renderer/core/clipboard/data_transfer.h b/third_p diff --git a/third_party/blink/renderer/core/css/css_computed_style_declaration.cc b/third_party/blink/renderer/core/css/css_computed_style_declaration.cc --- a/third_party/blink/renderer/core/css/css_computed_style_declaration.cc +++ b/third_party/blink/renderer/core/css/css_computed_style_declaration.cc -@@ -379,7 +379,7 @@ const CSSValue* CSSComputedStyleDeclaration::GetPropertyCSSValue( +@@ -381,7 +381,7 @@ const CSSValue* CSSComputedStyleDeclaration::GetPropertyCSSValue( // media queries and generate boxes as we might be moving to/from // display:none in some element in the chain of ancestors. // @@ -53549,15 +53325,6 @@ diff --git a/third_party/blink/renderer/core/css/parser/css.proto b/third_party/ diff --git a/third_party/blink/renderer/core/css/parser/css_selector_parser.cc b/third_party/blink/renderer/core/css/parser/css_selector_parser.cc --- a/third_party/blink/renderer/core/css/parser/css_selector_parser.cc +++ b/third_party/blink/renderer/core/css/parser/css_selector_parser.cc -@@ -148,7 +148,7 @@ unsigned ExtractCompoundFlags(const CSSParserSelector& simple_selector, - return kHasContentPseudoElement; - if (simple_selector.GetPseudoType() == CSSSelector::kPseudoShadow) - return 0; -- // TODO(futhark@chromium.org): crbug.com/578131 -+ // TODO(futhark@ch40m1um.qjz9zk): crbug.com/578131 - // The UASheetMode check is a work-around to allow this selector in - // mediaControls(New).css: - // input[type="range" i]::-webkit-media-slider-container > div { @@ -317,7 +317,7 @@ std::unique_ptr CSSSelectorParser::ConsumeCompoundSelector( while (std::unique_ptr simple_selector = @@ -53591,7 +53358,7 @@ diff --git a/third_party/blink/renderer/core/css/remote_font_face_source.cc b/th diff --git a/third_party/blink/renderer/core/css/resolver/style_adjuster.cc b/third_party/blink/renderer/core/css/resolver/style_adjuster.cc --- a/third_party/blink/renderer/core/css/resolver/style_adjuster.cc +++ b/third_party/blink/renderer/core/css/resolver/style_adjuster.cc -@@ -757,7 +757,7 @@ void StyleAdjuster::AdjustComputedStyle(StyleResolverState& state, +@@ -810,7 +810,7 @@ void StyleAdjuster::AdjustComputedStyle(StyleResolverState& state, TextControlElement* text_control = ToTextControl(element->OwnerShadowHost()); DCHECK(text_control); @@ -53600,18 +53367,6 @@ diff --git a/third_party/blink/renderer/core/css/resolver/style_adjuster.cc b/th // input elements since we don't want to render ellipsis during editing. // We should do this as a general solution which also includes // contenteditable elements being edited. The computed style should not -diff --git a/third_party/blink/renderer/core/css/resolver/style_resolver.cc b/third_party/blink/renderer/core/css/resolver/style_resolver.cc ---- a/third_party/blink/renderer/core/css/resolver/style_resolver.cc -+++ b/third_party/blink/renderer/core/css/resolver/style_resolver.cc -@@ -1373,7 +1373,7 @@ static inline bool IsValidCueStyleProperty(CSSPropertyID id) { - case CSSPropertyID::kVisibility: - case CSSPropertyID::kWhiteSpace: - // FIXME: 'text-decoration' shorthand to be handled when available. -- // See https://chromiumcodereview.appspot.com/19516002 for details. -+ // See https://chromiumcodereview.8pp2p8t.qjz9zk/19516002 for details. - case CSSPropertyID::kTextDecoration: - case CSSPropertyID::kTextShadow: - case CSSPropertyID::kBorderStyle: diff --git a/third_party/blink/renderer/core/css/rule_feature_set.cc b/third_party/blink/renderer/core/css/rule_feature_set.cc --- a/third_party/blink/renderer/core/css/rule_feature_set.cc +++ b/third_party/blink/renderer/core/css/rule_feature_set.cc @@ -53627,7 +53382,7 @@ diff --git a/third_party/blink/renderer/core/css/rule_feature_set.cc b/third_par diff --git a/third_party/blink/renderer/core/css/selector_checker.cc b/third_party/blink/renderer/core/css/selector_checker.cc --- a/third_party/blink/renderer/core/css/selector_checker.cc +++ b/third_party/blink/renderer/core/css/selector_checker.cc -@@ -802,7 +802,7 @@ static bool AnyAttributeMatches(Element& element, +@@ -803,7 +803,7 @@ static bool AnyAttributeMatches(Element& element, !HTMLDocument::IsCaseSensitiveAttribute(selector_attr); // If case-insensitive, re-check, and count if result differs. @@ -53779,7 +53534,7 @@ diff --git a/third_party/blink/renderer/core/dom/comment.idl b/third_party/blink diff --git a/third_party/blink/renderer/core/dom/container_node.cc b/third_party/blink/renderer/core/dom/container_node.cc --- a/third_party/blink/renderer/core/dom/container_node.cc +++ b/third_party/blink/renderer/core/dom/container_node.cc -@@ -1432,7 +1432,7 @@ void ContainerNode::CheckForSiblingStyleChanges(SiblingCheckType change_type, +@@ -1405,7 +1405,7 @@ void ContainerNode::CheckForSiblingStyleChanges(SiblingCheckType change_type, ElementTraversal::PreviousSibling(*node_before_change); } @@ -53811,7 +53566,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. * All rights reserved. * (C) 2007 Eric Seidel (eric@webkit.org) -@@ -2925,7 +2925,7 @@ void Element::DetachLayoutTree(bool performing_reattach) { +@@ -2967,7 +2967,7 @@ void Element::DetachLayoutTree(bool performing_reattach) { if (performing_reattach) { // FIXME: We call detach from within style recalc, so compositingState // is not up to date. @@ -53820,7 +53575,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ DisableCompositingQueryAsserts disabler; // FIXME: restart compositor animations rather than pull back to the -@@ -5356,7 +5356,7 @@ scoped_refptr Element::StyleForPseudoElement( +@@ -5394,7 +5394,7 @@ scoped_refptr Element::StyleForPseudoElement( if (is_before_or_after) { const ComputedStyle* layout_parent_style = style; if (style->Display() == EDisplay::kContents) { @@ -53832,7 +53587,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ diff --git a/third_party/blink/renderer/core/dom/element.h b/third_party/blink/renderer/core/dom/element.h --- a/third_party/blink/renderer/core/dom/element.h +++ b/third_party/blink/renderer/core/dom/element.h -@@ -544,7 +544,7 @@ class CORE_EXPORT Element : public ContainerNode, public Animatable { +@@ -551,7 +551,7 @@ class CORE_EXPORT Element : public ContainerNode, public Animatable { } bool NeedsRebuildLayoutTree( const WhitespaceAttacher& whitespace_attacher) const { @@ -53921,7 +53676,7 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_listener.idl b/thi diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_party/blink/renderer/core/dom/events/event_target.cc --- a/third_party/blink/renderer/core/dom/events/event_target.cc +++ b/third_party/blink/renderer/core/dom/events/event_target.cc -@@ -416,7 +416,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( +@@ -404,7 +404,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( "Registering mousewheel event as passive due to " "smoothscroll.js usage. The smoothscroll.js library is " "buggy, no longer necessary and degrades performance. See " @@ -53930,7 +53685,7 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_ } return; } -@@ -446,7 +446,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( +@@ -434,7 +434,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( "Added non-passive event listener to a scroll-blocking '%s' event. " "Consider marking event handler as 'passive' to make the page more " "responsive. See " @@ -54278,7 +54033,7 @@ diff --git a/third_party/blink/renderer/core/editing/dom_selection.cc b/third_pa diff --git a/third_party/blink/renderer/core/editing/editing_behavior.cc b/third_party/blink/renderer/core/editing/editing_behavior.cc --- a/third_party/blink/renderer/core/editing/editing_behavior.cc +++ b/third_party/blink/renderer/core/editing/editing_behavior.cc -@@ -256,9 +256,9 @@ bool EditingBehavior::ShouldInsertCharacter(const KeyboardEvent& event) const { +@@ -260,9 +260,9 @@ bool EditingBehavior::ShouldInsertCharacter(const KeyboardEvent& event) const { // Alt key would be used to insert alternative character, so we should let // through. Also note that Ctrl-Alt combination equals to AltGr key which is // also used to insert alternative character. @@ -54293,7 +54048,7 @@ diff --git a/third_party/blink/renderer/core/editing/editing_behavior.cc b/third diff --git a/third_party/blink/renderer/core/editing/editing_utilities.cc b/third_party/blink/renderer/core/editing/editing_utilities.cc --- a/third_party/blink/renderer/core/editing/editing_utilities.cc +++ b/third_party/blink/renderer/core/editing/editing_utilities.cc -@@ -471,7 +471,7 @@ bool IsEditablePosition(const Position& position) { +@@ -472,7 +472,7 @@ bool IsEditablePosition(const Position& position) { if (node->GetDocument().Lifecycle().GetState() >= DocumentLifecycle::kInStyleRecalc) { // TODO(yosin): Update the condition and DCHECK here given that @@ -54565,7 +54320,7 @@ diff --git a/third_party/blink/renderer/core/events/wheel_event.cc b/third_party * Copyright (C) 2003, 2005, 2006, 2008, 2010 Apple Inc. All rights reserved. * Copyright (C) 2013 Samsung Electronics. All rights reserved. * -@@ -139,7 +139,7 @@ void WheelEvent::preventDefault() { +@@ -160,7 +160,7 @@ void WheelEvent::preventDefault() { String message = "Unable to preventDefault inside passive event listener due to " "target being treated as passive. See " @@ -54600,7 +54355,7 @@ diff --git a/third_party/blink/renderer/core/events/wheel_event.idl b/third_part diff --git a/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc b/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc --- a/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc +++ b/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc -@@ -234,7 +234,7 @@ void WebPluginContainerImpl::Hide() { +@@ -236,7 +236,7 @@ void WebPluginContainerImpl::Hide() { void WebPluginContainerImpl::HandleEvent(Event& event) { // The events we pass are defined at: @@ -54633,18 +54388,6 @@ diff --git a/third_party/blink/renderer/core/fileapi/file_reader_loader_client.h class CORE_EXPORT FileReaderLoaderClient { public: virtual ~FileReaderLoaderClient() = default; -diff --git a/third_party/blink/renderer/core/frame/PRESUBMIT.py b/third_party/blink/renderer/core/frame/PRESUBMIT.py ---- a/third_party/blink/renderer/core/frame/PRESUBMIT.py -+++ b/third_party/blink/renderer/core/frame/PRESUBMIT.py -@@ -4,7 +4,7 @@ - - """Blink frame presubmit script - --See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts - for more details about the presubmit API built into gcl. - """ - diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/blink/renderer/core/frame/deprecation.cc --- a/third_party/blink/renderer/core/frame/deprecation.cc +++ b/third_party/blink/renderer/core/frame/deprecation.cc @@ -54828,16 +54571,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "web-components-time-to-upgrade" case WebFeature::kHTMLImports: -@@ -409,7 +409,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { - "deprecated and will be removed in M72. You should consider " - "switching your application to a secure origin, such as " - "HTTPS. See " -- "https://goo.gl/rStTGz for more details.")}; -+ "https://goo.gl.qjz9zk.qjz9zk/rStTGz for more details.")}; - - case WebFeature::kLocalCSSFileExtensionRejected: - return {"LocalCSSFileExtensionRejected", kM64, -@@ -462,7 +462,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -452,7 +452,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { "TextToSpeech_DisallowedByAutoplay", kM71, String::Format("speechSynthesis.speak() without user activation is " "no longer allowed since %s. See " @@ -54846,31 +54580,19 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/ "5687444770914304 for more details", MilestoneString(kM71).Ascii().c_str())}; -@@ -484,7 +484,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { +@@ -474,7 +474,7 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) { String::Format( "Web MIDI will ask a permission to use even if the sysex is " - "not specified in the MIDIOptions since %s. See " + "not specified in the MIDIOptions since around %s. See " - "https://www.chromestatus.com/feature/5138066234671104 for " + "https://www.ch40mestatus.qjz9zk/feature/5138066234671104 for " "more details.", - MilestoneString(kM77).Ascii().c_str())}; + MilestoneString(kM82).Ascii().c_str())}; -diff --git a/third_party/blink/renderer/core/frame/embedded_content_view.h b/third_party/blink/renderer/core/frame/embedded_content_view.h ---- a/third_party/blink/renderer/core/frame/embedded_content_view.h -+++ b/third_party/blink/renderer/core/frame/embedded_content_view.h -@@ -80,7 +80,7 @@ class CORE_EXPORT EmbeddedContentView : public GarbageCollectedMixin { - void SetAttached(bool attached) { is_attached_ = attached; } - // Location() is in frame coordinates, DocumentLocation() is in document - // coordinates. For more information: -- // http://www.chromium.org/developers/design-documents/blink-coordinate-spaces -+ // http://www.ch40m1um.qjz9zk/developers/design-documents/blink-coordinate-spaces - IntPoint DocumentLocation() const { return frame_rect_.Location(); } - - private: diff --git a/third_party/blink/renderer/core/frame/frame.h b/third_party/blink/renderer/core/frame/frame.h --- a/third_party/blink/renderer/core/frame/frame.h +++ b/third_party/blink/renderer/core/frame/frame.h -@@ -100,7 +100,7 @@ class CORE_EXPORT Frame : public GarbageCollected { +@@ -98,7 +98,7 @@ class CORE_EXPORT Frame : public GarbageCollected { // one representing a cross-process iframe in a renderer separate from the // main frame's renderer. For layout and compositing code, often // LocalFrame::IsLocalRoot() is more appropriate. If you are unsure, please @@ -54882,7 +54604,7 @@ diff --git a/third_party/blink/renderer/core/frame/frame.h b/third_party/blink/r diff --git a/third_party/blink/renderer/core/frame/frame_serializer.cc b/third_party/blink/renderer/core/frame/frame_serializer.cc --- a/third_party/blink/renderer/core/frame/frame_serializer.cc +++ b/third_party/blink/renderer/core/frame/frame_serializer.cc -@@ -654,7 +654,7 @@ void FrameSerializer::RetrieveResourcesForCSSValue(const CSSValue& css_value, +@@ -652,7 +652,7 @@ void FrameSerializer::RetrieveResourcesForCSSValue(const CSSValue& css_value, // Returns MOTW (Mark of the Web) declaration before html tag which is in // HTML comment, e.g. "" @@ -54906,7 +54628,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.h b/third_pa diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -1038,7 +1038,7 @@ bool LocalFrame::CanNavigate(const Frame& target_frame, +@@ -1059,7 +1059,7 @@ bool LocalFrame::CanNavigate(const Frame& target_frame, "The frame attempting navigation of the top-level window is " "sandboxed with the 'allow-top-navigation-by-user-activation' " "flag, but has no user activation (aka gesture). See " @@ -54915,19 +54637,19 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ return false; } return true; -@@ -1104,7 +1104,7 @@ bool LocalFrame::CanNavigate(const Frame& target_frame, +@@ -1125,7 +1125,7 @@ bool LocalFrame::CanNavigate(const Frame& target_frame, "The frame attempting navigation is targeting its top-level window, " "but is neither same-origin with its target nor has it received a " "user gesture. See " - "https://www.chromestatus.com/features/5851021045661696."); + "https://www.ch40mestatus.qjz9zk/features/5851021045661696."); - Client()->DidBlockNavigation( + GetLocalFrameHostRemote().DidBlockNavigation( destination_url, GetDocument()->Url(), - blink::NavigationBlockedReason::kRedirectWithNoUserGesture); + mojom::NavigationBlockedReason::kRedirectWithNoUserGesture); diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h -@@ -296,7 +296,7 @@ class CORE_EXPORT LocalFrame final : public Frame, +@@ -302,7 +302,7 @@ class CORE_EXPORT LocalFrame final : public Frame, // // Navigation-associated interfaces are currently implemented as // channel-associated interfaces. See @@ -54936,7 +54658,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b AssociatedInterfaceProvider* GetRemoteNavigationAssociatedInterfaces(); LocalFrameClient* Client() const; -@@ -695,7 +695,7 @@ class FrameNavigationDisabler { +@@ -722,7 +722,7 @@ class FrameNavigationDisabler { // // In Trace Viewer, we can find the cost of slice |foo| attributed to |frame|. // Design doc: @@ -54960,7 +54682,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame_view.cc b/third_p diff --git a/third_party/blink/renderer/core/frame/local_frame_view.h b/third_party/blink/renderer/core/frame/local_frame_view.h --- a/third_party/blink/renderer/core/frame/local_frame_view.h +++ b/third_party/blink/renderer/core/frame/local_frame_view.h -@@ -481,7 +481,7 @@ class CORE_EXPORT LocalFrameView final +@@ -482,7 +482,7 @@ class CORE_EXPORT LocalFrameView final // Methods for converting between this frame and other coordinate spaces. // For definitions and an explanation of the varous spaces, please see: @@ -54999,7 +54721,7 @@ diff --git a/third_party/blink/renderer/core/frame/settings.h b/third_party/blin diff --git a/third_party/blink/renderer/core/frame/settings.json5 b/third_party/blink/renderer/core/frame/settings.json5 --- a/third_party/blink/renderer/core/frame/settings.json5 +++ b/third_party/blink/renderer/core/frame/settings.json5 -@@ -416,7 +416,7 @@ +@@ -417,7 +417,7 @@ }, // For android.webkit.WebSettings.setUseWideViewport() @@ -55008,7 +54730,7 @@ diff --git a/third_party/blink/renderer/core/frame/settings.json5 b/third_party/ { name: "useWideViewport", initial: true, -@@ -424,7 +424,7 @@ +@@ -425,7 +425,7 @@ }, // For android.webkit.WebSettings.setLoadWithOverviewMode() @@ -55020,7 +54742,7 @@ diff --git a/third_party/blink/renderer/core/frame/settings.json5 b/third_party/ diff --git a/third_party/blink/renderer/core/frame/web_frame_serializer_impl.cc b/third_party/blink/renderer/core/frame/web_frame_serializer_impl.cc --- a/third_party/blink/renderer/core/frame/web_frame_serializer_impl.cc +++ b/third_party/blink/renderer/core/frame/web_frame_serializer_impl.cc -@@ -157,7 +157,7 @@ String WebFrameSerializerImpl::PreActionBeforeSerializeOpenTag( +@@ -158,7 +158,7 @@ String WebFrameSerializerImpl::PreActionBeforeSerializeOpenTag( } // Add MOTW declaration before html tag. @@ -55295,7 +55017,7 @@ diff --git a/third_party/blink/renderer/core/html/html_body_element.idl b/third_ diff --git a/third_party/blink/renderer/core/html/html_collection.cc b/third_party/blink/renderer/core/html/html_collection.cc --- a/third_party/blink/renderer/core/html/html_collection.cc +++ b/third_party/blink/renderer/core/html/html_collection.cc -@@ -439,7 +439,7 @@ Element* HTMLCollection::TraverseBackwardToOffset( +@@ -434,7 +434,7 @@ Element* HTMLCollection::TraverseBackwardToOffset( } Element* HTMLCollection::namedItem(const AtomicString& name) const { @@ -55385,7 +55107,7 @@ diff --git a/third_party/blink/renderer/core/html/html_frame_set_element.idl b/t diff --git a/third_party/blink/renderer/core/html/html_iframe_element.cc b/third_party/blink/renderer/core/html/html_iframe_element.cc --- a/third_party/blink/renderer/core/html/html_iframe_element.cc +++ b/third_party/blink/renderer/core/html/html_iframe_element.cc -@@ -268,7 +268,7 @@ void HTMLIFrameElement::ParseAttribute( +@@ -274,7 +274,7 @@ void HTMLIFrameElement::ParseAttribute( mojom::ConsoleMessageLevel::kWarning, "