diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dfea0d0..a2ffa23f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +# 87.0.4280.67 + # 86.0.4240.194 * fix native pages displaying incorrectly with the sticky desktop mode (thanks to @uazo) * re-introduce simplified NTP (fixes https://github.com/bromite/bromite/issues/701) diff --git a/build/RELEASE b/build/RELEASE index 01162a55..6e346bab 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -87.0.4280.57 +87.0.4280.67 diff --git a/build/patches/Add-history-support-in-incognito-mode.patch b/build/patches/Add-history-support-in-incognito-mode.patch index f5734b5d..b281a692 100644 --- a/build/patches/Add-history-support-in-incognito-mode.patch +++ b/build/patches/Add-history-support-in-incognito-mode.patch @@ -216,3 +216,4 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h #endif // CHROME_COMMON_PREF_NAMES_H_ -- 2.17.1 + diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index 52f07dfd..261d8058 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -3045,7 +3045,7 @@ diff --git a/chrome/common/extensions/docs/examples/extensions/gdocs/popup.html '', - '', -+ '', starred ? starCat : '', '', docTitle, '', @@ -4107,7 +4107,7 @@ diff --git a/chrome/common/extensions/docs/templates/articles/app_codelab_images -

If you want to show an external image in your app, you need to request it via XMLHttpRequest, -transform it into a Blob, and create an ObjectURL. This ObjectURL can be added to the DOM -+

If you want to show an external image in your app, you need to request it via XMLHttpRequest, ++

If you want to show an external image in your app, you need to request it via XMLHttpRequest, +transform it into a Blob, and create an ObjectURL. This ObjectURL can be added to the DOM because it refers to an in-memory item in the context of the app.

@@ -7072,7 +7072,7 @@ diff --git a/chrome/common/extensions/docs/templates/articles/single_purpose.htm we launched a policy requiring Chrome extensions to have a single purpose. In addition, starting with the May 2014 release of Chrome, we -started requiring -+started requiring ++started requiring that extensions in Chrome for Windows be hosted in the Chrome Web Store. Starting in Chrome 44 in July 2015, extensions in Mac were also @@ -18134,9 +18134,9 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ - "http://www.facebook.com/", - "http://www.google.com/", - "http://www.youtube.com/", -+ "http://www.f8c3b00k.qjz9zk/", -+ "http://www.9oo91e.qjz9zk/", -+ "http://www.y0u1ub3.qjz9zk/", ++ "http://www.f8c3b00k.qjz9zk/", ++ "http://www.9oo91e.qjz9zk/", ++ "http://www.y0u1ub3.qjz9zk/", "http://www.yahoo.com/", "http://baidu.com/", "http://www.amazon.com/", @@ -18145,18 +18145,18 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.tumblr.com/", "http://163.com/", - "http://www.google.com.hk/", -+ "http://www.9oo91e.qjz9zk.hk/", ++ "http://www.9oo91e.qjz9zk.hk/", "http://www.mail.ru/", "http://www.google.co.uk/", "http://hao123.com/", - "http://www.google.com.br/", -+ "http://www.9oo91e.qjz9zk.br/", ++ "http://www.9oo91e.qjz9zk.br/", "http://www.amazon.co.jp/", "http://www.weibo.com/", "http://www.xvideos.com/", "http://www.google.co.jp/", - "http://www.microsoft.com/", -+ "http://www.m1cr050ft.qjz9zk/", ++ "http://www.m1cr050ft.qjz9zk/", "http://www.delta-search.com/", "http://www.google.fr/", "http://www.conduit.com/", @@ -18165,7 +18165,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.soso.com/", "http://www.pornhub.com/", - "http://www.google.com.mx/", -+ "http://www.9oo91e.qjz9zk.mx/", ++ "http://www.9oo91e.qjz9zk.mx/", "http://www.blogger.com/", "http://www.neobux.com/", "http://www.amazon.co.uk/", @@ -18174,12 +18174,12 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.alipay.com/", "http://www.vube.com/", - "http://www.google.com.tr/", -+ "http://www.9oo91e.qjz9zk.tr/", ++ "http://www.9oo91e.qjz9zk.tr/", "http://www.youku.com/", "http://www.redtube.com/", "http://www.dailymotion.com/", - "http://www.google.com.au/", -+ "http://www.9oo91e.qjz9zk.au/", ++ "http://www.9oo91e.qjz9zk.au/", "http://www.adf.ly/", "http://www.netflix.com/", "http://www.adcash.com/", @@ -18188,19 +18188,19 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.weather.com/", "http://www.pixnet.net/", - "http://www.google.com.sa/", -+ "http://www.9oo91e.qjz9zk.sa/", ++ "http://www.9oo91e.qjz9zk.sa/", "http://www.clkmon.com/", "http://www.reddit.com/", "http://www.amazon.it/", - "http://www.google.com.eg/", -+ "http://www.9oo91e.qjz9zk.eg/", ++ "http://www.9oo91e.qjz9zk.eg/", "http://www.booking.com/", "http://www.google.nl/", "http://www.douban.com/", "http://www.amazon.cn/", "http://www.slideshare.net/", - "http://www.google.com.ar/", -+ "http://www.9oo91e.qjz9zk.ar/", ++ "http://www.9oo91e.qjz9zk.ar/", "http://www.badoo.com/", "http://www.dailymail.co.uk/", "http://www.google.co.th/", @@ -18208,12 +18208,12 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.wikia.com/", "http://www.godaddy.com/", - "http://www.google.com.tw/", -+ "http://www.9oo91e.qjz9zk.tw/", ++ "http://www.9oo91e.qjz9zk.tw/", "http://www.xinhuanet.com/", "http://www.mediafire.com/", "http://www.deviantart.com/", - "http://www.google.com.pk/", -+ "http://www.9oo91e.qjz9zk.pk/", ++ "http://www.9oo91e.qjz9zk.pk/", "http://www.bankofamerica.com/", "http://www.amazon.es/", "http://www.blogfa.com/", @@ -18222,7 +18222,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.google.co.ve/", "http://www.56.com/", - "http://www.google.com.vn/", -+ "http://www.9oo91e.qjz9zk.vn/", ++ "http://www.9oo91e.qjz9zk.vn/", "http://www.google.gr/", "http://www.comcast.net/", "http://www.torrentz.eu/", @@ -18231,7 +18231,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.answers.com/", "http://www.amazon.ca/", - "http://www.mozilla.org/", -+ "http://www.m0z111a.qjz9zk/", ++ "http://www.m0z111a.qjz9zk/", "http://www.guardian.co.uk/", "http://www.stumbleupon.com/", "http://www.hardsextube.com/", @@ -18240,12 +18240,12 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.search-results.com/", "http://www.fiverr.com/", - "http://www.google.com.ua/", -+ "http://www.9oo91e.qjz9zk.ua/", ++ "http://www.9oo91e.qjz9zk.ua/", "http://www.files.wordpress.com/", "http://www.onlineaway.net/", "http://www.nbcnews.com/", - "http://www.google.com.co/", -+ "http://www.9oo91e.qjz9zk.co/", ++ "http://www.9oo91e.qjz9zk.co/", "http://www.hootsuite.com/", "http://www.4dsply.com/", "http://www.google.ro/", @@ -18254,11 +18254,11 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.addthis.com/", "http://zol.com.cn/", - "http://www.google.com.ng/", -+ "http://www.9oo91e.qjz9zk.ng/", ++ "http://www.9oo91e.qjz9zk.ng/", "http://www.soundcloud.com/", "http://www.onclickads.net/", - "http://www.google.com.ph/", -+ "http://www.9oo91e.qjz9zk.ph/", ++ "http://www.9oo91e.qjz9zk.ph/", "http://www.dmm.co.jp/", "http://www.reference.com/", "http://www.google.be/", @@ -18267,7 +18267,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.sweetim.com/", "http://www.aweber.com/", - "http://www.google.com.my/", -+ "http://www.9oo91e.qjz9zk.my/", ++ "http://www.9oo91e.qjz9zk.my/", "http://www.pandora.com/", "http://www.w3schools.com/", "http://www.pengyou.com/", @@ -18276,7 +18276,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.warriorforum.com/", "http://www.statcounter.com/", - "http://www.google.com.pe/", -+ "http://www.9oo91e.qjz9zk.pe/", ++ "http://www.9oo91e.qjz9zk.pe/", "http://www.libero.it/", "http://www.thefreedictionary.com/", "http://www.soku.com/", @@ -18285,7 +18285,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.uploaded.net/", "http://www.bild.de/", - "http://www.google.com.bd/", -+ "http://www.9oo91e.qjz9zk.bd/", ++ "http://www.9oo91e.qjz9zk.bd/", "http://www.google.at/", "http://www.webcrawler.com/", "http://www.t-online.de/", @@ -18294,7 +18294,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.salesforce.com/", "http://www.scribd.com/", - "http://www.google.com.sg/", -+ "http://www.9oo91e.qjz9zk.sg/", ++ "http://www.9oo91e.qjz9zk.sg/", "http://it168.com/", "http://www.goodreads.com/", "http://www.target.com/", @@ -18303,7 +18303,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.narod.ru/", "http://www.china.com/", - "http://www.doubleclick.com/", -+ "http://www.60u613cl1c4.c0m.qjz9zk/", ++ "http://www.60u613cl1c4.c0m.qjz9zk/", "http://www.cam4.com/", "http://www.google.ie/", "http://dangdang.com/", @@ -18312,7 +18312,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.admagnet.net/", "http://rottentomatoes.com/", - "http://google.com.kw/", -+ "http://9oo91e.qjz9zk.kw/", ++ "http://9oo91e.qjz9zk.kw/", "http://www.cloob.com/", "http://www.nokia.com/", "http://wetter.com/", @@ -18321,7 +18321,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://immobilienscout24.de/", "http://www.google.kz/", - "http://goo.gl/", -+ "http://goo.gl.qjz9zk/", ++ "http://goo.gl.qjz9zk/", "http://zwaar.net/", "http://www.bankmellat.ir/", "http://alphaporno.com/", @@ -18330,7 +18330,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.sky.com/", "http://www.marketwatch.com/", - "http://www.google.com.ec/", -+ "http://www.9oo91e.qjz9zk.ec/", ++ "http://www.9oo91e.qjz9zk.ec/", "http://www.cbslocal.com/", "http://www.zhihu.com/", "http://www.888poker.com/", @@ -18339,7 +18339,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.drom.ru/", "http://www.weather.gov/", - "http://gstatic.com/", -+ "http://95tat1c.qjz9zk/", ++ "http://95tat1c.qjz9zk/", "http://www.amung.us/", "http://www.traidnt.net/", "http://www.ovh.net/", @@ -18348,7 +18348,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.bannersbroker.com/", "http://www.kohls.com/", - "http://www.google.com.do/", -+ "http://www.9oo91e.qjz9zk.do/", ++ "http://www.9oo91e.qjz9zk.do/", "http://www.dealfish.co.th/", "http://19lou.com/", "http://www.okwave.jp/", @@ -18357,7 +18357,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://sanook.com/", "http://ria.ru/", - "http://google.com.qa/", -+ "http://9oo91e.qjz9zk.qa/", ++ "http://9oo91e.qjz9zk.qa/", "http://jquery.com/", "http://pinshan.com/", "http://onlylady.com/", @@ -18366,7 +18366,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.webalta.ru/", "http://www.usbank.com/", - "http://www.google.com.ly/", -+ "http://www.9oo91e.qjz9zk.ly/", ++ "http://www.9oo91e.qjz9zk.ly/", "http://www.pantip.com/", "http://aftonbladet.se/", "http://scoop.it/", @@ -18375,7 +18375,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.tinypic.com/", "http://www.meilishuo.com/", - "http://googleadservices.com/", -+ "http://9oo91eadservices.qjz9zk/", ++ "http://9oo91eadservices.qjz9zk/", "http://www.boston.com/", "http://www.chron.com/", "http://www.breitbart.com/", @@ -18384,7 +18384,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.allocine.fr/", "http://www.slutload.com/", - "http://www.google.com.gt/", -+ "http://www.9oo91e.qjz9zk.gt/", ++ "http://www.9oo91e.qjz9zk.gt/", "http://www.santabanta.com/", "http://www.stardoll.com/", "http://www.polyvore.com/", @@ -18393,7 +18393,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.kbb.com/", "http://www.seasonvar.ru/", - "http://www.android.com/", -+ "http://www.8n6r01d.qjz9zk/", ++ "http://www.8n6r01d.qjz9zk/", "http://www.egrana.com.br/", "http://www.ettoday.net/", "http://www.webstatsdomain.net/", @@ -18402,7 +18402,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.planetminecraft.com/", "http://www.optimum.net/", - "http://www.google.com.pr/", -+ "http://www.9oo91e.qjz9zk.pr/", ++ "http://www.9oo91e.qjz9zk.pr/", "http://mthai.com/", "http://www.onlinecreditcenter6.com/", "http://www.tharunaya.co.uk/", @@ -18411,7 +18411,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.heise.de/", "http://www.wikispaces.com/", - "http://www.google.com.bo/", -+ "http://www.9oo91e.qjz9zk.bo/", ++ "http://www.9oo91e.qjz9zk.bo/", "http://www.skyscrapercity.com/", "http://www.zaobao.com/", "http://www.pirateproxy.net/", @@ -18420,12 +18420,12 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.mobileaziende.it/", "http://www.officialsurvey.org/", - "http://googleapis.com/", -+ "http://9oo91eapis.qjz9zk/", ++ "http://9oo91eapis.qjz9zk/", "http://www.mufg.jp/", "http://www.jobsdb.com/", "http://www.yahoo.com.cn/", - "http://www.google.com.sv/", -+ "http://www.9oo91e.qjz9zk.sv/", ++ "http://www.9oo91e.qjz9zk.sv/", "http://www.freejobalert.com/", "http://www.walla.co.il/", "http://www.hollywoodreporter.com/", @@ -18434,7 +18434,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.nownews.com/", "http://www.bc.vc/", - "http://www.google.com.af/", -+ "http://www.9oo91e.qjz9zk.af/", ++ "http://www.9oo91e.qjz9zk.af/", "http://www.ulmart.ru/", "http://www.estadao.com.br/", "http://www.politico.com/", @@ -18443,7 +18443,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.seobuilding.ru/", "http://www.t411.me/", - "http://googlesyndication.com/", -+ "http://9oo91esyndication.qjz9zk/", ++ "http://9oo91esyndication.qjz9zk/", "http://delfi.lt/", "http://www.eqla3.com/", "http://www.ali213.net/", @@ -18452,7 +18452,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.economist.com/", "http://www.zeit.de/", - "http://www.google.com.uy/", -+ "http://www.9oo91e.qjz9zk.uy/", ++ "http://www.9oo91e.qjz9zk.uy/", "http://www.pinoy-ako.info/", "http://www.lazada.co.id/", "http://www.filgoal.com/", @@ -18461,7 +18461,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.hawaaworld.com/", "http://www.freeonlinegames.com/", - "http://www.google.com.lb/", -+ "http://www.9oo91e.qjz9zk.lb/", ++ "http://www.9oo91e.qjz9zk.lb/", "http://www.oricon.co.jp/", "http://www.apple.com.cn/", "http://www.ab-in-den-urlaub.de/", @@ -18470,7 +18470,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.avangate.com/", "http://www.gandul.info/", - "http://www.google.com.gh/", -+ "http://www.9oo91e.qjz9zk.gh/", ++ "http://www.9oo91e.qjz9zk.gh/", "http://www.mybigcommerce.com/", "http://www.homeaway.com/", "http://www.wikitravel.org/", @@ -18479,7 +18479,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.mint.com/", "http://www.gorillavid.in/", - "http://www.google.com.om/", -+ "http://www.9oo91e.qjz9zk.om/", ++ "http://www.9oo91e.qjz9zk.om/", "http://www.blogbigtime.com/", "http://www.books.com.tw/", "http://www.korrespondent.net/", @@ -18488,7 +18488,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.8684.cn/", "http://www.rajasthan.gov.in/", - "http://www.youtube.com/user/PewDiePie/", -+ "http://www.y0u1ub3.qjz9zk/user/PewDiePie/", ++ "http://www.y0u1ub3.qjz9zk/user/PewDiePie/", "http://www.zonealarm.com/", "http://www.locaweb.com.br/", "http://logme.in/", @@ -18497,7 +18497,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.myhabit.com/", "http://www.kinomaniak.tv/", - "http://www.googlecode.com/", -+ "http://www.9oo91ecode.qjz9zk/", ++ "http://www.9oo91ecode.qjz9zk/", "http://www.kddi.com/", "http://www.wyborcza.biz/", "http://www.gtbank.com/", @@ -18506,7 +18506,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.longtailvideo.com/", "http://www.yengo.com/", - "http://www.listentoyoutube.com/", -+ "http://www.listentoy0u1ub3.qjz9zk/", ++ "http://www.listentoy0u1ub3.qjz9zk/", "http://www.dreamhost.com/", "http://www.cari.com.my/", "http://www.sergeymavrodi.com/", @@ -18515,7 +18515,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.seoclerks.com/", "http://www.yootheme.com/", - "http://www.google.com.py/", -+ "http://www.9oo91e.qjz9zk.py/", ++ "http://www.9oo91e.qjz9zk.py/", "http://www.beemp3.com/", "http://www.yepme.com/", "http://www.alef.ir/", @@ -18524,7 +18524,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.28tui.com/", "http://www.shopzilla.com/", - "http://www.google.com.ni/", -+ "http://www.9oo91e.qjz9zk.ni/", ++ "http://www.9oo91e.qjz9zk.ni/", "http://www.lycos.com/", "http://www.gucheng.com/", "http://www.rajanews.com/", @@ -18533,12 +18533,12 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.redorbit.com/", "http://www.inboxdollars.com/", - "http://www.google.com.bh/", -+ "http://www.9oo91e.qjz9zk.bh/", ++ "http://www.9oo91e.qjz9zk.bh/", "http://www.pcanalysis.net/", "http://www.acer.com/", "http://www.jizzbell.com/", - "http://www.google.com.kh/", -+ "http://www.9oo91e.qjz9zk.kh/", ++ "http://www.9oo91e.qjz9zk.kh/", "http://www.mappy.com/", "http://www.day.az/", "http://www.euronews.com/", @@ -18547,7 +18547,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.filesonar.com/", "http://www.hsbccreditcard.com/", - "http://www.google.com.np/", -+ "http://www.9oo91e.qjz9zk.np/", ++ "http://www.9oo91e.qjz9zk.np/", "http://www.parperfeito.com.br/", "http://www.sciencedaily.com/", "http://www.realgfporn.com/", @@ -18556,7 +18556,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.pornbb.org/", "http://www.formspring.me/", - "http://www.google.com.cy/", -+ "http://www.9oo91e.qjz9zk.cy/", ++ "http://www.9oo91e.qjz9zk.cy/", "http://www.purepeople.com/", "http://www.epnet.com/", "http://www.penny-arcade.com/", @@ -18565,7 +18565,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.gungho.jp/", "http://www.mk.co.kr/", - "http://www.googlegroups.com/", -+ "http://www.9oo91egroups.qjz9zk/", ++ "http://www.9oo91egroups.qjz9zk/", "http://www.animoto.com/", "http://www.alquds.co.uk/", "http://www.newsday.com/", @@ -18574,7 +18574,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.farecompare.com/", "http://www.xinjunshi.com/", - "http://www.youtube.com/user/SkyDoesMinecraft/", -+ "http://www.y0u1ub3.qjz9zk/user/SkyDoesMinecraft/", ++ "http://www.y0u1ub3.qjz9zk/user/SkyDoesMinecraft/", "http://www.vidxden.com/", "http://www.pvrcinemas.com/", "http://chachaba.com/", @@ -18583,7 +18583,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.oszone.net/", "http://www.teamtreehouse.com/", - "http://www.youtube.com/user/BlueXephos/", -+ "http://www.y0u1ub3.qjz9zk/user/BlueXephos/", ++ "http://www.y0u1ub3.qjz9zk/user/BlueXephos/", "http://www.humanservices.gov.au/", "http://www.bostonherald.com/", "http://www.kafeteria.pl/", @@ -18592,7 +18592,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.iafd.com/", "http://www.casertex.com/", - "http://www.gmail.com/", -+ "http://www.9ma1l.qjz9zk/", ++ "http://www.9ma1l.qjz9zk/", "http://www.modhoster.de/", "http://www.post-gazette.com/", "http://www.digikey.com/", @@ -18601,7 +18601,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.ok-porn.com/", "http://www.tutorialzine.com/", - "http://www.google.com.bn/", -+ "http://www.9oo91e.qjz9zk.bn/", ++ "http://www.9oo91e.qjz9zk.bn/", "http://www.site5.com/", "http://www.trafficjunky.net/", "http://www.xueqiu.com/", @@ -18610,7 +18610,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://leiting001.com/", "http://www.ifttt.com/", - "http://www.google.com.mm/", -+ "http://www.9oo91e.qjz9zk.mm/", ++ "http://www.9oo91e.qjz9zk.mm/", "http://www.gizbot.com/", "http://www.games2win.com/", "http://www.stiforp.com/", @@ -18619,7 +18619,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.newindianexpress.com/", "http://www.washingtonexaminer.com/", - "http://www.mozillazine.org/", -+ "http://www.m0z111azine.qjz9zk/", ++ "http://www.m0z111azine.qjz9zk/", "http://www.mg.co.za/", "http://www.newalbumreleases.net/", "http://www.trombi.com/", @@ -18628,7 +18628,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/ "http://www.tweepi.com/", "http://www.bobfilm.net/", - "http://www.phandroid.com/", -+ "http://www.ph8n6r01d.qjz9zk/", ++ "http://www.ph8n6r01d.qjz9zk/", "http://www.obozrevatel.com/", "http://www.elitedaily.com/", "http://www.tcfexpress.com/", diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch index 90a831ab..4323174c 100644 --- a/build/patches/Disable-safe-browsing.patch +++ b/build/patches/Disable-safe-browsing.patch @@ -1659,7 +1659,7 @@ diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/c diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -1363,6 +1363,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( +@@ -1364,6 +1364,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( is_enabled = false; } @@ -1667,7 +1667,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Disable password -@@ -1373,6 +1374,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( +@@ -1374,6 +1375,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -2166,7 +2166,7 @@ diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client. 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 -@@ -3451,7 +3451,6 @@ static_library("ui") { +@@ -3454,7 +3454,6 @@ static_library("ui") { "views/device_chooser_content_view.h", "views/devtools_process_observer.cc", "views/devtools_process_observer.h", diff --git a/build/patches/Flag-for-always-desktop-mode.patch b/build/patches/Flag-for-always-desktop-mode.patch index 3ad13a08..96ecb651 100644 --- a/build/patches/Flag-for-always-desktop-mode.patch +++ b/build/patches/Flag-for-always-desktop-mode.patch @@ -46,7 +46,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java 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 -@@ -112,6 +112,11 @@ +@@ -105,6 +105,11 @@ android:key="content_settings" android:order="20" android:title="@string/prefs_site_settings"/> diff --git a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch index 24241a07..7753b440 100644 --- a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch +++ b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch @@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting */ @@ -54,6 +61,18 @@ public class PrivacySettings private static final String PREF_PROXY_OPTIONS = "proxy"; - public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_history_enabled"; + public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_history_enabled"; + // moved from SyncAndServicesSettings.java + private static final String PREF_SERVICES_CATEGORY = "services_category"; @@ -71,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {PREF_CLEAR_BROWSING_DATA, PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS, PREF_SECURE_DNS, PREF_DO_NOT_TRACK, -@@ -61,7 +80,8 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo +@@ -61,7 +80,8 @@ public class PrivacySettings PREF_INCOGNITO_TAB_HISTORY_ENABLED, PREF_ALLOW_CUSTOM_TAB_INTENTS, PREF_CLOSE_TABS_ON_EXIT, @@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting }; private ManagedPreferenceDelegate mManagedPreferenceDelegate; -@@ -87,6 +107,29 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo +@@ -87,6 +107,29 @@ public class PrivacySettings mManagedPreferenceDelegate = createManagedPreferenceDelegate(); @@ -111,7 +111,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting ChromeSwitchPreference canMakePaymentPref = (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT); canMakePaymentPref.setOnPreferenceChangeListener(this); -@@ -119,6 +162,11 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo +@@ -119,6 +162,11 @@ public class PrivacySettings } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue); @@ -123,7 +123,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } else if (PREF_NETWORK_PREDICTIONS.equals(key)) { PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue); } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) { -@@ -133,6 +181,16 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo +@@ -133,6 +181,16 @@ public class PrivacySettings return true; } @@ -140,7 +140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onResume() { super.onResume(); -@@ -143,7 +201,7 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo +@@ -143,7 +201,7 @@ public class PrivacySettings * Updates the summaries for several preferences. */ public void updateSummaries() { diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch index 5ea9ed40..715a6571 100644 --- a/build/patches/Multiple-fingerprinting-mitigations.patch +++ b/build/patches/Multiple-fingerprinting-mitigations.patch @@ -96,7 +96,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 -@@ -226,6 +226,7 @@ source_set("browser") { +@@ -227,6 +227,7 @@ source_set("browser") { "//third_party/libyuv", "//third_party/re2", "//third_party/sqlite", diff --git a/build/patches/Show-site-settings-for-cookies.patch b/build/patches/Show-site-settings-for-cookies.patch index 4665144a..a6325904 100644 --- a/build/patches/Show-site-settings-for-cookies.patch +++ b/build/patches/Show-site-settings-for-cookies.patch @@ -4,9 +4,9 @@ Subject: Show site settings for cookies Avoid displaying info about intrusive ads --- - .../site_settings/SingleWebsiteSettings.java | 47 +++++++++++-------- - .../browser_ui/site_settings/Website.java | 14 ++++-- - 2 files changed, 37 insertions(+), 24 deletions(-) + .../site_settings/SingleWebsiteSettings.java | 59 +++++++++---------- + .../browser_ui/site_settings/Website.java | 14 +++-- + 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java @@ -58,7 +58,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + ContentSettingsType.JAVASCRIPT) + ? ContentSettingValues.ALLOW + : ContentSettingValues.BLOCK; -+ } + } +- // Not possible to embargo JAVASCRIPT. + setUpListPreference(preference, currentValue, false); + } + @@ -67,19 +68,41 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + @Nullable + Integer currentValue = + mSite.getContentSetting(getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES); -+ // Always show the cookies permission ++ // Always show the cookies permission + if (currentValue == null) { + currentValue = WebsitePreferenceBridge.isCategoryEnabled( + getSiteSettingsClient().getBrowserContextHandle(), + ContentSettingsType.COOKIES) + ? ContentSettingValues.ALLOW + : ContentSettingValues.BLOCK; - } -- // Not possible to embargo JAVASCRIPT. ++ } + // Not possible to embargo COOKIES. setUpListPreference(preference, currentValue, false /* isEmbargoed */); } +@@ -932,22 +941,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment + setUpListPreference(preference, null, false); + return; + } +- // If the ad blocker is activated, then this site will have ads blocked unless there is an +- // explicit permission disallowing the blocking. +- boolean activated = WebsitePreferenceBridge.getAdBlockingActivated( +- browserContextHandle, mSite.getAddress().getOrigin()); + @ContentSettingValues + @Nullable + Integer permission = mSite.getContentSetting(browserContextHandle, ContentSettingsType.ADS); + +- // If |permission| is null, there is no explicit (non-default) permission set for this site. +- // If the site is not considered a candidate for blocking, do the standard thing and remove +- // the preference. +- if (permission == null && !activated) { +- setUpListPreference(preference, null, false); +- return; +- } +- + // However, if the blocking is activated, we still want to show the permission, even if it + // is in the default state. + if (permission == null) { diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java diff --git a/build/patches/Update-i18n-zh_CN-support.patch b/build/patches/Update-i18n-zh_CN-support.patch index f1ada284..60057be7 100644 --- a/build/patches/Update-i18n-zh_CN-support.patch +++ b/build/patches/Update-i18n-zh_CN-support.patch @@ -10,7 +10,7 @@ Subject: Update i18n zh_CN support diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb -@@ -7020,4 +7020,8 @@ +@@ -7024,4 +7024,8 @@ YouTube 正在建立安全连接... 检查(&N) diff --git a/build/patches/build-remove-calling-untrusted-hooks.patch b/build/patches/build-remove-calling-untrusted-hooks.patch index 866788da..54da7541 100644 --- a/build/patches/build-remove-calling-untrusted-hooks.patch +++ b/build/patches/build-remove-calling-untrusted-hooks.patch @@ -11,7 +11,7 @@ sysroot. diff --git a/DEPS b/DEPS --- a/DEPS +++ b/DEPS -@@ -93,7 +93,7 @@ vars = { +@@ -94,7 +94,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. -@@ -123,8 +123,8 @@ vars = { +@@ -124,8 +124,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 bot checkouts the WPR archive files only when this # flag is set True. -@@ -4248,49 +4248,6 @@ hooks = [ +@@ -4249,49 +4249,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', -@@ -4414,18 +4371,6 @@ hooks = [ +@@ -4415,18 +4372,6 @@ hooks = [ '-s', 'src/buildtools/mac/clang-format.sha1', ], }, @@ -100,7 +100,7 @@ diff --git a/DEPS b/DEPS # Pull rc binaries using checked-in hashes. { 'name': 'rc_win', -@@ -4451,29 +4396,6 @@ hooks = [ +@@ -4452,29 +4397,6 @@ hooks = [ '-s', 'src/build/toolchain/win/rc/mac/rc.sha1', ], },