diff --git a/CHANGELOG.md b/CHANGELOG.md index a509bb97..1b9a61aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 72.0.3626.68 +* do not ignore save prompt for users without SD card (workaround for upstream wontfix https://bugs.chromium.org/p/chromium/issues/detail?id=916606) +* remove third_party/analytics patch (now fixed upstream in https://chromium.googlesource.com/chromium/src.git/+/64d6a56f094efbab83802c07ad3ddffa014f9903) +* AV1 codec support + # 71.0.3578.132 * add patches from AndroidHardening project (fixes https://github.com/bromite/bromite/issues/226) diff --git a/README.md b/README.md index d3d7597c..64c83189 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ Yes, since version 69. While the desktop version of Chromium has an option to di * privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects ## Features not related to privacy +* AV1 codec support * import/export bookmarks * allow playing videos in background tabs and disable pause on switching tabs * all codecs included (proprietary, open H.264 etc.) diff --git a/build/filters/adblock_entries.h b/build/filters/adblock_entries.h index 4cbf4b8c..f621a7f9 100644 --- a/build/filters/adblock_entries.h +++ b/build/filters/adblock_entries.h @@ -19,9 +19,10 @@ struct adblock_entry { const char **domains, **domains_skip; }; -#define ADBLOCK_ENTRY_COUNT 56226 +#define ADBLOCK_ENTRY_COUNT 56277 const char *m1001413a[] = { "clk1005.com^", NULL }; const char *m10030a28[] = { "/InsightTrk/", NULL }; +const char *m10043be [] = { "pro6e.com^", NULL }; const char *m10045299[] = { "award.sitekeuring.net^", NULL }; const char *m100458cd[] = { "eluhhfyxx.com^", NULL }; const char *m1004ae71[] = { "/activityloggingapi/", NULL }; @@ -607,6 +608,7 @@ const char *m1277d7a7[] = { "vipbox.im^", NULL }; const char *m127908df[] = { "bhmzjxrf.com^", NULL }; const char *m127a4963[] = { "888games.com^", NULL }; const char *m127b6312[] = { "hothardware.com^", "_staticbanner_", ".jpg", NULL }; +const char *m127bdab9[] = { "/track/", "&siteurl=", NULL }; const char *m127eae34[] = { "/easyads.", NULL }; const char *m12804bf4[] = { "468x60.php?", NULL }; const char *m1281771e[] = { "promo4partners.com^", NULL }; @@ -898,6 +900,7 @@ const char *m13c04a3 [] = { "bid.g.doubleclick.net^", NULL }; const char *m13c4d56c[] = { "avira.com/site/datatracking?", NULL }; const char *m13c59376[] = { "4utro.ru^", NULL }; const char *m13c59b43[] = { "nfdntqlqrgwc.com^", NULL }; +const char *m13c751a6[] = { "bornate.info^", NULL }; const char *m13c7b623[] = { "/track-action/", NULL }; const char *m13c8d15a[] = { "ae1a1e258b8b016.com^", NULL }; const char *m13c99d31[] = { "js.stroeermediabrands.de^", NULL }; @@ -1723,6 +1726,7 @@ const char *m17710704[] = { "/BuiltRegister.aspx?upt=", NULL }; const char *m17717298[] = { "hitcount.dk^", NULL }; const char *m1771f996[] = { "linkmoon.net/banners/", NULL }; const char *m17734241[] = { "hotfiletrend.com/dlp.gif", NULL }; +const char *m17797950[] = { "/bug/pic.gif?", NULL }; const char *m177ac54b[] = { "zprlpkabqlth.com^", NULL }; const char *m177e95d1[] = { "ads.hollywood.com^", NULL }; const char *m177ea674[] = { "adsdaq.com^", NULL }; @@ -2224,6 +2228,7 @@ const char *m19a157f4[] = { "computing.co.uk^", "^webtrends.js", NULL }; const char *m19a25f [] = { "nturveev.com^", NULL }; const char *m19a2bb97[] = { "ad-u.com^", NULL }; const char *m19a47199[] = { "lmoqmsagyjcurg.bid^", NULL }; +const char *m19a4a1e [] = { "/gaEvents.js", NULL }; const char *m19a501e3[] = { "adobetag.com/d2/", NULL }; const char *m19a5b60b[] = { "realsecuredredirect.com^", NULL }; const char *m19aa07e7[] = { "domainit.com/scripts/track.js", NULL }; @@ -2289,6 +2294,7 @@ const char *m19f8f396[] = { "ejgxyfzciwyi.com^", NULL }; const char *m19fa31fd[] = { "ads.expat-blog.biz^", NULL }; const char *m19fbdc6d[] = { "clear-request.com^", NULL }; const char *m19fdbb69[] = { "clubic.com/editorial/publier_count.php?", NULL }; +const char *m19fe4728[] = { "bootstrap-framework.org^", NULL }; const char *m19ffbae [] = { "pornvibe.org/sw.js", NULL }; const char *m19fff192[] = { "/showsidebar-ad-", NULL }; const char *m1a0011ad[] = { "shopify.com/", "/page?", "&eventType=", NULL }; @@ -2414,6 +2420,7 @@ const char *m1a8beafa[] = { "zggbloudx.com^", NULL }; const char *m1a8d8b57[] = { "bttbgroup.com^", NULL }; const char *m1a8e22d3[] = { "bannerimage.com^", NULL }; const char *m1a8ec607[] = { "uvnc.com/img/housecall.", NULL }; +const char *m1a8edd01[] = { "vidtech.cbsinteractive.com^", NULL }; const char *m1a909367[] = { "dailyhiit.com/sites/", "/ad-images/", NULL }; const char *m1a90dc95[] = { "uspsqjivl.bid^", NULL }; const char *m1a94374d[] = { "vixnixxer.com^", NULL }; @@ -2925,6 +2932,7 @@ const char *m1cb63f4 [] = { "tracking.netbank.de^", NULL }; const char *m1cb6929a[] = { "pornturbo.com/tmarket.php", NULL }; const char *m1cb7bca7[] = { "forensics1000.com^", NULL }; const char *m1cb892e6[] = { "lazynerd.info^", NULL }; +const char *m1cb9b04e[] = { "/rum_analytics/", NULL }; const char *m1cbda48c[] = { "coinurl.com/bootstrap/js/bootstrapx-clickover.js", NULL }; const char *m1cc09753[] = { "wmjdnluokizo.com^", NULL }; const char *m1cc13d24[] = { "/reporting/analytics.js", NULL }; @@ -3193,6 +3201,7 @@ const char *m1ddda5ca[] = { "/eros.htm", NULL }; const char *m1ddde30e[] = { "pghcitypaper.com/general/modalbox/modalbox.js", NULL }; const char *m1de4f18f[] = { "support.google.com/adsense/", NULL }; const char *m1de5bf25[] = { "voyeurhit.com/js/a2210.js", NULL }; +const char *m1de673dd[] = { "/fbpixel/", NULL }; const char *m1de73269[] = { "mediaplex.com/ad/bn/", NULL }; const char *m1deaaa54[] = { "dieohupl.com^", NULL }; const char *m1deabd7d[] = { "analytics.atomiconline.com/services/jquery.js", NULL }; @@ -3247,7 +3256,9 @@ const char *m1e243a2b[] = { "wmzfcchqnkrux.bid^", NULL }; const char *m1e2462fa[] = { "sportsbay.org^", NULL }; const char *m1e2472dc[] = { "wellsfargo.com/img/ads/", NULL }; const char *m1e24e429[] = { "uts-rss.crystalmedianetworks.com/track.php?", NULL }; +const char *m1e289194[] = { "/ad_boxes/", NULL }; const char *m1e299609[] = { "/Analytics/Visitor.", NULL }; +const char *m1e2af351[] = { "smallseotools.com/js/ads.js", NULL }; const char *m1e2b54fd[] = { "/tags/angular-", NULL }; const char *m1e2d324f[] = { "/geitonpop.", NULL }; const char *m1e2f4563[] = { "ad-srv.net^", NULL }; @@ -3417,6 +3428,7 @@ const char *m1ed8c8e [] = { "_555x70.", NULL }; const char *m1ed9ddf4[] = { "&largead=", NULL }; const char *m1edabeac[] = { "barium.cheezdev.com^", NULL }; const char *m1edcb834[] = { "freewebcounter.com^", NULL }; +const char *m1edcca44[] = { "/fb-pixel-", NULL }; const char *m1edd452c[] = { "advertlane.com^", NULL }; const char *m1edd7fb7[] = { "p-td.com^", NULL }; const char *m1edf39c3[] = { "netscape.com/c.cgi?", NULL }; @@ -4672,6 +4684,7 @@ const char *m243d7088[] = { "pcr1p2xr.com^", NULL }; const char *m243d7e15[] = { "gcpdata.telegraph.co.uk^", NULL }; const char *m243ded9d[] = { "imgburn.com/images/ddigest_", NULL }; const char *m243eb28a[] = { "pcwdld.com/wp-content/plugins/wbounce/", NULL }; +const char *m2443a694[] = { "ads.google.", NULL }; const char *m24447567[] = { "wordpress.com^", "-banner-", NULL }; const char *m2444ea2b[] = { "/adstract/", NULL }; const char *m24456c0f[] = { "extremetech.com/pb/pbl.min.js", NULL }; @@ -5033,6 +5046,7 @@ const char *m25d758ca[] = { "gawker.com/at.js.php", NULL }; const char *m25d77513[] = { "streamplay.to/js/pu2/", NULL }; const char *m25d81108[] = { "videositeprofits.com^", "^banner.jpg", NULL }; const char *m25db0e93[] = { "jcgvmfaby.bid^", NULL }; +const char *m25dc8b11[] = { "/impression_analytics/", NULL }; const char *m25dcb847[] = { "ra.ripple6.com^", NULL }; const char *m25dd062a[] = { "mcaxqvcu.com^", NULL }; const char *m25de57f8[] = { "/468xads.", NULL }; @@ -5501,6 +5515,7 @@ const char *m27ed36c0[] = { "providesupport.com^", NULL }; const char *m27ed93f0[] = { "d0efb7d9aeb478d.com^", NULL }; const char *m27ee861 [] = { "igopol.info^", NULL }; const char *m27eeaa79[] = { "adplex.media^", NULL }; +const char *m27ef8d90[] = { "b8cdn.com^", "^analytics.js", NULL }; const char *m27f05e0 [] = { "kaxsdc.com^", NULL }; const char *m27f14ea2[] = { "?rand=", "&blk=", NULL }; const char *m27f60fcd[] = { "sim-technik.de^", "^uniqueTrackId^", NULL }; @@ -6212,6 +6227,7 @@ const char *m2ae55db2[] = { "xbljpezkd.bid^", NULL }; const char *m2ae5b27b[] = { "pwizshlkrpyh.com^", NULL }; const char *m2ae72457[] = { "lb-69.com/pics/", NULL }; const char *m2ae97407[] = { "_ComScore.", NULL }; +const char *m2aea7510[] = { "s4yxaqyq95.com^", NULL }; const char *m2aec37ee[] = { "alphabaseinc.com/images/display_adz/", NULL }; const char *m2aeff7ad[] = { "suite101.de/tracking/", NULL }; const char *m2af1225e[] = { "cwkuki.com^", NULL }; @@ -6591,6 +6607,7 @@ const char *m2ca912f0[] = { "pussl7.com^", NULL }; const char *m2ca96d1c[] = { "croxdfrdjfnt.com^", NULL }; const char *m2ca97e86[] = { "cybernetentertainment.com^", NULL }; const char *m2cab5d2a[] = { "freetracker.biz^", NULL }; +const char *m2caf7104[] = { "/AdAppSettings/", NULL }; const char *m2cb04774[] = { "/usernext.", NULL }; const char *m2cb2c4ef[] = { "cdmagurus.com/forum/cyberflashing.swf", NULL }; const char *m2cb37037[] = { "rxeospfus.bid^", NULL }; @@ -7650,6 +7667,7 @@ const char *m312f4074[] = { "pix.impdesk.com^", NULL }; const char *m3132666f[] = { "web1.51.la^", NULL }; const char *m31334979[] = { "rvfjbxzxaookgp.com^", NULL }; const char *m3133f9e0[] = { "/ad/bannerimg/", NULL }; +const char *m31349141[] = { "getfreebit.xyz/libs/advertisement.js", NULL }; const char *m31358f08[] = { "conduit-banners.com^", NULL }; const char *m313662ab[] = { "/sponsoredheadline.", NULL }; const char *m31377d64[] = { "/exitpopunder_", NULL }; @@ -8696,6 +8714,7 @@ const char *m35d87f71[] = { "metartmoney.met-art.com^", NULL }; const char *m35d8d980[] = { "bet365.com^", "affiliate^", NULL }; const char *m35dc0cc9[] = { "shareasale.com^", NULL }; const char *m35de28cf[] = { "yumenetworks.com^", NULL }; +const char *m35dfd72a[] = { "d1qc76gneygidm.cloudfront.net^", NULL }; const char *m35dff821[] = { "bbc.co.uk/radio/player/", "/logger.js", NULL }; const char *m35e2771a[] = { "ts.blogo.it^", NULL }; const char *m35e277d9[] = { "talk-blog.com^", NULL }; @@ -9579,6 +9598,7 @@ const char *m39b3e26a[] = { "/ABAdsv1.", NULL }; const char *m39b4dd1c[] = { "cloudvideoplatform.com/scripts/WebAnalytics.js", NULL }; const char *m39b5a8f1[] = { "visitlog.net^", NULL }; const char *m39b5f311[] = { "ntfhglciig.bid^", NULL }; +const char *m39b7143 [] = { "9anime.", "/assets/", NULL }; const char *m39b8c96a[] = { "_ad_homepage.", NULL }; const char *m39b95c24[] = { "javascriptcounter.appspot.com^", NULL }; const char *m39b9dc3d[] = { "gettipsz.info^", NULL }; @@ -11125,6 +11145,7 @@ const char *m40ade707[] = { "zedo.com/jsc/c5/fhs.js", NULL }; const char *m40ae705c[] = { "myfreecams.com/mfc2/lib/o-mfccore.js", NULL }; const char *m40af4c32[] = { "/aditems/", NULL }; const char *m40af8711[] = { "/lotto_ad_", NULL }; +const char *m40b04488[] = { "qwant.com^", "^snippet^", NULL }; const char *m40b06aa4[] = { "protect-your-privacy.net/?", NULL }; const char *m40b1d6e [] = { "mo8mwxi1.com^", NULL }; const char *m40b216a3[] = { "m32.media^", NULL }; @@ -11587,6 +11608,7 @@ const char *m42a12e58[] = { "unhardward.com^", NULL }; const char *m42a1c916[] = { "dailytrust.info/images/banners/", NULL }; const char *m42a20f4c[] = { "clickppcbuzz.com^", NULL }; const char *m42a285b9[] = { "/event/track?", NULL }; +const char *m42a59189[] = { "/exbls1.js?", NULL }; const char *m42a592bf[] = { "pussl13.com^", NULL }; const char *m42a67cce[] = { "mdn2015x1.com^", NULL }; const char *m42a820a0[] = { "calltracks.com^", NULL }; @@ -11948,6 +11970,7 @@ const char *m4426db50[] = { "lhaqzqjbafcu.com^", NULL }; const char *m442755a5[] = { "/cnwk.1d/", "/apex.js", NULL }; const char *m442b133d[] = { "zs.dhl.de^", NULL }; const char *m442be6c5[] = { "smartclip.net/ads?", NULL }; +const char *m442c0f76[] = { "perkcanada.com^", NULL }; const char *m442c2dda[] = { "inskinmedia.com^", "^js^base^api^", NULL }; const char *m442c6aa0[] = { "bbqipbsg.bid^", NULL }; const char *m442cd2fb[] = { "luminate.com^", NULL }; @@ -12028,6 +12051,7 @@ const char *m448c1074[] = { "binlayer.de^", NULL }; const char *m448cc4bc[] = { "doubleclick.net/pfadx/comedycentral.", NULL }; const char *m448d1ae4[] = { "/adzone_", NULL }; const char *m448ea68a[] = { "/cm/ads/", NULL }; +const char *m4491ff0a[] = { "", "/", NULL }; const char *m44926e12[] = { "oywdlsbwkklw.com^", NULL }; const char *m44933d60[] = { "shorte.st^", "^referral_banners^", NULL }; const char *m4494ddb4[] = { "advertising.sun-sentinel.com/el-sentinel/elsentinel-landing-page.gif", NULL }; @@ -12592,6 +12616,7 @@ const char *m46ffd6f6[] = { "mokuz.ru^", NULL }; const char *m47011559[] = { "boostads.net^", NULL }; const char *m47017bf5[] = { "indicate.to^", NULL }; const char *m4701e31b[] = { "wipjyzwavojq.com^", NULL }; +const char *m470356b8[] = { "u595sebqih.com^", NULL }; const char *m4703d0cc[] = { "slacker.com^", "^Advertising.js", NULL }; const char *m470489a [] = { "/adblock_detect.", NULL }; const char *m470728db[] = { "5.39.67.191/promo.php?", NULL }; @@ -13502,7 +13527,6 @@ const char *m4b027973[] = { "ad.anuntis.com^", NULL }; const char *m4b052480[] = { "/report_visit.", NULL }; const char *m4b072432[] = { "uaaholcdcx.bid^", NULL }; const char *m4b07c3cd[] = { "netflix.com/EpicCounter?", NULL }; -const char *m4b0a5c20[] = { "moviefap.com/js/swfobject.js", NULL }; const char *m4b0b90ad[] = { "gelbooru.com/ads.js", NULL }; const char *m4b0bad32[] = { "czdaxoesbdlih.com^", NULL }; const char *m4b0e1383[] = { "du8783wkf05yr.cloudfront.net^", NULL }; @@ -13533,7 +13557,6 @@ const char *m4b283350[] = { "silverpush.co^", NULL }; const char *m4b2bb128[] = { "/www/js/ad/", NULL }; const char *m4b2cfddf[] = { "8c20290f4cc310f70.com^", NULL }; const char *m4b2e5c94[] = { "oregonlive.com/static/common/js/ads/ads.js", NULL }; -const char *m4b2ef2c0[] = { "", ".", "/", NULL }; const char *m4b2f310a[] = { "notdoppler.com^", "-promo-siteskin.", NULL }; const char *m4b2f8ed7[] = { "widgets.rewardstyle.com^", NULL }; const char *m4b30a7ea[] = { "trafficsynergy.com^", NULL }; @@ -13546,7 +13569,6 @@ const char *m4b394c51[] = { "/simple_reach.js", NULL }; const char *m4b3a3165[] = { "/adsbycurse.", NULL }; const char *m4b3b6c19[] = { "guim.co.uk/guardian/thirdparty/tv-site/side.html", NULL }; const char *m4b3bae27[] = { "forexpeacearmy.com/images/banners/", NULL }; -const char *m4b3c7720[] = { "imagefap.com/ubr_file_upload.js", NULL }; const char *m4b3e666b[] = { "/analytics/newrelic_", NULL }; const char *m4b40009e[] = { "balancebreath.com^", NULL }; const char *m4b44d64b[] = { "/analytics-plugin/", NULL }; @@ -13804,6 +13826,7 @@ const char *m4c6616e2[] = { "uutfeuxmqdvdp.com^", NULL }; const char *m4c67afde[] = { "svyksa.info^", NULL }; const char *m4c67cae8[] = { "usfmwydo.com^", NULL }; const char *m4c67d838[] = { "cast4u.tv/fku.php", NULL }; +const char *m4c691532[] = { "/mpl/mpulse.", NULL }; const char *m4c6a38f2[] = { "ixtuseq.info^", NULL }; const char *m4c6ab316[] = { "/pixeltracker.", NULL }; const char *m4c6ba0f [] = { "esgwceckxumg.com^", NULL }; @@ -16135,6 +16158,7 @@ const char *m56866b22[] = { ".ad.final.", NULL }; const char *m56867146[] = { "ad.mangareader.net^", NULL }; const char *m5686dc42[] = { ".com/0.gif?", NULL }; const char *m5688bc32[] = { "lr-port.de/tracker/", NULL }; +const char *m568a77a [] = { "6kauqbszb9.com^", NULL }; const char *m568e2503[] = { "trackstarsengland.net^", NULL }; const char *m56915dbf[] = { "dmtracking.1688.com^", NULL }; const char *m5691941d[] = { "catalystmagazine.net/images/banners/", NULL }; @@ -16751,7 +16775,6 @@ const char *m596bdf4d[] = { "thegameslist.com/wb/t.gif", NULL }; const char *m596e50c2[] = { "vastopped.com^", NULL }; const char *m596edaaf[] = { "animenewsnetwork.com/javascripts/advertisement.js", NULL }; const char *m596f0d1d[] = { ".cn/jc.gif?", NULL }; -const char *m596fe6ba[] = { "heg-cp.com^upm^^", NULL }; const char *m597039b [] = { "_468x60/", NULL }; const char *m5970c0d9[] = { "lyngsat.com/as9/", NULL }; const char *m5970cabd[] = { "ping-fast.com^", NULL }; @@ -20287,6 +20310,7 @@ const char *m6876362e[] = { "tftsbqbeuthh.com^", NULL }; const char *m6877486d[] = { "iuncajvw.com^", NULL }; const char *m6877e67f[] = { "mtdlcstsqt.com^", NULL }; const char *m687939fb[] = { "nysun.com/tracker.js", NULL }; +const char *m6879d189[] = { "_ad_server.", NULL }; const char *m687a2296[] = { "/cdn-ad-", NULL }; const char *m687b4cb9[] = { "youtube.com/get_midroll_", NULL }; const char *m687c2cdb[] = { "hkacgxlpfurb.com^", NULL }; @@ -23021,6 +23045,7 @@ const char *m74265cc0[] = { "/adtext.", NULL }; const char *m7428e7d5[] = { "/leaderboardadblock.", NULL }; const char *m742cb3c9[] = { "/files/ads-", NULL }; const char *m742fa6d [] = { "/ads-header-", NULL }; +const char *m7431fc18[] = { "imagefap.com/images/yes.gif?", NULL }; const char *m74325173[] = { "recessary.com^", NULL }; const char *m74336170[] = { "_adengine_", NULL }; const char *m74344592[] = { "/player/ad/", NULL }; @@ -24582,6 +24607,7 @@ const char *m7af49c65[] = { "adscendmedia.com/gwjs.php?", NULL }; const char *m7af4ef6c[] = { "filadmir.site^", NULL }; const char *m7af5a0fd[] = { ".png?cpn=", NULL }; const char *m7af5e2ad[] = { "variti.net^", NULL }; +const char *m7af61223[] = { "clk.", "/sw.js", NULL }; const char *m7af61e16[] = { "surveywidget.biz^", NULL }; const char *m7af6d222[] = { "acc-hd.de^", NULL }; const char *m7af7742b[] = { "wcyqoiyohhav.com^", NULL }; @@ -25399,7 +25425,6 @@ const char *m7e7b6026[] = { "/adiframe/", NULL }; const char *m7e7c9e69[] = { "audienceinsights.net^", NULL }; const char *m7e7cc2e9[] = { "travelocity.com/event.ng/", "click", NULL }; const char *m7e7ce9ad[] = { "break.com/break/js/brktrkr.js", NULL }; -const char *m7e7ceef [] = { "naturalnewsblogs.com^", "^SBA.", NULL }; const char *m7e7d675d[] = { "analytics.blue^", NULL }; const char *m7e7e4fba[] = { "/468_60_", NULL }; const char *m7e7f74d0[] = { "vjzqadxswfb.bid^", NULL }; @@ -25533,7 +25558,6 @@ const char *m7efedce8[] = { "evernote.com^", "^google-analytics-util.js", NULL } const char *m7f000a92[] = { "puogotzrsvtg.com^", NULL }; const char *m7f01383a[] = { "qip.ru^", NULL }; const char *m7f018105[] = { "boyfriendtv.com^", "^paysite^", NULL }; -const char *m7f01db4 [] = { "naturalnewsblogs.com^", "^SBA-", NULL }; const char *m7f0392c4[] = { "requiredcollectfilm.info^", NULL }; const char *m7f0402be[] = { "anti-adblock-scripts.googlecode.com/files/adscript.js", NULL }; const char *m7f0542ce[] = { "/mediateGA.js", NULL }; @@ -26039,6 +26063,7 @@ const char *m81505532[] = { "zyiis.net^", NULL }; const char *m81505907[] = { "glfnjyzix.bid^", NULL }; const char *m815396e9[] = { "verata.xyz^", NULL }; const char *m8154de30[] = { "/zero.gif?", "&uid=", NULL }; +const char *m81574bb [] = { "toros.co/collect.php", NULL }; const char *m8157da2f[] = { "adtegrity.net^", NULL }; const char *m8158ef7b[] = { "freestar.io^", NULL }; const char *m815978f2[] = { "eoredi.com^", NULL }; @@ -26321,6 +26346,7 @@ const char *m829fb71e[] = { "/adsense250.", NULL }; const char *m82a0a9f [] = { "dcs.maxthon.com^", NULL }; const char *m82a0c78c[] = { "buyflood.com^", NULL }; const char *m82a442ba[] = { "selfip.org/counter/", NULL }; +const char *m82a4e124[] = { "etrabandidlo.club^", NULL }; const char *m82a5adf8[] = { "moggattice.com^", NULL }; const char *m82a6764c[] = { "ugvdjzysvfivy.com^", NULL }; const char *m82a7d6fb[] = { "=webad2&", NULL }; @@ -26365,6 +26391,7 @@ const char *m82d18485[] = { "brasileirinhas.com.br/banners/", NULL }; const char *m82d23ddf[] = { "cursecdn.com/banner/", NULL }; const char *m82d35cfc[] = { "/sstat_plugin.js", NULL }; const char *m82d3b4f6[] = { "adrta.com^", NULL }; +const char *m82d5a86a[] = { "bananamovies.net/sw.js", NULL }; const char *m82d70e8a[] = { "aaa.dv0.info^", NULL }; const char *m82d7abf5[] = { "/ad-issue.", NULL }; const char *m82d7c7eb[] = { "/impression.js?", NULL }; @@ -26419,6 +26446,7 @@ const char *m8313220a[] = { "scriptall.cf^", NULL }; const char *m83139f7c[] = { "zel-zel-fie.com^", NULL }; const char *m8313a889[] = { "cellstores.com/tracking/", NULL }; const char *m83142c01[] = { "novinite.com/tz.php", NULL }; +const char *m83159902[] = { "gai-saighooho.info^", NULL }; const char *m83185011[] = { "/adsvariables.", NULL }; const char *m831a091f[] = { "gizmodo.in/gzdics/", NULL }; const char *m831b492d[] = { "easyretiredmillionaire.com/img/aff-img/", NULL }; @@ -26658,7 +26686,6 @@ const char *m841f4fa4[] = { "trkrdel.com^", NULL }; const char *m8420a3e4[] = { "/ads-restrictions.", NULL }; const char *m842252c8[] = { "linktausch-pagerank.de^", NULL }; const char *m84230b69[] = { "lvrvufurxhgp.com^", NULL }; -const char *m842347d6[] = { "reshet.tv//third-party/dfp/dfp", NULL }; const char *m8423f322[] = { ".pj?adv=", NULL }; const char *m84243aa6[] = { "pastebin.com/ablock/", NULL }; const char *m84249853[] = { "apmex.com/resources/ads/", NULL }; @@ -27273,6 +27300,7 @@ const char *m86f872e [] = { "citizen-usa.com/images/banners/", NULL }; const char *m86f93462[] = { "ockorrytznnq.bid^", NULL }; const char *m86fb03a0[] = { "hxqetblh.com^", NULL }; const char *m86fb502d[] = { "/ads/square3.", NULL }; +const char *m86fba35b[] = { "tracking.customerly.io^", NULL }; const char *m86fbb6b6[] = { "openx.net^", NULL }; const char *m86fe60db[] = { "tnlfupvrlr.com^", NULL }; const char *m8700d2a8[] = { "sptag1.com^", NULL }; @@ -28342,6 +28370,7 @@ const char *m8bb1f7ac[] = { "rylnirfbokjd.com^", NULL }; const char *m8bb245ed[] = { "partners.vouchedfor.co.uk^", NULL }; const char *m8bb28d51[] = { "thqwivyhdpoem.com^", NULL }; const char *m8bb6d43 [] = { "zoozle.org/if.php?q=", NULL }; +const char *m8bbac24e[] = { "/aimatch_ad_", NULL }; const char *m8bbacfeb[] = { "tracedesire.com^", NULL }; const char *m8bbc3322[] = { "/images/adv.", NULL }; const char *m8bbd09bf[] = { "/clicktale-", NULL }; @@ -28374,6 +28403,7 @@ const char *m8bd9d303[] = { "ypixrvxi.com^", NULL }; const char *m8bda5df1[] = { "sponsoredtweets.com^", NULL }; const char *m8bdb87df[] = { "/buddyw_ad.", NULL }; const char *m8bdc7d7c[] = { "/ad.skin.", NULL }; +const char *m8bdcb0c4[] = { "/trace-Update.php?", NULL }; const char *m8bde20fd[] = { "glnqvqbedbmvtcdzcokrfczopbddhopygrvrnlgmalgvhnsfsc.com^", NULL }; const char *m8bde606e[] = { "hdliveextra-a.akamaihd.net/HD/scripts/", "/config/ads.js", NULL }; const char *m8bdf9b9f[] = { "assoc-amazon.co.uk^", NULL }; @@ -28487,6 +28517,7 @@ const char *m8c58720 [] = { "megafiletube.xyz/js/adblock.js", NULL }; const char *m8c59ab65[] = { "pezrphjl.com^", NULL }; const char *m8c5e072c[] = { "mollnia.com^", NULL }; const char *m8c5e3d5c[] = { "hulu.com/guid.swf", NULL }; +const char *m8c5f5c0c[] = { "cbsstatic.com^", NULL }; const char *m8c5f682f[] = { "counter.hyipexplorer.com^", NULL }; const char *m8c601017[] = { "/site-tracker-", NULL }; const char *m8c608966[] = { "tools-euads.flugubluc.com/dtct.js?ads=true", NULL }; @@ -29478,6 +29509,7 @@ const char *m90b4d92 [] = { "acura.ca/_Global/js/includes/tracker.js", NULL }; const char *m90b517f9[] = { "/bottomad/", NULL }; const char *m90b59bcc[] = { "events.jotform.com^", NULL }; const char *m90b88f45[] = { "zualhpolssus.com^", NULL }; +const char *m90b999db[] = { "mn1nm.com^", NULL }; const char *m90bc6686[] = { "-intern-ads/", NULL }; const char *m90bce448[] = { "pntrs.com/i/", NULL }; const char *m90bd17d7[] = { "/advertphp/", NULL }; @@ -30001,7 +30033,6 @@ const char *m92f36adf[] = { "counter-kostenlos.net^", NULL }; const char *m92f78683[] = { "turbotrafficsystem.com^", "^banners^", NULL }; const char *m92f86f64[] = { "_nedstat.js", NULL }; const char *m92f9cff2[] = { "/floatads.", NULL }; -const char *m92f9da5c[] = { "9anime.is/scripts/", NULL }; const char *m92faa46a[] = { "yzreywobobmw.com^", NULL }; const char *m92fb2c3f[] = { "ydaynvgmkjxvy.com^", NULL }; const char *m92fbbbdf[] = { "/inv/ads/", NULL }; @@ -30184,6 +30215,7 @@ const char *m93b9f453[] = { "trackmyusers.com^", NULL }; const char *m93bb3a48[] = { "blackshoppingchannel.com^", "^com_adagency^", NULL }; const char *m93bb6561[] = { "ad.infoseek.com^", NULL }; const char *m93bc3059[] = { "ep4p.com^", NULL }; +const char *m93be489 [] = { "installp.com^", NULL }; const char *m93be6a4 [] = { "the123movies.org^", ".png", NULL }; const char *m93bf1120[] = { "_120_600.", NULL }; const char *m93bf2fca[] = { "pppjxzcu.bid^", NULL }; @@ -32813,7 +32845,6 @@ const char *m9f912405[] = { "gallup.wn.com/1x1.gif", NULL }; const char *m9f937663[] = { "djxvususwvso.com^", NULL }; const char *m9f9379e9[] = { "/NNAnalytics/", NULL }; const char *m9f93eec0[] = { "6angebot.ch^", NULL }; -const char *m9f955494[] = { "imagefap.com/jscripts/thumbnail_change.js", NULL }; const char *m9f955cf6[] = { "/adserv3.", NULL }; const char *m9f95dc69[] = { "/Ad/Index?", NULL }; const char *m9f9614d1[] = { "tbex.ru^", NULL }; @@ -33226,7 +33257,6 @@ const char *ma14cf893[] = { "statsrv.451.com^", NULL }; const char *ma14ddd9e[] = { "691123f5be2a669b.com^", NULL }; const char *ma14e8b10[] = { "urlcash.net/random", ".php", NULL }; const char *ma14ebe0d[] = { "yecviqwkapujp.bid^", NULL }; -const char *ma14f3bb2[] = { "imagefap.com/forum/styles/", NULL }; const char *ma14f4efb[] = { "hohfiknuk.com^", NULL }; const char *ma1518e95[] = { "ads.elcarado.com^", NULL }; const char *ma151cd51[] = { "-layer-ad.", NULL }; @@ -33847,7 +33877,6 @@ const char *ma3ed8f64[] = { "clkstat.qihoo.com^", NULL }; const char *ma3ef6274[] = { "pbsrc.com/sponsor/", NULL }; const char *ma3f09e16[] = { "metrics.apartments.com^", NULL }; const char *ma3f24bcb[] = { "mintake.com^", NULL }; -const char *ma3f37971[] = { "imagefap.com/jscripts/gallery.js", NULL }; const char *ma3f43f63[] = { "fdnxojzwbmie.bid^", NULL }; const char *ma3f4eb9e[] = { "/new_ads/", NULL }; const char *ma3f502a1[] = { "phncdn.com/js/translator/", NULL }; @@ -35352,6 +35381,7 @@ const char *maa7aa2da[] = { "ads.desmoinesregister.com^", NULL }; const char *maa7e7d71[] = { "/aff_banner/", NULL }; const char *maa7ea6b5[] = { "/FoxBlueKaiPlugIn.", NULL }; const char *maa7f5f94[] = { "fbgdc.com^", NULL }; +const char *maa805841[] = { "/ad-scroll.", NULL }; const char *maa82630e[] = { "versahq.com^", NULL }; const char *maa834b20[] = { "yvbrgzeu.com^", NULL }; const char *maa848d0e[] = { "justporno.tv/ad/", NULL }; @@ -35440,6 +35470,7 @@ const char *maadde56 [] = { "/affiliate-tracker.", NULL }; const char *maade70e4[] = { "/accesstracking/", NULL }; const char *maadffb9b[] = { "/adv/banner/", NULL }; const char *maae234e [] = { "anghamiwebcdn.akamaized.net/ads.", NULL }; +const char *maae25b5e[] = { "jumplead.com^", NULL }; const char *maae2da84[] = { "legalbusinessonline.com/popup/albpartners.aspx", NULL }; const char *maae49e9a[] = { "meta.streamcloud.eu/serve.php?adzone=ipc", NULL }; const char *maae6039a[] = { "ambqphwf.com^", NULL }; @@ -35647,7 +35678,6 @@ const char *mabb7b301[] = { "sfimg.com/SFIBanners/", NULL }; const char *mabb7e67f[] = { "vip-vip-vup.com^", NULL }; const char *mabb8cfe8[] = { "submarinecablemap.com^", "-sponsored.png", NULL }; const char *mabba752b[] = { "adnxs1.com^", NULL }; -const char *mabbc32b4[] = { "imagefap.com/jscripts/imagesloaded.min.js", NULL }; const char *mabbcf72e[] = { "rya.rockyou.com^", NULL }; const char *mabbeb825[] = { "frcznmfu.com^", NULL }; const char *mabc25c60[] = { "/click_stat/", NULL }; @@ -35671,7 +35701,6 @@ const char *mabd430c7[] = { "actiris.be^", "^urchin.js", NULL }; const char *mabd58d4c[] = { "/ads/adp4.", NULL }; const char *mabd94d8c[] = { "/hittrack.cgi?", NULL }; const char *mabda05f1[] = { "chauksoa.net^", NULL }; -const char *mabdb1d9d[] = { "/exo_na/", NULL }; const char *mabdbc94 [] = { "stellaservice.com^", NULL }; const char *mabdc9807[] = { "hosted.x-art.com/potd", NULL }; const char *mabde537 [] = { "hvckvfistbejp.com^", NULL }; @@ -37193,6 +37222,7 @@ const char *mb23115ae[] = { "cloudfront.net^", "^pubads_", NULL }; const char *mb232f470[] = { "contentspread.net^", NULL }; const char *mb2340ce4[] = { "/pv/new?", NULL }; const char *mb236d35f[] = { "sojern.com^", NULL }; +const char *mb2381b39[] = { "kantartns.lt^", NULL }; const char *mb23868e1[] = { "terra.com.mx^", "^metrics_end.js", NULL }; const char *mb23c4ccc[] = { "32b92bc03f19.com^", NULL }; const char *mb23c6b23[] = { "jame-world.com^", "^adv^", NULL }; @@ -39230,6 +39260,7 @@ const char *mbb30e720[] = { "sparechange.io^", NULL }; const char *mbb31ced2[] = { "clgyhwaoh.com^", NULL }; const char *mbb332dbe[] = { "fdfpnrhlckbmiz.bid^", NULL }; const char *mbb3436c9[] = { "kjnkmidieyrb.com^", NULL }; +const char *mbb350db2[] = { "/pagestat/", NULL }; const char *mbb353916[] = { "divertura.com^", NULL }; const char *mbb37a5f9[] = { "torrentz.eu/p/", NULL }; const char *mbb37cf6 [] = { "ygdnflmhslwi.com^", NULL }; @@ -41619,7 +41650,6 @@ const char *mc5b43bd1[] = { "fueldeck.com^", NULL }; const char *mc5b4fe45[] = { "rotci.com/images/rotcibanner.png", NULL }; const char *mc5b57670[] = { "://adclear.", "/acc?", NULL }; const char *mc5b68423[] = { "tinglog.baidu.com^", NULL }; -const char *mc5b6842d[] = { "imagefap.com/combine.php?", NULL }; const char *mc5b781fd[] = { "macblurayplayer.com/image/amazon-", NULL }; const char *mc5b8623c[] = { "50websads.com^", NULL }; const char *mc5b8cc61[] = { "/quantcast.js", NULL }; @@ -42034,6 +42064,7 @@ const char *mc7674211[] = { "phoronix.com^", NULL }; const char *mc767f9ae[] = { "/ad-hug.", NULL }; const char *mc7684298[] = { "wuldvrdfie.com^", NULL }; const char *mc76a13bc[] = { "shthbopqoz.bid^", NULL }; +const char *mc76b31e5[] = { "/getViewBeans.action?", NULL }; const char *mc76b6e99[] = { "tv4chan.com/iframes/", NULL }; const char *mc76c90c [] = { "/defaultad.", NULL }; const char *mc76cb481[] = { "sp.newsleader.com^", NULL }; @@ -42580,6 +42611,7 @@ const char *mc9d634dd[] = { "tap.idg.de^", NULL }; const char *mc9d65fe9[] = { "metrics.washingtonpost.com^", NULL }; const char *mc9d9bf83[] = { "porngames.adult^", "^", NULL }; const char *mc9dabb0a[] = { "-ga-track.", NULL }; +const char *mc9dabe34[] = { "9anime.", "^", NULL }; const char *mc9dae2e [] = { "/layer_log.php?p=", NULL }; const char *mc9db4b1a[] = { "/vision/ads/", NULL }; const char *mc9dbf4eb[] = { "rdlynbosndvx.com^", NULL }; @@ -42601,6 +42633,7 @@ const char *mc9e831e4[] = { "/promotools.", NULL }; const char *mc9e9d557[] = { "ads.guardianunlimited.co.uk^", NULL }; const char *mc9eaa5f0[] = { "ucikujit.bid^", NULL }; const char *mc9ec52dd[] = { "stats.rcsobjects.it^", NULL }; +const char *mc9ed1590[] = { "ts.delfi.", NULL }; const char *mc9eda40b[] = { "exjthrzliajfd.com^", NULL }; const char *mc9ef156d[] = { "snacktools.net/bannersnack/", NULL }; const char *mc9ef1efd[] = { "jubimax.com/banner_images/", NULL }; @@ -43056,6 +43089,7 @@ const char *mcbe2d3bf[] = { "tracking.batanga.com^", NULL }; const char *mcbe4dd6a[] = { "staticswind.club^", NULL }; const char *mcbe55bc3[] = { "wealth-at-home-millions.com^", NULL }; const char *mcbe58398[] = { "km-sea.net^", NULL }; +const char *mcbe615c7[] = { "rarbgaccess.org^", NULL }; const char *mcbe77012[] = { "hotcoursesabroad.com/widget-", NULL }; const char *mcbe7f2f3[] = { "/localAd/", NULL }; const char *mcbec52e9[] = { "pnoss.com^", NULL }; @@ -44709,6 +44743,7 @@ const char *md2f50563[] = { "swzyfkbkdv.bid^", NULL }; const char *md2f59279[] = { "livehindustan.com/js/BlockerScript.js", NULL }; const char *md2f5a0f [] = { "t1.oload.tv^", NULL }; const char *md2f7cb4 [] = { "/tagmgmt/bootstrap.", NULL }; +const char *md2f84ec5[] = { "4ukqzi8d7l.com^", NULL }; const char *md2f8f1d6[] = { "afclickoffers.com^", NULL }; const char *md2f9017b[] = { "/ad_728.", NULL }; const char *md2f9ddd0[] = { "/javascript/ads.", NULL }; @@ -44746,6 +44781,7 @@ const char *md31ae515[] = { "txmblr.com^", "^pixel^", NULL }; const char *md31b27d3[] = { "traffiq.com^", NULL }; const char *md31e1d73[] = { "/ad_styling_", NULL }; const char *md31e8188[] = { "/advertpro/", NULL }; +const char *md31f0527[] = { "/mpulse.js", NULL }; const char *md31f6519[] = { "themittani.com/sites/", "-skin", NULL }; const char *md32357e0[] = { "newsgate.pw^", NULL }; const char *md32561a4[] = { "bbj.hu^", "^smartdreamers", NULL }; @@ -45178,6 +45214,7 @@ const char *md5232177[] = { "joka.it/inquiero/isapi/csf.dll?", NULL }; const char *md524bf79[] = { "?goto=ad", NULL }; const char *md524f1b2[] = { "1f76e29aaec7bfff53e.com^", NULL }; const char *md52ab6fd[] = { "yxjecoghjycuvm.com^", NULL }; +const char *md52ce89d[] = { "shrinkearn.com/sw.js", NULL }; const char *md52d2aa4[] = { "keremerkan.net/wp-content/plugins/wp-minify/min/", "/google-analyticator/", NULL }; const char *md52dbc73[] = { "wuuyczqcgm.com^", NULL }; const char *md52e3937[] = { "alpsat.com/banner/", NULL }; @@ -45688,7 +45725,6 @@ const char *md759a144[] = { "aolcdn.com/omniunih.js", NULL }; const char *md75a587f[] = { "/728x90b/", NULL }; const char *md75b6f03[] = { "affiliates.picaboocorp.com^", NULL }; const char *md75bee02[] = { "ngacm.com^", NULL }; -const char *md75d5826[] = { "imagefap.com/jscripts/masonry.min.js", NULL }; const char *md75de8f0[] = { "/ads160x600-", NULL }; const char *md75f63c1[] = { "adca.st^", NULL }; const char *md7605d12[] = { "genieessp.jp^", NULL }; @@ -45872,6 +45908,7 @@ const char *md82cea99[] = { "/ad/afc_", NULL }; const char *md82dd1d2[] = { "/jsVideoPopAd.", NULL }; const char *md83053c4[] = { "wikinvest.com^", "^errorlogger.php^", NULL }; const char *md831d4f4[] = { "/analytics/eventTrack", NULL }; +const char *md833b81a[] = { "smallseotools.com/asets/js/adframe.js", NULL }; const char *md83523b6[] = { "liktirov.com^", NULL }; const char *md83535ce[] = { "/aux/collect?", NULL }; const char *md837e103[] = { "sfstatic.com^", "^js^fl.js", NULL }; @@ -45959,6 +45996,7 @@ const char *md88b09e6[] = { "csgocpu.com^", NULL }; const char *md88ba18 [] = { "/customad.", NULL }; const char *md88ba42d[] = { "fajsbncwlaws.com^", NULL }; const char *md88c229d[] = { "orts.wixawin.com^", NULL }; +const char *md88c7b3 [] = { "/traces.php?", NULL }; const char *md88ce4e8[] = { "e7e776c1a8bf677.com^", NULL }; const char *md88d10d5[] = { "imagerise.com/ir2.js", NULL }; const char *md88d558d[] = { "/cmarketing.countus.js", NULL }; @@ -47248,6 +47286,7 @@ const char *mddf948e8[] = { "/ilivid-ad-", NULL }; const char *mddfafb68[] = { "hypercomments.com/widget/", "/analytics.html", NULL }; const char *mddffddca[] = { "wienerzeitung.at/__webtrends/", NULL }; const char *mde00f517[] = { "bundesliga.com^", "^_partner^", NULL }; +const char *mde024c8 [] = { "dnevnik.si/tracker/", NULL }; const char *mde03cc7e[] = { "/logo-ads.", NULL }; const char *mde048505[] = { "rackspacecloud.com/Broker%20Buttons/", NULL }; const char *mde058b3b[] = { "tds.21pron.com^", NULL }; @@ -47406,6 +47445,7 @@ const char *mdea0931a[] = { "stats.g.doubleclick.net/dc.js", NULL }; const char *mdea0ab21[] = { "/adbridg.", NULL }; const char *mdea1f9cc[] = { "victorance.com^", NULL }; const char *mdea49732[] = { "ypmdszuxupnxk.bid^", NULL }; +const char *mdea61539[] = { "trick17.it^", NULL }; const char *mdea6cb50[] = { "complaintsboard.com/img/banner-", NULL }; const char *mdea6fb72[] = { "/adtech_", NULL }; const char *mdea7619f[] = { "adnigma.com/TemplateRun/js/DialogTag.js", NULL }; @@ -48033,6 +48073,7 @@ const char *me15665c3[] = { "icxm.net/x/img/kinguin.jpg", NULL }; const char *me156b479[] = { "saice.org.za/uploads/banners/", NULL }; const char *me156bb6b[] = { "tcwcsaddht.com^", NULL }; const char *me156ff4a[] = { "caledonianrecord.com/SiteImages/HomePageTiles/", NULL }; +const char *me158c4a9[] = { "/track_click?", NULL }; const char *me1596468[] = { ".com/adv3/", NULL }; const char *me15b7c31[] = { "/HompageStickyAd.", NULL }; const char *me15b9785[] = { "extszm.web.de^", NULL }; @@ -48463,6 +48504,7 @@ const char *me33e8acd[] = { "ewebcounter.com^", NULL }; const char *me33ef574[] = { "crcom.livejasmin.com^", NULL }; const char *me340d08e[] = { "/pixel.jsp?", NULL }; const char *me3424027[] = { "smart-ip.net^", NULL }; +const char *me3442351[] = { "lunaticfiles.com/ads.js", NULL }; const char *me3446792[] = { "relmaxtop.com^", NULL }; const char *me344eb54[] = { "pixel-a.basis.net^", NULL }; const char *me34662bb[] = { "fgcterkdpns.com^", NULL }; @@ -49421,6 +49463,7 @@ const char *me79a0ac0[] = { "tqn.com/px/?", NULL }; const char *me79aab26[] = { "/adswrapper3.", NULL }; const char *me79b128b[] = { "tracker.revip.info^", NULL }; const char *me79cfc30[] = { "tinyupload.com^", "^ct_adkontekst.js", NULL }; +const char *me79ea4ab[] = { "moneymakercdn.com^", NULL }; const char *me79f1e17[] = { "fmstigat.online^", NULL }; const char *me7a1a7d [] = { "bdtwxreri.com^", NULL }; const char *me7a29e9d[] = { "beacon-1.newrelic.com^", NULL }; @@ -50613,6 +50656,7 @@ const char *meccb4d36[] = { "busterzaster.de^", NULL }; const char *mecce243 [] = { "marketing.hearstmagazines.nl^", NULL }; const char *mecce7f37[] = { "/ad?pos_", NULL }; const char *meccf230 [] = { "4fuckr.com^", "^adframe.js", NULL }; +const char *mecd1895c[] = { "bstatic.com^", NULL }; const char *mecd2846f[] = { "tvguide.co.uk/images/skyskinus.", NULL }; const char *mecd8828e[] = { "img.mediaplex.com^", "_afl_bettingpage_", NULL }; const char *mecdccd2b[] = { "/interad.", NULL }; @@ -50753,6 +50797,7 @@ const char *med64b98d[] = { "_420x80_", NULL }; const char *med65864d[] = { "shroomery.org/bnr/", NULL }; const char *med67637a[] = { "maxmind.com/js/device.js", NULL }; const char *med68a2fb[] = { "ikrvzjdds.bid^", NULL }; +const char *med692eb [] = { "jumplead.io^", NULL }; const char *med6a64d7[] = { "uploadrocket.net/ads.js", NULL }; const char *med6c3a9c[] = { "/adstop728.", NULL }; const char *med6d4494[] = { "/counter.visit?", NULL }; @@ -50894,6 +50939,7 @@ const char *medf71f3 [] = { "uzotarak.com^", NULL }; const char *medf88858[] = { "yaujmwnwurdhm.com^", NULL }; const char *medf8a953[] = { "/includes/ads_", NULL }; const char *medf8f232[] = { "jf2mn2ms.club^", NULL }; +const char *medfb4576[] = { "heg-cp.com/upm/", NULL }; const char *medfb9a60[] = { "eehdssnxola.com^", NULL }; const char *medfc36cf[] = { "oe-static.de^", "^wws.js", NULL }; const char *medfccb4f[] = { "/youtube-track-event_", NULL }; @@ -50930,6 +50976,7 @@ const char *mee16612 [] = { "/system/ad/", NULL }; const char *mee177ed [] = { "_960_90.", NULL }; const char *mee18481a[] = { "track2.me^", NULL }; const char *mee18808d[] = { "tracking.cmjump.com.au^", NULL }; +const char *mee18cfe8[] = { "/gourmetads-", NULL }; const char *mee19c7ea[] = { "deliver.ifeng.com^", NULL }; const char *mee1a2633[] = { "scriptall.ga^", NULL }; const char *mee1a4c23[] = { "okcupid.com/poststat?", NULL }; @@ -51262,6 +51309,7 @@ const char *mef9be11e[] = { "?img_adv=", NULL }; const char *mef9c4640[] = { "mtnysmosgmp.bid^", NULL }; const char *mef9f143d[] = { "qqbyfhlctzty.com^", NULL }; const char *mef9fce57[] = { "getprice.com.au/images/", NULL }; +const char *mefa09fb7[] = { "automobile.it/fb/", NULL }; const char *mefa1098e[] = { "e0mn.com^", NULL }; const char *mefa2a739[] = { "hawaiireporter.com^", "^upandruningy.jpg", NULL }; const char *mefa3435e[] = { "softwarepiset.com^", NULL }; @@ -51734,6 +51782,7 @@ const char *mf1cc00a2[] = { "/lib/tracking/", NULL }; const char *mf1cc9420[] = { "countante.info^", NULL }; const char *mf1cc99fd[] = { "a2dfp.net^", NULL }; const char *mf1cc9f53[] = { "scoffopedia.com/images/banner", NULL }; +const char *mf1cdf7ee[] = { "keqi7dh3df.com^", NULL }; const char *mf1d28f70[] = { "/logcounter.", NULL }; const char *mf1d4d38a[] = { "kwgpddeduvje.com^", NULL }; const char *mf1d6d74 [] = { "-monero-miner.", NULL }; @@ -53560,6 +53609,7 @@ const char *mf99286de[] = { "/pb.min.", NULL }; const char *mf994ae9d[] = { "/ad-audit.", NULL }; const char *mf994c8e1[] = { "stad.com/googlefoot2.php?", NULL }; const char *mf996784c[] = { "people.cn/js/pa.js", NULL }; +const char *mf9986a88[] = { "codefund.app^", NULL }; const char *mf99a6b09[] = { "track.gridlockparadise.com^", NULL }; const char *mf99d002 [] = { "s.fsphp.t-online.de^", NULL }; const char *mf9a0fca8[] = { "bidorbuy.co.za/jsp/tradesearch/TradeFeedPreview.jsp?", NULL }; @@ -53612,6 +53662,7 @@ const char *mf9ddda87[] = { "alltagcloud.info^", NULL }; const char *mf9df3247[] = { "igdfzixkdzxe.com^", NULL }; const char *mf9dfabea[] = { "enecto.com^", NULL }; const char *mf9e02084[] = { "_400x68.", NULL }; +const char *mf9e13f5a[] = { "naturalnewsblogs.com^", "^xml^", NULL }; const char *mf9e14481[] = { "bewhoyouare.gq^", NULL }; const char *mf9e1ed0c[] = { "zubehost.com/", "?zoneid=", NULL }; const char *mf9e21f7e[] = { "lokalisten.de/tracking.gif", NULL }; @@ -53688,6 +53739,7 @@ const char *mfa3540b9[] = { "gubagoo.com/modules/tracking/", NULL }; const char *mfa3592eb[] = { "epmads.com/js/show_ads_epmads.js", NULL }; const char *mfa35ef20[] = { "metrics.dailymotion.com^", NULL }; const char *mfa371966[] = { "-advert2.", NULL }; +const char *mfa3809e7[] = { "log.seekda.com^", NULL }; const char *mfa387b2a[] = { "leche69.com^", NULL }; const char *mfa388e4f[] = { "imgflare.com/exo.html", NULL }; const char *mfa3b9ede[] = { "ipornia.com/", "=", "&", NULL }; @@ -54810,6 +54862,7 @@ const char *mff0a32cc[] = { "mlg-ad-ops.s3.amazonaws.com^", NULL }; const char *mff0aeab8[] = { "thegatewaypundit.com/wp-content/uploads/submit_tip.png", NULL }; const char *mff0b284d[] = { "da3uf5ucdz00u.cloudfront.net^", NULL }; const char *mff0f954a[] = { "mbl.is/mm/augl/", NULL }; +const char *mff1080de[] = { "qkpcihpo16.com^", NULL }; const char *mff10c3ce[] = { "hurterkranach.net^", NULL }; const char *mff119472[] = { "/ad_supertile/", NULL }; const char *mff11b155[] = { "thebrighttag.com^", NULL }; @@ -55094,7 +55147,6 @@ const char *d1b2f77fc[] = { "justrunlah.com", NULL }; const char *d1b8f248e[] = { "radioforge.com", NULL }; const char *d1bd955a5[] = { "deccanchronicle.com", NULL }; const char *d1bfe29af[] = { "eloan.co.il", NULL }; -const char *d1c26a419[] = { "123movies.com", "123unblock.xyz", "1337x.to", "1movies.is", "activistpost.com", "adsrt.com", "ancient-origins.net", "c123movies.com", "clicknupload.org", "couchtuner.onl", "couchtuner.rocks", "daclips.in", "datpiff.com", "downloadpirate.com", "dwatchseries.to", "estream.nu", "estream.to", "estream.xyz", "eztv.ag", "eztv.io", "eztv.tf", "eztv.yt", "fmovies.se", "fmovies.taxi", "fmovies.to", "fmovies.today", "fmovies.world", "fullmatchesandshows.com", "gifsis.com", "gomovies.sc", "gorillavid.in", "gostreams.net", "hdmoza.com", "hdonline.is", "healthline.com", "intoupload.net", "kickass2.ch", "kickass2.st", "kimcartoon.to", "limetorrents.info", "masterkreatif.com", "megaup.net", "monova.org", "monova.to", "movies.is", "movies123.xyz", "moviescouch.co", "moviewatcher.is", "movpod.in", "mrunlock.icu", "newser.com", "nocensor.pro", "nowvideo.sx", "nowwatchtvlive.ws", "onhax.me", "pirateiro.com", "postimg.cc", "prox4you.pw", "seedpeer.me", "sendit.cloud", "skidrowcrack.com", "solarmovie.one", "solarmoviez.ru", "swatchseries.to", "thegatewaypundit.com", "thewatchseries.ac", "tinypic.com", "torlock.com", "torrentdownload.ch", "torrentdownloads.me", "torrentfunk.com", "torrentfunk2.com", "torrentz2.eu", "tubidy.io", "uiz.io", "unblckd.org", "unblockall.org", "unblocked.app", "unblocked.lol", "unblocked.si", "unlockproject.icu", "uptobox.com", "userscloud.com", "vidbull.tv", "watchcartoononline.io", "watchseries.sk", "watchsomuch.info", "x1337x.se", "yesmovies.to", "yify-movies.net", "yify.bz", "yifyddl.com", "yifytorrent.co", "ymovies.tv", "yourbittorrent2.com", "yts.am", "zippyshare.com", NULL }; const char *d1c7df652[] = { "autodealer.co.za", NULL }; const char *d1c99a9d9[] = { "globalvoices.org", NULL }; const char *d1c99bff7[] = { "argos.co.uk", "newscientist.com", "upwork.com", NULL }; @@ -55332,7 +55384,6 @@ const char *d3afa8d69[] = { "rightwingtribune.com", "thelibertarianrepublic.com" const char *d3b1a4efb[] = { "boxoffice.com", NULL }; const char *d3b4c0d7e[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allthingsvegas.com", "askmefast.com", "auntyacid.com", "breaking911.com", "breathecast.com", "bulletsfirst.net", "clashdaily.com", "classicalite.com", "comicallyincorrect.com", "conservativebyte.com", "conservativevideos.com", "coviral.com", "creepybasement.com", "crossmap.com", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "digitaljournal.com", "eaglerising.com", "enstarz.com", "foreverymom.com", "freedomforce.com", "girlsjustwannahaveguns.com", "glitch.news", "greatamericanrepublic.com", "groopspeak.com", "guardianlv.com", "gymflow100.com", "hallels.com", "hngn.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "joeforamerica.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "libertyalliance.com", "libertyunyielding.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "naturalblaze.com", "naturalnews.com", "natureworldnews.com", "newser.com", "newsthump.com", "oddee.com", "patriotoutdoornews.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "shark-tank.com", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "themattwalshblog.com", "thepoke.co.uk", "traileraddict.com", "truththeory.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "viralnova.com", "viralthread.com", "xtribune.com", NULL }; const char *d3bf08cb9[] = { "betabeat.com", "couriermail.com.au", "financialpost.com", "wcpo.com", NULL }; -const char *d3c2e11c2[] = { "rarbg.to", "rarbgmirror.com", "rarbgproxy.org", "rarbgprx.org", NULL }; const char *d3c8a5d06[] = { "loot.com", NULL }; const char *d3ceb3c36[] = { "search.yahoo.com", NULL }; const char *d3d0cf98 [] = { "teamxbox.com", NULL }; @@ -55362,7 +55413,6 @@ const char *d40e4be15[] = { "daum.net", NULL }; const char *d40ead33f[] = { "astalavista.com", NULL }; const char *d40fe038c[] = { "mavrixonline.com", NULL }; const char *d4174448c[] = { "eatthis.com", "karnaval.com", "livestream.com", "luxuryrealestate.com", NULL }; -const char *d419c2c94[] = { "imagefap.com", NULL }; const char *d41aebb97[] = { "nme.com", "trustedreviews.com", NULL }; const char *d41b1888 [] = { "anitube.info", "anitube.pro", NULL }; const char *d41d1cca0[] = { "pornsocket.com", NULL }; @@ -55372,6 +55422,7 @@ const char *d4232c669[] = { "powvideo.net", NULL }; const char *d42669884[] = { "microsoft.com", NULL }; const char *d42679337[] = { "marstv.pw", NULL }; const char *d42cbe396[] = { "kapaza.be", NULL }; +const char *d42e73f91[] = { "ekathimerini.com", "hikersbay.com", "stl.news", "traveller24.com", NULL }; const char *d433b238a[] = { "xhamster.com", NULL }; const char *d433d1a8d[] = { "timesofindia.indiatimes.com", NULL }; const char *d4341ab02[] = { "750g.com", "alibabuy.com", "allocine.fr", "cap-cine.fr", "chartsinfrance.net", "cotecine.fr", "easyvols.fr", "easyvoyage.com", "get-the-look.fr", "jeuxactu.com", "jeuxvideo.com", "lestream.fr", "millenium.org", "musiquemag.com", "ouest-france.fr", "ozap.com", "purebreak.com", "purepeople.com", "puretrend.com", "shopoon.fr", "terrafemina.com", NULL }; @@ -55401,9 +55452,7 @@ const char *d463fcc5b[] = { "zone-anime.net", NULL }; const char *d46990e68[] = { "comunio.de", NULL }; const char *d46c5271c[] = { "www.google.com", NULL }; const char *d46d34540[] = { "rsaconference.com", NULL }; -const char *d47565321[] = { "namethatporn.com", NULL }; const char *d476273c5[] = { "ubuntugeek.com", NULL }; -const char *d47a111c1[] = { "audiotag.info", NULL }; const char *d47b82a0d[] = { "cnsm.com.br", NULL }; const char *d47e2640d[] = { "mozilla.org", NULL }; const char *d47f84e8d[] = { "smallseotools.com", NULL }; @@ -55558,6 +55607,7 @@ const char *d5f5823c6[] = { "wigflip.com", NULL }; const char *d5fa48da1[] = { "sedo.com", "sedo.de", NULL }; const char *d5fac5177[] = { "wwe.com", NULL }; const char *d5fcb6ccc[] = { "boostedboards.com", "elgato.com", "fallout4.com", "metronews.ca", "mtv.com.lb", "runningheroes.com", "teslamotors.com", NULL }; +const char *d604d11a4[] = { "insurance-corporate.blogspot.com", NULL }; const char *d608a8997[] = { "zlshorte.net", NULL }; const char *d6094f98f[] = { "entrobet.com", NULL }; const char *d6095a4c0[] = { "cntraveller.com", NULL }; @@ -55624,6 +55674,7 @@ const char *d6a1b33b0[] = { "games.baltimoresun.com", "games.charlotteobserver.c const char *d6a462ea1[] = { "palimas.com", NULL }; const char *d6a4872d4[] = { "sergent-major.com", NULL }; const char *d6a50137b[] = { "pornhd.com", NULL }; +const char *d6a5c72f7[] = { "ally.shortens.co", NULL }; const char *d6ab5ffd1[] = { "wstream.video", NULL }; const char *d6ad377bf[] = { "espn.go.com", "espndeportes.com", "espnfc.co.uk", "espnfc.com", "espnfc.com.au", "espnfc.us", "espnfcasia.com", NULL }; const char *d6ad9789d[] = { "zerohedge.com", NULL }; @@ -55689,6 +55740,7 @@ const char *d74e80f7c[] = { "uploaduj.net", NULL }; const char *d750a77be[] = { "dailystar.co.uk", "express.co.uk", NULL }; const char *d751d148e[] = { "haxmaps.com", NULL }; const char *d7523a9dc[] = { "sc2casts.com", NULL }; +const char *d7533de91[] = { "ads.google.ac", "ads.google.ad", "ads.google.ae", "ads.google.al", "ads.google.am", "ads.google.as", "ads.google.at", "ads.google.az", "ads.google.ba", "ads.google.be", "ads.google.bf", "ads.google.bg", "ads.google.bi", "ads.google.bj", "ads.google.bs", "ads.google.bt", "ads.google.by", "ads.google.ca", "ads.google.cat", "ads.google.cd", "ads.google.cf", "ads.google.cg", "ads.google.ch", "ads.google.ci", "ads.google.cl", "ads.google.cm", "ads.google.co.ao", "ads.google.co.bw", "ads.google.co.ck", "ads.google.co.cr", "ads.google.co.id", "ads.google.co.il", "ads.google.co.in", "ads.google.co.jp", "ads.google.co.ke", "ads.google.co.kr", "ads.google.co.ls", "ads.google.co.ma", "ads.google.co.mz", "ads.google.co.nz", "ads.google.co.th", "ads.google.co.tz", "ads.google.co.ug", "ads.google.co.uk", "ads.google.co.uz", "ads.google.co.ve", "ads.google.co.vi", "ads.google.co.za", "ads.google.co.zm", "ads.google.co.zw", "ads.google.com", "ads.google.com.af", "ads.google.com.ag", "ads.google.com.ai", "ads.google.com.ar", "ads.google.com.au", "ads.google.com.bd", "ads.google.com.bh", "ads.google.com.bn", "ads.google.com.bo", "ads.google.com.br", "ads.google.com.by", "ads.google.com.bz", "ads.google.com.cn", "ads.google.com.co", "ads.google.com.cu", "ads.google.com.cy", "ads.google.com.do", "ads.google.com.ec", "ads.google.com.eg", "ads.google.com.et", "ads.google.com.fj", "ads.google.com.gh", "ads.google.com.gi", "ads.google.com.gt", "ads.google.com.hk", "ads.google.com.jm", "ads.google.com.jo", "ads.google.com.kh", "ads.google.com.kw", "ads.google.com.lb", "ads.google.com.ly", "ads.google.com.mm", "ads.google.com.mt", "ads.google.com.mx", "ads.google.com.my", "ads.google.com.na", "ads.google.com.ng", "ads.google.com.ni", "ads.google.com.np", "ads.google.com.om", "ads.google.com.pa", "ads.google.com.pe", "ads.google.com.pg", "ads.google.com.ph", "ads.google.com.pk", "ads.google.com.pr", "ads.google.com.py", "ads.google.com.qa", "ads.google.com.ru", "ads.google.com.sa", "ads.google.com.sb", "ads.google.com.sg", "ads.google.com.sl", "ads.google.com.sv", "ads.google.com.tj", "ads.google.com.tn", "ads.google.com.tr", "ads.google.com.tw", "ads.google.com.ua", "ads.google.com.uy", "ads.google.com.vc", "ads.google.com.ve", "ads.google.com.vn", "ads.google.cv", "ads.google.cz", "ads.google.de", "ads.google.dj", "ads.google.dk", "ads.google.dm", "ads.google.dz", "ads.google.ee", "ads.google.es", "ads.google.fi", "ads.google.fm", "ads.google.fr", "ads.google.ga", "ads.google.ge", "ads.google.gg", "ads.google.gl", "ads.google.gm", "ads.google.gp", "ads.google.gr", "ads.google.gy", "ads.google.hk", "ads.google.hn", "ads.google.hr", "ads.google.ht", "ads.google.hu", "ads.google.ie", "ads.google.im", "ads.google.iq", "ads.google.is", "ads.google.it", "ads.google.it.ao", "ads.google.je", "ads.google.jo", "ads.google.jp", "ads.google.kg", "ads.google.ki", "ads.google.kz", "ads.google.la", "ads.google.li", "ads.google.lk", "ads.google.lt", "ads.google.lu", "ads.google.lv", "ads.google.md", "ads.google.me", "ads.google.mg", "ads.google.mk", "ads.google.ml", "ads.google.mn", "ads.google.ms", "ads.google.mu", "ads.google.mv", "ads.google.mw", "ads.google.ne", "ads.google.ne.jp", "ads.google.ng", "ads.google.nl", "ads.google.no", "ads.google.nr", "ads.google.nu", "ads.google.pl", "ads.google.pn", "ads.google.ps", "ads.google.pt", "ads.google.ro", "ads.google.rs", "ads.google.ru", "ads.google.rw", "ads.google.sc", "ads.google.se", "ads.google.sh", "ads.google.si", "ads.google.sk", "ads.google.sm", "ads.google.sn", "ads.google.so", "ads.google.sr", "ads.google.st", "ads.google.td", "ads.google.tg", "ads.google.tl", "ads.google.tm", "ads.google.tn", "ads.google.to", "ads.google.tt", "ads.google.us", "ads.google.vg", "ads.google.vu", "ads.google.ws", NULL }; const char *d75438397[] = { "architizer.com", NULL }; const char *d757e6905[] = { "squadd.io", NULL }; const char *d759d6398[] = { "gamestar.de", NULL }; @@ -55820,7 +55872,6 @@ const char *d881fca2d[] = { "guardian.co.uk", "landandfarm.com", NULL }; const char *d8889475f[] = { "ksta.de", NULL }; const char *d889bfde1[] = { "concursovirtual.com.br", "forum.kooora.com", "lavozdegalicia.es", "payback.pl", "posta.com.tr", "uol.com.br", NULL }; const char *d88a62b28[] = { "psu.com", NULL }; -const char *d890aa3ae[] = { "blog.sovoboys.net", NULL }; const char *d896d27e7[] = { "userscloud.com", NULL }; const char *d898d5803[] = { "dplay.com", "dplay.dk", "dplay.se", NULL }; const char *d89935507[] = { "lemonde.fr", NULL }; @@ -55861,6 +55912,7 @@ const char *d8ded2648[] = { "reuters.com", NULL }; const char *d8e122166[] = { "energy.de", NULL }; const char *d8e1bb2bc[] = { "thestreet.com", NULL }; const char *d8e3f8f77[] = { "majorleaguegaming.com", NULL }; +const char *d8ec2e076[] = { "rarbg.to", "rarbgaccess.org", "rarbgmirror.com", "rarbgproxy.org", "rarbgprx.org", NULL }; const char *d8ecb9057[] = { "yorkshirepost.co.uk", NULL }; const char *d8ed384fb[] = { "cityam.com", NULL }; const char *d8edf5506[] = { "tritonmedia.com", NULL }; @@ -56011,6 +56063,7 @@ const char *da70edbdd[] = { "dsero.com", "korean-candy.com", "misheel.net", "pol const char *da724cbf4[] = { "food.com", NULL }; const char *da75f0901[] = { "mlbtraderumors.com", NULL }; const char *da763cd1d[] = { "ostrow24.tv", NULL }; +const char *da7ac48b5[] = { "1337x.st", "1337x.to", "x1337x.eu", "x1337x.se", "x1337x.ws", NULL }; const char *da7d09f54[] = { "subaru.com", NULL }; const char *da7dc3aac[] = { "anitubebr.com", NULL }; const char *da7f79682[] = { "gaytube.com", "pornhub.com", "redtube.com", "redtube.it", "tube8.com", "tube8.es", "tube8.fr", "xtube.com", "youjizz.com", "youporn.com", "youporngay.com", NULL }; @@ -56094,13 +56147,12 @@ const char *db2368c43[] = { "hdeuropix.cc", NULL }; const char *db28c29b5[] = { "ciscospark.com", "citymapper.com", NULL }; const char *db2ac99bb[] = { "fxnetworks.com", NULL }; const char *db2c31c1f[] = { "credit.com", NULL }; -const char *db2d9dee6[] = { "1337x.to", "x1337x.se", NULL }; const char *db2e3492b[] = { "sportcategory.org", NULL }; const char *db2efb8b5[] = { "betwonga.com", "comparison411.com", "dealsplus.com", "matched-bet.net", "pcmag.com", NULL }; const char *db330c8ed[] = { "acehardware.com", NULL }; const char *db3310bdf[] = { "hbf.com.au", "seattlepi.com", "tv.com", NULL }; const char *db3380c9a[] = { "morningstar.in", NULL }; -const char *db34d38b3[] = { "123unblock.xyz", "mrunlock.icu", "nocensor.pro", "prox4you.pw", "unblockall.org", "unblocked.app", "unblocked.lol", "unblocked.si", "unlockproject.icu", NULL }; +const char *db364a3b4[] = { "123unblock.xyz", "mrunlock.icu", "myunblock.com", "nocensor.pro", "prox4you.pw", "unblockall.org", "unblocked.app", "unblocked.llc", "unblocked.lol", "unblocked.si", "unlockproject.icu", NULL }; const char *db370b6b2[] = { "1337x.to", "biology-online.org", "bitvid.sx", "cloudtime.to", "eztv.ag", "eztv.tf", "eztv.yt", "flashx.tv", "gorillavid.in", "letwatch.us", "movpod.in", "nowvideo.sx", "nowvideo.to", "wholecloud.net", NULL }; const char *db37ef5d0[] = { "watchtheofficeonline.tv", NULL }; const char *db39f7004[] = { "xfire.com", NULL }; @@ -56263,7 +56315,6 @@ const char *dcc2caf32[] = { "enstarz.com", "itechpost.com", "kdramastars.com", " const char *dcc338217[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "breaking911.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativeintel.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "damnlol.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "faithit.com", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "girlsjustwannahaveguns.com", "glitch.news", "godfatherpolitics.com", "gosocial.co", "greatamericanrepublic.com", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "headcramp.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "janmorganmedia.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "opednews.com", "parentherald.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "reverbpress.com", "reviveusa.com", "rightwingnews.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "thelibertarianrepublic.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tinypic.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "universityherald.com", "usherald.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "westernjournalism.com", "winningdemocrats.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *dccb6c746[] = { "adultfreex.com", NULL }; const char *dccbe7ff1[] = { "allmusic.com", "hulkusc.com", "sc2casts.com", NULL }; -const char *dcd18ce6c[] = { "0dt.net", "123movies.net", "adyou.me", "akvideo.stream", "animesonlinetk.info", "asianvote.com", "biqle.ru", "bittorrent.am", "bmovies.to", "bonstreams.net", "briansarmiento.website", "bro.adca.st", "buzzfil.net", "clicknupload.org", "clik.pw", "ddlvalley.me", "divxatope1.com", "dropapk.com", "dwatchseries.to", "ewatchseries.to", "eztv.ag", "fbstreams.me", "fileone.tv", "firstrowsports.eu", "flash-x.tv", "flashsx.tv", "flashx.co", "flashx.me", "flashx.run", "flashx.sx", "flashx.to", "flashx.tv", "flashx.ws", "flashx1.tv", "flashxx.tv", "gamestorrent.co", "gelbooru.com", "gorillavid.in", "gounlimited.to", "hdvid.life", "hdvid.tv", "hdvid.xyz", "icefilms.info", "igg-games.com", "jkanime.net", "katcr.host", "kissanime.ru", "lavamovies.se", "livecamtv.me", "m4ufree.com", "m4ufree.tv", "masterani.me", "megaup.net", "mlbstream.me", "moecdn.io", "monova.org", "monova.to", "movpod.in", "mp4upload.com", "my-project-free.tv", "myfeed4u.me", "nbastreams.me", "newpct.com", "newpct1.com", "nflstreams.me", "nhlstreams.me", "nowvideo.sx", "oload.site", "oloadcdn.net", "onvid.online", "onvid.xyz", "openload.co", "opensubtitles.org", "ourl.io", "pcgames-download.com", "pelispedia.tv", "pelisplus.tv", "pirateproxy.ist", "pirateproxy.sh", "putlockertv.se", "rapidvideo.com", "readmanga.today", "sawlive.tv", "serietvsubita.net", "shaggyimg.pro", "skidrowcrack.com", "sportshd.me", "stream.moe", "stream2watch.cc", "streamango.com", "streamfilmzzz.com", "streamzzz.online", "strikeout.co", "subtorrents.io", "sunmusiq.com", "telepisodes.co", "thehiddenbay.ws", "thepiratebay.cr", "thepixstate.com", "thevideobee.to", "torlock.com", "torrentfunk.com", "torrentz2.eu", "unblocked.mx", "unblocked.sh", "unblocked.vet", "unblocker.cc", "uploadproper.com", "uptobox.com", "vidgg.to", "vidlox.me", "vidlox.tv", "vidtod.me", "vidtodo.me", "vidtudu.com", "vidup.me", "vidup.tv", "vidzi.tv", "vodlock.co", "watchers.to", "watchonline.to", "watchonlinemovies.com.pk", "yts.ag", "yts.am", "yts.gs", "zooqle.com", NULL }; const char *dcd7b8fdc[] = { "forums.redflagdeals.com", NULL }; const char *dcd7c6f2a[] = { "my.msn.com", NULL }; const char *dcd975e64[] = { "crimemapping.com", NULL }; @@ -56521,6 +56572,7 @@ const char *df1bdf5e4[] = { "flash-x.tv", "flashx.tv", NULL }; const char *df1ff34b [] = { "xxxbunker.com", NULL }; const char *df2051168[] = { "gruntig.net", NULL }; const char *df2369551[] = { "usanetwork.com", NULL }; +const char *df2895160[] = { "0dt.net", "123movies.net", "adyou.me", "akvideo.stream", "animesonlinetk.info", "asianvote.com", "biqle.ru", "bittorrent.am", "bmovies.to", "bonstreams.net", "briansarmiento.website", "bro.adca.st", "buzzfil.net", "clicknupload.org", "clik.pw", "ddlvalley.me", "divxatope1.com", "dropapk.com", "dwatchseries.to", "ewatchseries.to", "eztv.ag", "fbstreams.me", "fileone.tv", "firstrowsports.eu", "flash-x.tv", "flashsx.tv", "flashx.co", "flashx.me", "flashx.run", "flashx.sx", "flashx.to", "flashx.tv", "flashx.ws", "flashx1.tv", "flashxx.tv", "gamestorrent.co", "gelbooru.com", "gorillavid.in", "gounlimited.to", "hdvid.life", "hdvid.tv", "hdvid.xyz", "icefilms.info", "igg-games.com", "jkanime.net", "katcr.host", "kissanime.ru", "lavamovies.se", "livecamtv.me", "m4ufree.com", "m4ufree.tv", "masterani.me", "megaup.net", "mlbstream.me", "moecdn.io", "monova.org", "monova.to", "movpod.in", "mp4upload.com", "my-project-free.tv", "myfeed4u.me", "nbastreams.me", "newpct.com", "newpct1.com", "nflstreams.me", "nhlstreams.me", "nowvideo.sx", "oload.site", "oloadcdn.net", "onvid.online", "onvid.xyz", "openload.co", "opensubtitles.org", "ourl.io", "pcgames-download.com", "pelispedia.tv", "pelisplus.tv", "pirateproxy.ist", "pirateproxy.sh", "putlockertv.se", "rapidvideo.com", "rarbg.to", "rarbgaccess.org", "rarbgmirror.com", "rarbgproxy.org", "rarbgprx.org", "readmanga.today", "sawlive.tv", "serietvsubita.net", "shaggyimg.pro", "skidrowcrack.com", "sportshd.me", "stream.moe", "stream2watch.cc", "streamango.com", "streamfilmzzz.com", "streamzzz.online", "strikeout.co", "subtorrents.io", "sunmusiq.com", "telepisodes.co", "thehiddenbay.ws", "thepiratebay.cr", "thepixstate.com", "thevideobee.to", "torlock.com", "toros.co", "torrentfunk.com", "torrentz2.eu", "unblocked.mx", "unblocked.sh", "unblocked.vet", "unblocker.cc", "uploadproper.com", "uptobox.com", "vidgg.to", "vidlox.me", "vidlox.tv", "vidtod.me", "vidtodo.me", "vidtudu.com", "vidup.me", "vidup.tv", "vidzi.tv", "vodlock.co", "watchers.to", "watchonline.to", "watchonlinemovies.com.pk", "yts.ag", "yts.am", "yts.gs", "zooqle.com", NULL }; const char *df2a14046[] = { "better-explorer.com", NULL }; const char *df2ce9151[] = { "uplod.ws", NULL }; const char *df30d2dfe[] = { "ipv6test.google.com", NULL }; @@ -56589,6 +56641,7 @@ const char *dfe3794b [] = { "wowhead.com", NULL }; const char *dfe511ead[] = { "media1fire.com", NULL }; const char *dfe5f1f90[] = { "apotheken-umschau.de", "compo-hobby.de", "diabetes-ratgeber.net", "giz.de", "kaguma.com", "krombacher.de", NULL }; const char *dfe6a41cb[] = { "tomsguide.com", "tomshardware.co.uk", "tomshardware.com", "wonderhowto.com", NULL }; +const char *dfea1acf8[] = { "123movies.com", "123unblock.xyz", "1337x.st", "1337x.to", "1movies.is", "activistpost.com", "adsrt.com", "ancient-origins.net", "c123movies.com", "clicknupload.org", "couchtuner.onl", "couchtuner.rocks", "daclips.in", "datpiff.com", "downloadpirate.com", "dwatchseries.to", "estream.nu", "estream.to", "estream.xyz", "eztv.ag", "eztv.io", "eztv.tf", "eztv.yt", "fmovies.se", "fmovies.taxi", "fmovies.to", "fmovies.today", "fmovies.world", "fullmatchesandshows.com", "gifsis.com", "gomovies.sc", "gorillavid.in", "gostreams.net", "hdmoza.com", "hdonline.is", "healthline.com", "intoupload.net", "kickass2.ch", "kickass2.st", "kimcartoon.to", "limetorrents.info", "masterkreatif.com", "megaup.net", "monova.org", "monova.to", "movies.is", "movies123.xyz", "moviescouch.co", "moviewatcher.is", "movpod.in", "mrunlock.icu", "newser.com", "nocensor.pro", "nowvideo.sx", "nowwatchtvlive.ws", "onhax.me", "pirateiro.com", "postimg.cc", "prox4you.pw", "seedpeer.me", "sendit.cloud", "skidrowcrack.com", "solarmovie.one", "solarmoviez.ru", "swatchseries.to", "thegatewaypundit.com", "thewatchseries.ac", "tinypic.com", "torlock.com", "torrentdownload.ch", "torrentdownloads.me", "torrentfunk.com", "torrentfunk2.com", "torrentz2.eu", "tubidy.io", "uiz.io", "unblckd.org", "unblockall.org", "unblocked.app", "unblocked.llc", "unblocked.lol", "unblocked.si", "unlockproject.icu", "uptobox.com", "userscloud.com", "vidbull.tv", "watchcartoononline.io", "watchseries.sk", "watchsomuch.info", "x1337x.eu", "x1337x.se", "x1337x.ws", "yesmovies.to", "yify-movies.net", "yify.bz", "yifyddl.com", "yifytorrent.co", "ymovies.tv", "yourbittorrent2.com", "yts.am", "zippyshare.com", NULL }; const char *dfee9524d[] = { "accesshollywood.com", NULL }; const char *dfef07ce4[] = { "readmanga.today", NULL }; const char *dfef42a9a[] = { "play.spotify.com", NULL }; @@ -57859,6 +57912,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m3b3f2f34, 0, NULL, NULL }, {mc9a56cd9, 0, NULL, NULL }, {m4a5dbe78, 0, NULL, NULL }, + {maa805841, 0, NULL, NULL }, {m845993e4, 0, NULL, NULL }, {meba3eeeb, 0, NULL, NULL }, {m2fa6988e, 0, NULL, NULL }, @@ -58194,6 +58248,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma2847f1f, 0, NULL, NULL }, {ma901d140, 0, NULL, NULL }, {me9efb8a0, 0, NULL, NULL }, + {m1e289194, 0, NULL, NULL }, {md0b71be3, 0, NULL, NULL }, {m8fbb635a, 0, NULL, NULL }, {m6e1cc45b, 0, NULL, NULL }, @@ -60470,6 +60525,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m66d8648e, 0, NULL, NULL }, {m98b9ee18, 0, NULL, NULL }, {mc00b694b, 0, NULL, NULL }, + {m8bbac24e, 0, NULL, NULL }, {md9c7d93f, 0, NULL, NULL }, {mf0c86da5, 0, NULL, NULL }, {m5db0904, 0, NULL, NULL }, @@ -61674,6 +61730,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb8b81d00, 0, NULL, NULL }, {m2740563a, 0, NULL, NULL }, {m337c1985, 0, NULL, NULL }, + {mee18cfe8, 0, NULL, NULL }, {ma1f02027, 0, NULL, NULL }, {m8bc8b3b6, 0, NULL, NULL }, {mcb8ca4d3, 0, NULL, NULL }, @@ -64096,6 +64153,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mff82249d, 0, NULL, NULL }, {m9408700d, 0, NULL, NULL }, {mbff7333, 0, NULL, NULL }, + {m6879d189, 0, NULL, NULL }, {m18c74d7b, 0, NULL, NULL }, {m5f3fe718, 0, NULL, NULL }, {m27e01113, 0, NULL, NULL }, @@ -64598,10 +64656,10 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mbdb4a6d1, 0, NULL, NULL }, {mce93e50b, 0, NULL, NULL }, {m5a2e3f3e, 0, NULL, NULL }, + {m42a59189, 0, NULL, NULL }, {mc97ad51f, 0, NULL, NULL }, {m69d19f7d, 0, NULL, NULL }, {m79f2360e, 0, NULL, NULL }, - {mabdb1d9d, 0, NULL, NULL }, {mb725fb54, 0, NULL, NULL }, {mcc4ecbbc, 0, NULL, NULL }, {m6dd2bb3f, 0, NULL, NULL }, @@ -65514,6 +65572,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf1dfb63, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, dnc1f44971 }, {mc8ed190e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9588bf09, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m6c3fb441, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m21d9650b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mfb94fcf9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m25f24ea0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -65529,6 +65588,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m19afb248, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m81e48b73, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9ecd6b37, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m568a77a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md1422fb6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3393cffc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m7e49feac, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -65895,6 +65955,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf23864b5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m40516880, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m41de09e0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mbd9ba7e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me1743622, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4e3bf989, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mdf4bae6d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -66171,6 +66232,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6c19a67a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m452f7914, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m638bf04c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mb2e1b449, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m27621a26, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {med8535c4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc8693353, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -66333,6 +66395,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md4cde46a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me20f1b7b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc2cd77f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m22498b10, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m60a951ac, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m805e4c14, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mfd9fc59, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -66625,6 +66688,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m79c2ca42, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md7fbcd6b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6c8e685f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m58939941, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mcce39aa7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7fb7c96f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7f3535c7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -66855,6 +66919,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m60a12cf6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mec7b6298, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m16181dcb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mf9986a88, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9b8f682b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbfc47f48, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7d665324, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67640,6 +67705,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9363372, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m811138b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m444a38d5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mb8ddb062, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md5d024ea, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8f2c11b6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me6a35032, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -68233,6 +68299,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc4424677, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma9e3e632, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mef6e99bc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mf66569bf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc003626d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m86b0b1e6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3f63595a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -68405,6 +68472,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mcdbcb388, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m689685ba, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m169ffa34, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m90b999db, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4180b2fe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9ff25af0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6d66a9ad, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -68837,6 +68905,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m3bfe288e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6283b139, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {meaa45f65, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m442c0f76, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md7cf25f2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mac335b7d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m99aadfc9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -69448,6 +69517,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1702414e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbca1be42, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc911c753, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m733ec12b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m63097258, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m58261533, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m484d668c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -69723,6 +69793,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc4ab34d0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf53ee57f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8e086a5e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m34a817bb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m80ca38e7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4ea8b5c0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9b0c916f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -69791,6 +69862,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m316e65b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md4d19bf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mded8bf11, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mc867fb61, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m546c6ac0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4b58835f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6c5c4888, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -69863,6 +69935,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9836d95b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me47f5bb1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me2788d2a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m5b3ee9c1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m56c6b416, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m35d823d7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4a98fb85, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -70135,6 +70208,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md0201ea0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc53a9dfb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4027a9b9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m94cd35f5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1b18a20a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9e3eb6c3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mcd7e4722, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -80245,6 +80319,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mac9bc964, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m66a279b0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m8ef4e630, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m3c35c737, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m3faaee3b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m43eca30e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m3631796d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -80291,6 +80366,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {meb1d649e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mb019dbf6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m8f471e9c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mf392d891, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {md03d26c9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m7920e357, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {ma4010646, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -80308,6 +80384,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m34594ca3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2fa7441, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m36c376a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mded88a91, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m122640e6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2773d9ff, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m781d4f31, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -80317,6 +80394,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m14ca0e07, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mfd36ff47, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m921cc3a6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mca73c9a1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m8e10f140, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mb9c926d0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mee97c18a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -80380,6 +80458,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1fedbb84, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m69ba6cb3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m5e9a5bfa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m201e15fa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m3ca61dec, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m532f57ed, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mfc1bfe1c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -80405,10 +80484,14 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m4c26edd1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mc0314c62, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m9a256543, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m2ef5a523, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me9925152, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m74763504, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mb53418a3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {maa719e9d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m36e7e555, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m7a988e4e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mcabdaed2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2968480f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m352c615e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m462f4e36, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -80419,6 +80502,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mfb67a727, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {md451b818, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me4bdf34a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mdcd4c8b4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m6ce1c01, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m422db642, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mc1a68952, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -81130,6 +81214,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {maa8e5e8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1205a281, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m11e67873, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m2aea7510, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mc49fec14, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m408f65b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m30f83d96, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -81525,6 +81610,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma10a4aaf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m675a56da, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m364faaac, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m19fe4728, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m83270e23, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m183537ff, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mcd13e140, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -81566,6 +81652,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m366f2e4d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4a90cdf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m72364245, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m38fb5f7f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md8c95db5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9767690a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {meb9205ad, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -82003,6 +82090,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1a2515eb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5b8efc32, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m807e8f78, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {me8f3b0b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {med71eb31, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc369e15b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5f364a2e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -82247,6 +82335,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mccbf9a7a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m802cc6f3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2e8214db, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m245531d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2bbc25a3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1eba6f00, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m50669af0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -82369,6 +82458,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8dd2d638, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8dcccd87, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m76e7896e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mbfcf62fc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m46b2bef0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m62725d1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m645440cb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -82819,6 +82909,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6e7694aa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m76efe6f2, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mec74faa6, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {mecd1895c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d42e73f91, NULL }, {m25ba755, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m428f2f28, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {md69081ab, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -83011,6 +83102,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf5e96b8f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mb7b52505, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m5d0b1d75, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mad4917b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m5f46100b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m51bb2aee, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, dn8e68d090 }, {m70915102, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -83021,6 +83113,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m97035fe8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m7b4d160b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m291e021, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m43a33264, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m95a08153, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m9650956b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m15828fa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -83090,6 +83183,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf63ffe7c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m93b79c66, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mbec5004d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m70d269b0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mf4139699, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {ma808534e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, dnfdfcdefa }, {md5b49561, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -83159,6 +83253,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m614f87ec, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m205d31c2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m5bd0e500, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m51dfc65b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mb9041e0c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m7d26c87, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m4e2ff935, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -83213,6 +83308,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {maa5b7b6e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2eca1e2d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7e1e0746, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mf5a11dbc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m563d0cdd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mb52572a2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me688e036, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -86068,7 +86164,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m76986ee2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m905b237, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m89ef6e1, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {mf2ca6d1d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d3c2e11c2, NULL }, + {mf2ca6d1d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d8ec2e076, NULL }, {m57348f2f, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mcacc17f1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me51ae88c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -87414,8 +87510,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb0b85779, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m6e4db0c6, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mbed465fd, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m7f01db4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {m7e7ceef, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mf9e13f5a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {ma61bce5c, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m854d11f4, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m1b2dbf22, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -87867,6 +87962,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m915c26dd, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m229ff4c6, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m1894d331, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m40b04488, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mdb90b1c9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m1cd22d53, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mfcbbc38d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -88317,6 +88413,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m7806a559, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me6db4cfa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me834999, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m50e6dfa0, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m2a39e625, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m523dab49, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m25d77513, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m2eb6207d, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -88658,7 +88756,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m5d228868, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m13af974e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m3fc5ba29, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m921639bc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d3c2e11c2, NULL }, + {m921639bc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d8ec2e076, NULL }, {me792ad3d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m21577723, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m34f36c63, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -88704,6 +88802,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6631e485, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m426eb36a, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m1be4d9d4, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m4dce27c, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m935791c0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mc76b6e99, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m55777a46, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -89257,8 +89356,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me7995c08, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d57faf9b, NULL }, {ma2459277, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d34e8a4c8, NULL }, {ma9b66181, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d34e8a4c8, NULL }, - {mfec2604f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, db34d38b3, NULL }, - {mfb3250c1, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, d1c26a419, NULL }, + {mfec2604f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, db364a3b4, NULL }, + {mfb3250c1, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, dfea1acf8, NULL }, {m89e4b38b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m7bdaf2d9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {ma2e51d93, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d3718473d, NULL }, @@ -89383,6 +89482,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m684804cd, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mb579fc97, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, db37ef5d0, NULL }, {m63f4528e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, + {mcbe615c7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m93ac081d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {ma8b2b2f7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {md29d59c1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -89495,8 +89595,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m95d4bef, ADBLOCK_FLAG_MATCH_BEGIN | ADBLOCK_FLAG_THIRD_PARTY, de0aa7df6, NULL }, {ma82b6143, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, de0650984, NULL }, {ma456b470, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {md2734e12, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, db2d9dee6, NULL }, - {m7ad964de, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, db2d9dee6, NULL }, + {md2734e12, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, da7ac48b5, NULL }, + {m7ad964de, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, da7ac48b5, NULL }, {mc013e090, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d458c7c6c, NULL }, {me155113, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d3fc9e1fd, NULL }, {m3bbee585, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d3fc9e1fd, NULL }, @@ -89908,7 +90008,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m23a277f3, ADBLOCK_FLAG_MATCH_BEGIN | ADBLOCK_FLAG_HAS_SEPARATOR, d230e59ac, NULL }, {m84aed8cf, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_THIRD_PARTY, d192a3461, NULL }, {m77c42d90, ADBLOCK_FLAG_MATCH_BEGIN | ADBLOCK_FLAG_HAS_SEPARATOR, db370b6b2, NULL }, - {m3e78e63e, ADBLOCK_FLAG_HAS_SEPARATOR, dcd18ce6c, NULL }, + {m3e78e63e, ADBLOCK_FLAG_HAS_SEPARATOR, df2895160, NULL }, {m4a6c85a9, ADBLOCK_FLAG_HAS_SEPARATOR, daed18dd1, NULL }, {mf28fd7c5, ADBLOCK_FLAG_HAS_SEPARATOR, d63b1a8b3, NULL }, {mba742503, 0, daed18dd1, NULL }, @@ -90730,6 +90830,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mce5b0bb6, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m5e781116, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m99bc346e, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {mb3f8725d, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mf796cbf2, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m17614752, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {me00270a6, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -90851,14 +90952,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m30ff5aa5, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {meac0adbf, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m67660b79, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {mc5b6842d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {ma14f3bb2, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d419c2c94, NULL }, - {ma3f37971, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {mabbc32b4, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {md75d5826, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m9f955494, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m4b3c7720, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m4b0a5c20, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m7ed5f45f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d8fea6f31, NULL }, {m6f0e70e9, ADBLOCK_FLAG_MATCH_BEGIN | ADBLOCK_FLAG_THIRD_PARTY, d8fea6f31, NULL }, {mac82fac, ADBLOCK_FLAG_MATCH_BEGIN | ADBLOCK_FLAG_THIRD_PARTY, d8fea6f31, NULL }, @@ -91915,6 +92008,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf61da3c2, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, de7a5915e, NULL }, {m84f2b38b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m1e6615d8, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {md833b81a, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m1e2af351, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mfc35b6c5, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, dd9919f9f, NULL }, {m73fb6a91, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d177aa2e5, NULL }, {m4f70ac93, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -92913,6 +93008,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8de3493c, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m1ca43863, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m92e3b9b5, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, + {m462b13cc, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d6ce818f3, NULL }, {m8f7e0663, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, dc9980258, NULL }, {mbc4f920b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mda961907, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -93171,6 +93267,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me3914ce9, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mf891ce06, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d1f3512c3, NULL }, {m1d2b31f8, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, + {m2443a694, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d7533de91, NULL }, {m7637d760, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d205c4588, NULL }, {m317773ec, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {ma908ccdf, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, @@ -93738,7 +93835,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m14f3bae7, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m61397e96, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m54ba3f87, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {mb53418a3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m7f24c592, ADBLOCK_FLAG_MATCH_DOMAIN, def102471, NULL }, {m2a9d13fa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m80de4c79, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -93765,7 +93861,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m110ef4a6, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_BEGIN | ADBLOCK_FLAG_MATCH_END | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m28841074, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me8501bcf, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, - {mcabdaed2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m6a6e26e4, ADBLOCK_FLAG_MATCH_DOMAIN, d853cf35c, NULL }, {m86df3dc6, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m430306c1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -93778,8 +93873,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me6c4609c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d57788374, NULL }, {meaa86a50, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m581541c8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {mf392d891, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {m5091536d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m63374c91, ADBLOCK_FLAG_HAS_WILDCARD, d80ac2121, NULL }, {m6ff2168f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m90f6b87c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -93789,21 +93882,19 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m291c1988, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {ma579e0de, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m1955ea9b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_BEGIN | ADBLOCK_FLAG_MATCH_END | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {m201e15fa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {mdcd4c8b4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mef324c8d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d7bcbf8f0, NULL }, {mcfdc3992, ADBLOCK_FLAG_MATCH_DOMAIN, d36ff5641, NULL }, {m271d4982, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m78b481e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d50dc0429, NULL }, {m6704fa3c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d50dc0429, NULL }, {m6df66d4e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {m733ec12b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m81cd296c, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d844ef45, NULL }, {md6a2288, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d844ef45, NULL }, {m8a8c07cd, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m176dac94, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {med5d48f, ADBLOCK_FLAG_MATCH_DOMAIN, dca17bc6a, NULL }, {m471595cf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mf1cdf7ee, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mbb8f63c9, ADBLOCK_FLAG_MATCH_DOMAIN, df908fd49, NULL }, {m3d228a0a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mbdbd85f4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -93870,16 +93961,14 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m819fc2a0, ADBLOCK_FLAG_MATCH_DOMAIN, dcf6c29e6, NULL }, {mbd9493fa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {mdae23a6c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {m94cd35f5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {m92f9da5c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mb058beb, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d74c31c76, NULL }, {mdd9f5d7c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m5cd9817e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mc9dabe34, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, + {m39b7143, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mf9e6407c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mdacc81db, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mfb62db16, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m50e6dfa0, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m2a39e625, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m41c999d7, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d7bcfbb47, NULL }, {mf8578c42, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mf69611a2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -93889,12 +93978,18 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m4b9d897c, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {md235712c, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m7a561c75, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m3bb17b4b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2504b324, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1c75a9dc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m397a7b63, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma104821f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {ma85b62e4, ADBLOCK_FLAG_MATCH_DOMAIN, d42679337, NULL }, + {mde99d362, ADBLOCK_FLAG_MATCH_DOMAIN, d260a4312, NULL }, {m4fbb9917, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d260a4312, NULL }, + {m4491ff0a, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_THIRD_PARTY, d260a4312, NULL }, + {m1a8edd01, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d260a4312, NULL }, + {m70c1bb11, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d260a4312, NULL }, + {m8c5f5c0c, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d260a4312, NULL }, {m1bffa964, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m94ea9570, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m16558725, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -93910,13 +94005,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m69a7a04f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m5362b342, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {ma3dde770, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, - {m3c35c737, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m53452dda, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {mded88a91, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {mca73c9a1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2609a58, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {m2ef5a523, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {m36e7e555, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {maae234e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, dd9e6a333, NULL }, {m791d99dc, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, dd9e6a333, NULL }, {maaa024e6, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d2aa66467, NULL }, @@ -94073,7 +94163,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma025270a, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d5d437ba3, NULL }, {m5d710a94, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m4fbc6b87, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {me8f3b0b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2549aba1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mccc8ece5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d3a592b5f, NULL }, {m654cd16c, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -94096,7 +94185,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m86984d4b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m692aa9c2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {md3eeb5b5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {mbfcf62fc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d47565321, NULL }, {m91e9170a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m6be2051f, ADBLOCK_FLAG_MATCH_END, NULL, NULL }, {m9408a1f3, 0, NULL, NULL }, @@ -94105,7 +94193,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md09ab634, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mb2092624, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m196f0246, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {mb3f8725d, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m924958f4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mdb86eaf1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mc9fa6d0b, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -94145,7 +94232,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m91e6a8e9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbfcc7ec6, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m89118c46, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m70d269b0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m1e2462fa, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d4863af3a, NULL }, {m1277d7a7, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d4863af3a, NULL }, {mccfb9960, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d4863af3a, NULL }, @@ -94179,7 +94265,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb78e2b4e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m1ffc500b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m859566d0, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {mf5a11dbc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {meecf8fdc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {ma30e0437, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mf71f7945, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, db0ddb6a9, NULL }, @@ -94190,8 +94275,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m5d5d5ca2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf1a3263f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9696af22, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, - {m5ec4a21a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {m51dfc65b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m470356b8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m331543b1, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m98781bec, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {me9afbea9, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -94202,6 +94286,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma6f9c629, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mc57cddbc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m4a5d657c, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d4cbba7bb, NULL }, + {m7af61223, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m5919bb4a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m1ff447d9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m4ddcbacc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -94214,8 +94299,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me24acc92, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m5707e15f, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m780be18b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {m462b13cc, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d6ce818f3, NULL }, - {m5b3ee9c1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma08891d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me8f832f3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {maa3b9bd2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -94249,7 +94332,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m7dcf1951, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m850caea1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mc65f82f8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {m245531d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m889e9c74, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mb3ba132a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {med02a2d1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d3a12c62a, NULL }, @@ -94304,7 +94386,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mbcecee7f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d73af20e0, NULL }, {m79aaba7d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m5e9ccfa9, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, - {m842347d6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m44bf2d51, ADBLOCK_FLAG_MATCH_DOMAIN, de9d10838, NULL }, {m8bde606e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d71dc8d1f, NULL }, {m885ebfb1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -94365,7 +94446,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m19ffbae, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m3be79090, ADBLOCK_FLAG_MATCH_DOMAIN, d59158744, NULL }, {m171bce27, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, dcb5aaf16, NULL }, - {m4dce27c, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {maa7a907f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, dfa868bc, NULL }, {mec367ab6, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m43c5e11f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -94448,7 +94528,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf5686468, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m84b898a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9c621b23, ADBLOCK_FLAG_MATCH_DOMAIN, d515f1dde, NULL }, - {m43a33264, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mab41d1a1, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m11e125bc, ADBLOCK_FLAG_MATCH_DOMAIN, db6578646, NULL }, {ma422ba2e, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -94462,7 +94541,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m44502ca7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m1722c934, ADBLOCK_FLAG_MATCH_DOMAIN, d1dc030cf, NULL }, {m9cf38237, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, - {m38fb5f7f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mde79b4b6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7d79c613, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m60f4ee7d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -94477,7 +94555,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mba3386a8, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, dcb9e5448, NULL }, {m47d5ed45, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m20c82bf8, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, - {mc867fb61, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m70f2074b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m52a3080e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d32720839, NULL }, {m8ec389bd, ADBLOCK_FLAG_MATCH_DOMAIN, d757e6905, NULL }, @@ -94488,6 +94565,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb57941da, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m5e6ca2cd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m153ba2af, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {me79ea4ab, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m36ecb5fc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, de9510849, NULL }, {m3209c23b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mca9bf6ed, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -94503,17 +94581,16 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mfa8d0746, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m4b55df4d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m146cbbfa, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, dffc9f70f, NULL }, - {m4b2ef2c0, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_THIRD_PARTY, dffc9f70f, NULL }, {mbda75001, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mce143ec7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m181174e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {m6c3fb441, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m76bbef3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {m22498b10, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m49f9474f, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mf154bc0b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mb06c7c88, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mac592b2c, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {md52ce89d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, + {mff1080de, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mce3d1d0f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m1f933e2d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d5216df21, NULL }, {m3d3327fa, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -94529,7 +94606,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mfcc63780, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m19c7e8f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, dd99c987d, NULL }, {m7c476cdb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, ddcc7573, NULL }, - {mb8ddb062, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mefa1098e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, dd3255d85, NULL }, {m4d6c0ed8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6bb7538b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -94537,7 +94613,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma063c41b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4e9b1233, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5184f4e2, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {m49678ca5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {ma1deb12f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mbfafad2c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, de2cac017, NULL }, {m3e83ad7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -94545,7 +94620,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m414c2cef, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5d0c9fa5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc007a998, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {mf66569bf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7c71769e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mbc32088b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m3e3cf6c4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -94564,15 +94638,12 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mfc68fcb5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb38ce55f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m824a8ca4, ADBLOCK_FLAG_MATCH_DOMAIN, dcb54b9bd, NULL }, - {mb7063375, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d890aa3ae, NULL }, {m73297b55, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m7780548c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m94a0d4bc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mc2e5a64d, ADBLOCK_FLAG_MATCH_DOMAIN, db1855bf8, NULL }, {ma95ee4d5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, - {m58939941, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6a45198d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, - {mb2e1b449, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7655f3da, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mb5d5cbba, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m9027b132, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -94585,7 +94656,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {meb8ebd72, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma3a9333d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me4a1e6fd, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, - {mad4917b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m49a4364e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me36f41df, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {maedc07ef, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -94616,9 +94686,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m31a94063, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d6d3cc18b, NULL }, {mdc406a70, ADBLOCK_FLAG_MATCH_DOMAIN, dedf0b96d, NULL }, {mb35f9d90, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, - {m1c547d00, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {mbd9ba7e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {m34a817bb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf765e5c8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2bd1759c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m8b31fe7, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, @@ -94643,7 +94710,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m3d51842d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mc367c8f0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1ba8fa7a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {m3bb17b4b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mbc13fa57, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m355fe3eb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mc4265681, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d7b5cae11, NULL }, @@ -94654,7 +94720,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m98df4100, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mea3032a9, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d31b4d7b8, NULL }, {m1f996531, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {mb7063375, ADBLOCK_FLAG_MATCH_DOMAIN, d47a111c1, NULL }, {m5a050382, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma81016f2, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m3ead390f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -94679,6 +94744,17 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me49bb896, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mea5ce16f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m8b61fc75, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mb7063375, ADBLOCK_FLAG_MATCH_DOMAIN, d604d11a4, NULL }, + {mb7063375, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d6a5c72f7, NULL }, + {md2f84ec5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m31349141, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, + {m35dfd72a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m93be489, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {me3442351, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, + {m82d5a86a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, + {m83159902, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m13c751a6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m82a4e124, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m959374f7, 0, NULL, NULL }, {m69eee246, 0, NULL, NULL }, {m480a1f0f, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, @@ -95035,6 +95111,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m42297d8e, 0, NULL, NULL }, {mdbf1842, 0, NULL, NULL }, {ma33f87b0, 0, NULL, NULL }, + {m2caf7104, 0, NULL, NULL }, {md237ff16, 0, NULL, NULL }, {m66e07417, 0, NULL, NULL }, {m471cecc3, 0, NULL, NULL }, @@ -95548,6 +95625,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9c4e4fc9, 0, NULL, NULL }, {m55e3f518, 0, NULL, NULL }, {md58a9532, 0, NULL, NULL }, + {m17797950, 0, NULL, NULL }, {m6360e40b, 0, NULL, NULL }, {m6f008f0e, 0, NULL, NULL }, {m17710704, 0, NULL, NULL }, @@ -96135,11 +96213,13 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6056f1c0, 0, NULL, NULL }, {m61c15e7d, 0, NULL, NULL }, {m3ff2419a, 0, NULL, NULL }, + {m1edcca44, 0, NULL, NULL }, {m592872ef, 0, NULL, NULL }, {m43d9ef2d, 0, NULL, NULL }, {m7f2adfa1, 0, NULL, NULL }, {mcd36e90d, 0, NULL, NULL }, {m59e910e8, 0, NULL, NULL }, + {m1de673dd, 0, NULL, NULL }, {mb00db6fc, 0, NULL, NULL }, {m839b008a, 0, NULL, NULL }, {me1bc2df1, 0, NULL, NULL }, @@ -96256,6 +96336,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1fde17a9, 0, NULL, NULL }, {me2c2359d, 0, NULL, NULL }, {m6642bf2c, 0, NULL, NULL }, + {m19a4a1e, 0, NULL, NULL }, {me8f278dd, 0, NULL, NULL }, {m413e0e18, 0, NULL, NULL }, {mc9288a63, 0, NULL, NULL }, @@ -96324,6 +96405,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma2fcbaa2, 0, NULL, NULL }, {me221b043, 0, NULL, NULL }, {m1e0eabe2, 0, NULL, NULL }, + {mc76b31e5, 0, NULL, NULL }, {m6a19ee3d, 0, NULL, NULL }, {m1cf30ccb, 0, NULL, NULL }, {m99b1fe9, 0, NULL, NULL }, @@ -96979,6 +97061,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me035c1b6, 0, NULL, NULL }, {m65b29b34, 0, NULL, NULL }, {mcd3e92bb, 0, NULL, NULL }, + {m4c691532, 0, NULL, NULL }, + {md31f0527, 0, NULL, NULL }, {mf4f9c879, 0, NULL, NULL }, {maec294c6, 0, NULL, NULL }, {mf2f8d373, 0, NULL, NULL }, @@ -97171,6 +97255,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mfb5df8fa, 0, NULL, NULL }, {m34778f71, 0, NULL, NULL }, {m30777254, 0, NULL, NULL }, + {mbb350db2, 0, NULL, NULL }, {mfb0cd002, 0, NULL, NULL }, {m2f93239f, 0, NULL, NULL }, {m8ad18c1a, 0, NULL, NULL }, @@ -98037,7 +98122,9 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mac814cc5, 0, NULL, NULL }, {m4b8de46a, 0, NULL, NULL }, {m3679cbbb, 0, NULL, NULL }, + {m8bdcb0c4, 0, NULL, NULL }, {m52876934, 0, NULL, NULL }, + {md88c7b3, 0, NULL, NULL }, {mef89115e, 0, NULL, NULL }, {m13c7b623, 0, NULL, NULL }, {m9240044a, 0, NULL, NULL }, @@ -98061,6 +98148,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mab689324, 0, NULL, NULL }, {m62b37852, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m2ed75569, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, + {m127bdab9, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m88c3d976, 0, NULL, NULL }, {m2fa9b40a, 0, NULL, NULL }, {m20abe9d6, 0, NULL, NULL }, @@ -98096,6 +98184,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m7cf00c06, 0, NULL, NULL }, {mbcfdd7b9, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {md2ead77b, 0, NULL, NULL }, + {me158c4a9, 0, NULL, NULL }, {mc9ac344e, 0, NULL, NULL }, {md570c060, 0, NULL, NULL }, {m57ca6fa2, 0, NULL, NULL }, @@ -98976,6 +99065,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1156ad60, 0, NULL, NULL }, {m2e9030fa, 0, NULL, NULL }, {m6f1f16d6, ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m25dc8b11, 0, NULL, NULL }, {m60491a15, 0, NULL, NULL }, {mf2e44fc9, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m16a8d379, 0, NULL, NULL }, @@ -98999,6 +99089,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m3b8f1ada, 0, NULL, NULL }, {md4c9f0fd, 0, NULL, NULL }, {mdc045ef6, 0, NULL, NULL }, + {m1cb9b04e, 0, NULL, NULL }, {mff7dea, 0, NULL, NULL }, {mbbf65b53, 0, NULL, NULL }, {me9dfa84, 0, NULL, NULL }, @@ -100198,6 +100289,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf470054b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m546b5fad, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5a6e68d8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {maae25b5e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {med692eb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8dddef61, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6fc97ae8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6601b73a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -100206,6 +100299,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m807af247, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m76a96cda, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbba18e7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mb2381b39, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m27f05e0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc779c838, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, dn745fe9ba }, {m55f8ab79, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -100668,6 +100762,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m29905b90, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8874108a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m57be714a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m10043be, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbf50c59d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc0439b51, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc146906e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -102765,6 +102860,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md20aa12c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mff2b9e2b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb8905e87, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mdea61539, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me226ca5f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf4509bbb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m694a425e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -103386,6 +103482,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m80303f24, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m827598fc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mc932e95e, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m27ef8d90, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m67e019e2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m33ea2a19, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mab1d2fe5, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -104002,7 +104099,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m82c00f82, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mfe6a64f8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mec3c98dd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {m596fe6ba, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {medfb4576, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m53156880, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mb55a971, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m3c29fe53, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -104166,6 +104263,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m67da3b95, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mbd0655df, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m3e4a3b42, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mfa3809e7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mded0375d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m93784c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m9e8e4d38, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -104875,6 +104973,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m281a54a5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m5797b5ac, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mee18808d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m86fba35b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mcdf24326, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m896ccfaa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m77e0078b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -106715,6 +106814,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m20a1e476, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m628b1e14, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m3f8098f7, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m7431fc18, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mbcbdd24a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, d36a72820, NULL }, {m1eadf6c3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mf57ae0f0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -107807,6 +107907,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mfefb4426, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m80ec9f22, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mfb9de79, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m81574bb, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m438cab43, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m725b4934, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mc511521c, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -107924,6 +108025,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m104ac010, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m77edebaf, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mb13a6e01, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, + {mc9ed1590, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m199ac4aa, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m128371fa, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m24cd0e47, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -108930,6 +109032,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m67cd823f, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m9cd0d0ce, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m46d628c4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mefa09fb7, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mb1ae131c, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m28bac62b, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mddb50d5c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -109120,6 +109223,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc8a86192, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mbb569d9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m118779b1, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {mde024c8, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {md15e66af, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m86d515c3, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m970306e6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, diff --git a/build/patches/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch new file mode 100644 index 00000000..af75905d --- /dev/null +++ b/build/patches/AV1-codec-support.patch @@ -0,0 +1,260 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Sun, 16 Dec 2018 15:24:19 +0100 +Subject: AV1 codec support + +libaom build fixes (requires -fPIC) +Report AV1 as playable on Android +--- + media/base/mime_util_internal.cc | 6 +++++- + third_party/libaom/BUILD.gn | 6 ++++-- + third_party/libaom/libaom_srcs.gni | 5 +++++ + .../source/config/linux/arm-neon-cpu-detect/config/aom_config.asm | 2 +- + .../source/config/linux/arm-neon-cpu-detect/config/aom_config.h | 2 +- + .../libaom/source/config/linux/arm-neon/config/aom_config.asm | 2 +- + third_party/libaom/source/config/linux/arm-neon/config/aom_config.h | 2 +- + third_party/libaom/source/config/linux/arm/config/aom_config.asm | 2 +- + third_party/libaom/source/config/linux/arm/config/aom_config.h | 2 +- + third_party/libaom/source/config/linux/arm64/config/aom_config.asm | 2 +- + third_party/libaom/source/config/linux/arm64/config/aom_config.h | 2 +- + .../libaom/source/config/linux/generic/config/aom_config.asm | 2 +- + third_party/libaom/source/config/linux/generic/config/aom_config.h | 2 +- + third_party/libaom/source/config/linux/ia32/config/aom_config.asm | 2 +- + third_party/libaom/source/config/linux/ia32/config/aom_config.h | 2 +- + third_party/libaom/source/config/linux/x64/config/aom_config.asm | 2 +- + third_party/libaom/source/config/linux/x64/config/aom_config.h | 2 +- + 17 files changed, 28 insertions(+), 17 deletions(-) + +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 +@@ -548,9 +548,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid( + case THEORA: + return false; + +- // AV1 is not supported on Android yet. ++ // AV1 is supported on Android. + case AV1: ++#if BUILDFLAG(ENABLE_AV1_DECODER) ++ return true; ++#else + return false; ++#endif + + // ---------------------------------------------------------------------- + // The remaining codecs may be supported depending on platform abilities. +diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn +--- a/third_party/libaom/BUILD.gn ++++ b/third_party/libaom/BUILD.gn +@@ -74,7 +74,7 @@ if (enable_av1_decoder) { + sources = aom_dsp_common_asm_sse2 + sources += aom_dsp_common_asm_ssse3 + sources += aom_ports_asm_x86 +- defines = [ "CHROMIUM" ] ++ defines = [ "CHROMIUM", "PIC" ] + include_dirs = libaom_include_dirs + } + +@@ -158,7 +158,7 @@ if (enable_av1_decoder) { + configs += [ "//build/config/compiler:no_chromium_code" ] + if (current_cpu == "arm") { + configs -= [ "//build/config/compiler:compiler_arm_fpu" ] +- cflags = [ "-mfpu=neon" ] ++ cflags = [ "-mfpu=neon", "-fPIC" ] + } + configs += [ ":libaom_config" ] + sources = aom_av1_common_intrin_neon +@@ -198,6 +198,8 @@ if (enable_av1_decoder) { + if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" || + cpu_arch_full == "arm-neon-cpu-detect") { + deps += [ ":libaom_intrinsics_neon" ] ++ # will detect CPU ++ sources += aom_ports_arm_sources + } + if (is_android) { + deps += [ "//third_party/android_tools:cpu_features" ] +diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni +--- a/third_party/libaom/libaom_srcs.gni ++++ b/third_party/libaom/libaom_srcs.gni +@@ -479,6 +479,11 @@ aom_mem_sources = [ + + aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ] + ++aom_ports_arm_sources = [ ++ "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c", ++ "//third_party/libaom/source/libaom/aom_ports/arm.h", ++ ] ++ + 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", +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 +@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1 + CONFIG_NORMAL_TILE_MODE equ 1 + CONFIG_ONE_PASS_SVM equ 0 + CONFIG_OS_SUPPORT equ 1 +-CONFIG_PIC equ 0 ++CONFIG_PIC equ 1 + CONFIG_RD_DEBUG equ 0 + CONFIG_REDUCED_ENCODER_BORDER equ 0 + CONFIG_RUNTIME_CPU_DETECT equ 1 +diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h +--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h ++++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h +@@ -47,7 +47,7 @@ + #define CONFIG_NORMAL_TILE_MODE 1 + #define CONFIG_ONE_PASS_SVM 0 + #define CONFIG_OS_SUPPORT 1 +-#define CONFIG_PIC 0 ++#define CONFIG_PIC 1 + #define CONFIG_RD_DEBUG 0 + #define CONFIG_REDUCED_ENCODER_BORDER 0 + #define CONFIG_RUNTIME_CPU_DETECT 1 +diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm +--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm ++++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm +@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1 + CONFIG_NORMAL_TILE_MODE equ 1 + CONFIG_ONE_PASS_SVM equ 0 + CONFIG_OS_SUPPORT equ 1 +-CONFIG_PIC equ 0 ++CONFIG_PIC equ 1 + CONFIG_RD_DEBUG equ 0 + CONFIG_REDUCED_ENCODER_BORDER equ 0 + CONFIG_RUNTIME_CPU_DETECT equ 0 +diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h +--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h ++++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h +@@ -47,7 +47,7 @@ + #define CONFIG_NORMAL_TILE_MODE 1 + #define CONFIG_ONE_PASS_SVM 0 + #define CONFIG_OS_SUPPORT 1 +-#define CONFIG_PIC 0 ++#define CONFIG_PIC 1 + #define CONFIG_RD_DEBUG 0 + #define CONFIG_REDUCED_ENCODER_BORDER 0 + #define CONFIG_RUNTIME_CPU_DETECT 0 +diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm +--- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm ++++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm +@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1 + CONFIG_NORMAL_TILE_MODE equ 1 + CONFIG_ONE_PASS_SVM equ 0 + CONFIG_OS_SUPPORT equ 1 +-CONFIG_PIC equ 0 ++CONFIG_PIC equ 1 + CONFIG_RD_DEBUG equ 0 + CONFIG_REDUCED_ENCODER_BORDER equ 0 + CONFIG_RUNTIME_CPU_DETECT equ 0 +diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h +--- a/third_party/libaom/source/config/linux/arm/config/aom_config.h ++++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h +@@ -47,7 +47,7 @@ + #define CONFIG_NORMAL_TILE_MODE 1 + #define CONFIG_ONE_PASS_SVM 0 + #define CONFIG_OS_SUPPORT 1 +-#define CONFIG_PIC 0 ++#define CONFIG_PIC 1 + #define CONFIG_RD_DEBUG 0 + #define CONFIG_REDUCED_ENCODER_BORDER 0 + #define CONFIG_RUNTIME_CPU_DETECT 0 +diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm +--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm ++++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm +@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1 + CONFIG_NORMAL_TILE_MODE equ 1 + CONFIG_ONE_PASS_SVM equ 0 + CONFIG_OS_SUPPORT equ 1 +-CONFIG_PIC equ 0 ++CONFIG_PIC equ 1 + CONFIG_RD_DEBUG equ 0 + CONFIG_REDUCED_ENCODER_BORDER equ 0 + CONFIG_RUNTIME_CPU_DETECT equ 0 +diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h +--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h ++++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h +@@ -47,7 +47,7 @@ + #define CONFIG_NORMAL_TILE_MODE 1 + #define CONFIG_ONE_PASS_SVM 0 + #define CONFIG_OS_SUPPORT 1 +-#define CONFIG_PIC 0 ++#define CONFIG_PIC 1 + #define CONFIG_RD_DEBUG 0 + #define CONFIG_REDUCED_ENCODER_BORDER 0 + #define CONFIG_RUNTIME_CPU_DETECT 0 +diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm +--- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm ++++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm +@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1 + CONFIG_NORMAL_TILE_MODE equ 1 + CONFIG_ONE_PASS_SVM equ 0 + CONFIG_OS_SUPPORT equ 1 +-CONFIG_PIC equ 0 ++CONFIG_PIC equ 1 + CONFIG_RD_DEBUG equ 0 + CONFIG_REDUCED_ENCODER_BORDER equ 0 + CONFIG_RUNTIME_CPU_DETECT equ 1 +diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h +--- a/third_party/libaom/source/config/linux/generic/config/aom_config.h ++++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h +@@ -47,7 +47,7 @@ + #define CONFIG_NORMAL_TILE_MODE 1 + #define CONFIG_ONE_PASS_SVM 0 + #define CONFIG_OS_SUPPORT 1 +-#define CONFIG_PIC 0 ++#define CONFIG_PIC 1 + #define CONFIG_RD_DEBUG 0 + #define CONFIG_REDUCED_ENCODER_BORDER 0 + #define CONFIG_RUNTIME_CPU_DETECT 1 +diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm +--- a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm ++++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm +@@ -35,7 +35,7 @@ + %define CONFIG_NORMAL_TILE_MODE 1 + %define CONFIG_ONE_PASS_SVM 0 + %define CONFIG_OS_SUPPORT 1 +-%define CONFIG_PIC 0 ++%define CONFIG_PIC 1 + %define CONFIG_RD_DEBUG 0 + %define CONFIG_REDUCED_ENCODER_BORDER 0 + %define CONFIG_RUNTIME_CPU_DETECT 1 +diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.h b/third_party/libaom/source/config/linux/ia32/config/aom_config.h +--- a/third_party/libaom/source/config/linux/ia32/config/aom_config.h ++++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.h +@@ -47,7 +47,7 @@ + #define CONFIG_NORMAL_TILE_MODE 1 + #define CONFIG_ONE_PASS_SVM 0 + #define CONFIG_OS_SUPPORT 1 +-#define CONFIG_PIC 0 ++#define CONFIG_PIC 1 + #define CONFIG_RD_DEBUG 0 + #define CONFIG_REDUCED_ENCODER_BORDER 0 + #define CONFIG_RUNTIME_CPU_DETECT 1 +diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm +--- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm ++++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm +@@ -35,7 +35,7 @@ + %define CONFIG_NORMAL_TILE_MODE 1 + %define CONFIG_ONE_PASS_SVM 0 + %define CONFIG_OS_SUPPORT 1 +-%define CONFIG_PIC 0 ++%define CONFIG_PIC 1 + %define CONFIG_RD_DEBUG 0 + %define CONFIG_REDUCED_ENCODER_BORDER 0 + %define CONFIG_RUNTIME_CPU_DETECT 1 +diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h +--- a/third_party/libaom/source/config/linux/x64/config/aom_config.h ++++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h +@@ -47,7 +47,7 @@ + #define CONFIG_NORMAL_TILE_MODE 1 + #define CONFIG_ONE_PASS_SVM 0 + #define CONFIG_OS_SUPPORT 1 +-#define CONFIG_PIC 0 ++#define CONFIG_PIC 1 + #define CONFIG_RD_DEBUG 0 + #define CONFIG_REDUCED_ENCODER_BORDER 0 + #define CONFIG_RUNTIME_CPU_DETECT 1 +-- +2.11.0 + diff --git a/build/patches/Add-DuckDuckGo-search-engine.patch b/build/patches/Add-DuckDuckGo-search-engine.patch index 67c2a209..7bb036f4 100644 --- a/build/patches/Add-DuckDuckGo-search-engine.patch +++ b/build/patches/Add-DuckDuckGo-search-engine.patch @@ -52,7 +52,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -51,548 +51,548 @@ namespace { +@@ -33,548 +33,548 @@ namespace { // Default (for countries with no better engine set) const PrepopulatedEngine* const engines_default[] = { diff --git a/build/patches/Add-English-only-search-engine.patch b/build/patches/Add-English-only-search-engine.patch index a0bd52f8..bbe6e773 100644 --- a/build/patches/Add-English-only-search-engine.patch +++ b/build/patches/Add-English-only-search-engine.patch @@ -64,7 +64,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -51,548 +51,548 @@ namespace { +@@ -33,548 +33,548 @@ namespace { // Default (for countries with no better engine set) const PrepopulatedEngine* const engines_default[] = { diff --git a/build/patches/Add-Qwant-search-engine.patch b/build/patches/Add-Qwant-search-engine.patch index e82e1789..925549a8 100644 --- a/build/patches/Add-Qwant-search-engine.patch +++ b/build/patches/Add-Qwant-search-engine.patch @@ -63,7 +63,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -51,548 +51,548 @@ namespace { +@@ -33,548 +33,548 @@ namespace { // Default (for countries with no better engine set) const PrepopulatedEngine* const engines_default[] = { diff --git a/build/patches/Add-StartPage-search-engine.patch b/build/patches/Add-StartPage-search-engine.patch index b73c4b6a..e4a03cef 100644 --- a/build/patches/Add-StartPage-search-engine.patch +++ b/build/patches/Add-StartPage-search-engine.patch @@ -51,7 +51,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -51,548 +51,548 @@ namespace { +@@ -33,548 +33,548 @@ namespace { // Default (for countries with no better engine set) const PrepopulatedEngine* const engines_default[] = { diff --git a/build/patches/Add-a-flag-for-DNS-over-HTTPS.patch b/build/patches/Add-a-flag-for-DNS-over-HTTPS.patch index c4b0f637..90d52cc2 100644 --- a/build/patches/Add-a-flag-for-DNS-over-HTTPS.patch +++ b/build/patches/Add-a-flag-for-DNS-over-HTTPS.patch @@ -24,7 +24,7 @@ See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-14.txt 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 -@@ -461,6 +461,14 @@ const FeatureEntry::FeatureVariation kCCTModuleCacheVariations[] = { +@@ -427,6 +427,14 @@ const FeatureEntry::FeatureVariation kCCTModuleCacheVariations[] = { base::size(kCCTModuleCache_ThirtyMinutes), nullptr}, }; @@ -39,7 +39,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #endif // OS_ANDROID const FeatureEntry::Choice kNumRasterThreadsChoices[] = { -@@ -3659,6 +3667,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3556,6 +3564,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kAsyncDns)}, #endif // defined(OS_ANDROID) @@ -55,7 +55,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 -@@ -2209,6 +2209,9 @@ const char kAutoFetchOnNetErrorPageDescription[] = +@@ -2254,6 +2254,9 @@ const char kAutoFetchOnNetErrorPageDescription[] = "When enabled, and navigation fails with an offline error, schedule a " "fetch of the page when online again."; @@ -68,7 +68,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 -@@ -1343,6 +1343,9 @@ extern const char kAsyncDnsDescription[]; +@@ -1352,6 +1352,9 @@ extern const char kAsyncDnsDescription[]; extern const char kAutoFetchOnNetErrorPageName[]; extern const char kAutoFetchOnNetErrorPageDescription[]; @@ -81,7 +81,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -22,6 +22,7 @@ +@@ -23,6 +23,7 @@ #include "chrome/browser/component_updater/sth_set_component_installer.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h" @@ -89,7 +89,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/ssl/ssl_config_service_manager.h" #include "chrome/common/channel_info.h" -@@ -389,15 +390,12 @@ SystemNetworkContextManager::SystemNetworkContextManager( +@@ -395,15 +396,12 @@ SystemNetworkContextManager::SystemNetworkContextManager( base::Value(ShouldEnableAsyncDns())); base::ListValue default_doh_servers; base::ListValue default_doh_server_methods; @@ -114,9 +114,9 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc --- a/components/network_session_configurator/common/network_features.cc +++ b/components/network_session_configurator/common/network_features.cc -@@ -10,7 +10,10 @@ namespace features { +@@ -8,7 +8,10 @@ - const base::Feature kChannelID{"channel-id", base::FEATURE_DISABLED_BY_DEFAULT}; + namespace features { -const base::Feature kDnsOverHttps{"dns-over-https", - base::FEATURE_DISABLED_BY_DEFAULT}; @@ -130,9 +130,9 @@ diff --git a/components/network_session_configurator/common/network_features.cc diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h --- a/components/network_session_configurator/common/network_features.h +++ b/components/network_session_configurator/common/network_features.h -@@ -13,9 +13,12 @@ namespace features { - // Enables Channel ID. - NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID; +@@ -10,9 +10,12 @@ + + namespace features { -// Enabled DNS over HTTPS +// DNS over HTTPS server endpoint choices @@ -161,8 +161,8 @@ diff --git a/components/network_session_configurator/common/network_switch_list. diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h --- a/net/base/load_flags_list.h +++ b/net/base/load_flags_list.h -@@ -92,6 +92,12 @@ LOAD_FLAG(MAYBE_USER_GESTURE, 1 << 14) - LOAD_FLAG(DO_NOT_USE_EMBEDDED_IDENTITY, 1 << 15) +@@ -89,6 +89,12 @@ LOAD_FLAG(MAYBE_USER_GESTURE, 1 << 13) + LOAD_FLAG(DO_NOT_USE_EMBEDDED_IDENTITY, 1 << 14) // Indicates that this request is not to be migrated to a cellular network when + @@ -172,7 +172,7 @@ diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h +// "Implementors SHOULD NOT set non-essential HTTP headers in DoH client requests." +LOAD_FLAG(MINIMAL_HEADERS, 1 << 18) // QUIC connection migration is enabled. - LOAD_FLAG(DISABLE_CONNECTION_MIGRATION_TO_CELLULAR, 1 << 16) + LOAD_FLAG(DISABLE_CONNECTION_MIGRATION_TO_CELLULAR, 1 << 15) diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc --- a/net/dns/dns_transaction.cc @@ -229,7 +229,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 -@@ -434,19 +434,23 @@ void URLRequestHttpJob::Start() { +@@ -422,19 +422,23 @@ void URLRequestHttpJob::Start() { // plugin could set a referrer although sending the referrer is inhibited. request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer); @@ -258,7 +258,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque AddExtraHeaders(); AddCookieHeaderAndStart(); -@@ -664,10 +668,12 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -647,10 +651,12 @@ void URLRequestHttpJob::AddExtraHeaders() { HttpRequestHeaders::kAcceptEncoding)) { // Advertise "br" encoding only if transferred data is opaque to proxy. bool advertise_brotli = false; @@ -275,7 +275,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque } } -@@ -684,7 +690,7 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -667,7 +673,7 @@ void URLRequestHttpJob::AddExtraHeaders() { advertised_encodings); } diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 68aaaf2b..0ee12874 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -24,9 +24,9 @@ Offer auto-complete for the proxy page URL. .../policy/core/browser/proxy_policy_handler.cc | 2 +- components/proxy_config/proxy_config_dictionary.cc | 22 +- components/proxy_config/proxy_config_dictionary.h | 6 +- - net/proxy_resolution/proxy_config.cc | 47 ++- + net/proxy_resolution/proxy_config.cc | 45 +++ net/proxy_resolution/proxy_config.h | 3 + - 19 files changed, 915 insertions(+), 13 deletions(-) + 19 files changed, 914 insertions(+), 12 deletions(-) create mode 100644 chrome/browser/resources/proxy_config.css create mode 100644 chrome/browser/resources/proxy_config.html create mode 100644 chrome/browser/resources/proxy_config.js @@ -36,7 +36,7 @@ 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 -@@ -80,6 +80,9 @@ +@@ -81,6 +81,9 @@ 1 2 @@ -66,7 +66,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 -@@ -244,6 +244,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -237,6 +237,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { builtins_to_provide.push_back( base::ASCIIToUTF16(chrome::kChromeUIFlagsURL)); builtins_to_provide.push_back( @@ -78,7 +78,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 -@@ -228,6 +228,8 @@ +@@ -204,6 +204,8 @@ @@ -508,7 +508,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 -@@ -271,6 +271,8 @@ jumbo_split_static_library("ui") { +@@ -273,6 +273,8 @@ jumbo_split_static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -520,7 +520,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 -@@ -50,6 +50,7 @@ +@@ -51,6 +51,7 @@ #include "chrome/browser/ui/webui/policy_tool_ui.h" #include "chrome/browser/ui/webui/policy_ui.h" #include "chrome/browser/ui/webui/predictors/predictors_ui.h" @@ -528,7 +528,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/md_settings_ui.h" #include "chrome/browser/ui/webui/settings_utils.h" -@@ -533,6 +534,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -529,6 +530,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUIWebApksHost) return &NewWebUI; @@ -982,7 +982,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 -@@ -185,6 +185,8 @@ const char kChromeUINativePhysicalWebDiagnosticsURL[] = +@@ -183,6 +183,8 @@ const char kChromeUINativePhysicalWebDiagnosticsURL[] = const char kChromeUINativeScheme[] = "chrome-native"; const char kChromeUIOfflineInternalsHost[] = "offline-internals"; const char kChromeUIPhysicalWebDiagnosticsHost[] = "physical-web-diagnostics"; @@ -991,7 +991,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 -@@ -345,6 +347,7 @@ const char* const kChromeHostURLs[] = { +@@ -344,6 +346,7 @@ const char* const kChromeHostURLs[] = { kChromeUIPasswordManagerInternalsHost, kChromeUIPolicyHost, kChromeUIPredictorsHost, @@ -999,7 +999,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kChromeUIQuotaInternalsHost, kChromeUISignInInternalsHost, kChromeUISiteEngagementHost, -@@ -379,6 +382,7 @@ const char* const kChromeHostURLs[] = { +@@ -378,6 +381,7 @@ const char* const kChromeHostURLs[] = { #if !defined(OS_ANDROID) #if !defined(OS_CHROMEOS) kChromeUIAppLauncherPageHost, @@ -1136,7 +1136,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc --- a/net/proxy_resolution/proxy_config.cc +++ b/net/proxy_resolution/proxy_config.cc -@@ -143,6 +143,51 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) { +@@ -140,6 +140,51 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) { } } @@ -1188,13 +1188,6 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c const ProxyList* ProxyConfig::ProxyRules::MapUrlSchemeToProxyList( const std::string& url_scheme) const { const ProxyList* proxy_server_list = const_cast(this)-> -@@ -270,4 +315,4 @@ std::unique_ptr ProxyConfig::ToValue() const { - return dict; - } - --} // namespace net -\ No newline at end of file -+} // namespace net diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_config.h --- a/net/proxy_resolution/proxy_config.h +++ b/net/proxy_resolution/proxy_config.h diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 549b866d..0b1d9fad 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -111,7 +111,7 @@ 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 -@@ -249,6 +249,7 @@ public abstract class ChromeActivity +@@ -253,6 +253,7 @@ public abstract class ChromeActivity private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener; // Observes when sync becomes ready to create the mContextReporter. @@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener; private ChromeFullscreenManager mFullscreenManager; -@@ -1707,6 +1708,9 @@ public abstract class ChromeActivity +@@ -1690,6 +1691,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -175,8 +175,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr +import org.chromium.base.ContextUtils; import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeFeatureList; - import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; -@@ -43,6 +44,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { + import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabPanel; +@@ -44,6 +45,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { private static final String TAG = "CCMenuPopulator"; private final ContextMenuItemDelegate mDelegate; private final @ContextMenuMode int mMode; @@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr /** * Defines the Groups of each Context Menu Item -@@ -246,7 +248,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -252,7 +254,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { if (FirstRunStatus.getFirstRunFlowComplete() && mMode == ContextMenuMode.NORMAL && !isEmptyUrl(params.getUrl()) && UrlUtilities.isAcceptedScheme(params.getUrl())) { @@ -286,7 +286,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd -@@ -691,6 +691,12 @@ CHAR-LIMIT guidelines: +@@ -688,6 +688,12 @@ CHAR-LIMIT guidelines: Sends some system information and page content to Google @@ -302,8 +302,8 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni -@@ -8,6 +8,7 @@ import("//device/vr/buildflags/buildflags.gni") - import("//chrome/android/feed/feed_java_sources.gni") +@@ -8,6 +8,7 @@ import("//components/offline_pages/buildflags/features.gni") + import("//device/vr/buildflags/buildflags.gni") chrome_java_sources = [ + "java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java", diff --git a/build/patches/Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch b/build/patches/Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch index 298e06b4..f824de31 100644 --- a/build/patches/Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch +++ b/build/patches/Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch @@ -331,7 +331,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd -@@ -224,6 +224,12 @@ CHAR-LIMIT guidelines: +@@ -227,6 +227,12 @@ CHAR-LIMIT guidelines: Search @@ -347,7 +347,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -149,6 +149,10 @@ jumbo_split_static_library("browser") { +@@ -150,6 +150,10 @@ jumbo_split_static_library("browser") { "bitmap_fetcher/bitmap_fetcher_service.h", "bitmap_fetcher/bitmap_fetcher_service_factory.cc", "bitmap_fetcher/bitmap_fetcher_service_factory.h", @@ -358,7 +358,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "bookmarks/bookmark_model_factory.cc", "bookmarks/bookmark_model_factory.h", "bookmarks/bookmark_stats.cc", -@@ -2588,8 +2592,6 @@ jumbo_split_static_library("browser") { +@@ -2614,8 +2618,6 @@ jumbo_split_static_library("browser") { "banners/app_banner_infobar_delegate_desktop.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", @@ -367,7 +367,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "certificate_viewer.h", "chrome_browser_field_trials_desktop.cc", "chrome_browser_field_trials_desktop.h", -@@ -2678,8 +2680,6 @@ jumbo_split_static_library("browser") { +@@ -2704,8 +2706,6 @@ jumbo_split_static_library("browser") { "importer/importer_uma.h", "importer/in_process_importer_bridge.cc", "importer/in_process_importer_bridge.h", @@ -401,7 +401,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_android.h" - #include "chrome/browser/signin/signin_manager_factory.h" + #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" +#include "chrome/common/importer/imported_bookmark_entry.h" +#include "chrome/common/importer/importer_data_types.h" @@ -409,21 +409,20 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" -@@ -30,11 +41,14 @@ +@@ -30,10 +41,13 @@ #include "components/bookmarks/managed/managed_bookmark_service.h" #include "components/prefs/pref_service.h" #include "components/query_parser/query_parser.h" +#include "components/search_engines/template_url.h" - #include "components/signin/core/browser/signin_manager.h" #include "components/undo/bookmark_undo_service.h" #include "components/undo/undo_manager.h" +#include "components/url_formatter/url_fixer.h" #include "content/public/browser/browser_thread.h" #include "jni/BookmarkBridge_jni.h" +#include "ui/android/window_android.h" + #include "services/identity/public/cpp/identity_manager.h" using base::android::AttachCurrentThread; - using base::android::ConvertUTF8ToJavaString; @@ -53,6 +67,57 @@ using bookmarks::BookmarkPermanentNode; using bookmarks::BookmarkType; using content::BrowserThread; @@ -731,7 +730,7 @@ diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -442,6 +442,9 @@ static_library("common") { +@@ -441,6 +441,9 @@ static_library("common") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index e5a63047..36886ec6 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -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/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils; +@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils; import org.chromium.chrome.browser.notifications.NotificationPlatformBridge; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; import org.chromium.chrome.browser.profiles.Profile; @@ -49,7 +49,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis import org.chromium.chrome.browser.searchwidget.SearchActivity; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin; -@@ -272,6 +273,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -273,6 +274,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega */ public static boolean isCustomTabIntent(Intent intent) { if (intent == null) return false; @@ -94,7 +94,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd -@@ -3875,6 +3875,13 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from +@@ -3972,6 +3972,13 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from Browse diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index d863b8e8..eef9b7d1 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -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 -@@ -2100,6 +2100,8 @@ public abstract class ChromeActivity +@@ -2096,6 +2096,8 @@ public abstract class ChromeActivity RecordUserAction.record("MobileMenuSettings"); } else if (id == R.id.show_menu) { showAppMenuForKeyboardEvent(); @@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd -@@ -2992,6 +2992,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Settings diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch index 47227078..9fc55c5b 100644 --- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -18,7 +18,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 -@@ -964,6 +964,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { +@@ -912,6 +912,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { net::kEffectiveConnectionType4G}, }; @@ -30,7 +30,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 == -@@ -2607,6 +2612,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2495,6 +2500,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMaterialDesignIncognitoNTPName, flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)}, @@ -43,7 +43,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 -@@ -1142,6 +1142,10 @@ const char kMaterialDesignIncognitoNTPDescription[] = +@@ -1231,6 +1231,10 @@ const char kMaterialDesignIncognitoNTPDescription[] = "If enabled, the Incognito New Tab page uses the new material design with " "a better readable text."; @@ -57,7 +57,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 -@@ -710,6 +710,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[]; +@@ -748,6 +748,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[]; extern const char kMaterialDesignIncognitoNTPName[]; extern const char kMaterialDesignIncognitoNTPDescription[]; @@ -77,9 +77,9 @@ diff --git a/components/network_session_configurator/common/network_features.cc +const char kMaxConnectionsPerHostChoiceDefault[] = "6", + kMaxConnectionsPerHostChoice15[] = "15"; + - const base::Feature kChannelID{"channel-id", base::FEATURE_DISABLED_BY_DEFAULT}; - const char kDnsOverHttpsChoiceDefault[] = "Disabled", + kDnsOverHttpsChoiceGoogle[] = "Google", + kDnsOverHttpsChoiceCloudflare[] = "Cloudflare", diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h --- a/components/network_session_configurator/common/network_features.h +++ b/components/network_session_configurator/common/network_features.h @@ -91,9 +91,9 @@ diff --git a/components/network_session_configurator/common/network_features.h b + kMaxConnectionsPerHostChoice6[], + kMaxConnectionsPerHostChoice15[]; + - // Enables Channel ID. - NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID; - + // DNS over HTTPS server endpoint choices + // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-12.txt). + NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps; diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h --- a/components/network_session_configurator/common/network_switch_list.h +++ b/components/network_session_configurator/common/network_switch_list.h @@ -130,7 +130,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket namespace net { -@@ -316,6 +319,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool( +@@ -314,6 +317,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool( int ClientSocketPoolManager::max_sockets_per_group( HttpNetworkSession::SocketPoolType pool_type) { DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES); diff --git a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch index 4333dfe7..3c35b7d4 100644 --- a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch +++ b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch @@ -13,7 +13,7 @@ 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 -@@ -3439,6 +3439,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3330,6 +3330,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kUseGoogleLocalNtp)}, #endif // !defined(OS_ANDROID) @@ -28,7 +28,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 -@@ -759,6 +759,11 @@ const char kEnablePictureInPictureName[] = "Enable Picture-in-Picture."; +@@ -791,6 +791,11 @@ const char kEnablePictureInPictureName[] = "Enable Picture-in-Picture."; const char kEnablePictureInPictureDescription[] = "Enable the Picture-in-Picture feature for videos."; @@ -43,7 +43,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 -@@ -470,6 +470,9 @@ extern const char kOOPHPStackModePseudo[]; +@@ -479,6 +479,9 @@ extern const char kOOPHPStackModePseudo[]; extern const char kEnablePictureInPictureName[]; extern const char kEnablePictureInPictureDescription[]; @@ -56,7 +56,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 -@@ -221,11 +221,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", +@@ -217,11 +217,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", // when in background. const base::Feature kResumeBackgroundVideo { "resume-background-video", @@ -68,7 +68,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc + base::FEATURE_DISABLED_BY_DEFAULT }; - // Display the Cast overlay button on the media controls. + // Enable Media Capabilities with finch-parameters. -- 2.11.0 diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index 9100e3ae..270577ad 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -14,7 +14,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 -@@ -3499,6 +3499,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3382,6 +3382,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kEnableVirtualKeyboardUkm)}, #endif // OS_CHROMEOS @@ -29,7 +29,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 -@@ -763,6 +763,10 @@ const char kOOPHPStackModeNative[] = "Native"; +@@ -795,6 +795,10 @@ const char kOOPHPStackModeNative[] = "Native"; const char kOOPHPStackModeNativeWithThreadNames[] = "Native with thread names"; const char kOOPHPStackModePseudo[] = "Trace events"; @@ -43,7 +43,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 -@@ -473,6 +473,9 @@ extern const char kOOPHPStackModeNative[]; +@@ -482,6 +482,9 @@ extern const char kOOPHPStackModeNative[]; extern const char kOOPHPStackModeNativeWithThreadNames[]; extern const char kOOPHPStackModePseudo[]; @@ -56,7 +56,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc --- a/net/dns/host_resolver_impl.cc +++ b/net/dns/host_resolver_impl.cc -@@ -76,6 +76,7 @@ +@@ -78,6 +78,7 @@ #include "net/log/net_log_with_source.h" #include "net/socket/client_socket_factory.h" #include "net/socket/datagram_client_socket.h" @@ -64,7 +64,7 @@ diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc #include "url/url_canon_ip.h" #if BUILDFLAG(ENABLE_MDNS) -@@ -2719,8 +2720,13 @@ bool HostResolverImpl::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -2773,8 +2774,13 @@ bool HostResolverImpl::IsIPv6Reachable(const NetLogWithSource& net_log) { bool cached = true; if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { @@ -102,7 +102,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp COMPONENT_EXPORT(NETWORK_CPP) +extern const base::Feature kIPv6Probing; +COMPONENT_EXPORT(NETWORK_CPP) - extern const base::Feature kOutOfBlinkCORS; + extern const base::Feature kOutOfBlinkCors; COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kReporting; -- diff --git a/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch b/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch index b59f49ce..e23e503a 100644 --- a/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch +++ b/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch @@ -20,7 +20,7 @@ legacy acceleration events. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3005,6 +3005,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2900,6 +2900,12 @@ const FeatureEntry kFeatureEntries[] = { {"enable-generic-sensor", flag_descriptions::kEnableGenericSensorName, flag_descriptions::kEnableGenericSensorDescription, kOsAll, FEATURE_VALUE_TYPE(features::kGenericSensor)}, @@ -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 -@@ -551,6 +551,14 @@ const char kEnableGenericSensorDescription[] = +@@ -567,6 +567,14 @@ const char kEnableGenericSensorDescription[] = "Accelerometer, LinearAccelerationSensor, Gyroscope, " "AbsoluteOrientationSensor and RelativeOrientationSensor interfaces."; @@ -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 -@@ -362,6 +362,12 @@ extern const char kEnableEnumeratingAudioDevicesDescription[]; +@@ -368,6 +368,12 @@ extern const char kEnableEnumeratingAudioDevicesDescription[]; extern const char kEnableGenericSensorName[]; extern const char kEnableGenericSensorDescription[]; @@ -70,20 +70,20 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -143,6 +143,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs( - if (command_line.HasSwitch(switches::kDisableSharedWorkers)) - WebRuntimeFeatures::EnableSharedWorker(false); +@@ -145,6 +145,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs( + base::FeatureList::IsEnabled(features::kSharedArrayBuffer) || + base::FeatureList::IsEnabled(features::kWebAssemblyThreads)); + WebRuntimeFeatures::EnableDeviceMotion(base::FeatureList::IsEnabled(features::kDeviceMotion)); + WebRuntimeFeatures::EnableDeviceOrientation(base::FeatureList::IsEnabled(features::kDeviceOrientation)); + - if (command_line.HasSwitch(switches::kDisableSpeechAPI)) - WebRuntimeFeatures::EnableScriptedSpeech(false); + if (command_line.HasSwitch(switches::kDisableSharedWorkers)) + WebRuntimeFeatures::EnableSharedWorker(false); 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 -@@ -570,6 +570,16 @@ const base::Feature kWebRtcHideLocalIpsWithMdns{ +@@ -598,6 +598,16 @@ const base::Feature kWebRtcHideLocalIpsWithMdns{ // https://wicg.github.io/webusb const base::Feature kWebUsb{"WebUSB", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -103,7 +103,7 @@ 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 -@@ -152,6 +152,8 @@ CONTENT_EXPORT extern const char kWebXrRenderPathParamValueGpuFence[]; +@@ -156,6 +156,8 @@ CONTENT_EXPORT extern const char kWebXrRenderPathParamValueGpuFence[]; CONTENT_EXPORT extern const char kWebXrRenderPathParamValueSharedBuffer[]; #endif // defined(OS_ANDROID) @@ -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 -@@ -85,6 +85,8 @@ class WebRuntimeFeatures { +@@ -97,6 +97,8 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableCSSFragmentIdentifiers(bool); BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool); BLINK_PLATFORM_EXPORT static void EnableDatabase(bool); @@ -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 -@@ -136,6 +136,14 @@ void WebRuntimeFeatures::EnableDatabase(bool enable) { +@@ -152,6 +152,14 @@ void WebRuntimeFeatures::EnableDatabase(bool enable) { RuntimeEnabledFeatures::SetDatabaseEnabled(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 -@@ -357,6 +357,14 @@ +@@ -371,6 +371,14 @@ status: "stable", }, { diff --git a/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch b/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch index 9cf681ee..39fd6de3 100644 --- a/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch +++ b/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch @@ -75,7 +75,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 -@@ -2195,6 +2195,14 @@ public abstract class ChromeActivity +@@ -2196,6 +2196,14 @@ public abstract class ChromeActivity final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent(); currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange); RecordUserAction.record("MobileMenuRequestDesktopSite"); @@ -93,7 +93,7 @@ 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 -@@ -1718,6 +1718,14 @@ public class ChromeTabbedActivity +@@ -1709,6 +1709,14 @@ public class ChromeTabbedActivity NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER); } RecordUserAction.record("MobileMenuDownloadManager"); @@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu import org.chromium.chrome.browser.ShortcutHelper; import org.chromium.chrome.browser.UrlConstants; import org.chromium.chrome.browser.banners.AppBannerManager; -@@ -209,6 +210,8 @@ public class AppMenuPropertiesDelegate { +@@ -197,6 +198,8 @@ public class AppMenuPropertiesDelegate { updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */); @@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu // Only display reader mode settings menu option if the current page is in reader mode. menu.findItem(R.id.reader_mode_prefs_id) .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl())); -@@ -448,6 +451,41 @@ public class AppMenuPropertiesDelegate { +@@ -450,6 +453,41 @@ public class AppMenuPropertiesDelegate { } /** @@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd -@@ -2977,6 +2977,17 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Find in page diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index 30ff818b..ee35cd27 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -13,7 +13,7 @@ Subject: Add option to not persist tabs across sessions 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 -@@ -66,6 +66,9 @@ +@@ -67,6 +67,9 @@ @@ -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 -@@ -1030,8 +1030,10 @@ public class ChromeTabbedActivity +@@ -1016,8 +1016,10 @@ public class ChromeTabbedActivity boolean hadCipherData = CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState()); @@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd -@@ -3765,6 +3765,12 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from +@@ -3853,6 +3853,12 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from IMAGE diff --git a/build/patches/Add-site-settings-option-for-session-only-cookies.patch b/build/patches/Add-site-settings-option-for-session-only-cookies.patch index 503f5cad..55e05b6b 100644 --- a/build/patches/Add-site-settings-option-for-session-only-cookies.patch +++ b/build/patches/Add-site-settings-option-for-session-only-cookies.patch @@ -28,7 +28,7 @@ diff --git a/chrome/android/java/res/xml/website_preferences.xml b/chrome/androi --- a/chrome/android/java/res/xml/website_preferences.xml +++ b/chrome/android/java/res/xml/website_preferences.xml @@ -26,6 +26,13 @@ - android:summary="@string/allow_third_party_cookies_summary" + android:summary="@string/block_third_party_cookies_summary" android:defaultValue="true" android:persistent="false" /> + @@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre /** * @return Whether third-party cookie blocking is configured by policy */ -@@ -638,6 +642,10 @@ public class PrefServiceBridge { +@@ -631,6 +635,10 @@ public class PrefServiceBridge { nativeSetBlockThirdPartyCookiesEnabled(enabled); } @@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre public void setDoNotTrackEnabled(boolean enabled) { nativeSetDoNotTrackEnabled(enabled); } -@@ -1086,6 +1094,7 @@ public class PrefServiceBridge { +@@ -1079,6 +1087,7 @@ public class PrefServiceBridge { private native boolean nativeGetAutoplayEnabled(); private native boolean nativeGetBackgroundSyncEnabled(); private native boolean nativeGetBlockThirdPartyCookiesEnabled(); @@ -74,7 +74,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre private native boolean nativeGetBlockThirdPartyCookiesManaged(); private native boolean nativeGetRememberPasswordsEnabled(); private native boolean nativeGetPasswordManagerAutoSigninEnabled(); -@@ -1132,6 +1141,7 @@ public class PrefServiceBridge { +@@ -1125,6 +1134,7 @@ public class PrefServiceBridge { private native void nativeSetAutoplayEnabled(boolean enabled); private native void nativeSetAllowCookiesEnabled(boolean enabled); private native void nativeSetBackgroundSyncEnabled(boolean enabled); @@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java -@@ -110,6 +110,7 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -121,6 +121,7 @@ public class SingleCategoryPreferences extends PreferenceFragment // Keys for category-specific preferences (toggle, link, button etc.), dynamically shown. public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies"; @@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate"; public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more"; private static final String ADD_EXCEPTION_KEY = "add_exception"; -@@ -438,6 +439,7 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -440,6 +441,7 @@ public class SingleCategoryPreferences extends PreferenceFragment if (type == SiteSettingsCategory.Type.COOKIES) { updateThirdPartyCookiesCheckBox(); @@ -101,16 +101,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web } else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) { updateNotificationsVibrateCheckBox(); } -@@ -476,6 +478,8 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -478,6 +480,8 @@ public class SingleCategoryPreferences extends PreferenceFragment + prefServiceBridge.setContentSetting( + mCategory.getContentSettingsType(), setting.toInt()); getInfoForOrigins(); - } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) { - prefServiceBridge.setBlockThirdPartyCookiesEnabled(!((boolean) newValue)); + } else if (COOKIES_SESSION_ONLY_TOGGLE_KEY.equals(preference.getKey())) { + prefServiceBridge.setCookiesSessionOnlyEnabled((boolean) newValue); + } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) { + prefServiceBridge.setBlockThirdPartyCookiesEnabled(((boolean) newValue)); } else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) { - prefServiceBridge.setNotificationsVibrateEnabled((boolean) newValue); - } -@@ -738,6 +742,8 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -767,6 +771,8 @@ public class SingleCategoryPreferences extends PreferenceFragment TriStateSiteSettingsPreference triStateToggle = (TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY); Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY); @@ -119,16 +119,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY); Preference explainProtectedMediaKey = screen.findPreference(EXPLAIN_PROTECTED_MEDIA_KEY); PreferenceGroup allowedGroup = (PreferenceGroup) screen.findPreference(ALLOWED_GROUP); -@@ -752,6 +758,7 @@ public class SingleCategoryPreferences extends PreferenceFragment - screen.removePreference(binaryToggle); - screen.removePreference(triStateToggle); +@@ -797,6 +803,7 @@ public class SingleCategoryPreferences extends PreferenceFragment + + if (hideSecondaryToggles) { screen.removePreference(thirdPartyCookies); + screen.removePreference(cookiesSessionOnly); screen.removePreference(notificationsVibrate); screen.removePreference(explainProtectedMediaKey); screen.removePreference(allowedGroup); -@@ -787,12 +794,15 @@ public class SingleCategoryPreferences extends PreferenceFragment - configureBinaryToggle(binaryToggle, contentType); +@@ -806,12 +813,15 @@ public class SingleCategoryPreferences extends PreferenceFragment + return; } - // Configure/hide the third-party cookie toggle, as needed. @@ -144,7 +144,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web } // Configure/hide the notifications vibrate toggle, as needed. -@@ -878,6 +888,15 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -916,6 +926,15 @@ public class SingleCategoryPreferences extends PreferenceFragment preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged()); } @@ -163,9 +163,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd -@@ -882,6 +882,12 @@ Your Google account may have other forms of browsing history like searches and a - - Third-party websites can save and read cookie data +@@ -879,6 +879,12 @@ Your Google account may have other forms of browsing history like searches and a + + Prevent third-party websites from saving and reading cookie data + + Keep cookies only until you quit your browser @@ -197,7 +197,7 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesManaged( JNIEnv* env, const JavaParamRef& obj) { -@@ -774,6 +785,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled( +@@ -767,6 +778,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled( GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled); } diff --git a/build/patches/Allow-building-without-safebrowsing-for-Android.patch b/build/patches/Allow-building-without-safebrowsing-for-Android.patch index bfe8125e..b0be8089 100644 --- a/build/patches/Allow-building-without-safebrowsing-for-Android.patch +++ b/build/patches/Allow-building-without-safebrowsing-for-Android.patch @@ -4,37 +4,33 @@ Subject: Allow building without safebrowsing for Android Fix build from scratch (issue found by nikolowry) --- - .../android/java/res/xml/privacy_preferences.xml | 12 ----- - .../preferences/privacy/PrivacyPreferences.java | 58 ---------------------- - .../chrome_browsing_data_remover_delegate.cc | 10 ---- - chrome/browser/chrome_content_browser_client.cc | 14 +----- - .../file_type_policies_component_installer.cc | 2 + - .../download/chrome_download_manager_delegate.cc | 14 +++++- - .../download/chrome_download_manager_delegate.h | 6 +++ - chrome/browser/download/download_item_model.cc | 10 ++++ - chrome/browser/download/download_item_model.h | 4 ++ - chrome/browser/download/download_prefs.cc | 4 ++ - .../browser/download/download_target_determiner.cc | 18 +++++++ - .../browser/download/download_target_determiner.h | 6 +++ - chrome/browser/download/download_target_info.cc | 4 ++ - chrome/browser/download/download_target_info.h | 4 ++ - chrome/browser/download/download_ui_model.cc | 4 ++ - chrome/browser/download/download_ui_model.h | 4 ++ - .../chrome_resource_dispatcher_host_delegate.cc | 4 ++ - chrome/browser/net/chrome_network_delegate.cc | 35 +------------ - 18 files changed, 85 insertions(+), 128 deletions(-) + .../android/java/res/xml/privacy_preferences.xml | 8 ----- + .../preferences/privacy/PrivacyPreferences.java | 40 ---------------------- + .../chrome_browsing_data_remover_delegate.cc | 10 ------ + chrome/browser/chrome_content_browser_client.cc | 14 +------- + .../file_type_policies_component_installer.cc | 2 ++ + .../download/chrome_download_manager_delegate.cc | 14 ++++++-- + .../download/chrome_download_manager_delegate.h | 6 ++++ + chrome/browser/download/download_item_model.cc | 10 ++++++ + chrome/browser/download/download_item_model.h | 4 +++ + chrome/browser/download/download_prefs.cc | 4 +++ + .../browser/download/download_target_determiner.cc | 18 ++++++++++ + .../browser/download/download_target_determiner.h | 6 ++++ + chrome/browser/download/download_target_info.cc | 4 +++ + chrome/browser/download/download_target_info.h | 4 +++ + chrome/browser/download/download_ui_model.cc | 4 +++ + chrome/browser/download/download_ui_model.h | 4 +++ + .../chrome_resource_dispatcher_host_delegate.cc | 4 +++ + chrome/browser/net/chrome_network_delegate.cc | 35 ++----------------- + 18 files changed, 85 insertions(+), 106 deletions(-) diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -18,18 +18,6 @@ +@@ -18,14 +18,6 @@ android:summary="@string/search_suggestions_summary" android:defaultValue="true" /> -- @@ -49,48 +45,34 @@ 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/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java -@@ -38,11 +38,6 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -38,9 +38,6 @@ public class PrivacyPreferences extends PreferenceFragment implements OnPreferenceChangeListener { private static final String PREF_NAVIGATION_ERROR = "navigation_error"; private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions"; -- private static final String PREF_SAFE_BROWSING_EXTENDED_REPORTING = -- "safe_browsing_extended_reporting"; - private static final String PREF_SAFE_BROWSING_SCOUT_REPORTING = - "safe_browsing_scout_reporting"; - private static final String PREF_SAFE_BROWSING = "safe_browsing"; private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search"; private static final String PREF_NETWORK_PREDICTIONS = "network_predictions"; -@@ -76,10 +71,6 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -74,8 +71,6 @@ public class PrivacyPreferences extends PreferenceFragment // Remove preferences that were migrated to SyncAndServicesPreferences. preferenceScreen.removePreference(findPreference(PREF_NAVIGATION_ERROR)); preferenceScreen.removePreference(findPreference(PREF_SEARCH_SUGGESTIONS)); -- preferenceScreen.removePreference( -- findPreference(PREF_SAFE_BROWSING_EXTENDED_REPORTING)); - preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING)); - preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING)); preferenceScreen.removePreference(findPreference(PREF_NETWORK_PREDICTIONS)); preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH)); preferenceScreen.removePreference(findPreference(PREF_USAGE_AND_CRASH_REPORTING)); -@@ -119,27 +110,6 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -115,17 +110,6 @@ public class PrivacyPreferences extends PreferenceFragment preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH)); } -- // Listen to changes to both Extended Reporting prefs. -- ChromeBaseCheckBoxPreference legacyExtendedReportingPref = -- (ChromeBaseCheckBoxPreference) findPreference( -- PREF_SAFE_BROWSING_EXTENDED_REPORTING); -- legacyExtendedReportingPref.setOnPreferenceChangeListener(this); -- legacyExtendedReportingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); +- // Listen to changes to the Extended Reporting pref. - ChromeBaseCheckBoxPreference scoutReportingPref = - (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING); - scoutReportingPref.setOnPreferenceChangeListener(this); - scoutReportingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); -- // Remove the extended reporting preference that is NOT active. -- String extended_reporting_pref_to_remove = -- prefServiceBridge.isSafeBrowsingScoutReportingActive() -- ? PREF_SAFE_BROWSING_EXTENDED_REPORTING : PREF_SAFE_BROWSING_SCOUT_REPORTING; -- preferenceScreen.removePreference(findPreference(extended_reporting_pref_to_remove)); - - ChromeBaseCheckBoxPreference safeBrowsingPref = - (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING); @@ -100,27 +82,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri updateSummaries(); } -@@ -148,12 +118,6 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -134,11 +118,6 @@ public class PrivacyPreferences extends PreferenceFragment String key = preference.getKey(); if (PREF_SEARCH_SUGGESTIONS.equals(key)) { PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue); - } else if (PREF_SAFE_BROWSING.equals(key)) { - PrefServiceBridge.getInstance().setSafeBrowsingEnabled((boolean) newValue); -- } else if (PREF_SAFE_BROWSING_EXTENDED_REPORTING.equals(key) -- || PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) { +- } else if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) { - PrefServiceBridge.getInstance().setSafeBrowsingExtendedReportingEnabled( - (boolean) newValue); } else if (PREF_NETWORK_PREDICTIONS.equals(key)) { PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue); recordNetworkPredictionEnablingUMA((boolean) newValue); -@@ -202,21 +166,6 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -187,19 +166,6 @@ public class PrivacyPreferences extends PreferenceFragment searchSuggestionsPref.setChecked(prefServiceBridge.isSearchSuggestEnabled()); } -- String extended_reporting_pref = prefServiceBridge.isSafeBrowsingScoutReportingActive() -- ? PREF_SAFE_BROWSING_SCOUT_REPORTING : PREF_SAFE_BROWSING_EXTENDED_REPORTING; - CheckBoxPreference extendedReportingPref = -- (CheckBoxPreference) findPreference(extended_reporting_pref); +- (CheckBoxPreference) findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING); - if (extendedReportingPref != null) { - extendedReportingPref.setChecked( - prefServiceBridge.isSafeBrowsingExtendedReportingEnabled()); @@ -135,12 +114,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri CheckBoxPreference canMakePaymentPref = (CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT); if (canMakePaymentPref != null) { -@@ -253,13 +202,6 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -236,12 +202,6 @@ public class PrivacyPreferences extends PreferenceFragment if (PREF_SEARCH_SUGGESTIONS.equals(key)) { return prefs.isSearchSuggestManaged(); } -- if (PREF_SAFE_BROWSING_EXTENDED_REPORTING.equals(key) -- || PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) { +- if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) { - return prefs.isSafeBrowsingExtendedReportingManaged(); - } - if (PREF_SAFE_BROWSING.equals(key)) { @@ -152,7 +130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -254,16 +254,6 @@ bool DoesOriginMatchEmbedderMask(int origin_type_mask, +@@ -242,16 +242,6 @@ bool DoesOriginMatchEmbedderMask(int origin_type_mask, return false; } @@ -172,7 +150,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. 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 -@@ -4853,19 +4853,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( +@@ -4990,19 +4990,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( content::ResourceContext* resource_context) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -228,9 +206,9 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom #include "chrome/common/safe_browsing/file_type_policies.h" +#endif #include "chrome/grit/generated_resources.h" - #include "components/download/database/in_progress/in_progress_cache_impl.h" #include "components/download/public/common/download_interrupt_reasons.h" -@@ -95,8 +99,10 @@ + #include "components/download/public/common/download_item.h" +@@ -94,8 +98,10 @@ using content::BrowserThread; using download::DownloadItem; using content::DownloadManager; @@ -241,7 +219,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom namespace { -@@ -746,19 +752,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() const { +@@ -744,19 +750,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() const { return std::string(chrome::kApplicationClientIDStringForAVScanning); } @@ -263,7 +241,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom void ChromeDownloadManagerDelegate::NotifyExtensions( DownloadItem* download, -@@ -1201,13 +1207,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( +@@ -1199,13 +1205,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif @@ -365,7 +343,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow is_being_revived_(false) {} } // namespace -@@ -376,6 +384,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) { +@@ -368,6 +376,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) { data->should_prefer_opening_in_browser_ = preference; } @@ -373,7 +351,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const { const DownloadItemModelData* data = DownloadItemModelData::Get(download_); return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS; -@@ -386,6 +395,7 @@ void DownloadItemModel::SetDangerLevel( +@@ -378,6 +387,7 @@ void DownloadItemModel::SetDangerLevel( DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } @@ -691,7 +669,7 @@ diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/downlo diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc --- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc -@@ -451,14 +451,18 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles( +@@ -421,14 +421,18 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles( content::ResourceContext* resource_context, ResourceType resource_type, std::vector>* throttles) { @@ -713,7 +691,7 @@ diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc -@@ -79,19 +79,6 @@ namespace { +@@ -78,19 +78,6 @@ namespace { bool g_access_to_all_files_enabled = false; @@ -733,7 +711,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ bool IsAccessAllowedInternal(const base::FilePath& path, const base::FilePath& profile_path) { if (g_access_to_all_files_enabled) -@@ -213,26 +200,8 @@ int ChromeNetworkDelegate::OnBeforeURLRequest( +@@ -212,26 +199,8 @@ int ChromeNetworkDelegate::OnBeforeURLRequest( GURL* new_url) { extensions_delegate_->ForwardStartRequestStatus(request); diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 1daadb15..de0a987b 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -10,7 +10,7 @@ Subject: Allow playing audio in background diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc --- a/media/blink/webmediaplayer_impl.cc +++ b/media/blink/webmediaplayer_impl.cc -@@ -908,6 +908,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -917,6 +917,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -23,7 +23,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp void WebMediaPlayerImpl::EnabledAudioTracksChanged( const blink::WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3053,7 +3059,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const { +@@ -3108,7 +3114,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const { // If suspending background video, pause any video that's not remoted or // not unlocked to play in the background. if (IsBackgroundSuspendEnabled(delegate_)) { @@ -38,7 +38,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 -@@ -161,6 +161,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl +@@ -162,6 +162,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl // True if the loaded media has a playable video/audio track. bool HasVideo() const override; bool HasAudio() const override; diff --git a/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch b/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch index 6a814874..a96916a6 100644 --- a/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch +++ b/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch @@ -11,7 +11,7 @@ Do not read experiment value for cronet async DNS configuration diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -216,7 +216,7 @@ void OnAuthPrefsChanged(PrefService* local_state, +@@ -219,7 +219,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 -@@ -476,7 +476,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( +@@ -517,7 +517,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( effective_experimental_options->Remove(it.key(), nullptr); continue; } diff --git a/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch b/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch index 1c80502f..ff604972 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch @@ -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 -@@ -320,6 +320,7 @@ void AudioContext::StopRendering() { +@@ -330,6 +330,7 @@ void AudioContext::StopRendering() { double AudioContext::baseLatency() const { DCHECK(IsMainThread()); DCHECK(destination()); diff --git a/build/patches/Battery-API-return-nothing.patch b/build/patches/Battery-API-return-nothing.patch index b670c7d3..a9cb464e 100644 --- a/build/patches/Battery-API-return-nothing.patch +++ b/build/patches/Battery-API-return-nothing.patch @@ -49,13 +49,13 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi - return; - - if (battery_status_.Charging() != old_status.Charging()) -- DispatchEvent(*Event::Create(EventTypeNames::chargingchange)); +- DispatchEvent(*Event::Create(event_type_names::kChargingchange)); - if (battery_status_.charging_time() != old_status.charging_time()) -- DispatchEvent(*Event::Create(EventTypeNames::chargingtimechange)); +- DispatchEvent(*Event::Create(event_type_names::kChargingtimechange)); - if (battery_status_.discharging_time() != old_status.discharging_time()) -- DispatchEvent(*Event::Create(EventTypeNames::dischargingtimechange)); +- DispatchEvent(*Event::Create(event_type_names::kDischargingtimechange)); - if (battery_status_.Level() != old_status.Level()) -- DispatchEvent(*Event::Create(EventTypeNames::levelchange)); +- DispatchEvent(*Event::Create(event_type_names::kLevelchange)); } void BatteryManager::RegisterWithDispatcher() { diff --git a/build/patches/Bromite-adblock-engine.patch b/build/patches/Bromite-adblock-engine.patch index 0a5a8a33..06dd4b33 100644 --- a/build/patches/Bromite-adblock-engine.patch +++ b/build/patches/Bromite-adblock-engine.patch @@ -73,7 +73,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 -@@ -2205,6 +2205,14 @@ public abstract class ChromeActivity +@@ -2206,6 +2206,14 @@ public abstract class ChromeActivity RecordUserAction.record("MobileMenuRequestEnableJavascript"); } else if (id == R.id.reader_mode_prefs_id) { DomDistillerUIUtils.openSettings(currentTab.getWebContents()); @@ -91,7 +91,7 @@ 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 -@@ -1676,6 +1676,14 @@ public class ChromeTabbedActivity +@@ -1667,6 +1667,14 @@ public class ChromeTabbedActivity reportNewTabShortcutUsed(true); getTabCreator(true).launchNTP(); } @@ -109,7 +109,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/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java -@@ -208,6 +208,8 @@ public class AppMenuPropertiesDelegate { +@@ -196,6 +196,8 @@ public class AppMenuPropertiesDelegate { && !TextUtils.isEmpty(url); prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem); @@ -118,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */); updateEnableJavascriptMenuItem(menu, currentTab); -@@ -486,6 +488,42 @@ public class AppMenuPropertiesDelegate { +@@ -488,6 +490,42 @@ public class AppMenuPropertiesDelegate { } /** @@ -176,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd -@@ -2997,6 +2997,17 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Turn on Request desktop site @@ -205,7 +205,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" #include "chrome/browser/net/chrome_extensions_network_delegate.h" -@@ -60,6 +61,7 @@ +@@ -59,6 +60,7 @@ #if defined(OS_ANDROID) #include "base/android/path_utils.h" #include "chrome/browser/io_thread.h" @@ -213,7 +213,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ #endif #if defined(OS_CHROMEOS) -@@ -194,16 +196,76 @@ void ChromeNetworkDelegate::set_cookie_settings( +@@ -193,16 +195,76 @@ void ChromeNetworkDelegate::set_cookie_settings( cookie_settings_ = cookie_settings; } @@ -304,7 +304,7 @@ diff --git a/chrome/browser/subresource_filter/subresource_filter_content_settin diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1731,6 +1731,13 @@ component("net") { +@@ -1758,6 +1758,13 @@ component("net") { "url_request/websocket_handshake_userdata_key.h", ] diff --git a/build/patches/Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch b/build/patches/Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch index 027af16d..ed84444c 100644 --- a/build/patches/Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch +++ b/build/patches/Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch @@ -30,7 +30,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/task_type.h" #include "third_party/blink/public/platform/web_scroll_into_view_params.h" -@@ -788,7 +786,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -789,7 +787,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { GetState().GetTextAlign(), text); // scale text metrics by 3/1000000th @@ -46,7 +46,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info. WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create( WebGLRenderingContextBase* context) { -- return new WebGLDebugRendererInfo(context); +- return MakeGarbageCollected(context); + return nullptr; } @@ -59,7 +59,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info. 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 -@@ -1432,7 +1432,9 @@ jumbo_component("platform") { +@@ -1429,7 +1429,9 @@ jumbo_component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -108,7 +108,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkPaint.h" -+#include "third_party/skia/src/core/SkColorData.h" ++#include "third_party/skia/include/private/SkColorData.h" #include "third_party/skia/include/core/SkSurface.h" #include "third_party/skia/include/gpu/GrContext.h" diff --git a/build/patches/Disable-NTP-remote-suggestions-by-default.patch b/build/patches/Disable-NTP-remote-suggestions-by-default.patch index 95cb3ce2..05dad2ca 100644 --- a/build/patches/Disable-NTP-remote-suggestions-by-default.patch +++ b/build/patches/Disable-NTP-remote-suggestions-by-default.patch @@ -9,7 +9,7 @@ Subject: Disable NTP remote suggestions by default diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc --- a/components/ntp_snippets/features.cc +++ b/components/ntp_snippets/features.cc -@@ -35,13 +35,13 @@ const base::Feature* const kAllFeatures[] = { +@@ -34,13 +34,13 @@ const base::Feature* const kAllFeatures[] = { &kRemoteSuggestionsBackendFeature}; const base::Feature kArticleSuggestionsFeature{ @@ -24,8 +24,8 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT}; - const base::Feature kForeignSessionsSuggestionsFeature{ - "NTPForeignSessionsSuggestions", base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kBreakingNewsPushFeature{"BreakingNewsPush", + base::FEATURE_DISABLED_BY_DEFAULT}; -- 2.11.0 diff --git a/build/patches/Disable-Omaha-update-checks.patch b/build/patches/Disable-Omaha-update-checks.patch index eda590de..4b465c08 100644 --- a/build/patches/Disable-Omaha-update-checks.patch +++ b/build/patches/Disable-Omaha-update-checks.patch @@ -36,8 +36,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNu 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 -@@ -334,7 +334,7 @@ const base::Feature kInflateToolbarOnBackgroundThread{ - "BackgroundToolbarInflation", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -350,7 +350,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{ + base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kJellyBeanSupported{"JellyBeanSupported", - base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/Disable-data-saver.patch b/build/patches/Disable-data-saver.patch index 7970ad0e..9a6e8841 100644 --- a/build/patches/Disable-data-saver.patch +++ b/build/patches/Disable-data-saver.patch @@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java -@@ -131,6 +131,7 @@ public class DataReductionProxySettings { +@@ -126,6 +126,7 @@ public class DataReductionProxySettings { // DataReductionProxySettings is a singleton that lives forever and there's no clean // shutdown of Chrome on Android mNativeDataReductionProxySettings = nativeInit(); @@ -30,7 +30,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/D } /** Returns true if the SPDY proxy promo is allowed to be shown. */ -@@ -153,6 +154,7 @@ public class DataReductionProxySettings { +@@ -148,6 +149,7 @@ public class DataReductionProxySettings { * data reduction statistics if this is the first time the SPDY proxy has been enabled. */ public void setDataReductionProxyEnabled(Context context, boolean enabled) { diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch index 7421fcce..a5cf7c0b 100644 --- a/build/patches/Disable-fetching-of-all-field-trials.patch +++ b/build/patches/Disable-fetching-of-all-field-trials.patch @@ -46,7 +46,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 -@@ -232,17 +232,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers, +@@ -239,17 +239,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() { diff --git a/build/patches/Disable-hyperlink-auditing-by-default.patch b/build/patches/Disable-hyperlink-auditing-by-default.patch index a93b9950..8e1f0ca5 100644 --- a/build/patches/Disable-hyperlink-auditing-by-default.patch +++ b/build/patches/Disable-hyperlink-auditing-by-default.patch @@ -9,8 +9,8 @@ Subject: Disable hyperlink auditing 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 -@@ -1505,7 +1505,7 @@ const FeatureEntry kFeatureEntries[] = { - SINGLE_VALUE_TYPE(switches::kDisablePushStateThrottle)}, +@@ -1418,7 +1418,7 @@ const FeatureEntry kFeatureEntries[] = { + SINGLE_VALUE_TYPE(switches::kDisableIpcFloodingProtection)}, {"disable-hyperlink-auditing", flag_descriptions::kHyperlinkAuditingName, flag_descriptions::kHyperlinkAuditingDescription, kOsAll, - SINGLE_DISABLE_VALUE_TYPE(switches::kNoPings)}, diff --git a/build/patches/Disable-metrics-on-all-I-O-threads.patch b/build/patches/Disable-metrics-on-all-I-O-threads.patch index a34b01a4..a8889a21 100644 --- a/build/patches/Disable-metrics-on-all-I-O-threads.patch +++ b/build/patches/Disable-metrics-on-all-I-O-threads.patch @@ -3,21 +3,34 @@ Date: Wed, 25 Apr 2018 10:23:51 +0200 Subject: Disable metrics on all I/O threads --- - chrome/browser/profiles/profile_io_data.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + chrome/browser/browser_process_impl.cc | 2 +- + chrome/browser/profiles/profile_io_data.cc | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) +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 +@@ -947,7 +947,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { + #endif // defined(OS_CHROMEOS) + + registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, +- GoogleUpdateSettings::GetCollectStatsConsent()); ++ false); + + #if defined(OS_ANDROID) + registry->RegisterBooleanPref( 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 -@@ -873,7 +873,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() { - - bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const { - DCHECK_CURRENTLY_ON(BrowserThread::IO); -- return enable_metrics_.GetValue(); -+ return false; - } - - chrome_browser_net::Predictor* ProfileIOData::GetPredictor() { +@@ -57,8 +57,6 @@ + #include "components/cookie_config/cookie_store_util.h" + #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h" + #include "components/dom_distiller/core/url_constants.h" +-#include "components/metrics/metrics_pref_names.h" +-#include "components/metrics/metrics_service.h" + #include "components/net_log/chrome_net_log.h" + #include "components/policy/core/common/cloud/policy_header_service.h" + #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" -- 2.11.0 diff --git a/build/patches/Disables-omission-of-URL-elements-in-Omnibox.patch b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch similarity index 61% rename from build/patches/Disables-omission-of-URL-elements-in-Omnibox.patch rename to build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch index 3447ae38..c4ec969c 100644 --- a/build/patches/Disables-omission-of-URL-elements-in-Omnibox.patch +++ b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch @@ -1,16 +1,17 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Wed, 11 Oct 2017 23:24:58 +0200 -Subject: Disables omission of URL elements in Omnibox +Subject: Disable omission of URL elements in Omnibox -Disable all omissions (already shadowed by first flag) +Disable all omissions because they are used throughout the code without +a corresponding user option to individually disable their usage. --- - components/url_formatter/url_formatter.cc | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + components/url_formatter/url_formatter.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc --- a/components/url_formatter/url_formatter.cc +++ b/components/url_formatter/url_formatter.cc -@@ -410,12 +410,12 @@ IDNConversionStatus IDNToUnicodeOneComponent(const base::char16* comp, +@@ -410,13 +410,13 @@ IDNConversionStatus IDNToUnicodeOneComponent(const base::char16* comp, } // namespace const FormatUrlType kFormatUrlOmitNothing = 0; @@ -18,17 +19,19 @@ diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatte -const FormatUrlType kFormatUrlOmitHTTP = 1 << 1; -const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2; -const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3; --const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4; -const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5; +-const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6; +-const FormatUrlType kFormatUrlOmitFileScheme = 1 << 7; +const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0; +const FormatUrlType kFormatUrlOmitHTTP = 0 << 1; +const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2; +const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3; -+const FormatUrlType kFormatUrlExperimentalElideAfterHost = 0 << 4; +const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5; - const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6; ++const FormatUrlType kFormatUrlTrimAfterHost = 0 << 6; ++const FormatUrlType kFormatUrlOmitFileScheme = 0 << 7; const FormatUrlType kFormatUrlOmitDefaults = + kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP | -- 2.11.0 diff --git a/build/patches/Disable-plugins-enumeration.patch b/build/patches/Disable-plugins-enumeration.patch index 9baade68..a14390ba 100644 --- a/build/patches/Disable-plugins-enumeration.patch +++ b/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 -@@ -1294,10 +1294,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { +@@ -1309,10 +1309,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { } PluginData* LocalFrame::GetPluginData() const { diff --git a/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch b/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch index fb6cb92d..ee5cce7e 100644 --- a/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch +++ b/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch @@ -156,7 +156,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPr diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni -@@ -140,7 +140,6 @@ chrome_java_sources = [ +@@ -163,7 +163,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java", "java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java", "java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java", diff --git a/build/patches/Disable-signin-and-data-saver-preferences.patch b/build/patches/Disable-signin-and-data-saver-preferences.patch index 8ecfbc4e..6eb34bac 100644 --- a/build/patches/Disable-signin-and-data-saver-preferences.patch +++ b/build/patches/Disable-signin-and-data-saver-preferences.patch @@ -4,10 +4,10 @@ Subject: Disable signin and data saver preferences Never show the data saver promo snackbar --- - chrome/android/java/res/xml/main_preferences.xml | 9 ----- + chrome/android/java/res/xml/main_preferences.xml | 9 ------ .../chromium/chrome/browser/ChromeActivity.java | 6 ++-- - .../browser/preferences/MainPreferences.java | 39 +++++++++++----------- - 3 files changed, 24 insertions(+), 30 deletions(-) + .../browser/preferences/MainPreferences.java | 37 +++++++++++----------- + 3 files changed, 22 insertions(+), 30 deletions(-) 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 @@ -23,22 +23,22 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j - +@@ -267,7 +267,7 @@ public abstract class ChromeActivity + private EphemeralTabPanel mEphemeralTabPanel; protected ReaderModeManager mReaderModeManager; private SnackbarManager mSnackbarManager; - private ModalDialogManager mModalDialogManager; - private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController; + //private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController; private AppMenuPropertiesDelegate mAppMenuPropertiesDelegate; private AppMenuHandler mAppMenuHandler; private ToolbarManager mToolbarManager; -@@ -666,6 +666,7 @@ public abstract class ChromeActivity +@@ -678,6 +678,7 @@ public abstract class ChromeActivity mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(mTabModelSelector) { @Override public void didFirstVisuallyNonEmptyPaint(Tab tab) { @@ -64,7 +64,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. // Only alert about data savings once the first paint has happened. It // doesn't make sense to show a snackbar about savings when nothing has been // displayed yet. -@@ -679,6 +680,7 @@ public abstract class ChromeActivity +@@ -691,6 +692,7 @@ public abstract class ChromeActivity DataReductionProxySettings.getInstance() .getTotalHttpContentLengthSaved()); } @@ -75,19 +75,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java -@@ -17,9 +17,9 @@ import org.chromium.base.VisibleForTesting; - import org.chromium.chrome.R; +@@ -18,10 +18,8 @@ import org.chromium.chrome.R; + import org.chromium.chrome.browser.AppHooks; import org.chromium.chrome.browser.ChromeFeatureList; import org.chromium.chrome.browser.contextual_suggestions.ContextualSuggestionsEnabledStateUtils; -import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; -+//import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; import org.chromium.chrome.browser.partnercustomizations.HomepageManager; + import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; -import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences; -+//import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences; import org.chromium.chrome.browser.search_engines.TemplateUrl; import org.chromium.chrome.browser.search_engines.TemplateUrlService; import org.chromium.chrome.browser.signin.SigninManager; -@@ -34,13 +34,11 @@ import java.util.Map; +@@ -36,13 +34,11 @@ import java.util.Map; public class MainPreferences extends PreferenceFragment implements SigninManager.SignInStateObserver, TemplateUrlService.LoadListener { public static final String PREF_ACCOUNT_SECTION = "account_section"; @@ -101,7 +100,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai public static final String PREF_NOTIFICATIONS = "notifications"; public static final String PREF_LANGUAGES = "languages"; public static final String PREF_DOWNLOADS = "downloads"; -@@ -52,7 +50,6 @@ public class MainPreferences extends PreferenceFragment +@@ -56,7 +52,6 @@ public class MainPreferences extends PreferenceFragment private final ManagedPreferenceDelegate mManagedPreferenceDelegate; private final Map mAllPreferences = new HashMap<>(); @@ -109,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai public MainPreferences() { setHasOptionsMenu(true); -@@ -68,25 +65,29 @@ public class MainPreferences extends PreferenceFragment +@@ -72,25 +67,29 @@ public class MainPreferences extends PreferenceFragment @Override public void onDestroy() { super.onDestroy(); @@ -140,7 +139,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai } @Override -@@ -99,16 +100,16 @@ public class MainPreferences extends PreferenceFragment +@@ -103,16 +102,16 @@ public class MainPreferences extends PreferenceFragment PreferenceUtils.addPreferencesFromResource(this, R.xml.main_preferences); cachePreferences(); @@ -158,9 +157,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai - setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION); + //setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - // If we are on Android O+ the Notifications preference should lead to the Android -@@ -164,7 +165,7 @@ public class MainPreferences extends PreferenceFragment + updatePasswordsPreference(); + +@@ -180,7 +179,7 @@ public class MainPreferences extends PreferenceFragment Preference preference = getPreferenceScreen().getPreference(index); mAllPreferences.put(preference.getKey(), preference); } @@ -169,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai } private void setManagedPreferenceDelegateForPreference(String key) { -@@ -173,12 +174,6 @@ public class MainPreferences extends PreferenceFragment +@@ -189,12 +188,6 @@ public class MainPreferences extends PreferenceFragment } private void updatePreferences() { @@ -182,7 +181,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai updateSearchEnginePreference(); if (HomepageManager.shouldShowHomepageSetting()) { -@@ -201,9 +196,11 @@ public class MainPreferences extends PreferenceFragment +@@ -217,9 +210,11 @@ public class MainPreferences extends PreferenceFragment removePreferenceIfPresent(PREF_CONTEXTUAL_SUGGESTIONS); } @@ -194,7 +193,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai } private Preference addPreferenceIfAbsent(String key) { -@@ -254,11 +251,11 @@ public class MainPreferences extends PreferenceFragment +@@ -279,11 +274,11 @@ public class MainPreferences extends PreferenceFragment private void onSignInPreferenceStateChanged() { // Remove "Account" section header if the personalized sign-in promo is shown. @@ -209,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai } // TemplateUrlService.LoadListener implementation. -@@ -280,9 +277,11 @@ public class MainPreferences extends PreferenceFragment +@@ -305,9 +300,11 @@ public class MainPreferences extends PreferenceFragment if (PREF_SAVED_PASSWORDS.equals(preference.getKey())) { return PrefServiceBridge.getInstance().isRememberPasswordsManaged(); } @@ -221,7 +220,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai if (PREF_SEARCH_ENGINE.equals(preference.getKey())) { return TemplateUrlService.getInstance().isDefaultSearchManaged(); } -@@ -296,11 +295,13 @@ public class MainPreferences extends PreferenceFragment +@@ -321,11 +318,13 @@ public class MainPreferences extends PreferenceFragment return prefs.isRememberPasswordsManaged() && !prefs.isRememberPasswordsEnabled(); } diff --git a/build/patches/Disable-signin-data-reduction-promos.patch b/build/patches/Disable-signin-data-reduction-promos.patch index 111b9062..7b7e9b64 100644 --- a/build/patches/Disable-signin-data-reduction-promos.patch +++ b/build/patches/Disable-signin-data-reduction-promos.patch @@ -9,7 +9,7 @@ Subject: Disable signin/data reduction promos 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 -@@ -603,7 +603,7 @@ public class ChromeTabbedActivity +@@ -604,7 +604,7 @@ public class ChromeTabbedActivity // TODO(tedchoc): Unify promo dialog logic as the search engine promo dialog checks // might not have completed at this point and we could show multiple // promos. @@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct // Promo dialogs in multiwindow mode are broken on some devices: http://crbug.com/354696 boolean isLegacyMultiWindow = MultiWindowUtils.getInstance().isLegacyMultiWindow(this); if (!isShowingPromo && !mIntentWithEffect && FirstRunStatus.getFirstRunFlowComplete() -@@ -621,7 +621,7 @@ public class ChromeTabbedActivity +@@ -622,7 +622,7 @@ public class ChromeTabbedActivity ChromePreferenceManager.PROMOS_SKIPPED_ON_FIRST_START, true); } diff --git a/build/patches/Do-not-grant-notifications-to-default-search-engine.patch b/build/patches/Do-not-grant-notifications-to-default-search-engine.patch index ec09a3b7..38353ef8 100644 --- a/build/patches/Do-not-grant-notifications-to-default-search-engine.patch +++ b/build/patches/Do-not-grant-notifications-to-default-search-engine.patch @@ -9,7 +9,7 @@ Subject: Do not grant notifications to default search engine 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 -@@ -296,7 +296,7 @@ const base::Feature kGeoLanguage{"GeoLanguage", +@@ -291,7 +291,7 @@ const base::Feature kGeoLanguage{"GeoLanguage", #if defined(OS_ANDROID) const base::Feature kGrantNotificationsToDSE{"GrantNotificationsToDSE", @@ -17,7 +17,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc + base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_ANDROID) - #if defined (OS_CHROMEOS) + #if defined(OS_CHROMEOS) -- 2.11.0 diff --git a/build/patches/Do-not-ignore-download-location-prompt-setting.patch b/build/patches/Do-not-ignore-download-location-prompt-setting.patch new file mode 100644 index 00000000..40133691 --- /dev/null +++ b/build/patches/Do-not-ignore-download-location-prompt-setting.patch @@ -0,0 +1,110 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Sun, 20 Jan 2019 06:20:10 +0100 +Subject: Do not ignore download location prompt setting + +Upstream has decided that it works as intended (https://bugs.chromium.org/p/chromium/issues/detail?id=916606) +but users would like to decide where to save a file even when there is no SD card available; +do not skip the prompt in such cases. +--- + .../download/DownloadLocationDialogBridge.java | 71 +++++++--------------- + 1 file changed, 21 insertions(+), 50 deletions(-) + +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java +@@ -32,9 +32,6 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller + private PropertyModel mDialogModel; + private DownloadLocationCustomView mCustomView; + private ModalDialogManager mModalDialogManager; +- private long mTotalBytes; +- private @DownloadLocationDialogType int mDialogType; +- private String mSuggestedPath; + private Context mContext; + + private DownloadLocationDialogBridge(long nativeDownloadLocationDialogBridge) { +@@ -67,12 +64,28 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller + + mModalDialogManager = activity.getModalDialogManager(); + mContext = activity; +- mTotalBytes = totalBytes; +- mDialogType = dialogType; +- mSuggestedPath = suggestedPath; + +- DownloadDirectoryProvider.getInstance().getAllDirectoriesOptions( +- (ArrayList dirs) -> { onDirectoryOptionsRetrieved(dirs); }); ++ // Already showing the dialog. ++ if (mDialogModel != null) return; ++ ++ // Actually show the dialog. ++ mCustomView = (DownloadLocationCustomView) LayoutInflater.from(mContext).inflate( ++ R.layout.download_location_dialog, null); ++ mCustomView.initialize(dialogType, new File(suggestedPath)); ++ ++ Resources resources = mContext.getResources(); ++ mDialogModel = ++ new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS) ++ .with(ModalDialogProperties.CONTROLLER, this) ++ .with(ModalDialogProperties.TITLE, getTitle(totalBytes, dialogType)) ++ .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView) ++ .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources, ++ R.string.duplicate_download_infobar_download_button) ++ .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT, resources, ++ R.string.cancel) ++ .build(); ++ ++ mModalDialogManager.showDialog(mDialogModel, ModalDialogManager.ModalDialogType.APP); + } + + @Override +@@ -105,48 +118,6 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller + mCustomView = null; + } + +- /** +- * Called after retrieved the download directory options. +- * @param dirs An list of available download directories. +- */ +- private void onDirectoryOptionsRetrieved(ArrayList dirs) { +- // If there is only one directory available, don't show the default dialog, and set the +- // download directory to default. Dialog will still show for other types of dialogs, like +- // name conflict or disk error. +- if (dirs.size() == 1 && mDialogType == DownloadLocationDialogType.DEFAULT) { +- final DirectoryOption dir = dirs.get(0); +- if (dir.type == DirectoryOption.DownloadLocationDirectoryType.DEFAULT) { +- assert(!TextUtils.isEmpty(dir.location)); +- PrefServiceBridge.getInstance().setDownloadAndSaveFileDefaultDirectory( +- dir.location); +- nativeOnComplete(mNativeDownloadLocationDialogBridge, mSuggestedPath); +- } +- return; +- } +- +- // Already showing the dialog. +- if (mDialogModel != null) return; +- +- // Actually show the dialog. +- mCustomView = (DownloadLocationCustomView) LayoutInflater.from(mContext).inflate( +- R.layout.download_location_dialog, null); +- mCustomView.initialize(mDialogType, new File(mSuggestedPath)); +- +- Resources resources = mContext.getResources(); +- mDialogModel = +- new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS) +- .with(ModalDialogProperties.CONTROLLER, this) +- .with(ModalDialogProperties.TITLE, getTitle(mTotalBytes, mDialogType)) +- .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView) +- .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources, +- R.string.duplicate_download_infobar_download_button) +- .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT, resources, +- R.string.cancel) +- .build(); +- +- mModalDialogManager.showDialog(mDialogModel, ModalDialogManager.ModalDialogType.APP); +- } +- + private String getTitle(long totalBytes, @DownloadLocationDialogType int dialogType) { + switch (dialogType) { + case DownloadLocationDialogType.LOCATION_FULL: +-- +2.11.0 + diff --git a/build/patches/Do-not-store-passwords-by-default.patch b/build/patches/Do-not-store-passwords-by-default.patch index 35fa0cab..8b3c4fa5 100644 --- a/build/patches/Do-not-store-passwords-by-default.patch +++ b/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 -@@ -363,10 +363,10 @@ void RecordParsingOnSavingDifference( +@@ -321,10 +321,10 @@ void RecordParsingOnSavingDifference( void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/build/patches/Enable-TLS-1.3-final-by-default.patch b/build/patches/Enable-TLS-1.3-final-by-default.patch index 92350a30..365aa3c1 100644 --- a/build/patches/Enable-TLS-1.3-final-by-default.patch +++ b/build/patches/Enable-TLS-1.3-final-by-default.patch @@ -9,7 +9,7 @@ Subject: Enable TLS 1.3 (final) by default diff --git a/chrome/browser/ssl/ssl_config_service_manager_pref.cc b/chrome/browser/ssl/ssl_config_service_manager_pref.cc --- a/chrome/browser/ssl/ssl_config_service_manager_pref.cc +++ b/chrome/browser/ssl/ssl_config_service_manager_pref.cc -@@ -180,7 +180,7 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref( +@@ -179,7 +179,7 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref( } else if (tls13_variant == "draft23") { tls13_value = switches::kTLS13VariantDraft23; version_value = switches::kSSLVersionTLSv13; diff --git a/build/patches/Enable-history-requirement-of-user-gesture.patch b/build/patches/Enable-history-requirement-of-user-gesture.patch index 238109f8..25a38b98 100644 --- a/build/patches/Enable-history-requirement-of-user-gesture.patch +++ b/build/patches/Enable-history-requirement-of-user-gesture.patch @@ -10,7 +10,7 @@ Set #enable-history-entry-requires-user-gesture to enabled 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 -@@ -1511,7 +1511,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1420,7 +1420,7 @@ const FeatureEntry kFeatureEntries[] = { {"enable-history-entry-requires-user-gesture", flag_descriptions::kHistoryRequiresUserGestureName, flag_descriptions::kHistoryRequiresUserGestureDescription, kOsAll, diff --git a/build/patches/Fix-crash-when-accessing-page-info-site-settings.patch b/build/patches/Fix-crash-when-accessing-page-info-site-settings.patch index f0ca7ce6..9c8740d3 100644 --- a/build/patches/Fix-crash-when-accessing-page-info-site-settings.patch +++ b/build/patches/Fix-crash-when-accessing-page-info-site-settings.patch @@ -9,9 +9,9 @@ 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 -@@ -677,6 +677,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper( - GURL canonical_requesting_origin = - GetCanonicalOrigin(requesting_origin, embedding_origin); +@@ -689,6 +689,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper( + if (status != CONTENT_SETTING_DEFAULT) + return PermissionResult(status, PermissionStatusSource::UNSPECIFIED); PermissionContextBase* context = GetPermissionContext(permission); + if (context == nullptr) { + return PermissionResult(CONTENT_SETTING_BLOCK, PermissionStatusSource::UNSPECIFIED); diff --git a/build/patches/Hide-passwords-manager-link.patch b/build/patches/Hide-passwords-manager-link.patch index 802bcee7..595c8989 100644 --- a/build/patches/Hide-passwords-manager-link.patch +++ b/build/patches/Hide-passwords-manager-link.patch @@ -9,7 +9,7 @@ Subject: Hide passwords manager link diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java -@@ -252,7 +252,7 @@ public class SavePasswordsPreferences +@@ -251,7 +251,7 @@ public class SavePasswordsPreferences return; } @@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pas PreferenceGroup passwordParent; if (mSearchQuery == null) { -@@ -327,7 +327,7 @@ public class SavePasswordsPreferences +@@ -326,7 +326,7 @@ public class SavePasswordsPreferences return; } diff --git a/build/patches/Hide-send-reports-checkbox.patch b/build/patches/Hide-send-reports-checkbox.patch index 9270b6f1..13d599ec 100644 --- a/build/patches/Hide-send-reports-checkbox.patch +++ b/build/patches/Hide-send-reports-checkbox.patch @@ -9,7 +9,7 @@ Subject: Hide send reports checkbox diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml --- a/chrome/android/java/res/layout/fre_tosanduma.xml +++ b/chrome/android/java/res/layout/fre_tosanduma.xml -@@ -71,7 +71,7 @@ +@@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:lineSpacingMultiplier="1.4" android:text="@string/fre_send_report_check" diff --git a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch index 4e676935..6d0a6ec2 100644 --- a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch +++ b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch @@ -11,14 +11,16 @@ Send a random key press to circumvent idle status detection third_party/blink/renderer/core/dom/document.cc | 32 +++++++++++++++++++++- .../renderer/core/dom/extensions/anti_amp_cure.h | 6 ++++ .../renderer/core/dom/extensions/video_bg_play.h | 6 ++++ - 4 files changed, 45 insertions(+), 1 deletion(-) + .../renderer/core/html/html_script_element.cc | 5 ++++ + .../blink/renderer/core/html/html_script_element.h | 1 + + 6 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h create mode 100644 third_party/blink/renderer/core/dom/extensions/video_bg_play.h diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn --- a/third_party/blink/renderer/core/dom/BUILD.gn +++ b/third_party/blink/renderer/core/dom/BUILD.gn -@@ -146,6 +146,8 @@ blink_core_sources("dom") { +@@ -148,6 +148,8 @@ blink_core_sources("dom") { "global_event_handlers.h", "icon_url.cc", "icon_url.h", @@ -30,7 +32,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 -@@ -233,6 +233,7 @@ +@@ -234,6 +234,7 @@ #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h" #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h" #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h" @@ -38,7 +40,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #include "third_party/blink/renderer/core/paint/compositing/paint_layer_compositor.h" #include "third_party/blink/renderer/core/paint/first_meaningful_paint_detector.h" #include "third_party/blink/renderer/core/paint/paint_layer.h" -@@ -291,6 +292,8 @@ +@@ -293,6 +294,8 @@ #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h" #include "third_party/blink/renderer/platform/wtf/time.h" @@ -47,7 +49,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #ifndef NDEBUG using WeakDocumentSet = blink::HeapHashSet>; static WeakDocumentSet& liveDocumentSet(); -@@ -6088,8 +6091,35 @@ void Document::FinishedParsing() { +@@ -6131,8 +6134,35 @@ void Document::FinishedParsing() { fetcher_->ClearResourcesFromPreviousFetcher(); } @@ -69,7 +71,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink + if ((pos1 == 0) || (pos2 == 0)) { + LOG(INFO) << "injecting anti-AMP-cure Javascript payload, URL: " << url_.GetString(); + HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags()); -+ e->setText(ANTI_AMP_CURE_JS); ++ e->setTextDirect(ANTI_AMP_CURE_JS); + bodyElement->AppendChild(e); + } + @@ -77,7 +79,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink + if ((WTF::kNotFound != host.Find("youtube.com")) || (WTF::kNotFound != host.Find("vimeo.com"))) { + LOG(INFO) << "injecting video-bg-play Javascript payload, URL: " << url_.GetString(); + HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags()); -+ e->setText(VIDEO_BG_PLAY_JS); ++ e->setTextDirect(VIDEO_BG_PLAY_JS); + bodyElement->AppendChild(e); + } + } // has origin and body element @@ -106,6 +108,32 @@ new file mode 100644 +#define VIDEO_BG_PLAY_JS "'use strict';\n\n/* generate a synthetic keypress to circumvent the extremely useful pause-and-prompt beaviour */\nsetInterval(function() {\n document.dispatchEvent(new KeyboardEvent(\"keydown\", {key : \"a\", char : \"a\", shiftKey: false}));\n}, 3 * 60 * 1000);\n\n/* video background play fix - original version by timdream */\ndocument.videoBGFix = {};\n\n// Page Visibility API\nObject.defineProperties(document.videoBGFix,\n { 'hidden': {value: false}, 'visibilityState': {value: 'visible'} });\n\nwindow.addEventListener(\n 'visibilitychange', evt => evt.stopImmediatePropagation(), true);\nwindow.addEventListener(\n 'blur', evt => evt.stopImmediatePropagation(), true);\n\n// Fullscreen API\nwindow.addEventListener('fullscreenchange', evt => {\n Object.defineProperties(document.videoBGFix,\n { 'fullscreenEnabled': {value: true},\n 'fullscreen': {value: true},\n 'fullscreenElement': {value: document.fullscreenElement.videoBGFix}});\n window.addEventListener(\n 'fullscreenchange', evt => evt.stopImmediatePropagation(), true);\n}, { capture: true, once: true });\n" + +#endif // video_bg_play_h +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 +@@ -147,6 +147,11 @@ void HTMLScriptElement::setTextContent( + } + } + ++void HTMLScriptElement::setTextDirect( ++ const char *s) { ++ Node::setTextContent(s); ++} ++ + void HTMLScriptElement::setAsync(bool async) { + SetBooleanAttribute(kAsyncAttr, async); + loader_->HandleAsyncAttribute(); +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 +@@ -53,6 +53,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; ++ void setTextDirect(const char*); + + KURL Src() const; + -- 2.11.0 diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch index 9b4c3cef..fca3f81e 100644 --- a/build/patches/Modify-default-preferences.patch +++ b/build/patches/Modify-default-preferences.patch @@ -3,23 +3,23 @@ Date: Thu, 12 Oct 2017 08:09:24 +0200 Subject: Modify default preferences --- - chrome/browser/background/background_mode_manager.cc | 2 +- - chrome/browser/chrome_content_browser_client.cc | 2 +- - chrome/browser/net/prediction_options.cc | 2 +- - chrome/browser/net/prediction_options.h | 2 +- - chrome/browser/profiles/profile.cc | 2 +- - .../resources/settings/reset_page/reset_profile_dialog.html | 2 +- - chrome/browser/signin/signin_promo.cc | 4 ++-- - chrome/browser/ui/browser_ui_prefs.cc | 4 ++-- - chrome/browser/ui/navigation_correction_tab_observer.cc | 2 +- - chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc | 4 ---- - chrome/service/cloud_print/connector_settings.cc | 2 +- - components/autofill/core/browser/autofill_manager.cc | 5 +---- - components/autofill/core/common/autofill_prefs.cc | 6 +++--- - components/bookmarks/browser/bookmark_utils.cc | 4 ++-- - components/safe_browsing/common/safe_browsing_prefs.cc | 4 ++-- - extensions/common/extension.cc | 8 -------- - 16 files changed, 20 insertions(+), 35 deletions(-) + chrome/browser/background/background_mode_manager.cc | 2 +- + chrome/browser/chrome_content_browser_client.cc | 2 +- + chrome/browser/net/prediction_options.cc | 2 +- + chrome/browser/net/prediction_options.h | 2 +- + chrome/browser/profiles/profile.cc | 2 +- + .../settings/reset_page/reset_profile_dialog.html | 2 +- + chrome/browser/signin/signin_promo.cc | 4 ++-- + chrome/browser/ui/browser_ui_prefs.cc | 4 ++-- + chrome/browser/ui/navigation_correction_tab_observer.cc | 2 +- + .../browser/ui/webui/local_discovery/local_discovery_ui.cc | 4 ---- + chrome/service/cloud_print/connector_settings.cc | 2 +- + components/autofill/core/browser/autofill_manager.cc | 14 ++++---------- + components/autofill/core/common/autofill_prefs.cc | 6 +++--- + components/bookmarks/browser/bookmark_utils.cc | 4 ++-- + components/safe_browsing/common/safe_browsing_prefs.cc | 4 ++-- + extensions/common/extension.cc | 8 -------- + 16 files changed, 23 insertions(+), 41 deletions(-) diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc --- a/chrome/browser/background/background_mode_manager.cc @@ -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 -@@ -1053,7 +1053,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1055,7 +1055,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -48,9 +48,9 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc --- a/chrome/browser/net/prediction_options.cc +++ b/chrome/browser/net/prediction_options.cc -@@ -30,7 +30,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender( - return NetworkPredictionStatus::ENABLED; +@@ -32,7 +32,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender( } + return NetworkPredictionStatus::DISABLED_DUE_TO_NETWORK; default: - DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options); + //DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options); @@ -165,22 +165,45 @@ 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 -@@ -290,10 +290,7 @@ bool AutofillManager::ShouldShowCreditCardSigninPromo( - bool AutofillManager::ShouldParseForms(const std::vector& forms, - const base::TimeTicks timestamp) { +@@ -351,10 +351,7 @@ bool AutofillManager::ShouldParseForms(const std::vector& forms, bool enabled = IsAutofillEnabled(); + sync_state_ = personal_data_ ? personal_data_->GetSyncSigninState() + : AutofillSyncSigninState::kNumSyncStates; - if (!has_logged_autofill_enabled_) { -- AutofillMetrics::LogIsAutofillEnabledAtPageLoad(enabled); +- AutofillMetrics::LogIsAutofillEnabledAtPageLoad(enabled, sync_state_); - has_logged_autofill_enabled_ = true; - } + has_logged_autofill_enabled_ = true; return enabled; } +@@ -621,10 +618,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl( + // suggestions available. + // TODO(mathp): Differentiate between number of suggestions available + // (current metric) and number shown to the user. +- if (!has_logged_address_suggestions_count_) { +- AutofillMetrics::LogAddressSuggestionsCount(suggestions.size()); +- has_logged_address_suggestions_count_ = true; +- } ++ has_logged_address_suggestions_count_ = true; + } + } + +@@ -1216,8 +1210,8 @@ void AutofillManager::Reset() { + #if defined(OS_ANDROID) || defined(OS_IOS) + autofill_assistant_.Reset(); + #endif +- has_logged_autofill_enabled_ = false; +- has_logged_address_suggestions_count_ = false; ++ has_logged_autofill_enabled_ = true; ++ has_logged_address_suggestions_count_ = true; + did_show_suggestions_ = false; + user_did_type_ = false; + user_did_autofill_ = false; diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc --- a/components/autofill/core/common/autofill_prefs.cc +++ b/components/autofill/core/common/autofill_prefs.cc -@@ -91,10 +91,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -132,10 +132,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { prefs::kAutofillBillingCustomerNumber, 0.0, user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); registry->RegisterBooleanPref( @@ -193,7 +216,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterIntegerPref( prefs::kAutofillLastVersionDeduped, 0, -@@ -103,7 +103,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -148,7 +148,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { prefs::kAutofillLastVersionDisusedAddressesDeleted, 0, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref( @@ -223,7 +246,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar 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 -@@ -229,9 +229,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -149,9 +149,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref( prefs::kSafeBrowsingSawInterstitialScoutReporting, false); registry->RegisterBooleanPref( diff --git a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch index 4377e50f..9dba4eda 100644 --- a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch +++ b/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 -@@ -242,6 +242,8 @@ std::vector +@@ -235,6 +235,8 @@ std::vector ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { std::vector builtins_to_provide; builtins_to_provide.push_back( diff --git a/build/patches/Open-YouTube-links-in-Bromite.patch b/build/patches/Open-YouTube-links-in-Bromite.patch index 858b0def..297c5e48 100644 --- a/build/patches/Open-YouTube-links-in-Bromite.patch +++ b/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 -@@ -386,6 +386,13 @@ public class ExternalNavigationHandler { +@@ -403,6 +403,13 @@ public class ExternalNavigationHandler { return OverrideUrlLoadingResult.NO_OVERRIDE; } diff --git a/build/patches/Punt-the-Widevine-version-string.patch b/build/patches/Punt-the-Widevine-version-string.patch index 102f05cd..104002e5 100644 --- a/build/patches/Punt-the-Widevine-version-string.patch +++ b/build/patches/Punt-the-Widevine-version-string.patch @@ -10,7 +10,7 @@ Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromi diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc -@@ -538,7 +538,7 @@ void ChromeContentClient::AddContentDecryptionModules( +@@ -541,7 +541,7 @@ void ChromeContentClient::AddContentDecryptionModules( base::FilePath cdm_path; content::CdmCapability capability; if (IsWidevineAvailable(&cdm_path, &capability)) { diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch index bea0a8f9..ecb682a4 100644 --- a/build/patches/Remove-help-menu-item.patch +++ b/build/patches/Remove-help-menu-item.patch @@ -24,7 +24,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 -@@ -2124,15 +2124,6 @@ public abstract class ChromeActivity +@@ -2123,15 +2123,6 @@ public abstract class ChromeActivity final Tab currentTab = getActivityTab(); @@ -56,7 +56,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/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 -@@ -1314,7 +1314,7 @@ public class CustomTabActivity extends ChromeActivity diff --git a/build/patches/Restore-classic-new-tab-page.patch b/build/patches/Restore-classic-new-tab-page.patch index c0a1bac3..0cfcf01f 100644 --- a/build/patches/Restore-classic-new-tab-page.patch +++ b/build/patches/Restore-classic-new-tab-page.patch @@ -9,18 +9,18 @@ Subject: Restore classic new tab page diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc --- a/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc -@@ -155,10 +155,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) { - } +@@ -156,10 +156,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) { bool ShouldShowLocalNewTab(Profile* profile) { + #if !defined(OS_ANDROID) - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); - return command_line->HasSwitch(switches::kForceLocalNtp) || - (base::FeatureList::IsEnabled(features::kUseGoogleLocalNtp) && - profile && DefaultSearchProviderIsGoogle(profile)); + return true; + #endif + return false; } - - bool ShouldDelayRemoteNTP(const GURL& search_provider_url, Profile* profile) { -- 2.11.0 diff --git a/build/patches/Revert-Download-location-android-Check-SD-card-before-showing-location-dialog.patch b/build/patches/Revert-Download-location-android-Check-SD-card-before-showing-location-dialog.patch deleted file mode 100644 index bc3b9c26..00000000 --- a/build/patches/Revert-Download-location-android-Check-SD-card-before-showing-location-dialog.patch +++ /dev/null @@ -1,109 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Thu, 20 Dec 2018 18:23:32 +0100 -Subject: Revert "Download location android: Check SD card before showing - location dialog." - -This reverts commit 9ade596cc0b315f1f9c3292e1fd8d6182e32fde2. ---- - .../download/DownloadLocationDialogBridge.java | 50 +++------------------- - 1 file changed, 6 insertions(+), 44 deletions(-) - -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java -@@ -4,9 +4,6 @@ - - package org.chromium.chrome.browser.download; - --import android.content.Context; --import android.text.TextUtils; -- - import org.chromium.base.annotations.CalledByNative; - import org.chromium.base.metrics.RecordHistogram; - import org.chromium.chrome.browser.ChromeActivity; -@@ -17,7 +14,6 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge; - import org.chromium.ui.base.WindowAndroid; - - import java.io.File; --import java.util.ArrayList; - - /** - * Helper class to handle communication between download location dialog and native. -@@ -26,10 +22,6 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller - private long mNativeDownloadLocationDialogBridge; - private DownloadLocationDialog mLocationDialog; - private ModalDialogManager mModalDialogManager; -- private long mTotalBytes; -- private @DownloadLocationDialogType int mDialogType; -- private String mSuggestedPath; -- private Context mContext; - - private DownloadLocationDialogBridge(long nativeDownloadLocationDialogBridge) { - mNativeDownloadLocationDialogBridge = nativeDownloadLocationDialogBridge; -@@ -60,13 +52,12 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller - } - - mModalDialogManager = activity.getModalDialogManager(); -- mContext = activity; -- mTotalBytes = totalBytes; -- mDialogType = dialogType; -- mSuggestedPath = suggestedPath; - -- DownloadDirectoryProvider.getInstance().getAllDirectoriesOptions( -- (ArrayList dirs) -> { onDirectoryOptionsRetrieved(dirs); }); -+ if (mLocationDialog != null) return; -+ mLocationDialog = DownloadLocationDialog.create( -+ this, activity, totalBytes, dialogType, new File(suggestedPath)); -+ -+ mModalDialogManager.showDialog(mLocationDialog, ModalDialogManager.ModalDialogType.APP); - } - - @Override -@@ -101,34 +92,6 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller - } - - /** -- * Called after retrieved the download directory options. -- * @param dirs An list of available download directories. -- */ -- private void onDirectoryOptionsRetrieved(ArrayList dirs) { -- // If there is only one directory available, don't show the default dialog, and set the -- // download directory to default. Dialog will still show for other types of dialogs, like -- // name conflict or disk error. -- if (dirs.size() == 1 && mDialogType == DownloadLocationDialogType.DEFAULT) { -- final DirectoryOption dir = dirs.get(0); -- if (dir.type == DirectoryOption.DownloadLocationDirectoryType.DEFAULT) { -- assert(!TextUtils.isEmpty(dir.location)); -- PrefServiceBridge.getInstance().setDownloadAndSaveFileDefaultDirectory( -- dir.location); -- nativeOnComplete(mNativeDownloadLocationDialogBridge, mSuggestedPath); -- } -- return; -- } -- -- // Already showing the dialog. -- if (mLocationDialog != null) return; -- -- // Actually show the dialog. -- mLocationDialog = DownloadLocationDialog.create( -- this, mContext, mTotalBytes, mDialogType, new File(mSuggestedPath)); -- mModalDialogManager.showDialog(mLocationDialog, ModalDialogManager.ModalDialogType.APP); -- } -- -- /** - * Pass along information from location dialog to native. - * - * @param fileName Name the user gave the file. -@@ -156,8 +119,7 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller - nativeOnComplete(mNativeDownloadLocationDialogBridge, file.getAbsolutePath()); - } - -- // Update preference to show prompt based on whether checkbox is checked only when the user -- // click the positive button. -+ // Update preference to show prompt based on whether checkbox is checked. - if (dontShowAgain) { - PrefServiceBridge.getInstance().setPromptForDownloadAndroid( - DownloadPromptStatus.DONT_SHOW); --- -2.11.0 - diff --git a/build/patches/User-Agent-anonymize.patch b/build/patches/User-Agent-anonymize.patch index a2cfb1b4..43f5f121 100644 --- a/build/patches/User-Agent-anonymize.patch +++ b/build/patches/User-Agent-anonymize.patch @@ -5,10 +5,25 @@ Subject: User Agent: anonymize Use a fixed device name and Chrome product version with the goal of not disclosing the specific build of Bromite. --- - components/version_info/version_info.cc | 13 +++++- - content/common/user_agent.cc | 72 ++++++++++++++++++++------------- - 2 files changed, 57 insertions(+), 28 deletions(-) + .../browser/ui/android/android_about_app_info.cc | 4 ++- + components/version_info/version_info.cc | 13 +++++++- + content/common/user_agent.cc | 37 +++++++++++++++++----- + content/public/common/user_agent.h | 2 +- + 4 files changed, 45 insertions(+), 11 deletions(-) +diff --git a/chrome/browser/ui/android/android_about_app_info.cc b/chrome/browser/ui/android/android_about_app_info.cc +--- a/chrome/browser/ui/android/android_about_app_info.cc ++++ b/chrome/browser/ui/android/android_about_app_info.cc +@@ -20,6 +20,8 @@ std::string AndroidAboutAppInfo::GetGmsInfo() { + } + + std::string AndroidAboutAppInfo::GetOsInfo() { ++ int32_t major_version = 4, minor_version, bugfix_version; ++ base::SysInfo::OperatingSystemVersionNumbers(&major_version, &minor_version, &bugfix_version); + return base::SysInfo::OperatingSystemVersion() + +- content::GetAndroidOSInfo(/*include_android_build_number=*/true); ++ content::GetAndroidOSInfo(/*include_android_build_number=*/true, major_version); + } diff --git a/components/version_info/version_info.cc b/components/version_info/version_info.cc --- a/components/version_info/version_info.cc +++ b/components/version_info/version_info.cc @@ -16,7 +31,7 @@ diff --git a/components/version_info/version_info.cc b/components/version_info/v #include "base/logging.h" #include "base/no_destructor.h" #include "base/version.h" -+#include "base/sys_info.h" ++#include "base/system/sys_info.h" #include "build/build_config.h" #include "components/version_info/version_info_values.h" @@ -34,124 +49,81 @@ diff --git a/components/version_info/version_info.cc b/components/version_info/v + } + + // version 5 and above -+ return "Chrome/70.0.3538.80"; ++ return "Chrome/71.0.3578.99"; } std::string GetProductName() { diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc -@@ -22,11 +22,6 @@ - - namespace content { - --#if defined(OS_ANDROID) --const base::Feature kAndroidUserAgentStringContainsBuildId{ -- "AndroidUserAgentStringContainsBuildId", base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_ANDROID) -- - std::string GetWebKitVersion() { - return base::StringPrintf("%d.%d (%s)", - WEBKIT_VERSION_MAJOR, -@@ -66,7 +61,32 @@ std::string BuildOSCpuInfo(bool include_android_build_number) { +@@ -85,7 +85,7 @@ std::string BuildOSCpuInfo(bool include_android_build_number) { } #elif defined(OS_ANDROID) std::string android_version_str = base::SysInfo::OperatingSystemVersion(); - std::string android_info_str = GetAndroidOSInfo(include_android_build_number); -+ std::string android_info_str; ++ std::string android_info_str = GetAndroidOSInfo(include_android_build_number, os_major_version); + #elif (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_FUCHSIA) + // Should work on any Posix system. + struct utsname unixinfo; +@@ -153,18 +153,39 @@ std::string BuildUserAgentFromProductAndExtraOSInfo( + return BuildUserAgentFromOSAndProduct(os_info, product); + } + +-std::string GetAndroidOSInfo(bool include_android_build_number) { ++std::string GetAndroidOSInfo(bool include_android_build_number, int32_t os_major_version) { + std::string android_info_str; + +- // Send information about the device. ++ // Send spoofed information about the device. + bool semicolon_inserted = false; +- std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename(); +- std::string android_device_name = base::SysInfo::HardwareModelName(); +- if (!android_device_name.empty() && "REL" == android_build_codename) { +- android_info_str += "; " + android_device_name; +- semicolon_inserted = true; ++ std::string android_device_name; + + // Send information about the device and build ID. + // Use a common device/build ID based on Android major version. + switch (os_major_version) { + default: // version 9 and above -+ android_info_str = "ONEPLUS A6000"; ++ android_device_name = "ONEPLUS A6000"; + break; + case 8: -+ android_info_str = "FIG-LX3"; ++ android_device_name = "FIG-LX3"; + break; + case 7: -+ android_info_str = "SM-G610M"; ++ android_device_name = "SM-G610M"; + break; + case 6: -+ android_info_str = "SM-J700M"; ++ android_device_name = "SM-J700M"; + break; + case 5: -+ android_info_str = "XT1033"; ++ android_device_name = "XT1033"; + break; + case 4: -+ android_info_str = "ZTE Blade C370 Build/KOT49H"; ++ android_device_name = "ZTE Blade C370"; + break; -+ } -+ -+ android_info_str = " " + android_info_str; - #elif (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_FUCHSIA) - // Should work on any Posix system. - struct utsname unixinfo; -@@ -102,7 +122,7 @@ std::string BuildOSCpuInfo(bool include_android_build_number) { - os_minor_version, - os_bugfix_version - #elif defined(OS_ANDROID) -- "Android %s%s", -+ "Android %s;%s", - android_version_str.c_str(), - android_info_str.c_str() - #elif defined(OS_POSIX) || defined(OS_FUCHSIA) -@@ -137,18 +157,6 @@ std::string BuildUserAgentFromProduct(const std::string& product) { - return BuildUserAgentFromOSAndProduct(os_info, product); - } - --#if defined(OS_ANDROID) --std::string BuildUserAgentFromProductAndExtraOSInfo( -- const std::string& product, -- const std::string& extra_os_info, -- bool include_android_build_number) { -- std::string os_info; -- base::StringAppendF(&os_info, "%s%s%s", getUserAgentPlatform().c_str(), -- BuildOSCpuInfo(include_android_build_number).c_str(), -- extra_os_info.c_str()); -- return BuildUserAgentFromOSAndProduct(os_info, product); --} -- - std::string GetAndroidOSInfo(bool include_android_build_number) { - std::string android_info_str; - -@@ -162,18 +170,28 @@ std::string GetAndroidOSInfo(bool include_android_build_number) { } ++ android_info_str += "; " + android_device_name; ++ semicolon_inserted = true; ++ // Append the build ID. -- if (base::FeatureList::IsEnabled(kAndroidUserAgentStringContainsBuildId) || -- include_android_build_number) { -- std::string android_build_id = base::SysInfo::GetAndroidBuildID(); -- if (!android_build_id.empty()) { -- if (!semicolon_inserted) -- android_info_str += ";"; -- android_info_str += " Build/" + android_build_id; -- } -+ std::string android_build_id = base::SysInfo::GetAndroidBuildID(); -+ if (!android_build_id.empty()) { -+ if (!semicolon_inserted) -+ android_info_str += ";"; -+ android_info_str += " Build/" + android_build_id; - } + if (base::FeatureList::IsEnabled(kAndroidUserAgentStringContainsBuildId) || + include_android_build_number) { +diff --git a/content/public/common/user_agent.h b/content/public/common/user_agent.h +--- a/content/public/common/user_agent.h ++++ b/content/public/common/user_agent.h +@@ -37,7 +37,7 @@ CONTENT_EXPORT std::string BuildUserAgentFromProductAndExtraOSInfo( + bool include_android_build_number); - return android_info_str; - } -+ -+#if defined(OS_ANDROID) -+std::string BuildUserAgentFromProductAndExtraOSInfo( -+ const std::string& product, -+ const std::string& extra_os_info, -+ bool include_android_build_number) { -+ std::string os_info; -+ base::StringAppendF(&os_info, "%s%s%s", getUserAgentPlatform().c_str(), -+ BuildOSCpuInfo(include_android_build_number).c_str(), -+ extra_os_info.c_str()); -+ return BuildUserAgentFromOSAndProduct(os_info, product); -+} -+ - #endif // defined(OS_ANDROID) + // Helper function to generate just the OS info. +-CONTENT_EXPORT std::string GetAndroidOSInfo(bool include_android_build_number); ++CONTENT_EXPORT std::string GetAndroidOSInfo(bool include_android_build_number, int32_t os_major_version); + #endif - std::string BuildUserAgentFromOSAndProduct(const std::string& os_info, + // Builds a full user agent string given a string describing the OS and a -- 2.11.0 diff --git a/build/patches/autofill-disable-autofill-download-manager.patch b/build/patches/autofill-disable-autofill-download-manager.patch index f661f057..d1fab7d4 100644 --- a/build/patches/autofill-disable-autofill-download-manager.patch +++ b/build/patches/autofill-disable-autofill-download-manager.patch @@ -4,14 +4,14 @@ Subject: autofill: disable autofill download manager Disables the autofill download manager (trk:158). --- - components/autofill/core/browser/autofill_download_manager.cc | 6 +++++- - components/autofill/core/browser/autofill_manager.cc | 2 ++ - 2 files changed, 7 insertions(+), 1 deletion(-) + .../autofill/core/browser/autofill_download_manager.cc | 13 ++++++++++++- + components/autofill/core/browser/autofill_manager.cc | 18 ------------------ + 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc --- a/components/autofill/core/browser/autofill_download_manager.cc +++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -49,7 +49,6 @@ namespace autofill { +@@ -52,7 +52,6 @@ namespace autofill { namespace { @@ -19,7 +19,23 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com const size_t kAutofillDownloadManagerMaxFormCacheSize = 16; const size_t kMaxFieldsPerQueryRequest = 100; -@@ -491,6 +490,7 @@ void AutofillDownloadManager::ClearUploadHistory(PrefService* pref_service) { +@@ -418,6 +417,7 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload, + return upload_request.SerializeToString(payload); + } + ++/* + // Gets an API method URL given its type (query or upload) and an optional + // resource ID. + // Example usage: +@@ -440,6 +440,7 @@ std::string GetAPIMethodUrl(AutofillDownloadManager::RequestType type, + } + return base::StrCat({api_method_url, "/", resource_id}); + } ++*/ + + } // namespace + +@@ -565,6 +566,7 @@ void AutofillDownloadManager::ClearUploadHistory(PrefService* pref_service) { std::tuple AutofillDownloadManager::GetRequestURLAndMethod( const FormRequestData& request_data) const { @@ -27,13 +43,31 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com std::string method("POST"); std::string query_str; -@@ -513,6 +513,10 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( +@@ -587,12 +589,17 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( GURL url = autofill_server_url_ .Resolve(RequestTypeToString(request_data.request_type)) .ReplaceComponents(replacements); +#else + std::string method("GET"); + GURL url = GURL("about:blank"); ++#endif + return std::make_tuple(std::move(url), std::move(method)); + } + + std::tuple + AutofillDownloadManager::GetRequestURLAndMethodForApi( + const FormRequestData& request_data) const { ++#if 0 + // ID of the resource to add to the API request URL. Nothing will be added if + // |resource_id| is empty. + std::string resource_id; +@@ -621,6 +628,10 @@ AutofillDownloadManager::GetRequestURLAndMethodForApi( + (request_data.request_type == AutofillDownloadManager::REQUEST_QUERY) + ? "GET" + : "POST"; ++#else ++ std::string method("GET"); ++ GURL url = GURL("about:blank"); +#endif return std::make_tuple(std::move(url), std::move(method)); } @@ -41,15 +75,35 @@ 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 -@@ -1166,9 +1166,11 @@ AutofillManager::AutofillManager( +@@ -171,19 +171,6 @@ void LogDeveloperEngagementUkm(ukm::UkmRecorder* ukm_recorder, + } + } + +-std::string GetAPIKeyForUrl(version_info::Channel channel) { +- // First look if we can get API key from command line flag. +- const base::CommandLine& command_line = +- *base::CommandLine::ForCurrentProcess(); +- if (command_line.HasSwitch(switches::kAutofillAPIKey)) +- return command_line.GetSwitchValueASCII(switches::kAutofillAPIKey); +- +- // Get the API key from Chrome baked keys. +- if (channel == version_info::Channel::STABLE) +- return google_apis::GetAPIKey(); +- return google_apis::GetNonStableAPIKey(); +-} +- + } // namespace + + AutofillManager::FillingContext::FillingContext() = default; +@@ -1260,11 +1247,6 @@ AutofillManager::AutofillManager( weak_ptr_factory_(this) { DCHECK(driver); DCHECK(client_); -+#if 0 - if (enable_download_manager == ENABLE_AUTOFILL_DOWNLOAD_MANAGER) { - download_manager_.reset(new AutofillDownloadManager(driver, this)); - } -+#endif +- if (enable_download_manager == ENABLE_AUTOFILL_DOWNLOAD_MANAGER) { +- version_info::Channel channel = client_->GetChannel(); +- download_manager_.reset( +- new AutofillDownloadManager(driver, this, GetAPIKeyForUrl(channel))); +- } CountryNames::SetLocaleString(app_locale_); if (personal_data_ && client_) personal_data_->OnSyncServiceInitialized(client_->GetSyncService()); diff --git a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch index 6e2ead87..0dd5de46 100644 --- a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch +++ b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch @@ -11,7 +11,7 @@ anyway), avoid sending to Google. diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc --- a/net/dns/host_resolver_impl.cc +++ b/net/dns/host_resolver_impl.cc -@@ -115,10 +115,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; +@@ -118,10 +118,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; // cached. const int kIPv6ProbePeriodMs = 1000; @@ -23,8 +23,8 @@ diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc + { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }; - // We use a separate histogram name for each platform to facilitate the - // display of error codes by their symbolic name (since each platform has + enum DnsResolveStatus { + RESOLVE_STATUS_DNS_SUCCESS = 0, -- 2.11.0 diff --git a/build/patches/getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch b/build/patches/getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch index 7fd5e95a..8669bcdc 100644 --- a/build/patches/getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch +++ b/build/patches/getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch @@ -33,7 +33,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #include "services/metrics/public/cpp/mojo_ukm_recorder.h" #include "services/metrics/public/cpp/ukm_builders.h" #include "services/metrics/public/cpp/ukm_source_id.h" -@@ -725,6 +726,10 @@ Document::Document(const DocumentInit& initializer, +@@ -722,6 +723,10 @@ Document::Document(const DocumentInit& initializer, } DCHECK(fetcher_); @@ -44,7 +44,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink root_scroller_controller_ = RootScrollerController::Create(*this); // We depend on the url getting immediately set in subframes, but we -@@ -790,6 +795,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope, +@@ -787,6 +792,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope, Position::BeforeNode(*shadow_host)); } @@ -62,7 +62,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 -@@ -427,6 +427,9 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -418,6 +418,9 @@ class CORE_EXPORT Document : public ContainerNode, has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -72,7 +72,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/ String visibilityState() const; mojom::PageVisibilityState GetPageVisibilityState() const; bool hidden() const; -@@ -1780,6 +1783,8 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -1776,6 +1779,8 @@ class CORE_EXPORT Document : public ContainerNode, double start_time_; @@ -84,7 +84,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 -@@ -1363,6 +1363,15 @@ DOMRectList* Element::getClientRects() { +@@ -1202,6 +1202,15 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom( quads, *element_layout_object); @@ -100,7 +100,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ return DOMRectList::Create(quads); } -@@ -1380,6 +1389,13 @@ DOMRect* Element::getBoundingClientRect() { +@@ -1219,6 +1228,13 @@ DOMRect* Element::getBoundingClientRect() { DCHECK(element_layout_object); GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -117,7 +117,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 -@@ -1606,11 +1606,27 @@ DOMRectList* Range::getClientRects() const { +@@ -1646,11 +1646,27 @@ DOMRectList* Range::getClientRects() const { Vector quads; GetBorderAndTextQuads(quads); @@ -149,9 +149,9 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re 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 -@@ -38,6 +38,24 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline, - return 0; - } +@@ -45,6 +45,24 @@ void TextMetrics::Trace(blink::Visitor* visitor) { + + TextMetrics::TextMetrics() : baselines_(Baselines::Create()) {} +void TextMetrics::Shuffle(const double factor) { + // x-direction @@ -166,9 +166,9 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third + actual_bounding_box_descent_ *= factor; + em_height_ascent_ *= factor; + em_height_descent_ *= factor; -+ baselines_.setAlphabetic(baselines_.alphabetic() * factor); -+ baselines_.setHanging(baselines_.hanging() * factor); -+ baselines_.setIdeographic(baselines_.ideographic() * factor); ++ baselines_->setAlphabetic(baselines_->alphabetic() * factor); ++ baselines_->setHanging(baselines_->hanging() * factor); ++ baselines_->setIdeographic(baselines_->ideographic() * factor); +} + void TextMetrics::Update(const Font& font, @@ -177,9 +177,9 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h --- a/third_party/blink/renderer/core/html/canvas/text_metrics.h +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h -@@ -68,6 +68,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable { +@@ -71,6 +71,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable { - static float GetFontBaseline(const TextBaseline&, const SimpleFontData&); + void Trace(blink::Visitor*) override; + void Shuffle(const double factor); + @@ -198,7 +198,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/task_type.h" #include "third_party/blink/public/platform/web_scroll_into_view_params.h" -@@ -782,8 +784,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -783,8 +785,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { else direction = ToTextDirection(GetState().GetDirection(), canvas()); diff --git a/build/patches/kill-GCM.patch b/build/patches/kill-GCM.patch index 2346df1b..633a24f6 100644 --- a/build/patches/kill-GCM.patch +++ b/build/patches/kill-GCM.patch @@ -10,24 +10,24 @@ Subject: kill GCM .../chrome/browser/ChromeBackgroundService.java | 1 - .../invalidation/InvalidationController.java | 13 -- .../browser/ntp/snippets/SnippetsLauncher.java | 44 ------- - .../browser/services/gcm/GCMBackgroundTask.java | 2 - + .../browser/services/gcm/GCMBackgroundTask.java | 2 +- .../gcm/InvalidationGcmUpstreamSender.java | 15 --- chrome/android/java_sources.gni | 2 - components/background_task_scheduler/BUILD.gn | 1 - .../BackgroundTaskSchedulerGcmNetworkManager.java | 146 +-------------------- components/gcm_driver/android/BUILD.gn | 1 - components/gcm_driver/instance_id/android/BUILD.gn | 1 - - .../gcm_driver/instance_id/InstanceIDBridge.java | 31 +---- + .../gcm_driver/instance_id/InstanceIDBridge.java | 40 +----- components/sync/android/BUILD.gn | 1 - third_party/cacheinvalidation/BUILD.gn | 6 - .../client/contrib/MultiplexingGcmListener.java | 92 +------------ .../android2/channel/AndroidNetworkChannel.java | 18 +-- - 19 files changed, 14 insertions(+), 523 deletions(-) + 19 files changed, 15 insertions(+), 531 deletions(-) diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn --- a/build/secondary/third_party/android_tools/BUILD.gn +++ b/build/secondary/third_party/android_tools/BUILD.gn -@@ -53,9 +53,6 @@ if (enable_java_templates) { +@@ -83,9 +83,6 @@ if (enable_java_templates) { testonly = true java_files = [ "//third_party/android_tools/sdk/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ] } @@ -40,7 +40,7 @@ diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondar diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -308,7 +308,6 @@ android_library("chrome_java") { +@@ -317,7 +317,6 @@ android_library("chrome_java") { "//third_party/android_deps:javax_inject_javax_inject_java", "//third_party/android_media:android_media_java", "//third_party/android_swipe_refresh:android_swipe_refresh_java", @@ -74,7 +74,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -911,43 +906,6 @@ by a child template that "extends" this file. +@@ -961,43 +956,6 @@ by a child template that "extends" this file. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" android:hardwareAccelerated="false" /> @@ -118,7 +118,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -959,8 +917,6 @@ by a child template that "extends" this file. +@@ -1009,8 +967,6 @@ by a child template that "extends" this file. @@ -127,7 +127,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro @@ -290,7 +290,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java -@@ -106,7 +106,6 @@ public class ChromeBackgroundService extends GcmTaskService { +@@ -116,7 +116,6 @@ public class ChromeBackgroundService extends GcmTaskService { @VisibleForTesting protected void rescheduleBackgroundSyncTasksOnUpgrade() { @@ -310,7 +310,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/In import org.chromium.base.ApplicationState; import org.chromium.base.ApplicationStatus; import org.chromium.base.ContextUtils; -@@ -198,18 +196,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat +@@ -192,18 +190,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat * Registers for Google Cloud Messaging (GCM) for Invalidations. */ private void ensureGcmIsInitialized() { @@ -425,12 +425,12 @@ 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/GCMBackgroundTask.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java --- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java -@@ -39,8 +39,6 @@ public class GCMBackgroundTask implements BackgroundTask { - Log.e(TAG, "The received bundle containing message data could not be validated."); +@@ -41,7 +41,7 @@ public class GCMBackgroundTask implements BackgroundTask { return false; } -- -- ChromeGcmListenerService.dispatchMessageToDriver(context, new GCMMessage(extras)); + +- ChromeGcmListenerService.dispatchMessageToDriver(context, message); ++ //ChromeGcmListenerService.dispatchMessageToDriver(context, message); return false; } @@ -469,7 +469,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/In diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni -@@ -27,7 +27,6 @@ chrome_java_sources = [ +@@ -28,7 +28,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/ChromeActivity.java", "java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java", "java/src/org/chromium/chrome/browser/ChromeApplication.java", @@ -477,7 +477,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java", "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java", "java/src/org/chromium/chrome/browser/ChromeFeatureList.java", -@@ -1344,7 +1343,6 @@ chrome_java_sources = [ +@@ -1417,7 +1416,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java", "java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java", "java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java", @@ -685,7 +685,7 @@ diff --git a/components/gcm_driver/android/BUILD.gn b/components/gcm_driver/andr 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 -@@ -26,7 +26,6 @@ android_library("instance_id_driver_java") { +@@ -27,7 +27,6 @@ android_library("instance_id_driver_java") { java_files = [ "java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java", @@ -696,7 +696,7 @@ diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java --- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java +++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java -@@ -32,7 +32,6 @@ public class InstanceIDBridge { +@@ -26,7 +26,6 @@ public class InstanceIDBridge { * Underlying InstanceIDWithSubtype. May be shared by multiple InstanceIDBridges. Must be * initialized on a background thread. */ @@ -704,7 +704,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com private static boolean sBlockOnAsyncTasksForTesting; -@@ -108,7 +107,7 @@ public class InstanceIDBridge { +@@ -71,7 +70,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected String doBackgroundWork() { @@ -713,7 +713,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override protected void sendResultToNative(String id) { -@@ -123,7 +122,7 @@ public class InstanceIDBridge { +@@ -86,7 +85,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected Long doBackgroundWork() { @@ -722,12 +722,15 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override protected void sendResultToNative(Long creationTime) { -@@ -148,12 +147,7 @@ public class InstanceIDBridge { +@@ -111,15 +110,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected String doBackgroundWork() { - try { -- storeLazinessInformation(authorizedEntity, isLazy); +- LazySubscriptionsManager.storeLazinessInformation( +- LazySubscriptionsManager.buildSubscriptionUniqueId( +- mSubtype, authorizedEntity), +- isLazy); - return mInstanceID.getToken(authorizedEntity, scope, extras); - } catch (IOException ex) { - return ""; @@ -736,21 +739,27 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override protected void sendResultToNative(String token) { -@@ -169,12 +163,7 @@ public class InstanceIDBridge { +@@ -135,18 +126,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected Boolean doBackgroundWork() { - try { - mInstanceID.deleteToken(authorizedEntity, scope); +- String subscriptionId = LazySubscriptionsManager.buildSubscriptionUniqueId( +- mSubtype, authorizedEntity); +- if (LazySubscriptionsManager.isSubscriptionLazy(subscriptionId)) { +- LazySubscriptionsManager.deletePersistedMessagesForSubscriptionId( +- subscriptionId); +- } - return true; - } catch (IOException ex) { - return false; - } -+ return true; ++ return false; } @Override protected void sendResultToNative(Boolean success) { -@@ -189,12 +178,7 @@ public class InstanceIDBridge { +@@ -161,12 +141,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected Boolean doBackgroundWork() { @@ -764,7 +773,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override protected void sendResultToNative(Boolean success) { -@@ -233,11 +217,6 @@ public class InstanceIDBridge { +@@ -205,11 +180,6 @@ public class InstanceIDBridge { @Override @SuppressWarnings("NoSynchronizedThisCheck") // Only used/accessible by native. protected Result doInBackground() { diff --git a/build/patches/kill-TOS-and-metrics-opt-out.patch b/build/patches/kill-TOS-and-metrics-opt-out.patch index 17a0bdbe..9ee8f49a 100644 --- a/build/patches/kill-TOS-and-metrics-opt-out.patch +++ b/build/patches/kill-TOS-and-metrics-opt-out.patch @@ -11,7 +11,7 @@ Subject: kill TOS and metrics opt-out diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml --- a/chrome/android/java/res/layout/fre_tosanduma.xml +++ b/chrome/android/java/res/layout/fre_tosanduma.xml -@@ -63,7 +63,8 @@ +@@ -62,7 +62,8 @@ android:layout_marginBottom="@dimen/fre_vertical_spacing" android:gravity="center" android:lineSpacingMultiplier="1.4" @@ -24,8 +24,8 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml -@@ -181,7 +181,6 @@ - 8dp +@@ -182,7 +182,6 @@ + 12dp 24dp 120dp - 12dp diff --git a/build/patches/kill-Vision.patch b/build/patches/kill-Vision.patch index 9736f3b1..d746bce9 100644 --- a/build/patches/kill-Vision.patch +++ b/build/patches/kill-Vision.patch @@ -13,7 +13,7 @@ Barcode, face and text detection APIs diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn --- a/services/shape_detection/BUILD.gn +++ b/services/shape_detection/BUILD.gn -@@ -86,14 +86,10 @@ if (is_android) { +@@ -85,14 +85,10 @@ if (is_android) { android_library("shape_detection_java") { java_files = [ diff --git a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch index 674832e0..01ebe2a1 100644 --- a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch +++ b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch @@ -5,9 +5,9 @@ Subject: openH264: enable ARM/ARM64 optimizations Enable the optimizations not only for ChromeOS but for all compatbile ARM/ARM64 architectures Limit threads auto-detect only for iOS --- - content/renderer/media_recorder/h264_encoder.cc | 6 ++-- - third_party/openh264/BUILD.gn | 39 +++++++++++++++++++++++++ - 2 files changed, 42 insertions(+), 3 deletions(-) + content/renderer/media_recorder/h264_encoder.cc | 6 ++--- + third_party/openh264/BUILD.gn | 31 +++++++++++++++++++------ + 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/content/renderer/media_recorder/h264_encoder.cc b/content/renderer/media_recorder/h264_encoder.cc --- a/content/renderer/media_recorder/h264_encoder.cc @@ -30,26 +30,15 @@ diff --git a/content/renderer/media_recorder/h264_encoder.cc b/content/renderer/ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn --- a/third_party/openh264/BUILD.gn +++ b/third_party/openh264/BUILD.gn -@@ -10,6 +10,7 @@ import("//third_party/yasm/yasm_assemble.gni") - # Config shared by all openh264 targets. - config("config") { - cflags = [] -+ defines = [] - - if (is_chromeos && target_cpu == "arm") { +@@ -16,11 +16,16 @@ config("config") { # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS -@@ -20,6 +21,20 @@ config("config") { + # devices. + defines += [ +- "HAVE_NEON", + "__chromeos__", ] } -+ # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS -+ # devices. -+ if (is_chromeos && target_cpu == "arm") { -+ defines += [ -+ "__chromeos__", -+ ] -+ } -+ + if (target_cpu == "arm" || target_cpu == "arm64") { + defines += [ + "HAVE_NEON", @@ -59,51 +48,51 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags. if (!is_win || is_clang) { cflags += [ -@@ -129,6 +144,14 @@ source_set("common") { +@@ -125,8 +130,12 @@ if (use_assembler) { + + source_set("common") { + sources = openh264_common_sources +- if (is_chromeos && target_cpu == "arm") { +- sources += openh264_common_sources_asm_arm ++ if (is_chromeos || is_android) { ++ if (target_cpu == "arm") { ++ sources += openh264_common_sources_asm_arm ++ } else if (target_cpu == "arm64") { ++ sources += openh264_common_sources_asm_arm64 ++ } } include_dirs = openh264_common_include_dirs -+ # enable ARM optimizations -+ if (target_cpu == "arm") { -+ sources += openh264_common_sources_asm_arm -+ } -+ if (target_cpu == "arm64") { -+ sources += openh264_common_sources_asm_arm64 -+ } -+ - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ ":config" ] -@@ -155,6 +178,14 @@ source_set("processing") { +@@ -151,8 +160,12 @@ source_set("common") { + + source_set("processing") { + sources = openh264_processing_sources +- if (is_chromeos && target_cpu == "arm") { +- sources += openh264_processing_sources_asm_arm ++ if (is_chromeos || is_android) { ++ if (target_cpu == "arm") { ++ sources += openh264_processing_sources_asm_arm ++ } else if (target_cpu == "arm64") { ++ sources += openh264_processing_sources_asm_arm64 ++ } } include_dirs = openh264_processing_include_dirs -+ # enable ARM optimizations -+ if (target_cpu == "arm") { -+ sources += openh264_common_sources_asm_arm -+ } -+ if (target_cpu == "arm64") { -+ sources += openh264_common_sources_asm_arm64 -+ } -+ - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ ":config" ] -@@ -174,6 +205,14 @@ source_set("encoder") { +@@ -170,8 +183,12 @@ source_set("processing") { + + source_set("encoder") { + sources = openh264_encoder_sources +- if (is_chromeos && target_cpu == "arm") { +- sources += openh264_encoder_sources_asm_arm ++ if (is_chromeos || is_android) { ++ if (target_cpu == "arm") { ++ sources += openh264_encoder_sources_asm_arm ++ } else if (target_cpu == "arm64") { ++ sources += openh264_encoder_sources_asm_arm64 ++ } } include_dirs = openh264_encoder_include_dirs -+ # enable ARM optimizations -+ if (target_cpu == "arm") { -+ sources += openh264_common_sources_asm_arm -+ } -+ if (target_cpu == "arm64") { -+ sources += openh264_common_sources_asm_arm64 -+ } -+ - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ ":config" ] -- 2.11.0 diff --git a/build/patches/safe_browsing-disable-cookie-transmission.patch b/build/patches/safe_browsing-disable-cookie-transmission.patch index c6c30e86..13bc83a1 100644 --- a/build/patches/safe_browsing-disable-cookie-transmission.patch +++ b/build/patches/safe_browsing-disable-cookie-transmission.patch @@ -17,7 +17,7 @@ References: https://github.com/iridium-browser/iridium-browser/issues/37 diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc -@@ -358,7 +358,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( +@@ -359,7 +359,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( auto resource_request = std::make_unique(); resource_request->url = GetClientReportUrl(kClientReportPhishingUrl); resource_request->method = "POST"; @@ -26,7 +26,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr auto loader = network::SimpleURLLoader::Create(std::move(resource_request), traffic_annotation); loader->AttachStringForUpload(request_data, "application/octet-stream"); -@@ -440,7 +440,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( +@@ -441,7 +441,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( auto resource_request = std::make_unique(); resource_request->url = GetClientReportUrl(kClientReportMalwareUrl); resource_request->method = "POST"; @@ -38,7 +38,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc -@@ -1067,7 +1067,7 @@ void CheckClientDownloadRequest::SendRequest() { +@@ -759,7 +759,7 @@ void CheckClientDownloadRequest::SendRequest() { auto resource_request = std::make_unique(); resource_request->url = PPAPIDownloadRequest::GetDownloadRequestUrl(); resource_request->method = "POST"; diff --git a/build/patches/safe_browsing-disable-incident-reporting.patch b/build/patches/safe_browsing-disable-incident-reporting.patch index bfeaaa49..d9d3d305 100644 --- a/build/patches/safe_browsing-disable-incident-reporting.patch +++ b/build/patches/safe_browsing-disable-incident-reporting.patch @@ -46,7 +46,7 @@ diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_ diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc -@@ -61,8 +61,7 @@ class SafeBrowsingBlockingPageFactoryImpl +@@ -59,8 +59,7 @@ class SafeBrowsingBlockingPageFactoryImpl Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); PrefService* prefs = profile->GetPrefs(); @@ -55,11 +55,11 @@ diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrom + bool is_extended_reporting_opt_in_allowed = false; bool is_proceed_anyway_disabled = prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled); - unified_consent::UnifiedConsentService* consent_service = + diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -329,8 +329,10 @@ SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() { +@@ -359,8 +359,10 @@ SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() { void SafeBrowsingService::RegisterAllDelayedAnalysis() { #if defined(FULL_SAFE_BROWSING) diff --git a/build/patches/safe_browsing-disable-reporting-of-safebrowsing-override.patch b/build/patches/safe_browsing-disable-reporting-of-safebrowsing-override.patch index b4577de7..5a07c720 100644 --- a/build/patches/safe_browsing-disable-reporting-of-safebrowsing-override.patch +++ b/build/patches/safe_browsing-disable-reporting-of-safebrowsing-override.patch @@ -26,7 +26,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr } // namespace -@@ -289,6 +291,10 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( +@@ -290,6 +292,10 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( return; } @@ -37,7 +37,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr // Fill in metadata about which model we used. if (is_extended_reporting) { request->set_model_filename(model_loader_extended_->name()); -@@ -371,6 +377,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( +@@ -372,6 +378,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( // Record that we made a request phishing_report_times_.push(base::Time::Now()); @@ -45,7 +45,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr } void ClientSideDetectionService::StartClientReportMalwareRequest( -@@ -385,6 +392,10 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( +@@ -386,6 +393,10 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( return; } @@ -56,7 +56,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr std::string request_data; if (!request->SerializeToString(&request_data)) { UpdateEnumUMAHistogram(REPORT_FAILED_SERIALIZATION); -@@ -454,6 +465,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( +@@ -455,6 +466,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( // Record that we made a malware request malware_report_times_.push(base::Time::Now()); diff --git a/build/patches/ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch b/build/patches/ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch index cdb7be45..0fbac462 100644 --- a/build/patches/ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch +++ b/build/patches/ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch @@ -17,7 +17,7 @@ Related comment: https://bugs.chromium.org/p/chromium/issues/detail?id=710701#c1 diff --git a/third_party/blink/renderer/devtools/BUILD.gn b/third_party/blink/renderer/devtools/BUILD.gn --- a/third_party/blink/renderer/devtools/BUILD.gn +++ b/third_party/blink/renderer/devtools/BUILD.gn -@@ -1162,10 +1162,8 @@ action("generate_devtools_grd") { +@@ -1161,10 +1161,8 @@ action("generate_devtools_grd") { devtools_embedder_scripts + [ "$resources_out_dir/devtools_extension_api.js" ] @@ -44,7 +44,7 @@ diff --git a/third_party/blink/renderer/devtools/front_end/audits2_worker.json b diff --git a/third_party/blink/renderer/devtools/front_end/devtools_app.json b/third_party/blink/renderer/devtools/front_end/devtools_app.json --- a/third_party/blink/renderer/devtools/front_end/devtools_app.json +++ b/third_party/blink/renderer/devtools/front_end/devtools_app.json -@@ -4,7 +4,7 @@ +@@ -4,21 +4,21 @@ { "name": "inspector_main", "type": "autostart" }, { "name": "mobile_throttling", "type": "autostart" }, @@ -52,8 +52,7 @@ diff --git a/third_party/blink/renderer/devtools/front_end/devtools_app.json b/t + { "name": "accessibility" }, { "name": "animation" }, { "name": "audits2" }, - { "name": "browser_console" }, -@@ -12,14 +12,14 @@ + { "name": "browser_debugger" }, { "name": "cookie_table" }, { "name": "devices" }, { "name": "elements" }, @@ -94,7 +93,7 @@ diff --git a/third_party/blink/renderer/devtools/front_end/shell.json b/third_pa diff --git a/third_party/blink/renderer/devtools/front_end/worker_app.json b/third_party/blink/renderer/devtools/front_end/worker_app.json --- a/third_party/blink/renderer/devtools/front_end/worker_app.json +++ b/third_party/blink/renderer/devtools/front_end/worker_app.json -@@ -11,7 +11,7 @@ +@@ -10,7 +10,7 @@ { "name": "help" }, { "name": "layer_viewer" }, { "name": "network" }, diff --git a/build/patches/ungoogled-chromium-Disable-Gaia.patch b/build/patches/ungoogled-chromium-Disable-Gaia.patch index 93ee9582..2aded352 100644 --- a/build/patches/ungoogled-chromium-Disable-Gaia.patch +++ b/build/patches/ungoogled-chromium-Disable-Gaia.patch @@ -18,7 +18,7 @@ See also: https://github.com/Eloston/ungoogled-chromium/issues/104 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 -@@ -348,7 +348,6 @@ +@@ -332,7 +332,6 @@ @@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou -@@ -492,7 +491,6 @@ +@@ -453,7 +452,6 @@ @@ -100,7 +100,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_ std::unique_ptr ExtractOAuth2TokenPairResponse(const std::string& data) { -@@ -240,6 +240,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( +@@ -270,6 +270,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( const net::NetworkTrafficAnnotationTag& traffic_annotation) { DCHECK(!fetch_pending_) << "Tried to fetch two things at once!"; @@ -108,7 +108,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_ auto resource_request = std::make_unique(); resource_request->url = gaia_gurl; original_url_ = gaia_gurl; -@@ -294,6 +295,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( +@@ -324,6 +325,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( base::BindOnce(&GaiaAuthFetcher::OnURLLoadComplete, base::Unretained(this)), kMaxMessageSize); diff --git a/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch b/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch index f23c14d5..e57d91a8 100644 --- a/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch +++ b/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch @@ -6,10 +6,10 @@ Disables various detections of Google hosts and functionality specific to them --- .../page_load_metrics/page_load_metrics_util.cc | 4 +- .../page_load_metrics/page_load_metrics_util.cc | 33 +--- - components/google/core/common/google_util.cc | 194 ++------------------- + components/google/core/common/google_util.cc | 196 ++------------------- components/search_engines/template_url.cc | 6 +- net/base/url_util.cc | 22 --- - 5 files changed, 14 insertions(+), 245 deletions(-) + 5 files changed, 14 insertions(+), 247 deletions(-) diff --git a/chrome/browser/page_load_metrics/page_load_metrics_util.cc b/chrome/browser/page_load_metrics/page_load_metrics_util.cc --- a/chrome/browser/page_load_metrics/page_load_metrics_util.cc @@ -71,9 +71,9 @@ diff --git a/chrome/common/page_load_metrics/page_load_metrics_util.cc b/chrome/ diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc -@@ -43,118 +43,16 @@ namespace { +@@ -45,120 +45,16 @@ bool gUseMockLinkDoctorBaseURLForTesting = false; - bool gUseMockLinkDoctorBaseURLForTesting = false; + bool g_ignore_port_numbers = false; -bool IsPathHomePageBase(base::StringPiece path) { - return (path == "/") || (path == "/webhp"); @@ -131,7 +131,8 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co -// port for its scheme (80 for HTTP, 443 for HTTPS). -bool IsValidURL(const GURL& url, PortPermission port_permission) { - return url.is_valid() && url.SchemeIsHTTPOrHTTPS() && -- (url.port().empty() || (port_permission == ALLOW_NON_STANDARD_PORTS)); +- (url.port().empty() || g_ignore_port_numbers || +- (port_permission == ALLOW_NON_STANDARD_PORTS)); -} - -bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host, @@ -148,9 +149,9 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co - // same page. - StripTrailingDot(&tld); - -- static base::NoDestructor> google_tlds( -- {GOOGLE_TLD_LIST}); -- return base::ContainsKey(*google_tlds, tld.as_string()); +- static const base::NoDestructor> +- google_tlds(std::initializer_list({GOOGLE_TLD_LIST})); +- return google_tlds->contains(tld); -} - -// True if |url| is a valid URL with a host that is in the static list of @@ -163,10 +164,11 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co - base::StringPiece host(url.host_piece()); - StripTrailingDot(&host); - -- static base::NoDestructor> google_subdomains( -- {"ipv4.google.com", "ipv6.google.com"}); +- static const base::NoDestructor> +- google_subdomains(std::initializer_list( +- {"ipv4.google.com", "ipv6.google.com"})); - -- return base::ContainsKey(*google_subdomains, host.as_string()); +- return google_subdomains->contains(host); -} - } // namespace @@ -191,7 +193,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co } void SetMockLinkDoctorBaseURLForTesting() { -@@ -168,120 +66,50 @@ std::string GetGoogleLocale(const std::string& application_locale) { +@@ -172,120 +68,50 @@ std::string GetGoogleLocale(const std::string& application_locale) { GURL AppendGoogleLocaleParam(const GURL& url, const std::string& application_locale) { diff --git a/build/patches/ungoogled-chromium-Disable-domain-reliability.patch b/build/patches/ungoogled-chromium-Disable-domain-reliability.patch index eab367a1..ba1a3b37 100644 --- a/build/patches/ungoogled-chromium-Disable-domain-reliability.patch +++ b/build/patches/ungoogled-chromium-Disable-domain-reliability.patch @@ -668,7 +668,7 @@ diff --git a/components/domain_reliability/uploader.cc b/components/domain_relia - if (discard_uploads_ || shutdown_) { + if (true) { - VLOG(1) << "Discarding report instead of uploading."; + DVLOG(1) << "Discarding report instead of uploading."; UploadResult result; result.status = UploadResult::SUCCESS; -- diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar-downloading.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar-downloading.patch index 37320bb7..b70b0b73 100644 --- a/build/patches/ungoogled-chromium-Disable-profile-avatar-downloading.patch +++ b/build/patches/ungoogled-chromium-Disable-profile-avatar-downloading.patch @@ -12,7 +12,7 @@ Added some Bromite-specific further improvements diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1270,8 +1270,6 @@ jumbo_split_static_library("browser") { +@@ -1271,8 +1271,6 @@ jumbo_split_static_library("browser") { "profiles/profile_attributes_entry.h", "profiles/profile_attributes_storage.cc", "profiles/profile_attributes_storage.h", @@ -24,7 +24,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc -@@ -83,20 +83,6 @@ base::string16 ProfileAttributesEntry::GetUserName() const { +@@ -94,20 +94,6 @@ base::string16 ProfileAttributesEntry::GetUserName() const { } const gfx::Image& ProfileAttributesEntry::GetAvatarIcon() const { diff --git a/build/patches/ungoogled-chromium-Disable-signin.patch b/build/patches/ungoogled-chromium-Disable-signin.patch index cc974027..8b49a1fe 100644 --- a/build/patches/ungoogled-chromium-Disable-signin.patch +++ b/build/patches/ungoogled-chromium-Disable-signin.patch @@ -42,7 +42,7 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages. diff --git a/components/signin/core/browser/signin_manager_base.cc b/components/signin/core/browser/signin_manager_base.cc --- a/components/signin/core/browser/signin_manager_base.cc +++ b/components/signin/core/browser/signin_manager_base.cc -@@ -155,7 +155,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) { +@@ -152,7 +152,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) { bool SigninManagerBase::IsInitialized() const { return initialized_; } bool SigninManagerBase::IsSigninAllowed() const { diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch index 20508bb1..9f11a235 100644 --- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch @@ -3,25 +3,10 @@ Date: Mon, 12 Feb 2018 21:28:53 +0100 Subject: ungoogled-chromium: Disable translate integration --- - components/translate/content/renderer/translate_helper.cc | 4 +++- - components/translate/core/browser/translate_manager.cc | 5 +++-- - components/translate/core/browser/translate_script.cc | 3 +-- - 3 files changed, 7 insertions(+), 5 deletions(-) + components/translate/core/browser/translate_manager.cc | 5 +++-- + components/translate/core/browser/translate_script.cc | 3 +-- + 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/components/translate/content/renderer/translate_helper.cc b/components/translate/content/renderer/translate_helper.cc ---- a/components/translate/content/renderer/translate_helper.cc -+++ b/components/translate/content/renderer/translate_helper.cc -@@ -74,7 +74,9 @@ TranslateHelper::TranslateHelper(content::RenderFrame* render_frame, - world_id_(world_id), - extension_scheme_(extension_scheme), - binding_(this), -- weak_method_factory_(this) {} -+ weak_method_factory_(this) { -+ CancelPendingTranslation(); -+} - - TranslateHelper::~TranslateHelper() { - } diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc --- a/components/translate/core/browser/translate_manager.cc +++ b/components/translate/core/browser/translate_manager.cc diff --git a/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch b/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch index b5fab093..4c8c1536 100644 --- a/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch +++ b/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch @@ -9,7 +9,7 @@ Subject: ungoogled-chromium: Disable webRTC log uploader diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -119,30 +119,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload( +@@ -121,30 +121,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload( DCHECK(meta_data.get()); DCHECK(!upload_done_data.log_path.empty()); @@ -41,7 +41,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser } void WebRtcLogUploader::PrepareMultipartPostData( -@@ -153,6 +130,9 @@ void WebRtcLogUploader::PrepareMultipartPostData( +@@ -155,6 +132,9 @@ void WebRtcLogUploader::PrepareMultipartPostData( DCHECK(!compressed_log.empty()); DCHECK(meta_data.get()); diff --git a/build/patches/ungoogled-chromium-Remove-third_party-analytics.patch b/build/patches/ungoogled-chromium-Remove-third_party-analytics.patch deleted file mode 100644 index 7280a50a..00000000 --- a/build/patches/ungoogled-chromium-Remove-third_party-analytics.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Mon, 17 Sep 2018 21:55:33 +0200 -Subject: ungoogled-chromium: Remove third_party/analytics - ---- - ui/webui/resources/webui_resources.grd | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/ui/webui/resources/webui_resources.grd b/ui/webui/resources/webui_resources.grd ---- a/ui/webui/resources/webui_resources.grd -+++ b/ui/webui/resources/webui_resources.grd -@@ -15,7 +15,6 @@ without changes to the corresponding grd file. --> - - - -- - --- -2.11.0 - diff --git a/build/patches/ungoogled-chromium-disable-safe-browsing.patch b/build/patches/ungoogled-chromium-disable-safe-browsing.patch index 49f76ccc..2d9b1620 100644 --- a/build/patches/ungoogled-chromium-disable-safe-browsing.patch +++ b/build/patches/ungoogled-chromium-disable-safe-browsing.patch @@ -41,7 +41,7 @@ Subject: ungoogled-chromium: disable safe browsing diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2621,8 +2621,6 @@ jumbo_split_static_library("browser") { +@@ -2647,8 +2647,6 @@ jumbo_split_static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -62,9 +62,9 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h -} - namespace subresource_filter { - class ContentRulesetService; + class RulesetService; } -@@ -116,10 +112,6 @@ namespace resource_coordinator { +@@ -117,10 +113,6 @@ class ResourceCoordinatorParts; class TabManager; } @@ -75,7 +75,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h // NOT THREAD SAFE, call only from the main thread. // These functions shouldn't return NULL unless otherwise noted. class BrowserProcess { -@@ -234,14 +226,6 @@ class BrowserProcess { +@@ -235,14 +227,6 @@ class BrowserProcess { // on this platform (or this is a unit test). virtual StatusTray* status_tray() = 0; @@ -89,19 +89,19 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h - // Returns the service providing versioned storage for rules used by the Safe // Browsing subresource filter. - virtual subresource_filter::ContentRulesetService* + virtual subresource_filter::RulesetService* 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 -@@ -72,7 +72,6 @@ +@@ -73,7 +73,6 @@ #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/profiles/profile_manager.h" - #include "chrome/browser/resource_coordinator/tab_lifecycle_unit_source.h" + #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/status_icons/status_tray.h" #include "chrome/browser/ui/browser_dialogs.h" -@@ -373,8 +372,6 @@ void BrowserProcessImpl::StartTearDown() { +@@ -371,8 +370,6 @@ void BrowserProcessImpl::StartTearDown() { // that URLFetcher operation before going away.) metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -110,7 +110,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro network_time_tracker_.reset(); #if BUILDFLAG(ENABLE_PLUGINS) plugins_resource_service_.reset(); -@@ -994,22 +991,6 @@ StatusTray* BrowserProcessImpl::status_tray() { +@@ -992,22 +989,6 @@ StatusTray* BrowserProcessImpl::status_tray() { return status_tray_.get(); } @@ -130,10 +130,10 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro - return NULL; -} - - subresource_filter::ContentRulesetService* + subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1300,16 +1281,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() { +@@ -1298,16 +1279,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() { #endif } @@ -153,17 +153,17 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -175,9 +175,6 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -172,9 +172,6 @@ class BrowserProcessImpl : public BrowserProcess, void set_background_mode_manager_for_test( std::unique_ptr manager) override; StatusTray* status_tray() override; - safe_browsing::SafeBrowsingService* safe_browsing_service() override; - safe_browsing::ClientSideDetectionService* safe_browsing_detection_service() - override; - subresource_filter::ContentRulesetService* - subresource_filter_ruleset_service() override; + subresource_filter::RulesetService* subresource_filter_ruleset_service() + override; optimization_guide::OptimizationGuideService* optimization_guide_service() -@@ -324,9 +321,6 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -326,9 +323,6 @@ class BrowserProcessImpl : public BrowserProcess, std::unique_ptr background_mode_manager_; #endif @@ -171,14 +171,14 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc - scoped_refptr safe_browsing_service_; - bool created_subresource_filter_ruleset_service_ = false; - std::unique_ptr + std::unique_ptr subresource_filter_ruleset_service_; diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -649,35 +649,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -617,35 +617,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( CONTENT_SETTINGS_TYPE_CLIENT_HINTS, base::Time(), base::Time::Max(), - base::BindRepeating(&WebsiteSettingsFilterAdapter, filter)); + website_settings_filter); - // Clear the safebrowsing cookies only if time period is for "all time". It - // doesn't make sense to apply the time period of deleting in the last X @@ -215,8 +215,8 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. 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 -@@ -812,30 +812,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { - g_io_thread_application_locale.Get() = locale; +@@ -830,30 +830,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { + GetIOThreadApplicationLocale() = locale; } -// An implementation of the SSLCertReporter interface used by @@ -246,7 +246,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if defined(OS_ANDROID) float GetDeviceScaleAdjustment() { static const float kMinFSM = 1.05f; -@@ -1988,7 +1964,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2004,7 +1980,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( // Disable client-side phishing detection in the renderer if it is // disabled in the Profile preferences or the browser process. if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || @@ -255,7 +255,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch command_line->AppendSwitch( switches::kDisableClientSidePhishingDetection); } -@@ -2666,7 +2642,7 @@ void ChromeContentBrowserClient::AllowCertificateError( +@@ -2694,7 +2670,7 @@ void ChromeContentBrowserClient::AllowCertificateError( SSLErrorHandler::HandleSSLError( web_contents, cert_error, ssl_info, request_url, expired_previous_decision, @@ -264,7 +264,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch callback, SSLErrorHandler::BlockingPageReadyCallback()); } -@@ -2936,8 +2912,6 @@ bool ChromeContentBrowserClient::CanCreateWindow( +@@ -2974,8 +2950,6 @@ bool ChromeContentBrowserClient::CanCreateWindow( void ChromeContentBrowserClient::ResourceDispatcherHostCreated() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -273,7 +273,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch for (size_t i = 0; i < extra_parts_.size(); ++i) extra_parts_[i]->ResourceDispatcherHostCreated(); -@@ -4103,7 +4077,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4181,7 +4155,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials)) { throttles.push_back(std::make_unique( handle, @@ -323,7 +323,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom } #if defined(OS_ANDROID) -@@ -618,16 +611,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath( +@@ -616,16 +609,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath( void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( base::FilePath* filename) { @@ -343,7 +343,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -534,9 +534,6 @@ bool DownloadItemModel::IsCommandEnabled( +@@ -526,9 +526,6 @@ bool DownloadItemModel::IsCommandEnabled( // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -372,7 +372,7 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download } } -@@ -382,10 +375,6 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( +@@ -371,10 +364,6 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( bool DownloadPrefs::EnableAutoOpenBasedOnExtension( const base::FilePath& file_name) { base::FilePath::StringType extension = file_name.Extension(); @@ -651,7 +651,7 @@ diff --git a/chrome/browser/extensions/blacklist_state_fetcher.h b/chrome/browse diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc --- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc -@@ -326,8 +326,7 @@ void LogCommittedPreviewsDecision( +@@ -296,8 +296,7 @@ void NotifyUIThreadOfRequestComplete( } // namespace ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate() @@ -661,7 +661,7 @@ diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b ChromeResourceDispatcherHostDelegate::~ChromeResourceDispatcherHostDelegate() { #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -341,8 +340,6 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning( +@@ -311,8 +310,6 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning( content::AppCacheService* appcache_service, ResourceType resource_type, std::vector>* throttles) { @@ -670,7 +670,7 @@ diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); #if BUILDFLAG(ENABLE_OFFLINE_PAGES) || BUILDFLAG(ENABLE_NACL) -@@ -461,7 +458,7 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles( +@@ -431,7 +428,7 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles( content::ResourceThrottle* first_throttle = NULL; #if defined(OS_ANDROID) first_throttle = DataReductionProxyResourceThrottle::MaybeCreate( @@ -682,7 +682,7 @@ diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -713,9 +713,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { +@@ -714,9 +714,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -708,7 +708,7 @@ diff --git a/chrome/browser/net/trial_comparison_cert_verifier.cc b/chrome/brows diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -230,7 +230,6 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -233,7 +233,6 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) CaptivePortalServiceFactory::GetInstance(); #endif @@ -719,7 +719,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc 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 -@@ -536,18 +536,6 @@ ProfileImpl::ProfileImpl( +@@ -549,18 +549,6 @@ ProfileImpl::ProfileImpl( create_mode == CREATE_MODE_SYNCHRONOUS); #endif @@ -738,7 +738,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p content::BrowserContext::Initialize(this, path_); { -@@ -556,7 +544,7 @@ ProfileImpl::ProfileImpl( +@@ -569,7 +557,7 @@ ProfileImpl::ProfileImpl( ->CreateDelegate(); delegate->InitPrefRegistry(pref_registry_.get()); prefs_ = chrome_prefs::CreateProfilePrefs( @@ -758,7 +758,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin sources = [ "safe_browsing_controller_client.cc", "safe_browsing_controller_client.h", -@@ -74,6 +75,7 @@ static_library("safe_browsing") { +@@ -75,6 +76,7 @@ static_library("safe_browsing") { } else { sources += [ "chrome_cleaner/chrome_cleaner_extension_util_win_noop.cc" ] } @@ -801,7 +801,7 @@ diff --git a/chrome/browser/ssl/cert_report_helper.cc b/chrome/browser/ssl/cert_ - ssl_cert_reporter_->ReportInvalidCertificateChain(serialized_report); } - bool CertReportHelper::IsShowingReportingCheckboxOrReportingAllowed() { + bool CertReportHelper::ShouldShowCertificateReporterCheckbox() { diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc --- a/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc @@ -911,7 +911,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 -@@ -2444,7 +2444,6 @@ jumbo_split_static_library("ui") { +@@ -2420,7 +2420,6 @@ jumbo_split_static_library("ui") { "views/cookie_info_view.h", "views/device_chooser_content_view.cc", "views/device_chooser_content_view.h", @@ -922,7 +922,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -242,8 +242,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -244,8 +244,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { PreviewsUITabHelper::CreateForWebContents(web_contents); RecentlyAudibleHelper::CreateForWebContents(web_contents); ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents); @@ -931,7 +931,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc SearchEngineTabHelper::CreateForWebContents(web_contents); SecurityStateTabHelper::CreateForWebContents(web_contents); if (SiteEngagementService::IsEnabled()) -@@ -297,9 +295,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -298,9 +296,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { new ChromePDFWebContentsHelperClient())); PluginObserver::CreateForWebContents(web_contents); SadTabHelper::CreateForWebContents(web_contents); @@ -944,7 +944,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -251,6 +251,7 @@ BadClockBlockingPage* CreateBadClockBlockingPage( +@@ -250,6 +250,7 @@ BadClockBlockingPage* CreateBadClockBlockingPage( base::Callback()); } @@ -952,7 +952,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage( content::WebContents* web_contents) { safe_browsing::SBThreatType threat_type = -@@ -309,7 +310,9 @@ safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage( +@@ -308,7 +309,9 @@ safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage( g_browser_process->safe_browsing_service()->ui_manager().get(), web_contents, main_frame_url, resource); } @@ -962,7 +962,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage( content::WebContents* web_contents) { safe_browsing::SBThreatType threat_type = -@@ -361,6 +364,7 @@ TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage( +@@ -360,6 +363,7 @@ TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage( g_browser_process->safe_browsing_service()->ui_manager().get(), web_contents, main_frame_url, resource, is_giant_webview); } @@ -970,8 +970,8 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage( -@@ -465,8 +469,6 @@ void InterstitialHTMLSource::StartDataRequest( - CreateSSLBlockingPage(web_contents, true /* is superfish */)); +@@ -460,8 +464,6 @@ void InterstitialHTMLSource::StartDataRequest( + interstitial_delegate.reset(CreateSSLBlockingPage(web_contents)); } else if (path_without_query == "/mitm-software-ssl") { interstitial_delegate.reset(CreateMITMSoftwareBlockingPage(web_contents)); - } else if (path_without_query == "/safebrowsing") { @@ -979,7 +979,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b } else if (path_without_query == "/clock") { interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents)); #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) -@@ -477,11 +479,6 @@ void InterstitialHTMLSource::StartDataRequest( +@@ -472,11 +474,6 @@ void InterstitialHTMLSource::StartDataRequest( if (path_without_query == "/supervised_user") { html = GetSupervisedUserInterstitialHTML(path); @@ -1092,7 +1092,7 @@ diff --git a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.h b/c diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -79,7 +79,6 @@ +@@ -80,7 +80,6 @@ #include "components/error_page/common/localized_error.h" #include "components/network_hints/renderer/prescient_networking_dispatcher.h" #include "components/pdf/renderer/pepper_pdf_host.h" @@ -1103,8 +1103,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer diff --git a/components/safe_browsing/features.cc b/components/safe_browsing/features.cc --- a/components/safe_browsing/features.cc +++ b/components/safe_browsing/features.cc -@@ -46,7 +46,7 @@ const base::Feature kInspectDownloadedRarFiles{ - "InspectDownloadedRarFiles", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -40,7 +40,7 @@ const base::Feature kForceEnableResetPasswordWebUI{ + "ForceEnableResetPasswordWebUI", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kSuspiciousSiteTriggerQuotaFeature{ - "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT}; diff --git a/build/patches/updater-disable-updater-pings.patch b/build/patches/updater-disable-updater-pings.patch index a1c2b93e..f729ba9b 100644 --- a/build/patches/updater-disable-updater-pings.patch +++ b/build/patches/updater-disable-updater-pings.patch @@ -14,7 +14,7 @@ Chromium would still send background requests. Kill it. diff --git a/components/component_updater/component_updater_url_constants.cc b/components/component_updater/component_updater_url_constants.cc --- a/components/component_updater/component_updater_url_constants.cc +++ b/components/component_updater/component_updater_url_constants.cc -@@ -15,9 +15,9 @@ namespace component_updater { +@@ -15,10 +15,10 @@ namespace component_updater { // The value of |kDefaultUrlSource| can be overridden with // --component-updater=url-source=someurl. const char kUpdaterDefaultUrl[] = @@ -25,11 +25,12 @@ diff --git a/components/component_updater/component_updater_url_constants.cc b/c - "http://update.googleapis.com/service/update2"; + "about:blank"; - } // namespace component_updater + extern const char kUpdaterJSONDefaultUrl[] = + "https://update.googleapis.com/service/update2/json"; diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc --- a/components/component_updater/configurator_impl.cc +++ b/components/component_updater/configurator_impl.cc -@@ -39,8 +39,7 @@ ConfiguratorImpl::ConfiguratorImpl( +@@ -48,8 +48,7 @@ ConfiguratorImpl::ConfiguratorImpl( : background_downloads_enabled_(config_policy.BackgroundDownloadsEnabled()), deltas_enabled_(config_policy.DeltaUpdatesEnabled()), fast_update_(config_policy.FastUpdate()), @@ -38,11 +39,11 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp + pings_enabled_(false), url_source_override_(config_policy.UrlSourceOverride()), initial_delay_(config_policy.InitialDelay()) { - if (config_policy.TestRequest()) -@@ -73,8 +72,6 @@ std::vector ConfiguratorImpl::UpdateUrl() const { - } - - std::vector urls{GURL(kUpdaterDefaultUrl), GURL(kUpdaterFallbackUrl)}; + if (config_policy.TestRequest()) { +@@ -88,8 +87,6 @@ std::vector ConfiguratorImpl::UpdateUrl() const { + GURL(kUpdaterJSONFallbackUrl)} + : std::vector{GURL(kUpdaterDefaultUrl), + GURL(kUpdaterFallbackUrl)}; - if (require_encryption_) - update_client::RemoveUnsecureUrls(&urls); @@ -51,7 +52,7 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp diff --git a/components/component_updater/configurator_impl.h b/components/component_updater/configurator_impl.h --- a/components/component_updater/configurator_impl.h +++ b/components/component_updater/configurator_impl.h -@@ -95,7 +95,6 @@ class ConfiguratorImpl { +@@ -102,7 +102,6 @@ class ConfiguratorImpl { const bool deltas_enabled_; const bool fast_update_; const bool pings_enabled_; diff --git a/build/patches_list.txt b/build/patches_list.txt index b8fc55a6..8c718720 100644 --- a/build/patches_list.txt +++ b/build/patches_list.txt @@ -7,7 +7,7 @@ updater-disable-updater-pings.patch prefs-only-keep-cookies-until-exit.patch Remove-EV-certificates.patch promo-disable-Google-promotion-fetching.patch -Disables-omission-of-URL-elements-in-Omnibox.patch +Disable-omission-of-URL-elements-in-Omnibox.patch Modify-default-preferences.patch Disable-contextual-search-by-default.patch Disable-hyperlink-auditing-by-default.patch @@ -35,7 +35,6 @@ ungoogled-chromium-Disable-GCM.patch ungoogled-chromium-Disable-Gaia.patch ungoogled-chromium-Disable-domain-reliability.patch ungoogled-chromium-Disable-Network-Time-Tracker.patch -ungoogled-chromium-Remove-third_party-analytics.patch ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch safe_browsing-disable-incident-reporting.patch safe_browsing-disable-reporting-of-safebrowsing-override.patch @@ -106,5 +105,5 @@ Enable-TLS-1.3-final-by-default.patch Do-not-grant-notifications-to-default-search-engine.patch Add-flag-to-disable-IPv6-probes.patch Add-a-proxy-configuration-page.patch -Revert-Download-location-android-Check-SD-card-before-showing-location-dialog.patch +Do-not-ignore-download-location-prompt-setting.patch Disable-previews-by-default.patch