Merge pull request #6602 from brave/85.0.4183.102-1.15.x

Upgrade patches from Chromium 85.0.4183.83 to Chromium 85.0.4183.102 (1.15.x).
brave · Sep 10, 2020 · 5b0a155 · 5b0a155
2 parents f965668 + 74ee803
commit 5b0a155
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 78d3c53293990ef4c0ee15db7173afe402de9521..1e77231d6d27bc396c1b37350207e00d0e92bd84 100644
+index f84109edef918ac04ca0d3070f8a9867984ab9ec..bd60e13a4dced6811d6cf4d5752560b1abad0a3f 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=85
 -MINOR=0
 -BUILD=4183
--PATCH=83
+-PATCH=102
 +MINOR=1
 +BUILD=15
 +PATCH=45
diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
-index 79a746ddcea9f2977b212042a951a4f48b7b1dde..7067711618c3aa5b4026bc809fe70c82fa904e41 100644
+index 5db8b816edd267a1264bbde1ac0611d880870f2c..41ff3e0ab51d49e0fe79b4bad25368e8bd76af70 100644
 --- a/chrome/browser/ui/chrome_pages.cc
 +++ b/chrome/browser/ui/chrome_pages.cc
-@@ -367,7 +367,7 @@ void ShowSlow(Browser* browser) {
+@@ -370,7 +370,7 @@ void ShowSlow(Browser* browser) {
  #endif
  }
 

diff --git a/patches/components-history-core-browser-thumbnail_database.cc.patch b/patches/components-history-core-browser-thumbnail_database.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/history/core/browser/thumbnail_database.cc b/components/history/core/browser/thumbnail_database.cc
-index 19c7722a778b24fcc50e7ab9a4e5e368399bf52d..625f5be347adbbfeb207ba45880372435b1a4e80 100644
+index 19c7722a778b24fcc50e7ab9a4e5e368399bf52d..11b2be6a2c3b428719aa9632d347b7aa2334957e 100644
 --- a/components/history/core/browser/thumbnail_database.cc
 +++ b/components/history/core/browser/thumbnail_database.cc
 @@ -519,6 +519,7 @@ FaviconBitmapID ThumbnailDatabase::AddFaviconBitmap(

diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
-index ffdfdf4c026dab77c024b2acd9588074ba816532..17a3ac21003da380d1376ceddc8c4513c0a0ae07 100644
+index eb2f41324d405f9ef38cf8451a327d331a82d573..7f94798670dbff7a1882a7df8d9ac8a33c2c1fb4 100644
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -208043,6 +208043,7 @@ regressions. -->
+@@ -208052,6 +208052,7 @@ regressions. -->
    <suffix name="ProtectedMedia" label="Protected media permission"/>
    <suffix name="PushMessaging" label="Push messaging permission"/>
    <suffix name="Quota" label="Quota permission"/>