Release 81.0.4044.63

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)

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

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

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

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,
+ };
+ 
+@@ -53,7 +54,7 @@ const PrepopulatedEngine* const engines_AL[] = {
+     &googleen, &google,
+     &yahoo,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &yandex_ru,
  };
  
- // Albania
-@@ -60,7 +61,7 @@ const PrepopulatedEngine* const engines_AR[] = {
+@@ -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,
+     &ecosia,
+ };
+@@ -79,7 +80,7 @@ const PrepopulatedEngine* const engines_AT[] = {
+ const PrepopulatedEngine* const engines_AU[] = {
+     &googleen, &google,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &yahoo_au,
+     &ecosia,
+ };
+@@ -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,
  };
  
- // Australia
-@@ -76,7 +77,7 @@ const PrepopulatedEngine* const engines_AU[] = {
+ // Bulgaria
+@@ -107,7 +108,7 @@ const PrepopulatedEngine* const engines_BG[] = {
      &googleen, &google,
      &bing,
-     &yahoo_au,
+     &yahoo,
 -    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
+     &yandex_ru,
  };
  
- // Bosnia and Herzegovina
-@@ -92,7 +93,7 @@ const PrepopulatedEngine* const engines_BE[] = {
+@@ -116,7 +117,7 @@ const PrepopulatedEngine* const engines_BH[] = {
      &googleen, &google,
      &bing,
      &yahoo,
 -    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
+     &ecosia,
  };
  
- // Bulgaria
-@@ -124,7 +125,7 @@ const PrepopulatedEngine* const engines_BN[] = {
+@@ -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,
  };
  
- // Bolivia
-@@ -132,7 +133,7 @@ const PrepopulatedEngine* const engines_BO[] = {
+@@ -143,7 +144,7 @@ const PrepopulatedEngine* const engines_BO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
 -    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
+     &ecosia,
  };
  
- // Brazil
-@@ -140,7 +141,7 @@ const PrepopulatedEngine* const engines_BR[] = {
+@@ -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[] = {
+@@ -170,7 +171,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
+     &googleen, &google,
      &bing,
      &yahoo,
-     &duckduckgo,
-+    &duckduckgo_light,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &ask,
  };
  
- // Canada
- const PrepopulatedEngine* const engines_CA[] = {
--    &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo,
-+    &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light,
+@@ -179,7 +180,7 @@ const PrepopulatedEngine* const engines_CA[] = {
+     &googleen, &google,
+     &bing,
+     &yahoo_ca,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &ecosia,
  };
  
- // Switzerland
-@@ -169,6 +171,7 @@ const PrepopulatedEngine* const engines_CH[] = {
+@@ -187,7 +188,7 @@ const PrepopulatedEngine* const engines_CA[] = {
+ const PrepopulatedEngine* const engines_CH[] = {
      &googleen, &google,
      &bing,
-     &duckduckgo,
-+    &duckduckgo_light,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
      &yahoo_ch,
+     &ecosia,
  };
- 
-@@ -177,7 +180,7 @@ const PrepopulatedEngine* const engines_CL[] = {
+@@ -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,
+ };
+ 
+@@ -423,7 +424,7 @@ const PrepopulatedEngine* const engines_IL[] = {
+     &bing,
+     &yahoo,
+     &yandex_ru,
+-    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
  };
  
- // Israel
-@@ -382,7 +385,7 @@ const PrepopulatedEngine* const engines_IN[] = {
+ // India
+@@ -431,7 +432,7 @@ const PrepopulatedEngine* const engines_IN[] = {
      &googleen, &google,
      &yahoo_in,
      &bing,
 -    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &yandex_ru,
+ };
+ 
+@@ -441,7 +442,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
+     &yahoo,
+     &bing,
+     &yandex_ru,
+-    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
  };
  
- // Iraq
-@@ -405,7 +408,7 @@ const PrepopulatedEngine* const engines_IS[] = {
+ // 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[] = {
+@@ -495,7 +496,7 @@ const PrepopulatedEngine* const engines_JP[] = {
+     &yahoo_jp,
+     &bing,
+     &baidu,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Kenya
+@@ -503,7 +504,7 @@ const PrepopulatedEngine* const engines_KE[] = {
      &googleen, &google,
+     &bing,
      &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &yandex_ru,
+ };
+ 
+@@ -521,7 +522,7 @@ const PrepopulatedEngine* const engines_KW[] = {
+     &googleen, &google,
      &bing,
+     &yahoo,
 -    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
+     &yandex_com,
  };
  
- // South Korea
-@@ -478,6 +481,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -539,7 +540,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+     &googleen, &google,
      &bing,
      &yahoo,
-     &duckduckgo,
-+    &duckduckgo_light,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &ecosia,
  };
  
- // Liechtenstein
-@@ -485,6 +489,7 @@ const PrepopulatedEngine* const engines_LI[] = {
+@@ -547,7 +548,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+ const PrepopulatedEngine* const engines_LI[] = {
      &googleen, &google,
      &bing,
-     &duckduckgo,
-+    &duckduckgo_light,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &yahoo,
+     &ecosia,
+ };
+@@ -558,14 +559,14 @@ const PrepopulatedEngine* const engines_LT[] = {
+     &bing,
      &yahoo,
+     &yandex_ru,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
  };
  
-@@ -500,7 +505,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+ // Luxembourg
  const PrepopulatedEngine* const engines_LU[] = {
      &googleen, &google,
      &bing,
 -    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
      &yahoo,
+     &ecosia,
+ };
+@@ -576,7 +577,7 @@ const PrepopulatedEngine* const engines_LV[] = {
+     &yandex_ru,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
  };
  
-@@ -533,7 +538,7 @@ const PrepopulatedEngine* const engines_MC[] = {
-     &googleen, &google,
+ // 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,
  };
  
- // Moldova
-@@ -541,7 +546,7 @@ const PrepopulatedEngine* const engines_MD[] = {
+@@ -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[] = {
+@@ -728,7 +730,7 @@ const PrepopulatedEngine* const engines_PK[] = {
+     &googleen, &google,
+     &yahoo,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &yandex_com,
+ };
+ 
+@@ -737,7 +739,7 @@ const PrepopulatedEngine* const engines_PL[] = {
      &googleen, &google,
      &bing,
      &yahoo,
 -    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
+     &yandex_ru,
  };
  
- // Puerto Rico
-@@ -661,7 +667,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+@@ -746,7 +748,7 @@ const PrepopulatedEngine* const engines_PR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
 -    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
+     &ecosia,
  };
  
- // Portugal
-@@ -669,7 +675,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+@@ -755,7 +757,7 @@ const PrepopulatedEngine* const engines_PT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
 -    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
+     &ecosia,
  };
  
- // Paraguay
-@@ -677,7 +683,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+@@ -764,7 +766,7 @@ const PrepopulatedEngine* const engines_PY[] = {
      &googleen, &google,
      &bing,
      &yahoo,
 -    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
+     &ecosia,
  };
  
- // Qatar
-@@ -693,7 +699,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+@@ -773,7 +775,7 @@ const PrepopulatedEngine* const engines_QA[] = {
      &googleen, &google,
      &bing,
      &yahoo,
 -    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
+     &yandex_com,
  };
  
- // Serbia
-@@ -701,7 +707,7 @@ const PrepopulatedEngine* const engines_RS[] = {
+@@ -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,
  };
  
- // Russia
-@@ -733,7 +739,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+@@ -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,
+ };
+ 
+@@ -873,7 +875,7 @@ const PrepopulatedEngine* const engines_SY[] = {
+     &bing,
+     &yahoo,
+     &yandex_ru,
+-    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
  };
  
- // El Salvador
-@@ -765,7 +771,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+ // 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,
+ };
+ 
+@@ -981,7 +983,7 @@ const PrepopulatedEngine* const engines_YE[] = {
+     &bing,
+     &yahoo,
+     &yandex_ru,
+-    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
  };
  
- // Vietnam
-@@ -877,7 +883,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+ // South Africa
+@@ -989,7 +991,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
      &googleen, &google,
      &bing,
      &yahoo,
 -    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &baidu,
+ };
+ 
+@@ -999,7 +1001,7 @@ const PrepopulatedEngine* const engines_ZW[] = {
+     &bing,
+     &yahoo,
+     &ask,
+-    &duckduckgo,
 +    &duckduckgo, &duckduckgo_light,
  };
+ // ----------------------------------------------------------------------------
  
- // Zimbabwe
 -- 
 2.17.1
 

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 @@
-     <integer name="list_item_level_selected">1</integer>
-     <integer name="list_item_level_incognito">2</integer>
+@@ -72,6 +72,9 @@
+     <!-- Value for scaleX to mirror drawables correctly for LTR / RTL layouts. -->
+     <integer name="automirror_scale_x_reverse">-1</integer>
  
 +    <string name="proxy_title">Proxy configuration</string>
 +    <string name="proxy_url">chrome://proxy</string>
@@ -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<base::string16> 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 @@
          <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_services\manifest.json" type="BINDATA" />
        </if>
  
@@ -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<MemoryInternalsUI>;
    if (url.host_piece() == chrome::kChromeUINetExportHost)
      return &NewWebUI<NetExportUI>;
@@ -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[];

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" />
      <Preference
-         android:fragment="org.chromium.chrome.browser.settings.privacy.DoNotTrackPreference"
+         android:fragment="org.chromium.chrome.browser.settings.privacy.DoNotTrackSettings"
          android:key="do_not_track"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java b/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
 new file mode 100644
@@ -62,7 +61,7 @@ new file mode 100644
 +import org.chromium.chrome.browser.tab.Tab;
 +import org.chromium.chrome.browser.tab.TabImpl;
 +import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
-+import org.chromium.chrome.browser.tabmodel.TabLaunchType;
++import org.chromium.chrome.browser.tab.TabLaunchType;
 +import org.chromium.chrome.browser.tabmodel.TabModel;
 +import org.chromium.content_public.browser.LoadUrlParams;
 +
@@ -127,15 +126,15 @@ new file mode 100644
 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
-@@ -54,6 +54,7 @@ import org.chromium.base.annotations.UsedByReflection;
- import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.base.metrics.RecordUserAction;
+@@ -54,6 +54,7 @@ import org.chromium.base.metrics.RecordUserAction;
+ import org.chromium.base.supplier.ObservableSupplier;
+ import org.chromium.base.supplier.ObservableSupplierImpl;
  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.appmenu.AppMenuPropertiesDelegateImpl;
-@@ -1680,6 +1681,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1545,6 +1546,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              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
+       <message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY" desc="A text for the basic tab explaining browsing history.">
+         Clears history and autocompletions in the address bar.
        </message>
- 
 +      <!-- always incognito -->
 +      <message name="IDS_ALWAYS_INCOGNITO_TITLE" desc="Title for always incognito mode">
 +        Open links in incognito tabs always
@@ -317,10 +305,9 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 +      <message name="IDS_ALWAYS_INCOGNITO_SUMMARY" desc="Summary for always incognito mode">
 +        Opens links in incognito tabs when you click on new tab or on a link
 +      </message>
-+
-       <!-- Themes preferences -->
-       <message name="IDS_PREFS_THEMES" desc="Title for the Themes preferences. [CHAR-LIMIT=32]">
-         Themes
+       <message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SIGNED_IN" desc="A text explaining other forms of activity for signed in users.">
+         Clears history and autocompletions in the address bar. Your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
+       </message>
 -- 
 2.17.1
 

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<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
          List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
          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<BookmarkId> 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<BookmarkUIObserver> 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<jobject>&) {
-@@ -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:
-       <message name="IDS_SEARCH" desc="The label for a search button.">
-         Search
+@@ -256,6 +256,12 @@ CHAR-LIMIT guidelines:
+       <message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR-LIMIT=32]">
+         Sites
        </message>
 +      <message name="IDS_IMPORT_BOOKMARKS" desc="The label for the import bookmarks button.">
 +        Import
@@ -751,13 +751,13 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 +      <message name="IDS_EXPORT_BOOKMARKS" desc="The label for an export bookmarks button.">
 +        Export
 +      </message>
-       <message name="IDS_SHOW_INFO" desc="The label for a info button to show info.">
-         Show Info
+       <message name="IDS_NOTIFICATION_CATEGORY_VR" desc="Label for notifications in VR, within a list of notification categories. [CHAR-LIMIT=32]">
+         Virtual Reality
        </message>
 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") {
      }
    }
  

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" />
 +    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
@@ -45,7 +45,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
  import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
  import org.chromium.chrome.browser.searchwidget.SearchActivity;
  import org.chromium.chrome.browser.tab.Tab;
-+import org.chromium.chrome.browser.settings.privacy.PrivacyPreferences;
++import org.chromium.chrome.browser.settings.privacy.PrivacySettings;
  import org.chromium.chrome.browser.util.IntentUtils;
  import org.chromium.chrome.browser.util.UrlConstants;
  import org.chromium.chrome.browser.vr.VrModuleProvider;
@@ -53,15 +53,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
       */
      public static boolean isCustomTabIntent(Intent intent) {
          if (intent == null) return false;
-+        if (!ContextUtils.getAppSharedPreferences().getBoolean(PrivacyPreferences.PREF_ALLOW_CUSTOM_TAB_INTENTS, false))
++        if (!ContextUtils.getAppSharedPreferences().getBoolean(PrivacySettings.PREF_ALLOW_CUSTOM_TAB_INTENTS, false))
 +            return false;
          if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent)
                  || !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) {
              return false;
-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
-@@ -41,6 +41,8 @@ public class PrivacyPreferences
+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
+@@ -15,7 +15,7 @@ import android.view.MenuItem;
+ 
+ import org.chromium.base.BuildInfo;
+ import org.chromium.chrome.R;
+-import org.chromium.chrome.browser.ChromeFeatureList;
++import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.help.HelpAndFeedback;
+ import org.chromium.chrome.browser.preferences.Pref;
+ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+@@ -41,6 +41,8 @@ public class PrivacySettings
  
      private ManagedPreferenceDelegate mManagedPreferenceDelegate;
  
@@ -70,7 +79,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
      @Override
      public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
          SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
-@@ -76,6 +78,10 @@ public class PrivacyPreferences
+@@ -76,6 +78,10 @@ public class PrivacySettings
                      Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
          } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
              PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
@@ -81,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
          } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
              PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
          }
-@@ -111,6 +117,11 @@ public class PrivacyPreferences
+@@ -111,6 +117,11 @@ public class PrivacySettings
                      prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
          }
  
@@ -96,7 +105,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
-@@ -3975,6 +3975,13 @@ The site does NOT gain access to the camera. The camera images are only visible
+@@ -3863,6 +3863,13 @@ Only you can see what your camera is looking at. The site can't see your camera'
        <message name="IDS_NEAR_OOM_REDUCTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can be reloaded.">
           Show original
        </message>

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" />
          <item android:id="@+id/enter_vr_id"
              android:title="@string/enter_vr" />
@@ -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<C extends ChromeActivityComponent>
+@@ -2044,6 +2044,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              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, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
-       <message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
+@@ -2818,6 +2818,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+       <message name="IDS_MENU_SETTINGS" desc="Menu item for opening browser settings. [CHAR-LIMIT=27]">
          Settings
        </message>
 +      <message name="IDS_MENU_EXIT" desc="Menu item for exit browser. [CHAR-LIMIT=27]">

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",

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",

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};
  

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[];

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",
      },

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
+

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" >
 +
-+            <org.chromium.chrome.browser.widget.ChromeTextInputLayout
++            <org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
 +                android:id="@+id/adblock_url"
 +                style="@style/PreferenceScreenLayout"
 +                android:layout_width="match_parent"
@@ -80,7 +81,7 @@ new file mode 100644
 +                    android:inputType="textUri"
 +                    android:singleLine="true"
 +                    android:hint="@string/options_adblock_edit_label" />
-+            </org.chromium.chrome.browser.widget.ChromeTextInputLayout>
++            </org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
 +
 +            <Space style="@style/ButtonBarTopSpacer" />
 +            <View style="@style/ButtonBarTopDivider" />
@@ -104,7 +105,7 @@ new file mode 100644
 +        </LinearLayout>
 +    </ScrollView>
 +
-+    <include layout="@layout/preferences_action_bar_shadow"/>
++    <include layout="@layout/settings_action_bar_shadow"/>
 +
 +</FrameLayout>
 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"/>
 +    <Preference
 +        android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"
@@ -164,6 +165,32 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
      <Preference
          android:fragment="org.chromium.chrome.browser.settings.accessibility.AccessibilitySettings"
          android:key="accessibility"
+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
+@@ -238,6 +238,14 @@ public class FeatureUtilities {
+                 ChromeFeatureList.isEnabled(ChromeFeatureList.REACHED_CODE_PROFILER));
+     }
+ 
++     public static void setAdBlockFiltersURL(String url) {
++         FeatureUtilitiesJni.get().setAdBlockFiltersURL(url);
++     }
++
++     public static String getAdBlockFiltersURL() {
++         return FeatureUtilitiesJni.get().getAdBlockFiltersURL();
++     }
++
+     /**
+      * @return True if tab model merging for Android N+ is enabled.
+      */
+@@ -785,5 +793,7 @@ public class FeatureUtilities {
+     @NativeMethods
+     interface Natives {
+         boolean isNetworkServiceWarmUpEnabled();
++        void setAdBlockFiltersURL(String url);
++        String getAdBlockFiltersURL();
+     }
+ }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
 new file mode 100644
 --- /dev/null
@@ -278,7 +305,7 @@ new file mode 100644
 +import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
 +
 +import org.chromium.chrome.browser.settings.website.WebsitePreferenceBridge;
-+import org.chromium.chrome.browser.ContentSettingsType;
++import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.chrome.browser.settings.SettingsUtils;
 +import org.chromium.chrome.browser.flags.FeatureUtilities;
 +import androidx.annotation.VisibleForTesting;
@@ -325,7 +352,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
-@@ -9734,6 +9734,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9937,6 +9937,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
  
@@ -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<adblock_updater::AdBlockUpdaterService>(
            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
        </message>
  
@@ -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";
  

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'
        <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
          IMAGE
        </message>

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:
-       <message name="IDS_NOTIFICATIONS_CONTENT_SUGGESTIONS_SUMMARY_DISABLED" desc="Summary for the disabled preference to turn on/off content suggestions notifications when search and site suggestions are disabled.">
-         Search and site suggestions disabled
+@@ -732,6 +732,9 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_HOUR" desc="The option to delete browsing data from the last hour.">
+         Last hour
        </message>
 +      <message name="IDS_OPTIONS_NTP_IS_HOMEPAGE_LABEL" desc="The label for switch that allows the user to toggle whether opening a new tab leads to the new tab page or the home page.">
 +        Use for new tabs
 +      </message>
- 
-       <!-- always incognito -->
-       <message name="IDS_ALWAYS_INCOGNITO_TITLE" desc="Title for always incognito mode">
+       <message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_24_HOURS" desc="The option to delete browsing data from the last 24 hours.">
+         Last 24 hours
+       </message>
 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[];

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
      <!-- A toggle for enabling vibration in notifications. -->
      <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
          android:key="notifications_vibrate"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java
-@@ -130,6 +130,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
+@@ -130,6 +130,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
  
      // Keys for category-specific preferences (toggle, link, button etc.), dynamically shown.
      public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies";
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/websit
      public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
      public static final String NOTIFICATIONS_QUIET_UI_TOGGLE_KEY = "notifications_quiet_ui";
      public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
-@@ -479,6 +480,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -478,6 +479,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
  
                  if (type == SiteSettingsCategory.Type.COOKIES) {
                      updateThirdPartyCookiesCheckBox();
@@ -60,7 +60,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/websit
                  } else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
                      updateNotificationsSecondaryControls();
                  }
-@@ -517,6 +519,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -516,6 +518,8 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
              int setting = (int) newValue;
              WebsitePreferenceBridge.setContentSetting(mCategory.getContentSettingsType(), setting);
              getInfoForOrigins();
@@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/websit
          } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
              PrefServiceBridge.getInstance().setBoolean(
                      Pref.BLOCK_THIRD_PARTY_COOKIES, ((boolean) newValue));
-@@ -828,6 +832,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -829,6 +833,8 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
          TriStateSiteSettingsPreference triStateToggle =
                  (TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY);
          Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY);
@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/websit
          Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
          Preference notificationsQuietUi = screen.findPreference(NOTIFICATIONS_QUIET_UI_TOGGLE_KEY);
          Preference explainProtectedMediaKey = screen.findPreference(EXPLAIN_PROTECTED_MEDIA_KEY);
-@@ -860,6 +866,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -861,6 +867,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
  
          if (hideSecondaryToggles) {
              screen.removePreference(thirdPartyCookies);
@@ -86,7 +86,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/websit
              screen.removePreference(notificationsVibrate);
              screen.removePreference(notificationsQuietUi);
              screen.removePreference(explainProtectedMediaKey);
-@@ -871,12 +878,15 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -872,12 +879,15 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
              return;
          }
  
@@ -103,7 +103,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/websit
          }
  
          // Configure/hide the notifications secondary controls, as needed.
-@@ -990,6 +1000,15 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -992,6 +1002,15 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
          }
      }
  
@@ -202,7 +202,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
-@@ -898,6 +898,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -814,6 +814,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_BLOCK_THIRD_PARTY_COOKIES_SUMMARY" desc="Summary text for Block Third Party Cookies preference">
          Prevent third-party websites from saving and reading cookie data
        </message>

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" >
 +
-+            <org.chromium.chrome.browser.widget.ChromeTextInputLayout
++            <org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
 +                android:id="@+id/doh_url"
 +                style="@style/PreferenceScreenLayout"
 +                android:layout_width="match_parent"
@@ -77,7 +77,7 @@ new file mode 100644
 +                    android:inputType="textUri"
 +                    android:singleLine="true"
 +                    android:hint="@string/options_doh_edit_label" />
-+            </org.chromium.chrome.browser.widget.ChromeTextInputLayout>
++            </org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
 +
 +            <Space style="@style/ButtonBarTopSpacer" />
 +            <View style="@style/ButtonBarTopDivider" />
@@ -101,13 +101,13 @@ new file mode 100644
 +        </LinearLayout>
 +    </ScrollView>
 +
-+    <include layout="@layout/preferences_action_bar_shadow"/>
++    <include layout="@layout/settings_action_bar_shadow"/>
 +
 +</FrameLayout>
 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 @@
      <integer name="download_infobar_bar_fill_in_delay">400</integer>
      <integer name="download_infobar_bar_fill_out_delay">200</integer>
  
@@ -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.">
          <message name="IDS_OPTIONS_HOMEPAGE_TITLE" desc="The title of the home page overlay on Android" formatter_data="android_java">
            Home page
          </message>
@@ -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
        </message>
  
@@ -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",

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<std::string> kDisableTriggerTypes{
+     &kInterestFeedContentSuggestions, "disable_trigger_types", ""};
 -- 
 2.17.1
 

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<blink::WebMediaPlayer::TrackId>& 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;

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

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;
        }

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, "");
              }

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
 

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());
  

build/patches/Battery-API-return-nothing.patch

@@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 -  BatteryStatus old_status = battery_status_;
 -  battery_status_ = *BatteryDispatcher::Instance().LatestData();
 -
-   if (battery_property_->GetState() == ScriptPromisePropertyBase::kPending) {
+   if (battery_property_->GetState() == BatteryProperty::kPending) {
      battery_property_->Resolve(this);
      return;
    }

build/patches/Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch

@@ -9,7 +9,6 @@ This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs
  .../chrome_autocomplete_scheme_classifier.cc  |  1 +
  chrome/browser/history/history_utils.cc       |  1 +
  chrome/browser/ui/singleton_tabs.cc           |  3 +-
- .../browser/url_request_context_factory.cc    |  7 +++-
  .../omnibox/browser/autocomplete_input.cc     |  7 ++--
  components/url_formatter/url_fixer.cc         |  4 +++
  .../child_process_security_policy_impl.cc     |  1 +
@@ -21,7 +20,7 @@ This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs
  url/url_constants.cc                          |  1 +
  url/url_constants.h                           |  1 +
  url/url_util.cc                               |  2 ++
- 15 files changed, 97 insertions(+), 4 deletions(-)
+ 14 files changed, 91 insertions(+), 3 deletions(-)
  create mode 100644 net/url_request/trk_protocol_handler.cc
  create mode 100644 net/url_request/trk_protocol_handler.h
 
@@ -50,7 +49,7 @@ diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/hi
 diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
 --- a/chrome/browser/ui/singleton_tabs.cc
 +++ b/chrome/browser/ui/singleton_tabs.cc
-@@ -100,7 +100,8 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
+@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
  
      // Skip view-source tabs. This is needed because RewriteURLIfNecessary
      // removes the "view-source:" scheme which leads to incorrect matching.
@@ -60,36 +59,6 @@ diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_t
        continue;
  
      GURL rewritten_tab_url = tab_url;
-diff --git a/chromecast/browser/url_request_context_factory.cc b/chromecast/browser/url_request_context_factory.cc
---- a/chromecast/browser/url_request_context_factory.cc
-+++ b/chromecast/browser/url_request_context_factory.cc
-@@ -40,6 +40,7 @@
- #include "net/proxy_resolution/proxy_resolution_service.h"
- #include "net/quic/quic_context.h"
- #include "net/ssl/ssl_config_service_defaults.h"
-+#include "net/url_request/trk_protocol_handler.h"
- #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_builder.h"
- #include "net/url_request/url_request_context_getter.h"
-@@ -248,13 +249,17 @@ void URLRequestContextFactory::InitializeMainContextDependencies(
-       new net::URLRequestJobFactoryImpl());
-   // Keep ProtocolHandlers added in sync with
-   // CastContentBrowserClient::IsHandledURL().
-+  bool set_protocol = false;
-   for (content::ProtocolHandlerMap::iterator it = protocol_handlers->begin();
-        it != protocol_handlers->end();
-        ++it) {
--    bool set_protocol =
-+    set_protocol =
-         job_factory->SetProtocolHandler(it->first, std::move(it->second));
-     DCHECK(set_protocol);
-   }
-+  set_protocol = job_factory->SetProtocolHandler(
-+      url::kTraceScheme, base::WrapUnique(new net::TrkProtocolHandler));
-+  DCHECK(set_protocol);
- 
-   // Set up interceptors in the reverse order.
-   std::unique_ptr<net::URLRequestJobFactory> top_job_factory =
 diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
 --- a/components/omnibox/browser/autocomplete_input.cc
 +++ b/components/omnibox/browser/autocomplete_input.cc
@@ -117,7 +86,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
 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
-@@ -552,6 +552,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
+@@ -566,6 +566,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
      }
    }
  
@@ -131,7 +100,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
 diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -617,6 +617,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
+@@ -620,6 +620,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
  #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
    RegisterWebSafeScheme(url::kFtpScheme);
    RegisterWebSafeScheme(url::kDataScheme);
@@ -142,7 +111,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1662,6 +1662,8 @@ component("net") {
+@@ -1075,6 +1075,8 @@ component("net") {
        "url_request/report_sender.h",
        "url_request/static_http_user_agent_settings.cc",
        "url_request/static_http_user_agent_settings.h",
@@ -263,7 +232,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
  #include "net/url_request/url_request_context.h"
  #include "net/url_request/url_request_context_storage.h"
  #include "net/url_request/url_request_intercepting_job_factory.h"
-@@ -649,6 +650,9 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+@@ -648,6 +649,9 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
      }
      url_request_interceptors_.clear();
    }
@@ -298,7 +267,7 @@ diff --git a/url/url_constants.h b/url/url_constants.h
 diff --git a/url/url_util.cc b/url/url_util.cc
 --- a/url/url_util.cc
 +++ b/url/url_util.cc
-@@ -27,6 +27,7 @@ struct SchemeRegistry {
+@@ -32,6 +32,7 @@ struct SchemeRegistry {
    std::vector<SchemeWithType> standard_schemes = {
        {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
        {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
@@ -306,7 +275,7 @@ diff --git a/url/url_util.cc b/url/url_util.cc
        // Yes, file URLs can have a hostname, so file URLs should be handled as
        // "standard". File URLs never have a port as specified by the SchemeType
        // field.  Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file
-@@ -64,6 +65,7 @@ struct SchemeRegistry {
+@@ -69,6 +70,7 @@ struct SchemeRegistry {
        kAboutScheme,
        kJavaScriptScheme,
        kDataScheme,

build/patches/Bromite-AdBlockUpdaterService.patch

@@ -7,7 +7,6 @@ Do not use experiments to enable/disable presets
 Always enable ad filtering
 Download filters by checking Last-Modified header first
 ---
- .../browser/flags/FeatureUtilities.java       |  10 +
  chrome/browser/after_startup_task_utils.cc    |   5 +
  chrome/browser/browser_process.h              |   7 +
  chrome/browser/browser_process_impl.cc        |  28 ++
@@ -28,38 +27,12 @@ Download filters by checking Last-Modified header first
  .../browser/subresource_filter_features.cc    | 113 +-------
  .../core/common/common_features.cc            |   2 +-
  .../frame_host/navigation_throttle_runner.cc  |  10 -
- 21 files changed, 818 insertions(+), 144 deletions(-)
+ 20 files changed, 808 insertions(+), 144 deletions(-)
  create mode 100644 components/component_updater/adblock_updater_service.cc
  create mode 100644 components/component_updater/adblock_updater_service.h
  create mode 100644 components/component_updater/download_filters_task.cc
  create mode 100644 components/component_updater/download_filters_task.h
 
-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
-@@ -156,6 +156,14 @@ public class FeatureUtilities {
-         cacheServiceManagerForBackgroundPrefetch();
-     }
- 
-+     public static void setAdBlockFiltersURL(String url) {
-+         FeatureUtilitiesJni.get().setAdBlockFiltersURL(url);
-+     }
-+
-+     public static String getAdBlockFiltersURL() {
-+         return FeatureUtilitiesJni.get().getAdBlockFiltersURL();
-+     }
-+
-     /**
-      * @return True if tab model merging for Android N+ is enabled.
-      */
-@@ -729,5 +737,7 @@ public class FeatureUtilities {
-         void setActivityType(@ActivityType int type);
-         void setIsInMultiWindowMode(boolean isInMultiWindowMode);
-         boolean isNetworkServiceWarmUpEnabled();
-+        void setAdBlockFiltersURL(String url);
-+        String getAdBlockFiltersURL();
-     }
- }
 diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
 --- a/chrome/browser/after_startup_task_utils.cc
 +++ b/chrome/browser/after_startup_task_utils.cc
@@ -72,7 +45,7 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
  using content::BrowserThread;
  using content::WebContents;
  using content::WebContentsObserver;
-@@ -136,6 +138,9 @@ void SetBrowserStartupIsComplete() {
+@@ -137,6 +139,9 @@ void SetBrowserStartupIsComplete() {
    g_after_startup_tasks.Get().clear();
    g_after_startup_tasks.Get().shrink_to_fit();
  
@@ -116,7 +89,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 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
-@@ -1007,6 +1007,34 @@ BrowserProcessImpl::component_updater() {
+@@ -1012,6 +1012,34 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -174,7 +147,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -1727,9 +1727,12 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1723,9 +1723,12 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
  
    PreBrowserStart();
  
@@ -191,23 +164,23 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows
 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
-@@ -63,7 +63,6 @@
- #include "chrome/browser/gpu/chrome_browser_main_extra_parts_gpu.h"
+@@ -65,7 +65,6 @@
  #include "chrome/browser/hid/chrome_hid_delegate.h"
+ #include "chrome/browser/interstitials/enterprise_util.h"
  #include "chrome/browser/lifetime/browser_shutdown.h"
 -#include "chrome/browser/lookalikes/lookalike_url_navigation_throttle.h"
  #include "chrome/browser/media/router/media_router_feature.h"
  #include "chrome/browser/media/router/presentation/presentation_service_delegate_impl.h"
  #include "chrome/browser/media/router/presentation/receiver_presentation_service_delegate_impl.h"
-@@ -208,7 +207,6 @@
- #include "components/nacl/common/buildflags.h"
- #include "components/nacl/common/nacl_constants.h"
+@@ -216,7 +215,6 @@
+ #include "components/language/core/browser/pref_names.h"
+ #include "components/metrics/client_info.h"
  #include "components/net_log/chrome_net_log.h"
 -#include "components/page_load_metrics/browser/metrics_navigation_throttle.h"
  #include "components/page_load_metrics/browser/metrics_web_contents_observer.h"
  #include "components/page_load_metrics/browser/page_load_metrics_util.h"
  #include "components/payments/content/payment_request_display_manager.h"
-@@ -3802,16 +3800,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -3815,16 +3813,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
      content::NavigationHandle* handle) {
    std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
  
@@ -224,7 +197,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #if BUILDFLAG(ENABLE_PLUGINS)
    MaybeAddThrottle(&throttles,
                     FlashDownloadInterception::MaybeCreateThrottleFor(handle));
-@@ -3926,10 +3914,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -3939,10 +3927,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
                     safe_browsing::MaybeCreateNavigationThrottle(handle));
  #endif
  
@@ -972,7 +945,7 @@ new file mode 100644
 diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
 --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
 +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
-@@ -306,6 +306,17 @@ ContentSubresourceFilterThrottleManager::
+@@ -310,6 +310,17 @@ ContentSubresourceFilterThrottleManager::
        throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
                                                  ad_tagging_state);
      }

build/patches/Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch

@@ -44,7 +44,7 @@ diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/and
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -31,7 +31,11 @@ bool FieldIsInBlacklist(const char* current_value, std::string blacklist_str) {
+@@ -15,7 +15,11 @@ namespace features {
  #if defined(OS_ANDROID)
  // Use android AImageReader when playing videos with MediaPlayer.
  const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",
@@ -54,12 +54,12 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
                                               base::FEATURE_ENABLED_BY_DEFAULT};
 +#endif
  
- // Use android SurfaceControl API for managing display compositor's buffer queue
- // and using overlays on Android.
+ // Used only by webview to disable SurfaceControl.
+ const base::Feature kDisableSurfaceControlForWebview{
 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
-@@ -487,7 +487,11 @@ const base::Feature kMediaDrmPreprovisioningAtStartup{
+@@ -500,7 +500,11 @@ const base::Feature kMediaDrmPreprovisioningAtStartup{
  
  // Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
  const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput",

build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch

@@ -9,7 +9,7 @@ Subject: Disable DRM media origin IDs preprovisioning
 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
-@@ -476,7 +476,7 @@ const base::Feature kMediaDrmPersistentLicense{
+@@ -489,7 +489,7 @@ const base::Feature kMediaDrmPersistentLicense{
  // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
  // which will trigger provisioning process after MediaDrmBridge is created.
  const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",

build/patches/Disable-Omaha-update-checks.patch

@@ -6,8 +6,7 @@ Do not consider Jelly Bean unsupported
 ---
  .../java/src/org/chromium/chrome/browser/omaha/OmahaBase.java   | 2 +-
  .../org/chromium/chrome/browser/omaha/VersionNumberGetter.java  | 2 +-
- chrome/browser/android/chrome_feature_list.cc                   | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
@@ -33,18 +32,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNu
  
      protected VersionNumberGetter() { }
  
-diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
---- a/chrome/browser/android/chrome_feature_list.cc
-+++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -464,7 +464,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
-     base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kJellyBeanSupported{"JellyBeanSupported",
--                                        base::FEATURE_DISABLED_BY_DEFAULT};
-+                                        base::FEATURE_ENABLED_BY_DEFAULT};
- 
- const base::Feature kSearchEnginePromoExistingDevice{
-     "SearchEnginePromo.ExistingDevice", base::FEATURE_ENABLED_BY_DEFAULT};
 -- 
 2.17.1
 

build/patches/Disable-addresses-autofill-by-default.patch

@@ -1,36 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 19 Dec 2019 21:46:10 +0100
-Subject: Disable addresses autofill by default
-
----
- .../autofill_assistant/AutofillAssistantPreferencesUtil.java    | 2 +-
- .../autofill_assistant/AutofillAssistantPreferences.java        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
---- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
-+++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
-@@ -26,7 +26,7 @@ class AutofillAssistantPreferencesUtil {
-     /** Checks whether the Autofill Assistant switch preference in settings is on. */
-     static boolean isAutofillAssistantSwitchOn() {
-         return ContextUtils.getAppSharedPreferences().getBoolean(
--                AutofillAssistantPreferences.PREF_AUTOFILL_ASSISTANT_SWITCH, true);
-+                AutofillAssistantPreferences.PREF_AUTOFILL_ASSISTANT_SWITCH, false);
-     }
- 
-     /** Checks whether the Autofill Assistant onboarding has been accepted. */
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill_assistant/AutofillAssistantPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill_assistant/AutofillAssistantPreferences.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill_assistant/AutofillAssistantPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill_assistant/AutofillAssistantPreferences.java
-@@ -48,7 +48,7 @@ public class AutofillAssistantPreferences extends PreferenceFragmentCompat {
-         // (e.g. the switch will say "On" when it is really turned off), so .setChecked() should be
-         // called after .addPreference()
-         autofillAssistantSwitch.setChecked(ContextUtils.getAppSharedPreferences().getBoolean(
--                PREF_AUTOFILL_ASSISTANT_SWITCH, true));
-+                PREF_AUTOFILL_ASSISTANT_SWITCH, false));
-     }
- 
-     private Context getStyledContext() {
--- 
-2.17.1
-

build/patches/Disable-all-promo-dialogs.patch

@@ -9,7 +9,7 @@ Subject: Disable all promo dialogs
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -183,7 +183,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
+@@ -213,7 +213,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
       * displayed.
       */
      private boolean triggerPromo() {
@@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
              SharedPreferencesManager preferenceManager = SharedPreferencesManager.getInstance();
              // Promos can only be shown when we start with ACTION_MAIN intent and
              // after FRE is complete. Native initialization can finish before the FRE flow is
-@@ -214,8 +214,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
+@@ -244,8 +244,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
                  preferenceManager.writeBoolean(
                          ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true);
              }

build/patches/Disable-autofill-assistant-by-default.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 19 Dec 2019 21:46:10 +0100
+Subject: Disable autofill assistant by default
+
+---
+ .../autofill_assistant/AutofillAssistantPreferencesUtil.java    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
+--- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
++++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
+@@ -15,7 +15,7 @@ class AutofillAssistantPreferencesUtil {
+     /** Checks whether the Autofill Assistant switch preference in settings is on. */
+     static boolean isAutofillAssistantSwitchOn() {
+         return SharedPreferencesManager.getInstance().readBoolean(
+-                ChromePreferenceKeys.AUTOFILL_ASSISTANT_ENABLED, true);
++                ChromePreferenceKeys.AUTOFILL_ASSISTANT_ENABLED, false);
+     }
+ 
+     /** Checks whether the Autofill Assistant onboarding has been accepted. */
+-- 
+2.17.1
+

build/patches/Disable-dynamic-module-loading.patch

@@ -13,7 +13,7 @@ Subject: Disable dynamic module loading
 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
-@@ -426,19 +426,6 @@ chrome_java_sources = [
+@@ -443,19 +443,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/BaseCustomTabActivityComponent.java",
    "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java",
    "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityModule.java",
@@ -36,15 +36,15 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
-@@ -40,7 +40,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabIntentHandler.Int
- import org.chromium.chrome.browser.customtabs.content.TabCreationMode;
+@@ -41,7 +41,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabIntentHandler;
+ import org.chromium.chrome.browser.customtabs.content.CustomTabIntentHandler.IntentIgnoringCriterion;
  import org.chromium.chrome.browser.customtabs.dependency_injection.CustomTabActivityComponent;
  import org.chromium.chrome.browser.customtabs.dependency_injection.CustomTabActivityModule;
 -import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleCoordinator;
  import org.chromium.chrome.browser.customtabs.features.CustomTabNavigationBarController;
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
  import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
-@@ -79,9 +78,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
+@@ -73,9 +72,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
  
      private final CustomTabsConnection mConnection = CustomTabsConnection.getInstance();
  
@@ -53,8 +53,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 -
      private CustomTabNightModeStateController mNightModeStateController;
  
-     /**
-@@ -217,12 +213,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
+     private CustomTabActivityTabProvider.Observer mTabChangeObserver =
+@@ -190,12 +186,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
      public void finishNativeInitialization() {
          if (!mIntentDataProvider.isInfoPage()) FirstRunSignInProcessor.start(this);
  
@@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
          mConnection.showSignInToastIfNecessary(mSession, getIntent());
  
          if (isTaskRoot() && UsageStatsService.isEnabled()) {
-@@ -259,10 +249,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
+@@ -232,10 +222,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
          WebContents webContents = tab == null ? null : tab.getWebContents();
          mConnection.resetPostMessageHandlerForSession(
                  mIntentDataProvider.getSession(), webContents);
@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
      }
  
      @Override
-@@ -503,10 +489,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
+@@ -406,10 +392,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
          if (mIntentDataProvider.isTrustedWebActivity()) {
              component.resolveTrustedWebActivityCoordinator();
          }
@@ -92,15 +92,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
-@@ -45,7 +45,6 @@ import org.chromium.chrome.browser.ChromeFeatureList;
+@@ -44,7 +44,6 @@ import org.chromium.chrome.browser.ChromeApplication;
  import org.chromium.chrome.browser.ChromeVersionInfo;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProvider;
 -import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleMetrics;
  import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
- import org.chromium.chrome.browser.ui.styles.ChromeColors;
-@@ -824,20 +823,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -820,20 +819,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
          // even receive the extras for using the feature.
          if (componentName == null) return false;
  
@@ -126,16 +126,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
-@@ -58,8 +58,6 @@ import org.chromium.chrome.browser.browserservices.Origin;
+@@ -57,8 +57,6 @@ import org.chromium.chrome.browser.browserservices.Origin;
  import org.chromium.chrome.browser.browserservices.PostMessageHandler;
  import org.chromium.chrome.browser.browserservices.SessionDataHolder;
  import org.chromium.chrome.browser.browserservices.SessionHandler;
 -import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleLoader;
 -import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleMetrics;
  import org.chromium.chrome.browser.device.DeviceClassManager;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.init.ChainedTasks;
- import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
-@@ -220,7 +218,6 @@ public class CustomTabsConnection {
+@@ -218,7 +216,6 @@ public class CustomTabsConnection {
  
      private volatile ChainedTasks mWarmupTasks;
  
@@ -143,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
      /**
       * <strong>DO NOT CALL</strong>
       * Public to be instanciable from {@link ChromeApplication}. This is however
-@@ -1388,7 +1385,6 @@ public class CustomTabsConnection {
+@@ -1401,7 +1398,6 @@ public class CustomTabsConnection {
          if (ChromeApplication.isSevereMemorySignal(level)) {
              getInstance().mClientManager.cleanupUnusedSessions();
          }
@@ -151,7 +151,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
      }
  
      @VisibleForTesting
-@@ -1524,32 +1520,6 @@ public class CustomTabsConnection {
+@@ -1537,32 +1533,6 @@ public class CustomTabsConnection {
          recordSpeculationStatusOnSwap(SPECULATION_STATUS_ON_SWAP_BACKGROUND_TAB_NOT_MATCHED);
      }
  
@@ -187,16 +187,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
-@@ -17,8 +17,6 @@ import org.chromium.chrome.browser.customtabs.ReparentingTaskProvider;
+@@ -15,8 +15,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabUmaRecorder;
+ import org.chromium.chrome.browser.customtabs.ReparentingTaskProvider;
  import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabController;
- import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabFactory;
  import org.chromium.chrome.browser.customtabs.content.CustomTabIntentHandler;
 -import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleCoordinator;
 -import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleToolbarController;
  import org.chromium.chrome.browser.customtabs.features.ImmersiveModeController;
- import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarColorController;
  import org.chromium.chrome.browser.dependency_injection.ActivityScope;
-@@ -34,8 +32,6 @@ import dagger.Subcomponent;
+ import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
+@@ -31,8 +29,6 @@ import dagger.Subcomponent;
  @ActivityScope
  public interface CustomTabActivityComponent extends BaseCustomTabActivityComponent {
      TrustedWebActivityCoordinator resolveTrustedWebActivityCoordinator();

build/patches/Disable-fetching-of-all-field-trials.patch

@@ -3,13 +3,13 @@ Date: Sun, 8 Jul 2018 18:16:34 +0200
 Subject: Disable fetching of all field trials
 
 ---
- .../chrome/browser/ChromeFeatureList.java         | 15 +++------------
+ .../chrome/browser/flags/ChromeFeatureList.java   | 15 +++------------
  .../variations/service/variations_service.cc      | 12 +-----------
  2 files changed, 4 insertions(+), 23 deletions(-)
 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
++++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 @@ -108,10 +108,7 @@ public abstract class ChromeFeatureList {
       */
      public static int getFieldTrialParamByFeatureAsInt(
@@ -49,7 +49,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureLi
 diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -241,17 +241,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -242,17 +242,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
  // Variations seed fetching is only enabled in official Chrome builds, if a URL
  // is specified on the command line, and for testing.
  bool IsFetchingEnabled() {

build/patches/Disable-media-router-and-remoting-by-default.patch

@@ -40,7 +40,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -232,7 +232,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -234,7 +234,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
        prefs::kMediaRouterFirstRunFlowAcknowledged,
        false,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -52,7 +52,7 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profil
 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
-@@ -401,7 +401,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -403,7 +403,7 @@ void ProfileImpl::RegisterProfilePrefs(
    registry->RegisterStringPref(
        prefs::kPrintPreviewDefaultDestinationSelectionRules, std::string());
    registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);

build/patches/Disable-metrics-on-all-I-O-threads.patch

@@ -10,7 +10,7 @@ Subject: Disable metrics on all I/O threads
 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
-@@ -907,7 +907,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -912,7 +912,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
  #endif  // defined(OS_CHROMEOS)
  
    registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
@@ -22,7 +22,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
 --- a/chrome/browser/profiles/profile_io_data.cc
 +++ b/chrome/browser/profiles/profile_io_data.cc
-@@ -48,8 +48,6 @@
+@@ -46,8 +46,6 @@
  #include "components/content_settings/core/browser/host_content_settings_map.h"
  #include "components/cookie_config/cookie_store_util.h"
  #include "components/dom_distiller/core/url_constants.h"

build/patches/Disable-password-reuse-detection-on-android.patch

@@ -3,8 +3,8 @@ Date: Sun, 15 Dec 2019 22:39:56 +0100
 Subject: Disable password reuse detection on android
 
 ---
- components/password_manager/core/browser/BUILD.gn | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ components/password_manager/core/browser/BUILD.gn | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
 --- a/components/password_manager/core/browser/BUILD.gn
@@ -14,10 +14,11 @@ diff --git a/components/password_manager/core/browser/BUILD.gn b/components/pass
  # TODO(crbug.com/1006430): Fix password reuse detection not fully functional on
  # Android.
 -password_reuse_detection_support = !is_ios
-+password_reuse_detection_support = !is_ios && !is_android
- password_reuse_warning_support = !is_android && !is_ios
+-password_reuse_warning_support = !is_ios
 -password_on_focus_ping_support = !is_ios
-+password_on_focus_ping_support = !is_android && !is_ios
++password_reuse_detection_support = !is_ios && !is_android
++password_reuse_warning_support = !is_ios && !is_android
++password_on_focus_ping_support = !is_ios && !is_android
  
  config("password_reuse_detection_config") {
    defines = []

build/patches/Disable-plugins-enumeration.patch

@@ -9,7 +9,7 @@ Subject: Disable plugins enumeration
 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
-@@ -1177,10 +1177,8 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -1198,10 +1198,8 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
  }
  
  PluginData* LocalFrame::GetPluginData() const {

build/patches/Disable-promos-displayed-in-bookmarks-manager.patch

@@ -5,12 +5,12 @@ Subject: Disable promos displayed in bookmarks manager
 Remove personalized signin promo view from
 bookmarks, never reach signin thresholds.
 ---
- ...rsonalized_signin_promo_view_bookmarks.xml | 30 -----------
- .../bookmarks/BookmarkItemsAdapter.java       | 23 +-------
- .../bookmarks/BookmarkPromoHeader.java        | 52 +------------------
- .../ReorderBookmarkItemsAdapter.java          | 19 +------
- .../browser/signin/SigninPromoController.java | 21 +-------
- 5 files changed, 7 insertions(+), 138 deletions(-)
+ ...rsonalized_signin_promo_view_bookmarks.xml |  30 -----
+ .../bookmarks/BookmarkItemsAdapter.java       |  23 +---
+ .../bookmarks/BookmarkPromoHeader.java        | 111 +-----------------
+ .../ReorderBookmarkItemsAdapter.java          |  19 +--
+ .../browser/signin/SigninPromoController.java |  19 +--
+ 5 files changed, 7 insertions(+), 195 deletions(-)
  delete mode 100644 chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
 
 diff --git a/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml b/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
@@ -128,15 +128,79 @@ 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/BookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
-@@ -20,7 +20,6 @@ import org.chromium.chrome.R;
+@@ -20,19 +20,13 @@ import org.chromium.chrome.R;
  import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
  import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 -import org.chromium.chrome.browser.signin.PersonalizedSigninPromoView;
  import org.chromium.chrome.browser.signin.ProfileDataCache;
- import org.chromium.chrome.browser.signin.SigninManager;
- import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
-@@ -124,19 +123,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+-import org.chromium.chrome.browser.signin.SigninManager;
+-import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
+ import org.chromium.chrome.browser.signin.SigninPromoController;
+-import org.chromium.chrome.browser.signin.SigninPromoUtil;
+ import org.chromium.chrome.browser.signin.SyncPromoView;
+ import org.chromium.components.signin.AccountManagerFacade;
+ import org.chromium.components.signin.AccountsChangeObserver;
+ import org.chromium.components.signin.ChromeSigninController;
+ import org.chromium.components.signin.metrics.SigninAccessPoint;
+-import org.chromium.components.sync.AndroidSyncSettings;
+-import org.chromium.components.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
+ import org.chromium.content_public.browser.UiThreadTaskTraits;
+ 
+ import java.lang.annotation.Retention;
+@@ -42,7 +36,7 @@ import java.lang.annotation.RetentionPolicy;
+  * Class that manages all the logic and UI behind the signin promo header in the bookmark
+  * content UI. The header is shown only on certain situations, (e.g., not signed in).
+  */
+-class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObserver,
++class BookmarkPromoHeader implements
+                                      ProfileDataCache.Observer, AccountsChangeObserver {
+     /**
+      * Specifies the various states in which the Bookmarks promo can be.
+@@ -61,7 +55,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+     private static @Nullable @PromoState Integer sPromoStateForTests;
+ 
+     private final Context mContext;
+-    private final SigninManager mSignInManager;
+     private final Runnable mPromoHeaderChangeAction;
+ 
+     private final @Nullable ProfileDataCache mProfileDataCache;
+@@ -76,8 +69,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+         mContext = context;
+         mPromoHeaderChangeAction = promoHeaderChangeAction;
+ 
+-        AndroidSyncSettings.get().registerObserver(this);
+-
+         if (SigninPromoController.hasNotReachedImpressionLimit(
+                     SigninAccessPoint.BOOKMARK_MANAGER)) {
+             int imageSize =
+@@ -91,9 +82,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+             mSigninPromoController = null;
+         }
+ 
+-        mSignInManager = IdentityServicesProvider.get().getSigninManager();
+-        mSignInManager.addSignInStateObserver(this);
+-
+         mPromoState = calculatePromoState();
+         if (mPromoState == PromoState.PROMO_SYNC) {
+             SharedPreferencesManager.getInstance().incrementInt(
+@@ -105,15 +93,11 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+      * Clean ups the class. Must be called once done using this class.
+      */
+     void destroy() {
+-        AndroidSyncSettings.get().unregisterObserver(this);
+-
+         if (mSigninPromoController != null) {
+             AccountManagerFacade.get().removeObserver(this);
+             mProfileDataCache.removeObserver(this);
+             mSigninPromoController.onPromoDestroyed();
+         }
+-
+-        mSignInManager.removeSignInStateObserver(this);
+     }
+ 
+     /**
+@@ -124,19 +108,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
          return mPromoState;
      }
  
@@ -156,7 +220,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * @return Sync promo header {@link ViewHolder} instance that can be used with
       *         {@link RecyclerView}.
-@@ -149,40 +135,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+@@ -149,49 +120,11 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
          return new ViewHolder(view) {};
      }
  
@@ -181,7 +245,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 -     */
 -    private void setPersonalizedSigninPromoDeclined() {
 -        SharedPreferencesManager.getInstance().writeBoolean(
--                ChromePreferenceKeys.PREF_PERSONALIZED_SIGNIN_PROMO_DECLINED, true);
+-                ChromePreferenceKeys.SIGNIN_PROMO_PERSONALIZED_DECLINED, true);
 -        mPromoState = calculatePromoState();
 -        triggerPromoUpdate();
 -    }
@@ -189,25 +253,74 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 -    /**
 -     * @return Whether the user declined the personalized signin promo.
 -     */
--    private boolean wasPersonalizedSigninPromoDeclined() {
+-    @VisibleForTesting
+-    static boolean wasPersonalizedSigninPromoDeclined() {
 -        return SharedPreferencesManager.getInstance().readBoolean(
--                ChromePreferenceKeys.PREF_PERSONALIZED_SIGNIN_PROMO_DECLINED, false);
+-                ChromePreferenceKeys.SIGNIN_PROMO_PERSONALIZED_DECLINED, false);
 -    }
 -
+     /**
+      * @return Whether the personalized signin promo should be shown to user.
+      */
+     private boolean shouldShowBookmarkSigninPromo() {
+-        return mSignInManager.isSignInAllowed()
+-                && SigninPromoController.hasNotReachedImpressionLimit(
+-                        SigninAccessPoint.BOOKMARK_MANAGER)
+-                && !wasPersonalizedSigninPromoDeclined();
++        return false;
+     }
+ 
      private @PromoState int calculatePromoState() {
-         if (sPromoStateForTests != null) {
+@@ -199,48 +132,9 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
              return sPromoStateForTests;
-@@ -195,8 +147,7 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
-         if (!ChromeSigninController.get().isSignedIn()) {
-             boolean impressionLimitReached = !SigninPromoController.hasNotReachedImpressionLimit(
-                     SigninAccessPoint.BOOKMARK_MANAGER);
--            if (!mSignInManager.isSignInAllowed() || impressionLimitReached
--                    || wasPersonalizedSigninPromoDeclined()) {
-+            if (!mSignInManager.isSignInAllowed() || impressionLimitReached) {
-                 return PromoState.PROMO_NONE;
-             }
-             return PromoState.PROMO_SIGNIN_PERSONALIZED;
-@@ -248,7 +199,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+         }
+ 
+-        if (!AndroidSyncSettings.get().isMasterSyncEnabled()) {
+-            return PromoState.PROMO_NONE;
+-        }
+-
+-        if (!ChromeSigninController.get().isSignedIn()) {
+-            return shouldShowBookmarkSigninPromo() ? PromoState.PROMO_SIGNIN_PERSONALIZED
+-                                                   : PromoState.PROMO_NONE;
+-        }
+-
+-        boolean impressionLimitNotReached =
+-                SharedPreferencesManager.getInstance().readInt(
+-                        ChromePreferenceKeys.SIGNIN_AND_SYNC_PROMO_SHOW_COUNT)
+-                < MAX_SIGNIN_AND_SYNC_PROMO_SHOW_COUNT;
+-        if (!AndroidSyncSettings.get().isChromeSyncEnabled() && impressionLimitNotReached) {
+-            return PromoState.PROMO_SYNC;
+-        }
+         return PromoState.PROMO_NONE;
+     }
+ 
+-    // AndroidSyncSettingsObserver implementation.
+-    @Override
+-    public void androidSyncSettingsChanged() {
+-        // AndroidSyncSettings calls this method from non-UI threads.
+-        PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
+-            mPromoState = calculatePromoState();
+-            triggerPromoUpdate();
+-        });
+-    }
+-
+-    // SignInStateObserver implementation.
+-    @Override
+-    public void onSignedIn() {
+-        mPromoState = calculatePromoState();
+-        triggerPromoUpdate();
+-    }
+-
+-    @Override
+-    public void onSignedOut() {
+-        mPromoState = calculatePromoState();
+-        triggerPromoUpdate();
+-    }
+-
+     // ProfileDataCache.Observer implementation.
+     @Override
+     public void onProfileDataUpdated(String accountId) {
+@@ -254,7 +148,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
      }
  
      private void triggerPromoUpdate() {
@@ -273,15 +386,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Reord
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
-@@ -70,25 +70,8 @@ public class SigninPromoController {
+@@ -69,24 +69,7 @@ public class SigninPromoController {
+      * @param accessPoint The access point for which the impression limit is being checked.
       */
      public static boolean hasNotReachedImpressionLimit(@AccessPoint int accessPoint) {
-         SharedPreferencesManager preferencesManager = SharedPreferencesManager.getInstance();
+-        SharedPreferencesManager preferencesManager = SharedPreferencesManager.getInstance();
 -        switch (accessPoint) {
 -            case SigninAccessPoint.BOOKMARK_MANAGER:
--                return preferencesManager.readInt(
--                               ChromePreferenceKeys.SIGNIN_PROMO_IMPRESSIONS_COUNT_BOOKMARKS)
--                        < MAX_IMPRESSIONS_BOOKMARKS;
+-                return getSigninPromoImpressionsCountBookmarks() < MAX_IMPRESSIONS_BOOKMARKS;
 -            case SigninAccessPoint.NTP_CONTENT_SUGGESTIONS:
 -                // There is no impression limit for NTP content suggestions.
 -                return true;
@@ -296,8 +408,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPr
 -                assert false : "Unexpected value for access point: " + accessPoint;
 -                return false;
 -        }
-+        // never show anything
-+        return true;
++         return false;
      }
  
      /**

build/patches/Disable-references-to-fonts.googleapis.com.patch

@@ -12,7 +12,7 @@ Subject: Disable references to fonts.googleapis.com
 diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -295,7 +295,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
+@@ -294,7 +294,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
  }
  
  std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() {
@@ -36,7 +36,7 @@ diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_di
 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
-@@ -132,7 +132,7 @@ function maybeSetWebFont() {
+@@ -116,7 +116,7 @@ function maybeSetWebFont() {
    }
  
    const e = document.createElement('link');

build/patches/Disable-search-ready-omnibox-by-default.patch

@@ -3,13 +3,13 @@ Date: Mon, 12 Aug 2019 08:47:04 +0200
 Subject: Disable search-ready omnibox by default
 
 ---
- chrome/browser/android/chrome_feature_list.cc | 2 +-
+ chrome/browser/flags/android/chrome_feature_list.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
---- a/chrome/browser/android/chrome_feature_list.cc
-+++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -521,7 +521,7 @@ const base::Feature kScrollToExpandPaymentHandler{
+diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
+--- a/chrome/browser/flags/android/chrome_feature_list.cc
++++ b/chrome/browser/flags/android/chrome_feature_list.cc
+@@ -552,7 +552,7 @@ const base::Feature kScrollToExpandPaymentHandler{
      "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kSearchReadyOmniboxFeature{

build/patches/Disable-smart-selection-by-default.patch

@@ -8,14 +8,14 @@ commit 48d4ae54f7565c429bf29cd63806aee5d7e93e69)
 Notice that re-enabling smart selection would make incognito mode potentially
 leak information through the TextClassifier set by OEM, if any
 ---
- chrome/browser/android/chrome_feature_list.cc                   | 2 +-
+ chrome/browser/flags/android/chrome_feature_list.cc             | 2 +-
  .../content/browser/selection/SelectionPopupControllerImpl.java | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
---- a/chrome/browser/android/chrome_feature_list.cc
-+++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -366,7 +366,7 @@ const base::Feature kChromeSharingHub{"ChromeSharingHub",
+diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
+--- a/chrome/browser/flags/android/chrome_feature_list.cc
++++ b/chrome/browser/flags/android/chrome_feature_list.cc
+@@ -393,7 +393,7 @@ const base::Feature kChromeSharingHub{"ChromeSharingHub",
                                        base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kChromeSmartSelection{"ChromeSmartSelection",
@@ -27,7 +27,7 @@ diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/andr
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
-@@ -775,7 +775,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
+@@ -799,7 +799,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
              menu.removeItem(R.id.select_action_menu_share);
          }
  

build/patches/Disable-some-signed-exchange-features.patch

@@ -9,7 +9,7 @@ Subject: Disable some signed exchange 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
-@@ -500,7 +500,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
+@@ -549,7 +549,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
  // Signed Exchange Reporting for distributors
  // https://www.chromestatus.com/features/5687904902840320
  const base::Feature kSignedExchangeReportingForDistributors{
@@ -18,7 +18,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
  
  // Subresource prefetching+loading via Signed HTTP Exchange
  // https://www.chromestatus.com/features/5126805474246656
-@@ -510,7 +510,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
+@@ -559,7 +559,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
  // Origin-Signed HTTP Exchanges (for WebPackage Loading)
  // https://www.chromestatus.com/features/5745285984681984
  const base::Feature kSignedHTTPExchange{"SignedHTTPExchange",

build/patches/Disable-sync-services-menu-entry.patch

@@ -19,7 +19,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 -        android:order="2"
 -        android:layout="@layout/account_management_account_row"
 -        android:title="@string/prefs_sync_and_services"
--        android:fragment="org.chromium.chrome.browser.settings.sync.SyncAndServicesPreferences"/>
+-        android:fragment="org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings"/>
  
      <PreferenceCategory
          android:key="basics_section"

build/patches/Disable-third-party-cookies-by-default.patch

@@ -10,7 +10,7 @@ author: Chad Miller <chad.miller@canonical.com>
 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -58,7 +58,7 @@ void CookieSettings::GetCookieSettings(
+@@ -59,7 +59,7 @@ void CookieSettings::GetCookieSettings(
  void CookieSettings::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(

build/patches/Do-not-compile-QR-code-sharing.patch

@@ -0,0 +1,115 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 27 Feb 2020 23:23:59 +0100
+Subject: Do not compile QR code sharing
+
+---
+ chrome/android/java/AndroidManifest.xml          | 16 ----------------
+ .../chrome/browser/share/ShareDelegateImpl.java  |  5 -----
+ .../browser/share/ShareSheetCoordinator.java     | 14 --------------
+ chrome/browser/share/android/java_sources.gni    | 12 ------------
+ 4 files changed, 47 deletions(-)
+
+diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
+--- a/chrome/android/java/AndroidManifest.xml
++++ b/chrome/android/java/AndroidManifest.xml
+@@ -824,22 +824,6 @@ by a child template that "extends" this file.
+             </intent-filter>
+           </activity>
+ 
+-          <activity
+-            android:name="org.chromium.chrome.browser.share.qrcode.QrCodeShareActivity"
+-            android:icon="@drawable/ic_launcher"
+-            android:label="@string/qr_code_share_icon_label"
+-            android:enabled="false"
+-            android:excludeFromRecents="true"
+-            android:exported="true"
+-            android:noHistory="true"
+-            android:theme="@android:style/Theme.NoDisplay"
+-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
+-            <intent-filter>
+-                <action android:name="android.intent.action.SEND" />
+-                <category android:name="android.intent.category.DEFAULT" />
+-                <data android:mimeType="text/plain" />
+-            </intent-filter>
+-          </activity>
+ 
+         <activity
+             android:name="org.chromium.chrome.browser.vr.VrCancelAnimationActivity"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
+@@ -20,7 +20,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
+ import org.chromium.chrome.browser.printing.PrintShareActivity;
+ import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfShareActivity;
+-import org.chromium.chrome.browser.share.qrcode.QrCodeShareActivity;
+ import org.chromium.chrome.browser.tab.SadTab;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tab.TabImpl;
+@@ -98,10 +97,6 @@ public class ShareDelegateImpl implements ShareDelegate {
+             classesToEnable.add(SendTabToSelfShareActivity.class);
+         }
+ 
+-        if (QrCodeShareActivity.featureIsAvailable()) {
+-            classesToEnable.add(QrCodeShareActivity.class);
+-        }
+-
+         if (!classesToEnable.isEmpty()) {
+             OptionalShareTargetsManager.getInstance().enableOptionalShareActivities(activity,
+                     classesToEnable, () -> triggerShare(currentTab, shareDirectly, isIncognito));
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java
+@@ -16,7 +16,6 @@ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ActivityTabProvider;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfShareActivity;
+-import org.chromium.chrome.browser.share.qrcode.QrCodeCoordinator;
+ import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tab.TabLaunchType;
+@@ -73,19 +72,6 @@ public class ShareSheetCoordinator {
+     ArrayList<PropertyModel> createTopRowPropertyModels(
+             ShareSheetBottomSheetContent bottomSheet, Activity activity) {
+         ArrayList<PropertyModel> models = new ArrayList<>();
+-        // QR Codes
+-        PropertyModel qrcodePropertyModel = mPropertyModelBuilder.createPropertyModel(
+-                AppCompatResources.getDrawable(activity, R.drawable.qr_code),
+-                activity.getResources().getString(R.string.qr_code_share_icon_label),
+-                (currentActivity)
+-                        -> {
+-                    mBottomSheetController.hideContent(bottomSheet, true);
+-                    QrCodeCoordinator qrCodeCoordinator =
+-                            new QrCodeCoordinator(activity, this::createNewTab);
+-                    qrCodeCoordinator.show();
+-                },
+-                /*isFirstParty=*/true);
+-        models.add(qrcodePropertyModel);
+ 
+         // Send Tab To Self
+         PropertyModel sttsPropertyModel =
+diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/share/android/java_sources.gni
+--- a/chrome/browser/share/android/java_sources.gni
++++ b/chrome/browser/share/android/java_sources.gni
+@@ -4,18 +4,6 @@
+ 
+ # TODO(gayane): This should be a separate build target when circular dependencies are removed.
+ share_java_sources = [
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeCoordinator.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialog.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialogTab.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodePageAdapter.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeShareActivity.java",
+   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreview.java",
+   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreviewOverlay.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanCoordinator.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanView.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewBinder.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewProperties.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareCoordinator.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
+ ]
+-- 
+2.17.1
+

build/patches/Do-not-grant-notifications-to-default-search-engine.patch

@@ -11,7 +11,7 @@ Block gelocation by default instead of granting it for non-enterprise use cases
 diff --git a/chrome/browser/android/search_permissions/search_permissions_service.cc b/chrome/browser/android/search_permissions/search_permissions_service.cc
 --- a/chrome/browser/android/search_permissions/search_permissions_service.cc
 +++ b/chrome/browser/android/search_permissions/search_permissions_service.cc
-@@ -190,7 +190,7 @@ void SearchPermissionsService::ResetDSEPermission(ContentSettingsType type) {
+@@ -191,7 +191,7 @@ void SearchPermissionsService::ResetDSEPermission(ContentSettingsType type) {
    DCHECK(dse_url.is_empty() || IsPermissionControlledByDSE(type, dse_origin));
  
    if (!dse_url.is_empty())
@@ -20,7 +20,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
  }
  
  void SearchPermissionsService::ResetDSEPermissions() {
-@@ -333,11 +333,7 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
+@@ -334,11 +334,7 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
      return;
    }
  
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
    pref_service_->ClearPref(prefs::kDSEWasDisabledByPolicy);
  
    // Initialize the pref for geolocation if it hasn't been initialized yet.
-@@ -370,10 +366,8 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
+@@ -371,10 +367,8 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
        pref_service_->ClearPref(prefs::kDSEGeolocationSettingDeprecated);
      } else if (dse_geolocation_setting == CONTENT_SETTING_ASK) {
        // If the user hasn't explicitly allowed or blocked geolocation for the
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
      }
  
      // Update the content setting with the auto-grants for the DSE.
-@@ -398,11 +392,9 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
+@@ -399,11 +393,9 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
          GetContentSetting(dse_origin, ContentSettingsType::NOTIFICATIONS);
      ContentSetting dse_notifications_setting = notifications_setting_to_restore;
      // If the user hasn't explicitly allowed or blocked notifications for the
@@ -63,7 +63,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
 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
-@@ -320,7 +320,7 @@ const base::FeatureParam<std::string> kDnsOverHttpsTemplatesParam{
+@@ -310,7 +310,7 @@ const base::FeatureParam<std::string> kDnsOverHttpsTemplatesParam{
  #if defined(OS_ANDROID)
  // Enable changing default downloads storage location on Android.
  const base::Feature kDownloadsLocationChange{"DownloadsLocationChange",
@@ -71,7 +71,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 +                                             base::FEATURE_DISABLED_BY_DEFAULT};
  #endif
  
- // If enabled, Drive will use FCM for its invalidations.
+ // If enabled, policies will use FCM (Firebase Cloud Messaging) for its
 -- 
 2.17.1
 

build/patches/Do-not-store-passwords-by-default.patch

@@ -9,7 +9,7 @@ Subject: Do not store passwords by default
 diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -178,10 +178,10 @@ void AddLocallySavedPredictions(FieldInfoManager* field_info_manager,
+@@ -185,10 +185,10 @@ void AddLocallySavedPredictions(FieldInfoManager* field_info_manager,
  void PasswordManager::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(

build/patches/Download-on-Android-Q-Remove-a-DCHECK-in-CreateReservation.patch

@@ -1,32 +0,0 @@
-From: Xing Liu <xingliu@chromium.org>
-Date: Tue, 18 Feb 2020 21:10:54 +0000
-Subject: Download on Android Q: Remove a DCHECK in CreateReservation.
-
-When resuming a download, the suggested path can be content URI. This
-will hit a DCHECK in CreateReservation.
-
-Bug: 1045642
-Change-Id: I61c452afafbbc9606f747c84ff18e6b9dc9a0fb6
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2062759
-Reviewed-by: Min Qin <qinmin@chromium.org>
-Commit-Queue: Xing Liu <xingliu@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#742270}
----
- .../internal/common/download_path_reservation_tracker.cc        | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/components/download/internal/common/download_path_reservation_tracker.cc b/components/download/internal/common/download_path_reservation_tracker.cc
---- a/components/download/internal/common/download_path_reservation_tracker.cc
-+++ b/components/download/internal/common/download_path_reservation_tracker.cc
-@@ -326,8 +326,6 @@ PathValidationResult ValidatePathAndResolveConflicts(
- // - Returns the result of creating the path reservation.
- PathValidationResult CreateReservation(const CreateReservationInfo& info,
-                                        base::FilePath* reserved_path) {
--  DCHECK(info.suggested_path.IsAbsolute());
--
-   // Create a reservation map if one doesn't exist. It will be automatically
-   // deleted when all the reservations are revoked.
-   if (g_reservation_map == NULL)
--- 
-2.17.1
-

build/patches/Enable-changing-default-downloads-storage-location-by-default.patch

@@ -9,7 +9,7 @@ Subject: Enable changing default downloads storage location by default
 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
-@@ -320,7 +320,7 @@ const base::FeatureParam<std::string> kDnsOverHttpsTemplatesParam{
+@@ -310,7 +310,7 @@ const base::FeatureParam<std::string> kDnsOverHttpsTemplatesParam{
  #if defined(OS_ANDROID)
  // Enable changing default downloads storage location on Android.
  const base::Feature kDownloadsLocationChange{"DownloadsLocationChange",
@@ -17,7 +17,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 +                                             base::FEATURE_ENABLED_BY_DEFAULT};
  #endif
  
- // If enabled, Drive will use FCM for its invalidations.
+ // If enabled, policies will use FCM (Firebase Cloud Messaging) for its
 -- 
 2.17.1
 

build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

@@ -42,7 +42,7 @@ Excerpt from https://github.com/bromite/bromite/issues/226
 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
-@@ -302,6 +302,10 @@ config("compiler") {
+@@ -292,6 +292,10 @@ config("compiler") {
        }
      }
  

build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch

@@ -9,7 +9,7 @@ Subject: Enable site per process isolation for devices with enough memory
 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
-@@ -659,11 +659,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
+@@ -655,11 +655,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
  // browser_features, as they are only used on the browser side.
  const base::Feature kSitePerProcess {
    "site-per-process",
@@ -21,7 +21,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
  };
  
  // Controls a mode for dynamically process-isolating sites where the user has
-@@ -693,7 +689,7 @@ const base::Feature kSiteIsolationForPasswordSites{
+@@ -689,7 +685,7 @@ const base::Feature kSiteIsolationForPasswordSites {
  // base::SysInfo::AmountOfPhysicalMemoryMB().
  const base::Feature kSitePerProcessOnlyForHighMemoryClients{
      "site-per-process-only-for-high-memory-clients",

build/patches/Enable-user-agent-freeze-by-default.patch

@@ -16,8 +16,8 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
 -                                     base::FEATURE_DISABLED_BY_DEFAULT};
 +                                     base::FEATURE_ENABLED_BY_DEFAULT};
  
- // When enabled, the compositing of trivial 3D transforms is disabled.
- const base::Feature kDoNotCompositeTrivial3D{"DoNotCompositeTrivial3D",
+ // When enabled, enter assumed-overlap mode in compositing overlap testing
+ // anytime a fixed or sticky position element is encountered.
 -- 
 2.17.1
 

build/patches/Fix-crash-when-accessing-page-info-site-settings.patch

@@ -9,14 +9,14 @@ Subject: Fix crash when accessing page info / site settings
 diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
 --- a/chrome/browser/permissions/permission_manager.cc
 +++ b/chrome/browser/permissions/permission_manager.cc
-@@ -766,6 +766,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
-   if (status != CONTENT_SETTING_DEFAULT)
-     return PermissionResult(status, PermissionStatusSource::UNSPECIFIED);
+@@ -784,6 +784,9 @@ permissions::PermissionResult PermissionManager::GetPermissionStatusHelper(
+     return permissions::PermissionResult(
+         status, permissions::PermissionStatusSource::UNSPECIFIED);
    PermissionContextBase* context = GetPermissionContext(permission);
 +  if (context == nullptr) {
-+      return PermissionResult(CONTENT_SETTING_BLOCK, PermissionStatusSource::UNSPECIFIED);
++      return permissions::PermissionResult(CONTENT_SETTING_BLOCK, permissions::PermissionStatusSource::UNSPECIFIED);
 +  }
-   PermissionResult result = context->GetPermissionStatus(
+   permissions::PermissionResult result = context->GetPermissionStatus(
        render_frame_host, canonical_requesting_origin.GetOrigin(),
        embedding_origin.GetOrigin());
 -- 

build/patches/Hide-passwords-manager-link.patch

@@ -3,13 +3,13 @@ Date: Sun, 13 Aug 2017 19:33:04 -0400
 Subject: Hide passwords manager link
 
 ---
- .../browser/settings/password/SavePasswordsPreferences.java   | 4 ++--
+ .../chrome/browser/settings/password/PasswordSettings.java    | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/password/SavePasswordsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/password/SavePasswordsPreferences.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/password/SavePasswordsPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/password/SavePasswordsPreferences.java
-@@ -254,7 +254,7 @@ public class SavePasswordsPreferences
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java
+@@ -254,7 +254,7 @@ public class PasswordSettings
              return;
          }
  
@@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/passwo
  
          PreferenceGroup passwordParent;
          if (mSearchQuery == null) {
-@@ -329,7 +329,7 @@ public class SavePasswordsPreferences
+@@ -329,7 +329,7 @@ public class PasswordSettings
              return;
          }
  

build/patches/Hide-send-reports-checkbox.patch

@@ -13,8 +13,8 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
                          android:layout_height="wrap_content"
                          android:lineSpacingMultiplier="1.4"
                          android:text="@string/fre_send_report_check"
--                        android:textAppearance="@style/TextAppearance.BlackBodyDefault" />
-+                        android:textAppearance="@style/TextAppearance.BlackBodyDefault" android:visibility="gone" />
+-                        android:textAppearance="@style/TextAppearance.TextMedium.Primary" />
++                        android:textAppearance="@style/TextAppearance.TextMedium.Primary" android:visibility="gone" />
                      </LinearLayout>
              </LinearLayout>
          </LinearLayout>

build/patches/Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch

@@ -33,7 +33,7 @@ diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/re
 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
-@@ -257,6 +257,7 @@
+@@ -261,6 +261,7 @@
  #include "third_party/blink/renderer/core/page/scrolling/root_scroller_controller.h"
  #include "third_party/blink/renderer/core/page/scrolling/scroll_state_callback.h"
  #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
@@ -41,7 +41,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
  #include "third_party/blink/renderer/core/page/scrolling/text_fragment_anchor.h"
  #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
-@@ -321,6 +322,8 @@
+@@ -323,6 +324,8 @@
  #include "third_party/blink/renderer/platform/wtf/text/string_buffer.h"
  #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
  
@@ -50,7 +50,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  #ifndef NDEBUG
  using WeakDocumentSet = blink::HeapHashSet<blink::WeakMember<blink::Document>>;
  static WeakDocumentSet& liveDocumentSet();
-@@ -6770,8 +6773,63 @@ void Document::FinishedParsing() {
+@@ -6418,8 +6421,63 @@ void Document::FinishedParsing() {
    // Parser should have picked up all preloads by now
    fetcher_->ClearPreloads(ResourceFetcher::kClearSpeculativeMarkupPreloads);
  
@@ -118,7 +118,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -1690,6 +1690,8 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -1681,6 +1681,8 @@ class CORE_EXPORT Document : public ContainerNode,
    void AddAXContext(AXContext*);
    void RemoveAXContext(AXContext*);
  
@@ -152,7 +152,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/html/html_script_element.cc b/third_party/blink/renderer/core/html/html_script_element.cc
 --- a/third_party/blink/renderer/core/html/html_script_element.cc
 +++ b/third_party/blink/renderer/core/html/html_script_element.cc
-@@ -148,6 +148,11 @@ void HTMLScriptElement::setTextContent(
+@@ -156,6 +156,11 @@ void HTMLScriptElement::setTextContent(
    }
  }
  
@@ -167,7 +167,7 @@ diff --git a/third_party/blink/renderer/core/html/html_script_element.cc b/third
 diff --git a/third_party/blink/renderer/core/html/html_script_element.h b/third_party/blink/renderer/core/html/html_script_element.h
 --- a/third_party/blink/renderer/core/html/html_script_element.h
 +++ b/third_party/blink/renderer/core/html/html_script_element.h
-@@ -51,6 +51,7 @@ class CORE_EXPORT HTMLScriptElement final : public HTMLElement,
+@@ -52,6 +52,7 @@ class CORE_EXPORT HTMLScriptElement final : public HTMLElement,
    void setText(const StringOrTrustedScript&, ExceptionState&);
    void setInnerText(const StringOrTrustedScript&, ExceptionState&) override;
    void setTextContent(const StringOrTrustedScript&, ExceptionState&) override;

build/patches/Modify-default-preferences.patch

@@ -17,7 +17,7 @@ Do not hide component extensions
  components/autofill/core/browser/autofill_manager.cc     | 9 +++------
  components/autofill/core/common/autofill_prefs.cc        | 2 +-
  components/bookmarks/browser/bookmark_utils.cc           | 4 ++--
- components/safe_browsing/common/safe_browsing_prefs.cc   | 4 ++--
+ .../safe_browsing/core/common/safe_browsing_prefs.cc     | 4 ++--
  extensions/common/extension.cc                           | 8 --------
  15 files changed, 18 insertions(+), 33 deletions(-)
 
@@ -36,7 +36,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 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
-@@ -1170,7 +1170,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1217,7 +1217,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -113,20 +113,20 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
-@@ -57,7 +57,7 @@ void NavigationCorrectionTabObserver::SetAllowEnableCorrectionsForTesting(
- // static
+@@ -59,7 +59,7 @@ void NavigationCorrectionTabObserver::SetAllowEnableCorrectionsForTesting(
  void NavigationCorrectionTabObserver::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* prefs) {
--  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true,
-+  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, false,
+   prefs->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
+-                             true,
++                             false,
                               user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
  }
  
 diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
-@@ -107,10 +107,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
+@@ -109,10 +109,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
+   registry->RegisterBooleanPref(prefs::kLocalDiscoveryEnabled, true);
    registry->RegisterBooleanPref(
        prefs::kLocalDiscoveryNotificationsEnabled,
 -#if defined(OS_WIN)
@@ -151,7 +151,7 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -823,10 +823,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
+@@ -883,10 +883,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
        // suggestions available.
        // TODO(mathp): Differentiate between number of suggestions available
        // (current metric) and number shown to the user.
@@ -163,7 +163,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
      }
    }
  
-@@ -1464,8 +1461,8 @@ void AutofillManager::Reset() {
+@@ -1524,8 +1521,8 @@ void AutofillManager::Reset() {
  #if defined(OS_ANDROID) || defined(OS_IOS)
    autofill_assistant_.Reset();
  #endif
@@ -204,10 +204,10 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
    registry->RegisterBooleanPref(
        prefs::kShowManagedBookmarksInBookmarkBar,
-diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc
---- a/components/safe_browsing/common/safe_browsing_prefs.cc
-+++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -169,9 +169,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
+--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
++++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
+@@ -175,9 +175,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
        prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
    registry->RegisterBooleanPref(

build/patches/Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch

@@ -39,7 +39,6 @@ Added flag --fingerprinting-canvas-image-data-noise to disable Canvas image data
  .../renderer/core/html/canvas/text_metrics.cc |  18 ++
  .../renderer/core/html/canvas/text_metrics.h  |   2 +
  .../canvas2d/canvas_rendering_context_2d.cc   |   8 +-
- .../webgl/webgl_debug_renderer_info.cc        |   4 +-
  third_party/blink/renderer/platform/BUILD.gn  |   5 +-
  .../platform/exported/web_runtime_features.cc |  12 ++
  .../platform/graphics/image_data_buffer.cc    |   7 +
@@ -49,7 +48,7 @@ Added flag --fingerprinting-canvas-image-data-noise to disable Canvas image data
  third_party/ungoogled/BUILD.gn                |  10 ++
  third_party/ungoogled/ungoogled_switches.cc   |  18 ++
  third_party/ungoogled/ungoogled_switches.h    |  18 ++
- 24 files changed, 343 insertions(+), 5 deletions(-)
+ 23 files changed, 341 insertions(+), 3 deletions(-)
  create mode 100644 third_party/ungoogled/BUILD.gn
  create mode 100644 third_party/ungoogled/ungoogled_switches.cc
  create mode 100644 third_party/ungoogled/ungoogled_switches.h
@@ -57,7 +56,7 @@ Added flag --fingerprinting-canvas-image-data-noise to disable Canvas image data
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2222,6 +2222,7 @@ jumbo_static_library("browser") {
+@@ -2233,6 +2233,7 @@ jumbo_static_library("browser") {
      "//third_party/metrics_proto",
      "//third_party/re2",
      "//third_party/smhasher:cityhash",
@@ -68,7 +67,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -149,6 +149,7 @@
+@@ -153,6 +153,7 @@
  #include "third_party/blink/public/common/experiments/memory_ablation_experiment.h"
  #include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/common/forcedark/forcedark_switches.h"
@@ -76,7 +75,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #include "third_party/leveldatabase/leveldb_features.h"
  #include "ui/accessibility/accessibility_features.h"
  #include "ui/accessibility/accessibility_switches.h"
-@@ -1513,12 +1514,24 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1584,12 +1585,24 @@ const FeatureEntry kFeatureEntries[] = {
      {"enable-webrtc-srtp-aes-gcm", flag_descriptions::kWebrtcSrtpAesGcmName,
       flag_descriptions::kWebrtcSrtpAesGcmDescription, kOsAll,
       SINGLE_VALUE_TYPE(switches::kEnableWebRtcSrtpAesGcm)},
@@ -104,7 +103,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -209,6 +209,7 @@ jumbo_source_set("browser") {
+@@ -205,6 +205,7 @@ jumbo_source_set("browser") {
      "//third_party/libyuv",
      "//third_party/re2",
      "//third_party/sqlite",
@@ -115,7 +114,7 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
 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
-@@ -225,6 +225,7 @@
+@@ -223,6 +223,7 @@
  #include "third_party/blink/public/common/page/launching_process_state.h"
  #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
  #include "third_party/blink/public/public_buildflags.h"
@@ -123,7 +122,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
  #include "third_party/skia/include/core/SkBitmap.h"
  #include "ui/accessibility/accessibility_switches.h"
  #include "ui/base/ui_base_switches.h"
-@@ -3092,6 +3093,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3091,6 +3092,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
      switches::kDisablePreferCompositingToLCDText,
      switches::kDisableDatabases,
      switches::kDisableFileSystem,
@@ -136,7 +135,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
 diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
 --- a/content/child/BUILD.gn
 +++ b/content/child/BUILD.gn
-@@ -125,6 +125,7 @@ target(link_target_type, "child") {
+@@ -124,6 +124,7 @@ target(link_target_type, "child") {
      "//third_party/blink/public/common",
      "//third_party/blink/public/strings",
      "//third_party/ced",
@@ -155,7 +154,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
  #include "third_party/blink/public/platform/web_runtime_features.h"
  #include "ui/accessibility/accessibility_features.h"
  #include "ui/base/ui_base_features.h"
-@@ -523,6 +524,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -518,6 +519,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
    // They're moved here to distinguish them from actual base checks
    WebRuntimeFeatures::EnableOverlayScrollbars(ui::IsOverlayScrollbarEnabled());
  
@@ -166,9 +165,9 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 +  WebRuntimeFeatures::EnableFingerprintingCanvasImageDataNoise(
 +      !command_line.HasSwitch(switches::kFingerprintingCanvasImageDataNoise));
 +
-   WebRuntimeFeatures::EnableFormControlsRefresh(
-       features::IsFormControlsRefreshEnabled());
- 
+   if (base::FeatureList::GetInstance()->IsFeatureOverriddenFromCommandLine(
+           blink::features::kNativeFileSystemAPI.name,
+           base::FeatureList::OVERRIDE_ENABLE_FEATURE)) {
 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
@@ -193,7 +192,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  #include "base/time/time.h"
  #include "cc/input/overscroll_behavior.h"
  #include "cc/input/scroll_snap_data.h"
-@@ -2875,6 +2876,23 @@ void Document::UpdateStyleAndLayoutTree() {
+@@ -2439,6 +2440,23 @@ void Document::UpdateStyleAndLayoutTree() {
  #if DCHECK_IS_ON()
    AssertLayoutTreeUpdated(*this);
  #endif
@@ -220,7 +219,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -416,6 +416,10 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -417,6 +417,10 @@ class CORE_EXPORT Document : public ContainerNode,
      has_xml_declaration_ = has_xml_declaration ? 1 : 0;
    }
  
@@ -231,7 +230,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
    String visibilityState() const;
    bool IsPageVisible() const;
    bool hidden() const;
-@@ -1970,6 +1974,9 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -1959,6 +1963,9 @@ class CORE_EXPORT Document : public ContainerNode,
  
    base::ElapsedTimer start_time_;
  
@@ -244,7 +243,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
 diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -1902,6 +1902,11 @@ DOMRectList* Element::getClientRects() {
+@@ -1948,6 +1948,11 @@ DOMRectList* Element::getClientRects() {
    DCHECK(element_layout_object);
    GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
        quads, *element_layout_object);
@@ -253,10 +252,10 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
 +      quad.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY());
 +    }
 +  }
-   return DOMRectList::Create(quads);
+   return MakeGarbageCollected<DOMRectList>(quads);
  }
  
-@@ -1919,6 +1924,9 @@ DOMRect* Element::getBoundingClientRect() {
+@@ -1965,6 +1970,9 @@ DOMRect* Element::getBoundingClientRect() {
    DCHECK(element_layout_object);
    GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                          *element_layout_object);
@@ -269,7 +268,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/range.cc b/third_party/blink/renderer/core/dom/range.cc
 --- a/third_party/blink/renderer/core/dom/range.cc
 +++ b/third_party/blink/renderer/core/dom/range.cc
-@@ -1631,11 +1631,21 @@ DOMRectList* Range::getClientRects() const {
+@@ -1631,6 +1631,12 @@ DOMRectList* Range::getClientRects() const {
    Vector<FloatQuad> quads;
    GetBorderAndTextQuads(quads);
  
@@ -279,19 +278,22 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re
 +    }
 +  }
 +
-   return DOMRectList::Create(quads);
+   return MakeGarbageCollected<DOMRectList>(quads);
  }
  
- DOMRect* Range::getBoundingClientRect() const {
--  return DOMRect::FromFloatRect(BoundingRect());
-+  auto rect = BoundingRect();
-+  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
-+    rect.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
+@@ -1758,7 +1764,11 @@ FloatRect Range::BoundingRect() const {
+ 
+   // If all rects are empty, return the first rect.
+   if (result.IsEmpty() && !quads.IsEmpty())
+-    return quads.front().BoundingBox();
++    result = quads.front().BoundingBox();
++
++  if (!result.IsEmpty() && RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
++    result.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
 +  }
-+  return DOMRect::FromFloatRect(rect);
- }
  
- // TODO(editing-dev): We should make
+   return result;
+ }
 diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
 --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
 +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
@@ -335,7 +337,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-@@ -821,9 +821,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+@@ -822,9 +822,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
    else
      direction = ToTextDirection(GetState().GetDirection(), canvas());
  
@@ -352,27 +354,10 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering
  }
  
  void CanvasRenderingContext2D::DrawTextInternal(
-diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
---- a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
-+++ b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
-@@ -37,11 +37,11 @@ WebGLExtensionName WebGLDebugRendererInfo::GetName() const {
- 
- WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
-     WebGLRenderingContextBase* context) {
--  return MakeGarbageCollected<WebGLDebugRendererInfo>(context);
-+  return nullptr;
- }
- 
- bool WebGLDebugRendererInfo::Supported(WebGLRenderingContextBase*) {
--  return true;
-+  return false;
- }
- 
- const char* WebGLDebugRendererInfo::ExtensionName() {
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1478,7 +1478,9 @@ jumbo_component("platform") {
+@@ -1482,7 +1482,9 @@ jumbo_component("platform") {
      "//third_party/blink/renderer:non_test_config",
    ]
  
@@ -383,7 +368,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
  
    public_deps = [
      ":blink_platform_public_deps",
-@@ -1516,6 +1518,7 @@ jumbo_component("platform") {
+@@ -1521,6 +1523,7 @@ jumbo_component("platform") {
      "//third_party/blink/public/mojom:embedded_frame_sink_mojo_bindings_blink",
      "//third_party/blink/public/strings",
      "//third_party/ced",
@@ -394,7 +379,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
 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
-@@ -696,4 +696,16 @@ void WebRuntimeFeatures::EnableAcceleratedSmallCanvases(bool enable) {
+@@ -690,4 +690,16 @@ void WebRuntimeFeatures::EnableAcceleratedSmallCanvases(bool enable) {
    RuntimeEnabledFeatures::SetAcceleratedSmallCanvasesEnabled(enable);
  }
  
@@ -461,7 +446,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
  #include "v8/include/v8.h"
  
  namespace blink {
-@@ -117,9 +121,164 @@ bool StaticBitmapImage::CopyToByteArray(
+@@ -128,7 +132,162 @@ bool StaticBitmapImage::CopyToByteArray(
    DCHECK(read_pixels_successful ||
           !sk_image->bounds().intersect(SkIRect::MakeXYWH(
               rect.X(), rect.Y(), info.width(), info.height())));
@@ -623,15 +608,13 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +#undef writable_addr
 +#undef shuffleComponent
 +
- const gpu::SyncToken& StaticBitmapImage::GetSyncToken() const {
-   static const gpu::SyncToken sync_token;
-   return sync_token;
+ }  // namespace blink
 diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
-@@ -30,6 +30,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image {
-   static scoped_refptr<StaticBitmapImage> Create(sk_sp<SkData> data,
-                                                  const SkImageInfo&);
+@@ -34,6 +34,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image {
+ 
+   StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {}
  
 +  static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY);
 +
@@ -641,7 +624,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 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
-@@ -714,6 +714,15 @@
+@@ -728,6 +728,15 @@
        name: "FetchMetadataDestination",
        status: "experimental"
      },

build/patches/Never-fetch-popular-sites.patch

@@ -11,10 +11,10 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p
 +++ b/components/ntp_tiles/popular_sites_impl.cc
 @@ -275,6 +275,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
    DCHECK(!callback_);
-   callback_ = callback;
+   callback_ = std::move(callback);
  
 +  if (force_download) {
-+    callback_.Run(true);
++    std::move(callback_).Run(true);
 +    return true;
 +  }
 +  return false;

build/patches/Never-send-any-crash-upload-data.patch

@@ -9,7 +9,7 @@ Subject: Never send any crash upload data
 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
-@@ -125,6 +125,9 @@ void TraceCrashServiceUploader::DoUpload(
+@@ -124,6 +124,9 @@ void TraceCrashServiceUploader::DoUpload(
      std::unique_ptr<const base::DictionaryValue> metadata,
      const UploadProgressCallback& progress_callback,
      UploadDoneCallback done_callback) {

build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch

@@ -9,7 +9,7 @@ Subject: Offer builtin autocomplete for chrome://flags
 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
-@@ -255,6 +255,8 @@ std::vector<base::string16> ChromeAutocompleteProviderClient::GetBuiltinURLs() {
+@@ -229,6 +229,8 @@ std::vector<base::string16> ChromeAutocompleteProviderClient::GetBuiltinURLs() {
  std::vector<base::string16>
  ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
    std::vector<base::string16> builtins_to_provide;

build/patches/Open-YouTube-links-in-Bromite.patch

@@ -9,7 +9,7 @@ Subject: Open YouTube links in Bromite
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
-@@ -403,6 +403,7 @@ public class ExternalNavigationHandler {
+@@ -440,6 +440,7 @@ public class ExternalNavigationHandler {
                          Uri.parse(WebView.SCHEME_TEL
                                  + params.getUrl().substring(WTAI_MC_URL_PREFIX.length()))),
                  false);
@@ -17,7 +17,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext
          if (DEBUG) Log.i(TAG, "wtai:// link handled");
          RecordUserAction.record("Android.PhoneIntent");
          return true;
-@@ -746,6 +747,13 @@ public class ExternalNavigationHandler {
+@@ -804,6 +805,13 @@ public class ExternalNavigationHandler {
              return OverrideUrlLoadingResult.OVERRIDE_WITH_ASYNC_ACTION;
          }
  

build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch

@@ -38,7 +38,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
 diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
 --- a/net/url_request/url_request_http_job.cc
 +++ b/net/url_request/url_request_http_job.cc
-@@ -271,6 +271,7 @@ void URLRequestHttpJob::Start() {
+@@ -278,6 +278,7 @@ void URLRequestHttpJob::Start() {
    // plugin could set a referrer although sending the referrer is inhibited.
    request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer);
  
@@ -46,7 +46,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
    // Our consumer should have made sure that this is a safe referrer. See for
    // instance WebCore::FrameLoader::HideReferrer.
    if (referrer.is_valid()) {
-@@ -286,11 +287,14 @@ void URLRequestHttpJob::Start() {
+@@ -293,11 +294,14 @@ void URLRequestHttpJob::Start() {
      request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
                                            referer_value);
    }
@@ -61,7 +61,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
  
    AddExtraHeaders();
    AddCookieHeaderAndStart();
-@@ -505,10 +509,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
+@@ -510,10 +514,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
      } else {
        // Advertise "br" encoding only if transferred data is opaque to proxy.
        bool advertise_brotli = false;
@@ -78,7 +78,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
          }
        }
  
-@@ -526,7 +532,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
+@@ -531,7 +537,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
      }
    }
  

build/patches/Remove-SMS-integration.patch

@@ -3,9 +3,9 @@ Date: Sun, 3 Nov 2019 08:22:29 +0100
 Subject: Remove SMS integration
 
 ---
- .../content/browser/sms/SmsReceiver.java      | 29 +++----------------
+ .../content/browser/sms/SmsReceiver.java      | 30 +++----------------
  .../content/browser/sms/Wrappers.java         | 11 +------
- 2 files changed, 5 insertions(+), 35 deletions(-)
+ 2 files changed, 5 insertions(+), 36 deletions(-)
 
 diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java b/content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java
 --- a/content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java
@@ -41,7 +41,15 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Sm
      }
  
      @CalledByNative
-@@ -77,7 +60,7 @@ public class SmsReceiver extends BroadcastReceiver {
+@@ -66,7 +49,6 @@ public class SmsReceiver extends BroadcastReceiver {
+     private void destroy() {
+         if (DEBUG) Log.d(TAG, "Destroying SmsReceiver.");
+         mDestroyed = true;
+-        mContext.unregisterReceiver(this);
+     }
+ 
+     @Override
+@@ -77,7 +59,7 @@ public class SmsReceiver extends BroadcastReceiver {
              return;
          }
  
@@ -50,7 +58,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Sm
              return;
          }
  
-@@ -104,22 +87,18 @@ public class SmsReceiver extends BroadcastReceiver {
+@@ -104,22 +86,18 @@ public class SmsReceiver extends BroadcastReceiver {
                  if (DEBUG) Log.d(TAG, "Timeout");
                  SmsReceiverJni.get().onTimeout(mSmsProviderAndroid);
                  break;

build/patches/Remove-dependency-on-com.google.android.gcm.patch

@@ -12,9 +12,9 @@ Subject: Remove dependency on com.google.android.gcm
 diff --git a/third_party/android_sdk/BUILD.gn b/third_party/android_sdk/BUILD.gn
 --- a/third_party/android_sdk/BUILD.gn
 +++ b/third_party/android_sdk/BUILD.gn
-@@ -67,7 +67,4 @@ if (enable_java_templates) {
+@@ -63,7 +63,4 @@ if (enable_java_templates) {
      testonly = true
-     java_files = [ "//third_party/android_sdk/public/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ]
+     sources = [ "//third_party/android_sdk/public/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ]
    }
 -  android_java_prebuilt("android_gcm_java") {
 -    jar_path = "//third_party/android_sdk/public/extras/google/gcm/gcm-client/dist/gcm.jar"

build/patches/Remove-dependency-on-com.google.android.gms.auth.patch

@@ -16,8 +16,8 @@ Subject: Remove dependency on com.google.android.gms.auth
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -216,7 +216,6 @@ android_library("chrome_java") {
-     ":thumbnail_cache_entry_proto_java",
+@@ -222,7 +222,6 @@ android_library("chrome_java") {
+     ":partner_location_descriptor_proto_java",
      ":update_proto_java",
      ":usage_stats_proto_java",
 -    "$google_play_services_package:google_play_services_auth_base_java",
@@ -27,7 +27,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/components/signin/core/browser/android/BUILD.gn b/components/signin/core/browser/android/BUILD.gn
 --- a/components/signin/core/browser/android/BUILD.gn
 +++ b/components/signin/core/browser/android/BUILD.gn
-@@ -15,7 +15,6 @@ generate_jni("jni_headers") {
+@@ -14,7 +14,6 @@ generate_jni("jni_headers") {
  
  android_library("java") {
    deps = [
@@ -97,7 +97,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon
 diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
 --- a/content/public/android/BUILD.gn
 +++ b/content/public/android/BUILD.gn
-@@ -53,7 +53,6 @@ action("generate_sandboxed_service_srcjar") {
+@@ -49,7 +49,6 @@ action("generate_sandboxed_service_srcjar") {
  android_library("content_java") {
    deps = [
      ":content_java_resources",
@@ -108,9 +108,9 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
 diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
 --- a/content/test/BUILD.gn
 +++ b/content/test/BUILD.gn
-@@ -2348,7 +2348,6 @@ if (is_android) {
+@@ -2344,7 +2344,6 @@ if (is_android) {
      testonly = true
-     java_files = content_java_sources_needing_jni
+     sources = content_java_sources_needing_jni
      deps = [
 -      "$google_play_services_package:google_play_services_auth_api_phone_java",
        "$google_play_services_package:google_play_services_base_java",
@@ -119,7 +119,7 @@ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
 diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
 --- a/third_party/android_deps/BUILD.gn
 +++ b/third_party/android_deps/BUILD.gn
-@@ -820,50 +820,6 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
+@@ -850,50 +850,6 @@ java_prebuilt("com_android_tools_build_jetifier_jetifier_processor_java") {
    ]
  }
  
@@ -173,7 +173,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
 diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn
 --- a/third_party/robolectric/BUILD.gn
 +++ b/third_party/robolectric/BUILD.gn
-@@ -938,7 +938,6 @@ java_library("shadows_play_services_java") {
+@@ -939,7 +939,6 @@ java_library("shadows_play_services_java") {
      ":robolectric_shadowapi_java",
      ":robolectric_utils_java",
      ":shadows_core_java",

build/patches/Remove-dependency-on-com.google.android.gms.cast.patch

@@ -18,18 +18,18 @@ Subject: Remove dependency on com.google.android.gms.cast
  .../router/caf/CastSessionController.java     |  84 -------------
  .../browser/media/router/caf/CastUtils.java   |   6 -
  .../CafExpandedControllerActivity.java        |  24 +---
- .../remoting/FlingingControllerAdapter.java   |  61 ---------
+ .../remoting/FlingingControllerAdapter.java   |  67 ----------
  .../caf/remoting/RemotingMediaSource.java     |   8 +-
  .../remoting/RemotingSessionController.java   |  21 ----
  chrome/android/java/AndroidManifest.xml       |  28 -----
  chrome/test/android/cast_emulator/BUILD.gn    |   1 -
  third_party/android_deps/BUILD.gn             |  33 -----
- 21 files changed, 27 insertions(+), 778 deletions(-)
+ 21 files changed, 27 insertions(+), 784 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -218,8 +218,6 @@ android_library("chrome_java") {
+@@ -224,8 +224,6 @@ android_library("chrome_java") {
      ":usage_stats_proto_java",
      "$google_play_services_package:google_play_services_base_java",
      "$google_play_services_package:google_play_services_basement_java",
@@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "$google_play_services_package:google_play_services_tasks_java",
      "//base:base_java",
      "//base:jni_java",
-@@ -618,8 +616,6 @@ junit_binary("chrome_junit_tests") {
+@@ -626,8 +624,6 @@ junit_binary("chrome_junit_tests") {
      ":partner_location_descriptor_proto_java",
      "$google_play_services_package:google_play_services_base_java",
      "$google_play_services_package:google_play_services_basement_java",
@@ -47,7 +47,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//base:base_java",
      "//base:base_java_test_support",
      "//base:base_junit_test_support",
-@@ -730,8 +726,6 @@ android_library("chrome_test_java") {
+@@ -736,8 +732,6 @@ android_library("chrome_test_java") {
      ":partner_location_descriptor_proto_java",
      "$google_play_services_package:google_play_services_base_java",
      "$google_play_services_package:google_play_services_basement_java",
@@ -1248,7 +1248,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
  import org.chromium.base.Log;
  import org.chromium.chrome.browser.media.router.FlingingController;
  import org.chromium.chrome.browser.media.router.MediaController;
-@@ -68,14 +63,6 @@ public class FlingingControllerAdapter implements FlingingController, MediaContr
+@@ -69,14 +64,6 @@ public class FlingingControllerAdapter implements FlingingController, MediaContr
      /** Starts loading the media URL, from the given position. */
      public void load(long position) {
          if (!mSessionController.isConnected()) return;
@@ -1263,7 +1263,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
      }
  
      ////////////////////////////////////////////
-@@ -90,30 +77,21 @@ public class FlingingControllerAdapter implements FlingingController, MediaContr
+@@ -91,30 +78,21 @@ public class FlingingControllerAdapter implements FlingingController, MediaContr
              load(/* position= */ 0);
              return;
          }
@@ -1294,7 +1294,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
      }
  
      @Override
-@@ -124,49 +102,10 @@ public class FlingingControllerAdapter implements FlingingController, MediaContr
+@@ -125,54 +103,9 @@ public class FlingingControllerAdapter implements FlingingController, MediaContr
              load(position);
              return;
          }
@@ -1306,7 +1306,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
      ////////////////////////////////////////////
      // MediaController implementation end
      ////////////////////////////////////////////
- 
+-
 -    public void onStatusUpdated() {
 -        if (mMediaStatusObserver == null) return;
 -
@@ -1314,6 +1314,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
 -
 -        MediaStatus mediaStatus = remoteMediaClient.getMediaStatus();
 -        if (mediaStatus != null) {
+-            mHasEverReceivedValidMediaSession = true;
 -            if (mediaStatus.getPlayerState() == MediaStatus.PLAYER_STATE_IDLE
 -                    && mediaStatus.getIdleReason() == MediaStatus.IDLE_REASON_FINISHED) {
 -                mLoaded = false;
@@ -1326,7 +1327,11 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
 -
 -            mMediaStatusObserver.onMediaStatusUpdate(new MediaStatusBridge(mediaStatus));
 -
--        } else {
+-        } else if (mHasEverReceivedValidMediaSession) {
+-            // We can receive a null |mediaStatus| while we are in the process of loading the video.
+-            // We should wait until we receive one valid media status before considering the video
+-            // unloaded. Otherwise, the first call to seek or play will reload the video.
+-            // See b/144325733.
 -            mLoaded = false;
 -            mStreamPositionExtrapolator.clear();
 -        }
@@ -1424,8 +1429,8 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -180,12 +180,6 @@ by a child template that "extends" this file.
-             android:theme="@android:style/Theme.Material.Light.Dialog.Alert" />
+@@ -163,12 +163,6 @@ by a child template that "extends" this file.
+         <meta-data android:name="com.google.ar.core" android:value="optional" />
          {% endif %}
  
 -        <!-- Cast support -->
@@ -1437,7 +1442,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <!-- Note: All activities directly or indirectly derived from ChromeActivity
               must specify android:hardwareAccelerated="false".
  
-@@ -784,16 +778,6 @@ by a child template that "extends" this file.
+@@ -767,16 +761,6 @@ by a child template that "extends" this file.
              </intent-filter>
          </activity>
  
@@ -1454,7 +1459,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <!-- This activity is used to restart the main Chrome process.  Should never be exported. -->
          <activity android:name="org.chromium.chrome.browser.BrowserRestartActivity"
              android:launchMode="singleInstance"
-@@ -1217,18 +1201,6 @@ android:value="true" />
+@@ -1204,18 +1188,6 @@ android:value="true" />
          {% endif %}
  
          {% block extra_application_definitions %}
@@ -1487,7 +1492,7 @@ diff --git a/chrome/test/android/cast_emulator/BUILD.gn b/chrome/test/android/ca
 diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
 --- a/third_party/android_deps/BUILD.gn
 +++ b/third_party/android_deps/BUILD.gn
-@@ -846,39 +846,6 @@ android_aar_prebuilt("google_play_services_basement_java") {
+@@ -874,39 +874,6 @@ android_aar_prebuilt("google_play_services_basement_java") {
    input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
  }
  

build/patches/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch

@@ -29,16 +29,16 @@ Subject: Remove dependency on
  services/BUILD.gn                             |  4 -
  services/device/geolocation/BUILD.gn          |  2 -
  services/shape_detection/BUILD.gn             |  2 -
- third_party/android_deps/BUILD.gn             | 38 ---------
+ third_party/android_deps/BUILD.gn             | 34 --------
  third_party/cacheinvalidation/BUILD.gn        |  1 -
  third_party/robolectric/BUILD.gn              |  2 -
- 27 files changed, 16 insertions(+), 275 deletions(-)
+ 27 files changed, 16 insertions(+), 271 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -216,9 +216,6 @@ android_library("chrome_java") {
-     ":thumbnail_cache_entry_proto_java",
+@@ -222,9 +222,6 @@ android_library("chrome_java") {
+     ":partner_location_descriptor_proto_java",
      ":update_proto_java",
      ":usage_stats_proto_java",
 -    "$google_play_services_package:google_play_services_base_java",
@@ -47,7 +47,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//base:base_java",
      "//base:jni_java",
      "//chrome/android/features/keyboard_accessory:public_java",
-@@ -614,8 +611,6 @@ junit_binary("chrome_junit_tests") {
+@@ -622,8 +619,6 @@ junit_binary("chrome_junit_tests") {
      ":chrome_app_java_resources",
      ":chrome_java",
      ":partner_location_descriptor_proto_java",
@@ -56,8 +56,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//base:base_java",
      "//base:base_java_test_support",
      "//base:base_junit_test_support",
-@@ -724,9 +719,6 @@ android_library("chrome_test_java") {
-     ":chrome_public_test_apk_resources",
+@@ -730,9 +725,6 @@ android_library("chrome_test_java") {
+     ":chrome_app_java_resources",
      ":chrome_test_util_java",
      ":partner_location_descriptor_proto_java",
 -    "$google_play_services_package:google_play_services_base_java",
@@ -105,7 +105,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -858,15 +858,6 @@ by a child template that "extends" this file.
+@@ -841,15 +841,6 @@ by a child template that "extends" this file.
              </intent-filter>
            </activity>
  
@@ -134,7 +134,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b
  import org.chromium.base.Callback;
  import org.chromium.base.ContextUtils;
  import org.chromium.base.annotations.CalledByNative;
-@@ -380,16 +377,7 @@ public abstract class AppHooks {
+@@ -370,16 +367,7 @@ public abstract class AppHooks {
       * same as {@link GoogleApiAvailability#isGooglePlayServicesAvailable()}.
       */
      public int isGoogleApiAvailableWithMinApkVersion(int minApkVersion) {
@@ -564,8 +564,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
 diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
 --- a/chrome/test/android/BUILD.gn
 +++ b/chrome/test/android/BUILD.gn
-@@ -187,8 +187,6 @@ android_library("chrome_java_test_support") {
-     "javatests/src/org/chromium/chrome/test/util/WaitForFocusHelper.java",
+@@ -177,8 +177,6 @@ android_library("chrome_java_test_support") {
+     "javatests/src/org/chromium/chrome/test/util/browser/webapps/WebappTestPage.java",
    ]
    deps = [
 -    "$google_play_services_package:google_play_services_base_java",
@@ -596,7 +596,7 @@ diff --git a/components/background_task_scheduler/BUILD.gn b/components/backgrou
        "//base:base_java",
        "//base:base_java_test_support",
        "//content/public/test/android:content_java_test_support",
-@@ -104,10 +98,6 @@ if (is_android) {
+@@ -105,10 +99,6 @@ if (is_android) {
  
      deps = [
        ":background_task_scheduler_java",
@@ -610,7 +610,7 @@ diff --git a/components/background_task_scheduler/BUILD.gn b/components/backgrou
 diff --git a/components/signin/core/browser/android/BUILD.gn b/components/signin/core/browser/android/BUILD.gn
 --- a/components/signin/core/browser/android/BUILD.gn
 +++ b/components/signin/core/browser/android/BUILD.gn
-@@ -15,8 +15,6 @@ generate_jni("jni_headers") {
+@@ -14,8 +14,6 @@ generate_jni("jni_headers") {
  
  android_library("java") {
    deps = [
@@ -642,7 +642,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon
 diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
 --- a/content/public/android/BUILD.gn
 +++ b/content/public/android/BUILD.gn
-@@ -53,9 +53,6 @@ action("generate_sandboxed_service_srcjar") {
+@@ -49,9 +49,6 @@ action("generate_sandboxed_service_srcjar") {
  android_library("content_java") {
    deps = [
      ":content_java_resources",
@@ -655,9 +655,9 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
 diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
 --- a/content/test/BUILD.gn
 +++ b/content/test/BUILD.gn
-@@ -2348,9 +2348,6 @@ if (is_android) {
+@@ -2344,9 +2344,6 @@ if (is_android) {
      testonly = true
-     java_files = content_java_sources_needing_jni
+     sources = content_java_sources_needing_jni
      deps = [
 -      "$google_play_services_package:google_play_services_base_java",
 -      "$google_play_services_package:google_play_services_basement_java",
@@ -668,9 +668,9 @@ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
 diff --git a/device/BUILD.gn b/device/BUILD.gn
 --- a/device/BUILD.gn
 +++ b/device/BUILD.gn
-@@ -390,8 +390,6 @@ if (is_android) {
+@@ -388,8 +388,6 @@ if (is_android) {
    junit_binary("device_junit_tests") {
-     java_files = [ "gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java" ]
+     sources = [ "gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java" ]
      deps = [
 -      "$google_play_services_package:google_play_services_base_java",
 -      "$google_play_services_package:google_play_services_basement_java",
@@ -693,7 +693,7 @@ diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_jav
 diff --git a/services/BUILD.gn b/services/BUILD.gn
 --- a/services/BUILD.gn
 +++ b/services/BUILD.gn
-@@ -107,8 +107,6 @@ if (is_android) {
+@@ -103,8 +103,6 @@ if (is_android) {
        "shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java",
      ]
      deps = [
@@ -702,7 +702,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn
        "//base:base_java",
        "//base:base_java_test_support",
        "//base:base_junit_test_support",
-@@ -136,8 +134,6 @@ if (is_android) {
+@@ -132,8 +130,6 @@ if (is_android) {
        "shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java",
      ]
      deps = [
@@ -714,9 +714,9 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn
 diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
 --- a/services/device/geolocation/BUILD.gn
 +++ b/services/device/geolocation/BUILD.gn
-@@ -150,8 +150,6 @@ if (is_android) {
+@@ -149,8 +149,6 @@ if (is_android) {
+ 
      deps = [
-       ":geolocation",
        ":geolocation_jni_headers",
 -      "$google_play_services_package:google_play_services_base_java",
 -      "$google_play_services_package:google_play_services_basement_java",
@@ -738,7 +738,7 @@ diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.
 diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
 --- a/third_party/android_deps/BUILD.gn
 +++ b/third_party/android_deps/BUILD.gn
-@@ -820,44 +820,6 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
+@@ -850,40 +850,6 @@ java_prebuilt("com_android_tools_build_jetifier_jetifier_processor_java") {
    ]
  }
  
@@ -759,9 +759,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
 -android_aar_prebuilt("google_play_services_basement_java") {
 -  aar_path = "libs/com_google_android_gms_play_services_basement/play-services-basement-15.0.1.aar"
 -  info_path = "libs/com_google_android_gms_play_services_basement/com_google_android_gms_play_services_basement.info"
--  deps = [
--    ":com_android_support_support_v4_java",
--  ]
+-  deps = [ ":com_android_support_support_v4_java" ]
 -
 -  # Removing drawables from GMS .aars as they are unused bloat.
 -  strip_drawables = true
@@ -772,9 +770,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
 -android_aar_prebuilt("google_play_services_tasks_java") {
 -  aar_path = "libs/com_google_android_gms_play_services_tasks/play-services-tasks-15.0.1.aar"
 -  info_path = "libs/com_google_android_gms_play_services_tasks/com_google_android_gms_play_services_tasks.info"
--  deps = [
--    ":google_play_services_basement_java",
--  ]
+-  deps = [ ":google_play_services_basement_java" ]
 -
 -  # Removing drawables from GMS .aars as they are unused bloat.
 -  strip_drawables = true
@@ -786,7 +782,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
 diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
 --- a/third_party/cacheinvalidation/BUILD.gn
 +++ b/third_party/cacheinvalidation/BUILD.gn
-@@ -137,7 +137,6 @@ if (is_android) {
+@@ -133,7 +133,6 @@ if (is_android) {
      jacoco_never_instrument = true
      deps = [
        ":cacheinvalidation_proto_java",
@@ -797,7 +793,7 @@ diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidat
 diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn
 --- a/third_party/robolectric/BUILD.gn
 +++ b/third_party/robolectric/BUILD.gn
-@@ -938,8 +938,6 @@ java_library("shadows_play_services_java") {
+@@ -939,8 +939,6 @@ java_library("shadows_play_services_java") {
      ":robolectric_shadowapi_java",
      ":robolectric_utils_java",
      ":shadows_core_java",

build/patches/Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch

@@ -21,7 +21,7 @@ Subject: Remove dependency on com.google.android.gms.fido,
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -220,8 +220,6 @@ android_library("chrome_java") {
+@@ -226,8 +226,6 @@ android_library("chrome_java") {
      "$google_play_services_package:google_play_services_basement_java",
      "$google_play_services_package:google_play_services_cast_framework_java",
      "$google_play_services_package:google_play_services_cast_java",
@@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "$google_play_services_package:google_play_services_tasks_java",
      "//base:base_java",
      "//base:jni_java",
-@@ -622,7 +620,6 @@ junit_binary("chrome_junit_tests") {
+@@ -630,7 +628,6 @@ junit_binary("chrome_junit_tests") {
      "$google_play_services_package:google_play_services_basement_java",
      "$google_play_services_package:google_play_services_cast_framework_java",
      "$google_play_services_package:google_play_services_cast_java",
@@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "//base:base_java",
      "//base:base_java_test_support",
      "//base:base_junit_test_support",
-@@ -735,8 +732,6 @@ android_library("chrome_test_java") {
+@@ -741,8 +738,6 @@ android_library("chrome_test_java") {
      "$google_play_services_package:google_play_services_basement_java",
      "$google_play_services_package:google_play_services_cast_framework_java",
      "$google_play_services_package:google_play_services_cast_java",
@@ -50,7 +50,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
-@@ -642,10 +642,6 @@ public class ExternalNavigationHandler {
+@@ -679,10 +679,6 @@ public class ExternalNavigationHandler {
          if (shouldProxyForInstantApps) {
              RecordHistogram.recordEnumeratedHistogram("Android.InstantApps.DirectInstantAppsIntent",
                      AiaIntent.SERP, AiaIntent.NUM_ENTRIES);
@@ -178,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/Ins
 diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm_driver/instance_id/android/BUILD.gn
 --- a/components/gcm_driver/instance_id/android/BUILD.gn
 +++ b/components/gcm_driver/instance_id/android/BUILD.gn
-@@ -19,7 +19,6 @@ generate_jni("test_support_jni_headers") {
+@@ -15,7 +15,6 @@ generate_jni("test_support_jni_headers") {
  
  android_library("instance_id_driver_java") {
    deps = [
@@ -186,7 +186,7 @@ diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm
      "//base:base_java",
      "//base:jni_java",
      "//components/gcm_driver/android:gcm_driver_java",
-@@ -37,7 +36,6 @@ android_library("instance_id_driver_java") {
+@@ -33,7 +32,6 @@ android_library("instance_id_driver_java") {
  android_library("instance_id_driver_test_support_java") {
    deps = [
      ":instance_id_driver_java",
@@ -282,7 +282,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
 diff --git a/device/BUILD.gn b/device/BUILD.gn
 --- a/device/BUILD.gn
 +++ b/device/BUILD.gn
-@@ -392,7 +392,6 @@ if (is_android) {
+@@ -390,7 +390,6 @@ if (is_android) {
      deps = [
        "$google_play_services_package:google_play_services_base_java",
        "$google_play_services_package:google_play_services_basement_java",
@@ -293,7 +293,7 @@ diff --git a/device/BUILD.gn b/device/BUILD.gn
 diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
 --- a/services/device/geolocation/BUILD.gn
 +++ b/services/device/geolocation/BUILD.gn
-@@ -152,7 +152,6 @@ if (is_android) {
+@@ -151,7 +151,6 @@ if (is_android) {
        ":geolocation_jni_headers",
        "$google_play_services_package:google_play_services_base_java",
        "$google_play_services_package:google_play_services_basement_java",
@@ -454,7 +454,7 @@ diff --git a/services/device/geolocation/android/java/src/org/chromium/device/ge
 diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
 --- a/third_party/android_deps/BUILD.gn
 +++ b/third_party/android_deps/BUILD.gn
-@@ -879,64 +879,6 @@ android_aar_prebuilt("google_play_services_cast_framework_java") {
+@@ -907,64 +907,6 @@ android_aar_prebuilt("google_play_services_cast_framework_java") {
    strip_resources = !is_java_debug
  }
  
@@ -522,7 +522,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
 diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
 --- a/third_party/cacheinvalidation/BUILD.gn
 +++ b/third_party/cacheinvalidation/BUILD.gn
-@@ -137,7 +137,6 @@ if (is_android) {
+@@ -133,7 +133,6 @@ if (is_android) {
      jacoco_never_instrument = true
      deps = [
        ":cacheinvalidation_proto_java",

build/patches/Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch

@@ -4,44 +4,25 @@ Subject: Remove dependency on com.google.android.gms.flags,
  com.google.android.gms.location.places, com.google.android.gms.stats
 
 ---
- third_party/android_deps/BUILD.gn | 49 -------------------------------
- 1 file changed, 49 deletions(-)
+ third_party/android_deps/BUILD.gn | 28 ----------------------------
+ 1 file changed, 28 deletions(-)
 
 diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
 --- a/third_party/android_deps/BUILD.gn
 +++ b/third_party/android_deps/BUILD.gn
-@@ -1638,55 +1638,6 @@ java_prebuilt("com_github_stephenc_jcip_jcip_annotations_java") {
+@@ -1709,34 +1709,6 @@ java_prebuilt("com_github_kevinstern_software_and_algorithms_java") {
    visibility = [ ":*" ]
  }
  
--# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
--android_aar_prebuilt("google_play_services_flags_java") {
--  aar_path = "libs/com_google_android_gms_play_services_flags/play-services-flags-15.0.1.aar"
--  info_path = "libs/com_google_android_gms_play_services_flags/com_google_android_gms_play_services_flags.info"
--
--  # To remove visibility constraint, add this dependency to
--  # //tools/android/roll/android_deps/build.gradle.
--  visibility = [ ":*" ]
--  deps = [
--    ":google_play_services_base_java",
--    ":google_play_services_basement_java",
--  ]
--
--  # Removing drawables from GMS .aars as they are unused bloat.
--  strip_drawables = true
--}
--
 -# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 -android_aar_prebuilt("google_play_services_places_placereport_java") {
 -  aar_path = "libs/com_google_android_gms_play_services_places_placereport/play-services-places-placereport-15.0.1.aar"
 -  info_path = "libs/com_google_android_gms_play_services_places_placereport/com_google_android_gms_play_services_places_placereport.info"
 -
 -  # To remove visibility constraint, add this dependency to
--  # //tools/android/roll/android_deps/build.gradle.
+-  # //third_party/android_deps/build.gradle.
 -  visibility = [ ":*" ]
--  deps = [
--    ":google_play_services_basement_java",
--  ]
+-  deps = [ ":google_play_services_basement_java" ]
 -
 -  # Removing drawables from GMS .aars as they are unused bloat.
 -  strip_drawables = true
@@ -53,11 +34,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
 -  info_path = "libs/com_google_android_gms_play_services_stats/com_google_android_gms_play_services_stats.info"
 -
 -  # To remove visibility constraint, add this dependency to
--  # //tools/android/roll/android_deps/build.gradle.
+-  # //third_party/android_deps/build.gradle.
 -  visibility = [ ":*" ]
--  deps = [
--    ":google_play_services_basement_java",
--  ]
+-  deps = [ ":google_play_services_basement_java" ]
 -
 -  # Removing drawables from GMS .aars as they are unused bloat.
 -  strip_drawables = true

build/patches/Remove-dependency-on-com.google.android.gms.gcm.patch

@@ -8,7 +8,7 @@ The snippets are already disabled in native codes, this will disable it on Java
  chrome/android/BUILD.gn                       |  3 -
  .../browser/ChromeBackgroundService.java      |  4 -
  .../ntp/snippets/SnippetsLauncher.java        |  2 +-
- .../gcm/ChromeGcmListenerService.java         | 57 +-----------
+ .../gcm/ChromeGcmListenerService.java         | 58 +-----------
  components/background_task_scheduler/BUILD.gn |  3 -
  .../BackgroundTaskGcmTaskService.java         | 63 +------------
  .../BackgroundTaskSchedulerFactory.java       |  6 +-
@@ -19,12 +19,12 @@ The snippets are already disabled in native codes, this will disable it on Java
  .../channel/AndroidGcmController.java         | 42 +--------
  .../AndroidInstanceIDListenerService.java     | 13 +--
  .../channel/GcmRegistrationTaskService.java   | 89 +------------------
- 14 files changed, 10 insertions(+), 322 deletions(-)
+ 14 files changed, 11 insertions(+), 322 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -221,7 +221,6 @@ android_library("chrome_java") {
+@@ -227,7 +227,6 @@ android_library("chrome_java") {
      "$google_play_services_package:google_play_services_cast_framework_java",
      "$google_play_services_package:google_play_services_cast_java",
      "$google_play_services_package:google_play_services_fido_java",
@@ -32,7 +32,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "$google_play_services_package:google_play_services_iid_java",
      "$google_play_services_package:google_play_services_tasks_java",
      "//base:base_java",
-@@ -738,7 +737,6 @@ android_library("chrome_test_java") {
+@@ -744,7 +743,6 @@ android_library("chrome_test_java") {
      "$google_play_services_package:google_play_services_cast_framework_java",
      "$google_play_services_package:google_play_services_cast_java",
      "$google_play_services_package:google_play_services_fido_java",
@@ -40,7 +40,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
      "$google_play_services_package:google_play_services_iid_java",
      "$google_play_services_package:google_play_services_tasks_java",
      "//base:base_java",
-@@ -1539,7 +1537,6 @@ android_library("browser_java_test_support") {
+@@ -1526,7 +1524,6 @@ android_library("browser_java_test_support") {
    ]
    deps = [
      ":chrome_java",
@@ -65,7 +65,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroun
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
-@@ -36,7 +36,7 @@ public class SnippetsLauncher {
+@@ -35,7 +35,7 @@ public class SnippetsLauncher {
      // If it is non-null then the browser is running.
      private static SnippetsLauncher sInstance;
  
@@ -77,15 +77,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/Sn
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
-@@ -11,7 +11,6 @@ import android.os.Bundle;
- import android.os.SystemClock;
+@@ -10,7 +10,6 @@ import android.os.Build;
+ import android.os.Bundle;
  import android.text.TextUtils;
  
 -import com.google.android.gms.gcm.GcmListenerService;
  import com.google.ipc.invalidation.ticl.android2.channel.AndroidGcmController;
  
  import org.chromium.base.ContextUtils;
-@@ -34,62 +33,9 @@ import org.chromium.content_public.browser.UiThreadTaskTraits;
+@@ -33,62 +32,9 @@ import org.chromium.content_public.browser.UiThreadTaskTraits;
  /**
   * Receives Downstream messages and status of upstream messages from GCM.
   */
@@ -149,14 +149,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/Ch
      /**
       * Returns if we deliver the GCMMessage with a background service by calling
       * Context#startService. This will only work if Android has put us in a whitelist to allow
-@@ -222,7 +168,6 @@ public class ChromeGcmListenerService extends GcmListenerService {
-     static void dispatchMessageToDriver(Context applicationContext, GCMMessage message) {
+@@ -218,7 +164,7 @@ public class ChromeGcmListenerService extends GcmListenerService {
+     static void dispatchMessageToDriver(GCMMessage message) {
          ThreadUtils.assertOnUiThread();
-         ChromeBrowserInitializer.getInstance(applicationContext).handleSynchronousStartup();
+         ChromeBrowserInitializer.getInstance().handleSynchronousStartup();
 -        GCMDriver.dispatchMessage(message);
++        //GCMDriver.dispatchMessage(message);
      }
  
-     private static boolean isNativeLoaded() {
+     private static boolean isFullBrowserLoaded() {
 diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
 --- a/components/background_task_scheduler/BUILD.gn
 +++ b/components/background_task_scheduler/BUILD.gn
@@ -176,7 +177,7 @@ diff --git a/components/background_task_scheduler/BUILD.gn b/components/backgrou
        "$google_play_services_package:google_play_services_tasks_java",
        "//base:base_java",
        "//base:base_java_test_support",
-@@ -109,7 +107,6 @@ if (is_android) {
+@@ -110,7 +108,6 @@ if (is_android) {
        "$google_play_services_package:google_play_services_auth_base_java",
        "$google_play_services_package:google_play_services_base_java",
        "$google_play_services_package:google_play_services_basement_java",
@@ -321,7 +322,7 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
 diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
 --- a/third_party/android_deps/BUILD.gn
 +++ b/third_party/android_deps/BUILD.gn
-@@ -893,21 +893,6 @@ android_aar_prebuilt("google_play_services_fido_java") {
+@@ -921,21 +921,6 @@ android_aar_prebuilt("google_play_services_fido_java") {
    strip_drawables = true
  }
  
@@ -346,7 +347,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
 diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
 --- a/third_party/cacheinvalidation/BUILD.gn
 +++ b/third_party/cacheinvalidation/BUILD.gn
-@@ -137,7 +137,6 @@ if (is_android) {
+@@ -133,7 +133,6 @@ if (is_android) {
      jacoco_never_instrument = true
      deps = [
        ":cacheinvalidation_proto_java",

build/patches/Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch

@@ -10,13 +10,13 @@ Subject: Remove dependency on com.google.android.gms.vision,
  .../BarcodeDetectionProviderImpl.java         |  18 +--
  .../FaceDetectionImplGmsCore.java             | 122 +-----------------
  .../shape_detection/TextDetectionImpl.java    |  60 +--------
- third_party/android_deps/BUILD.gn             |  66 ----------
- 7 files changed, 10 insertions(+), 376 deletions(-)
+ third_party/android_deps/BUILD.gn             |  83 ------------
+ 7 files changed, 10 insertions(+), 393 deletions(-)
 
 diff --git a/services/BUILD.gn b/services/BUILD.gn
 --- a/services/BUILD.gn
 +++ b/services/BUILD.gn
-@@ -109,8 +109,6 @@ if (is_android) {
+@@ -105,8 +105,6 @@ if (is_android) {
      deps = [
        "$google_play_services_package:google_play_services_base_java",
        "$google_play_services_package:google_play_services_basement_java",
@@ -25,7 +25,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn
        "//base:base_java",
        "//base:base_java_test_support",
        "//base:base_junit_test_support",
-@@ -140,8 +138,6 @@ if (is_android) {
+@@ -136,8 +134,6 @@ if (is_android) {
      deps = [
        "$google_play_services_package:google_play_services_base_java",
        "$google_play_services_package:google_play_services_basement_java",
@@ -483,7 +483,7 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect
 diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
 --- a/third_party/android_deps/BUILD.gn
 +++ b/third_party/android_deps/BUILD.gn
-@@ -949,35 +949,6 @@ android_aar_prebuilt("google_play_services_tasks_java") {
+@@ -975,35 +975,6 @@ android_aar_prebuilt("google_play_services_tasks_java") {
    strip_drawables = true
  }
  
@@ -519,7 +519,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
  # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
  android_aar_prebuilt("com_google_android_material_material_java") {
    aar_path = "libs/com_google_android_material_material/material-1.0.0-rc02.aar"
-@@ -1667,25 +1638,6 @@ java_prebuilt("com_github_stephenc_jcip_jcip_annotations_java") {
+@@ -1738,60 +1709,6 @@ java_prebuilt("com_github_kevinstern_software_and_algorithms_java") {
    visibility = [ ":*" ]
  }
  
@@ -529,7 +529,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
 -  info_path = "libs/com_google_android_gms_play_services_clearcut/com_google_android_gms_play_services_clearcut.info"
 -
 -  # To remove visibility constraint, add this dependency to
--  # //tools/android/roll/android_deps/build.gradle.
+-  # //third_party/android_deps/build.gradle.
 -  visibility = [ ":*" ]
 -  deps = [
 -    ":google_play_services_base_java",
@@ -542,20 +542,30 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
 -  strip_drawables = true
 -}
 -
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
- android_aar_prebuilt("google_play_services_flags_java") {
-   aar_path = "libs/com_google_android_gms_play_services_flags/play-services-flags-15.0.1.aar"
-@@ -1703,24 +1655,6 @@ android_aar_prebuilt("google_play_services_flags_java") {
-   strip_drawables = true
- }
- 
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_flags_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_flags/play-services-flags-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_flags/com_google_android_gms_play_services_flags.info"
+-
+-  # To remove visibility constraint, add this dependency to
+-  # //third_party/android_deps/build.gradle.
+-  visibility = [ ":*" ]
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
 -# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 -android_aar_prebuilt("google_play_services_phenotype_java") {
 -  aar_path = "libs/com_google_android_gms_play_services_phenotype/play-services-phenotype-15.0.1.aar"
 -  info_path = "libs/com_google_android_gms_play_services_phenotype/com_google_android_gms_play_services_phenotype.info"
 -
 -  # To remove visibility constraint, add this dependency to
--  # //tools/android/roll/android_deps/build.gradle.
+-  # //third_party/android_deps/build.gradle.
 -  visibility = [ ":*" ]
 -  deps = [
 -    ":google_play_services_base_java",

build/patches/Remove-dependency-on-com.google.android.play.patch

@@ -14,7 +14,7 @@ Subject: Remove dependency on com.google.android.play
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -344,7 +344,6 @@ android_library("chrome_java") {
+@@ -363,7 +363,6 @@ android_library("chrome_java") {
      "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
      "//third_party/cct_dynamic_module:cct_dynamic_module_java",
      "//third_party/gif_player:gif_player_java",
@@ -157,7 +157,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/In
 -import com.google.android.play.core.appupdate.AppUpdateManagerFactory;
 -
  import org.chromium.base.ContextUtils;
- import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.omaha.UpdateConfigs;
 @@ -20,20 +18,6 @@ public class InlineUpdateControllerFactory {
      public static InlineUpdateController create(Runnable callback) {

build/patches/Remove-help-menu-item.patch

@@ -13,10 +13,10 @@ Subject: Remove help menu item
 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
-@@ -81,8 +81,6 @@
+@@ -83,8 +83,6 @@
              android:icon="@drawable/reader_mode_prefs_icon" />
          <item android:id="@+id/preferences_id"
-             android:title="@string/menu_preferences" />
+             android:title="@string/menu_settings" />
 -        <item android:id="@+id/help_id"
 -            android:title="@string/menu_help" />
          <item android:id="@+id/enter_vr_id"
@@ -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
-@@ -2114,15 +2114,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1979,15 +1979,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
          final Tab currentTab = getActivityTab();
  
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
-@@ -125,7 +125,7 @@ public abstract class BaseCustomTabActivity<C extends ChromeActivityComponent>
+@@ -229,7 +229,7 @@ public abstract class BaseCustomTabActivity<C extends BaseCustomTabActivityCompo
      @Override
      public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
          // Disable creating new tabs, bookmark, history, print, help, focus_url, etc.

build/patches/Remove-signin-and-data-saver-integrations.patch

@@ -20,23 +20,23 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
  chrome/android/java/AndroidManifest.xml       | 28 ------
  .../android/java/res/xml/main_preferences.xml | 14 ---
  .../chrome/browser/ChromeActivity.java        | 34 -------
- .../browser/settings/MainPreferences.java     | 86 +-----------------
+ .../chrome/browser/settings/MainSettings.java | 90 +------------------
  .../DataReductionPreferenceFragment.java      | 24 ++---
- .../settings/privacy/PrivacyPreferences.java  |  7 --
- .../sync/SyncAndServicesPreferences.java      |  8 --
- .../chrome/browser/signin/SigninManager.java  | 71 ++-------------
+ .../settings/privacy/PrivacySettings.java     |  7 --
+ .../sync/SyncAndServicesSettings.java         |  8 --
+ .../chrome/browser/signin/SigninManager.java  | 68 ++------------
  .../android/signin/signin_manager_android.cc  |  1 -
  .../strings/android_chrome_strings.grd        | 18 ----
  .../signin/SystemAccountManagerDelegate.java  | 38 +-------
  .../components/sync/AndroidSyncSettings.java  | 24 +----
- .../net/HttpNegotiateAuthenticator.java       | 88 +------------------
+ .../net/HttpNegotiateAuthenticator.java       | 88 +-----------------
  .../chromoting/base/OAuthTokenFetcher.java    |  2 -
- 15 files changed, 25 insertions(+), 421 deletions(-)
+ 15 files changed, 25 insertions(+), 422 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -1114,8 +1114,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
+@@ -1121,8 +1121,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
    resources = [
      "java/res_template/xml/file_paths.xml",
      "java/res_template/xml/launchershortcuts.xml",
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
      {% block extra_uses_permissions %}
      {% endblock %}
  
-@@ -978,16 +970,6 @@ by a child template that "extends" this file.
+@@ -961,16 +953,6 @@ by a child template that "extends" this file.
                  android:resource="@xml/file_paths" />
          </provider>
  
@@ -98,7 +98,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <!-- Broadcast receiver that will be notified of account changes -->
          <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
              <intent-filter>
-@@ -1095,16 +1077,6 @@ by a child template that "extends" this file.
+@@ -1078,16 +1060,6 @@ by a child template that "extends" this file.
          <service android:name="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"
              android:exported="false"/>
  
@@ -134,31 +134,31 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
      <PreferenceCategory
          android:key="basics_section"
          android:order="3"
-@@ -84,11 +75,6 @@
+@@ -79,11 +70,6 @@
          android:key="languages"
-         android:order="16"
-         android:title="@string/prefs_languages"/>
+         android:order="15"
+         android:title="@string/language_settings"/>
 -    <org.chromium.chrome.browser.settings.ChromeBasePreference
 -        android:fragment="org.chromium.chrome.browser.settings.datareduction.DataReductionPreferenceFragment"
 -        android:key="data_reduction"
--        android:order="17"
+-        android:order="16"
 -        android:title="@string/data_reduction_title_lite_mode"/>
      <org.chromium.chrome.browser.settings.ChromeBasePreference
-         android:fragment="org.chromium.chrome.browser.settings.download.DownloadPreferences"
+         android:fragment="org.chromium.chrome.browser.settings.download.DownloadSettings"
          android:key="downloads"
 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
-@@ -131,8 +131,6 @@ import org.chromium.chrome.browser.share.ShareDelegateImpl;
- import org.chromium.chrome.browser.snackbar.BottomContainer;
- import org.chromium.chrome.browser.snackbar.SnackbarManager;
- import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
+@@ -125,8 +125,6 @@ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.settings.SettingsLauncher;
+ import org.chromium.chrome.browser.share.ShareDelegate;
+ import org.chromium.chrome.browser.share.ShareDelegateImpl;
 -import org.chromium.chrome.browser.sync.ProfileSyncService;
 -import org.chromium.chrome.browser.sync.SyncController;
  import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabBrowserControlsConstraintsHelper;
- import org.chromium.chrome.browser.tab.TabImpl;
-@@ -255,9 +253,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+ import org.chromium.chrome.browser.tab.TabDelegateFactory;
+ import org.chromium.chrome.browser.tab.TabHidingType;
+@@ -252,9 +250,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      @SuppressLint("NewApi")
      private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
  
@@ -168,12 +168,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
      @Nullable
      private ChromeFullscreenManager mFullscreenManager;
  
-@@ -870,28 +865,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -873,28 +868,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      private void createContextReporterIfNeeded() {
          if (!mStarted) return; // Sync state reporting should work only in started state.
          if (mContextReporter != null || getActivityTab() == null) return;
 -
--        final SyncController syncController = SyncController.get(this);
+-        final SyncController syncController = SyncController.get();
 -        final ProfileSyncService syncService = ProfileSyncService.get();
 -
 -        if (syncController != null && syncController.isSyncingUrlsWithKeystorePassphrase()) {
@@ -197,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
      }
  
      @Override
-@@ -963,13 +936,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -966,13 +939,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) {
              GSAAccountChangeListener.getInstance().disconnect();
          }
@@ -211,29 +211,34 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
          if (mContextReporter != null) mContextReporter.disable();
  
          super.onStopWithNative();
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPreferences.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPreferences.java
-@@ -19,7 +19,6 @@ import org.chromium.base.ContextUtils;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
+@@ -19,20 +19,14 @@ import org.chromium.base.ContextUtils;
  import org.chromium.chrome.R;
- import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.flags.FeatureUtilities;
 -import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
  import org.chromium.chrome.browser.night_mode.NightModeUtils;
  import org.chromium.chrome.browser.offlinepages.prefetch.PrefetchConfiguration;
  import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
-@@ -27,7 +26,6 @@ import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
+ import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
  import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
  import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
- import org.chromium.chrome.browser.settings.autofill_assistant.AutofillAssistantPreferences;
 -import org.chromium.chrome.browser.settings.datareduction.DataReductionPreferenceFragment;
  import org.chromium.chrome.browser.settings.developer.DeveloperSettings;
- import org.chromium.chrome.browser.settings.sync.SignInPreference;
- import org.chromium.chrome.browser.settings.sync.SyncPreferenceUtils;
-@@ -44,16 +42,11 @@ import java.util.Map;
+-import org.chromium.chrome.browser.settings.sync.SignInPreference;
+ import org.chromium.chrome.browser.settings.sync.SyncSettingsUtils;
+-import org.chromium.chrome.browser.signin.IdentityServicesProvider;
+-import org.chromium.chrome.browser.signin.SigninManager;
+-import org.chromium.chrome.browser.sync.ProfileSyncService;
+ import org.chromium.components.search_engines.TemplateUrl;
+ import org.chromium.components.search_engines.TemplateUrlService;
+ 
+@@ -43,16 +37,11 @@ import java.util.Map;
   * The main settings screen, shown when the user first opens Settings.
   */
- public class MainPreferences extends PreferenceFragmentCompat
+ public class MainSettings extends PreferenceFragmentCompat
 -        implements TemplateUrlService.LoadListener, ProfileSyncService.SyncStateChangedListener,
 -                   SigninManager.SignInStateObserver {
 -    public static final String PREF_ACCOUNT_SECTION = "account_section";
@@ -241,22 +246,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPr
 -    public static final String PREF_SYNC_AND_SERVICES = "sync_and_services";
 +        implements TemplateUrlService.LoadListener {
      public static final String PREF_SEARCH_ENGINE = "search_engine";
-     public static final String PREF_SAVED_PASSWORDS = "saved_passwords";
+     public static final String PREF_PASSWORDS = "passwords";
      public static final String PREF_HOMEPAGE = "homepage";
      public static final String PREF_UI_THEME = "ui_theme";
 -    public static final String PREF_DATA_REDUCTION = "data_reduction";
      public static final String PREF_NOTIFICATIONS = "notifications";
      public static final String PREF_LANGUAGES = "languages";
      public static final String PREF_DOWNLOADS = "downloads";
-@@ -67,7 +60,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -60,7 +49,6 @@ public class MainSettings extends PreferenceFragmentCompat
  
      private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
      private final Map<String, Preference> mAllPreferences = new HashMap<>();
 -    private SignInPreference mSignInPreference;
  
-     public MainPreferences() {
+     public MainSettings() {
          setHasOptionsMenu(true);
-@@ -90,35 +82,16 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -83,35 +71,16 @@ public class MainSettings extends PreferenceFragmentCompat
      @Override
      public void onDestroy() {
          super.onDestroy();
@@ -266,7 +271,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPr
      @Override
      public void onStart() {
          super.onStart();
--        SigninManager signinManager = IdentityServicesProvider.getSigninManager();
+-        SigninManager signinManager = IdentityServicesProvider.get().getSigninManager();
 -        if (signinManager.isSigninSupported()) {
 -            signinManager.addSignInStateObserver(this);
 -            mSignInPreference.registerForUpdates();
@@ -280,7 +285,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPr
      @Override
      public void onStop() {
          super.onStop();
--        SigninManager signinManager = IdentityServicesProvider.getSigninManager();
+-        SigninManager signinManager = IdentityServicesProvider.get().getSigninManager();
 -        if (signinManager.isSigninSupported()) {
 -            signinManager.removeSignInStateObserver(this);
 -            mSignInPreference.unregisterForUpdates();
@@ -292,7 +297,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPr
      }
  
      @Override
-@@ -131,12 +104,9 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -124,12 +93,9 @@ public class MainSettings extends PreferenceFragmentCompat
          SettingsUtils.addPreferencesFromResource(this, R.xml.main_preferences);
          cachePreferences();
  
@@ -305,7 +310,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPr
  
          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
              // If we are on Android O+ the Notifications preference should lead to the Android
-@@ -190,7 +160,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -175,7 +141,6 @@ public class MainSettings extends PreferenceFragmentCompat
              Preference preference = getPreferenceScreen().getPreference(index);
              mAllPreferences.put(preference.getKey(), preference);
          }
@@ -313,11 +318,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPr
      }
  
      private void setManagedPreferenceDelegateForPreference(String key) {
-@@ -199,13 +168,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -184,13 +149,6 @@ public class MainSettings extends PreferenceFragmentCompat
      }
  
      private void updatePreferences() {
--        if (IdentityServicesProvider.getSigninManager().isSigninSupported()) {
+-        if (IdentityServicesProvider.get().getSigninManager().isSigninSupported()) {
 -            addPreferenceIfAbsent(PREF_SIGN_IN);
 -        } else {
 -            removePreferenceIfPresent(PREF_SIGN_IN);
@@ -327,7 +332,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPr
          updateSearchEnginePreference();
  
          Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE);
-@@ -222,10 +184,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -207,10 +165,6 @@ public class MainSettings extends PreferenceFragmentCompat
          } else {
              removePreferenceIfPresent(PREF_DEVELOPER);
          }
@@ -338,21 +343,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPr
      }
  
      private Preference addPreferenceIfAbsent(String key) {
-@@ -239,13 +197,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -224,13 +178,6 @@ public class MainSettings extends PreferenceFragmentCompat
          if (preference != null) getPreferenceScreen().removePreference(preference);
      }
  
 -    private void updateSyncAndServicesPreference() {
 -        ChromeBasePreference syncAndServices =
 -                (ChromeBasePreference) findPreference(PREF_SYNC_AND_SERVICES);
--        syncAndServices.setIcon(SyncPreferenceUtils.getSyncStatusIcon(getActivity()));
--        syncAndServices.setSummary(SyncPreferenceUtils.getSyncStatusSummary(getActivity()));
+-        syncAndServices.setIcon(SyncSettingsUtils.getSyncStatusIcon(getActivity()));
+-        syncAndServices.setSummary(SyncSettingsUtils.getSyncStatusSummary(getActivity()));
 -    }
 -
      private void updateSearchEnginePreference() {
          if (!TemplateUrlServiceFactory.get().isLoaded()) {
              ChromeBasePreference searchEnginePref =
-@@ -277,28 +228,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -262,28 +209,6 @@ public class MainSettings extends PreferenceFragmentCompat
          pref.setSummary(isOn ? R.string.text_on : R.string.text_off);
      }
  
@@ -381,7 +386,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPr
      // TemplateUrlService.LoadListener implementation.
      @Override
      public void onTemplateUrlServiceLoaded() {
-@@ -306,11 +235,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -291,11 +216,6 @@ public class MainSettings extends PreferenceFragmentCompat
          updateSearchEnginePreference();
      }
  
@@ -391,9 +396,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPr
 -    }
 -
      @VisibleForTesting
-     ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() {
+     public ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() {
          return mManagedPreferenceDelegate;
-@@ -320,9 +244,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -305,9 +225,6 @@ public class MainSettings extends PreferenceFragmentCompat
          return new ManagedPreferenceDelegate() {
              @Override
              public boolean isPreferenceControlledByPolicy(Preference preference) {
@@ -403,7 +408,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainPr
                  if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
                      return TemplateUrlServiceFactory.get().isDefaultSearchManaged();
                  }
-@@ -331,11 +252,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -316,11 +233,6 @@ public class MainSettings extends PreferenceFragmentCompat
  
              @Override
              public boolean isPreferenceClickDisabledByPolicy(Preference preference) {
@@ -456,18 +461,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/datare
      }
  
      /**
-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
 @@ -24,7 +24,6 @@ import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference;
  import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
- import org.chromium.chrome.browser.settings.PreferencesLauncher;
+ import org.chromium.chrome.browser.settings.SettingsLauncher;
  import org.chromium.chrome.browser.settings.SettingsUtils;
--import org.chromium.chrome.browser.settings.sync.SyncAndServicesPreferences;
+-import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
  import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
  import org.chromium.ui.text.NoUnderlineClickableSpan;
  import org.chromium.ui.text.SpanApplier;
-@@ -39,9 +38,6 @@ public class PrivacyPreferences
+@@ -39,9 +38,6 @@ public class PrivacySettings
      private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
      private static final String PREF_DO_NOT_TRACK = "do_not_track";
      private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
@@ -477,7 +482,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
  
      private ManagedPreferenceDelegate mManagedPreferenceDelegate;
  
-@@ -64,9 +60,6 @@ public class PrivacyPreferences
+@@ -64,9 +60,6 @@ public class PrivacySettings
          networkPredictionPref.setOnPreferenceChangeListener(this);
          networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
  
@@ -487,10 +492,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
          ChromeBaseCheckBoxPreference searchSuggestionsPref =
                  (ChromeBaseCheckBoxPreference) findPreference(PREF_SEARCH_SUGGESTIONS);
          searchSuggestionsPref.setOnPreferenceChangeListener(this);
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java
-@@ -175,15 +175,7 @@ public class SyncAndServicesPreferences extends PreferenceFragmentCompat
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesSettings.java
+@@ -162,15 +162,7 @@ public class SyncAndServicesSettings extends PreferenceFragmentCompat
  
          mPrivacyPrefManager.migrateNetworkPredictionPreferences();
  
@@ -509,17 +514,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/S
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
-@@ -22,9 +22,6 @@ import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.base.metrics.RecordUserAction;
+@@ -23,8 +23,6 @@ import org.chromium.base.metrics.RecordUserAction;
  import org.chromium.base.task.PostTask;
  import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
--import org.chromium.components.signin.AccountIdProvider;
+ import org.chromium.components.signin.AccountManagerFacade;
 -import org.chromium.components.signin.AccountTrackerService;
 -import org.chromium.components.signin.ChromeSigninController;
+ import org.chromium.components.signin.base.CoreAccountInfo;
  import org.chromium.components.signin.identitymanager.ClearAccountsAction;
- import org.chromium.components.signin.identitymanager.CoreAccountInfo;
  import org.chromium.components.signin.identitymanager.IdentityManager;
-@@ -50,7 +47,7 @@ import java.util.List;
+@@ -50,7 +48,7 @@ import java.util.List;
   * See chrome/browser/signin/signin_manager_android.h for more details.
   */
  public class SigninManager
@@ -528,7 +532,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
      private static final String TAG = "SigninManager";
  
      /**
-@@ -168,7 +165,6 @@ public class SigninManager
+@@ -168,7 +166,6 @@ public class SigninManager
       * This is not final, as destroy() updates this.
       */
      private long mNativeSigninManagerAndroid;
@@ -536,7 +540,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
      private final IdentityManager mIdentityManager;
      private final IdentityMutator mIdentityMutator;
      private final AndroidSyncSettings mAndroidSyncSettings;
-@@ -205,24 +201,22 @@ public class SigninManager
+@@ -206,24 +203,22 @@ public class SigninManager
       */
      @CalledByNative
      private static SigninManager create(long nativeSigninManagerAndroid,
@@ -549,14 +553,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
          assert identityMutator != null;
 -        return new SigninManager(nativeSigninManagerAndroid, accountTrackerService, identityManager,
 +        return new SigninManager(nativeSigninManagerAndroid, identityManager,
-                 identityMutator, AndroidSyncSettings.get());
+                 identityMutator, AndroidSyncSettings.get(), ExternalAuthUtils.getInstance());
      }
  
      @VisibleForTesting
 -    SigninManager(long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService,
 +    SigninManager(long nativeSigninManagerAndroid,
              IdentityManager identityManager, IdentityMutator identityMutator,
-             AndroidSyncSettings androidSyncSettings) {
+             AndroidSyncSettings androidSyncSettings, ExternalAuthUtils externalAuthUtils) {
          ThreadUtils.assertOnUiThread();
          assert androidSyncSettings != null;
          mNativeSigninManagerAndroid = nativeSigninManagerAndroid;
@@ -564,7 +568,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
          mIdentityManager = identityManager;
          mIdentityMutator = identityMutator;
          mAndroidSyncSettings = androidSyncSettings;
-@@ -230,7 +224,6 @@ public class SigninManager
+@@ -232,7 +227,6 @@ public class SigninManager
          mSigninAllowedByPolicy =
                  SigninManagerJni.get().isSigninAllowedByPolicy(mNativeSigninManagerAndroid);
  
@@ -572,7 +576,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
          mIdentityManager.addObserver(this);
  
          reloadAllAccountsFromSystem();
-@@ -243,7 +236,6 @@ public class SigninManager
+@@ -245,7 +239,6 @@ public class SigninManager
      @CalledByNative
      public void destroy() {
          mIdentityManager.removeObserver(this);
@@ -580,17 +584,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
          mNativeSigninManagerAndroid = 0;
      }
  
-@@ -282,8 +274,7 @@ public class SigninManager
+@@ -284,8 +277,7 @@ public class SigninManager
       * Returns true if signin can be started now.
       */
      public boolean isSignInAllowed() {
 -        return !mFirstRunCheckIsPending && mSignInState == null && mSigninAllowedByPolicy
 -                && ChromeSigninController.get().getSignedInUser() == null && isSigninSupported();
-+	return false;
++       return false;
      }
  
      /**
-@@ -339,27 +330,6 @@ public class SigninManager
+@@ -340,27 +332,6 @@ public class SigninManager
          });
      }
  
@@ -618,24 +622,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
      /**
       * Starts the sign-in flow, and executes the callback when finished.
       *
-@@ -407,14 +377,8 @@ public class SigninManager
+@@ -430,11 +401,8 @@ public class SigninManager
      }
  
      private void progressSignInFlowSeedSystemAccounts() {
 -        if (mAccountTrackerService.checkAndSeedSystemAccounts()) {
 -            progressSignInFlowCheckPolicy();
--        } else if (AccountIdProvider.getInstance().canBeUsed()) {
--            mSignInState.mBlockedOnAccountSeeding = true;
 -        } else {
--            Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable");
--            abortSignIn();
+-            mSignInState.mBlockedOnAccountSeeding = true;
 -        }
 +        Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable");
 +        abortSignIn();
      }
  
      /**
-@@ -451,18 +415,6 @@ public class SigninManager
+@@ -471,18 +439,6 @@ public class SigninManager
          // The user should not be already signed in
          assert !mIdentityManager.hasPrimaryAccount();
  
@@ -648,13 +649,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
 -        // Cache the signed-in account name. This must be done after the native call, otherwise
 -        // sync tries to start without being signed in natively and crashes.
 -        ChromeSigninController.get().setSignedInAccountName(
--                mSignInState.mCoreAccountInfo.getName());
--        enableSync(mSignInState.mCoreAccountInfo.getAccount());
+-                mSignInState.mCoreAccountInfo.getEmail());
+-        enableSync(mSignInState.mCoreAccountInfo);
 -
          if (mSignInState.mCallback != null) {
              mSignInState.mCallback.onSignInComplete();
          }
-@@ -620,10 +572,8 @@ public class SigninManager
+@@ -640,10 +596,8 @@ public class SigninManager
  
          // Native sign-out must happen before resetting the account so data is deleted correctly.
          // http://crbug.com/589028
@@ -665,14 +666,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
      }
  
      void finishSignOut() {
-@@ -683,13 +633,6 @@ public class SigninManager
+@@ -703,14 +657,6 @@ public class SigninManager
          SigninManagerJni.get().stopApplyingCloudPolicy(mNativeSigninManagerAndroid);
      }
  
--    private void enableSync(Account account) {
+-    private void enableSync(CoreAccountInfo accountInfo) {
 -        // Cache the signed-in account name. This must be done after the native call, otherwise
 -        // sync tries to start without being signed in the native code and crashes.
--        mAndroidSyncSettings.updateAccount(account);
+-        mAndroidSyncSettings.updateAccount(
+-                AccountManagerFacade.createAccountFromName(accountInfo.getEmail()));
 -        mAndroidSyncSettings.enableChromeSync();
 -    }
 -
@@ -693,7 +695,7 @@ diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/br
 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
-@@ -369,24 +369,12 @@ CHAR-LIMIT guidelines:
+@@ -273,24 +273,12 @@ CHAR-LIMIT guidelines:
        </message>
  
        <!-- Sign-in, sync and personalization preferences -->
@@ -718,7 +720,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_SIGN_IN_TO_CHROME_DISABLED_SUMMARY" desc="A descriptive line of text that appears under the 'Sign in to Chrome' option, in Chrome Settings on Android. The text explains why 'Sign in to Chrome' is disabled. 'Administrator' refers to the IT administrator of the company/organization that owns the user’s device.">
          Disabled by the administrator of this device
        </message>
-@@ -436,9 +424,6 @@ CHAR-LIMIT guidelines:
+@@ -340,9 +328,6 @@ CHAR-LIMIT guidelines:
        <message name="IDS_URL_KEYED_ANONYMIZED_DATA_SUMMARY" desc="Summary for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
          Sends URLs of pages you visit to Google
        </message>
@@ -728,7 +730,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_CANCEL_SYNC_DIALOG_TITLE" desc="The title of a dialog that is shown when users tries closing 'Sync and Google services' preferences without confirming the changes.">
          Cancel sync?
        </message>
-@@ -1294,9 +1279,6 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1231,9 +1216,6 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_DATA_REDUCTION_DESCRIPTION_LITE_MODE" desc="Text describing how the Lite mode feature works. Seen only before the user has enabled the feature.">
          When Lite mode is on, Chrome uses Google servers to make pages load faster. Lite mode rewrites very slow pages to load only essential content. Lite mode does not apply to Incognito tabs.
        </message>

build/patches/Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch

@@ -1,37 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 15 Feb 2020 08:20:40 +0100
-Subject: Restore GPU bug blacklist for AImageReader on ARM CPUs
-
-Restore the AImageReader blacklist for ARM/ARM64 devices which causes
-crashes on Android 9 and 10 (at different code locations).
-
-See discussion at https://github.com/bromite/bromite/issues/445
----
- gpu/config/gpu_driver_bug_list.json | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-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
-@@ -2891,6 +2891,18 @@
-         "reset_base_mipmap_level_before_texstorage"
-       ]
-     },
-+    {
-+      "id":275,
-+      "cr_bugs": [838725],
-+      "description": "Disable AImageReader on ARM GPUs as its buggy.",
-+      "os": {
-+        "type": "android"
-+      },
-+      "gl_vendor": "ARM.*",
-+      "features": [
-+        "disable_aimagereader"
-+      ]
-+    },
-     {
-       "id": 277,
-       "description": "Direct composition path is buggy on certain AMD devices/drivers",
--- 
-2.17.1
-

build/patches/Restore-classic-new-tab-page.patch

@@ -23,9 +23,9 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
  // Used to look up the URL to use for the New Tab page. Also tracks how we
  // arrived at that URL so it can be logged with UMA.
  struct NewTabURLDetails {
-@@ -176,8 +169,7 @@ struct NewTabURLDetails {
- 
-     const GURL local_url(chrome::kChromeSearchLocalNtpUrl);
+@@ -182,8 +175,7 @@ struct NewTabURLDetails {
+                              : chrome::kChromeSearchLocalNtpUrl);
+ #endif
  
 -    if (ShouldShowLocalNewTab(profile))
 -      return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);

build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch

@@ -4,31 +4,20 @@ Subject: Revert "Cleanup Search Ready Omnibox flag since it has launched"
 
 This reverts commit ae458edcc8422d0815d0e82261e71fe10d7d6fc2.
 ---
- .../src/org/chromium/chrome/browser/ChromeFeatureList.java | 1 +
  .../browser/omnibox/suggestions/AutocompleteMediator.java  | 7 +++++++
  chrome/browser/about_flags.cc                              | 3 +++
- chrome/browser/android/chrome_feature_list.cc              | 4 ++++
- chrome/browser/android/chrome_feature_list.h               | 1 +
  chrome/browser/flag-metadata.json                          | 5 +++++
  chrome/browser/flag_descriptions.cc                        | 5 +++++
  chrome/browser/flag_descriptions.h                         | 3 +++
+ chrome/browser/flags/android/chrome_feature_list.cc        | 4 ++++
+ chrome/browser/flags/android/chrome_feature_list.h         | 1 +
+ .../chromium/chrome/browser/flags/ChromeFeatureList.java   | 1 +
  8 files changed, 29 insertions(+)
 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
-@@ -309,6 +309,7 @@ public abstract class ChromeFeatureList {
-     public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts";
-     public static final String REACHED_CODE_PROFILER = "ReachedCodeProfiler";
-     public static final String READER_MODE_IN_CCT = "ReaderModeInCCT";
-+    public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
-     public static final String REMOVE_NAVIGATION_HISTORY = "RemoveNavigationHistory";
-     public static final String REORDER_BOOKMARKS = "ReorderBookmarks";
-     public static final String REVAMPED_CONTEXT_MENU = "RevampedContextMenu";
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
-@@ -387,6 +387,13 @@ class AutocompleteMediator
+@@ -435,6 +435,13 @@ class AutocompleteMediator
      void onNativeInitialized() {
          mNativeInitialized = true;
  
@@ -45,7 +34,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggest
 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
-@@ -2027,6 +2027,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2071,6 +2071,9 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kAndroidAutofillAccessibilityName,
       flag_descriptions::kAndroidAutofillAccessibilityDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(features::kAndroidAutofillAccessibility)},
@@ -55,42 +44,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #endif  // OS_ANDROID
      {"enable-zero-copy", flag_descriptions::kZeroCopyName,
       flag_descriptions::kZeroCopyDescription, kOsAll,
-diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
---- a/chrome/browser/android/chrome_feature_list.cc
-+++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -166,6 +166,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
-     &kReorderBookmarks,
-     &kRevampedContextMenu,
-     &kScrollToExpandPaymentHandler,
-+    &kSearchReadyOmniboxFeature,
-     &kSearchEnginePromoExistingDevice,
-     &kSearchEnginePromoNewDevice,
-     &kServiceManagerForBackgroundPrefetch,
-@@ -519,6 +520,9 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu",
- const base::Feature kScrollToExpandPaymentHandler{
-     "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT};
- 
-+const base::Feature kSearchReadyOmniboxFeature{
-+    "SearchReadyOmnibox", base::FEATURE_ENABLED_BY_DEFAULT};
-+
- const base::Feature kServiceManagerForBackgroundPrefetch{
-     "ServiceManagerForBackgroundPrefetch", base::FEATURE_DISABLED_BY_DEFAULT};
- 
-diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h
---- a/chrome/browser/android/chrome_feature_list.h
-+++ b/chrome/browser/android/chrome_feature_list.h
-@@ -101,6 +101,7 @@ extern const base::Feature kRevampedContextMenu;
- extern const base::Feature kScrollToExpandPaymentHandler;
- extern const base::Feature kSearchEnginePromoExistingDevice;
- extern const base::Feature kSearchEnginePromoNewDevice;
-+extern const base::Feature kSearchReadyOmniboxFeature;
- extern const base::Feature kServiceManagerForBackgroundPrefetch;
- extern const base::Feature kServiceManagerForDownload;
- extern const base::Feature kSettingsModernStatusBar;
 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
-@@ -1758,6 +1758,11 @@
+@@ -1763,6 +1763,11 @@
      "owners": [ "ginko", "newcomer" ],
      "expiry_milestone": 78
    },
@@ -105,7 +62,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 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
-@@ -2771,6 +2771,11 @@ const char kSafeBrowsingUseLocalBlacklistsV2Description[] =
+@@ -2620,6 +2620,11 @@ const char kSafeBrowsingUseLocalBlacklistsV2Description[] =
      "process to check the Safe Browsing reputation of URLs without calling "
      "into GmsCore for every URL.";
  
@@ -120,7 +77,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
-@@ -1630,6 +1630,9 @@ extern const char kReaderModeInCCTDescription[];
+@@ -1518,6 +1518,9 @@ extern const char kRecoverFromNeverSaveAndroidDescription[];
  extern const char kSafeBrowsingUseLocalBlacklistsV2Name[];
  extern const char kSafeBrowsingUseLocalBlacklistsV2Description[];
  
@@ -130,6 +87,49 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
  extern const char kSetMarketUrlForTestingName[];
  extern const char kSetMarketUrlForTestingDescription[];
  
+diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
+--- a/chrome/browser/flags/android/chrome_feature_list.cc
++++ b/chrome/browser/flags/android/chrome_feature_list.cc
+@@ -181,6 +181,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
+     &kReorderBookmarks,
+     &kRevampedContextMenu,
+     &kScrollToExpandPaymentHandler,
++    &kSearchReadyOmniboxFeature,
+     &kSearchEnginePromoExistingDevice,
+     &kSearchEnginePromoNewDevice,
+     &kServiceManagerForBackgroundPrefetch,
+@@ -550,6 +551,9 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu",
+ const base::Feature kScrollToExpandPaymentHandler{
+     "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
++const base::Feature kSearchReadyOmniboxFeature{
++    "SearchReadyOmnibox", base::FEATURE_ENABLED_BY_DEFAULT};
++
+ const base::Feature kServiceManagerForBackgroundPrefetch{
+     "ServiceManagerForBackgroundPrefetch", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
+--- a/chrome/browser/flags/android/chrome_feature_list.h
++++ b/chrome/browser/flags/android/chrome_feature_list.h
+@@ -108,6 +108,7 @@ extern const base::Feature kRevampedContextMenu;
+ extern const base::Feature kScrollToExpandPaymentHandler;
+ extern const base::Feature kSearchEnginePromoExistingDevice;
+ extern const base::Feature kSearchEnginePromoNewDevice;
++extern const base::Feature kSearchReadyOmniboxFeature;
+ extern const base::Feature kServiceManagerForBackgroundPrefetch;
+ extern const base::Feature kServiceManagerForDownload;
+ extern const base::Feature kShoppingAssist;
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
++++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+@@ -319,6 +319,7 @@ public abstract class ChromeFeatureList {
+     public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts";
+     public static final String REACHED_CODE_PROFILER = "ReachedCodeProfiler";
+     public static final String READER_MODE_IN_CCT = "ReaderModeInCCT";
++    public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
+     public static final String REMOVE_NAVIGATION_HISTORY = "RemoveNavigationHistory";
+     public static final String REORDER_BOOKMARKS = "ReorderBookmarks";
+     public static final String REVAMPED_CONTEXT_MENU = "RevampedContextMenu";
 -- 
 2.17.1
 

build/patches/Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch

@@ -12,9 +12,9 @@ Unified consent miscellanous backport fixes
  .../chrome/browser/feed/FeedNewTabPage.java   |  2 +-
  .../browser/feed/TestNetworkClient.java       |  2 +-
  .../java/res/xml/privacy_preferences.xml      | 26 +++++
- .../settings/privacy/PrivacyPreferences.java  | 96 ++++++++++++++++---
- .../settings/sync/SyncPreferenceUtils.java    |  2 +-
- .../sync/SyncNotificationController.java      | 11 ++-
+ .../settings/privacy/PrivacySettings.java     | 96 ++++++++++++++++---
+ .../settings/sync/SyncSettingsUtils.java      |  2 +-
+ .../sync/SyncNotificationController.java      |  8 +-
  .../chrome/browser/sync/SyncTestRule.java     |  9 +-
  .../chromium/chrome/browser/sync/UkmTest.java | 50 +++++++++-
  .../strings/android_chrome_strings.grd        | 15 +++
@@ -71,7 +71,7 @@ Unified consent miscellanous backport fixes
  .../android_chrome_strings_zh-CN.xtb          | 19 +++-
  .../android_chrome_strings_zh-TW.xtb          | 19 +++-
  .../unified_consent_service_factory.cc        |  5 +-
- 62 files changed, 1129 insertions(+), 77 deletions(-)
+ 62 files changed, 1127 insertions(+), 76 deletions(-)
 
 diff --git a/chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java b/chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java
 --- a/chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java
@@ -134,7 +134,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 +        android:title="@string/usage_and_crash_reports_title"
 +        android:fragment="org.chromium.chrome.browser.settings.privacy.UsageAndCrashReportsPreferenceFragment" />
      <Preference
-         android:fragment="org.chromium.chrome.browser.settings.privacy.DoNotTrackPreference"
+         android:fragment="org.chromium.chrome.browser.settings.privacy.DoNotTrackSettings"
          android:key="do_not_track"
 @@ -28,6 +50,10 @@
          android:title="@string/clear_browsing_data_title"
@@ -147,9 +147,9 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
      <org.chromium.chrome.browser.settings.TextMessagePreference
          android:key="sync_and_services_link"
          android:summary="@string/privacy_sync_and_services_link"
-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
 @@ -15,10 +15,12 @@ import android.view.MenuItem;
  
  import org.chromium.base.BuildInfo;
@@ -162,10 +162,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
 +import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge;
  import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference;
  import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
- import org.chromium.chrome.browser.settings.PreferencesLauncher;
+ import org.chromium.chrome.browser.settings.SettingsLauncher;
 @@ -33,18 +35,24 @@ import org.chromium.ui.text.SpanApplier;
   */
- public class PrivacyPreferences
+ public class PrivacySettings
          extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
 +    private static final String PREF_NAVIGATION_ERROR = "navigation_error";
 +    private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
@@ -191,14 +191,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
          SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
          getActivity().setTitle(R.string.prefs_privacy);
          setHasOptionsMenu(true);
-@@ -62,14 +70,30 @@ public class PrivacyPreferences
+@@ -62,14 +70,30 @@ public class PrivacySettings
          networkPredictionPref.setOnPreferenceChangeListener(this);
          networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
  
 -        Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
 -        NoUnderlineClickableSpan linkSpan = new NoUnderlineClickableSpan(getResources(), view -> {
--            PreferencesLauncher.launchSettingsPage(getActivity(), SyncAndServicesPreferences.class,
--                    SyncAndServicesPreferences.createArguments(false));
+-            SettingsLauncher.getInstance().launchSettingsPage(getActivity(),
+-                    SyncAndServicesSettings.class, SyncAndServicesSettings.createArguments(false));
 -        });
 -        syncAndServicesLink.setSummary(
 -                SpanApplier.applySpans(getString(R.string.privacy_sync_and_services_link),
@@ -230,7 +230,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
  
          updateSummaries();
      }
-@@ -82,6 +106,15 @@ public class PrivacyPreferences
+@@ -82,6 +106,15 @@ public class PrivacySettings
                      Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
          } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
              PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
@@ -246,7 +246,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
          }
  
          return true;
-@@ -99,6 +132,35 @@ public class PrivacyPreferences
+@@ -99,6 +132,35 @@ public class PrivacySettings
      public void updateSummaries() {
          PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
  
@@ -282,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
          CheckBoxPreference canMakePaymentPref =
                  (CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
          if (canMakePaymentPref != null) {
-@@ -136,6 +198,18 @@ public class PrivacyPreferences
+@@ -136,6 +198,18 @@ public class PrivacySettings
      private ManagedPreferenceDelegate createManagedPreferenceDelegate() {
          return preference -> {
              String key = preference.getKey();
@@ -301,10 +301,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
              if (PREF_NETWORK_PREDICTIONS.equals(key)) {
                  return PrivacyPreferencesManager.getInstance().isNetworkPredictionManaged();
              }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncPreferenceUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncPreferenceUtils.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncPreferenceUtils.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncPreferenceUtils.java
-@@ -97,7 +97,7 @@ public class SyncPreferenceUtils {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncSettingsUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncSettingsUtils.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncSettingsUtils.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncSettingsUtils.java
+@@ -191,7 +191,7 @@ public class SyncSettingsUtils {
                          : context.getString(R.string.sync_passwords_error_card_title);
              }
  
@@ -316,39 +316,32 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/S
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
-@@ -7,11 +7,13 @@ package org.chromium.chrome.browser.sync;
+@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.sync;
  import android.content.Context;
  import android.content.Intent;
  import android.os.Build;
 +import android.os.Bundle;
  import android.util.Log;
  
- import org.chromium.base.ContextUtils;
- import org.chromium.base.ThreadUtils;
- import org.chromium.chrome.R;
-+import org.chromium.chrome.browser.ChromeFeatureList;
- import org.chromium.chrome.browser.notifications.ChromeNotification;
- import org.chromium.chrome.browser.notifications.ChromeNotificationBuilder;
- import org.chromium.chrome.browser.notifications.NotificationBuilderFactory;
-@@ -24,6 +26,7 @@ import org.chromium.chrome.browser.notifications.PendingIntentProvider;
+ import androidx.annotation.StringRes;
+@@ -24,6 +25,7 @@ import org.chromium.chrome.browser.notifications.NotificationMetadata;
+ import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
+ import org.chromium.chrome.browser.notifications.PendingIntentProvider;
  import org.chromium.chrome.browser.notifications.channels.ChannelDefinitions;
- import org.chromium.chrome.browser.settings.PreferencesLauncher;
- import org.chromium.chrome.browser.settings.sync.SyncAndServicesPreferences;
 +import org.chromium.chrome.browser.settings.sync.AccountManagementFragment;
- import org.chromium.chrome.browser.sync.GoogleServiceAuthError.State;
- import org.chromium.chrome.browser.sync.ui.PassphraseActivity;
- import org.chromium.components.sync.AndroidSyncSettings;
-@@ -169,9 +172,11 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC
+ import org.chromium.chrome.browser.settings.SettingsLauncher;
+ import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
+ import org.chromium.chrome.browser.signin.IdentityServicesProvider;
+@@ -196,9 +198,11 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC
       * @return the intent for opening the settings
       */
      private Intent createSettingsIntent() {
--        return PreferencesLauncher.createIntentForSettingsPage(ContextUtils.getApplicationContext(),
--                SyncAndServicesPreferences.class.getName(),
--                SyncAndServicesPreferences.createArguments(false));
 +        final String fragmentName = AccountManagementFragment.class.getName();
 +        final Bundle fragmentArguments = null;
 +
-+        return PreferencesLauncher.createIntentForSettingsPage(
+         return SettingsLauncher.getInstance().createIntentForSettingsPage(
+-                ContextUtils.getApplicationContext(), SyncAndServicesSettings.class.getName(),
+-                SyncAndServicesSettings.createArguments(false));
 +                ContextUtils.getApplicationContext(), fragmentName, fragmentArguments);
      }
  
@@ -356,7 +349,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotifi
 diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java
 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java
 +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java
-@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.ChromeFeatureList;
+@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.ChromeActivity;
  import org.chromium.chrome.browser.SyncFirstSetupCompleteSource;
  import org.chromium.chrome.browser.autofill.PersonalDataManager;
  import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
@@ -364,7 +357,7 @@ diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncT
  import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator;
  import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
  import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
-@@ -355,8 +356,12 @@ public class SyncTestRule extends ChromeActivityTestRule<ChromeActivity> {
+@@ -352,8 +353,12 @@ public class SyncTestRule extends ChromeActivityTestRule<ChromeActivity> {
                              Assert.fail("Sign-in was aborted");
                          }
                      });
@@ -459,7 +452,7 @@ diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTe
 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
-@@ -741,6 +741,18 @@ CHAR-LIMIT guidelines:
+@@ -648,6 +648,18 @@ CHAR-LIMIT guidelines:
        <message name="IDS_PREFS_PRIVACY" desc="Title for the Privacy preferences. [CHAR-LIMIT=32]">
          Privacy
        </message>
@@ -478,7 +471,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_TITLE" desc="Title for checkbox that controls reporting data to detect bad apps/sites. Please ensure ‘Safe Browsing’ in this message matches the ‘Safe Browsing’ settings title.">
          Help improve Chrome security
        </message>
-@@ -1521,6 +1533,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1458,6 +1470,9 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_ACCOUNT_MANAGEMENT_TITLE" desc="Header title for the account management screen. [CHAR-LIMIT=32]">
          Signed in to Google as
        </message>
@@ -491,7 +484,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">ይህ ለሁሉም ጣቢያዎች ውሂብን ያጸዳል፣ የሚከተሉትን ጨምሮ፦</translation>
  <translation id="983192555821071799">ሁሉንም ትሮች ይዝጉ</translation>
  <translation id="987264212798334818">አጠቃላይ</translation>
@@ -518,7 +511,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">سيؤدي هذا إلى محو بيانات جميع المواقع، بما في ذلك:</translation>
  <translation id="983192555821071799">إغلاق جميع علامات التبويب</translation>
  <translation id="987264212798334818">عام</translation>
@@ -545,7 +538,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">Това действие ще изчисти данните за всички сайтове, включително:</translation>
  <translation id="983192555821071799">Затваряне на всички раздели</translation>
  <translation id="987264212798334818">Общи</translation>
@@ -572,7 +565,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb
-@@ -1128,4 +1128,21 @@
+@@ -1102,4 +1102,21 @@
  <translation id="982182592107339124">এটা সব সাইটের জন্য ডেটা সাফ করবে, এতে অন্তর্ভুক্ত আছে:</translation>
  <translation id="983192555821071799">সমস্ত ট্যাবগুলি বন্ধ করুন</translation>
  <translation id="987264212798334818">সাধারণ</translation>
@@ -599,7 +592,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb
-@@ -1126,4 +1126,21 @@ El lloc web NO obté accés a la càmera. Només tu pots veure les imatges de la
+@@ -1100,4 +1100,21 @@ Mantén premuda qualsevol paraula per cercar-la. Per definir millor la cerca, aj
  <translation id="982182592107339124">S'esborraran les dades de tots els llocs web, com ara:</translation>
  <translation id="983192555821071799">Tanca totes les pestanyes</translation>
  <translation id="987264212798334818">General</translation>
@@ -626,7 +619,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb
-@@ -1126,4 +1126,21 @@ Web NEZÍSKÁ přístup k fotoaparátu. Fotky z fotoaparátu uvidíte pouze vy
+@@ -1100,4 +1100,21 @@ Dlouhým stisknutím jakéhokoli slova z něj vytvoříte vyhledávací dotaz.
  <translation id="982182592107339124">Tímto vymažete data všech webů včetně těchto:</translation>
  <translation id="983192555821071799">Zavřít všechny karty</translation>
  <translation id="987264212798334818">Všeobecné</translation>
@@ -653,7 +646,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb
-@@ -1126,4 +1126,21 @@ Websitet får IKKE adgang til kameraet. Kameraets billeder kan kun ses af dig.</
+@@ -1100,4 +1100,21 @@ Tryk længe på et ord for at søge efter det. Du kan tilpasse søgningen ved at
  <translation id="982182592107339124">Denne handling rydder dataene for alle websites, herunder:</translation>
  <translation id="983192555821071799">Luk alle faner</translation>
  <translation id="987264212798334818">Generelt</translation>
@@ -680,7 +673,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb
-@@ -1126,4 +1126,21 @@ Die Website erhält KEINEN Zugriff auf die Kamera. Die Kamerabilder sind nur fü
+@@ -1100,4 +1100,21 @@ Halten Sie ein Wort lange gedrückt, um eine Suche damit zu starten. Sie können
  <translation id="982182592107339124">Alle Daten für alle Websites werden gelöscht, darunter:</translation>
  <translation id="983192555821071799">Alle Tabs schließen</translation>
  <translation id="987264212798334818">Allgemein</translation>
@@ -707,7 +700,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">Αυτή η ενέργεια θα εκκαθαρίσει τα δεδομένα για όλους τους ιστότοπους, όπως:</translation>
  <translation id="983192555821071799">Κλείσιμο όλων των καρτελών</translation>
  <translation id="987264212798334818">Γενικά</translation>
@@ -734,7 +727,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb
-@@ -1126,4 +1126,21 @@ The site does NOT gain access to the camera. The camera images are only visible
+@@ -1100,4 +1100,21 @@ Long-press any word to create a search for it. To refine your search adjust the
  <translation id="982182592107339124">This will clear data for all sites, including:</translation>
  <translation id="983192555821071799">Close all tabs</translation>
  <translation id="987264212798334818">General</translation>
@@ -761,7 +754,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb
-@@ -1126,4 +1126,21 @@ El sitio NO podrá acceder a la cámara. Solo tú podrás ver las imágenes de l
+@@ -1100,4 +1100,21 @@ Mantén presionada cualquier palabra para buscarla. Para definir mejor la búsqu
  <translation id="982182592107339124">Esta acción borrará los datos de todos los sitios, entre los que se incluyen:</translation>
  <translation id="983192555821071799">Cerrar todas las pestañas</translation>
  <translation id="987264212798334818">General</translation>
@@ -788,7 +781,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb
-@@ -1126,4 +1126,21 @@ El sitio web no obtendrá acceso a la cámara. Solo tú puedes ver las imágenes
+@@ -1100,4 +1100,21 @@ Mantén pulsada cualquier palabra para buscarla. Para acotar la búsqueda, ajust
  <translation id="982182592107339124">Se borrarán los datos de todos los sitios web, incluidos:</translation>
  <translation id="983192555821071799">Cerrar todas las pestañas</translation>
  <translation id="987264212798334818">General</translation>
@@ -815,7 +808,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb
-@@ -1126,4 +1126,21 @@ Sait EI saa juurdepääsu kaamerale. Kaamera jäädvustatud pildid on nähtavad
+@@ -1100,4 +1100,21 @@ Puudutage pikalt mis tahes sõnal, et seda otsida. Otsingu täpsustamiseks kohan
  <translation id="982182592107339124">See kustutab kõikide saitide andmed, sealhulgas:</translation>
  <translation id="983192555821071799">Sule kõik vahelehed</translation>
  <translation id="987264212798334818">Üldine</translation>
@@ -842,7 +835,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">با این کار داده‌های همه سایت‌ها پاک می‌شود، از جمله:</translation>
  <translation id="983192555821071799">بستن همه برگه‌ها</translation>
  <translation id="987264212798334818">موارد کلی</translation>
@@ -869,7 +862,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb
-@@ -1126,4 +1126,21 @@ Sivusto EI saa kameran käyttöoikeutta. Kamerakuvat näkyvät vain sinulle.</tr
+@@ -1100,4 +1100,21 @@ Hae sanaa painamalla sitä pitkään. Jos haluat tarkentaa hakuasi, muuta valint
  <translation id="982182592107339124">Kaikkien sivustojen tiedot poistetaan, esimerkiksi:</translation>
  <translation id="983192555821071799">Sulje kaikki välilehdet</translation>
  <translation id="987264212798334818">Yleistä</translation>
@@ -896,7 +889,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb
-@@ -1126,4 +1126,21 @@ HINDI magkakaroon ng access sa camera ang site. Ikaw lang ang makakakita ng mga
+@@ -1100,4 +1100,21 @@ Pindutin nang matagal ang anumang salita para hanapin ito. Para pinuhin ang iyon
  <translation id="982182592107339124">Iki-clear nito ang data para sa lahat ng site, kabilang ang:</translation>
  <translation id="983192555821071799">Isara ang lahat ng tab</translation>
  <translation id="987264212798334818">Pangkalahatan</translation>
@@ -923,7 +916,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb
-@@ -1126,4 +1126,21 @@ En revanche, le site n'a PAS accès à la caméra. Vous seul pouvez voir les ima
+@@ -1100,4 +1100,21 @@ Pour sélectionner un mot, appuyez dessus de manière prolongée. Vous pouvez en
  <translation id="982182592107339124">Cette action entraînera la suppression des données pour tous les sites, y compris :</translation>
  <translation id="983192555821071799">Fermer tous les onglets</translation>
  <translation id="987264212798334818">Général</translation>
@@ -950,7 +943,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">આ બધી સાઇટ્સ પરથી ડેટા સાફ કરશે, આ સહિત:</translation>
  <translation id="983192555821071799">બધા ટેબ્સ બંધ કરો</translation>
  <translation id="987264212798334818">સામાન્ય</translation>
@@ -977,7 +970,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">इससे इन सभी साइटों का डेटा साफ़ हो जाएगा:</translation>
  <translation id="983192555821071799">सभी टैब बंद करें</translation>
  <translation id="987264212798334818">सामान्य</translation>
@@ -1004,7 +997,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb
-@@ -1126,4 +1126,21 @@ Web-lokacija NE dobiva pristup fotoaparatu. Slike fotoaparata možete vidjeti sa
+@@ -1100,4 +1100,21 @@ Dugo pritisnite željenu riječ da biste je pretražili. Da biste precizirali pr
  <translation id="982182592107339124">Izbrisat će se podaci za sve web-lokacije, uključujući:</translation>
  <translation id="983192555821071799">Zatvori sve kartice</translation>
  <translation id="987264212798334818">Općenito</translation>
@@ -1031,7 +1024,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb
-@@ -1126,4 +1126,21 @@ A webhely NEM kap hozzáférést a kamerához. A kamera képét csak Ön láthat
+@@ -1100,4 +1100,21 @@ A kívánt szó hosszú lenyomásával keresést végezhet. A keresés finomít
  <translation id="982182592107339124">Ezzel törli az összes webhely adatait, beleértve a következőket:</translation>
  <translation id="983192555821071799">Az összes lap bezárása</translation>
  <translation id="987264212798334818">Általános</translation>
@@ -1058,7 +1051,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb
-@@ -1126,4 +1126,21 @@ Situs TIDAK mendapatkan akses ke kamera. Gambar kamera hanya dapat dilihat oleh
+@@ -1100,4 +1100,21 @@ Tekan lama kata apa pun untuk menelusurinya. Untuk menyaring penelusuran, Anda d
  <translation id="982182592107339124">Tindakan ini akan menghapus data untuk semua situs, termasuk:</translation>
  <translation id="983192555821071799">Tutup semua tab</translation>
  <translation id="987264212798334818">Umum</translation>
@@ -1085,7 +1078,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
-@@ -1126,4 +1126,21 @@ Il sito NON ottiene l'accesso alla videocamera. Le immagini della videocamera so
+@@ -1100,4 +1100,21 @@ Premi a lungo qualsiasi parola per creare una ricerca associata. Per perfezionar
  <translation id="982182592107339124">Questa operazione cancellerà i dati di tutti i siti, inclusi:</translation>
  <translation id="983192555821071799">Chiudi tutte le schede</translation>
  <translation id="987264212798334818">Generali</translation>
@@ -1112,7 +1105,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">פעולה זו תמחק נתונים של כל האתרים, כולל:</translation>
  <translation id="983192555821071799">סגור את כל הכרטיסיות</translation>
  <translation id="987264212798334818">כללי</translation>
@@ -1139,7 +1132,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">この操作を行うと、次を含むすべてのサイトのデータが削除されます。</translation>
  <translation id="983192555821071799">すべてのタブを閉じる</translation>
  <translation id="987264212798334818">全般</translation>
@@ -1166,7 +1159,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb
-@@ -1127,4 +1127,21 @@
+@@ -1101,4 +1101,21 @@
  <translation id="982182592107339124">ಇದು ಎಲ್ಲಾ ಸೈಟ್‌ಗಳಿಗೆ ಡೇಟಾ ತೆರವುಗೊಳಿಸುತ್ತದೆ, ಇವುಗಳನ್ನೂ ಒಳಗೊಂಡು:</translation>
  <translation id="983192555821071799">ಎಲ್ಲ ಟ್ಯಾಬ್‌ಗಳನ್ನು ಮುಚ್ಚಿ</translation>
  <translation id="987264212798334818">ಸಾಮಾನ್ಯ</translation>
@@ -1193,7 +1186,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">다음을 포함한 모든 사이트의 데이터가 삭제됩니다.</translation>
  <translation id="983192555821071799">탭 모두 닫기</translation>
  <translation id="987264212798334818">일반</translation>
@@ -1220,7 +1213,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb
-@@ -1126,4 +1126,21 @@ Svetainė NETURI prieigos prie fotoaparato. Fotoaparato vaizdai matomi tik jums.
+@@ -1100,4 +1100,21 @@ Palaikykite paspaudę bet kurį žodį, kad sukurtumėte jo paiešką. Jei norit
  <translation id="982182592107339124">Bus išvalyti visų svetainių duomenys, įskaitant:</translation>
  <translation id="983192555821071799">Uždar. visų skirtukų lapus</translation>
  <translation id="987264212798334818">Bendra</translation>
@@ -1247,7 +1240,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb
-@@ -1126,4 +1126,21 @@ Vietnei NAV piekļuves kamerai. Kameras attēli ir redzami tikai jums.</translat
+@@ -1100,4 +1100,21 @@ Turiet nospiestu jebkuru vārdu, lai izveidotu tā meklēšanas vienumu. Lai pre
  <translation id="982182592107339124">Tādējādi tiks dzēsti dati no visām vietnēm, tostarp:</translation>
  <translation id="983192555821071799">Aizvērt visas cilnes</translation>
  <translation id="987264212798334818">Vispārīgi</translation>
@@ -1274,7 +1267,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">ഇത് ഇനിപ്പറയുന്നവ ഉൾപ്പെടെയുള്ള എല്ലാ സൈറ്റുകളുടെയും വിവരങ്ങൾ മായ്‌ക്കുന്നതിനിടയാക്കും:</translation>
  <translation id="983192555821071799">എല്ലാ ടാബുകളും അടയ്‌ക്കുക</translation>
  <translation id="987264212798334818">പൊതുവായ</translation>
@@ -1301,7 +1294,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">हे यासह सर्व साइटसाठी डेटा साफ करेल:</translation>
  <translation id="983192555821071799">सर्व टॅब बंद करा</translation>
  <translation id="987264212798334818">सामान्य</translation>
@@ -1328,7 +1321,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb
-@@ -1126,4 +1126,21 @@ Tapak TIDAK memperoleh akses kepada kamera. Hanya anda dapat melihat imej kamera
+@@ -1100,4 +1100,21 @@ Tekan lama-lama pada mana-mana perkataan untuk membuat carian tentang perkataan
  <translation id="982182592107339124">Ini akan memadamkan data untuk semua tapak web, termasuk:</translation>
  <translation id="983192555821071799">Tutup semua tab</translation>
  <translation id="987264212798334818">Umum</translation>
@@ -1355,7 +1348,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb
-@@ -1126,4 +1126,21 @@ De site krijgt GEEN toegang tot de camera. De camerabeelden zijn alleen zichtbaa
+@@ -1100,4 +1100,21 @@ Druk lang op een woord om er een zoekopdracht voor te maken. Pas de selectie aan
  <translation id="982182592107339124">Hiermee worden de gegevens voor alle sites gewist, inclusief:</translation>
  <translation id="983192555821071799">Alle tabbladen sluiten</translation>
  <translation id="987264212798334818">Algemeen</translation>
@@ -1382,7 +1375,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb
-@@ -1126,4 +1126,21 @@ Nettstedet får IKKE tilgang til kameraet. Kamerabildene er kun synlige for deg.
+@@ -1100,4 +1100,21 @@ Utfør lange trykk på ord for å søke etter dem. For å finstemme søket, just
  <translation id="982182592107339124">Dette fører til at dataene for alle nettsteder slettes, deriblant disse:</translation>
  <translation id="983192555821071799">Lukk alle faner</translation>
  <translation id="987264212798334818">Generelt</translation>
@@ -1409,7 +1402,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb
-@@ -1126,4 +1126,21 @@ Witryna NIE uzyskuje dostępu do kamery. Tylko Ty widzisz rejestrowany obraz.</t
+@@ -1100,4 +1100,21 @@ Przytrzymaj dowolne słowo, by rozpocząć wyszukiwanie. Jeśli chcesz je doprec
  <translation id="982182592107339124">Spowoduje to usunięcie danych wszystkich witryn, w tym:</translation>
  <translation id="983192555821071799">Zamknij wszystkie karty</translation>
  <translation id="987264212798334818">Ogólne</translation>
@@ -1436,7 +1429,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb
-@@ -1127,4 +1127,21 @@ O site NÃO terá acesso à câmera. As imagens da câmera são visíveis apenas
+@@ -1101,4 +1101,21 @@ Toque em qualquer palavra e a mantenha pressionada para criar uma pesquisa. Para
  <translation id="982182592107339124">Essa ação limpará os dados de todos os sites, incluindo:</translation>
  <translation id="983192555821071799">Fechar todas as guias</translation>
  <translation id="987264212798334818">Geral</translation>
@@ -1463,7 +1456,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb
-@@ -1126,4 +1126,21 @@ O site NÃO fica com acesso à câmara. As imagens da câmara estão visíveis a
+@@ -1100,4 +1100,21 @@ Mantenha premida qualquer palavra para criar uma pesquisa para a mesma. Para ref
  <translation id="982182592107339124">Esta ação limpa os dados de todos os sites, incluindo:</translation>
  <translation id="983192555821071799">Fechar todos os separadores</translation>
  <translation id="987264212798334818">Geral</translation>
@@ -1490,7 +1483,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb
-@@ -1126,4 +1126,21 @@ Acest site NU primește acces la cameră. Imaginile camerei sunt vizibile doar p
+@@ -1100,4 +1100,21 @@ Apasă lung pe orice cuvânt ca să creezi o căutare pentru acesta. Pentru a ra
  <translation id="982182592107339124">Astfel, se vor șterge datele pentru toate site-urile, inclusiv:</translation>
  <translation id="983192555821071799">Închide toate filele</translation>
  <translation id="987264212798334818">General</translation>
@@ -1517,7 +1510,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">Будут удалены данные всех сайтов, в том числе:</translation>
  <translation id="983192555821071799">Закрыть все вкладки</translation>
  <translation id="987264212798334818">Общие</translation>
@@ -1544,7 +1537,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb
-@@ -1126,4 +1126,21 @@ Web NEZÍSKA prístup k fotoaparátu. Obrázky fotoaparátu sú viditeľné iba
+@@ -1100,4 +1100,21 @@ Ak chcete vyhľadať nejaké slovo, dlho ho stlačte. Ak chcete vyhľadávanie s
  <translation id="982182592107339124">Vymažete dáta všetkých webov vrátane týchto:</translation>
  <translation id="983192555821071799">Zavrieť všetky karty</translation>
  <translation id="987264212798334818">Všeobecné</translation>
@@ -1571,7 +1564,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb
-@@ -1126,4 +1126,21 @@ Spletno mesto NIMA dostopa do kamere. Posnetki kamere so vidni samo vam.</transl
+@@ -1100,4 +1100,21 @@ Za dalj časa pritisnite poljubno besedo, če želite ustvariti iskanje zanjo. 
  <translation id="982182592107339124">S tem bodo izbrisani podatki za vsa spletna mesta, vključno s temi:</translation>
  <translation id="983192555821071799">Zapri vse zavihke</translation>
  <translation id="987264212798334818">Splošno</translation>
@@ -1598,7 +1591,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb
-@@ -1126,4 +1126,21 @@ Google налог можда има друге облике историје п
+@@ -1100,4 +1100,21 @@ Google налог можда има друге облике историје п
  <translation id="982182592107339124">Овим бришете податке за све сајтове, укључујући:</translation>
  <translation id="983192555821071799">Затвори све картице</translation>
  <translation id="987264212798334818">Опште</translation>
@@ -1625,7 +1618,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb
-@@ -1126,4 +1126,21 @@ Webbplatsen får INTE tillgång till kameran. Bara du kan se kamerabilderna.</tr
+@@ -1100,4 +1100,21 @@ Tryck länge på ett ord för att söka efter det. Om du vill finjustera söknin
  <translation id="982182592107339124">Åtgärden raderar data för alla webbplatser, inklusive:</translation>
  <translation id="983192555821071799">Stäng alla flikar</translation>
  <translation id="987264212798334818">Allmänt</translation>
@@ -1652,7 +1645,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb
-@@ -1125,4 +1125,21 @@ Tovuti hii HAIPATI idhini ya kufikia kamera. Ni wewe pekee utaona picha hizi za
+@@ -1100,4 +1100,21 @@ Bonyeza neno lolote kwa muda mrefu ili utunge utafutaji wake. Ili uchuje utafuta
  <translation id="982182592107339124">Hatua hii itafuta data ya tovuti zote, ikiwa ni pamoja na:</translation>
  <translation id="983192555821071799">Funga vichupo vyote</translation>
  <translation id="987264212798334818">Jumla</translation>
@@ -1679,7 +1672,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">இதனால் எல்லா தளங்களுக்கான தரவும் அழிக்கப்படும், இதில் அடங்குபவை:</translation>
  <translation id="983192555821071799">எல்லா தாவல்களையும் மூடு</translation>
  <translation id="987264212798334818">பொது</translation>
@@ -1706,7 +1699,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">ఇది వీటితో సహా అన్ని సైట్‌ల డేటాను తీసివేస్తుంది:</translation>
  <translation id="983192555821071799">అన్ని ట్యాబ్‌లను మూసివేయి</translation>
  <translation id="987264212798334818">సాధారణం</translation>
@@ -1733,7 +1726,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">การดำเนินการนี้จะล้างข้อมูลสำหรับทุกเว็บไซต์ รวมถึง</translation>
  <translation id="983192555821071799">ปิดแท็บทั้งหมด</translation>
  <translation id="987264212798334818">ทั่วไป</translation>
@@ -1760,7 +1753,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb
-@@ -1126,4 +1126,21 @@ Site kameraya ERİŞMEZ. Kamera görüntülerini yalnızca siz görebilirsiniz.<
+@@ -1100,4 +1100,21 @@ Herhangi bir kelimeye uzun basarak o kelime için arama oluşturun. Aramanızı
  <translation id="982182592107339124">Bu işlem, aşağıdakiler de dahil olmak üzere tüm sitelere ilişkin verileri temizleyecek:</translation>
  <translation id="983192555821071799">Tüm sekmeleri kapat</translation>
  <translation id="987264212798334818">Genel</translation>
@@ -1787,7 +1780,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">Буде видалено дані всіх сайтів, зокрема:</translation>
  <translation id="983192555821071799">Закрити всі вкладки</translation>
  <translation id="987264212798334818">Загальне</translation>
@@ -1814,7 +1807,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb
-@@ -1126,4 +1126,21 @@ Trang web này KHÔNG có quyền truy cập vào máy ảnh. Chỉ bạn mới
+@@ -1100,4 +1100,21 @@ Hãy nhấn và giữ từ bất kỳ để bắt đầu tìm kiếm từ đó.
  <translation id="982182592107339124">Thao tác này sẽ xóa dữ liệu của tất cả các trang web, bao gồm:</translation>
  <translation id="983192555821071799">Đóng tất cả các tab</translation>
  <translation id="987264212798334818">Chung</translation>
@@ -1841,7 +1834,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">这会清除所有网站的数据，包括：</translation>
  <translation id="983192555821071799">关闭所有标签页</translation>
  <translation id="987264212798334818">常规</translation>
@@ -1868,7 +1861,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb
-@@ -1126,4 +1126,21 @@
+@@ -1100,4 +1100,21 @@
  <translation id="982182592107339124">這會清除所有網站的資料，包括：</translation>
  <translation id="983192555821071799">關閉所有分頁</translation>
  <translation id="987264212798334818">一般</translation>
@@ -1895,9 +1888,9 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/chrome/browser/unified_consent/unified_consent_service_factory.cc b/chrome/browser/unified_consent/unified_consent_service_factory.cc
 --- a/chrome/browser/unified_consent/unified_consent_service_factory.cc
 +++ b/chrome/browser/unified_consent/unified_consent_service_factory.cc
-@@ -35,10 +35,7 @@ std::vector<std::string> GetSyncedServicePrefNames() {
+@@ -36,10 +36,7 @@ std::vector<std::string> GetSyncedServicePrefNames() {
    return {
-     prefs::kSearchSuggestEnabled, prefs::kAlternateErrorPagesEnabled,
+     prefs::kSearchSuggestEnabled, embedder_support::kAlternateErrorPagesEnabled,
          prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingScoutReportingEnabled,
 -        spellcheck::prefs::kSpellCheckUseSpellingService,
 -#if defined(OS_ANDROID)

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
-@@ -2052,6 +2052,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2096,6 +2096,10 @@ const FeatureEntry kFeatureEntries[] = {
       SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)},
  #endif  // OS_MACOSX
  #if defined(OS_ANDROID)
@@ -27,9 +27,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 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
-@@ -776,6 +776,11 @@
-       "quickoffice-chrome-eng@google.com" ],
-     "expiry_milestone": 88
+@@ -775,6 +775,11 @@
+     // enable-javascript-harmony.
+     "expiry_milestone": -1
    },
 +  {
 +    "name": "disable-pull-to-refresh-effect",
@@ -37,12 +37,12 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 +    "expiry_milestone": -1
 +  },
    {
-     // See https://crbug.com/882238.
-     "name": "disable-pushstate-throttle",
+     "name": "disable-keepalive-fetch",
+     "owners": [ "yhirano" ],
 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
-@@ -2755,6 +2755,10 @@ extern const char kProcessSharingWithStrictSiteInstancesDescription[] =
+@@ -2598,6 +2598,10 @@ const char kProcessSharingWithStrictSiteInstancesDescription[] =
      "separated like strict site isolation, but process selection puts multiple "
      "site instances in a single process.";
  
@@ -56,7 +56,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
-@@ -1619,6 +1619,9 @@ extern const char kProcessSharingWithDefaultSiteInstancesDescription[];
+@@ -1504,6 +1504,9 @@ extern const char kProcessSharingWithDefaultSiteInstancesDescription[];
  extern const char kProcessSharingWithStrictSiteInstancesName[];
  extern const char kProcessSharingWithStrictSiteInstancesDescription[];
  

build/patches/Skip-the-first-run-and-metrics.patch

@@ -3,26 +3,28 @@ Date: Sun, 26 Nov 2017 22:51:43 +0100
 Subject: Skip the first run and metrics
 
 ---
- .../chromium/chrome/browser/firstrun/FirstRunStatus.java  | 8 ++++----
- .../chromium/chrome/browser/firstrun/FirstRunUtils.java   | 5 -----
- .../browser/firstrun/ToSAndUMAFirstRunFragment.java       | 6 ++++--
- 3 files changed, 8 insertions(+), 11 deletions(-)
+ .../chrome/browser/firstrun/FirstRunStatus.java   | 11 +++++------
+ .../chrome/browser/firstrun/FirstRunUtils.java    | 15 +++++----------
+ .../firstrun/ToSAndUMAFirstRunFragment.java       |  6 ++++--
+ 3 files changed, 14 insertions(+), 18 deletions(-)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
-@@ -38,11 +38,11 @@ public class FirstRunStatus {
+@@ -31,12 +31,11 @@ public class FirstRunStatus {
       * includes ToS and Sign In pages if necessary.
       */
      public static boolean getFirstRunFlowComplete() {
--        if (ContextUtils.getAppSharedPreferences().getBoolean(FIRST_RUN_FLOW_COMPLETE, false)) {
+-        if (SharedPreferencesManager.getInstance().readBoolean(
+-                    ChromePreferenceKeys.FIRST_RUN_FLOW_COMPLETE, false)) {
 -            return true;
-+        boolean complete = ContextUtils.getAppSharedPreferences().getBoolean(FIRST_RUN_FLOW_COMPLETE, false);
-+        if (!complete) {
-+             setFirstRunFlowComplete(true);
-         }
+-        }
 -        return CommandLine.getInstance().hasSwitch(
 -                ChromeSwitches.FORCE_FIRST_RUN_FLOW_COMPLETE_FOR_TESTING);
++        boolean complete = SharedPreferencesManager.getInstance().readBoolean(
++                    ChromePreferenceKeys.FIRST_RUN_FLOW_COMPLETE, false);
++        if (!complete)
++           setFirstRunFlowComplete(true);
 +        return true;
      }
  
@@ -30,24 +32,28 @@ 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/FirstRunUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
-@@ -35,17 +35,12 @@ public class FirstRunUtils {
-         //   - checkAnyUserHasSeenToS() may be true which needs to sync its state to the prefs.
-         boolean javaPrefValue = javaPrefs.getBoolean(CACHED_TOS_ACCEPTED_PREF, false);
+@@ -36,16 +36,11 @@ public class FirstRunUtils {
+         boolean javaPrefValue =
+                 javaPrefs.readBoolean(ChromePreferenceKeys.FIRST_RUN_CACHED_TOS_ACCEPTED, false);
          boolean nativePrefValue = isFirstRunEulaAccepted();
 -        boolean userHasSeenTos =
 -                ToSAckedReceiver.checkAnyUserHasSeenToS();
 -        boolean isFirstRunComplete = FirstRunStatus.getFirstRunFlowComplete();
 -        if (javaPrefValue || nativePrefValue || userHasSeenTos || isFirstRunComplete) {
-             if (!javaPrefValue) {
-                 javaPrefs.edit().putBoolean(CACHED_TOS_ACCEPTED_PREF, true).apply();
-             }
-             if (!nativePrefValue) {
-                 setEulaAccepted();
-             }
--        }
+-            if (!javaPrefValue) {
+-                javaPrefs.writeBoolean(ChromePreferenceKeys.FIRST_RUN_CACHED_TOS_ACCEPTED, true);
+-            }
+-            if (!nativePrefValue) {
+-                setEulaAccepted();
+-            }
++        if (!javaPrefValue) {
++            javaPrefs.writeBoolean(ChromePreferenceKeys.FIRST_RUN_CACHED_TOS_ACCEPTED, true);
++        }
++        if (!nativePrefValue) {
++            setEulaAccepted();
+         }
      }
  
-     /**
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java

build/patches/Switch-to-fstack-protector-strong.patch

@@ -16,7 +16,7 @@ higher memory/cache usage but not by the full 2-3%.
 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
-@@ -293,16 +293,12 @@ config("compiler") {
+@@ -283,16 +283,12 @@ config("compiler") {
          cflags += [ "-fstack-protector" ]
        }
      } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {

build/patches/Upstream-internal-DownloadCollectionBridge-code.patch

@@ -0,0 +1,805 @@
+From: Min Qin <qinmin@chromium.org>
+Date: Wed, 4 Mar 2020 19:08:17 +0000
+Subject: Upstream internal DownloadCollectionBridge code
+
+This will allow download in public chromium build to work on Q with MediaStore.
+
+BUG=1052490
+
+Change-Id: I31476292b92c7a5882fa4ad80cc60b29f6b14dba
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2057806
+Reviewed-by: Robert Sesek <rsesek@chromium.org>
+Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
+Reviewed-by: David Trainor <dtrainor@chromium.org>
+Commit-Queue: Min Qin <qinmin@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#746867}
+---
+ .../org/chromium/chrome/browser/AppHooks.java |   8 -
+ .../download/DownloadManagerService.java      |   2 +
+ .../infobar/DuplicateDownloadInfoBar.java     |   8 +-
+ .../init/ProcessInitializationHandler.java    |   6 -
+ chrome/browser/download/android/BUILD.gn      |   2 +
+ chrome/browser/download/android/DEPS          |   1 +
+ .../download/DownloadDelegateImpl.java        |  31 ++
+ components/download/internal/common/BUILD.gn  |   6 +-
+ .../download/DownloadCollectionBridge.java    | 413 ++++++++++++------
+ .../components/download/DownloadDelegate.java |  47 ++
+ 10 files changed, 363 insertions(+), 161 deletions(-)
+ create mode 100644 chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/DownloadDelegateImpl.java
+ create mode 100644 components/download/internal/common/android/java/src/org/chromium/components/download/DownloadDelegate.java
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
+@@ -54,7 +54,6 @@ import org.chromium.chrome.browser.usage_stats.DigitalWellbeingClient;
+ import org.chromium.chrome.browser.webapps.GooglePlayWebApkInstallDelegate;
+ import org.chromium.chrome.browser.webauth.Fido2ApiHandler;
+ import org.chromium.chrome.browser.widget.FeatureHighlightProvider;
+-import org.chromium.components.download.DownloadCollectionBridge;
+ import org.chromium.components.signin.AccountManagerDelegate;
+ import org.chromium.components.signin.SystemAccountManagerDelegate;
+ import org.chromium.content_public.browser.UiThreadTaskTraits;
+@@ -340,13 +339,6 @@ public abstract class AppHooks {
+         return new FeatureHighlightProvider();
+     }
+ 
+-    /**
+-     * @return A new {@link DownloadCollectionBridge} instance.
+-     */
+-    public DownloadCollectionBridge getDownloadCollectionBridge() {
+-        return DownloadCollectionBridge.getDownloadCollectionBridge();
+-    }
+-
+     /**
+      * @return A new {@link DigitalWellbeingClient} instance.
+      */
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java
+@@ -51,6 +51,7 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.profiles.ProfileManager;
+ import org.chromium.chrome.browser.util.ConversionUtils;
++import org.chromium.components.download.DownloadCollectionBridge;
+ import org.chromium.components.download.DownloadState;
+ import org.chromium.components.feature_engagement.EventConstants;
+ import org.chromium.components.feature_engagement.Tracker;
+@@ -288,6 +289,7 @@ public class DownloadManagerService implements DownloadController.DownloadNotifi
+         mHandler = handler;
+         mDownloadSnackbarController = new DownloadSnackbarController();
+         mOMADownloadHandler = new OMADownloadHandler(applicationContext);
++        DownloadCollectionBridge.setDownloadDelegate(new DownloadDelegateImpl());
+         // Note that this technically leaks the native object, however, DownloadManagerService
+         // is a singleton that lives forever and there's no clean shutdown of Chrome on Android.
+         init();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/DuplicateDownloadInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/DuplicateDownloadInfoBar.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/DuplicateDownloadInfoBar.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/DuplicateDownloadInfoBar.java
+@@ -16,7 +16,6 @@ import android.text.style.StyleSpan;
+ import android.view.View;
+ import android.webkit.MimeTypeMap;
+ 
+-import org.chromium.base.BuildInfo;
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.annotations.CalledByNative;
+ import org.chromium.base.task.AsyncTask;
+@@ -84,11 +83,8 @@ public class DuplicateDownloadInfoBar extends ConfirmInfoBar {
+                 new AsyncTask<String>() {
+                     @Override
+                     protected String doInBackground() {
+-                        if (BuildInfo.isAtLeastQ()
+-                                && DownloadCollectionBridge.getDownloadCollectionBridge()
+-                                           .needToPublishDownload(mFilePath)) {
+-                            Uri uri = DownloadCollectionBridge.getDownloadCollectionBridge()
+-                                              .getDownloadUriForFileName(filename);
++                        if (DownloadCollectionBridge.shouldPublishDownload(mFilePath)) {
++                            Uri uri = DownloadCollectionBridge.getDownloadUriForFileName(filename);
+                             return uri == null ? null : uri.toString();
+                         } else {
+                             if (file.exists()) return mFilePath;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+@@ -81,7 +81,6 @@ import org.chromium.chrome.browser.util.ConversionUtils;
+ import org.chromium.chrome.browser.webapps.WebApkVersionManager;
+ import org.chromium.chrome.browser.webapps.WebappRegistry;
+ import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
+-import org.chromium.components.download.DownloadCollectionBridge;
+ import org.chromium.components.minidump_uploader.CrashFileManager;
+ import org.chromium.components.signin.AccountManagerFacade;
+ import org.chromium.components.signin.AccountsChangeObserver;
+@@ -185,11 +184,6 @@ public class ProcessInitializationHandler {
+                         application, ChromePreferenceKeys.SYNC_SESSIONS_UUID),
+                 false);
+ 
+-        // Set up the DownloadCollectionBridge early as display names may be immediately retrieved
+-        // after native is loaded.
+-        DownloadCollectionBridge.setDownloadCollectionBridge(
+-                AppHooks.get().getDownloadCollectionBridge());
+-
+         // De-jelly can also be controlled by a system property. As sandboxed processes can't
+         // read this property directly, convert it to the equivalent command line flag.
+         if (DeJellyUtils.externallyEnableDeJelly()) {
+diff --git a/chrome/browser/download/android/BUILD.gn b/chrome/browser/download/android/BUILD.gn
+--- a/chrome/browser/download/android/BUILD.gn
++++ b/chrome/browser/download/android/BUILD.gn
+@@ -8,6 +8,7 @@ android_library("java") {
+   sources = [
+     "java/src/org/chromium/chrome/browser/download/DirectoryOption.java",
+     "java/src/org/chromium/chrome/browser/download/DownloadConstants.java",
++    "java/src/org/chromium/chrome/browser/download/DownloadDelegateImpl.java",
+     "java/src/org/chromium/chrome/browser/download/DownloadDirectoryProvider.java",
+     "java/src/org/chromium/chrome/browser/download/DownloadFileProvider.java",
+     "java/src/org/chromium/chrome/browser/download/DownloadFilter.java",
+@@ -24,6 +25,7 @@ android_library("java") {
+     "//base:base_java",
+     "//base:jni_java",
+     "//chrome/browser/util:java",
++    "//components/download/internal/common:internal_java",
+     "//components/download/public/common:public_java",
+     "//components/offline_items_collection/core:core_java",
+     "//content/public/android:content_java",
+diff --git a/chrome/browser/download/android/DEPS b/chrome/browser/download/android/DEPS
+--- a/chrome/browser/download/android/DEPS
++++ b/chrome/browser/download/android/DEPS
+@@ -1,4 +1,5 @@
+ include_rules = [
+   "+media/video",
+   "+content/public/android/java/src/org/chromium/content_public",
++  "+components/download/internal/common",
+ ]
+diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/DownloadDelegateImpl.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/DownloadDelegateImpl.java
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/DownloadDelegateImpl.java
+@@ -0,0 +1,31 @@
++// 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.
++
++package org.chromium.chrome.browser.download;
++
++import android.net.Uri;
++
++import org.chromium.components.download.DownloadDelegate;
++
++/**
++ * Utility class that implements DownloadDelegate.
++ */
++public class DownloadDelegateImpl extends DownloadDelegate {
++    public DownloadDelegateImpl() {}
++
++    @Override
++    public String remapGenericMimeType(String mimeType, String url, String filename) {
++        return MimeUtils.remapGenericMimeType(mimeType, url, filename);
++    }
++
++    @Override
++    public Uri parseOriginalUrl(String originalUrl) {
++        return UriUtils.parseOriginalUrl(originalUrl);
++    }
++
++    @Override
++    public boolean isDownloadOnSDCard(String filePath) {
++        return DownloadDirectoryProvider.isDownloadOnSDCard(filePath);
++    }
++}
+diff --git a/components/download/internal/common/BUILD.gn b/components/download/internal/common/BUILD.gn
+--- a/components/download/internal/common/BUILD.gn
++++ b/components/download/internal/common/BUILD.gn
+@@ -101,11 +101,15 @@ source_set("internal") {
+ 
+ if (is_android) {
+   android_library("internal_java") {
+-    sources = [ "android/java/src/org/chromium/components/download/DownloadCollectionBridge.java" ]
++    sources = [
++      "android/java/src/org/chromium/components/download/DownloadCollectionBridge.java",
++      "android/java/src/org/chromium/components/download/DownloadDelegate.java",
++    ]
+ 
+     deps = [
+       "//base:base_java",
+       "//base:jni_java",
++      "//third_party/android_provider:android_provider_java",
+     ]
+     annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+   }
+diff --git a/components/download/internal/common/android/java/src/org/chromium/components/download/DownloadCollectionBridge.java b/components/download/internal/common/android/java/src/org/chromium/components/download/DownloadCollectionBridge.java
+--- a/components/download/internal/common/android/java/src/org/chromium/components/download/DownloadCollectionBridge.java
++++ b/components/download/internal/common/android/java/src/org/chromium/components/download/DownloadCollectionBridge.java
+@@ -4,26 +4,59 @@
+ 
+ package org.chromium.components.download;
+ 
++import android.annotation.TargetApi;
+ import android.content.ContentResolver;
++import android.content.ContentUris;
++import android.content.ContentValues;
++import android.database.Cursor;
+ import android.net.Uri;
++import android.os.Build;
++import android.os.FileUtils;
+ import android.os.ParcelFileDescriptor;
++import android.provider.BaseColumns;
++import android.provider.MediaStore;
++import android.provider.MediaStore.Downloads;
++import android.provider.MediaStore.MediaColumns;
++import android.text.TextUtils;
++import android.text.format.DateUtils;
+ 
++import androidx.annotation.NonNull;
++
++import org.chromium.base.BuildInfo;
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.annotations.CalledByNative;
+ import org.chromium.base.annotations.JNINamespace;
+ import org.chromium.base.annotations.NativeMethods;
++import org.chromium.third_party.android.provider.MediaStoreUtils;
++import org.chromium.third_party.android.provider.MediaStoreUtils.PendingParams;
++import org.chromium.third_party.android.provider.MediaStoreUtils.PendingSession;
++
++import java.io.FileInputStream;
++import java.io.InputStream;
++import java.io.OutputStream;
++import java.text.SimpleDateFormat;
++import java.util.ArrayList;
++import java.util.Arrays;
++import java.util.Date;
++import java.util.List;
++import java.util.Locale;
+ 
+ /**
+  * Helper class for publishing download files to the public download collection.
+  */
+ @JNINamespace("download")
+ public class DownloadCollectionBridge {
+-    // Singleton instance that allows embedders to replace their implementation.
+-    private static DownloadCollectionBridge sDownloadCollectionBridge;
+     private static final String TAG = "DownloadCollection";
+-    // Guards access to sDownloadCollectionBridge.
+-    private static final Object sLock = new Object();
++
++    // File name pattern to be used when media store has too many duplicates. This matches
++    // that of download_path_reservation_tracker.cc.
++    private static final String FILE_NAME_PATTERN = "yyyy-MM-dd'T'HHmmss.SSS";
++
++    private static final List<String> COMMON_DOUBLE_EXTENSIONS =
++            new ArrayList<String>(Arrays.asList("tar.gz", "tar.z", "tar.bz2", "tar.bz", "user.js"));
++
++    private static DownloadDelegate sDownloadDelegate = new DownloadDelegate();
+ 
+     /**
+      *  Class representing the Uri and display name pair for downloads.
+@@ -49,127 +82,13 @@ public class DownloadCollectionBridge {
+     }
+ 
+     /**
+-     * Return getDownloadCollectionBridge singleton.
+-     */
+-    public static DownloadCollectionBridge getDownloadCollectionBridge() {
+-        synchronized (sLock) {
+-            if (sDownloadCollectionBridge == null) {
+-                sDownloadCollectionBridge = new DownloadCollectionBridge();
+-            }
+-        }
+-        return sDownloadCollectionBridge;
+-    }
+-
+-    /**
+-     * Sets the singlton object to use later.
+-     */
+-    public static void setDownloadCollectionBridge(DownloadCollectionBridge bridge) {
+-        synchronized (sLock) {
+-            sDownloadCollectionBridge = bridge;
+-        }
+-    }
+-
+-    /**
+-     * Returns whether a download needs to be published.
+-     * @param filePath File path of the download.
+-     * @return True if the download needs to be published, or false otherwise.
+-     */
+-    public boolean needToPublishDownload(final String filePath) {
+-        return false;
+-    }
+-
+-    /**
+-     * Creates a pending session for download to be written into.
+-     * @param fileName Name of the file.
+-     * @param mimeType Mime type of the file.
+-     * @param originalUrl Originating URL of the download.
+-     * @param referrer Referrer of the download.
+-     * @return Uri created for the pending session.
+-     */
+-    protected Uri createPendingSession(final String fileName, final String mimeType,
+-            final String originalUrl, final String referrer) {
+-        return null;
+-    }
+-
+-    /**
+-     * Copy file content from a source file to the pending Uri.
+-     * @param sourcePath File content to be copied from.
+-     * @param pendingUri Destination Uri to be copied to.
+-     * @return true on success, or false otherwise.
+-     */
+-    protected boolean copyFileToPendingUri(final String sourcePath, final String pendingUri) {
+-        return false;
+-    }
+-
+-    /**
+-     * Abandon the the intermediate Uri.
+-     * @param pendingUri Intermediate Uri that is going to be deleted.
+-     */
+-    protected void abandonPendingUri(final String pendingUri) {}
+-
+-    /**
+-     * Publish a completed download to public repository.
+-     * @param pendingUri Pending uri to publish.
+-     * @return Uri of the published file.
+-     */
+-    protected Uri publishCompletedDownload(final String pendingUri) {
+-        return null;
+-    }
+-
+-    /**
+-     * Gets the content URI of the download that has the given file name.
+-     * @param pendingUri name of the file.
+-     * @return Uri of the download with the given display name.
++     * Sets the DownloadDelegate to be used for utility methods.
++     * TODO(qinmin): remove this method once we moved all the utility methods into
++     * components/.
++     * @param downloadDelegate The new delegate to be used.
+      */
+-    public Uri getDownloadUriForFileName(final String fileName) {
+-        return null;
+-    }
+-
+-    /**
+-     * Renames a download Uri with a display name.
+-     * @param downloadUri Uri of the download.
+-     * @param displayName New display name for the download.
+-     * @return whether rename was successful.
+-     */
+-    protected boolean rename(final String downloadUri, final String displayName) {
+-        return false;
+-    }
+-
+-    /**
+-     * @return  Whether download display names needs to be retrieved.
+-     */
+-    protected boolean needToGetDisplayNames() {
+-        return false;
+-    }
+-
+-    /**
+-     * Gets the display names for all downloads
+-     * @return an array of download Uri and display name pair.
+-     */
+-    protected DisplayNameInfo[] getDisplayNames() {
+-        return null;
+-    }
+-
+-    /**
+-     * @return whether download collection is supported.
+-     */
+-    protected boolean isDownloadCollectionSupported() {
+-        return false;
+-    }
+-
+-    /**
+-     *  Refreshes the expiration date so the unpublished download won't get abandoned.
+-     *  @param intermediateUri The intermediate Uri that is not yet published.
+-     */
+-    protected void refreshExpirationDate(final String intermediateUri) {}
+-
+-    /**
+-     * Gets the display name for a download.
+-     * @param downloadUri Uri of the download.
+-     * @return the display name of the download.
+-     */
+-    protected String getDisplayNameForUri(final String downloadUri) {
+-        return null;
++    public static void setDownloadDelegate(DownloadDelegate downloadDelegate) {
++        sDownloadDelegate = downloadDelegate;
+     }
+ 
+     /**
+@@ -183,8 +102,20 @@ public class DownloadCollectionBridge {
+     @CalledByNative
+     public static String createIntermediateUriForPublish(final String fileName,
+             final String mimeType, final String originalUrl, final String referrer) {
+-        Uri uri = getDownloadCollectionBridge().createPendingSession(
+-                fileName, mimeType, originalUrl, referrer);
++        Uri uri = createPendingSessionInternal(fileName, mimeType, originalUrl, referrer);
++        if (uri != null) return uri.toString();
++
++        // If there are too many duplicates on the same file name, createPendingSessionInternal()
++        // will return null. Generate a new file name with timestamp.
++        SimpleDateFormat sdf = new SimpleDateFormat(FILE_NAME_PATTERN, Locale.getDefault());
++        // Remove the extension first.
++        String baseName = getBaseName(fileName);
++        String extension = fileName.substring(baseName.length());
++        StringBuilder sb = new StringBuilder(baseName);
++        sb.append(" - ");
++        sb.append(sdf.format(new Date()));
++        sb.append(extension);
++        uri = createPendingSessionInternal(sb.toString(), mimeType, originalUrl, referrer);
+         return uri == null ? null : uri.toString();
+     }
+ 
+@@ -194,8 +125,13 @@ public class DownloadCollectionBridge {
+      * @return True if the download needs to be published, or false otherwise.
+      */
+     @CalledByNative
+-    private static boolean shouldPublishDownload(final String filePath) {
+-        return getDownloadCollectionBridge().needToPublishDownload(filePath);
++    public static boolean shouldPublishDownload(final String filePath) {
++        if (isAtLeastQ()) {
++            if (filePath == null) return false;
++            // Only need to publish downloads that are on primary storage.
++            return !sDownloadDelegate.isDownloadOnSDCard(filePath);
++        }
++        return false;
+     }
+ 
+     /**
+@@ -205,9 +141,21 @@ public class DownloadCollectionBridge {
+      * @return True on success, or false otherwise.
+      */
+     @CalledByNative
++    @TargetApi(29)
+     public static boolean copyFileToIntermediateUri(
+             final String sourcePath, final String destinationUri) {
+-        return getDownloadCollectionBridge().copyFileToPendingUri(sourcePath, destinationUri);
++        try {
++            PendingSession session = openPendingUri(destinationUri);
++            OutputStream out = session.openOutputStream();
++            InputStream in = new FileInputStream(sourcePath);
++            FileUtils.copy(in, out);
++            in.close();
++            out.close();
++            return true;
++        } catch (Exception e) {
++            Log.e(TAG, "Unable to copy content to pending Uri.", e);
++        }
++        return false;
+     }
+ 
+     /**
+@@ -216,7 +164,8 @@ public class DownloadCollectionBridge {
+      */
+     @CalledByNative
+     public static void deleteIntermediateUri(final String uri) {
+-        getDownloadCollectionBridge().abandonPendingUri(uri);
++        PendingSession session = openPendingUri(uri);
++        session.abandon();
+     }
+ 
+     /**
+@@ -226,8 +175,34 @@ public class DownloadCollectionBridge {
+      */
+     @CalledByNative
+     public static String publishDownload(final String intermediateUri) {
+-        Uri uri = getDownloadCollectionBridge().publishCompletedDownload(intermediateUri);
+-        return uri == null ? null : uri.toString();
++        // Android Q's MediaStore.Downloads has an issue that the custom mime type which is not
++        // supported by MimeTypeMap is overridden to "application/octet-stream" when publishing.
++        // To deal with this issue we set the mime type again after publishing.
++        // See crbug.com/1010829 for more details.
++        ContentResolver resolver = ContextUtils.getApplicationContext().getContentResolver();
++        String mimeType = null;
++        Cursor cursor = null;
++        try {
++            cursor = resolver.query(Uri.parse(intermediateUri),
++                    new String[] {MediaColumns.MIME_TYPE}, null, null, null);
++            if (cursor != null && cursor.getCount() != 0 && cursor.moveToNext()) {
++                mimeType = cursor.getString(cursor.getColumnIndex(MediaColumns.MIME_TYPE));
++            }
++        } catch (Exception e) {
++            Log.e(TAG, "Unable to get mimeType.", e);
++        } finally {
++            if (cursor != null) cursor.close();
++        }
++
++        PendingSession session = openPendingUri(intermediateUri);
++        Uri publishedUri = session.publish();
++
++        if (!TextUtils.isEmpty(mimeType)) {
++            final ContentValues updateValues = new ContentValues();
++            updateValues.put(MediaColumns.MIME_TYPE, mimeType);
++            resolver.update(publishedUri, updateValues, null, null);
++        }
++        return publishedUri.toString();
+     }
+ 
+     /**
+@@ -241,7 +216,10 @@ public class DownloadCollectionBridge {
+             ContentResolver resolver = ContextUtils.getApplicationContext().getContentResolver();
+             ParcelFileDescriptor pfd =
+                     resolver.openFileDescriptor(Uri.parse(intermediateUri), "rw");
+-            getDownloadCollectionBridge().refreshExpirationDate(intermediateUri);
++            ContentValues updateValues = new ContentValues();
++            updateValues.put("date_expires", getNewExpirationTime());
++            ContextUtils.getApplicationContext().getContentResolver().update(
++                    Uri.parse(intermediateUri), updateValues, null, null);
+             return pfd.detachFd();
+         } catch (Exception e) {
+             Log.e(TAG, "Cannot open intermediate Uri.", e);
+@@ -250,12 +228,13 @@ public class DownloadCollectionBridge {
+     }
+ 
+     /**
++     * Check if a download with the same name already exists.
++     * @param fileName The name of the file to check.
+      * @return whether a download with the file name exists.
+      */
+     @CalledByNative
+     private static boolean fileNameExists(final String fileName) {
+-        Uri uri = getDownloadCollectionBridge().getDownloadUriForFileName(fileName);
+-        return uri != null;
++        return getDownloadUriForFileName(fileName) != null;
+     }
+ 
+     /**
+@@ -266,7 +245,12 @@ public class DownloadCollectionBridge {
+      */
+     @CalledByNative
+     private static boolean renameDownloadUri(final String downloadUri, final String displayName) {
+-        return getDownloadCollectionBridge().rename(downloadUri, displayName);
++        final ContentValues updateValues = new ContentValues();
++        Uri uri = Uri.parse(downloadUri);
++        updateValues.put(MediaColumns.DISPLAY_NAME, displayName);
++        return ContextUtils.getApplicationContext().getContentResolver().update(
++                       uri, updateValues, null, null)
++                == 1;
+     }
+ 
+     /**
+@@ -274,7 +258,7 @@ public class DownloadCollectionBridge {
+      */
+     @CalledByNative
+     private static boolean needToRetrieveDisplayNames() {
+-        return getDownloadCollectionBridge().needToGetDisplayNames();
++        return isAtLeastQ();
+     }
+ 
+     /**
+@@ -282,15 +266,63 @@ public class DownloadCollectionBridge {
+      * @return an array of download Uri and display name pair.
+      */
+     @CalledByNative
++    @TargetApi(29)
+     private static DisplayNameInfo[] getDisplayNamesForDownloads() {
+-        return getDownloadCollectionBridge().getDisplayNames();
++        ContentResolver resolver = ContextUtils.getApplicationContext().getContentResolver();
++        Cursor cursor = null;
++        try {
++            Uri uri = Downloads.EXTERNAL_CONTENT_URI;
++            cursor = resolver.query(MediaStore.setIncludePending(uri),
++                    new String[] {BaseColumns._ID, MediaColumns.DISPLAY_NAME}, null, null, null);
++            if (cursor == null || cursor.getCount() == 0) return null;
++            List<DisplayNameInfo> infos = new ArrayList<DisplayNameInfo>();
++            while (cursor.moveToNext()) {
++                String displayName =
++                        cursor.getString(cursor.getColumnIndex(MediaColumns.DISPLAY_NAME));
++                Uri downloadUri = ContentUris.withAppendedId(
++                        uri, cursor.getInt(cursor.getColumnIndex(BaseColumns._ID)));
++                infos.add(new DisplayNameInfo(downloadUri.toString(), displayName));
++            }
++            return infos.toArray(new DisplayNameInfo[0]);
++        } catch (Exception e) {
++            Log.e(TAG, "Unable to get display names for downloads.", e);
++        } finally {
++            if (cursor != null) cursor.close();
++        }
++        return null;
+     }
+ 
+     /**
+      * @return whether download collection is supported.
+      */
+     public static boolean supportsDownloadCollection() {
+-        return getDownloadCollectionBridge().isDownloadCollectionSupported();
++        return isAtLeastQ();
++    }
++
++    /**
++     * Gets the content URI of the download that has the given file name.
++     * @param pendingUri name of the file.
++     * @return Uri of the download with the given display name.
++     */
++    @TargetApi(29)
++    public static Uri getDownloadUriForFileName(String fileName) {
++        Cursor cursor = null;
++        try {
++            Uri uri = Downloads.EXTERNAL_CONTENT_URI;
++            cursor = ContextUtils.getApplicationContext().getContentResolver().query(
++                    MediaStore.setIncludePending(uri), new String[] {BaseColumns._ID},
++                    "_display_name LIKE ?1", new String[] {fileName}, null);
++            if (cursor == null) return null;
++            if (cursor.moveToNext()) {
++                return ContentUris.withAppendedId(
++                        uri, cursor.getInt(cursor.getColumnIndex(BaseColumns._ID)));
++            }
++        } catch (Exception e) {
++            Log.e(TAG, "Unable to check file name existence.", e);
++        } finally {
++            if (cursor != null) cursor.close();
++        }
++        return null;
+     }
+ 
+     /**
+@@ -300,6 +332,93 @@ public class DownloadCollectionBridge {
+         return DownloadCollectionBridgeJni.get().getExpirationDurationInDays();
+     }
+ 
++    private static boolean isAtLeastQ() {
++        return BuildInfo.isAtLeastQ() || Build.VERSION.SDK_INT >= 29;
++    }
++
++    /**
++     * Helper method to create a pending session for download to be written into.
++     * @param fileName Name of the file.
++     * @param mimeType Mime type of the file.
++     * @param originalUrl Originating URL of the download.
++     * @param referrer Referrer of the download.
++     * @return Uri created for the pending session, or null if failed.
++     */
++    private static Uri createPendingSessionInternal(final String fileName, final String mimeType,
++            final String originalUrl, final String referrer) {
++        PendingParams pendingParams =
++                createPendingParams(fileName, mimeType, originalUrl, referrer);
++        pendingParams.setExpirationTime(getNewExpirationTime());
++        try {
++            return MediaStoreUtils.createPending(
++                    ContextUtils.getApplicationContext(), pendingParams);
++        } catch (Exception e) {
++            return null;
++        }
++    }
++
++    /**
++     * Helper method to create PendingParams needed for PendingSession creation.
++     * @param fileName Name of the file.
++     * @param mimeType Mime type of the file.
++     * @param originalUrl Originating URL of the download.
++     * @param referrer Referrer of the download.
++     * @return PendingParams needed for creating the PendingSession.
++     */
++    @TargetApi(29)
++    private static PendingParams createPendingParams(final String fileName, final String mimeType,
++            final String originalUrl, final String referrer) {
++        Uri downloadsUri = Downloads.EXTERNAL_CONTENT_URI;
++        String newMimeType =
++                sDownloadDelegate.remapGenericMimeType(mimeType, originalUrl, fileName);
++        PendingParams pendingParams = new PendingParams(downloadsUri, fileName, newMimeType);
++        Uri originalUri = sDownloadDelegate.parseOriginalUrl(originalUrl);
++        Uri referrerUri = TextUtils.isEmpty(referrer) ? null : Uri.parse(referrer);
++        pendingParams.setDownloadUri(originalUri);
++        pendingParams.setRefererUri(referrerUri);
++        return pendingParams;
++    }
++
++    /**
++     *  Gets the base name, without extension, from a file name.
++     *  TODO(qinmin): move this into a common utility class.
++     *  @param fileName Name of the file.
++     *  @return Base name of the file.
++     */
++    private static String getBaseName(final String fileName) {
++        for (String extension : COMMON_DOUBLE_EXTENSIONS) {
++            if (fileName.endsWith(extension)) {
++                String name = fileName.substring(0, fileName.length() - extension.length());
++                // remove the "." at the end.
++                if (name.endsWith(".")) {
++                    return name.substring(0, name.length() - 1);
++                }
++            }
++        }
++        int index = fileName.lastIndexOf('.');
++        if (index == -1) {
++            return fileName;
++        } else {
++            return fileName.substring(0, index);
++        }
++    }
++
++    private static @NonNull PendingSession openPendingUri(final String pendingUri) {
++        return MediaStoreUtils.openPending(
++                ContextUtils.getApplicationContext(), Uri.parse(pendingUri));
++    }
++
++    /**
++     * Helper method to generate a new expiration epoch time in seconds.
++     * @return Epoch time value in seconds for the download to expire.
++     */
++    private static long getNewExpirationTime() {
++        return (System.currentTimeMillis()
++                       + DownloadCollectionBridge.getExpirationDurationInDays()
++                               * DateUtils.DAY_IN_MILLIS)
++                / 1000;
++    }
++
+     /**
+      * Gets the display name for a download.
+      * @param downloadUri Uri of the download.
+@@ -307,7 +426,21 @@ public class DownloadCollectionBridge {
+      */
+     @CalledByNative
+     private static String getDisplayName(final String downloadUri) {
+-        return getDownloadCollectionBridge().getDisplayNameForUri(downloadUri);
++        ContentResolver resolver = ContextUtils.getApplicationContext().getContentResolver();
++        Cursor cursor = null;
++        try {
++            cursor = resolver.query(Uri.parse(downloadUri),
++                    new String[] {MediaColumns.DISPLAY_NAME}, null, null, null);
++            if (cursor == null || cursor.getCount() == 0) return null;
++            if (cursor.moveToNext()) {
++                return cursor.getString(cursor.getColumnIndex(MediaColumns.DISPLAY_NAME));
++            }
++        } catch (Exception e) {
++            Log.e(TAG, "Unable to get display name for download.", e);
++        } finally {
++            if (cursor != null) cursor.close();
++        }
++        return null;
+     }
+ 
+     @NativeMethods
+diff --git a/components/download/internal/common/android/java/src/org/chromium/components/download/DownloadDelegate.java b/components/download/internal/common/android/java/src/org/chromium/components/download/DownloadDelegate.java
+new file mode 100644
+--- /dev/null
++++ b/components/download/internal/common/android/java/src/org/chromium/components/download/DownloadDelegate.java
+@@ -0,0 +1,47 @@
++// 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.
++
++package org.chromium.components.download;
++
++import android.net.Uri;
++
++/**
++ * Helper class for providering some helper method needed by DownloadCollectionBridge.
++ */
++public class DownloadDelegate {
++    public DownloadDelegate() {}
++
++    /**
++     * If the given MIME type is null, or one of the "generic" types (text/plain
++     * or application/octet-stream) map it to a type that Android can deal with.
++     * If the given type is not generic, return it unchanged.
++     *
++     * @param mimeType MIME type provided by the server.
++     * @param url URL of the data being loaded.
++     * @param filename file name obtained from content disposition header
++     * @return The MIME type that should be used for this data.
++     */
++    public String remapGenericMimeType(String mimeType, String url, String filename) {
++        return mimeType;
++    }
++
++    /**
++     * Parses an originating URL string and returns a valid Uri that can be inserted into
++     * DownloadManager. The returned Uri has to be null or non-empty http(s) scheme.
++     * @param originalUrl String representation of the originating URL.
++     * @return A valid Uri that can be accepted by DownloadManager.
++     */
++    public Uri parseOriginalUrl(String originalUrl) {
++        return Uri.parse(originalUrl);
++    }
++
++    /**
++     * Returns whether the downloaded file path is on an external SD card.
++     * @param filePath The download file path.
++     * @return Whether download is on external sd card.
++     */
++    public boolean isDownloadOnSDCard(String filePath) {
++        return false;
++    }
++}
+-- 
+2.17.1
+

build/patches/Use-4-tile-rows-never-show-logo.patch

@@ -13,7 +13,7 @@ Subject: Use 4 tile rows, never show logo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
-@@ -109,7 +109,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -119,7 +119,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
      /** Observer for overview mode. */
      private EmptyOverviewModeObserver mOverviewObserver;
  
@@ -31,7 +31,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
          mSearchProviderIsGoogle = isGoogle;
  
          updateTileGridPadding();
-@@ -787,7 +787,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -789,7 +789,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
      }
  
      private static int getMaxTileRows() {
@@ -55,10 +55,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mos
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
-@@ -116,7 +116,7 @@ public class SiteSection extends OptionalLeaf implements TileGroup.Observer {
-                         ExploreSitesBridge.getVariation())) {
-             return 1;
-         }
+@@ -109,7 +109,7 @@ public class SiteSection extends OptionalLeaf implements TileGroup.Observer {
+     }
+ 
+     private static int getMaxTileRows() {
 -        return 2;
 +        return 4;
      }
@@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/til
 diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/engagement/important_sites_util.cc
 --- a/chrome/browser/engagement/important_sites_util.cc
 +++ b/chrome/browser/engagement/important_sites_util.cc
-@@ -58,7 +58,7 @@ static const int kTimesIgnoredForBlacklist = 3;
+@@ -62,7 +62,7 @@ static const int kTimesIgnoredForBlacklist = 3;
  // These are the maximum # of bookmarks we can use as signals. If the user has
  // <= kMaxBookmarks, then we just use those bookmarks. Otherwise we filter all
  // bookmarks on site engagement > 0, sort, and trim to kMaxBookmarks.
@@ -80,7 +80,7 @@ diff --git a/components/history/core/browser/top_sites_impl.h b/components/histo
 --- a/components/history/core/browser/top_sites_impl.h
 +++ b/components/history/core/browser/top_sites_impl.h
 @@ -48,7 +48,7 @@ class TopSitesImpl : public TopSites, public HistoryServiceObserver {
-   using CanAddURLToHistoryFn = base::Callback<bool(const GURL&)>;
+   using CanAddURLToHistoryFn = base::RepeatingCallback<bool(const GURL&)>;
  
    // How many top sites to store in the cache.
 -  static constexpr size_t kTopSitesNumber = 10;

build/patches/Use-a-minimum-DoH-timeout-of-400ms.patch

@@ -19,7 +19,7 @@ diff --git a/net/dns/dns_session.cc b/net/dns/dns_session.cc
    UpdateTimeouts(NetworkChangeNotifier::GetConnectionType());
    InitializeServerStats();
  }
-@@ -325,9 +327,12 @@ base::TimeDelta DnsSession::NextTimeout(unsigned server_index, int attempt) {
+@@ -334,9 +336,12 @@ base::TimeDelta DnsSession::NextTimeout(unsigned server_index, int attempt) {
  }
  
  base::TimeDelta DnsSession::NextDohTimeout(unsigned doh_server_index) {
@@ -36,14 +36,14 @@ diff --git a/net/dns/dns_session.cc b/net/dns/dns_session.cc
 diff --git a/net/dns/dns_session.h b/net/dns/dns_session.h
 --- a/net/dns/dns_session.h
 +++ b/net/dns/dns_session.h
-@@ -167,6 +167,7 @@ class NET_EXPORT_PRIVATE DnsSession : public base::RefCounted<DnsSession> {
+@@ -176,6 +176,7 @@ class NET_EXPORT_PRIVATE DnsSession : public base::RefCounted<DnsSession> {
  
    base::TimeDelta initial_timeout_;
    base::TimeDelta max_timeout_;
 +  base::TimeDelta min_doh_timeout_;
  
-   // Track runtime statistics of each insecure DNS server.
-   std::vector<std::unique_ptr<ServerStats>> server_stats_;
+   // TODO(crbug.com/1022059): Move all handling of ServerStats (both for DoH and
+   // non-DoH) to ResolveContext.
 -- 
 2.17.1
 

build/patches/Use-dummy-DFM-installer.patch

@@ -19,7 +19,7 @@ Subject: Use dummy DFM installer
 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
-@@ -122,10 +122,6 @@ public class ChromeApplication extends Application {
+@@ -125,10 +125,6 @@ public class ChromeApplication extends Application {
              ChromeBackgroundTaskFactory.setAsDefault();
          }
  
@@ -510,7 +510,7 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component
       * Updates the CrashKey report containing modules currently present.
       */
      public static void updateCrashKeys() {
--        if (!BuildConfig.IS_BUNDLE) return;
+-        if (!BundleUtils.isBundle()) return;
 -
 -        try (Timer timer = new Timer()) {
 -            CrashKeyRecorder.updateCrashKeys();

build/patches/autofill-disable-autofill-download-manager.patch

@@ -108,7 +108,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -182,19 +182,6 @@ void LogDeveloperEngagementUkm(ukm::UkmRecorder* ukm_recorder,
+@@ -185,19 +185,6 @@ void LogDeveloperEngagementUkm(ukm::UkmRecorder* ukm_recorder,
    }
  }
  
@@ -128,7 +128,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
  ValuePatternsMetric GetValuePattern(const base::string16& value) {
    if (IsUPIVirtualPaymentAddress(value))
      return ValuePatternsMetric::kUpiVpa;
-@@ -1519,11 +1506,6 @@ AutofillManager::AutofillManager(
+@@ -1579,11 +1566,6 @@ AutofillManager::AutofillManager(
                                      : std::make_unique<CreditCardAccessManager>(
                                            driver, client_, personal_data_,
                                            credit_card_form_event_logger_.get());

build/patches/battery_status_service-disable-more-privacy-nightmares.patch

@@ -24,7 +24,7 @@ References: https://github.com/iridium-browser/iridium-browser/issues/40
 diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
 --- a/services/device/battery/battery_status_service.cc
 +++ b/services/device/battery/battery_status_service.cc
-@@ -70,6 +70,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
+@@ -43,6 +43,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
    if (!battery_fetcher_)
      battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
  
@@ -32,7 +32,7 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device
    if (callback_list_.empty()) {
      bool success = battery_fetcher_->StartListeningBatteryChange();
      // On failure pass the default values back.
-@@ -81,6 +82,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
+@@ -54,6 +55,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
      // Send recent status to the new callback if already available.
      callback.Run(status_);
    }

build/patches/build-remove-calling-untrusted-hooks.patch

@@ -11,7 +11,7 @@ sysroot.
 diff --git a/DEPS b/DEPS
 --- a/DEPS
 +++ b/DEPS
-@@ -76,7 +76,7 @@ vars = {
+@@ -81,7 +81,7 @@ vars = {
  
    # Check out and download nacl by default. This can be disabled e.g. with
    # custom_vars.
@@ -20,7 +20,7 @@ diff --git a/DEPS b/DEPS
  
    # By default, do not check out src-internal. This can be overridden e.g. with
    # custom_vars.
-@@ -100,8 +100,8 @@ vars = {
+@@ -108,8 +108,8 @@ vars = {
    # support for other platforms may be added in the future.
    'checkout_openxr' : 'checkout_win',
  
@@ -31,7 +31,7 @@ diff --git a/DEPS b/DEPS
  
    # By default, do not check out WebKit for iOS, as it is not needed unless
    # running against ToT WebKit rather than system WebKit. This can be overridden
-@@ -3401,49 +3401,6 @@ hooks = [
+@@ -3502,49 +3502,6 @@ hooks = [
          'sync', '--extract',
      ],
    },
@@ -81,7 +81,7 @@ diff --git a/DEPS b/DEPS
    {
      # Case-insensitivity for the Win SDK. Must run before win_toolchain below.
      'name': 'ciopfs_linux',
-@@ -3471,18 +3428,6 @@ hooks = [
+@@ -3572,18 +3529,6 @@ hooks = [
      'condition': 'checkout_mac',
      'action': ['python', 'src/build/mac_toolchain.py'],
    },
@@ -100,7 +100,7 @@ diff --git a/DEPS b/DEPS
    {
      # Update the prebuilt clang toolchain.
      # Note: On Win, this should run after win_toolchain, as it may use it.
-@@ -3569,18 +3514,6 @@ hooks = [
+@@ -3679,18 +3624,6 @@ hooks = [
                  '-s', 'src/buildtools/mac/clang-format.sha1',
      ],
    },
@@ -119,7 +119,7 @@ diff --git a/DEPS b/DEPS
    # Pull rc binaries using checked-in hashes.
    {
      'name': 'rc_win',
-@@ -3606,29 +3539,6 @@ hooks = [
+@@ -3716,29 +3649,6 @@ hooks = [
                  '-s', 'src/build/toolchain/win/rc/mac/rc.sha1',
      ],
    },

build/patches/disable-background-sync-by-default.patch

@@ -9,7 +9,7 @@ Subject: disable background sync by default
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -308,7 +308,7 @@ void ContentSettingsRegistry::Init() {
+@@ -313,7 +313,7 @@ void ContentSettingsRegistry::Init() {
             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
  
    Register(ContentSettingsType::BACKGROUND_SYNC, "background-sync",