diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch
index e3e6a860..28a2c385 100644
--- a/build/patches/AImageReader-CFI-crash-mitigations.patch
+++ b/build/patches/AImageReader-CFI-crash-mitigations.patch
@@ -20,7 +20,7 @@ See discussions at:
---
base/android/android_image_reader_compat.cc | 8 +++++++-
base/android/android_image_reader_compat.h | 4 ++++
- chrome/browser/flag-metadata.json | 2 +-
+ chrome/browser/flag-metadata.json | 6 +++---
gpu/config/gpu_driver_bug_list.json | 16 ++++++++++++++++
gpu/config/gpu_finch_features.cc | 5 +++++
gpu/config/gpu_finch_features.h | 1 +
@@ -30,7 +30,7 @@ See discussions at:
gpu/ipc/service/stream_texture_android.cc | 11 ++++++++++-
media/base/media_switches.cc | 4 ++++
media/base/media_switches.h | 1 +
- 12 files changed, 63 insertions(+), 3 deletions(-)
+ 12 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc
--- a/base/android/android_image_reader_compat.cc
@@ -82,15 +82,19 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
-@@ -2121,7 +2121,7 @@
+@@ -2062,9 +2062,9 @@
+ "expiry_milestone": 97
+ },
{
- "name": "enable-launcher-app-paging",
- "owners": [ "//ash/app_list/OWNERS" ],
-- "expiry_milestone": 95
+- "name": "enable-image-reader",
+- "owners": [ "vikassoni", "liberato" ],
+- "expiry_milestone": 115
++ "name": "enable-image-reader", // Bromite: do not expire
++ "owners": [ "vikassoni", "liberato" ], // flag
+ "expiry_milestone": -1
},
{
- "name": "enable-layout-ng",
+ "name": "enable-immersive-fullscreen-toolbar",
diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json
--- a/gpu/config/gpu_driver_bug_list.json
+++ b/gpu/config/gpu_driver_bug_list.json
diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch
index ee086099..b38eab61 100644
--- a/build/patches/Add-IsCleartextPermitted-flag.patch
+++ b/build/patches/Add-IsCleartextPermitted-flag.patch
@@ -14,7 +14,7 @@ Subject: Add IsCleartextPermitted flag
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
-@@ -7783,6 +7783,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7780,6 +7780,11 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
chrome::android::kBookmarksExportUseSaf)},
diff --git a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch
index f6f543a7..f260a7dd 100644
--- a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch
+++ b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch
@@ -17,7 +17,7 @@ See also:
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
-@@ -7538,6 +7538,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7535,6 +7535,12 @@ const FeatureEntry kFeatureEntries[] = {
"AndroidDynamicColor")},
#endif // defined(OS_ANDROID)
diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch
index aaf070fb..06bfdf00 100644
--- a/build/patches/Add-an-always-incognito-mode.patch
+++ b/build/patches/Add-an-always-incognito-mode.patch
@@ -620,7 +620,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -930,6 +930,19 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -924,6 +924,19 @@ Your Google account may have other forms of browsing history like searches and a
Clears history from all synced devices.
diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch
index e2c5602d..b67ea428 100644
--- a/build/patches/Add-custom-tab-intents-privacy-option.patch
+++ b/build/patches/Add-custom-tab-intents-privacy-option.patch
@@ -194,7 +194,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4615,6 +4615,21 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
Show original
diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch
index 99c36240..163253d6 100644
--- a/build/patches/Add-exit-menu-item.patch
+++ b/build/patches/Add-exit-menu-item.patch
@@ -97,7 +97,7 @@ 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
-@@ -3229,6 +3229,9 @@ To change this setting, <resetlink>reset sync
<resetlink>reset sync
Dark theme
diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch
index 403f207f..6397f74d 100644
--- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch
+++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#if defined(OS_ANDROID)
const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = {
{"mode", "always-none"}};
-@@ -4916,6 +4932,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4913,6 +4929,11 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
#endif // !defined(OS_ANDROID)
diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch
index 0de0977e..5a518cec 100644
--- a/build/patches/Add-flag-for-save-data-header.patch
+++ b/build/patches/Add-flag-for-save-data-header.patch
@@ -14,7 +14,7 @@ Subject: Add flag for save-data-header
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
-@@ -4655,6 +4655,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4652,6 +4652,9 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if defined(OS_ANDROID)
diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch
index c381e9e1..5ba6164d 100644
--- a/build/patches/Add-flag-to-disable-vibration.patch
+++ b/build/patches/Add-flag-to-disable-vibration.patch
@@ -18,7 +18,7 @@ Subject: Add flag to disable vibration
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
-@@ -6357,6 +6357,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6354,6 +6354,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)},
#endif
diff --git a/build/patches/Add-history-support-in-incognito-mode.patch b/build/patches/Add-history-support-in-incognito-mode.patch
index 1295c053..07f01f46 100644
--- a/build/patches/Add-history-support-in-incognito-mode.patch
+++ b/build/patches/Add-history-support-in-incognito-mode.patch
@@ -1669,7 +1669,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
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
-@@ -961,6 +961,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -955,6 +955,12 @@ Your Google account may have other forms of browsing history like searches and a
Your changes will take effect the next time you relaunch Bromite.
diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch
index 6a953699..de7a2f88 100644
--- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch
+++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch
@@ -349,7 +349,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -3312,6 +3312,9 @@ To change this setting, <resetlink>reset sync
<resetlink>reset sync
Track prices
diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch
index c86c3210..b2447214 100644
--- a/build/patches/Add-option-to-force-tablet-UI.patch
+++ b/build/patches/Add-option-to-force-tablet-UI.patch
@@ -101,7 +101,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
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
-@@ -1234,6 +1234,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1228,6 +1228,12 @@ Your Google account may have other forms of browsing history like searches and a
Turn off
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 7dc5e88a..058b1dcb 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
@@ -96,7 +96,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4132,6 +4132,12 @@ To change this setting, <resetlink>reset sync
<resetlink>reset sync
IMAGE
diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch
index 228a28d6..f398cdff 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
@@ -154,7 +154,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
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
-@@ -1010,6 +1010,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1004,6 +1004,9 @@ Your Google account may have other forms of browsing history like searches and a
Last hour
diff --git a/build/patches/Ask-user-before-closing-all-tabs.patch b/build/patches/Ask-user-before-closing-all-tabs.patch
index 6a1a6bec..c864d7f9 100644
--- a/build/patches/Ask-user-before-closing-all-tabs.patch
+++ b/build/patches/Ask-user-before-closing-all-tabs.patch
@@ -47,7 +47,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
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
-@@ -3303,6 +3303,9 @@ To change this setting, <resetlink>reset sync
<resetlink>reset sync
Close all tabs
diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch
index be33f089..054f5ec8 100644
--- a/build/patches/Automated-domain-substitution.patch
+++ b/build/patches/Automated-domain-substitution.patch
@@ -4409,10 +4409,10 @@ index de05ded0fa8d8..1938e2116a685 100644
"""
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index d1ec95b1f7d30..f6802be8e47ba 100644
+index 710405d74c4b5..6b599ef096aed 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -3819,7 +3819,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3816,7 +3816,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSyncSandboxDescription, kOsAll,
SINGLE_VALUE_TYPE_AND_VALUE(
switches::kSyncServiceURL,
@@ -4421,7 +4421,7 @@ index d1ec95b1f7d30..f6802be8e47ba 100644
#if !defined(OS_ANDROID)
{"media-router-cast-allow-all-ips",
flag_descriptions::kMediaRouterCastAllowAllIPsName,
-@@ -4051,7 +4051,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4048,7 +4048,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSetMarketUrlForTestingName,
flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid,
SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting,
@@ -8626,7 +8626,7 @@ index 751c62997b8c4..12026509d985d 100644
#if BUILDFLAG(IS_CHROMEOS_ASH)
// UMA histogram FamilyUser.WebFilterType
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-index 5b45c1547da7e..0a57016014d1e 100644
+index 154bb21c9716d..4dfd5ba2218b4 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -9,7 +9,7 @@ FAQ:
@@ -8638,7 +8638,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
CHAR_LIMIT guidelines:
Certain strings need character limits to prevent a long translation from breaking the UI.
-@@ -937,7 +937,7 @@ Privacy Sandbox trials are still in active development and are available in sele
+@@ -931,7 +931,7 @@ Privacy Sandbox trials are still in active development and are available in sele
Choose another provider
@@ -8647,7 +8647,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
This setting is disabled on managed browsers
-@@ -974,7 +974,7 @@ Privacy Sandbox trials are still in active development and are available in sele
+@@ -968,7 +968,7 @@ Privacy Sandbox trials are still in active development and are available in sele
The selected data has been removed from Chrome and your synced devices.
@@ -8656,7 +8656,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
Cached images and files
-@@ -1017,10 +1017,10 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1011,10 +1011,10 @@ Your Google account may have other forms of browsing history like searches and a
Record history even in incognito mode
@@ -8669,7 +8669,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
<link1>Search history</link1> and <link2>other forms of activity</link2> may be saved in your Google Account when you’re signed in. You can delete them anytime.
-@@ -1092,7 +1092,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1086,7 +1086,7 @@ Your Google account may have other forms of browsing history like searches and a
Basic
@@ -8678,7 +8678,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
Blocked site
-@@ -1513,7 +1513,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1507,7 +1507,7 @@ Your Google account may have other forms of browsing history like searches and a
In Lite mode, Chrome loads pages faster and uses up to 60 percent less data. To optimize the pages that you visit, Chrome sends your web traffic to Google. <link>Learn more</link>
@@ -8687,7 +8687,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
Turn on Lite mode
-@@ -1736,10 +1736,10 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1730,10 +1730,10 @@ Your Google account may have other forms of browsing history like searches and a
Waiting for details of parents.
@@ -8700,7 +8700,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
Content
-@@ -1798,22 +1798,22 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1792,22 +1792,22 @@ Your Google account may have other forms of browsing history like searches and a
Google Terms of Service
@@ -8727,7 +8727,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
-@@ -1830,7 +1830,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1824,7 +1824,7 @@ Your Google account may have other forms of browsing history like searches and a
Also clear your Chrome data from this device
@@ -8736,7 +8736,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
Contacting Google. This may take a minute…
-@@ -1935,7 +1935,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1929,7 +1929,7 @@ Your Google account may have other forms of browsing history like searches and a
Your data was encrypted with your <learnmore>sync passphrase</learnmore> on %1$sSept 1, 2012. Enter it to start sync.
@@ -8745,7 +8745,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
This field cannot be blank
-@@ -4045,7 +4045,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
@@ -8754,7 +8754,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
No compatible devices found
-@@ -4079,7 +4079,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
@@ -8763,7 +8763,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
%1$sYouTube also has data in Chrome
-@@ -4436,7 +4436,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
%1$sTanya's Pixel 2...
@@ -8772,7 +8772,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
List of devices to share a tab with.
-@@ -4475,7 +4475,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
%1$sphone
@@ -8781,7 +8781,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
You can send tabs between devices that are signed in with the same Google Account
-@@ -5333,7 +5333,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
@@ -8790,7 +8790,7 @@ index 5b45c1547da7e..0a57016014d1e 100644
Your browser is not managed
-@@ -5342,7 +5342,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch
index ade62d62..de7ef5a8 100644
--- a/build/patches/Bromite-auto-updater.patch
+++ b/build/patches/Bromite-auto-updater.patch
@@ -902,7 +902,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1704,6 +1704,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1698,6 +1698,12 @@ Your Google account may have other forms of browsing history like searches and a
Chrome updates are no longer supported for this version of Android
@@ -915,7 +915,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
-@@ -3220,7 +3226,7 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
diff --git a/build/patches/Disable-Accessibility-service-by-default.patch b/build/patches/Disable-Accessibility-service-by-default.patch
index 4abf0f49..91f36194 100644
--- a/build/patches/Disable-Accessibility-service-by-default.patch
+++ b/build/patches/Disable-Accessibility-service-by-default.patch
@@ -26,7 +26,7 @@ diff --git a/chrome/android/java/res/xml/accessibility_preferences.xml b/chrome/
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
-@@ -1290,6 +1290,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1284,6 +1284,12 @@ Your Google account may have other forms of browsing history like searches and a
Accessibility
diff --git a/build/patches/Disable-FLoC.patch b/build/patches/Disable-FLoC.patch
index 494bef93..18755018 100644
--- a/build/patches/Disable-FLoC.patch
+++ b/build/patches/Disable-FLoC.patch
@@ -18,12 +18,13 @@ Also added the disabling of blink features through the DisabledForBromite tag
components/history/core/browser/url_row.h | 1 -
third_party/blink/common/features.cc | 4 +-
.../permissions_policy_feature.mojom | 5 --
- .../blink/renderer/core/dom/document.cc | 3 +-
+ .../renderer/bindings/generated_in_core.gni | 2 -
+ .../blink/renderer/core/dom/document.cc | 31 +---------
.../blink/renderer/core/dom/document.idl | 1 -
.../renderer/core/dom/interest_cohort.idl | 4 --
.../permissions_policy_features.json5 | 6 --
.../platform/runtime_enabled_features.json5 | 5 +-
- 17 files changed, 38 insertions(+), 134 deletions(-)
+ 18 files changed, 38 insertions(+), 164 deletions(-)
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
@@ -390,10 +391,30 @@ diff --git a/third_party/blink/public/mojom/permissions_policy/permissions_polic
// Controls whether Autofill may fill fields in that frame when triggered on
// a field with the main frame's origin.
kSharedAutofill = 83,
+diff --git a/third_party/blink/renderer/bindings/generated_in_core.gni b/third_party/blink/renderer/bindings/generated_in_core.gni
+--- a/third_party/blink/renderer/bindings/generated_in_core.gni
++++ b/third_party/blink/renderer/bindings/generated_in_core.gni
+@@ -201,8 +201,6 @@ generated_dictionary_sources_in_core = [
+ "$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_input_device_capabilities_init.h",
+ "$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_input_event_init.cc",
+ "$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_input_event_init.h",
+- "$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_interest_cohort.cc",
+- "$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_interest_cohort.h",
+ "$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_intersection_observer_init.cc",
+ "$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_intersection_observer_init.h",
+ "$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_intrinsic_sizes_result_options.cc",
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -5998,8 +5998,7 @@ ScriptPromise Document::interestCohort(ScriptState* script_state,
+@@ -79,7 +79,6 @@
+ #include "third_party/blink/renderer/bindings/core/v8/source_location.h"
+ #include "third_party/blink/renderer/bindings/core/v8/v8_element_creation_options.h"
+ #include "third_party/blink/renderer/bindings/core/v8/v8_element_registration_options.h"
+-#include "third_party/blink/renderer/bindings/core/v8/v8_interest_cohort.h"
+ #include "third_party/blink/renderer/bindings/core/v8/v8_throw_dom_exception.h"
+ #include "third_party/blink/renderer/bindings/core/v8/v8_union_elementcreationoptions_string.h"
+ #include "third_party/blink/renderer/bindings/core/v8/v8_union_htmlscriptelement_svgscriptelement.h"
+@@ -5998,8 +5997,7 @@ ScriptPromise Document::interestCohort(ScriptState* script_state,
return ScriptPromise();
}
@@ -403,6 +424,40 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
exception_state.ThrowDOMException(
DOMExceptionCode::kInvalidAccessError,
"The \"interest-cohort\" Permissions Policy denied the use of "
+@@ -6011,33 +6009,6 @@ ScriptPromise Document::interestCohort(ScriptState* script_state,
+ MakeGarbageCollected(script_state);
+
+ ScriptPromise promise = resolver->Promise();
+-
+- GetFlocService(ExecutionContext::From(script_state))
+- ->GetInterestCohort(WTF::Bind(
+- [](ScriptPromiseResolver* resolver, Document* document,
+- mojom::blink::InterestCohortPtr interest_cohort) {
+- DCHECK(resolver);
+- DCHECK(document);
+-
+- if (interest_cohort->version.IsEmpty()) {
+- ScriptState* state = resolver->GetScriptState();
+- ScriptState::Scope scope(state);
+-
+- resolver->Reject(V8ThrowDOMException::CreateOrEmpty(
+- state->GetIsolate(), DOMExceptionCode::kDataError,
+- "Failed to get the interest cohort: either it is "
+- "unavailable, or preferences or content settings have "
+- "denied access."));
+- } else {
+- InterestCohort* result = InterestCohort::Create();
+- result->setId(interest_cohort->id);
+- result->setVersion(interest_cohort->version);
+-
+- resolver->Resolve(result);
+- }
+- },
+- WrapPersistent(resolver), WrapPersistent(this)));
+-
+ return promise;
+ }
+
diff --git a/third_party/blink/renderer/core/dom/document.idl b/third_party/blink/renderer/core/dom/document.idl
--- a/third_party/blink/renderer/core/dom/document.idl
+++ b/third_party/blink/renderer/core/dom/document.idl
diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch
index 75171126..9af6d3ab 100644
--- a/build/patches/Disable-safe-browsing.patch
+++ b/build/patches/Disable-safe-browsing.patch
@@ -27,7 +27,7 @@ Disable CrowdDeny feature
...ontent_browser_client_receiver_bindings.cc | 2 +
.../file_type_policies_component_installer.cc | 16 +----
.../browser/component_updater/registration.cc | 7 --
- .../chrome_download_manager_delegate.cc | 39 ++++------
+ .../chrome_download_manager_delegate.cc | 41 +++++------
.../chrome_download_manager_delegate.h | 8 ++-
.../browser/download/download_item_model.cc | 15 +++-
chrome/browser/download/download_item_model.h | 4 ++
@@ -61,6 +61,8 @@ Disable CrowdDeny feature
.../download_protection_service.h | 5 --
.../url_lookup_service_factory.cc | 4 ++
.../safety_check/SafetyCheckMediator.java | 13 ----
+ .../java/res/layout/fre_uma_dialog.xml | 11 ---
+ .../ui/fre/FreUMADialogCoordinator.java | 3 -
.../ssl/sct_reporting_service_factory.cc | 11 +--
.../browser/ssl/security_state_tab_helper.cc | 10 +--
...urce_filter_web_contents_helper_factory.cc | 4 ++
@@ -86,7 +88,7 @@ Disable CrowdDeny feature
.../file_system_access_permission_context.h | 6 --
weblayer/BUILD.gn | 1 -
weblayer/test/BUILD.gn | 1 -
- 80 files changed, 178 insertions(+), 659 deletions(-)
+ 82 files changed, 180 insertions(+), 673 deletions(-)
diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
--- a/chrome/android/java/res/xml/google_services_preferences.xml
@@ -850,7 +852,19 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
#include "chrome/common/buildflags.h"
-@@ -135,8 +139,10 @@ using content::DownloadManager;
+@@ -72,9 +76,11 @@
+ #include "components/prefs/pref_member.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/safe_browsing/buildflags.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "components/safe_browsing/content/browser/download/download_stats.h"
+ #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
+ #include "components/safe_browsing/content/common/file_type_policies.h"
++#endif
+ #include "components/services/quarantine/public/mojom/quarantine.mojom.h"
+ #include "components/services/quarantine/quarantine_impl.h"
+ #include "content/public/browser/browser_task_traits.h"
+@@ -135,8 +141,10 @@ using content::DownloadManager;
using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
@@ -861,7 +875,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
namespace {
-@@ -341,12 +347,12 @@ void HandleMixedDownloadInfoBarResult(
+@@ -341,12 +349,12 @@ void HandleMixedDownloadInfoBarResult(
}
#endif
@@ -875,7 +889,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
if (download_restriction !=
DownloadPrefs::DownloadRestriction::POTENTIALLY_DANGEROUS_FILES &&
download_restriction !=
-@@ -383,8 +389,8 @@ void MaybeReportDangerousDownloadBlocked(
+@@ -383,8 +391,8 @@ void MaybeReportDangerousDownloadBlocked(
danger_type, download->GetMimeType(), /*scan_id*/ "",
download->GetTotalBytes(), safe_browsing::EventResult::BLOCKED);
}
@@ -885,7 +899,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#if BUILDFLAG(FULL_SAFE_BROWSING)
download::DownloadDangerType SavePackageDangerType(
-@@ -436,13 +442,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
+@@ -436,13 +444,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
download_manager_ = dm;
@@ -899,7 +913,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
}
#if defined(OS_ANDROID)
-@@ -791,16 +790,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
+@@ -791,16 +792,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename) {
@@ -916,7 +930,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
}
void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
-@@ -870,8 +859,6 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
+@@ -870,8 +861,6 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
chrome::ShowSettingsSubPage(browser, "certificates");
else
browser->OpenURL(params);
@@ -925,7 +939,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#endif // OS_ANDROID
}
-@@ -927,18 +914,18 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
+@@ -927,18 +916,18 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
return std::string(chrome::kApplicationClientIDStringForAVScanning);
}
@@ -946,7 +960,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
void ChromeDownloadManagerDelegate::GetMixedContentStatus(
download::DownloadItem* download,
-@@ -1535,8 +1522,11 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
+@@ -1535,8 +1524,11 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
@@ -958,7 +972,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
if (ShouldBlockFile(target_info->danger_type, item)) {
MaybeReportDangerousDownloadBlocked(
download_prefs_->download_restriction(), "DANGEROUS_FILE_TYPE",
-@@ -1545,6 +1535,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
+@@ -1545,6 +1537,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
// A dangerous type would take precedence over the blocking of the file.
target_info->danger_type = download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS;
}
@@ -966,7 +980,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
base::FilePath target_path = target_info->target_path;
-@@ -1687,7 +1678,6 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
+@@ -1687,7 +1680,6 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
service->MaybeSendDangerousDownloadOpenedReport(download,
show_download_in_folder);
}
@@ -974,7 +988,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
if (!download->GetAutoOpened()) {
download::DownloadContent download_content =
download::DownloadContentFromMimeType(download->GetMimeType(), false);
-@@ -1695,6 +1685,7 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
+@@ -1695,6 +1687,7 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
download->GetDangerType(), download_content, base::Time::Now(),
download->GetEndTime(), show_download_in_folder);
}
@@ -2226,6 +2240,40 @@ diff --git a/chrome/browser/safety_check/android/java/src/org/chromium/chrome/br
return true;
});
// Set the listener for clicking the passwords element.
+diff --git a/chrome/browser/signin/ui/android/java/res/layout/fre_uma_dialog.xml b/chrome/browser/signin/ui/android/java/res/layout/fre_uma_dialog.xml
+--- a/chrome/browser/signin/ui/android/java/res/layout/fre_uma_dialog.xml
++++ b/chrome/browser/signin/ui/android/java/res/layout/fre_uma_dialog.xml
+@@ -22,17 +22,6 @@
+ android:text="@string/signin_fre_uma_dialog_title"
+ style="@style/TextAppearance.Headline.Primary" />
+
+-
+-
+ mDialogManager.dismissDialog(
+ mModel, DialogDismissalCause.ACTION_ON_CONTENT));
+- Switch umaSwitch = view.findViewById(R.id.fre_uma_dialog_switch);
+- umaSwitch.setOnCheckedChangeListener(
+- (compoundButton, isChecked) -> listener.onAllowCrashUploadChecked(isChecked));
+ return view;
+ }
+
diff --git a/chrome/browser/ssl/sct_reporting_service_factory.cc b/chrome/browser/ssl/sct_reporting_service_factory.cc
--- a/chrome/browser/ssl/sct_reporting_service_factory.cc
+++ b/chrome/browser/ssl/sct_reporting_service_factory.cc
diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch
index 32e91e5e..2b1c40d7 100644
--- a/build/patches/Disable-text-fragments-by-default.patch
+++ b/build/patches/Disable-text-fragments-by-default.patch
@@ -17,7 +17,7 @@ Revert "[Text Fragment] Unflag fragment directive removal."
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
-@@ -5541,6 +5541,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5538,6 +5538,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSharingHubDesktopOmniboxDescription, kOsDesktop,
FEATURE_VALUE_TYPE(sharing_hub::kSharingHubDesktopOmnibox)},
#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch
index 72295937..a9022174 100644
--- a/build/patches/Enable-native-Android-autofill.patch
+++ b/build/patches/Enable-native-Android-autofill.patch
@@ -326,7 +326,7 @@ diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_a
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
-@@ -582,6 +582,9 @@ CHAR_LIMIT guidelines:
+@@ -576,6 +576,9 @@ CHAR_LIMIT guidelines:
Save passwords
diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch
index 74274568..62ed11a6 100644
--- a/build/patches/Enable-share-intent.patch
+++ b/build/patches/Enable-share-intent.patch
@@ -304,7 +304,7 @@ new file mode 100644
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
-@@ -5566,6 +5566,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5563,6 +5563,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(sharing_hub::kDesktopScreenshots)},
#endif
@@ -389,7 +389,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
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
-@@ -4578,6 +4578,19 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch
index bd1e0f57..c9643044 100644
--- a/build/patches/Experimental-user-scripts-support.patch
+++ b/build/patches/Experimental-user-scripts-support.patch
@@ -345,7 +345,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#include "components/version_info/version_info.h"
#include "components/viz/common/features.h"
#include "components/viz/common/switches.h"
-@@ -6531,6 +6532,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6528,6 +6529,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kUserDataSnapshot)},
#endif
diff --git a/build/patches/JIT-less-toggle.patch b/build/patches/JIT-less-toggle.patch
index 3421899f..761fddbc 100644
--- a/build/patches/JIT-less-toggle.patch
+++ b/build/patches/JIT-less-toggle.patch
@@ -70,7 +70,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -952,6 +952,13 @@ Privacy Sandbox trials are still in active development and are available in sele
+@@ -946,6 +946,13 @@ Privacy Sandbox trials are still in active development and are available in sele
Please verify that this is a valid provider or try again later
diff --git a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch
index 498e8cd3..51e34d74 100644
--- a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch
+++ b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch
@@ -152,7 +152,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -405,6 +405,10 @@ CHAR_LIMIT guidelines:
+@@ -399,6 +399,10 @@ CHAR_LIMIT guidelines:
No statistics or crash reports are sent to Google
diff --git a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch
index 6013e2cb..446ec143 100644
--- a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch
+++ b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch
@@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
+ mMostVisitedSites =
+ SuggestionsDependencyFactory.getInstance().createMostVisitedSites(Profile.getLastUsedRegularProfile());
+ }
-+ mMostVisitedSites.removeBlocklistedUrl(tabToBookmark.getOriginalUrl());
++ mMostVisitedSites.removeBlocklistedUrl(tabToBookmark.getOriginalUrl());
+
if (bridge == null || !bridge.isEditBookmarksEnabled()) {
assert false;
diff --git a/build/patches/Remove-signin-and-data-saver-integrations.patch b/build/patches/Remove-signin-and-data-saver-integrations.patch
index 4f99aead..3a2b8c94 100644
--- a/build/patches/Remove-signin-and-data-saver-integrations.patch
+++ b/build/patches/Remove-signin-and-data-saver-integrations.patch
@@ -25,7 +25,9 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
.../browser/feed/FeedSurfaceCoordinator.java | 5 +-
.../browser/feed/FeedSurfaceMediator.java | 103 +---------
chrome/android/java/AndroidManifest.xml | 8 -
+ .../res/xml/google_services_preferences.xml | 5 -
.../android/java/res/xml/main_preferences.xml | 27 +--
+ .../java/res/xml/manage_sync_preferences.xml | 12 --
.../java/res/xml/privacy_preferences.xml | 4 -
.../org/chromium/chrome/browser/AppHooks.java | 8 -
.../chrome/browser/ChromeTabbedActivity.java | 16 --
@@ -38,7 +40,7 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
.../browser/customtabs/CustomTabActivity.java | 3 -
.../DataReductionPreferenceFragment.java | 24 +--
.../browser/firstrun/FirstRunActivity.java | 41 +---
- .../firstrun/FirstRunFlowSequencer.java | 32 +---
+ .../firstrun/FirstRunFlowSequencer.java | 50 +----
.../firstrun/LightweightFirstRunActivity.java | 6 +-
.../firstrun/ToSAndUMAFirstRunFragment.java | 11 --
.../history/HistoryContentManager.java | 10 +-
@@ -68,11 +70,11 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
.../AccountPickerDelegateImpl.java | 18 --
.../signin/ui/fre/SigninFirstRunMediator.java | 32 +---
chrome/browser/sync/sync_service_factory.cc | 12 +-
- .../strings/android_chrome_strings.grd | 12 --
+ .../strings/android_chrome_strings.grd | 18 --
.../signin/SystemAccountManagerDelegate.java | 35 +---
.../net/HttpNegotiateAuthenticator.java | 88 +--------
.../chromoting/base/OAuthTokenFetcher.java | 2 -
- 53 files changed, 51 insertions(+), 1247 deletions(-)
+ 55 files changed, 52 insertions(+), 1287 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
@@ -475,6 +477,21 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
{% block extra_uses_permissions %}
{% endblock %}
+diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
+--- a/chrome/android/java/res/xml/google_services_preferences.xml
++++ b/chrome/android/java/res/xml/google_services_preferences.xml
+@@ -24,11 +24,6 @@
+ android:title="@string/autocomplete_searches_and_urls_title"
+ android:summary="@string/autocomplete_searches_and_urls_summary"
+ android:persistent="false"/>
+-
+
+
+-
+-
+-
+-
+-
+-
+
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -1376,22 +1413,40 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
-@@ -79,14 +79,6 @@ public abstract class FirstRunFlowSequencer {
- }
- }
-
+@@ -60,31 +60,7 @@ public abstract class FirstRunFlowSequencer {
+ public static class FirstRunFlowSequencerDelegate {
+ /** @return true if the sync consent promo page should be shown. */
+ boolean shouldShowSyncConsentPage(Activity activity, List accounts) {
+- // We show the sync consent page if sync is allowed, and not signed in, and
+- // - "skip the first use hints" is not set, or
+- // - "skip the first use hints" is set, but there is at least one account.
+- final IdentityManager identityManager =
+- IdentityServicesProvider.get().getIdentityManager(
+- Profile.getLastUsedRegularProfile());
+- final boolean isSignedInWithSync = identityManager.hasPrimaryAccount(ConsentLevel.SYNC);
+- final boolean shouldShowSyncConsentPreMICe = isSyncAllowed() && !isSignedInWithSync
+- && (!shouldSkipFirstUseHints(activity) || !accounts.isEmpty());
+-
+- if (FREMobileIdentityConsistencyFieldTrial.isEnabled()) {
+- final boolean isSignedInWithoutSync =
+- identityManager.hasPrimaryAccount(ConsentLevel.SIGNIN);
+- return shouldShowSyncConsentPreMICe && isSignedInWithoutSync;
+- } else {
+- return shouldShowSyncConsentPreMICe;
+- }
+- }
+-
- /** @return true if the Data Reduction promo page should be shown. */
- @VisibleForTesting
- public boolean shouldShowDataReductionPage() {
- return !DataReductionProxySettings.getInstance().isDataReductionProxyManaged()
- && DataReductionProxySettings.getInstance()
- .isDataReductionProxyFREPromoAllowed();
-- }
--
++ return false;
+ }
+
/** @return true if the Search Engine promo page should be shown. */
- @VisibleForTesting
- public boolean shouldShowSearchEnginePage() {
-@@ -99,10 +91,7 @@ public abstract class FirstRunFlowSequencer {
+@@ -99,10 +75,7 @@ public abstract class FirstRunFlowSequencer {
/** @return true if Sync is allowed for the current user. */
@VisibleForTesting
protected boolean isSyncAllowed() {
@@ -1403,7 +1458,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
}
/** @return true if first use hints should be skipped. */
-@@ -158,7 +147,7 @@ public abstract class FirstRunFlowSequencer {
+@@ -158,7 +131,7 @@ public abstract class FirstRunFlowSequencer {
}
protected boolean shouldShowDataReductionPage() {
@@ -1412,7 +1467,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
}
@VisibleForTesting
-@@ -172,7 +161,6 @@ public abstract class FirstRunFlowSequencer {
+@@ -172,7 +145,6 @@ public abstract class FirstRunFlowSequencer {
@VisibleForTesting
protected void setFirstRunFlowSignInComplete() {
@@ -1420,7 +1475,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
}
@VisibleForTesting
-@@ -183,13 +171,6 @@ public abstract class FirstRunFlowSequencer {
+@@ -183,13 +155,6 @@ public abstract class FirstRunFlowSequencer {
}
void processFreEnvironmentPreNative() {
@@ -1434,7 +1489,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
}
/**
-@@ -198,12 +179,6 @@ public abstract class FirstRunFlowSequencer {
+@@ -198,12 +163,6 @@ public abstract class FirstRunFlowSequencer {
* @param freProperties Resulting FRE properties bundle.
*/
public void updateFirstRunProperties(Bundle freProperties) {
@@ -1447,7 +1502,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
}
/**
-@@ -217,9 +192,6 @@ public abstract class FirstRunFlowSequencer {
+@@ -217,9 +176,6 @@ public abstract class FirstRunFlowSequencer {
if (!FirstRunUtils.isFirstRunEulaAccepted()) {
FirstRunUtils.setEulaAccepted();
}
@@ -2769,10 +2824,16 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
Sync and personalize across devices
-@@ -342,15 +339,6 @@ CHAR_LIMIT guidelines:
-
- Sends URLs of pages you visit to Google
+@@ -336,21 +333,6 @@ CHAR_LIMIT guidelines:
+
+ Preloads pages that Chrome thinks you might visit. To do this, Chrome may use cookies, if you allow cookies, and may encrypt and send pages through Google to hide your identity from sites.
+-
+- Make searches and browsing better
+-
+-
+- Sends URLs of pages you visit to Google
+-
-
- For more settings that relate to privacy, security, and data collection, see <link>Sync and Google services</link>
-
diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch
index 7e330303..d5c3ff7f 100644
--- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch
+++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch
@@ -7,7 +7,7 @@ This reverts commit ae458edcc8422d0815d0e82261e71fe10d7d6fc2.
Disable search-ready omnibox by default
---
- chrome/browser/about_flags.cc | 3 +++
+ chrome/browser/about_flags.cc | 5 ++++-
chrome/browser/flag-metadata.json | 5 +++++
chrome/browser/flag_descriptions.cc | 5 +++++
chrome/browser/flag_descriptions.h | 3 +++
@@ -15,21 +15,31 @@ Disable search-ready omnibox by default
chrome/browser/flags/android/chrome_feature_list.h | 1 +
.../chrome/browser/flags/ChromeFeatureList.java | 1 +
.../suggestions/DropdownItemViewInfoListBuilder.java | 10 ++++++++--
- 8 files changed, 30 insertions(+), 2 deletions(-)
+ 8 files changed, 31 insertions(+), 3 deletions(-)
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
-@@ -3381,6 +3381,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3380,8 +3380,8 @@ const FeatureEntry kFeatureEntries[] = {
+ #if defined(USE_AURA)
{"overscroll-history-navigation",
flag_descriptions::kOverscrollHistoryNavigationName,
- flag_descriptions::kOverscrollHistoryNavigationDescription, kOsAura,
+- flag_descriptions::kOverscrollHistoryNavigationDescription, kOsAura,
+ FEATURE_VALUE_TYPE(features::kOverscrollHistoryNavigation)},
++ flag_descriptions::kOverscrollHistoryNavigationDescription, kOsAura,
+ {"pull-to-refresh", flag_descriptions::kPullToRefreshName,
+ flag_descriptions::kPullToRefreshDescription, kOsAura,
+ MULTI_VALUE_TYPE(kPullToRefreshChoices)},
+@@ -7748,6 +7748,9 @@ const FeatureEntry kFeatureEntries[] = {
+ // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
+ // Histograms" in tools/metrics/histograms/README.md (run the
+ // AboutFlagsHistogramTest unit test to verify this process).
+ {"enable-search-ready-omnibox", flag_descriptions::kSearchReadyOmniboxName,
+ flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid,
+ FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)},
- FEATURE_VALUE_TYPE(features::kOverscrollHistoryNavigation)},
- {"pull-to-refresh", flag_descriptions::kPullToRefreshName,
- flag_descriptions::kPullToRefreshDescription, kOsAura,
+ };
+
+ class FlagsStateSingleton : public flags_ui::FlagsState::Delegate {
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch
index b54510ba..7a037aba 100644
--- a/build/patches/Restore-Simplified-NTP-launch.patch
+++ b/build/patches/Restore-Simplified-NTP-launch.patch
@@ -325,7 +325,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug
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
-@@ -4005,6 +4005,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4002,6 +4002,9 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE_AND_VALUE(
switches::kForceShowUpdateMenuItemCustomSummary,
"Custom Summary")},
diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
index e4e2b0d8..1e1227bd 100644
--- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
+++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
@@ -13,7 +13,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
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
-@@ -3435,6 +3435,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3432,6 +3432,10 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableHostedAppShimCreation)},
#endif // OS_MAC
#if defined(OS_ANDROID)
diff --git a/build/patches/Revert-flags-remove-num-raster-threads.patch b/build/patches/Revert-flags-remove-num-raster-threads.patch
index 1e36e561..d5d8dae9 100644
--- a/build/patches/Revert-flags-remove-num-raster-threads.patch
+++ b/build/patches/Revert-flags-remove-num-raster-threads.patch
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
{flag_descriptions::kTouchSelectionStrategyCharacter,
-@@ -3647,6 +3656,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3644,6 +3653,9 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-use-zoom-for-dsf", flag_descriptions::kEnableUseZoomForDsfName,
flag_descriptions::kEnableUseZoomForDsfDescription, kOsAll,
MULTI_VALUE_TYPE(kEnableUseZoomForDSFChoices)},
diff --git a/build/patches/ungoogled-chromium-Disable-domain-reliability.patch b/build/patches/ungoogled-chromium-Disable-domain-reliability.patch
index 3f46bebf..96c7ca9d 100644
--- a/build/patches/ungoogled-chromium-Disable-domain-reliability.patch
+++ b/build/patches/ungoogled-chromium-Disable-domain-reliability.patch
@@ -10,8 +10,8 @@ Subject: ungoogled-chromium: Disable domain reliability
.../domain_reliability/google_configs.cc | 10 ++---
.../domain_reliability/google_configs.h | 8 ++--
components/domain_reliability/uploader.cc | 2 +-
- components/google/core/common/google_util.cc | 4 +-
- 8 files changed, 30 insertions(+), 84 deletions(-)
+ components/google/core/common/google_util.cc | 14 +------
+ 8 files changed, 30 insertions(+), 94 deletions(-)
diff --git a/chrome/browser/domain_reliability/service_factory.cc b/chrome/browser/domain_reliability/service_factory.cc
--- a/chrome/browser/domain_reliability/service_factory.cc
@@ -232,7 +232,24 @@ diff --git a/components/domain_reliability/uploader.cc b/components/domain_relia
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
-@@ -55,7 +55,6 @@ GURL AppendGoogleLocaleParam(const GURL& url,
+@@ -33,16 +33,6 @@ namespace google_util {
+
+ const char kGoogleHomepageURL[] = "https://www.google.com/";
+
+-bool HasGoogleSearchQueryParam(base::StringPiece str) {
+- url::Component query(0, static_cast(str.length())), key, value;
+- while (url::ExtractQueryKeyValue(str.data(), &query, &key, &value)) {
+- base::StringPiece key_str = str.substr(key.begin, key.len);
+- if (key_str == "q" || key_str == "as_q" || key_str == "imgurl")
+- return true;
+- }
+- return false;
+-}
+-
+ std::string GetGoogleLocale(const std::string& application_locale) {
+ // Google does not recognize "nb" for Norwegian Bokmal; it uses "no".
+ return (application_locale == "nb") ? "no" : application_locale;
+@@ -55,7 +45,6 @@ GURL AppendGoogleLocaleParam(const GURL& url,
}
std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
@@ -240,7 +257,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co
return std::string();
}
-@@ -101,8 +100,7 @@ bool IsGoogleHostname(base::StringPiece host,
+@@ -101,8 +90,7 @@ bool IsGoogleHostname(base::StringPiece host,
bool IsGoogleDomainUrl(const GURL& url,
SubdomainPermission subdomain_permission,
PortPermission port_permission) {